flynx/pWiki
1
1
Fork 0
mirror of https://github.com/flynx/pWiki.git synced 2026-08-25 16:56:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

added nested macro handler to .expand(..) / .resolve(..) / .parse(..)

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2026-07-03 18:21:54 +03:00
parent e8b0cb435c
commit 12d77832a5
1 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
v3/pwiki/parser.js
View File

@ -278,6 +278,7 @@ module.BaseParser = {
return blocks }, return blocks },
// Strip comments... // Strip comments...
// //
stripComments: function(str){ stripComments: function(str){
@ -597,7 +598,7 @@ module.BaseParser = {
// sync (text) and async (DOM) rendering // sync (text) and async (DOM) rendering
// in the simplest form: take the expanded AST and merge // in the simplest form: take the expanded AST and merge
// into a single string // into a single string
expand: function(page, ast, state={}){ expand: function(page, ast, state={}, nested_handlers={}){
var that = this var that = this
ast = typeof(ast) != 'object' ? ast = typeof(ast) != 'object' ?
this.group(ast) this.group(ast)
@ -607,8 +608,9 @@ module.BaseParser = {
var elems = [] var elems = []
for(let elem of ast){ for(let elem of ast){
// text block... // text block...
if(typeof(elem) == 'string'){ if(typeof(elem) != 'object'){
elems.push(elem) elems.push(elem)
continue } continue }
// do not re-expand expanded elements... // do not re-expand expanded elements...
@ -618,7 +620,6 @@ module.BaseParser = {
continue } continue }
// cleanup... // cleanup...
//elem = {...elem}
elem = serialize.partialDeepCopy(elem) elem = serialize.partialDeepCopy(elem)
delete elem.error delete elem.error
delete elem.value delete elem.value
@ -626,9 +627,15 @@ module.BaseParser = {
var {name, args, body} = elem var {name, args, body} = elem
// nested macro -- skip... // nested macro...
if(that.macros[name] instanceof Array){ if(that.macros[name] instanceof Array){
elems.push(elem) // call handler...
if(nested_handlers[name]){
elems.push(
nested_handlers[name].call(that, elem))
// skip...
} else {
elems.push(elem) }
continue } continue }
// drop non-macros/aliases... // drop non-macros/aliases...
if(typeof(that.macros[name]) != 'function' if(typeof(that.macros[name]) != 'function'
@ -639,7 +646,7 @@ module.BaseParser = {
// XXX cache this as an AST // XXX cache this as an AST
body body
&& !that.macros[name].lazy && !that.macros[name].lazy
&& (body = this.expand(page, body, state)) && (body = this.expand(page, body, state, nested_handlers))
// call macro... // call macro...
var res = that.callMacro(page, name, args, body, state) var res = that.callMacro(page, name, args, body, state)
@ -731,10 +738,10 @@ module.BaseParser = {
// XXX it looks like the first slot is resolved before the last // XXX it looks like the first slot is resolved before the last
// slot has a chance to set the value as it is waiting for // slot has a chance to set the value as it is waiting for
// the first slot to finish... // the first slot to finish...
resolve: function(page, ast, state={}){ resolve: function(page, ast, state={}, nested_handlers={}){
var that = this var that = this
ast = typeof(ast) != 'object' ? ast = typeof(ast) != 'object' ?
this.expand(page, ast, state) this.expand(page, ast, state, nested_handlers)
: ast instanceof types.Generator ? : ast instanceof types.Generator ?
ast ast
: ast.iter() : ast.iter()
@ -798,21 +805,21 @@ module.BaseParser = {
}, },
// XXX // XXX
parse: function(page, ast, state={}, wait='wait'){ parse: function(page, ast, state={}, nested_handlers={}, wait='wait'){
var that = this var that = this
var reresolve = !!state.wait var reresolve = !!state.wait
return Promise.awaitOrRun( return Promise.awaitOrRun(
this.resolve(page, ast, state), this.resolve(page, ast, state, nested_handlers),
state[wait], state[wait],
function(ast, reresolve){ function(ast, reresolve){
ast = reresolve ? ast = reresolve ?
that.resolve(page, ast, state) that.resolve(page, ast, state, nested_handlers)
: ast : ast
return (ast ?? '').join('') }) }, return (ast ?? '').join('') }) },
// XXX how should this play with filters??? // XXX how should this play with filters???
// ...should filters be client-side only?? // ...should filters be client-side only??
parseNested: function(page, ast, state={}){ parseNested: function(page, ast, state={}, nested_handlers={}){
return this.parse(page, ast, state, 'waitNestedi') }, return this.parse(page, ast, state, nested_handlers, 'waitNestedi') },
@ -1409,7 +1416,8 @@ module.parser = {
slot.splice(0, slot.length, placeholder) slot.splice(0, slot.length, placeholder)
// expand body... // expand body...
body = body ? body = body ?
that.expand(page, body ?? [], state) // XXX can we pass content handler here???
that.expand(page, body ?? [], state, {})
: body : body
// if slot not overriden, write our value... // if slot not overriden, write our value...
if(slot[0] === placeholder){ if(slot[0] === placeholder){
@ -1438,7 +1446,7 @@ module.parser = {
return ((st ?? state).slots ?? {})[name] }, return ((st ?? state).slots ?? {})[name] },
{slot: name}) }) })), {slot: name}) }) })),
// XXX do not like this name... // XXX do not like this name...
content: ['slot'], content: ['slot', 'include'],
// //
@ -1557,9 +1565,14 @@ module.parser = {
var pageHandler = var pageHandler =
function(text){ function(text){
// XXX handle body / <content/>... // XXX NOTE: if body set and contains to <content/> macro
// XXX // then the included value will not be displayed...
return handler.call(that, page, text, state) } return body ?
that.expand(page, body, state,
{ content: function(){
handler_called = true
return text = handler.call(that, page, text, state) } })
: handler.call(that, page, text, state) }
var resultHandler = var resultHandler =
function(pages){ function(pages){
state.include_stack.at(-1) == base_src state.include_stack.at(-1) == base_src