working of filters...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>

pwiki2.js

@@ -465,6 +465,9 @@ object.Constructor('BasePage', {
 			//*/
 			data) },
 
+	update: function(...data){
+		return Object.assign(this, ...data) },
+
 	__init__: function(path, referrer, store){
 		// NOTE: this will allow inheriting .store from the prototype
 		if(store){
@@ -673,12 +676,27 @@ function*(lex, to=false, macros){
 		yield value } } 
 
 
+// XXX PATH_VARS need to handle path variables...
 // XXX macros and filters should be features for simpler plugin handlng (???)
 var Page =
 module.Page = 
 object.Constructor('Page', BasePage, {
+	SKIP_FILTERS: 'nofilters',
+
+	// XXX might be a good idea to fix filter order...
 	filters: {
-		test: function(){},
+		// if this is used all other filters will be skipped (placeholder)
+		nofilters: function(source){ return source },
+
+		// XXX move to docs...
+		test: function(source){
+			return source 
+				.replace(/ test /g, ' TEST ') },
+
+		wikiword: function(source){
+			return source },
+		markdown: function(source){
+			return source },
 	},
 	macros: {
 		// XXX move to docs...
@@ -695,7 +713,6 @@ object.Constructor('Page', BasePage, {
 			} else {
 				yield '<test/>' } },
 
-		// XXX STUB
 		now: function(){
 			return ''+ Date.now() },
 		// XXX local filters???
@@ -706,38 +723,45 @@ object.Constructor('Page', BasePage, {
 		// 				...
 		// 				@filter(markdown)
 		// 			</filter>
+		// XXX need to nest filter namespaces -- currently parent_filters 
+		// 		does not see filters defined after the block...
 		filter: function*(args, body, state){
+			var filters = state.filters = 
+				state.filters ?? []
 			// local filter...
 			if(body){
-				throw new Error('Not implemented: local filters')
+				var parent_filters = state.filters
-				var global_filters = state.filters
+				filters = state.filters = 
-				state.filters = (state.filters ?? []).slice()
+					[] }
-				// parse the body...
+			// populate filters...
-				// XXX should post-processing be done here or after...
+			Object.values(args)
-				var res = this.postProcess(
+				.forEach(function(filter){
-					this.expand(body, state),
+					// clear disabled filters...
-					state)
+					// NOTE: '-<filter>' has precedence over '<filter>'...
-				state.filters = global_filters
+					if(filter[0] == '-' 
-				// XXX need to prevent re-expansion of this....
+							&& filters.includes(filter.slice(1))){
-				yield* res
+						filters.splice(filters.indexOf(filter.slice(1)), 1) }
-
+					// only add once...
-			// global filter...
+					!filters.includes(filter)
-			} else {
+						&& (filter[0] == '-' 
-				var filters = 
+							|| !filters.includes('-'+filter))
-				state.filters = 
+						&& filters.push(filter) }) 
-					state.filters 
+			// local filters...
-						?? []
+			if(body){
-				Object.values(args)
+				// serialize the block for later processing...
-					.forEach(function(filter){
+				var res = {
-						// '-<filter>' has precedence over '<filter>'
+					filters: state.filters,
-						if(filter[0] == '-' 
+					// XXX might be a good idea to simply ref the parent 
-								&& filters.includes(filter.slice(1))){
+					// 		context here -- i.e. link filters into a chain...
-							filters.splice(filters.indexOf(filter.slice(1)), 1) }
+					parent_filters,
-						// only add once...
+					text: [...this.expand(body, state)]
-						!filters.includes(filter)
+						.flat()
-							// XXX do we need to handle '--<filter>' here???
+						.join(''),
-							&& !filters.includes('-'+filter)
+				}
-							&& filters.push(filter) }) }},
+				// restore global filters...
+				state.filters = parent_filters
+				yield res } 
+			return },
 		include: function(){},
 		source: function(){},
 		quote: function(){},
@@ -782,13 +806,35 @@ object.Constructor('Page', BasePage, {
 				yield* res
 			} else {
 				yield res } } },
-	// XXX handle filters...
+	// XXX add a special filter to clear pending filters...
+	// XXX skip nested pre-filtered blocks...
 	postProcess: function(ast, state={}){
-		if(state.filters){
+		var that = this
-			// XXX
+		return [...ast]
-			console.log('### FILTERS:', state.filters)
+			.map(function(section){
-		}
+				var filters = state.filters
-		return [...ast].join('') },
+				// local filters...
+				if(typeof(section) != 'string'){
+					// XXX also need to hanlde nested filters (no longer flat)...
+					// XXX merge this with .parent_filters...
+					filters = section.filters
+					section = section.text }
+				return (filters 
+						// if this.SKIP_FILTERS is set and used then all other 
+						// filters will be skipped...
+						&& (!this.SKIP_FILTERS
+							|| !filters.inculdes(this.SKIP_FILTERS))) ?
+					// filter...
+					filters
+						.reduce(function(res, filter){
+							if(filter[0] == '-'){
+								return res }
+							if(that.filters[filter] == null){
+								throw new Error('.postProcess(..): unsupported filter: '+ filter) }
+							return that.filters[filter].call(that, res) }, section)
+					: section })
+			.flat()
+			.join('') },
 
 
 	// raw page text...
@@ -840,6 +886,7 @@ var WIKIWORD_PATTERN =
 
 // NOTE: in general the root wiki api is simply a page instance.
 // XXX not yet sure how to organize the actual alient -- UI, hooks, .. etc
+var pwiki =
 module.pwiki = 
 Page('/', '/', 
 	Object.assign(
@@ -847,6 +894,24 @@ Page('/', '/',
 		require('./bootstrap')))
 
 
+// XXX TEST...
+console.log('loading test page...')
+pwiki.update({
+	location: '/test',
+	text: `
+	Some test text...
+
+	@now()
+
+	<test>
+	some code...
+	</test>
+	
+	@filter(test)`,
+})
+
+
+
 
 
 /**********************************************************************