msb-public
/
svelte
mirror of https://github.com/sveltejs/svelte
1
0
Code Issues Projects Releases Wiki Activity

refactor node._state stuff

Browse Source
pull/803/head
Rich Harris 8 years ago
parent 6499d4714d
commit 9fae7671a4
9 changed files with 34 additions and 41 deletions
Show Stats Download Patch File Download Diff File

21
src/generators/dom/preprocess.ts
Unescape View File

@ -48,9 +48,7 @@ const preprocessors = {
const dependencies = block.findDependencies(node.expression); const dependencies = block.findDependencies(node.expression);
block.addDependencies(dependencies); block.addDependencies(dependencies);
node._state = getChildState(state, { node.var = block.getUniqueName('text');
name: block.getUniqueName('text'),
});
}, },
RawMustacheTag: ( RawMustacheTag: (
@ -65,8 +63,7 @@ const preprocessors = {
const dependencies = block.findDependencies(node.expression); const dependencies = block.findDependencies(node.expression);
block.addDependencies(dependencies); block.addDependencies(dependencies);
const name = block.getUniqueName('raw'); node.var = block.getUniqueName('raw');
node._state = getChildState(state, { name });
}, },
Text: ( Text: (
@ -86,7 +83,7 @@ const preprocessors = {
} }
node._state.shouldCreate = true; node._state.shouldCreate = true;
node._state.name = block.getUniqueName(`text`); node.var = block.getUniqueName(`text`);
}, },
IfBlock: ( IfBlock: (
@ -333,13 +330,12 @@ const preprocessors = {
generator.components.has(node.name) || node.name === ':Self'; generator.components.has(node.name) || node.name === ':Self';
if (isComponent) { if (isComponent) {
const name = block.getUniqueName( node.var = block.getUniqueName(
(node.name === ':Self' ? generator.name : node.name).toLowerCase() (node.name === ':Self' ? generator.name : node.name).toLowerCase()
); );
node._state = getChildState(state, { node._state = getChildState(state, {
name, parentNode: `${node.var}._slotted.default`
parentNode: `${name}._slotted.default`
}); });
} else { } else {
const slot = getStaticAttributeValue(node, 'slot'); const slot = getStaticAttributeValue(node, 'slot');
@ -349,15 +345,14 @@ const preprocessors = {
component._slots.add(slot); component._slots.add(slot);
} }
const name = block.getUniqueName( node.var = block.getUniqueName(
node.name.replace(/[^a-zA-Z0-9_$]/g, '_') node.name.replace(/[^a-zA-Z0-9_$]/g, '_')
); );
node._state = getChildState(state, { node._state = getChildState(state, {
isTopLevel: false, isTopLevel: false,
name, parentNode: node.var,
parentNode: name, parentNodes: block.getUniqueName(`${node.var}_nodes`),
parentNodes: block.getUniqueName(`${name}_nodes`),
parentNodeName: node.name, parentNodeName: node.name,
namespace: node.name === 'svg' namespace: node.name === 'svg'
? 'http://www.w3.org/2000/svg' ? 'http://www.w3.org/2000/svg'

2
src/generators/dom/visitors/Component.ts
Unescape View File

@ -48,7 +48,7 @@ export default function visitComponent(
) { ) {
generator.hasComponents = true; generator.hasComponents = true;
const name = node._state.name; const name = node.var;
const componentInitProperties = [`_root: #component._root`]; const componentInitProperties = [`_root: #component._root`];

4
src/generators/dom/visitors/EachBlock.ts
Unescape View File

@ -19,10 +19,10 @@ export default function visitEachBlock(
const iterations = block.getUniqueName(`${each_block}_iterations`); const iterations = block.getUniqueName(`${each_block}_iterations`);
const params = block.params.join(', '); const params = block.params.join(', ');
const needsAnchor = node.next ? (!node.next._state || !node.next._state.name) : !state.parentNode; const needsAnchor = node.next ? (!node.next._state || !node.next.var) : !state.parentNode;
const anchor = needsAnchor const anchor = needsAnchor
? block.getUniqueName(`${each_block}_anchor`) ? block.getUniqueName(`${each_block}_anchor`)
: (node.next && node.next._state.name) || 'null'; : (node.next && node.next.var) || 'null';
// hack the sourcemap, so that if data is missing the bug // hack the sourcemap, so that if data is missing the bug
// is easy to find // is easy to find

4
src/generators/dom/visitors/Element/Element.ts
Unescape View File

@ -45,7 +45,7 @@ export default function visitElement(
} }
if (node.name === 'slot') { if (node.name === 'slot') {
return visitSlot(generator, block, state, node, elementStack); return visitSlot(generator, block, state, node, elementStack, componentStack);
} }
if (generator.components.has(node.name) || node.name === ':Self') { if (generator.components.has(node.name) || node.name === ':Self') {
@ -57,7 +57,7 @@ export default function visitElement(
const slot = node.attributes.find((attribute: Node) => attribute.name === 'slot'); const slot = node.attributes.find((attribute: Node) => attribute.name === 'slot');
const parentNode = slot ? const parentNode = slot ?
`${componentStack[componentStack.length - 1]._state.name}._slotted.${slot.value[0].data}` : // TODO this looks bonkers `${componentStack[componentStack.length - 1].var}._slotted.${slot.value[0].data}` : // TODO this looks bonkers
state.parentNode; state.parentNode;
const isToplevel = !parentNode; const isToplevel = !parentNode;

20
src/generators/dom/visitors/Element/addTransitions.ts
Unescape View File

@ -13,7 +13,7 @@ export default function addTransitions(
outro outro
) { ) {
if (intro === outro) { if (intro === outro) {
const name = block.getUniqueName(`${state.name}_transition`); const name = block.getUniqueName(`${node.var}_transition`);
const snippet = intro.expression const snippet = intro.expression
? block.contextualise(intro.expression).snippet ? block.contextualise(intro.expression).snippet
: '{}'; : '{}';
@ -24,23 +24,23 @@ export default function addTransitions(
block.builders.intro.addBlock(deindent` block.builders.intro.addBlock(deindent`
#component._root._aftercreate.push( function () { #component._root._aftercreate.push( function () {
if ( !${name} ) ${name} = @wrapTransition( #component, ${state.name}, ${fn}, ${snippet}, true, null ); if ( !${name} ) ${name} = @wrapTransition( #component, ${node.var}, ${fn}, ${snippet}, true, null );
${name}.run( true, function () { ${name}.run( true, function () {
#component.fire( 'intro.end', { node: ${state.name} }); #component.fire( 'intro.end', { node: ${node.var} });
}); });
}); });
`); `);
block.builders.outro.addBlock(deindent` block.builders.outro.addBlock(deindent`
${name}.run( false, function () { ${name}.run( false, function () {
#component.fire( 'outro.end', { node: ${state.name} }); #component.fire( 'outro.end', { node: ${node.var} });
if ( --#outros === 0 ) #outrocallback(); if ( --#outros === 0 ) #outrocallback();
${name} = null; ${name} = null;
}); });
`); `);
} else { } else {
const introName = intro && block.getUniqueName(`${state.name}_intro`); const introName = intro && block.getUniqueName(`${node.var}_intro`);
const outroName = outro && block.getUniqueName(`${state.name}_outro`); const outroName = outro && block.getUniqueName(`${node.var}_outro`);
if (intro) { if (intro) {
block.addVariable(introName); block.addVariable(introName);
@ -59,9 +59,9 @@ export default function addTransitions(
block.builders.intro.addBlock(deindent` block.builders.intro.addBlock(deindent`
#component._root._aftercreate.push( function () { #component._root._aftercreate.push( function () {
${introName} = @wrapTransition( #component, ${state.name}, ${fn}, ${snippet}, true, null ); ${introName} = @wrapTransition( #component, ${node.var}, ${fn}, ${snippet}, true, null );
${introName}.run( true, function () { ${introName}.run( true, function () {
#component.fire( 'intro.end', { node: ${state.name} }); #component.fire( 'intro.end', { node: ${node.var} });
}); });
}); });
`); `);
@ -78,9 +78,9 @@ export default function addTransitions(
// TODO hide elements that have outro'd (unless they belong to a still-outroing // TODO hide elements that have outro'd (unless they belong to a still-outroing
// group) prior to their removal from the DOM // group) prior to their removal from the DOM
block.builders.outro.addBlock(deindent` block.builders.outro.addBlock(deindent`
${outroName} = @wrapTransition( #component, ${state.name}, ${fn}, ${snippet}, false, null ); ${outroName} = @wrapTransition( #component, ${node.var}, ${fn}, ${snippet}, false, null );
${outroName}.run( false, function () { ${outroName}.run( false, function () {
#component.fire( 'outro.end', { node: ${state.name} }); #component.fire( 'outro.end', { node: ${node.var} });
if ( --#outros === 0 ) #outrocallback(); if ( --#outros === 0 ) #outrocallback();
}); });
`); `);

4
src/generators/dom/visitors/IfBlock.ts
Unescape View File

@ -79,10 +79,10 @@ export default function visitIfBlock(
) { ) {
const name = generator.getUniqueName(`if_block`); const name = generator.getUniqueName(`if_block`);
const needsAnchor = node.next ? (!node.next._state || !node.next._state.name) : !state.parentNode; const needsAnchor = node.next ? (!node.next._state || !node.next.var) : !state.parentNode;
const anchor = needsAnchor const anchor = needsAnchor
? block.getUniqueName(`${name}_anchor`) ? block.getUniqueName(`${name}_anchor`)
: (node.next && node.next._state.name) || 'null'; : (node.next && node.next.var) || 'null';
const params = block.params.join(', '); const params = block.params.join(', ');
const branches = getBranches(generator, block, state, node, elementStack, componentStack); const branches = getBranches(generator, block, state, node, elementStack, componentStack);

8
src/generators/dom/visitors/MustacheTag.ts
Unescape View File

@ -11,19 +11,17 @@ export default function visitMustacheTag(
state: State, state: State,
node: Node node: Node
) { ) {
const { name } = node._state;
const { init } = visitTag( const { init } = visitTag(
generator, generator,
block, block,
state, state,
node, node,
name, node.var,
value => `${name}.data = ${value};` value => `${node.var}.data = ${value};`
); );
block.addElement( block.addElement(
name, node.var,
`@createText( ${init} )`, `@createText( ${init} )`,
`@claimText( ${state.parentNodes}, ${init} )`, `@claimText( ${state.parentNodes}, ${init} )`,
state.parentNode state.parentNode

10
src/generators/dom/visitors/RawMustacheTag.ts
Unescape View File

@ -11,18 +11,18 @@ export default function visitRawMustacheTag(
state: State, state: State,
node: Node node: Node
) { ) {
const name = node._state.name; const name = node.var;
const needsAnchorBefore = node.prev ? (node.prev.type !== 'Element' || !node.prev._state || !node.prev._state.name) : !state.parentNode; const needsAnchorBefore = node.prev ? (node.prev.type !== 'Element' || !node.prev._state || !node.prev.var) : !state.parentNode;
const needsAnchorAfter = node.next ? (node.next.type !== 'Element' || !node.next._state || !node.next._state.name) : !state.parentNode; const needsAnchorAfter = node.next ? (node.next.type !== 'Element' || !node.next._state || !node.next.var) : !state.parentNode;
const anchorBefore = needsAnchorBefore const anchorBefore = needsAnchorBefore
? block.getUniqueName(`${name}_before`) ? block.getUniqueName(`${name}_before`)
: (node.prev && node.prev._state.name) || 'null'; : (node.prev && node.prev.var) || 'null';
const anchorAfter = needsAnchorAfter const anchorAfter = needsAnchorAfter
? block.getUniqueName(`${name}_after`) ? block.getUniqueName(`${name}_after`)
: (node.next && node.next._state.name) || 'null'; : (node.next && node.next.var) || 'null';
let detach: string; let detach: string;
let insert: (content: string) => string; let insert: (content: string) => string;

2
src/generators/dom/visitors/Text.ts
Unescape View File

@ -12,7 +12,7 @@ export default function visitText(
) { ) {
if (!node._state.shouldCreate) return; if (!node._state.shouldCreate) return;
block.addElement( block.addElement(
node._state.name, node.var,
`@createText( ${stringify(node.data)} )`, `@createText( ${stringify(node.data)} )`,
`@claimText( ${state.parentNodes}, ${stringify(node.data)} )`, `@claimText( ${state.parentNodes}, ${stringify(node.data)} )`,
state.parentNode state.parentNode

Write Preview
Loading…
Cancel
Save