Alias Problems and Optin

This commit is contained in:
reverend 2021-01-17 16:33:09 +01:00
parent 08e20dfcb3
commit e8609fe833

View File

@ -52,12 +52,19 @@ is_direct_descendant_of_block()
return false return false
return true return true
/*
* Checks if we are called inside a block
*/
is_in_block()
return 'RV-Block' in called-from
/* /*
* Taking the currently stashed names, mapping * Taking the currently stashed names, mapping
* them to the given name under the called parent * them to the given name under the called parent
* (using called-from) and returning the stashed blocks * (using called-from) and returning the stashed blocks
*/ */
generate_aliases(actual_name) generate_aliases(actual_name, level_type=null)
if level_type == null
level_type = split(' ', called-from)[0] level_type = split(' ', called-from)[0]
if actual_name == null if actual_name == null
if length(_block.alias.stash[level_type]) > 2 if length(_block.alias.stash[level_type]) > 2
@ -82,7 +89,8 @@ generate_aliases(actual_name)
* (using called-from). Returning the given name * (using called-from). Returning the given name
* when no alias is found * when no alias is found
*/ */
resolve_alias(name) resolve_alias(name, level_type=null)
if level_type == null
level_type = split(' ', called-from)[0] level_type = split(' ', called-from)[0]
if level_type+':'+name in _block.alias.map if level_type+':'+name in _block.alias.map
@ -90,14 +98,20 @@ resolve_alias(name)
else else
return name return name
/*
* Renders an element modifier
*/
render_element_modifier(modifier) render_element_modifier(modifier)
&--{resolve_alias(modifier.name)} &--{resolve_alias(modifier.name, 'RV-Element__Modifier')}
foreach(modifier.blocks, @(block){ foreach(modifier.blocks, @(block){
{block} {block}
}) })
/*
* Renders an element
*/
render_element(element) render_element(element)
&__{resolve_alias(element.name)} &__{resolve_alias(element.name, 'RV-Element')}
foreach(element.blocks, @(block){ foreach(element.blocks, @(block){
{block} {block}
}) })
@ -105,8 +119,11 @@ render_element(element)
render_element_modifier(modifier) render_element_modifier(modifier)
}) })
/*
* Renders an block modifier,
*/
render_block_modifier(modifier) render_block_modifier(modifier)
&--{resolve_alias(modifier.name)} &--{resolve_alias(modifier.name, 'RV-Block__Modifier')}
foreach(modifier.blocks, @(block){ foreach(modifier.blocks, @(block){
{block} {block}
}) })
@ -123,22 +140,31 @@ render_block_modifier(modifier)
* (See generate_aliases) * (See generate_aliases)
*/ */
RV-Element--name(name) RV-Element--name(name)
if 'RV-Element' in called-from
push(_block.alias.stash.RV-Element, { push(_block.alias.stash.RV-Element, {
name: name name: name
block: block block: block
}) })
else
{block}
RV-Element__Modifier--name(name) RV-Element__Modifier--name(name)
if 'RV-Element__Modifier' in called-from
push(_block.alias.stash.RV-Element__Modifier, { push(_block.alias.stash.RV-Element__Modifier, {
name: name name: name
block: block block: block
}) })
else
{block}
RV-Block__Modifier--name(name) RV-Block__Modifier--name(name)
if 'RV-Block__Modifier' in called-from
push(_block.alias.stash.RV-Block__Modifier, { push(_block.alias.stash.RV-Block__Modifier, {
name: name name: name
block: block block: block
}) })
else
{block}
RV-Block(block_name) RV-Block(block_name)
@ -151,9 +177,10 @@ RV-Block(block_name)
render_element(element) render_element(element)
}) })
reset_block()
RV-Block__Modifier(modifier_name=null) RV-Block__Modifier(modifier_name=null)
modifier_name = resolve_alias(modifier_name)
blocks = generate_aliases(modifier_name) blocks = generate_aliases(modifier_name)
modifier_name = blocks.name modifier_name = blocks.name
blocks = blocks.blocks blocks = blocks.blocks
@ -169,7 +196,6 @@ RV-Block__Modifier(modifier_name=null)
push(_block.block_modifiers, modifier) push(_block.block_modifiers, modifier)
RV-Element(element_name=null) RV-Element(element_name=null)
element_name = resolve_alias(element_name)
blocks = generate_aliases(element_name) blocks = generate_aliases(element_name)
element_name = blocks.name element_name = blocks.name
@ -190,7 +216,6 @@ RV-Element(element_name=null)
RV-Element__Modifier(modifier_name=null) RV-Element__Modifier(modifier_name=null)
modifier_name = resolve_alias(modifier_name)
blocks = generate_aliases(modifier_name) blocks = generate_aliases(modifier_name)
modifier_name = blocks.name modifier_name = blocks.name
blocks = blocks.blocks blocks = blocks.blocks