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

Merge pull request #769 from sveltejs/gh-768

Browse Source 
skip updates where possible
pull/770/head
Rich Harris 8 years ago committed by GitHub
parent 1d77a45fdc 3daa7aa6b3
commit 276b7998f9
55 changed files with 855 additions and 532 deletions
Show Stats Download Patch File Download Diff File

11
src/generators/Generator.ts
Unescape View File

@ -125,7 +125,8 @@ export default class Generator {
) { ) {
this.addSourcemapLocations(expression); this.addSourcemapLocations(expression);
const usedContexts: string[] = []; const usedContexts = new Set();
const usedIndexes = new Set();
const { code, helpers } = this; const { code, helpers } = this;
const { contexts, indexes } = block; const { contexts, indexes } = block;
@ -168,12 +169,13 @@ export default class Generator {
); );
} }
if (!~usedContexts.indexOf(name)) usedContexts.push(name); usedContexts.add(name);
} else if (helpers.has(name)) { } else if (helpers.has(name)) {
code.prependRight(node.start, `${self.alias('template')}.helpers.`); code.prependRight(node.start, `${self.alias('template')}.helpers.`);
} else if (indexes.has(name)) { } else if (indexes.has(name)) {
const context = indexes.get(name); const context = indexes.get(name);
if (!~usedContexts.indexOf(context)) usedContexts.push(context); usedContexts.add(context); // TODO is this right?
usedIndexes.add(name);
} else { } else {
// handle shorthand properties // handle shorthand properties
if (parent && parent.type === 'Property' && parent.shorthand) { if (parent && parent.type === 'Property' && parent.shorthand) {
@ -193,7 +195,7 @@ export default class Generator {
code.prependRight(node.start, `state.`); code.prependRight(node.start, `state.`);
} }
if (!~usedContexts.indexOf('state')) usedContexts.push('state'); usedContexts.add('state');
} }
this.skip(); this.skip();
@ -221,6 +223,7 @@ export default class Generator {
return { return {
dependencies: Array.from(dependencies), dependencies: Array.from(dependencies),
contexts: usedContexts, contexts: usedContexts,
indexes: usedIndexes,
snippet: `[✂${expression.start}-${expression.end}✂]`, snippet: `[✂${expression.start}-${expression.end}✂]`,
}; };
} }

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

