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

simplify helpers

Browse Source
pull/673/head
Rich Harris 8 years ago
parent 9b4550d2e8
commit 078f3ad8b6
15 changed files with 85 additions and 118 deletions
Show Stats Download Patch File Download Diff File

1
mocha.opts
Unescape View File

@ -1 +1,2 @@
--bail
test/test.js test/test.js

20
src/generators/dom/Block.ts
Unescape View File

@ -2,6 +2,7 @@ import CodeBuilder from '../../utils/CodeBuilder';
import deindent from '../../utils/deindent'; import deindent from '../../utils/deindent';
import { DomGenerator } from './index'; import { DomGenerator } from './index';
import { Node } from '../../interfaces'; import { Node } from '../../interfaces';
import shared from './shared';
export interface BlockOptions { export interface BlockOptions {
name: string; name: string;
@ -140,7 +141,7 @@ export default class Block {
if (isToplevel) { if (isToplevel) {
this.builders.unmount.addLine( this.builders.unmount.addLine(
`${this.generator.helper('detachNode')}( ${name} );` `@detachNode( ${name} );`
); );
} }
} }
@ -187,12 +188,11 @@ export default class Block {
mount(name: string, parentNode: string) { mount(name: string, parentNode: string) {
if (parentNode) { if (parentNode) {
this.builders.mount.addLine( this.builders.mount.addLine(
`${this.generator.helper('appendNode')}( ${name}, ${parentNode} );` `@appendNode( ${name}, ${parentNode} );`
); );
} else { } else {
this.builders.mount.addLine( this.builders.mount.addLine(
`${this.generator.helper('insertNode')}( ${name}, ${this `@insertNode( ${name}, ${this.target}, anchor );`
.target}, anchor );`
); );
} }
} }
@ -233,7 +233,7 @@ export default class Block {
} }
if (this.builders.create.isEmpty()) { if (this.builders.create.isEmpty()) {
properties.addBlock(`create: ${this.generator.helper('noop')},`); properties.addBlock(`create: @noop,`);
} else { } else {
properties.addBlock(deindent` properties.addBlock(deindent`
create: function () { create: function () {
@ -245,7 +245,7 @@ export default class Block {
if (this.generator.hydratable) { if (this.generator.hydratable) {
if (this.builders.claim.isEmpty()) { if (this.builders.claim.isEmpty()) {
properties.addBlock(`claim: ${this.generator.helper('noop')},`); properties.addBlock(`claim: @noop,`);
} else { } else {
properties.addBlock(deindent` properties.addBlock(deindent`
claim: function ( nodes ) { claim: function ( nodes ) {
@ -265,7 +265,7 @@ export default class Block {
} }
if (this.builders.mount.isEmpty()) { if (this.builders.mount.isEmpty()) {
properties.addBlock(`mount: ${this.generator.helper('noop')},`); properties.addBlock(`mount: @noop,`);
} else { } else {
properties.addBlock(deindent` properties.addBlock(deindent`
mount: function ( ${this.target}, anchor ) { mount: function ( ${this.target}, anchor ) {
@ -276,7 +276,7 @@ export default class Block {
if (this.hasUpdateMethod) { if (this.hasUpdateMethod) {
if (this.builders.update.isEmpty()) { if (this.builders.update.isEmpty()) {
properties.addBlock(`update: ${this.generator.helper('noop')},`); properties.addBlock(`update: @noop,`);
} else { } else {
properties.addBlock(deindent` properties.addBlock(deindent`
update: function ( changed, ${this.params.join(', ')} ) { update: function ( changed, ${this.params.join(', ')} ) {
@ -331,7 +331,7 @@ export default class Block {
} }
if (this.builders.unmount.isEmpty()) { if (this.builders.unmount.isEmpty()) {
properties.addBlock(`unmount: ${this.generator.helper('noop')},`); properties.addBlock(`unmount: @noop,`);
} else { } else {
properties.addBlock(deindent` properties.addBlock(deindent`
unmount: function () { unmount: function () {
@ -341,7 +341,7 @@ export default class Block {
} }
if (this.builders.destroy.isEmpty()) { if (this.builders.destroy.isEmpty()) {
properties.addBlock(`destroy: ${this.generator.helper('noop')}`); properties.addBlock(`destroy: @noop`);
} else { } else {
properties.addBlock(deindent` properties.addBlock(deindent`
destroy: function () { destroy: function () {

46
src/generators/dom/index.ts
Unescape View File

@ -12,6 +12,8 @@ import preprocess from './preprocess';
import Block from './Block'; import Block from './Block';
import { Parsed, CompileOptions, Node } from '../../interfaces'; import { Parsed, CompileOptions, Node } from '../../interfaces';
const helperPattern = new RegExp(`@(${Object.keys(shared).join('|')})\\b`, 'g');
export class DomGenerator extends Generator { export class DomGenerator extends Generator {
blocks: Block[]; blocks: Block[];
uses: Set<string>; uses: Set<string>;
@ -83,7 +85,6 @@ export default function dom(
if (computations.length) { if (computations.length) {
const builder = new CodeBuilder(); const builder = new CodeBuilder();
const differs = generator.helper('differs');
computations.forEach(({ key, deps }) => { computations.forEach(({ key, deps }) => {
if (generator.readonly.has(key)) { if (generator.readonly.has(key)) {
@ -98,7 +99,7 @@ export default function dom(
const condition = `isInitial || ${deps const condition = `isInitial || ${deps
.map( .map(
dep => dep =>
`( '${dep}' in newState && ${differs}( state.${dep}, oldState.${dep} ) )` `( '${dep}' in newState && @differs( state.${dep}, oldState.${dep} ) )`
) )
.join(' || ')}`; .join(' || ')}`;
const statement = `state.${key} = newState.${key} = ${generator.alias( const statement = `state.${key} = newState.${key} = ${generator.alias(
@ -131,18 +132,14 @@ export default function dom(
`} `}
var oldState = this._state; var oldState = this._state;
this._state = ${generator.helper('assign')}( {}, oldState, newState ); this._state = @assign( {}, oldState, newState );
${computations.length && ${computations.length &&
`${generator.alias( `${generator.alias(
'recompute' 'recompute'
)}( this._state, newState, oldState, false )`} )}( this._state, newState, oldState, false )`}
${generator.helper( @dispatchObservers( this, this._observers.pre, newState, oldState );
'dispatchObservers'
)}( this, this._observers.pre, newState, oldState );
${block.hasUpdateMethod && `this._fragment.update( newState, this._state );`} ${block.hasUpdateMethod && `this._fragment.update( newState, this._state );`}
${generator.helper( @dispatchObservers( this, this._observers.post, newState, oldState );
'dispatchObservers'
)}( this, this._observers.post, newState, oldState );
${generator.hasComplexBindings && ${generator.hasComplexBindings &&
`while ( this._bindings.length ) this._bindings.pop()();`} `while ( this._bindings.length ) this._bindings.pop()();`}
${(generator.hasComponents || generator.hasIntroTransitions) && ${(generator.hasComponents || generator.hasIntroTransitions) &&
@ -158,10 +155,10 @@ export default function dom(
if (generator.css && options.css !== false) { if (generator.css && options.css !== false) {
builders.main.addBlock(deindent` builders.main.addBlock(deindent`
function ${generator.alias('add_css')} () { function ${generator.alias('add_css')} () {
var style = ${generator.helper('createElement')}( 'style' ); var style = @createElement( 'style' );
style.id = ${JSON.stringify(generator.cssId + '-style')}; style.id = ${JSON.stringify(generator.cssId + '-style')};
style.textContent = ${JSON.stringify(generator.css)}; style.textContent = ${JSON.stringify(generator.css)};
${generator.helper('appendNode')}( style, document.head ); @appendNode( style, document.head );
} }
`); `);
} }
@ -180,7 +177,7 @@ export default function dom(
? `, ${generator.alias('template')}.methods` ? `, ${generator.alias('template')}.methods`
: ''); : '');
const proto = sharedPath const proto = sharedPath
? `${generator.helper('proto')} ` ? `@proto `
: deindent` : deindent`
{ {
${['get', 'fire', 'observe', 'on', 'set', '_flush'] ${['get', 'fire', 'observe', 'on', 'set', '_flush']
@ -196,7 +193,7 @@ export default function dom(
`if ( !options.target && !options._root ) throw new Error( "'target' is a required option" );`} `if ( !options.target && !options._root ) throw new Error( "'target' is a required option" );`}
${generator.usesRefs && `this.refs = {};`} ${generator.usesRefs && `this.refs = {};`}
this._state = ${templateProperties.data this._state = ${templateProperties.data
? `${generator.helper('assign')}( ${generator.alias( ? `@assign( ${generator.alias(
'template' 'template'
)}.data(), options.data )` )}.data(), options.data )`
: `options.data || {}`}; : `options.data || {}`};
@ -242,9 +239,9 @@ export default function dom(
if ( options.target ) { if ( options.target ) {
${generator.hydratable ? ${generator.hydratable ?
deindent` deindent`
var nodes = ${generator.helper('children')}( options.target ); var nodes = @children( options.target );
options.hydrate ? this._fragment.claim( nodes ) : this._fragment.create(); options.hydrate ? this._fragment.claim( nodes ) : this._fragment.create();
nodes.forEach( ${generator.helper('detachNode')} ); nodes.forEach( @detachNode );
` : ` :
deindent` deindent`
this._fragment.create(); this._fragment.create();
@ -269,7 +266,7 @@ export default function dom(
`} `}
} }
${generator.helper('assign')}( ${prototypeBase}, ${proto}); @assign( ${prototypeBase}, ${proto});
${name}.prototype._set = function _set ( newState ) { ${name}.prototype._set = function _set ( newState ) {
${builders._set} ${builders._set}
@ -289,6 +286,9 @@ export default function dom(
}; };
`); `);
let result = builders.main.toString()
.replace(helperPattern, (match: string, name: string) => generator.helper(name));
if (sharedPath) { if (sharedPath) {
if (format !== 'es') { if (format !== 'es') {
throw new Error( throw new Error(
@ -302,9 +302,7 @@ export default function dom(
: name; : name;
}); });
builders.main.addLineAtStart( result = `import { ${names.join(', ')} } from ${JSON.stringify(sharedPath)};\n\n` + result;
`import { ${names.join(', ')} } from ${JSON.stringify(sharedPath)};`
);
} else { } else {
generator.uses.forEach(key => { generator.uses.forEach(key => {
const str = shared[key]; const str = shared[key];
@ -343,22 +341,20 @@ export default function dom(
// special case // special case
const global = `_svelteTransitionManager`; const global = `_svelteTransitionManager`;
builders.main.addBlock( result += `\n\nvar ${generator.alias(
`var ${generator.alias(
'transitionManager' 'transitionManager'
)} = window.${global} || ( window.${global} = ${code});` )} = window.${global} || ( window.${global} = ${code});`;
);
} else { } else {
const alias = generator.alias(expression.id.name); const alias = generator.alias(expression.id.name);
if (alias !== expression.id.name) if (alias !== expression.id.name)
code.overwrite(expression.id.start, expression.id.end, alias); code.overwrite(expression.id.start, expression.id.end, alias);
builders.main.addBlock(code.toString()); result += `\n\n${code}`;
} }
}); });
} }
return generator.generate(builders.main.toString(), options, { return generator.generate(result, options, {
name, name,
format, format,
}); });

4
src/generators/dom/visitors/Component/Binding.ts
Unescape View File

@ -73,9 +73,7 @@ export default function visitBinding(
${updating} = true; ${updating} = true;
${setter} ${setter}
${updating} = false; ${updating} = false;
}, { init: ${generator.helper( }, { init: @differs( ${local.name}.get( '${attribute.name}' ), ${snippet} ) });
'differs'
)}( ${local.name}.get( '${attribute.name}' ), ${snippet} ) });
}); });
`); `);

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

@ -48,8 +48,8 @@ export default function visitEachBlock(
if (node.needsAnchor) { if (node.needsAnchor) {
block.addElement( block.addElement(
anchor, anchor,
`${generator.helper('createComment')}()`, `@createComment()`,
`${generator.helper('createComment')}()`, `@createComment()`,
state.parentNode, state.parentNode,
true true
); );
@ -162,8 +162,8 @@ function keyed(
node._block.first = node._block.getUniqueName('first'); node._block.first = node._block.getUniqueName('first');
node._block.addElement( node._block.addElement(
node._block.first, node._block.first,
`${generator.helper('createComment')}()`, `@createComment()`,
`${generator.helper('createComment')}()`, `@createComment()`,
null, null,
true true
); );
@ -479,6 +479,6 @@ function unkeyed(
`); `);
block.builders.destroy.addBlock( block.builders.destroy.addBlock(
`${generator.helper('destroyEach')}( ${iterations}, false, 0 );` `@destroyEach( ${iterations}, false, 0 );`
); );
} }

16
src/generators/dom/visitors/Element/Attribute.ts
Unescape View File

@ -36,8 +36,8 @@ export default function visitAttribute(
// namespaced attributes but I'm not sure that's applicable in // namespaced attributes but I'm not sure that's applicable in
// HTML5? // HTML5?
const method = name.slice(0, 6) === 'xlink:' const method = name.slice(0, 6) === 'xlink:'
? 'setXlinkAttribute' ? '@setXlinkAttribute'
: 'setAttribute'; : '@setAttribute';
const isDynamic = const isDynamic =
(attribute.value !== true && attribute.value.length > 1) || (attribute.value !== true && attribute.value.length > 1) ||
@ -112,13 +112,9 @@ export default function visitAttribute(
updater = `${state.parentNode}.${propertyName} = ${last};`; updater = `${state.parentNode}.${propertyName} = ${last};`;
} else { } else {
block.builders.hydrate.addLine( block.builders.hydrate.addLine(
`${generator.helper( `${method}( ${state.parentNode}, '${name}', ${last} = ${value} );`
method
)}( ${state.parentNode}, '${name}', ${last} = ${value} );`
); );
updater = `${generator.helper( updater = `${method}( ${state.parentNode}, '${name}', ${last} );`;
method
)}( ${state.parentNode}, '${name}', ${last} );`;
} }
block.builders.update.addBlock(deindent` block.builders.update.addBlock(deindent`
@ -135,9 +131,7 @@ export default function visitAttribute(
const statement = propertyName const statement = propertyName
? `${state.parentNode}.${propertyName} = ${value};` ? `${state.parentNode}.${propertyName} = ${value};`
: `${generator.helper( : `${method}( ${state.parentNode}, '${name}', ${value} );`;
method
)}( ${state.parentNode}, '${name}', ${value} );`;
block.builders.hydrate.addLine(statement); block.builders.hydrate.addLine(statement);

31
src/generators/dom/visitors/Element/Binding.ts
Unescape View File

@ -152,11 +152,9 @@ export default function visitBinding(
} }
`); `);
block.builders.hydrate.addBlock(deindent` block.builders.hydrate.addBlock(
${generator.helper( `@addListener( ${state.parentNode}, '${eventName}', ${handler} );`
'addListener' );
)}( ${state.parentNode}, '${eventName}', ${handler} );
`);
if (node.name !== 'audio' && node.name !== 'video') if (node.name !== 'audio' && node.name !== 'video')
node.initialUpdate = updateElement; node.initialUpdate = updateElement;
@ -170,22 +168,15 @@ export default function visitBinding(
`); `);
} }
block.builders.destroy.addLine(deindent` block.builders.destroy.addLine(
${generator.helper( `@removeListener( ${state.parentNode}, '${eventName}', ${handler} );`);
'removeListener'
)}( ${state.parentNode}, '${eventName}', ${handler} );
`);
if (attribute.name === 'paused') { if (attribute.name === 'paused') {
block.builders.create.addLine( block.builders.create.addLine(
`${generator.helper( `@addListener( ${state.parentNode}, 'play', ${handler} );`
'addListener'
)}( ${state.parentNode}, 'play', ${handler} );`
); );
block.builders.destroy.addLine( block.builders.destroy.addLine(
`${generator.helper( `@removeListener( ${state.parentNode}, 'play', ${handler} );`
'removeListener'
)}( ${state.parentNode}, 'play', ${handler} );`
); );
} }
} }
@ -231,9 +222,7 @@ function getBindingValue(
// <input type='checkbox' bind:group='foo'> // <input type='checkbox' bind:group='foo'>
if (attribute.name === 'group') { if (attribute.name === 'group') {
if (type === 'checkbox') { if (type === 'checkbox') {
return `${generator.helper( return `@getBindingGroupValue( ${block.component}._bindingGroups[${bindingGroup}] )`;
'getBindingGroupValue'
)}( ${block.component}._bindingGroups[${bindingGroup}] )`;
} }
return `${state.parentNode}.__value`; return `${state.parentNode}.__value`;
@ -241,9 +230,7 @@ function getBindingValue(
// <input type='range|number' bind:value> // <input type='range|number' bind:value>
if (type === 'range' || type === 'number') { if (type === 'range' || type === 'number') {
return `${generator.helper( return `@toNumber( ${state.parentNode}.${attribute.name} )`;
'toNumber'
)}( ${state.parentNode}.${attribute.name} )`;
} }
// everything else // everything else

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

@ -56,22 +56,20 @@ export default function visitElement(
if (generator.hydratable) { if (generator.hydratable) {
block.builders.claim.addBlock(deindent` block.builders.claim.addBlock(deindent`
${name} = ${getClaimStatement(generator, childState.namespace, state.parentNodes, node)}; ${name} = ${getClaimStatement(generator, childState.namespace, state.parentNodes, node)};
var ${childState.parentNodes} = ${generator.helper('children')}( ${name} ); var ${childState.parentNodes} = @children( ${name} );
`); `);
} }
if (state.parentNode) { if (state.parentNode) {
block.builders.mount.addLine(`${block.generator.helper('appendNode')}( ${name}, ${state.parentNode} );`); block.builders.mount.addLine(`@appendNode( ${name}, ${state.parentNode} );`);
} else { } else {
block.builders.mount.addLine(`${block.generator.helper('insertNode')}( ${name}, ${block.target}, anchor );`); block.builders.mount.addLine(`@insertNode( ${name}, ${block.target}, anchor );`);
} }
// add CSS encapsulation attribute // add CSS encapsulation attribute
if (generator.cssId && (!generator.cascade || state.isTopLevel)) { if (generator.cssId && (!generator.cascade || state.isTopLevel)) {
block.builders.hydrate.addLine( block.builders.hydrate.addLine(
`${generator.helper( `@setAttribute( ${name}, '${generator.cssId}', '' );`
'setAttribute'
)}( ${name}, '${generator.cssId}', '' );`
); );
} }
@ -134,7 +132,7 @@ export default function visitElement(
// TODO we eventually need to consider what happens to elements // TODO we eventually need to consider what happens to elements
// that belong to the same outgroup as an outroing element... // that belong to the same outgroup as an outroing element...
block.builders.unmount.addLine( block.builders.unmount.addLine(
`${generator.helper('detachNode')}( ${name} );` `@detachNode( ${name} );`
); );
} }
@ -188,7 +186,7 @@ export default function visitElement(
} }
block.builders.claim.addLine( block.builders.claim.addLine(
`${childState.parentNodes}.forEach( ${generator.helper('detachNode')} );` `${childState.parentNodes}.forEach( @detachNode );`
); );
} }
@ -198,14 +196,14 @@ function getRenderStatement(
name: string name: string
) { ) {
if (namespace === 'http://www.w3.org/2000/svg') { if (namespace === 'http://www.w3.org/2000/svg') {
return `${generator.helper('createSvgElement')}( '${name}' )`; return `@createSvgElement( '${name}' )`;
} }
if (namespace) { if (namespace) {
return `document.createElementNS( '${namespace}', '${name}' )`; return `document.createElementNS( '${namespace}', '${name}' )`;
} }
return `${generator.helper('createElement')}( '${name}' )`; return `@createElement( '${name}' )`;
} }
function getClaimStatement( function getClaimStatement(
@ -221,7 +219,7 @@ function getClaimStatement(
const name = namespace ? node.name : node.name.toUpperCase(); const name = namespace ? node.name : node.name.toUpperCase();
return `${generator.helper('claimElement')}( ${nodes}, '${name}', ${attributes ? `{ ${attributes} }` : `{}`}, ${namespace === namespaces.svg ? true : false} )`; return `@claimElement( ${nodes}, '${name}', ${attributes ? `{ ${attributes} }` : `{}`}, ${namespace === namespaces.svg ? true : false} )`;
} }
function quoteProp(name: string) { function quoteProp(name: string) {

16
src/generators/dom/visitors/Element/EventHandler.ts
Unescape View File

@ -99,16 +99,12 @@ export default function visitEventHandler(
block.builders.init.addBlock(handler); block.builders.init.addBlock(handler);
} }
block.builders.hydrate.addLine(deindent` block.builders.hydrate.addLine(
${generator.helper( `@addListener( ${state.parentNode}, '${name}', ${handlerName} );`
'addListener' );
)}( ${state.parentNode}, '${name}', ${handlerName} );
`);
block.builders.destroy.addLine(deindent` block.builders.destroy.addLine(
${generator.helper( `@removeListener( ${state.parentNode}, '${name}', ${handlerName} );`
'removeListener' );
)}( ${state.parentNode}, '${name}', ${handlerName} );
`);
} }
} }

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

@ -12,8 +12,6 @@ export default function addTransitions(
intro, intro,
outro outro
) { ) {
const wrapTransition = generator.helper('wrapTransition');
if (intro === outro) { if (intro === outro) {
const name = block.getUniqueName(`${state.name}_transition`); const name = block.getUniqueName(`${state.name}_transition`);
const snippet = intro.expression const snippet = intro.expression
@ -26,7 +24,7 @@ export default function addTransitions(
block.builders.intro.addBlock(deindent` block.builders.intro.addBlock(deindent`
${block.component}._renderHooks.push( function () { ${block.component}._renderHooks.push( function () {
if ( !${name} ) ${name} = ${wrapTransition}( ${state.name}, ${fn}, ${snippet}, true, null ); if ( !${name} ) ${name} = @wrapTransition( ${state.name}, ${fn}, ${snippet}, true, null );
${name}.run( true, function () { ${name}.run( true, function () {
${block.component}.fire( 'intro.end', { node: ${state.name} }); ${block.component}.fire( 'intro.end', { node: ${state.name} });
}); });
@ -61,7 +59,7 @@ export default function addTransitions(
block.builders.intro.addBlock(deindent` block.builders.intro.addBlock(deindent`
${block.component}._renderHooks.push( function () { ${block.component}._renderHooks.push( function () {
${introName} = ${wrapTransition}( ${state.name}, ${fn}, ${snippet}, true, null ); ${introName} = @wrapTransition( ${state.name}, ${fn}, ${snippet}, true, null );
${introName}.run( true, function () { ${introName}.run( true, function () {
${block.component}.fire( 'intro.end', { node: ${state.name} }); ${block.component}.fire( 'intro.end', { node: ${state.name} });
}); });
@ -80,7 +78,7 @@ 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}( ${state.name}, ${fn}, ${snippet}, false, null ); ${outroName} = @wrapTransition( ${state.name}, ${fn}, ${snippet}, false, null );
${outroName}.run( false, function () { ${outroName}.run( false, function () {
${block.component}.fire( 'outro.end', { node: ${state.name} }); ${block.component}.fire( 'outro.end', { node: ${state.name} });
if ( --${block.alias('outros')} === 0 ) ${block.alias('outrocallback')}(); if ( --${block.alias('outros')} === 0 ) ${block.alias('outrocallback')}();

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

@ -116,8 +116,8 @@ export default function visitIfBlock(
if (node.needsAnchor) { if (node.needsAnchor) {
block.addElement( block.addElement(
anchor, anchor,
`${generator.helper('createComment')}()`, `@createComment()`,
`${generator.helper('createComment')}()`, `@createComment()`,
state.parentNode, state.parentNode,
true true
); );

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

@ -18,8 +18,8 @@ export default function visitMustacheTag(
block.addVariable(value); block.addVariable(value);
block.addElement( block.addElement(
name, name,
`${generator.helper('createText')}( ${value} = ${snippet} )`, `@createText( ${value} = ${snippet} )`,
generator.hydratable ? `${generator.helper('claimText')}( ${state.parentNodes}, ${value} = ${snippet} )` : '', generator.hydratable ? `@claimText( ${state.parentNodes}, ${value} = ${snippet} )` : '',
state.parentNode, state.parentNode,
true true
); );

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

@ -23,15 +23,15 @@ export default function visitRawMustacheTag(
// exists for `Element`s. // exists for `Element`s.
block.addElement( block.addElement(
before, before,
`${generator.helper('createElement')}( 'noscript' )`, `@createElement( 'noscript' )`,
`${generator.helper('createElement')}( 'noscript' )`, `@createElement( 'noscript' )`,
state.parentNode, state.parentNode,
true true
); );
block.addElement( block.addElement(
after, after,
`${generator.helper('createElement')}( 'noscript' )`, `@createElement( 'noscript' )`,
`${generator.helper('createElement')}( 'noscript' )`, `@createElement( 'noscript' )`,
state.parentNode, state.parentNode,
true true
); );
@ -39,9 +39,7 @@ export default function visitRawMustacheTag(
const isToplevel = !state.parentNode; const isToplevel = !state.parentNode;
const mountStatement = `${before}.insertAdjacentHTML( 'afterend', ${value} = ${snippet} );`; const mountStatement = `${before}.insertAdjacentHTML( 'afterend', ${value} = ${snippet} );`;
const detachStatement = `${generator.helper( const detachStatement = `@detachBetween( ${before}, ${after} );`;
'detachBetween'
)}( ${before}, ${after} );`;
block.builders.mount.addLine(mountStatement); block.builders.mount.addLine(mountStatement);

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

@ -12,8 +12,8 @@ export default function visitText(
if (!node._state.shouldCreate) return; if (!node._state.shouldCreate) return;
block.addElement( block.addElement(
node._state.name, node._state.name,
`${generator.helper('createText')}( ${JSON.stringify(node.data)} )`, `@createText( ${JSON.stringify(node.data)} )`,
generator.hydratable ? `${generator.helper('claimText')}( ${state.parentNodes}, ${JSON.stringify(node.data)} )` : '', generator.hydratable ? `@claimText( ${state.parentNodes}, ${JSON.stringify(node.data)} )` : '',
state.parentNode, state.parentNode,
node.usedAsAnchor node.usedAsAnchor
); );

3
src/shared/transitions.js
Unescape View File

@ -1,4 +1,5 @@
import { assign, noop } from './utils.js'; import { assign, noop } from './utils.js';
import { createElement } from './dom.js';
export function linear(t) { export function linear(t) {
return t; return t;
@ -45,7 +46,7 @@ export function wrapTransition(node, fn, params, intro, outgroup) {
// TODO share <style> tag between all transitions? // TODO share <style> tag between all transitions?
if (obj.css) { if (obj.css) {
var style = document.createElement('style'); var style = createElement('style');
} }
if (intro) { if (intro) {

Write Preview
Loading…
Cancel
Save