From 6c5b088dd5d11ef97ed25f250a8a165edc55e906 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Wed, 3 Aug 2022 14:13:23 +0300
Subject: [PATCH] tweaking pattern path rendering...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 pwiki2.js | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/pwiki2.js b/pwiki2.js
index 60a3e95..35cf303 100755
--- a/pwiki2.js
+++ b/pwiki2.js
@@ -1537,11 +1537,13 @@ object.Constructor('Page', BasePage, {
 			text = null }
 		state = state ?? {}
 		text = text 
-			?? await this.raw
+			?? await this.each()
 		return text instanceof Array ?
 			Promise.iter(text)
 				.map(function(text){
-					return that.__parser__.parse(that, text, state) })
+					return text instanceof Page ?
+						that.__parser__.parse(text, null, state)
+						: that.__parser__.parse(that, text, state) })
 			: this.__parser__.parse(this, text, state) },
 
 	// true if page has an array value but is not a pattern page...
@@ -1561,6 +1563,28 @@ object.Constructor('Page', BasePage, {
 	// NOTE: when matching multiple pages this will return a list...
 	get raw(){ return (async function(){
 		var that = this
+
+		var pages = await this.each()
+			.map(async function(page){
+				var data = await page.data
+				return (
+					// action...
+					typeof(data) == 'function' ?
+						data.call(page)
+						: data.text ) })
+
+		if(pages.length == 0){
+			var msg = (this.PAGE_NOT_FOUND 
+					|| module.PAGE_NOT_FOUND)
+				.replace(/\$PATH/, this.path)
+			if(this.PAGE_NOT_FOUND){
+				return msg }
+			throw new Error(msg) }
+
+		return this.isPattern ?
+			pages
+			: pages[0] }).call(this) },
+	/*/
 		var data = await this.data
 		// no data...
 		// NOTE: if we hit this it means that nothing was resolved, 
@@ -1587,6 +1611,7 @@ object.Constructor('Page', BasePage, {
 							: d.text })
 					.flat()
    			: data.text )}).call(this) },
+	//*/
 	set raw(value){
 		this.__update__({text: value}) },
 		//this.onTextUpdate(value) },