@ -12,6 +12,7 @@ export interface BlockOptions {
key?: string; key?: string;
contexts?: Map<string, string>; contexts?: Map<string, string>;
indexes?: Map<string, string>; indexes?: Map<string, string>;
changeableIndexes?: Map<string, boolean>;
contextDependencies?: Map<string, string[]>; contextDependencies?: Map<string, string[]>;
params?: string[]; params?: string[];
indexNames?: Map<string, string>; indexNames?: Map<string, string>;
@ -32,6 +33,7 @@ export default class Block {
contexts: Map<string, string>; contexts: Map<string, string>;
indexes: Map<string, string>; indexes: Map<string, string>;
changeableIndexes: Map<string, boolean>;
contextDependencies: Map<string, string[]>; contextDependencies: Map<string, string[]>;
dependencies: Set<string>; dependencies: Set<string>;
params: string[]; params: string[];
@ -77,6 +79,7 @@ export default class Block {
this.contexts = options.contexts; this.contexts = options.contexts;
this.indexes = options.indexes; this.indexes = options.indexes;
this.changeableIndexes = options.changeableIndexes;
this.contextDependencies = options.contextDependencies; this.contextDependencies = options.contextDependencies;
this.dependencies = new Set(); this.dependencies = new Set();
@ -121,8 +124,7 @@ export default class Block {
name: string, name: string,
renderStatement: string, renderStatement: string,
claimStatement: string, claimStatement: string,
parentNode: string, parentNode: string
needsIdentifier = false
) { ) {
const isToplevel = !parentNode; const isToplevel = !parentNode;
@ -195,7 +197,7 @@ export default class Block {
let outroing; let outroing;
const hasOutros = !this.builders.outro.isEmpty(); const hasOutros = !this.builders.outro.isEmpty();
if (hasOutros) { if (hasOutros) {
outroing = this.getUniqueName('outroing'); outroing = this.alias('outroing');
this.addVariable(outroing); this.addVariable(outroing);
} }

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

@ -74,10 +74,9 @@ export default function dom(
}); });
const builder = new CodeBuilder(); const builder = new CodeBuilder();
if (computations.length) {
const computationBuilder = new CodeBuilder(); const computationBuilder = new CodeBuilder();
if (computations.length) {
computations.forEach(({ key, deps }) => { computations.forEach(({ key, deps }) => {
if (generator.readonly.has(key)) { if (generator.readonly.has(key)) {
// <:Window> bindings // <:Window> bindings
@ -88,47 +87,15 @@ export default function dom(
generator.readonly.add(key); generator.readonly.add(key);
const condition = `isInitial || ${deps const condition = `isInitial || ${deps.map(dep => `changed.${dep}`).join(' || ')}`;
.map(
dep => const statement = `if ( @differs( ( state.${key} = @template.computed.${key}( ${deps
`( '${dep}' in newState && @differs( state.${dep}, oldState.${dep} ) )`
)
.join(' || ')}`;
const statement = `state.${key} = newState.${key} = @template.computed.${key}( ${deps
.map(dep => `state.${dep}`) .map(dep => `state.${dep}`)
.join(', ')} );`; .join(', ')} ) ), oldState.${key} ) ) changed.${key} = true;`;
computationBuilder.addConditionalLine(condition, statement); computationBuilder.addConditional(condition, statement);
}); });
builder.addBlock(deindent`
function @recompute ( state, newState, oldState, isInitial ) {
${computationBuilder}
} }
`);
}
const _set = deindent`
${options.dev &&
deindent`
if ( typeof newState !== 'object' ) {
throw new Error( 'Component .set was called without an object of data key-values to update.' );
}
${Array.from(generator.readonly).map(
prop =>
`if ( '${prop}' in newState && !this._updatingReadonlyProperty ) throw new Error( "Cannot set read-only property '${prop}'" );`
)}
`}
var oldState = this._state;
this._state = @assign( {}, oldState, newState );
${computations.length &&
`@recompute( this._state, newState, oldState, false )`}
@dispatchObservers( this, this._observers.pre, newState, oldState );
${block.hasUpdateMethod && `this._fragment.update( newState, this._state );`}
@dispatchObservers( this, this._observers.post, newState, oldState );
`;
if (hasJs) { if (hasJs) {
builder.addBlock(`[✂${parsed.js.content.start}-${parsed.js.content.end}✂]`); builder.addBlock(`[✂${parsed.js.content.start}-${parsed.js.content.end}✂]`);
@ -174,7 +141,7 @@ export default function dom(
? `@proto ` ? `@proto `
: deindent` : deindent`
{ {
${['destroy', 'get', 'fire', 'observe', 'on', 'set', 'teardown'] ${['destroy', 'get', 'fire', 'observe', 'on', 'set', '_set', 'teardown']
.map(n => `${n}: @${n === 'teardown' ? 'destroy' : n}`) .map(n => `${n}: @${n === 'teardown' ? 'destroy' : n}`)
.join(',\n')} .join(',\n')}
}`; }`;
@ -190,7 +157,7 @@ export default function dom(
? `@assign( @template.data(), options.data )` ? `@assign( @template.data(), options.data )`
: `options.data || {}`}; : `options.data || {}`};
${generator.metaBindings} ${generator.metaBindings}
${computations.length && `@recompute( this._state, this._state, {}, true );`} ${computations.length && `this._recompute( {}, this._state, {}, true );`}
${options.dev && ${options.dev &&
Array.from(generator.expectedProperties).map( Array.from(generator.expectedProperties).map(
prop => prop =>
@ -259,9 +226,20 @@ export default function dom(
@assign( ${prototypeBase}, ${proto}); @assign( ${prototypeBase}, ${proto});
${name}.prototype._set = function _set ( newState ) { ${options.dev && deindent`
${_set} ${name}.prototype._checkReadOnly = function _checkReadOnly ( newState ) {
${Array.from(generator.readonly).map(
prop =>
`if ( '${prop}' in newState && !this._updatingReadonlyProperty ) throw new Error( "Cannot set read-only property '${prop}'" );`
)}
}; };
`}
${computations.length ? deindent`
${name}.prototype._recompute = function _recompute ( changed, state, oldState, isInitial ) {
${computationBuilder}
}
` : (!sharedPath && `${name}.prototype._recompute = @noop;`)}
${templateProperties.setup && `@template.setup( ${name} );`} ${templateProperties.setup && `@template.setup( ${name} );`}
`); `);

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

@ -189,7 +189,10 @@ const preprocessors = {
contexts.set(node.context, context); contexts.set(node.context, context);
const indexes = new Map(block.indexes); const indexes = new Map(block.indexes);
if (node.index) indexes.set(indexName, node.context); if (node.index) indexes.set(node.index, node.context);
const changeableIndexes = new Map(block.changeableIndexes);
if (node.index) changeableIndexes.set(node.index, node.key);
const contextDependencies = new Map(block.contextDependencies); const contextDependencies = new Map(block.contextDependencies);
contextDependencies.set(node.context, dependencies); contextDependencies.set(node.context, dependencies);
@ -203,6 +206,7 @@ const preprocessors = {
contextDependencies, contextDependencies,
contexts, contexts,
indexes, indexes,
changeableIndexes,
listName, listName,
indexName, indexName,
@ -274,6 +278,11 @@ const preprocessors = {
} }
} }
}); });
} else if (attribute.type === 'EventHandler' && attribute.expression) {
attribute.expression.arguments.forEach((arg: Node) => {
const dependencies = block.findDependencies(arg);
block.addDependencies(dependencies);
});
} else if (attribute.type === 'Binding') { } else if (attribute.type === 'Binding') {
const dependencies = block.findDependencies(attribute.value); const dependencies = block.findDependencies(attribute.value);
block.addDependencies(dependencies); block.addDependencies(dependencies);
@ -444,6 +453,7 @@ export default function preprocess(
contexts: new Map(), contexts: new Map(),
indexes: new Map(), indexes: new Map(),
changeableIndexes: new Map(),
contextDependencies: new Map(), contextDependencies: new Map(),
params: ['state'], params: ['state'],
@ -462,7 +472,7 @@ export default function preprocess(
generator.blocks.push(block); generator.blocks.push(block);
preprocessChildren(generator, block, state, node, false, [], true, null); preprocessChildren(generator, block, state, node, false, [], true, null);
block.hasUpdateMethod = block.dependencies.size > 0; block.hasUpdateMethod = true;
return { block, state }; return { block, state };
} }

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

@ -89,7 +89,7 @@ export default function visitBinding(
local.update.addBlock(deindent` local.update.addBlock(deindent`
if ( !${updating} && ${dependencies if ( !${updating} && ${dependencies
.map(dependency => `'${dependency}' in changed`) .map(dependency => `changed.${dependency}`)
.join(' || ')} ) { .join(' || ')} ) {
${updating} = true; ${updating} = true;
${local.name}._set({ ${attribute.name}: ${snippet} }); ${local.name}._set({ ${attribute.name}: ${snippet} });

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

@ -195,10 +195,8 @@ export default function visitComponent(
if (attribute.dependencies.length) { if (attribute.dependencies.length) {
return deindent` return deindent`
if ( ${attribute.dependencies if ( ${attribute.dependencies
.map(dependency => `'${dependency}' in changed`) .map(dependency => `changed.${dependency}`)
.join( .join(' || ')} ) ${name}_changes.${attribute.name} = ${attribute.value};
'||'
)} ) ${name}_changes.${attribute.name} = ${attribute.value};
`; `;
} }
@ -212,7 +210,7 @@ export default function visitComponent(
${updates.join('\n')} ${updates.join('\n')}
if ( Object.keys( ${name}_changes ).length ) ${name}._set( ${name}_changes ); ${name}._set( ${name}_changes );
`); `);
} }

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

@ -57,8 +57,7 @@ export default function visitEachBlock(
anchor, anchor,
`@createComment()`, `@createComment()`,
`@createComment()`, `@createComment()`,
state.parentNode, state.parentNode
true
); );
} else if (node.next) { } else if (node.next) {
node.next.usedAsAnchor = true; node.next.usedAsAnchor = true;
@ -172,8 +171,7 @@ function keyed(
node._block.first, node._block.first,
`@createComment()`, `@createComment()`,
`@createComment()`, `@createComment()`,
null, null
true
); );
} }
@ -411,7 +409,7 @@ function unkeyed(
// TODO do this for keyed blocks as well // TODO do this for keyed blocks as well
const condition = Array.from(allDependencies) const condition = Array.from(allDependencies)
.map(dependency => `'${dependency}' in changed`) .map(dependency => `changed.${dependency}`)
.join(' || '); .join(' || ');
const parentNode = state.parentNode || `${anchor}.parentNode`; const parentNode = state.parentNode || `${anchor}.parentNode`;

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

@ -47,10 +47,28 @@ export default function visitAttribute(
if (isDynamic) { if (isDynamic) {
let value; let value;
const allDependencies = new Set();
let shouldCache;
let hasChangeableIndex;
// TODO some of this code is repeated in Tag.ts — would be good to
// DRY it out if that's possible without introducing crazy indirection
if (attribute.value.length === 1) { if (attribute.value.length === 1) {
// single {{tag}} — may be a non-string // single {{tag}} — may be a non-string
const { snippet } = block.contextualise(attribute.value[0].expression); const { expression } = attribute.value[0];
const { snippet, dependencies, indexes } = block.contextualise(expression);
value = snippet; value = snippet;
dependencies.forEach(d => {
allDependencies.add(d);
});
hasChangeableIndex = Array.from(indexes).some(index => block.changeableIndexes.get(index));
shouldCache = (
expression.type !== 'Identifier' ||
block.contexts.has(expression.name) ||
hasChangeableIndex
);
} else { } else {
// '{{foo}} {{bar}}' — treat as string concatenation // '{{foo}} {{bar}}' — treat as string concatenation
value = value =
@ -60,22 +78,35 @@ export default function visitAttribute(
if (chunk.type === 'Text') { if (chunk.type === 'Text') {
return stringify(chunk.data); return stringify(chunk.data);
} else { } else {
const { snippet } = block.contextualise(chunk.expression); const { snippet, dependencies, indexes } = block.contextualise(chunk.expression);
if (Array.from(indexes).some(index => block.changeableIndexes.get(index))) {
hasChangeableIndex = true;
}
dependencies.forEach(d => {
allDependencies.add(d);
});
return `( ${snippet} )`; return `( ${snippet} )`;
} }
}) })
.join(' + '); .join(' + ');
shouldCache = true;
} }
const last = block.getUniqueName( const isSelectValueAttribute =
name === 'value' && state.parentNodeName === 'select';
const last = (shouldCache || isSelectValueAttribute) && block.getUniqueName(
`${state.parentNode}_${name.replace(/[^a-zA-Z_$]/g, '_')}_value` `${state.parentNode}_${name.replace(/[^a-zA-Z_$]/g, '_')}_value`
); );
block.addVariable(last);
const isSelectValueAttribute = if (shouldCache || isSelectValueAttribute) block.addVariable(last);
name === 'value' && state.parentNodeName === 'select';
let updater; let updater;
const init = shouldCache ? `${last} = ${value}` : value;
if (isSelectValueAttribute) { if (isSelectValueAttribute) {
// annoying special case // annoying special case
@ -104,27 +135,42 @@ export default function visitAttribute(
} }
`; `;
block.builders.hydrate.addLine(deindent` block.builders.hydrate.addBlock(deindent`
${last} = ${value} ${last} = ${value};
${updater} ${updater}
`); `);
block.builders.update.addLine(`${last} = ${value};`);
} else if (propertyName) { } else if (propertyName) {
block.builders.hydrate.addLine( block.builders.hydrate.addLine(
`${state.parentNode}.${propertyName} = ${last} = ${value};` `${state.parentNode}.${propertyName} = ${init};`
); );
updater = `${state.parentNode}.${propertyName} = ${last};`; updater = `${state.parentNode}.${propertyName} = ${shouldCache || isSelectValueAttribute ? last : value};`;
} else { } else {
block.builders.hydrate.addLine( block.builders.hydrate.addLine(
`${method}( ${state.parentNode}, '${name}', ${last} = ${value} );` `${method}( ${state.parentNode}, '${name}', ${init} );`
); );
updater = `${method}( ${state.parentNode}, '${name}', ${last} );`; updater = `${method}( ${state.parentNode}, '${name}', ${shouldCache || isSelectValueAttribute ? last : value} );`;
} }
block.builders.update.addBlock(deindent` if (allDependencies.size || hasChangeableIndex || isSelectValueAttribute) {
if ( ${last} !== ( ${last} = ${value} ) ) { const dependencies = Array.from(allDependencies);
${updater} const changedCheck = (
( block.hasOutroMethod ? `#outroing || ` : '' ) +
dependencies.map(dependency => `changed.${dependency}`).join(' || ')
);
const updateCachedValue = `${last} !== ( ${last} = ${value} )`;
const condition = shouldCache ?
( dependencies.length ? `( ${changedCheck} ) && ${updateCachedValue}` : updateCachedValue ) :
changedCheck;
block.builders.update.addConditional(
condition,
updater
);
} }
`);
} else { } else {
const value = attribute.value === true const value = attribute.value === true
? 'true' ? 'true'

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

@ -38,8 +38,8 @@ export default function visitWindow(
let usesState = false; let usesState = false;
attribute.expression.arguments.forEach((arg: Node) => { attribute.expression.arguments.forEach((arg: Node) => {
const { contexts } = block.contextualise(arg, null, true); const { dependencies } = block.contextualise(arg, null, true);
if (contexts.length) usesState = true; if (dependencies.length) usesState = true;
}); });
const flattened = flattenReference(attribute.expression.callee); const flattened = flattenReference(attribute.expression.callee);

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

@ -119,8 +119,7 @@ export default function visitIfBlock(
anchor, anchor,
`@createComment()`, `@createComment()`,
`@createComment()`, `@createComment()`,
state.parentNode, state.parentNode
true
); );
} else if (node.next) { } else if (node.next) {
node.next.usedAsAnchor = true; node.next.usedAsAnchor = true;

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

@ -1,4 +1,5 @@
import deindent from '../../../utils/deindent'; import deindent from '../../../utils/deindent';
import visitTag from './shared/Tag';
import { DomGenerator } from '../index'; import { DomGenerator } from '../index';
import Block from '../Block'; import Block from '../Block';
import { Node } from '../../../interfaces'; import { Node } from '../../../interfaces';
@ -10,25 +11,21 @@ export default function visitMustacheTag(
state: State, state: State,
node: Node node: Node
) { ) {
const name = node._state.name; const { name } = node._state;
const value = block.getUniqueName(`${name}_value`);
const { snippet } = block.contextualise(node.expression); const { init } = visitTag(
generator,
block,
state,
node,
name,
value => `${name}.data = ${value};`
);
block.addVariable(value);
block.addElement( block.addElement(
name, name,
`@createText( ${value} = ${snippet} )`, `@createText( ${init} )`,
generator.hydratable `@claimText( ${state.parentNodes}, ${init} )`,
? `@claimText( ${state.parentNodes}, ${value} = ${snippet} )` state.parentNode
: '',
state.parentNode,
true
); );
block.builders.update.addBlock(deindent`
if ( ${value} !== ( ${value} = ${snippet} ) ) {
${name}.data = ${value};
}
`);
} }

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

@ -1,4 +1,6 @@
import deindent from '../../../utils/deindent'; import deindent from '../../../utils/deindent';
import addUpdateBlock from './shared/addUpdateBlock';
import visitTag from './shared/Tag';
import { DomGenerator } from '../index'; import { DomGenerator } from '../index';
import Block from '../Block'; import Block from '../Block';
import { Node } from '../../../interfaces'; import { Node } from '../../../interfaces';
@ -12,12 +14,19 @@ export default function visitRawMustacheTag(
) { ) {
const name = node._state.basename; const name = node._state.basename;
const before = node._state.name; const before = node._state.name;
const value = block.getUniqueName(`${name}_value`);
const after = block.getUniqueName(`${name}_after`); const after = block.getUniqueName(`${name}_after`);
const { snippet } = block.contextualise(node.expression); const { init } = visitTag(
generator,
block.addVariable(value); block,
state,
node,
name,
value => deindent`
@detachBetween( ${before}, ${after} );
${before}.insertAdjacentHTML( 'afterend', ${value} );
`
);
// we would have used comments here, but the `insertAdjacentHTML` api only // we would have used comments here, but the `insertAdjacentHTML` api only
// exists for `Element`s. // exists for `Element`s.
@ -25,30 +34,16 @@ export default function visitRawMustacheTag(
before, before,
`@createElement( 'noscript' )`, `@createElement( 'noscript' )`,
`@createElement( 'noscript' )`, `@createElement( 'noscript' )`,
state.parentNode, state.parentNode
true
); );
block.addElement( block.addElement(
after, after,
`@createElement( 'noscript' )`, `@createElement( 'noscript' )`,
`@createElement( 'noscript' )`, `@createElement( 'noscript' )`,
state.parentNode, state.parentNode
true
); );
const isToplevel = !state.parentNode; block.builders.mount.addLine(`${before}.insertAdjacentHTML( 'afterend', ${init} );`);
block.builders.detachRaw.addBlock(`@detachBetween( ${before}, ${after} );`);
const mountStatement = `${before}.insertAdjacentHTML( 'afterend', ${value} = ${snippet} );`;
const detachStatement = `@detachBetween( ${before}, ${after} );`;
block.builders.mount.addLine(mountStatement);
block.builders.update.addBlock(deindent`
if ( ${value} !== ( ${value} = ${snippet} ) ) {
${detachStatement}
${mountStatement}
}
`);
block.builders.detachRaw.addBlock(detachStatement);
} }

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

@ -14,10 +14,7 @@ export default function visitText(
block.addElement( block.addElement(
node._state.name, node._state.name,
`@createText( ${stringify(node.data)} )`, `@createText( ${stringify(node.data)} )`,
generator.hydratable `@claimText( ${state.parentNodes}, ${stringify(node.data)} )`,
? `@claimText( ${state.parentNodes}, ${stringify(node.data)} )` state.parentNode
: '',
state.parentNode,
node.usedAsAnchor
); );
} }

49
src/generators/dom/visitors/shared/Tag.ts
Unescape View File

@ -0,0 +1,49 @@
import deindent from '../../../../utils/deindent';
import { DomGenerator } from '../../index';
import Block from '../../Block';
import { Node } from '../../../../interfaces';
import { State } from '../../interfaces';
export default function visitTag(
generator: DomGenerator,
block: Block,
state: State,
node: Node,
name: string,
update: (value: string) => string
) {
const { dependencies, indexes, snippet } = block.contextualise(node.expression);
const hasChangeableIndex = Array.from(indexes).some(index => block.changeableIndexes.get(index));
const shouldCache = (
node.expression.type !== 'Identifier' ||
block.contexts.has(node.expression.name) ||
hasChangeableIndex
);
const value = shouldCache && block.getUniqueName(`${name}_value`);
const init = shouldCache ? value : snippet;
if (shouldCache) block.addVariable(value, snippet);
if (dependencies.length || hasChangeableIndex) {
const changedCheck = (
( block.hasOutroMethod ? `#outroing || ` : '' ) +
dependencies.map(dependency => `changed.${dependency}`).join(' || ')
);
const updateCachedValue = `${value} !== ( ${value} = ${snippet} )`;
const condition = shouldCache ?
( dependencies.length ? `( ${changedCheck} ) && ${updateCachedValue}` : updateCachedValue ) :
changedCheck;
block.builders.update.addConditional(
condition,
update(shouldCache ? value : snippet)
);
}
return { init };
}

42
src/shared/index.js
Unescape View File

@ -26,14 +26,13 @@ export function differs(a, b) {
return a !== b || ((a && typeof a === 'object') || typeof a === 'function'); return a !== b || ((a && typeof a === 'object') || typeof a === 'function');
} }
export function dispatchObservers(component, group, newState, oldState) { export function dispatchObservers(component, group, changed, newState, oldState) {
for (var key in group) { for (var key in group) {
if (!(key in newState)) continue; if (!changed[key]) continue;
var newValue = newState[key]; var newValue = newState[key];
var oldValue = oldState[key]; var oldValue = oldState[key];
if (differs(newValue, oldValue)) {
var callbacks = group[key]; var callbacks = group[key];
if (!callbacks) continue; if (!callbacks) continue;
@ -46,7 +45,6 @@ export function dispatchObservers(component, group, newState, oldState) {
callback.__calling = false; callback.__calling = false;
} }
} }
}
} }
export function get(key) { export function get(key) {
@ -133,6 +131,34 @@ export function set(newState) {
this._root._lock = false; this._root._lock = false;
} }
export function _set(newState) {
var oldState = this._state,
changed = {},
dirty = false;
for (var key in newState) {
if (differs(newState[key], oldState[key])) changed[key] = dirty = true;
}
if (!dirty) return;
this._state = assign({}, oldState, newState);
this._recompute(changed, this._state, oldState, false);
dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
this._fragment.update(changed, this._state);
dispatchObservers(this, this._observers.post, changed, this._state, oldState);
}
export function _setDev(newState) {
if (typeof newState !== 'object') {
throw new Error(
'Component .set was called without an object of data key-values to update.'
);
}
this._checkReadOnly(newState);
_set.call(this, newState);
}
export function callAll(fns) { export function callAll(fns) {
while (fns && fns.length) fns.pop()(); while (fns && fns.length) fns.pop()();
} }
@ -144,7 +170,9 @@ export var proto = {
observe: observe, observe: observe,
on: on, on: on,
set: set, set: set,
teardown: destroy teardown: destroy,
_recompute: noop,
_set: _set
}; };
export var protoDev = { export var protoDev = {
@ -154,5 +182,7 @@ export var protoDev = {
observe: observeDev, observe: observeDev,
on: onDev, on: onDev,
set: set, set: set,
teardown: destroyDev teardown: destroyDev,
_recompute: noop,
_set: _setDev
}; };

10
src/utils/CodeBuilder.ts
Unescape View File

@ -21,15 +21,17 @@ export default class CodeBuilder {
this.lastCondition = null; this.lastCondition = null;
} }
addConditionalLine(condition: string, line: string) { addConditional(condition: string, body: string) {
body = body.replace(/^/gm, '\t');
if (condition === this.lastCondition) { if (condition === this.lastCondition) {
this.result += `\n\t${line}`; this.result += `\n${body}`;
} else { } else {
if (this.lastCondition) { if (this.lastCondition) {
this.result += `\n}\n\n`; this.result += `\n}`;
} }
this.result += `if ( ${condition} ) {\n\t${line}`; this.result += `${this.last === ChunkType.Block ? '\n\n' : '\n'}if ( ${condition} ) {\n${body}`;
this.lastCondition = condition; this.lastCondition = condition;
} }

2
test/helpers.js
Unescape View File

@ -125,7 +125,7 @@ export function normalizeHtml(window, html) {
.replace(/>[\s\r\n]+</g, '><') .replace(/>[\s\r\n]+</g, '><')
.trim(); .trim();
cleanChildren(node, ''); cleanChildren(node, '');
return node.innerHTML; return node.innerHTML.replace(/<\/?noscript\/?>/g, '');
} }
export function setupHtmlEqual() { export function setupHtmlEqual() {

5
test/js/index.js
Unescape View File

@ -52,7 +52,7 @@ describe("js", () => {
} }
] ]
}).then(bundle => { }).then(bundle => {
return bundle.generate({ format: "es" }) return bundle.generate({ format: "es" });
}).then(({ code }) => { }).then(({ code }) => {
fs.writeFileSync(`${dir}/_actual-bundle.js`, code); fs.writeFileSync(`${dir}/_actual-bundle.js`, code);
@ -65,6 +65,9 @@ describe("js", () => {
code.trim().replace(/^\s+$/gm, ""), code.trim().replace(/^\s+$/gm, ""),
expectedBundle.trim().replace(/^\s+$/gm, "") expectedBundle.trim().replace(/^\s+$/gm, "")
); );
}).catch(err => {
console.error(err.loc);
throw err;
}); });
}); });
}); });

