flynx/pWiki
1
1
Fork 0
mirror of https://github.com/flynx/pWiki.git synced 2026-07-10 18:40:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed the @slot(..) recursion issue...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2026-07-01 12:45:37 +03:00
parent 70e44f5a6f
commit 84880015f7
2 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
v3/pwiki/parser.js
View File

@ -1315,10 +1315,6 @@ module.parser = {
// Force hide a slot...
// <slot hidden ... />
//
// Insert previous slot content...
// <content/>
//
//
// NOTE: slots are expanded in order of occurance not in order
// of topology, thus nested can override slots they are
// nested in, e.g.:
@ -1331,11 +1327,12 @@ module.parser = {
// NOTE: hidden has precedence over shown if both are given.
// XXX revise...
//
// XXX do we need to be able to insert previous slot value???
// ...this was implemented via <content/>, but the naming
// was not obvious, should be something like <overridden/>
// or <previous/>...
// XXX revise the use of hidden/shown use mechanic and if it's
// needed...
// XXX do we need to guard from recursion???
// ...do not think it's possible -- everything is resolved
// once and just inseerted as-is (revise)
slot: Macro(
['name', 'text', ['shown', 'hidden']],
lazy(
@ -1348,7 +1345,6 @@ module.parser = {
var slots = state.slots ??= {}
//var hidden = name in slots
// XXX EXPERIMENTAL
var hidden =
// 'hidden' has priority...
args.hidden
@ -1359,30 +1355,31 @@ module.parser = {
: name in slots)
// set slot value...
delete slots[name]
//
// NOTE: the slots are filled sequentially, in
// order of opening elements, rather than
// topologically, i.e. filled on the way down
// the tree vs. up.
var slot = slots[name] ??= []
// NOTE: the placeholder is a stand-in for our
// current value that is still to be generated.
var placeholder = [...(0 in slot ? slot : [])]
slot.splice(0, slot.length, placeholder)
// expand slot body...
body = body ?
parser.expand(this, body ?? [], state)
: body
// XXX BUG: this breaks into infinite recursion:
// '<slot a>[[ <slot a> ]]</slot>'
// -> err
// need to somehow break recursion here, if the
// nested slot had no/empty body...
// slots[name] ??= body ?? []
// fixes the recursion but also resets the
// parent value...
// need to meke the behavior of the following
// the saem:
// '<slot a>[[ <slot a> ]]</slot>'
// -> err
// and:
// '<slot a>[[ <slot a> ]]</slot> @slot(a)'
// -> '[[ ]]'
slots[name] ??= body
// if slot not overriden, write our value...
if(slot[0] === placeholder){
slot.splice(0, 1,
...(body != null ?
[body]
: placeholder)) }
return hidden ?
''
: Object.assign(
// stage II: place the latest slot value...
function(st){
return ((st ?? state).slots ?? {})[name]
?? body },

2
v3/pwiki/test/parser.js
View File

@ -72,12 +72,10 @@ test.Setups({
'<slot slot>[[ <slot slot value/> ]]</slot>',
'<slot slot shown>[[ <slot slot value/> ]]</slot>',
'value' ]} },
/*/ XXX recursion...
slot_nested_shown_nested: function(assert){
return {code: [
'<slot slot>[[ <slot slot/> ]]</slot>',
'[[ ]]' ]} },
//*/
/* XXX SHOWN_HIDDEN
// XXX these need to be revised...