From 078f36be6a216a88c73a815da13832a5c017fee1 Mon Sep 17 00:00:00 2001 From: Rich-Harris Date: Sat, 8 Apr 2017 15:55:04 -0400 Subject: [PATCH] get rid of fragment.type --- src/generators/dom/index.js | 1 - src/generators/dom/visitors/Component.js | 1 - src/generators/dom/visitors/EachBlock.js | 2 -- src/generators/dom/visitors/IfBlock.js | 7 +++---- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/generators/dom/index.js b/src/generators/dom/index.js index 5a6ad09ff4..4d11107f44 100644 --- a/src/generators/dom/index.js +++ b/src/generators/dom/index.js @@ -109,7 +109,6 @@ export default function dom ( parsed, source, options ) { const component = getUniqueName( 'component' ); const mainFragment = new Fragment({ - type: 'block', generator, name: generator.alias( 'create_main_fragment' ), key: null, diff --git a/src/generators/dom/visitors/Component.js b/src/generators/dom/visitors/Component.js index 5f2f6d2f10..56f9468ca4 100644 --- a/src/generators/dom/visitors/Component.js +++ b/src/generators/dom/visitors/Component.js @@ -79,7 +79,6 @@ export default function visitComponent ( generator, fragment, state, node ) { const params = fragment.params.join( ', ' ); const childFragment = fragment.child({ - type: 'component', name: generator.getUniqueName( `render_${name}_yield_fragment` ), // TODO should getUniqueName happen inside Fragment? probably builders: getBuilders() }); diff --git a/src/generators/dom/visitors/EachBlock.js b/src/generators/dom/visitors/EachBlock.js index 2705d47968..662e7e6672 100644 --- a/src/generators/dom/visitors/EachBlock.js +++ b/src/generators/dom/visitors/EachBlock.js @@ -189,7 +189,6 @@ export default function visitEachBlock ( generator, fragment, state, node ) { const getUniqueName = generator.getUniqueNameMaker( blockParams ); const childFragment = fragment.child({ - type: 'block', name: renderer, expression: node.expression, context: node.context, @@ -221,7 +220,6 @@ export default function visitEachBlock ( generator, fragment, state, node ) { if ( node.else ) { const childFragment = fragment.child({ - type: 'block', name: renderElse, builders: getBuilders(), getUniqueName: generator.getUniqueNameMaker( fragment.params ) diff --git a/src/generators/dom/visitors/IfBlock.js b/src/generators/dom/visitors/IfBlock.js index 30ee1be7b8..f94de000d4 100644 --- a/src/generators/dom/visitors/IfBlock.js +++ b/src/generators/dom/visitors/IfBlock.js @@ -11,7 +11,7 @@ function getConditionsAndBlocks ( generator, fragment, state, node, _name, i = 0 block: name }]; - generateBlock( generator, fragment, state, node, name, 'block' ); + generateBlock( generator, fragment, state, node, name ); if ( node.else && node.else.children.length === 1 && node.else.children[0].type === 'IfBlock' ) { @@ -26,15 +26,14 @@ function getConditionsAndBlocks ( generator, fragment, state, node, _name, i = 0 }); if ( node.else ) { - generateBlock( generator, fragment, state, node.else, name, 'block' ); + generateBlock( generator, fragment, state, node.else, name ); } } return conditionsAndBlocks; } -function generateBlock ( generator, fragment, state, node, name, type ) { +function generateBlock ( generator, fragment, state, node, name ) { const childFragment = fragment.child({ - type, name, builders: getBuilders() });