43
test/js/samples/collapses-text-around-comments/expected-bundle.js
Unescape View File

@ -52,14 +52,13 @@ function differs(a, b) {
return a !== b || ((a && typeof a === 'object') || typeof a === 'function'); return a !== b || ((a && typeof a === 'object') || typeof a === 'function');
} }
function dispatchObservers(component, group, newState, oldState) { function dispatchObservers(component, group, changed, newState, oldState) {
for (var key in group) { for (var key in group) {
if (!(key in newState)) continue; if (!changed[key]) continue;
var newValue = newState[key]; var newValue = newState[key];
var oldValue = oldState[key]; var oldValue = oldState[key];
if (differs(newValue, oldValue)) {
var callbacks = group[key]; var callbacks = group[key];
if (!callbacks) continue; if (!callbacks) continue;
@ -72,7 +71,6 @@ function dispatchObservers(component, group, newState, oldState) {
callback.__calling = false; callback.__calling = false;
} }
} }
}
} }
function get(key) { function get(key) {
@ -134,6 +132,23 @@ function set(newState) {
this._root._lock = false; this._root._lock = false;
} }
function _set(newState) {
var oldState = this._state,
changed = {},
dirty = false;
for (var key in newState) {
if (differs(newState[key], oldState[key])) changed[key] = dirty = true;
}
if (!dirty) return;
this._state = assign({}, oldState, newState);
this._recompute(changed, this._state, oldState, false);
dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
this._fragment.update(changed, this._state);
dispatchObservers(this, this._observers.post, changed, this._state, oldState);
}
function callAll(fns) { function callAll(fns) {
while (fns && fns.length) fns.pop()(); while (fns && fns.length) fns.pop()();
} }
@ -145,7 +160,9 @@ var proto = {
observe: observe, observe: observe,
on: on, on: on,
set: set, set: set,
teardown: destroy teardown: destroy,
_recompute: noop,
_set: _set
}; };
var template = (function () { var template = (function () {
@ -168,12 +185,12 @@ function add_css () {
} }
function create_main_fragment ( state, component ) { function create_main_fragment ( state, component ) {
var p, text_value, text; var p, text;
return { return {
create: function () { create: function () {
p = createElement( 'p' ); p = createElement( 'p' );
text = createText( text_value = state.foo ); text = createText( state.foo );
this.hydrate(); this.hydrate();
}, },
@ -187,8 +204,8 @@ function create_main_fragment ( state, component ) {
}, },
update: function ( changed, state ) { update: function ( changed, state ) {
if ( text_value !== ( text_value = state.foo ) ) { if ( changed.foo ) {
text.data = text_value; text.data = state.foo;
} }
}, },
@ -226,12 +243,4 @@ function SvelteComponent ( options ) {
assign( SvelteComponent.prototype, proto ); assign( SvelteComponent.prototype, proto );
SvelteComponent.prototype._set = function _set ( newState ) {
var oldState = this._state;
this._state = assign( {}, oldState, newState );
dispatchObservers( this, this._observers.pre, newState, oldState );
this._fragment.update( newState, this._state );
dispatchObservers( this, this._observers.post, newState, oldState );
};
export default SvelteComponent; export default SvelteComponent;

18
test/js/samples/collapses-text-around-comments/expected.js
Unescape View File

@ -1,4 +1,4 @@
import { appendNode, assign, createElement, createText, detachNode, dispatchObservers, insertNode, noop, proto, setAttribute } from "svelte/shared.js"; import { appendNode, assign, createElement, createText, detachNode, insertNode, noop, proto, setAttribute } from "svelte/shared.js";
var template = (function () { var template = (function () {
return { return {
@ -20,12 +20,12 @@ function add_css () {
} }
function create_main_fragment ( state, component ) { function create_main_fragment ( state, component ) {
var p, text_value, text; var p, text;
return { return {
create: function () { create: function () {
p = createElement( 'p' ); p = createElement( 'p' );
text = createText( text_value = state.foo ); text = createText( state.foo );
this.hydrate(); this.hydrate();
}, },
@ -39,8 +39,8 @@ function create_main_fragment ( state, component ) {
}, },
update: function ( changed, state ) { update: function ( changed, state ) {
if ( text_value !== ( text_value = state.foo ) ) { if ( changed.foo ) {
text.data = text_value; text.data = state.foo;
} }
}, },
@ -78,12 +78,4 @@ function SvelteComponent ( options ) {
assign( SvelteComponent.prototype, proto ); assign( SvelteComponent.prototype, proto );
SvelteComponent.prototype._set = function _set ( newState ) {
var oldState = this._state;
this._state = assign( {}, oldState, newState );
dispatchObservers( this, this._observers.pre, newState, oldState );
this._fragment.update( newState, this._state );
dispatchObservers( this, this._observers.post, newState, oldState );
};
export default SvelteComponent; export default SvelteComponent;

49
test/js/samples/computed-collapsed-if/expected-bundle.js
Unescape View File

@ -28,14 +28,13 @@ function differs(a, b) {
return a !== b || ((a && typeof a === 'object') || typeof a === 'function'); return a !== b || ((a && typeof a === 'object') || typeof a === 'function');
} }
function dispatchObservers(component, group, newState, oldState) { function dispatchObservers(component, group, changed, newState, oldState) {
for (var key in group) { for (var key in group) {
if (!(key in newState)) continue; if (!changed[key]) continue;
var newValue = newState[key]; var newValue = newState[key];
var oldValue = oldState[key]; var oldValue = oldState[key];
if (differs(newValue, oldValue)) {
var callbacks = group[key]; var callbacks = group[key];
if (!callbacks) continue; if (!callbacks) continue;
@ -48,7 +47,6 @@ function dispatchObservers(component, group, newState, oldState) {
callback.__calling = false; callback.__calling = false;
} }
} }
}
} }
function get(key) { function get(key) {
@ -110,6 +108,23 @@ function set(newState) {
this._root._lock = false; this._root._lock = false;
} }
function _set(newState) {
var oldState = this._state,
changed = {},
dirty = false;
for (var key in newState) {
if (differs(newState[key], oldState[key])) changed[key] = dirty = true;
}
if (!dirty) return;
this._state = assign({}, oldState, newState);
this._recompute(changed, this._state, oldState, false);
dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
this._fragment.update(changed, this._state);
dispatchObservers(this, this._observers.post, changed, this._state, oldState);
}
function callAll(fns) { function callAll(fns) {
while (fns && fns.length) fns.pop()(); while (fns && fns.length) fns.pop()();
} }
@ -121,16 +136,11 @@ var proto = {
observe: observe, observe: observe,
on: on, on: on,
set: set, set: set,
teardown: destroy teardown: destroy,
_recompute: noop,
_set: _set
}; };
function recompute ( state, newState, oldState, isInitial ) {
if ( isInitial || ( 'x' in newState && differs( state.x, oldState.x ) ) ) {
state.a = newState.a = template.computed.a( state.x );
state.b = newState.b = template.computed.b( state.x );
}
}
var template = (function () { var template = (function () {
return { return {
computed: { computed: {
@ -147,6 +157,8 @@ function create_main_fragment ( state, component ) {
mount: noop, mount: noop,
update: noop,
unmount: noop, unmount: noop,
destroy: noop destroy: noop
@ -156,7 +168,7 @@ function create_main_fragment ( state, component ) {
function SvelteComponent ( options ) { function SvelteComponent ( options ) {
options = options || {}; options = options || {};
this._state = options.data || {}; this._state = options.data || {};
recompute( this._state, this._state, {}, true ); this._recompute( {}, this._state, {}, true );
this._observers = { this._observers = {
pre: Object.create( null ), pre: Object.create( null ),
@ -178,12 +190,11 @@ function SvelteComponent ( options ) {
assign( SvelteComponent.prototype, proto ); assign( SvelteComponent.prototype, proto );
SvelteComponent.prototype._set = function _set ( newState ) { SvelteComponent.prototype._recompute = function _recompute ( changed, state, oldState, isInitial ) {
var oldState = this._state; if ( isInitial || changed.x ) {
this._state = assign( {}, oldState, newState ); if ( differs( ( state.a = template.computed.a( state.x ) ), oldState.a ) ) changed.a = true;
recompute( this._state, newState, oldState, false ); if ( differs( ( state.b = template.computed.b( state.x ) ), oldState.b ) ) changed.b = true;
dispatchObservers( this, this._observers.pre, newState, oldState ); }
dispatchObservers( this, this._observers.post, newState, oldState );
}; };
export default SvelteComponent; export default SvelteComponent;

26
test/js/samples/computed-collapsed-if/expected.js
Unescape View File

@ -1,11 +1,4 @@
import { assign, differs, dispatchObservers, noop, proto } from "svelte/shared.js"; import { assign, differs, noop, proto } from "svelte/shared.js";
function recompute ( state, newState, oldState, isInitial ) {
if ( isInitial || ( 'x' in newState && differs( state.x, oldState.x ) ) ) {
state.a = newState.a = template.computed.a( state.x );
state.b = newState.b = template.computed.b( state.x );
}
}
var template = (function () { var template = (function () {
return { return {
@ -23,6 +16,8 @@ function create_main_fragment ( state, component ) {
mount: noop, mount: noop,
update: noop,
unmount: noop, unmount: noop,
destroy: noop destroy: noop
@ -32,7 +27,7 @@ function create_main_fragment ( state, component ) {
function SvelteComponent ( options ) { function SvelteComponent ( options ) {
options = options || {}; options = options || {};
this._state = options.data || {}; this._state = options.data || {};
recompute( this._state, this._state, {}, true ); this._recompute( {}, this._state, {}, true );
this._observers = { this._observers = {
pre: Object.create( null ), pre: Object.create( null ),
@ -54,12 +49,11 @@ function SvelteComponent ( options ) {
assign( SvelteComponent.prototype, proto ); assign( SvelteComponent.prototype, proto );
SvelteComponent.prototype._set = function _set ( newState ) { SvelteComponent.prototype._recompute = function _recompute ( changed, state, oldState, isInitial ) {
var oldState = this._state; if ( isInitial || changed.x ) {
this._state = assign( {}, oldState, newState ); if ( differs( ( state.a = template.computed.a( state.x ) ), oldState.a ) ) changed.a = true;
recompute( this._state, newState, oldState, false ) if ( differs( ( state.b = template.computed.b( state.x ) ), oldState.b ) ) changed.b = true;
dispatchObservers( this, this._observers.pre, newState, oldState ); }
dispatchObservers( this, this._observers.post, newState, oldState ); }
};
export default SvelteComponent; export default SvelteComponent;

36
test/js/samples/css-media-query/expected-bundle.js
Unescape View File

@ -48,14 +48,13 @@ function differs(a, b) {
return a !== b || ((a && typeof a === 'object') || typeof a === 'function'); return a !== b || ((a && typeof a === 'object') || typeof a === 'function');
} }
function dispatchObservers(component, group, newState, oldState) { function dispatchObservers(component, group, changed, newState, oldState) {
for (var key in group) { for (var key in group) {
if (!(key in newState)) continue; if (!changed[key]) continue;
var newValue = newState[key]; var newValue = newState[key];
var oldValue = oldState[key]; var oldValue = oldState[key];
if (differs(newValue, oldValue)) {
var callbacks = group[key]; var callbacks = group[key];
if (!callbacks) continue; if (!callbacks) continue;
@ -68,7 +67,6 @@ function dispatchObservers(component, group, newState, oldState) {
callback.__calling = false; callback.__calling = false;
} }
} }
}
} }
function get(key) { function get(key) {
@ -130,6 +128,23 @@ function set(newState) {
this._root._lock = false; this._root._lock = false;
} }
function _set(newState) {
var oldState = this._state,
changed = {},
dirty = false;
for (var key in newState) {
if (differs(newState[key], oldState[key])) changed[key] = dirty = true;
}
if (!dirty) return;
this._state = assign({}, oldState, newState);
this._recompute(changed, this._state, oldState, false);
dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
this._fragment.update(changed, this._state);
dispatchObservers(this, this._observers.post, changed, this._state, oldState);
}
function callAll(fns) { function callAll(fns) {
while (fns && fns.length) fns.pop()(); while (fns && fns.length) fns.pop()();
} }
@ -141,7 +156,9 @@ var proto = {
observe: observe, observe: observe,
on: on, on: on,
set: set, set: set,
teardown: destroy teardown: destroy,
_recompute: noop,
_set: _set
}; };
function encapsulateStyles ( node ) { function encapsulateStyles ( node ) {
@ -172,6 +189,8 @@ function create_main_fragment ( state, component ) {
insertNode( div, target, anchor ); insertNode( div, target, anchor );
}, },
update: noop,
unmount: function () { unmount: function () {
detachNode( div ); detachNode( div );
}, },
@ -206,11 +225,4 @@ function SvelteComponent ( options ) {
assign( SvelteComponent.prototype, proto ); assign( SvelteComponent.prototype, proto );
SvelteComponent.prototype._set = function _set ( newState ) {
var oldState = this._state;
this._state = assign( {}, oldState, newState );
dispatchObservers( this, this._observers.pre, newState, oldState );
dispatchObservers( this, this._observers.post, newState, oldState );
};
export default SvelteComponent; export default SvelteComponent;

11
test/js/samples/css-media-query/expected.js
Unescape View File

@ -1,4 +1,4 @@
import { appendNode, assign, createElement, detachNode, dispatchObservers, insertNode, noop, proto, setAttribute } from "svelte/shared.js"; import { appendNode, assign, createElement, detachNode, insertNode, noop, proto, setAttribute } from "svelte/shared.js";
function encapsulateStyles ( node ) { function encapsulateStyles ( node ) {
setAttribute( node, 'svelte-2363328337', '' ); setAttribute( node, 'svelte-2363328337', '' );
@ -28,6 +28,8 @@ function create_main_fragment ( state, component ) {
insertNode( div, target, anchor ); insertNode( div, target, anchor );
}, },
update: noop,
unmount: function () { unmount: function () {
detachNode( div ); detachNode( div );
}, },
@ -62,11 +64,4 @@ function SvelteComponent ( options ) {
assign( SvelteComponent.prototype, proto ); assign( SvelteComponent.prototype, proto );
SvelteComponent.prototype._set = function _set ( newState ) {
var oldState = this._state;
this._state = assign( {}, oldState, newState );
dispatchObservers( this, this._observers.pre, newState, oldState );
dispatchObservers( this, this._observers.post, newState, oldState );
};
export default SvelteComponent; export default SvelteComponent;

67
test/js/samples/each-block-changed-check/expected-bundle.js
Unescape View File

@ -61,14 +61,13 @@ function differs(a, b) {
return a !== b || ((a && typeof a === 'object') || typeof a === 'function'); return a !== b || ((a && typeof a === 'object') || typeof a === 'function');
} }
function dispatchObservers(component, group, newState, oldState) { function dispatchObservers(component, group, changed, newState, oldState) {
for (var key in group) { for (var key in group) {
if (!(key in newState)) continue; if (!changed[key]) continue;
var newValue = newState[key]; var newValue = newState[key];
var oldValue = oldState[key]; var oldValue = oldState[key];
if (differs(newValue, oldValue)) {
var callbacks = group[key]; var callbacks = group[key];
if (!callbacks) continue; if (!callbacks) continue;
@ -81,7 +80,6 @@ function dispatchObservers(component, group, newState, oldState) {
callback.__calling = false; callback.__calling = false;
} }
} }
}
} }
function get(key) { function get(key) {
@ -143,6 +141,23 @@ function set(newState) {
this._root._lock = false; this._root._lock = false;
} }
function _set(newState) {
var oldState = this._state,
changed = {},
dirty = false;
for (var key in newState) {
if (differs(newState[key], oldState[key])) changed[key] = dirty = true;
}
if (!dirty) return;
this._state = assign({}, oldState, newState);
this._recompute(changed, this._state, oldState, false);
dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
this._fragment.update(changed, this._state);
dispatchObservers(this, this._observers.post, changed, this._state, oldState);
}
function callAll(fns) { function callAll(fns) {
while (fns && fns.length) fns.pop()(); while (fns && fns.length) fns.pop()();
} }
@ -154,11 +169,13 @@ var proto = {
observe: observe, observe: observe,
on: on, on: on,
set: set, set: set,
teardown: destroy teardown: destroy,
_recompute: noop,
_set: _set
}; };
function create_main_fragment ( state, component ) { function create_main_fragment ( state, component ) {
var text, p, text_1_value, text_1; var text, p, text_1;
var each_block_value = state.comments; var each_block_value = state.comments;
@ -176,7 +193,7 @@ function create_main_fragment ( state, component ) {
text = createText( "\n\n" ); text = createText( "\n\n" );
p = createElement( 'p' ); p = createElement( 'p' );
text_1 = createText( text_1_value = state.foo ); text_1 = createText( state.foo );
}, },
mount: function ( target, anchor ) { mount: function ( target, anchor ) {
@ -192,7 +209,7 @@ function create_main_fragment ( state, component ) {
update: function ( changed, state ) { update: function ( changed, state ) {
var each_block_value = state.comments; var each_block_value = state.comments;
if ( 'comments' in changed || 'elapsed' in changed || 'time' in changed ) { if ( changed.comments || changed.elapsed || changed.time ) {
for ( var i = 0; i < each_block_value.length; i += 1 ) { for ( var i = 0; i < each_block_value.length; i += 1 ) {
if ( each_block_iterations[i] ) { if ( each_block_iterations[i] ) {
each_block_iterations[i].update( changed, state, each_block_value, each_block_value[i], i ); each_block_iterations[i].update( changed, state, each_block_value, each_block_value[i], i );
@ -210,8 +227,8 @@ function create_main_fragment ( state, component ) {
each_block_iterations.length = each_block_value.length; each_block_iterations.length = each_block_value.length;
} }
if ( text_1_value !== ( text_1_value = state.foo ) ) { if ( changed.foo ) {
text_1.data = text_1_value; text_1.data = state.foo;
} }
}, },
@ -231,18 +248,18 @@ function create_main_fragment ( state, component ) {
} }
function create_each_block ( state, each_block_value, comment, i, component ) { function create_each_block ( state, each_block_value, comment, i, component ) {
var div, strong, text_value, text, text_1, span, text_2_value, text_2, text_3, text_4_value, text_4, text_5, text_6, raw_value, raw_before, raw_after; var div, strong, text, text_1, span, text_2_value = comment.author, text_2, text_3, text_4_value = state.elapsed(comment.time, state.time), text_4, text_5, text_6, raw_value = comment.html, raw_before, raw_after;
return { return {
create: function () { create: function () {
div = createElement( 'div' ); div = createElement( 'div' );
strong = createElement( 'strong' ); strong = createElement( 'strong' );
text = createText( text_value = i ); text = createText( i );
text_1 = createText( "\n\n\t\t" ); text_1 = createText( "\n\n\t\t" );
span = createElement( 'span' ); span = createElement( 'span' );
text_2 = createText( text_2_value = comment.author ); text_2 = createText( text_2_value );
text_3 = createText( " wrote " ); text_3 = createText( " wrote " );
text_4 = createText( text_4_value = state.elapsed(comment.time, state.time) ); text_4 = createText( text_4_value );
text_5 = createText( " ago:" ); text_5 = createText( " ago:" );
text_6 = createText( "\n\n\t\t" ); text_6 = createText( "\n\n\t\t" );
raw_before = createElement( 'noscript' ); raw_before = createElement( 'noscript' );
@ -268,25 +285,21 @@ function create_each_block ( state, each_block_value, comment, i, component ) {
appendNode( text_6, div ); appendNode( text_6, div );
appendNode( raw_before, div ); appendNode( raw_before, div );
appendNode( raw_after, div ); appendNode( raw_after, div );
raw_before.insertAdjacentHTML( 'afterend', raw_value = comment.html ); raw_before.insertAdjacentHTML( 'afterend', raw_value );
}, },
update: function ( changed, state, each_block_value, comment, i ) { update: function ( changed, state, each_block_value, comment, i ) {
if ( text_value !== ( text_value = i ) ) { if ( ( changed.comments ) && text_2_value !== ( text_2_value = comment.author ) ) {
text.data = text_value;
}
if ( text_2_value !== ( text_2_value = comment.author ) ) {
text_2.data = text_2_value; text_2.data = text_2_value;
} }
if ( text_4_value !== ( text_4_value = state.elapsed(comment.time, state.time) ) ) { if ( ( changed.elapsed || changed.comments || changed.time ) && text_4_value !== ( text_4_value = state.elapsed(comment.time, state.time) ) ) {
text_4.data = text_4_value; text_4.data = text_4_value;
} }
if ( raw_value !== ( raw_value = comment.html ) ) { if ( ( changed.comments ) && raw_value !== ( raw_value = comment.html ) ) {
detachBetween( raw_before, raw_after ); detachBetween( raw_before, raw_after );
raw_before.insertAdjacentHTML( 'afterend', raw_value = comment.html ); raw_before.insertAdjacentHTML( 'afterend', raw_value );
} }
}, },
@ -324,12 +337,4 @@ function SvelteComponent ( options ) {
assign( SvelteComponent.prototype, proto ); assign( SvelteComponent.prototype, proto );
SvelteComponent.prototype._set = function _set ( newState ) {
var oldState = this._state;
this._state = assign( {}, oldState, newState );
dispatchObservers( this, this._observers.pre, newState, oldState );
this._fragment.update( newState, this._state );
dispatchObservers( this, this._observers.post, newState, oldState );
};
export default SvelteComponent; export default SvelteComponent;

42
test/js/samples/each-block-changed-check/expected.js
Unescape View File

@ -1,7 +1,7 @@
import { appendNode, assign, createElement, createText, destroyEach, detachBetween, detachNode, dispatchObservers, insertNode, noop, proto } from "svelte/shared.js"; import { appendNode, assign, createElement, createText, destroyEach, detachBetween, detachNode, insertNode, noop, proto } from "svelte/shared.js";
function create_main_fragment ( state, component ) { function create_main_fragment ( state, component ) {
var text, p, text_1_value, text_1; var text, p, text_1;
var each_block_value = state.comments; var each_block_value = state.comments;
@ -19,7 +19,7 @@ function create_main_fragment ( state, component ) {
text = createText( "\n\n" ); text = createText( "\n\n" );
p = createElement( 'p' ); p = createElement( 'p' );
text_1 = createText( text_1_value = state.foo ); text_1 = createText( state.foo );
}, },
mount: function ( target, anchor ) { mount: function ( target, anchor ) {
@ -35,7 +35,7 @@ function create_main_fragment ( state, component ) {
update: function ( changed, state ) { update: function ( changed, state ) {
var each_block_value = state.comments; var each_block_value = state.comments;
if ( 'comments' in changed || 'elapsed' in changed || 'time' in changed ) { if ( changed.comments || changed.elapsed || changed.time ) {
for ( var i = 0; i < each_block_value.length; i += 1 ) { for ( var i = 0; i < each_block_value.length; i += 1 ) {
if ( each_block_iterations[i] ) { if ( each_block_iterations[i] ) {
each_block_iterations[i].update( changed, state, each_block_value, each_block_value[i], i ); each_block_iterations[i].update( changed, state, each_block_value, each_block_value[i], i );
@ -53,8 +53,8 @@ function create_main_fragment ( state, component ) {
each_block_iterations.length = each_block_value.length; each_block_iterations.length = each_block_value.length;
} }
if ( text_1_value !== ( text_1_value = state.foo ) ) { if ( changed.foo ) {
text_1.data = text_1_value; text_1.data = state.foo;
} }
}, },
@ -74,18 +74,18 @@ function create_main_fragment ( state, component ) {
} }
function create_each_block ( state, each_block_value, comment, i, component ) { function create_each_block ( state, each_block_value, comment, i, component ) {
var div, strong, text_value, text, text_1, span, text_2_value, text_2, text_3, text_4_value, text_4, text_5, text_6, raw_value, raw_before, raw_after; var div, strong, text, text_1, span, text_2_value = comment.author, text_2, text_3, text_4_value = state.elapsed(comment.time, state.time), text_4, text_5, text_6, raw_value = comment.html, raw_before, raw_after;
return { return {
create: function () { create: function () {
div = createElement( 'div' ); div = createElement( 'div' );
strong = createElement( 'strong' ); strong = createElement( 'strong' );
text = createText( text_value = i ); text = createText( i );
text_1 = createText( "\n\n\t\t" ); text_1 = createText( "\n\n\t\t" );
span = createElement( 'span' ); span = createElement( 'span' );
text_2 = createText( text_2_value = comment.author ); text_2 = createText( text_2_value );
text_3 = createText( " wrote " ); text_3 = createText( " wrote " );
text_4 = createText( text_4_value = state.elapsed(comment.time, state.time) ); text_4 = createText( text_4_value );
text_5 = createText( " ago:" ); text_5 = createText( " ago:" );
text_6 = createText( "\n\n\t\t" ); text_6 = createText( "\n\n\t\t" );
raw_before = createElement( 'noscript' ); raw_before = createElement( 'noscript' );
@ -111,25 +111,21 @@ function create_each_block ( state, each_block_value, comment, i, component ) {
appendNode( text_6, div ); appendNode( text_6, div );
appendNode( raw_before, div ); appendNode( raw_before, div );
appendNode( raw_after, div ); appendNode( raw_after, div );
raw_before.insertAdjacentHTML( 'afterend', raw_value = comment.html ); raw_before.insertAdjacentHTML( 'afterend', raw_value );
}, },
update: function ( changed, state, each_block_value, comment, i ) { update: function ( changed, state, each_block_value, comment, i ) {
if ( text_value !== ( text_value = i ) ) { if ( ( changed.comments ) && text_2_value !== ( text_2_value = comment.author ) ) {
text.data = text_value;
}
if ( text_2_value !== ( text_2_value = comment.author ) ) {
text_2.data = text_2_value; text_2.data = text_2_value;
} }
if ( text_4_value !== ( text_4_value = state.elapsed(comment.time, state.time) ) ) { if ( ( changed.elapsed || changed.comments || changed.time ) && text_4_value !== ( text_4_value = state.elapsed(comment.time, state.time) ) ) {
text_4.data = text_4_value; text_4.data = text_4_value;
} }
if ( raw_value !== ( raw_value = comment.html ) ) { if ( ( changed.comments ) && raw_value !== ( raw_value = comment.html ) ) {
detachBetween( raw_before, raw_after ); detachBetween( raw_before, raw_after );
raw_before.insertAdjacentHTML( 'afterend', raw_value = comment.html ); raw_before.insertAdjacentHTML( 'afterend', raw_value );
} }
}, },
@ -167,12 +163,4 @@ function SvelteComponent ( options ) {
assign( SvelteComponent.prototype, proto ); assign( SvelteComponent.prototype, proto );
SvelteComponent.prototype._set = function _set ( newState ) {
var oldState = this._state;
this._state = assign( {}, oldState, newState );
dispatchObservers( this, this._observers.pre, newState, oldState );
this._fragment.update( newState, this._state );
dispatchObservers( this, this._observers.post, newState, oldState );
};
export default SvelteComponent; export default SvelteComponent;

36
test/js/samples/event-handlers-custom/expected-bundle.js
Unescape View File

@ -48,14 +48,13 @@ function differs(a, b) {
return a !== b || ((a && typeof a === 'object') || typeof a === 'function'); return a !== b || ((a && typeof a === 'object') || typeof a === 'function');
} }
function dispatchObservers(component, group, newState, oldState) { function dispatchObservers(component, group, changed, newState, oldState) {
for (var key in group) { for (var key in group) {
if (!(key in newState)) continue; if (!changed[key]) continue;
var newValue = newState[key]; var newValue = newState[key];
var oldValue = oldState[key]; var oldValue = oldState[key];
if (differs(newValue, oldValue)) {
var callbacks = group[key]; var callbacks = group[key];
if (!callbacks) continue; if (!callbacks) continue;
@ -68,7 +67,6 @@ function dispatchObservers(component, group, newState, oldState) {
callback.__calling = false; callback.__calling = false;
} }
} }
}
} }
function get(key) { function get(key) {
@ -130,6 +128,23 @@ function set(newState) {
this._root._lock = false; this._root._lock = false;
} }
function _set(newState) {
var oldState = this._state,
changed = {},
dirty = false;
for (var key in newState) {
if (differs(newState[key], oldState[key])) changed[key] = dirty = true;
}
if (!dirty) return;
this._state = assign({}, oldState, newState);
this._recompute(changed, this._state, oldState, false);
dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
this._fragment.update(changed, this._state);
dispatchObservers(this, this._observers.post, changed, this._state, oldState);
}
function callAll(fns) { function callAll(fns) {
while (fns && fns.length) fns.pop()(); while (fns && fns.length) fns.pop()();
} }
@ -141,7 +156,9 @@ var proto = {
observe: observe, observe: observe,
on: on, on: on,
set: set, set: set,
teardown: destroy teardown: destroy,
_recompute: noop,
_set: _set
}; };
var template = (function () { var template = (function () {
@ -181,6 +198,8 @@ function create_main_fragment ( state, component ) {
appendNode( text, button ); appendNode( text, button );
}, },
update: noop,
unmount: function () { unmount: function () {
detachNode( button ); detachNode( button );
}, },
@ -215,11 +234,4 @@ function SvelteComponent ( options ) {
assign( SvelteComponent.prototype, template.methods, proto ); assign( SvelteComponent.prototype, template.methods, proto );
SvelteComponent.prototype._set = function _set ( newState ) {
var oldState = this._state;
this._state = assign( {}, oldState, newState );
dispatchObservers( this, this._observers.pre, newState, oldState );
dispatchObservers( this, this._observers.post, newState, oldState );
};
export default SvelteComponent; export default SvelteComponent;

11
test/js/samples/event-handlers-custom/expected.js
Unescape View File

@ -1,4 +1,4 @@
import { appendNode, assign, createElement, createText, detachNode, dispatchObservers, insertNode, proto } from "svelte/shared.js"; import { appendNode, assign, createElement, createText, detachNode, insertNode, noop, proto } from "svelte/shared.js";
var template = (function () { var template = (function () {
return { return {
@ -37,6 +37,8 @@ function create_main_fragment ( state, component ) {
appendNode( text, button ); appendNode( text, button );
}, },
update: noop,
unmount: function () { unmount: function () {
detachNode( button ); detachNode( button );
}, },
@ -71,11 +73,4 @@ function SvelteComponent ( options ) {
assign( SvelteComponent.prototype, template.methods, proto ); assign( SvelteComponent.prototype, template.methods, proto );
SvelteComponent.prototype._set = function _set ( newState ) {
var oldState = this._state;
this._state = assign( {}, oldState, newState );
dispatchObservers( this, this._observers.pre, newState, oldState );
dispatchObservers( this, this._observers.post, newState, oldState );
};
export default SvelteComponent; export default SvelteComponent;

35
test/js/samples/if-block-no-update/expected-bundle.js
Unescape View File

@ -52,14 +52,13 @@ function differs(a, b) {
return a !== b || ((a && typeof a === 'object') || typeof a === 'function'); return a !== b || ((a && typeof a === 'object') || typeof a === 'function');
} }
function dispatchObservers(component, group, newState, oldState) { function dispatchObservers(component, group, changed, newState, oldState) {
for (var key in group) { for (var key in group) {
if (!(key in newState)) continue; if (!changed[key]) continue;
var newValue = newState[key]; var newValue = newState[key];
var oldValue = oldState[key]; var oldValue = oldState[key];
if (differs(newValue, oldValue)) {
var callbacks = group[key]; var callbacks = group[key];
if (!callbacks) continue; if (!callbacks) continue;
@ -72,7 +71,6 @@ function dispatchObservers(component, group, newState, oldState) {
callback.__calling = false; callback.__calling = false;
} }
} }
}
} }
function get(key) { function get(key) {
@ -134,6 +132,23 @@ function set(newState) {
this._root._lock = false; this._root._lock = false;
} }
function _set(newState) {
var oldState = this._state,
changed = {},
dirty = false;
for (var key in newState) {
if (differs(newState[key], oldState[key])) changed[key] = dirty = true;
}
if (!dirty) return;
this._state = assign({}, oldState, newState);
this._recompute(changed, this._state, oldState, false);
dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
this._fragment.update(changed, this._state);
dispatchObservers(this, this._observers.post, changed, this._state, oldState);
}
function callAll(fns) { function callAll(fns) {
while (fns && fns.length) fns.pop()(); while (fns && fns.length) fns.pop()();
} }
@ -145,7 +160,9 @@ var proto = {
observe: observe, observe: observe,
on: on, on: on,
set: set, set: set,
teardown: destroy teardown: destroy,
_recompute: noop,
_set: _set
}; };
function create_main_fragment ( state, component ) { function create_main_fragment ( state, component ) {
@ -259,12 +276,4 @@ function SvelteComponent ( options ) {
assign( SvelteComponent.prototype, proto ); assign( SvelteComponent.prototype, proto );
SvelteComponent.prototype._set = function _set ( newState ) {
var oldState = this._state;
this._state = assign( {}, oldState, newState );
dispatchObservers( this, this._observers.pre, newState, oldState );
this._fragment.update( newState, this._state );
dispatchObservers( this, this._observers.post, newState, oldState );
};
export default SvelteComponent; export default SvelteComponent;

10
test/js/samples/if-block-no-update/expected.js
Unescape View File

@ -1,4 +1,4 @@
import { appendNode, assign, createComment, createElement, createText, detachNode, dispatchObservers, insertNode, noop, proto } from "svelte/shared.js"; import { appendNode, assign, createComment, createElement, createText, detachNode, insertNode, noop, proto } from "svelte/shared.js";
function create_main_fragment ( state, component ) { function create_main_fragment ( state, component ) {
var if_block_anchor; var if_block_anchor;
@ -111,12 +111,4 @@ function SvelteComponent ( options ) {
assign( SvelteComponent.prototype, proto ); assign( SvelteComponent.prototype, proto );
SvelteComponent.prototype._set = function _set ( newState ) {
var oldState = this._state;
this._state = assign( {}, oldState, newState );
dispatchObservers( this, this._observers.pre, newState, oldState );
this._fragment.update( newState, this._state );
dispatchObservers( this, this._observers.post, newState, oldState );
};
export default SvelteComponent; export default SvelteComponent;

35
test/js/samples/if-block-simple/expected-bundle.js
Unescape View File

@ -52,14 +52,13 @@ function differs(a, b) {
return a !== b || ((a && typeof a === 'object') || typeof a === 'function'); return a !== b || ((a && typeof a === 'object') || typeof a === 'function');
} }
function dispatchObservers(component, group, newState, oldState) { function dispatchObservers(component, group, changed, newState, oldState) {
for (var key in group) { for (var key in group) {
if (!(key in newState)) continue; if (!changed[key]) continue;
var newValue = newState[key]; var newValue = newState[key];
var oldValue = oldState[key]; var oldValue = oldState[key];
if (differs(newValue, oldValue)) {
var callbacks = group[key]; var callbacks = group[key];
if (!callbacks) continue; if (!callbacks) continue;
@ -72,7 +71,6 @@ function dispatchObservers(component, group, newState, oldState) {
callback.__calling = false; callback.__calling = false;
} }
} }
}
} }
function get(key) { function get(key) {
@ -134,6 +132,23 @@ function set(newState) {
this._root._lock = false; this._root._lock = false;
} }
function _set(newState) {
var oldState = this._state,
changed = {},
dirty = false;
for (var key in newState) {
if (differs(newState[key], oldState[key])) changed[key] = dirty = true;
}
if (!dirty) return;
this._state = assign({}, oldState, newState);
this._recompute(changed, this._state, oldState, false);
dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
this._fragment.update(changed, this._state);
dispatchObservers(this, this._observers.post, changed, this._state, oldState);
}
function callAll(fns) { function callAll(fns) {
while (fns && fns.length) fns.pop()(); while (fns && fns.length) fns.pop()();
} }
@ -145,7 +160,9 @@ var proto = {
observe: observe, observe: observe,
on: on, on: on,
set: set, set: set,
teardown: destroy teardown: destroy,
_recompute: noop,
_set: _set
}; };
function create_main_fragment ( state, component ) { function create_main_fragment ( state, component ) {
@ -235,12 +252,4 @@ function SvelteComponent ( options ) {
assign( SvelteComponent.prototype, proto ); assign( SvelteComponent.prototype, proto );
SvelteComponent.prototype._set = function _set ( newState ) {
var oldState = this._state;
this._state = assign( {}, oldState, newState );
dispatchObservers( this, this._observers.pre, newState, oldState );
this._fragment.update( newState, this._state );
dispatchObservers( this, this._observers.post, newState, oldState );
};
export default SvelteComponent; export default SvelteComponent;

10
test/js/samples/if-block-simple/expected.js
Unescape View File

@ -1,4 +1,4 @@
import { appendNode, assign, createComment, createElement, createText, detachNode, dispatchObservers, insertNode, noop, proto } from "svelte/shared.js"; import { appendNode, assign, createComment, createElement, createText, detachNode, insertNode, noop, proto } from "svelte/shared.js";
function create_main_fragment ( state, component ) { function create_main_fragment ( state, component ) {
var if_block_anchor; var if_block_anchor;
@ -87,12 +87,4 @@ function SvelteComponent ( options ) {
assign( SvelteComponent.prototype, proto ); assign( SvelteComponent.prototype, proto );
SvelteComponent.prototype._set = function _set ( newState ) {
var oldState = this._state;
this._state = assign( {}, oldState, newState );
dispatchObservers( this, this._observers.pre, newState, oldState );
this._fragment.update( newState, this._state );
dispatchObservers( this, this._observers.post, newState, oldState );
};
export default SvelteComponent; export default SvelteComponent;

36
test/js/samples/non-imported-component/expected-bundle.js
Unescape View File

@ -42,14 +42,13 @@ function differs(a, b) {
return a !== b || ((a && typeof a === 'object') || typeof a === 'function'); return a !== b || ((a && typeof a === 'object') || typeof a === 'function');
} }
function dispatchObservers(component, group, newState, oldState) { function dispatchObservers(component, group, changed, newState, oldState) {
for (var key in group) { for (var key in group) {
if (!(key in newState)) continue; if (!changed[key]) continue;
var newValue = newState[key]; var newValue = newState[key];
var oldValue = oldState[key]; var oldValue = oldState[key];
if (differs(newValue, oldValue)) {
var callbacks = group[key]; var callbacks = group[key];
if (!callbacks) continue; if (!callbacks) continue;
@ -62,7 +61,6 @@ function dispatchObservers(component, group, newState, oldState) {
callback.__calling = false; callback.__calling = false;
} }
} }
}
} }
function get(key) { function get(key) {
@ -124,6 +122,23 @@ function set(newState) {
this._root._lock = false; this._root._lock = false;
} }
function _set(newState) {
var oldState = this._state,
changed = {},
dirty = false;
for (var key in newState) {
if (differs(newState[key], oldState[key])) changed[key] = dirty = true;
}
if (!dirty) return;
this._state = assign({}, oldState, newState);
this._recompute(changed, this._state, oldState, false);
dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
this._fragment.update(changed, this._state);
dispatchObservers(this, this._observers.post, changed, this._state, oldState);
}
function callAll(fns) { function callAll(fns) {
while (fns && fns.length) fns.pop()(); while (fns && fns.length) fns.pop()();
} }
@ -135,7 +150,9 @@ var proto = {
observe: observe, observe: observe,
on: on, on: on,
set: set, set: set,
teardown: destroy teardown: destroy,
_recompute: noop,
_set: _set
}; };
var template = (function () { var template = (function () {
@ -170,6 +187,8 @@ function create_main_fragment ( state, component ) {
nonimported._fragment.mount( target, anchor ); nonimported._fragment.mount( target, anchor );
}, },
update: noop,
unmount: function () { unmount: function () {
imported._fragment.unmount(); imported._fragment.unmount();
detachNode( text ); detachNode( text );
@ -221,11 +240,4 @@ function SvelteComponent ( options ) {
assign( SvelteComponent.prototype, proto ); assign( SvelteComponent.prototype, proto );
SvelteComponent.prototype._set = function _set ( newState ) {
var oldState = this._state;
this._state = assign( {}, oldState, newState );
dispatchObservers( this, this._observers.pre, newState, oldState );
dispatchObservers( this, this._observers.post, newState, oldState );
};
export default SvelteComponent; export default SvelteComponent;

11
test/js/samples/non-imported-component/expected.js
Unescape View File

@ -1,6 +1,6 @@
import Imported from 'Imported.html'; import Imported from 'Imported.html';
import { assign, callAll, createText, detachNode, dispatchObservers, insertNode, proto } from "svelte/shared.js"; import { assign, callAll, createText, detachNode, insertNode, noop, proto } from "svelte/shared.js";
var template = (function () { var template = (function () {
return { return {
@ -34,6 +34,8 @@ function create_main_fragment ( state, component ) {
nonimported._fragment.mount( target, anchor ); nonimported._fragment.mount( target, anchor );
}, },
update: noop,
unmount: function () { unmount: function () {
imported._fragment.unmount(); imported._fragment.unmount();
detachNode( text ); detachNode( text );
@ -85,11 +87,4 @@ function SvelteComponent ( options ) {
assign( SvelteComponent.prototype, proto ); assign( SvelteComponent.prototype, proto );
SvelteComponent.prototype._set = function _set ( newState ) {
var oldState = this._state;
this._state = assign( {}, oldState, newState );
dispatchObservers( this, this._observers.pre, newState, oldState );
dispatchObservers( this, this._observers.post, newState, oldState );
};
export default SvelteComponent; export default SvelteComponent;

36
test/js/samples/onrender-onteardown-rewritten/expected-bundle.js
Unescape View File

@ -28,14 +28,13 @@ function differs(a, b) {
return a !== b || ((a && typeof a === 'object') || typeof a === 'function'); return a !== b || ((a && typeof a === 'object') || typeof a === 'function');
} }
function dispatchObservers(component, group, newState, oldState) { function dispatchObservers(component, group, changed, newState, oldState) {
for (var key in group) { for (var key in group) {
if (!(key in newState)) continue; if (!changed[key]) continue;
var newValue = newState[key]; var newValue = newState[key];
var oldValue = oldState[key]; var oldValue = oldState[key];
if (differs(newValue, oldValue)) {
var callbacks = group[key]; var callbacks = group[key];
if (!callbacks) continue; if (!callbacks) continue;
@ -48,7 +47,6 @@ function dispatchObservers(component, group, newState, oldState) {
callback.__calling = false; callback.__calling = false;
} }
} }
}
} }
function get(key) { function get(key) {
@ -110,6 +108,23 @@ function set(newState) {
this._root._lock = false; this._root._lock = false;
} }
function _set(newState) {
var oldState = this._state,
changed = {},
dirty = false;
for (var key in newState) {
if (differs(newState[key], oldState[key])) changed[key] = dirty = true;
}
if (!dirty) return;
this._state = assign({}, oldState, newState);
this._recompute(changed, this._state, oldState, false);
dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
this._fragment.update(changed, this._state);
dispatchObservers(this, this._observers.post, changed, this._state, oldState);
}
function callAll(fns) { function callAll(fns) {
while (fns && fns.length) fns.pop()(); while (fns && fns.length) fns.pop()();
} }
@ -121,7 +136,9 @@ var proto = {
observe: observe, observe: observe,
on: on, on: on,
set: set, set: set,
teardown: destroy teardown: destroy,
_recompute: noop,
_set: _set
}; };
var template = (function () { var template = (function () {
@ -139,6 +156,8 @@ function create_main_fragment ( state, component ) {
mount: noop, mount: noop,
update: noop,
unmount: noop, unmount: noop,
destroy: noop destroy: noop
@ -182,11 +201,4 @@ function SvelteComponent ( options ) {
assign( SvelteComponent.prototype, proto ); assign( SvelteComponent.prototype, proto );
SvelteComponent.prototype._set = function _set ( newState ) {
var oldState = this._state;
this._state = assign( {}, oldState, newState );
dispatchObservers( this, this._observers.pre, newState, oldState );
dispatchObservers( this, this._observers.post, newState, oldState );
};
export default SvelteComponent; export default SvelteComponent;

11
test/js/samples/onrender-onteardown-rewritten/expected.js
Unescape View File

@ -1,4 +1,4 @@
import { assign, callAll, dispatchObservers, noop, proto } from "svelte/shared.js"; import { assign, callAll, noop, proto } from "svelte/shared.js";
var template = (function () { var template = (function () {
return { return {
@ -15,6 +15,8 @@ function create_main_fragment ( state, component ) {
mount: noop, mount: noop,
update: noop,
unmount: noop, unmount: noop,
destroy: noop destroy: noop
@ -58,11 +60,4 @@ function SvelteComponent ( options ) {
assign( SvelteComponent.prototype, proto ); assign( SvelteComponent.prototype, proto );
SvelteComponent.prototype._set = function _set ( newState ) {
var oldState = this._state;
this._state = assign( {}, oldState, newState );
dispatchObservers( this, this._observers.pre, newState, oldState );
dispatchObservers( this, this._observers.post, newState, oldState );
};
export default SvelteComponent; export default SvelteComponent;

36
test/js/samples/setup-method/expected-bundle.js
Unescape View File

@ -28,14 +28,13 @@ function differs(a, b) {
return a !== b || ((a && typeof a === 'object') || typeof a === 'function'); return a !== b || ((a && typeof a === 'object') || typeof a === 'function');
} }
function dispatchObservers(component, group, newState, oldState) { function dispatchObservers(component, group, changed, newState, oldState) {
for (var key in group) { for (var key in group) {
if (!(key in newState)) continue; if (!changed[key]) continue;
var newValue = newState[key]; var newValue = newState[key];
var oldValue = oldState[key]; var oldValue = oldState[key];
if (differs(newValue, oldValue)) {
var callbacks = group[key]; var callbacks = group[key];
if (!callbacks) continue; if (!callbacks) continue;
@ -48,7 +47,6 @@ function dispatchObservers(component, group, newState, oldState) {
callback.__calling = false; callback.__calling = false;
} }
} }
}
} }
function get(key) { function get(key) {
@ -110,6 +108,23 @@ function set(newState) {
this._root._lock = false; this._root._lock = false;
} }
function _set(newState) {
var oldState = this._state,
changed = {},
dirty = false;
for (var key in newState) {
if (differs(newState[key], oldState[key])) changed[key] = dirty = true;
}
if (!dirty) return;
this._state = assign({}, oldState, newState);
this._recompute(changed, this._state, oldState, false);
dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
this._fragment.update(changed, this._state);
dispatchObservers(this, this._observers.post, changed, this._state, oldState);
}
function callAll(fns) { function callAll(fns) {
while (fns && fns.length) fns.pop()(); while (fns && fns.length) fns.pop()();
} }
@ -121,7 +136,9 @@ var proto = {
observe: observe, observe: observe,
on: on, on: on,
set: set, set: set,
teardown: destroy teardown: destroy,
_recompute: noop,
_set: _set
}; };
var template = (function () { var template = (function () {
@ -150,6 +167,8 @@ function create_main_fragment ( state, component ) {
mount: noop, mount: noop,
update: noop,
unmount: noop, unmount: noop,
destroy: noop destroy: noop
@ -180,13 +199,6 @@ function SvelteComponent ( options ) {
assign( SvelteComponent.prototype, template.methods, proto ); assign( SvelteComponent.prototype, template.methods, proto );
SvelteComponent.prototype._set = function _set ( newState ) {
var oldState = this._state;
this._state = assign( {}, oldState, newState );
dispatchObservers( this, this._observers.pre, newState, oldState );
dispatchObservers( this, this._observers.post, newState, oldState );
};
template.setup( SvelteComponent ); template.setup( SvelteComponent );
export default SvelteComponent; export default SvelteComponent;

11
test/js/samples/setup-method/expected.js
Unescape View File

@ -1,4 +1,4 @@
import { assign, dispatchObservers, noop, proto } from "svelte/shared.js"; import { assign, noop, proto } from "svelte/shared.js";
var template = (function () { var template = (function () {
return { return {
@ -26,6 +26,8 @@ function create_main_fragment ( state, component ) {
mount: noop, mount: noop,
update: noop,
unmount: noop, unmount: noop,
destroy: noop destroy: noop
@ -56,13 +58,6 @@ function SvelteComponent ( options ) {
assign( SvelteComponent.prototype, template.methods, proto ); assign( SvelteComponent.prototype, template.methods, proto );
SvelteComponent.prototype._set = function _set ( newState ) {
var oldState = this._state;
this._state = assign( {}, oldState, newState );
dispatchObservers( this, this._observers.pre, newState, oldState );
dispatchObservers( this, this._observers.post, newState, oldState );
};
template.setup( SvelteComponent ); template.setup( SvelteComponent );
export default SvelteComponent; export default SvelteComponent;

35
test/js/samples/use-elements-as-anchors/expected-bundle.js
Unescape View File

@ -52,14 +52,13 @@ function differs(a, b) {
return a !== b || ((a && typeof a === 'object') || typeof a === 'function'); return a !== b || ((a && typeof a === 'object') || typeof a === 'function');
} }
function dispatchObservers(component, group, newState, oldState) { function dispatchObservers(component, group, changed, newState, oldState) {
for (var key in group) { for (var key in group) {
if (!(key in newState)) continue; if (!changed[key]) continue;
var newValue = newState[key]; var newValue = newState[key];
var oldValue = oldState[key]; var oldValue = oldState[key];
if (differs(newValue, oldValue)) {
var callbacks = group[key]; var callbacks = group[key];
if (!callbacks) continue; if (!callbacks) continue;
@ -72,7 +71,6 @@ function dispatchObservers(component, group, newState, oldState) {
callback.__calling = false; callback.__calling = false;
} }
} }
}
} }
function get(key) { function get(key) {
@ -134,6 +132,23 @@ function set(newState) {
this._root._lock = false; this._root._lock = false;
} }
function _set(newState) {
var oldState = this._state,
changed = {},
dirty = false;
for (var key in newState) {
if (differs(newState[key], oldState[key])) changed[key] = dirty = true;
}
if (!dirty) return;
this._state = assign({}, oldState, newState);
this._recompute(changed, this._state, oldState, false);
dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
this._fragment.update(changed, this._state);
dispatchObservers(this, this._observers.post, changed, this._state, oldState);
}
function callAll(fns) { function callAll(fns) {
while (fns && fns.length) fns.pop()(); while (fns && fns.length) fns.pop()();
} }
@ -145,7 +160,9 @@ var proto = {
observe: observe, observe: observe,
on: on, on: on,
set: set, set: set,
teardown: destroy teardown: destroy,
_recompute: noop,
_set: _set
}; };
function create_main_fragment ( state, component ) { function create_main_fragment ( state, component ) {
@ -419,12 +436,4 @@ function SvelteComponent ( options ) {
assign( SvelteComponent.prototype, proto ); assign( SvelteComponent.prototype, proto );
SvelteComponent.prototype._set = function _set ( newState ) {
var oldState = this._state;
this._state = assign( {}, oldState, newState );
dispatchObservers( this, this._observers.pre, newState, oldState );
this._fragment.update( newState, this._state );
dispatchObservers( this, this._observers.post, newState, oldState );
};
export default SvelteComponent; export default SvelteComponent;

10
test/js/samples/use-elements-as-anchors/expected.js
Unescape View File

@ -1,4 +1,4 @@
import { appendNode, assign, createComment, createElement, createText, detachNode, dispatchObservers, insertNode, noop, proto } from "svelte/shared.js"; import { appendNode, assign, createComment, createElement, createText, detachNode, insertNode, noop, proto } from "svelte/shared.js";
function create_main_fragment ( state, component ) { function create_main_fragment ( state, component ) {
var div, text, p, text_1, text_2, text_3, text_4, p_1, text_5, text_6, text_8, if_block_4_anchor; var div, text, p, text_1, text_2, text_3, text_4, p_1, text_5, text_6, text_8, if_block_4_anchor;
@ -271,12 +271,4 @@ function SvelteComponent ( options ) {
assign( SvelteComponent.prototype, proto ); assign( SvelteComponent.prototype, proto );
SvelteComponent.prototype._set = function _set ( newState ) {
var oldState = this._state;
this._state = assign( {}, oldState, newState );
dispatchObservers( this, this._observers.pre, newState, oldState );
this._fragment.update( newState, this._state );
dispatchObservers( this, this._observers.post, newState, oldState );
};
export default SvelteComponent; export default SvelteComponent;

7
test/runtime/samples/each-block-keyed/_config.js
Unescape View File

@ -6,7 +6,10 @@ export default {
] ]
}, },
html: '<p>implement keyed each blocks</p><p>implement client-side hydration</p>', html: `
<p>1: implement keyed each blocks</p>
<p>2: implement client-side hydration</p>
`,
test ( assert, component, target ) { test ( assert, component, target ) {
const [ p1, p2 ] = target.querySelectorAll( 'p' ); const [ p1, p2 ] = target.querySelectorAll( 'p' );
@ -16,7 +19,7 @@ export default {
{ id: 234, description: 'implement client-side hydration' } { id: 234, description: 'implement client-side hydration' }
] ]
}); });
assert.htmlEqual( target.innerHTML, '<p>implement client-side hydration</p>' ); assert.htmlEqual( target.innerHTML, '<p>1: implement client-side hydration</p>' );
const [ p3 ] = target.querySelectorAll( 'p' ); const [ p3 ] = target.querySelectorAll( 'p' );

4
test/runtime/samples/each-block-keyed/main.html
Unescape View File

@ -1,3 +1,3 @@
{{#each todos as todo @id}} {{#each todos as todo, i @id}}
<p>{{todo.description}}</p> <p>{{i+1}}: {{todo.description}}</p>
{{/each}} {{/each}}

26
test/runtime/samples/ignore-unchanged-attribute-compound/_config.js
Unescape View File

@ -0,0 +1,26 @@
import counter from './counter.js';
export default {
data: {
x: 1,
y: 2
},
html: `
<p>1</p>
<p class='-2-'></p>
`,
test(assert, component) {
counter.count = 0;
component.set({ x: 3 });
assert.equal(counter.count, 0);
component.set({ x: 4, y: 5 });
assert.equal(counter.count, 1);
component.set({ x: 5, y: 5 });
assert.equal(counter.count, 1);
}
};

3
test/runtime/samples/ignore-unchanged-attribute-compound/counter.js
Unescape View File

@ -0,0 +1,3 @@
export default {
count: 0
};

15
test/runtime/samples/ignore-unchanged-attribute-compound/main.html
Unescape View File

@ -0,0 +1,15 @@
<p>{{x}}</p>
<p class='-{{myHelper(y)}}-'></p>
<script>
import counter from './counter.js';
export default {
helpers: {
myHelper(value) {
counter.count += 1;
return value;
}
}
};
</script>

26
test/runtime/samples/ignore-unchanged-attribute/_config.js
Unescape View File

@ -0,0 +1,26 @@
import counter from './counter.js';
export default {
data: {
x: 1,
y: 2
},
html: `
<p>1</p>
<p class='2'></p>
`,
test(assert, component) {
counter.count = 0;
component.set({ x: 3 });
assert.equal(counter.count, 0);
component.set({ x: 4, y: 5 });
assert.equal(counter.count, 1);
component.set({ x: 5, y: 5 });
assert.equal(counter.count, 1);
}
};

3
test/runtime/samples/ignore-unchanged-attribute/counter.js
Unescape View File

@ -0,0 +1,3 @@
export default {
count: 0
};

15
test/runtime/samples/ignore-unchanged-attribute/main.html
Unescape View File

@ -0,0 +1,15 @@
<p>{{x}}</p>
<p class='{{myHelper(y)}}'></p>
<script>
import counter from './counter.js';
export default {
helpers: {
myHelper(value) {
counter.count += 1;
return value;
}
}
};
</script>

26
test/runtime/samples/ignore-unchanged-raw/_config.js
Unescape View File

@ -0,0 +1,26 @@
import counter from './counter.js';
export default {
data: {
x: 1,
y: 2
},
html: `
<p>1</p>
<p>2</p>
`,
test(assert, component) {
counter.count = 0;
component.set({ x: 3 });
assert.equal(counter.count, 0);
component.set({ x: 4, y: 5 });
assert.equal(counter.count, 1);
component.set({ x: 5, y: 5 });
assert.equal(counter.count, 1);
}
};

3
test/runtime/samples/ignore-unchanged-raw/counter.js
Unescape View File

@ -0,0 +1,3 @@
export default {
count: 0
};

15
test/runtime/samples/ignore-unchanged-raw/main.html
Unescape View File

@ -0,0 +1,15 @@
<p>{{x}}</p>
<p>{{{myHelper(y)}}}</p>
<script>
import counter from './counter.js';
export default {
helpers: {
myHelper(value) {
counter.count += 1;
return value;
}
}
};
</script>

26
test/runtime/samples/ignore-unchanged-tag/_config.js
Unescape View File

@ -0,0 +1,26 @@
import counter from './counter.js';
export default {
data: {
x: 1,
y: 2
},
html: `
<p>1</p>
<p>2</p>
`,
test(assert, component) {
counter.count = 0;
component.set({ x: 3 });
assert.equal(counter.count, 0);
component.set({ x: 4, y: 5 });
assert.equal(counter.count, 1);
component.set({ x: 5, y: 5 });
assert.equal(counter.count, 1);
}
};

3
test/runtime/samples/ignore-unchanged-tag/counter.js
Unescape View File

@ -0,0 +1,3 @@
export default {
count: 0
};

15
test/runtime/samples/ignore-unchanged-tag/main.html
Unescape View File

@ -0,0 +1,15 @@
<p>{{x}}</p>
<p>{{myHelper(y)}}</p>
<script>
import counter from './counter.js';
export default {
helpers: {
myHelper(value) {
counter.count += 1;
return value;
}
}
};
</script>
Write Preview
Loading…
Cancel
Save