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

Factor out each-block code into helper functions

Browse Source
pull/3547/head
Arpad Borsos 6 years ago
parent c250793b35
commit 58cbe7bbde
No known key found for this signature in database
GPG Key ID: 908EDF65263368B4
14 changed files with 375 additions and 291 deletions
Show Stats Download Patch File Download Diff File

2
package-lock.json generated
Unescape View File

@ -1,6 +1,6 @@
{ {
"name": "svelte", "name": "svelte",
"version": "3.11.0", "version": "3.12.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

2
src/compiler/compile/render_dom/Block.ts
Unescape View File

@ -422,7 +422,7 @@ export default class Block {
return deindent` return deindent`
${this.comment && `// ${escape(this.comment, { only_escape_at_symbol: true })}`} ${this.comment && `// ${escape(this.comment, { only_escape_at_symbol: true })}`}
function ${this.name}(${this.key ? `${local_key}, ` : ''}ctx) { function ${this.name}(ctx${this.key ? `, ${local_key}` : ''}) {
${this.get_contents(local_key)} ${this.get_contents(local_key)}
} }
`; `;

204
src/compiler/compile/render_dom/wrappers/EachBlock.ts
Unescape View File

@ -120,7 +120,7 @@ export default class EachBlockWrapper extends Wrapper {
// optimisation for array literal // optimisation for array literal
fixed_length, fixed_length,
data_length: fixed_length === null ? `${each_block_value}.[✂${c}-${c+4}✂]` : fixed_length, data_length: fixed_length === null ? `${each_block_value}.[✂${c}-${c+4}✂]` : fixed_length,
view_length: fixed_length === null ? `${iterations}.[✂${c}-${c+4}✂]` : fixed_length view_length: fixed_length === null ? `${iterations}.b.[✂${c}-${c+4}✂]` : fixed_length
}; };
const store = const store =
@ -175,7 +175,6 @@ export default class EachBlockWrapper extends Wrapper {
if (this.fragment.nodes.length === 0) return; if (this.fragment.nodes.length === 0) return;
const { renderer } = this; const { renderer } = this;
const { component } = renderer;
const needs_anchor = this.next const needs_anchor = this.next
? !this.next.is_dom_node() : ? !this.next.is_dom_node() :
@ -188,8 +187,6 @@ export default class EachBlockWrapper extends Wrapper {
const snippet = this.node.expression.render(block); const snippet = this.node.expression.render(block);
block.builders.init.add_line(`let ${this.vars.each_block_value} = ${snippet};`);
renderer.blocks.push(deindent` renderer.blocks.push(deindent`
function ${this.vars.get_each_context}(ctx, list, i) { function ${this.vars.get_each_context}(ctx, list, i) {
const child_ctx = @_Object.create(ctx); const child_ctx = @_Object.create(ctx);
@ -205,13 +202,25 @@ export default class EachBlockWrapper extends Wrapper {
: (this.next && this.next.var) || 'null'; : (this.next && this.next.var) || 'null';
const update_mount_node = this.get_update_mount_node(update_anchor_node); const update_mount_node = this.get_update_mount_node(update_anchor_node);
block.builders.init.add_line(`let ${this.vars.each_block_value} = ${snippet};`);
const { iterations } = this.vars
block.builders.init.add_block(deindent`
let ${iterations} = @init_each_block(
ctx,
${this.vars.get_each_context},
ctx => ${snippet},
${this.node.key ? `ctx => ${this.node.key.render()}` : 'null'},
${this.vars.create_each_block},
${this.else ? this.else.block.name : 'null'}
);
`)
const args = { const args = {
block, block,
parent_node, parent_node,
parent_nodes, parent_nodes,
snippet, snippet,
initial_anchor_node,
initial_mount_node,
update_anchor_node, update_anchor_node,
update_mount_node update_mount_node
}; };
@ -222,10 +231,24 @@ export default class EachBlockWrapper extends Wrapper {
this.render_unkeyed(args); this.render_unkeyed(args);
} }
block.builders.create.add_block(deindent`
@create_each_blocks(${iterations});
`);
if (parent_nodes && this.renderer.options.hydratable) {
block.builders.claim.add_block(deindent`
@claim_each_blocks(${iterations}, ${parent_nodes});
`);
}
block.builders.mount.add_block(deindent`
@mount_each_blocks(${iterations}, ${initial_mount_node}, ${initial_anchor_node});
`);
if (this.block.has_intro_method || this.block.has_outro_method) { if (this.block.has_intro_method || this.block.has_outro_method) {
block.builders.intro.add_block(deindent` block.builders.intro.add_block(deindent`
for (let #i = 0; #i < ${this.vars.data_length}; #i += 1) { for (let #i = 0; #i < ${this.vars.data_length}; #i += 1) {
@transition_in(${this.vars.iterations}[#i]); @transition_in(${iterations}.b[#i]);
} }
`); `);
} }
@ -240,23 +263,7 @@ export default class EachBlockWrapper extends Wrapper {
} }
if (this.else) { if (this.else) {
const each_block_else = component.get_unique_name(`${this.var}_else`); const each_block_else = `${iterations}.e`;
block.builders.init.add_line(`let ${each_block_else} = null;`);
// TODO neaten this up... will end up with an empty line in the block
block.builders.init.add_block(deindent`
if (!${this.vars.data_length}) {
${each_block_else} = ${this.else.block.name}(ctx);
${each_block_else}.c();
}
`);
block.builders.mount.add_block(deindent`
if (${each_block_else}) {
${each_block_else}.m(${initial_mount_node}, ${initial_anchor_node});
}
`);
if (this.else.block.has_update_method) { if (this.else.block.has_update_method) {
block.builders.update.add_block(deindent` block.builders.update.add_block(deindent`
@ -285,10 +292,6 @@ export default class EachBlockWrapper extends Wrapper {
} }
`); `);
} }
block.builders.destroy.add_block(deindent`
if (${each_block_else}) ${each_block_else}.d(${parent_node ? '' : 'detaching'});
`);
} }
this.fragment.render(this.block, null, 'nodes'); this.fragment.render(this.block, null, 'nodes');
@ -303,8 +306,6 @@ export default class EachBlockWrapper extends Wrapper {
parent_node, parent_node,
parent_nodes, parent_nodes,
snippet, snippet,
initial_anchor_node,
initial_mount_node,
update_anchor_node, update_anchor_node,
update_mount_node update_mount_node
}: { }: {
@ -312,24 +313,14 @@ export default class EachBlockWrapper extends Wrapper {
parent_node: string; parent_node: string;
parent_nodes: string; parent_nodes: string;
snippet: string; snippet: string;
initial_anchor_node: string;
initial_mount_node: string;
update_anchor_node: string; update_anchor_node: string;
update_mount_node: string; update_mount_node: string;
}) { }) {
const { const {
create_each_block,
length,
iterations, iterations,
view_length view_length
} = this.vars; } = this.vars;
const get_key = block.get_unique_name('get_key');
const lookup = block.get_unique_name(`${this.var}_lookup`);
block.add_variable(iterations, '[]');
block.add_variable(lookup, `new @_Map()`);
if (this.fragment.nodes[0].is_dom_node()) { if (this.fragment.nodes[0].is_dom_node()) {
this.block.first = this.fragment.nodes[0].var; this.block.first = this.fragment.nodes[0].var;
} else { } else {
@ -342,38 +333,6 @@ export default class EachBlockWrapper extends Wrapper {
); );
} }
block.builders.init.add_block(deindent`
const ${get_key} = ctx => ${
// @ts-ignore todo: probably error
this.node.key.render()};
for (let #i = 0; #i < ${this.vars.each_block_value}.${length}; #i += 1) {
let child_ctx = ${this.vars.get_each_context}(ctx, ${this.vars.each_block_value}, #i);
let key = ${get_key}(child_ctx);
${lookup}.set(key, ${iterations}[#i] = ${create_each_block}(key, child_ctx));
}
`);
block.builders.create.add_block(deindent`
for (let #i = 0; #i < ${view_length}; #i += 1) {
${iterations}[#i].c();
}
`);
if (parent_nodes && this.renderer.options.hydratable) {
block.builders.claim.add_block(deindent`
for (let #i = 0; #i < ${view_length}; #i += 1) {
${iterations}[#i].l(${parent_nodes});
}
`);
}
block.builders.mount.add_block(deindent`
for (let #i = 0; #i < ${view_length}; #i += 1) {
${iterations}[#i].m(${initial_mount_node}, ${initial_anchor_node});
}
`);
const dynamic = this.block.has_update_method; const dynamic = this.block.has_update_method;
const destroy = this.node.has_animation const destroy = this.node.has_animation
@ -388,41 +347,41 @@ export default class EachBlockWrapper extends Wrapper {
const ${this.vars.each_block_value} = ${snippet}; const ${this.vars.each_block_value} = ${snippet};
${this.block.has_outros && `@group_outros();`} ${this.block.has_outros && `@group_outros();`}
${this.node.has_animation && `for (let #i = 0; #i < ${view_length}; #i += 1) ${iterations}[#i].r();`} ${this.node.has_animation && `for (let #i = 0; #i < ${view_length}; #i += 1) ${iterations}.b[#i].r();`}
${iterations} = @update_keyed_each(${iterations}, changed, ${get_key}, ${dynamic ? '1' : '0'}, ctx, ${this.vars.each_block_value}, ${lookup}, ${update_mount_node}, ${destroy}, ${create_each_block}, ${update_anchor_node}, ${this.vars.get_each_context}); @update_keyed_each(
${this.node.has_animation && `for (let #i = 0; #i < ${view_length}; #i += 1) ${iterations}[#i].a();`} ${iterations},
changed,
${dynamic ? '1' : '0'},
ctx,
${update_mount_node},
${destroy},
${update_anchor_node}
);
${this.node.has_animation && `for (let #i = 0; #i < ${view_length}; #i += 1) ${iterations}.b[#i].a();`}
${this.block.has_outros && `@check_outros();`} ${this.block.has_outros && `@check_outros();`}
`); `);
if (this.block.has_outros) { if (this.block.has_outros) {
block.builders.outro.add_block(deindent` block.builders.outro.add_block(deindent`
for (let #i = 0; #i < ${view_length}; #i += 1) { for (let #i = 0; #i < ${view_length}; #i += 1) {
@transition_out(${iterations}[#i]); @transition_out(${iterations}.b[#i]);
} }
`); `);
} }
block.builders.destroy.add_block(deindent` block.builders.destroy.add_block(deindent`
for (let #i = 0; #i < ${view_length}; #i += 1) { @destroy_each_blocks(${iterations}, ${parent_node ? '' : 'detaching'});
${iterations}[#i].d(${parent_node ? '' : 'detaching'});
}
`); `);
} }
render_unkeyed({ render_unkeyed({
block, block,
parent_nodes,
snippet, snippet,
initial_anchor_node,
initial_mount_node,
update_anchor_node, update_anchor_node,
update_mount_node update_mount_node
}: { }: {
block: Block; block: Block;
parent_nodes: string;
snippet: string; snippet: string;
initial_anchor_node: string;
initial_mount_node: string;
update_anchor_node: string; update_anchor_node: string;
update_mount_node: string; update_mount_node: string;
}) { }) {
@ -431,38 +390,9 @@ export default class EachBlockWrapper extends Wrapper {
length, length,
iterations, iterations,
fixed_length, fixed_length,
data_length,
view_length view_length
} = this.vars; } = this.vars;
block.builders.init.add_block(deindent`
let ${iterations} = [];
for (let #i = 0; #i < ${data_length}; #i += 1) {
${iterations}[#i] = ${create_each_block}(${this.vars.get_each_context}(ctx, ${this.vars.each_block_value}, #i));
}
`);
block.builders.create.add_block(deindent`
for (let #i = 0; #i < ${view_length}; #i += 1) {
${iterations}[#i].c();
}
`);
if (parent_nodes && this.renderer.options.hydratable) {
block.builders.claim.add_block(deindent`
for (let #i = 0; #i < ${view_length}; #i += 1) {
${iterations}[#i].l(${parent_nodes});
}
`);
}
block.builders.mount.add_block(deindent`
for (let #i = 0; #i < ${view_length}; #i += 1) {
${iterations}[#i].m(${initial_mount_node}, ${initial_anchor_node});
}
`);
const all_dependencies = new Set(this.block.dependencies); const all_dependencies = new Set(this.block.dependencies);
const { dependencies } = this.node.expression; const { dependencies } = this.node.expression;
dependencies.forEach((dependency: string) => { dependencies.forEach((dependency: string) => {
@ -478,32 +408,32 @@ export default class EachBlockWrapper extends Wrapper {
if (condition !== '') { if (condition !== '') {
const for_loop_body = this.block.has_update_method const for_loop_body = this.block.has_update_method
? deindent` ? deindent`
if (${iterations}[#i]) { if (${iterations}.b[#i]) {
${iterations}[#i].p(changed, child_ctx); ${iterations}.b[#i].p(changed, child_ctx);
${has_transitions && `@transition_in(${this.vars.iterations}[#i], 1);`} ${has_transitions && `@transition_in(${this.vars.iterations}.b[#i], 1);`}
} else { } else {
${iterations}[#i] = ${create_each_block}(child_ctx); ${iterations}.b[#i] = ${create_each_block}(child_ctx);
${iterations}[#i].c(); ${iterations}.b[#i].c();
${has_transitions && `@transition_in(${this.vars.iterations}[#i], 1);`} ${has_transitions && `@transition_in(${this.vars.iterations}.b[#i], 1);`}
${iterations}[#i].m(${update_mount_node}, ${update_anchor_node}); ${iterations}.b[#i].m(${update_mount_node}, ${update_anchor_node});
} }
` `
: has_transitions : has_transitions
? deindent` ? deindent`
if (${iterations}[#i]) { if (${iterations}.b[#i]) {
@transition_in(${this.vars.iterations}[#i], 1); @transition_in(${this.vars.iterations}.b[#i], 1);
} else { } else {
${iterations}[#i] = ${create_each_block}(child_ctx); ${iterations}.b[#i] = ${create_each_block}(child_ctx);
${iterations}[#i].c(); ${iterations}.b[#i].c();
@transition_in(${this.vars.iterations}[#i], 1); @transition_in(${this.vars.iterations}.b[#i], 1);
${iterations}[#i].m(${update_mount_node}, ${update_anchor_node}); ${iterations}.b[#i].m(${update_mount_node}, ${update_anchor_node});
} }
` `
: deindent` : deindent`
if (!${iterations}[#i]) { if (!${iterations}.b[#i]) {
${iterations}[#i] = ${create_each_block}(child_ctx); ${iterations}.b[#i] = ${create_each_block}(child_ctx);
${iterations}[#i].c(); ${iterations}.b[#i].c();
${iterations}[#i].m(${update_mount_node}, ${update_anchor_node}); ${iterations}.b[#i].m(${update_mount_node}, ${update_anchor_node});
} }
`; `;
@ -515,8 +445,8 @@ export default class EachBlockWrapper extends Wrapper {
const out = block.get_unique_name('out'); const out = block.get_unique_name('out');
block.builders.init.add_block(deindent` block.builders.init.add_block(deindent`
const ${out} = i => @transition_out(${iterations}[i], 1, 1, () => { const ${out} = i => @transition_out(${iterations}.b[i], 1, 1, () => {
${iterations}[i] = null; ${iterations}.b[i] = null;
}); });
`); `);
remove_old_blocks = deindent` remove_old_blocks = deindent`
@ -529,7 +459,7 @@ export default class EachBlockWrapper extends Wrapper {
} else { } else {
remove_old_blocks = deindent` remove_old_blocks = deindent`
for (${this.block.has_update_method ? `` : `#i = ${this.vars.each_block_value}.${length}`}; #i < ${this.block.has_update_method ? view_length : '#old_length'}; #i += 1) { for (${this.block.has_update_method ? `` : `#i = ${this.vars.each_block_value}.${length}`}; #i < ${this.block.has_update_method ? view_length : '#old_length'}; #i += 1) {
${iterations}[#i].d(1); ${iterations}.b[#i].d(1);
} }
${!fixed_length && `${view_length} = ${this.vars.each_block_value}.${length};`} ${!fixed_length && `${view_length} = ${this.vars.each_block_value}.${length};`}
`; `;
@ -560,13 +490,13 @@ export default class EachBlockWrapper extends Wrapper {
if (this.block.has_outros) { if (this.block.has_outros) {
block.builders.outro.add_block(deindent` block.builders.outro.add_block(deindent`
${iterations} = ${iterations}.filter(@_Boolean); ${iterations}.b = ${iterations}.b.filter(@_Boolean);
for (let #i = 0; #i < ${view_length}; #i += 1) { for (let #i = 0; #i < ${view_length}; #i += 1) {
@transition_out(${iterations}[#i]); @transition_out(${iterations}.b[#i]);
} }
`); `);
} }
block.builders.destroy.add_block(`@destroy_each(${iterations}, detaching);`); block.builders.destroy.add_block(`@destroy_each_blocks(${iterations}, detaching);`);
} }
} }

6
src/runtime/internal/dom.ts
Unescape View File

@ -10,12 +10,6 @@ export function detach(node: Node) {
node.parentNode.removeChild(node); node.parentNode.removeChild(node);
} }
export function destroy_each(iterations, detaching) {
for (let i = 0; i < iterations.length; i += 1) {
if (iterations[i]) iterations[i].d(detaching);
}
}
export function element<K extends keyof HTMLElementTagNameMap>(name: K) { export function element<K extends keyof HTMLElementTagNameMap>(name: K) {
return document.createElement<K>(name); return document.createElement<K>(name);
} }

126
src/runtime/internal/each_block.ts
Unescape View File

@ -0,0 +1,126 @@
interface Fragment {
key: string;
/** create */
c: () => void;
/** claim */
l?: (nodes: Array<Node>) => void;
/** hydrate */
h?: () => void;
/** mount */
m: (target: Node, anchor?: Node | null) => void;
/** update */
p?: (changed: unknown, context: unknown) => void;
/** intro */
i?: () => void;
/** outro */
o?: () => void;
/** destroy */
d: (detaching: boolean) => void;
}
export interface EachBlock {
/** each_blocks */
b: Array<Fragment>;
/** each_lookup */
l: Map<unknown, Fragment>;
/** else_block */
e: Fragment | null;
/** get_each_context */
gc: (context: unknown, each_value: unknown, i: number) => unknown;
/** get_each_value */
gv: (context: unknown) => Array<unknown>;
/** get_key */
gk?: (child_context: unknown) => string;
/** create_each_block */
cb: (context: unknown, key?: unknown) => Fragment;
/** create_else_block */
ce?: (context: unknown) => Fragment;
}
export function init_each_block(
context: unknown,
get_each_context: EachBlock['gc'],
get_each_value: EachBlock['gv'],
get_key: EachBlock['gk'],
create_each_block: EachBlock['cb'],
create_else_block: EachBlock['ce']
): EachBlock {
const each_value = get_each_value(context);
const each_blocks = [];
const each_lookup = new Map();
for (let i = 0; i < each_value.length; i += 1) {
let child_ctx = get_each_context(context, each_value, i);
let key = get_key && get_key(child_ctx);
each_lookup.set(key, (each_blocks[i] = create_each_block(child_ctx, key)));
}
let else_block = null;
if (create_else_block && !each_value.length) {
else_block = create_else_block(context);
// TODO: Why exactly is this here and not in the `create` hook?
else_block.c();
}
return {
b: each_blocks,
l: each_lookup,
e: else_block,
gc: get_each_context,
gv: get_each_value,
gk: get_key,
cb: create_each_block,
ce: create_else_block,
};
}
export function create_each_blocks(each_block: EachBlock) {
for (const block of each_block.b) {
block.c();
}
}
export function claim_each_blocks(each_blocks: EachBlock, nodes: Array<Node>) {
for (const block of each_blocks.b) {
if (block.l) {
block.l(nodes);
}
}
}
export function mount_each_blocks(
each_blocks: EachBlock,
target: Node,
anchor?: Node | null
) {
for (const block of each_blocks.b) {
block.m(target, anchor);
}
if (each_blocks.e) {
each_blocks.e.m(target, anchor);
}
}
export function destroy_each_blocks(
each_blocks: EachBlock,
detaching: boolean
) {
for (const block of each_blocks.b) {
if (block) {
block.d(detaching);
}
}
if (each_blocks.e) {
each_blocks.e.d(detaching);
}
}

1
src/runtime/internal/index.ts
Unescape View File

@ -13,3 +13,4 @@ export * from './transitions';
export * from './utils'; export * from './utils';
export * from './Component'; export * from './Component';
export * from './dev'; export * from './dev';
export * from './each_block';

15
src/runtime/internal/keyed_each.ts
Unescape View File

@ -1,3 +1,4 @@
import { EachBlock } from './each_block';
import { transition_in, transition_out } from './transitions'; import { transition_in, transition_out } from './transitions';
export function destroy_block(block, lookup) { export function destroy_block(block, lookup) {
@ -21,7 +22,15 @@ export function fix_and_outro_and_destroy_block(block, lookup) {
outro_and_destroy_block(block, lookup); outro_and_destroy_block(block, lookup);
} }
export function update_keyed_each(old_blocks, changed, get_key, dynamic, ctx, list, lookup, node, destroy, create_each_block, next, get_context) { export function update_keyed_each(each_block: EachBlock, changed, dynamic, ctx, node, destroy, next) {
const {
b: old_blocks,
l: lookup,
cb: create_each_block,
gk: get_key,
gc: get_context,
} = each_block;
const list = each_block.gv(ctx);
let o = old_blocks.length; let o = old_blocks.length;
let n = list.length; let n = list.length;
@ -40,7 +49,7 @@ export function update_keyed_each(old_blocks, changed, get_key, dynamic, ctx, li
let block = lookup.get(key); let block = lookup.get(key);
if (!block) { if (!block) {
block = create_each_block(key, child_ctx); block = create_each_block(child_ctx, key);
block.c(); block.c();
} else if (dynamic) { } else if (dynamic) {
block.p(changed, child_ctx); block.p(changed, child_ctx);
@ -105,7 +114,7 @@ export function update_keyed_each(old_blocks, changed, get_key, dynamic, ctx, li
while (n) insert(new_blocks[n - 1]); while (n) insert(new_blocks[n - 1]);
return new_blocks; each_block.b = new_blocks;
} }
export function measure(blocks) { export function measure(blocks) {

44
test/js/samples/debug-foo-bar-baz-things/expected.js
Unescape View File

@ -3,12 +3,15 @@ import {
SvelteComponentDev, SvelteComponentDev,
add_location, add_location,
append_dev, append_dev,
destroy_each, create_each_blocks,
destroy_each_blocks,
detach_dev, detach_dev,
dispatch_dev, dispatch_dev,
element, element,
init, init,
init_each_block,
insert_dev, insert_dev,
mount_each_blocks,
noop, noop,
safe_not_equal, safe_not_equal,
set_data_dev, set_data_dev,
@ -76,17 +79,18 @@ function create_fragment(ctx) {
let each_value = ctx.things; let each_value = ctx.things;
let each_blocks = []; let each_blocks = init_each_block(
ctx,
for (let i = 0; i < each_value.length; i += 1) { get_each_context,
each_blocks[i] = create_each_block(get_each_context(ctx, each_value, i)); ctx => ctx.things,
} null,
create_each_block,
null
);
const block = { const block = {
c: function create() { c: function create() {
for (let i = 0; i < each_blocks.length; i += 1) { create_each_blocks(each_blocks);
each_blocks[i].c();
}
t0 = space(); t0 = space();
p = element("p"); p = element("p");
@ -100,9 +104,7 @@ function create_fragment(ctx) {
}, },
m: function mount(target, anchor) { m: function mount(target, anchor) {
for (let i = 0; i < each_blocks.length; i += 1) { mount_each_blocks(each_blocks, target, anchor);
each_blocks[i].m(target, anchor);
}
insert_dev(target, t0, anchor); insert_dev(target, t0, anchor);
insert_dev(target, p, anchor); insert_dev(target, p, anchor);
@ -118,19 +120,19 @@ function create_fragment(ctx) {
for (i = 0; i < each_value.length; i += 1) { for (i = 0; i < each_value.length; i += 1) {
const child_ctx = get_each_context(ctx, each_value, i); const child_ctx = get_each_context(ctx, each_value, i);
if (each_blocks[i]) { if (each_blocks.b[i]) {
each_blocks[i].p(changed, child_ctx); each_blocks.b[i].p(changed, child_ctx);
} else { } else {
each_blocks[i] = create_each_block(child_ctx); each_blocks.b[i] = create_each_block(child_ctx);
each_blocks[i].c(); each_blocks.b[i].c();
each_blocks[i].m(t0.parentNode, t0); each_blocks.b[i].m(t0.parentNode, t0);
} }
} }
for (; i < each_blocks.length; i += 1) { for (; i < each_blocks.b.length; i += 1) {
each_blocks[i].d(1); each_blocks.b[i].d(1);
} }
each_blocks.length = each_value.length; each_blocks.b.length = each_value.length;
} }
if (changed.foo) { if (changed.foo) {
@ -142,7 +144,7 @@ function create_fragment(ctx) {
o: noop, o: noop,
d: function destroy(detaching) { d: function destroy(detaching) {
destroy_each(each_blocks, detaching); destroy_each_blocks(each_blocks, detaching);
if (detaching) { if (detaching) {
detach_dev(t0); detach_dev(t0);

44
test/js/samples/debug-foo/expected.js
Unescape View File

@ -3,12 +3,15 @@ import {
SvelteComponentDev, SvelteComponentDev,
add_location, add_location,
append_dev, append_dev,
destroy_each, create_each_blocks,
destroy_each_blocks,
detach_dev, detach_dev,
dispatch_dev, dispatch_dev,
element, element,
init, init,
init_each_block,
insert_dev, insert_dev,
mount_each_blocks,
noop, noop,
safe_not_equal, safe_not_equal,
set_data_dev, set_data_dev,
@ -76,17 +79,18 @@ function create_fragment(ctx) {
let each_value = ctx.things; let each_value = ctx.things;
let each_blocks = []; let each_blocks = init_each_block(
ctx,
for (let i = 0; i < each_value.length; i += 1) { get_each_context,
each_blocks[i] = create_each_block(get_each_context(ctx, each_value, i)); ctx => ctx.things,
} null,
create_each_block,
null
);
const block = { const block = {
c: function create() { c: function create() {
for (let i = 0; i < each_blocks.length; i += 1) { create_each_blocks(each_blocks);
each_blocks[i].c();
}
t0 = space(); t0 = space();
p = element("p"); p = element("p");
@ -100,9 +104,7 @@ function create_fragment(ctx) {
}, },
m: function mount(target, anchor) { m: function mount(target, anchor) {
for (let i = 0; i < each_blocks.length; i += 1) { mount_each_blocks(each_blocks, target, anchor);
each_blocks[i].m(target, anchor);
}
insert_dev(target, t0, anchor); insert_dev(target, t0, anchor);
insert_dev(target, p, anchor); insert_dev(target, p, anchor);
@ -118,19 +120,19 @@ function create_fragment(ctx) {
for (i = 0; i < each_value.length; i += 1) { for (i = 0; i < each_value.length; i += 1) {
const child_ctx = get_each_context(ctx, each_value, i); const child_ctx = get_each_context(ctx, each_value, i);
if (each_blocks[i]) { if (each_blocks.b[i]) {
each_blocks[i].p(changed, child_ctx); each_blocks.b[i].p(changed, child_ctx);
} else { } else {
each_blocks[i] = create_each_block(child_ctx); each_blocks.b[i] = create_each_block(child_ctx);
each_blocks[i].c(); each_blocks.b[i].c();
each_blocks[i].m(t0.parentNode, t0); each_blocks.b[i].m(t0.parentNode, t0);
} }
} }
for (; i < each_blocks.length; i += 1) { for (; i < each_blocks.b.length; i += 1) {
each_blocks[i].d(1); each_blocks.b[i].d(1);
} }
each_blocks.length = each_value.length; each_blocks.b.length = each_value.length;
} }
if (changed.foo) { if (changed.foo) {
@ -142,7 +144,7 @@ function create_fragment(ctx) {
o: noop, o: noop,
d: function destroy(detaching) { d: function destroy(detaching) {
destroy_each(each_blocks, detaching); destroy_each_blocks(each_blocks, detaching);
if (detaching) { if (detaching) {
detach_dev(t0); detach_dev(t0);

44
test/js/samples/deconflict-builtins/expected.js
Unescape View File

@ -2,12 +2,15 @@
import { import {
SvelteComponent, SvelteComponent,
append, append,
destroy_each, create_each_blocks,
destroy_each_blocks,
detach, detach,
element, element,
empty, empty,
init, init,
init_each_block,
insert, insert,
mount_each_blocks,
noop, noop,
safe_not_equal, safe_not_equal,
set_data, set_data,
@ -54,25 +57,24 @@ function create_fragment(ctx) {
let each_value = ctx.createElement; let each_value = ctx.createElement;
let each_blocks = []; let each_blocks = init_each_block(
ctx,
for (let i = 0; i < each_value.length; i += 1) { get_each_context,
each_blocks[i] = create_each_block(get_each_context(ctx, each_value, i)); ctx => ctx.createElement,
} null,
create_each_block,
null
);
return { return {
c() { c() {
for (let i = 0; i < each_blocks.length; i += 1) { create_each_blocks(each_blocks);
each_blocks[i].c();
}
each_1_anchor = empty(); each_1_anchor = empty();
}, },
m(target, anchor) { m(target, anchor) {
for (let i = 0; i < each_blocks.length; i += 1) { mount_each_blocks(each_blocks, target, anchor);
each_blocks[i].m(target, anchor);
}
insert(target, each_1_anchor, anchor); insert(target, each_1_anchor, anchor);
}, },
@ -85,19 +87,19 @@ function create_fragment(ctx) {
for (i = 0; i < each_value.length; i += 1) { for (i = 0; i < each_value.length; i += 1) {
const child_ctx = get_each_context(ctx, each_value, i); const child_ctx = get_each_context(ctx, each_value, i);
if (each_blocks[i]) { if (each_blocks.b[i]) {
each_blocks[i].p(changed, child_ctx); each_blocks.b[i].p(changed, child_ctx);
} else { } else {
each_blocks[i] = create_each_block(child_ctx); each_blocks.b[i] = create_each_block(child_ctx);
each_blocks[i].c(); each_blocks.b[i].c();
each_blocks[i].m(each_1_anchor.parentNode, each_1_anchor); each_blocks.b[i].m(each_1_anchor.parentNode, each_1_anchor);
} }
} }
for (; i < each_blocks.length; i += 1) { for (; i < each_blocks.b.length; i += 1) {
each_blocks[i].d(1); each_blocks.b[i].d(1);
} }
each_blocks.length = each_value.length; each_blocks.b.length = each_value.length;
} }
}, },
@ -105,7 +107,7 @@ function create_fragment(ctx) {
o: noop, o: noop,
d(detaching) { d(detaching) {
destroy_each(each_blocks, detaching); destroy_each_blocks(each_blocks, detaching);
if (detaching) { if (detaching) {
detach(each_1_anchor); detach(each_1_anchor);

40
test/js/samples/each-block-array-literal/expected.js
Unescape View File

@ -2,12 +2,15 @@
import { import {
SvelteComponent, SvelteComponent,
append, append,
destroy_each, create_each_blocks,
destroy_each_blocks,
detach, detach,
element, element,
empty, empty,
init, init,
init_each_block,
insert, insert,
mount_each_blocks,
noop, noop,
safe_not_equal, safe_not_equal,
set_data, set_data,
@ -54,25 +57,24 @@ function create_fragment(ctx) {
let each_value = [ctx.a, ctx.b, ctx.c, ctx.d, ctx.e]; let each_value = [ctx.a, ctx.b, ctx.c, ctx.d, ctx.e];
let each_blocks = []; let each_blocks = init_each_block(
ctx,
for (let i = 0; i < 5; i += 1) { get_each_context,
each_blocks[i] = create_each_block(get_each_context(ctx, each_value, i)); ctx => [ctx.a, ctx.b, ctx.c, ctx.d, ctx.e],
} null,
create_each_block,
null
);
return { return {
c() { c() {
for (let i = 0; i < 5; i += 1) { create_each_blocks(each_blocks);
each_blocks[i].c();
}
each_1_anchor = empty(); each_1_anchor = empty();
}, },
m(target, anchor) { m(target, anchor) {
for (let i = 0; i < 5; i += 1) { mount_each_blocks(each_blocks, target, anchor);
each_blocks[i].m(target, anchor);
}
insert(target, each_1_anchor, anchor); insert(target, each_1_anchor, anchor);
}, },
@ -85,17 +87,17 @@ function create_fragment(ctx) {
for (i = 0; i < each_value.length; i += 1) { for (i = 0; i < each_value.length; i += 1) {
const child_ctx = get_each_context(ctx, each_value, i); const child_ctx = get_each_context(ctx, each_value, i);
if (each_blocks[i]) { if (each_blocks.b[i]) {
each_blocks[i].p(changed, child_ctx); each_blocks.b[i].p(changed, child_ctx);
} else { } else {
each_blocks[i] = create_each_block(child_ctx); each_blocks.b[i] = create_each_block(child_ctx);
each_blocks[i].c(); each_blocks.b[i].c();
each_blocks[i].m(each_1_anchor.parentNode, each_1_anchor); each_blocks.b[i].m(each_1_anchor.parentNode, each_1_anchor);
} }
} }
for (; i < 5; i += 1) { for (; i < 5; i += 1) {
each_blocks[i].d(1); each_blocks.b[i].d(1);
} }
} }
}, },
@ -104,7 +106,7 @@ function create_fragment(ctx) {
o: noop, o: noop,
d(detaching) { d(detaching) {
destroy_each(each_blocks, detaching); destroy_each_blocks(each_blocks, detaching);
if (detaching) { if (detaching) {
detach(each_1_anchor); detach(each_1_anchor);

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

@ -4,11 +4,14 @@ import {
SvelteComponent, SvelteComponent,
append, append,
attr, attr,
destroy_each, create_each_blocks,
destroy_each_blocks,
detach, detach,
element, element,
init, init,
init_each_block,
insert, insert,
mount_each_blocks,
noop, noop,
safe_not_equal, safe_not_equal,
set_data, set_data,
@ -85,17 +88,18 @@ function create_fragment(ctx) {
let each_value = ctx.comments; let each_value = ctx.comments;
let each_blocks = []; let each_blocks = init_each_block(
ctx,
for (let i = 0; i < each_value.length; i += 1) { get_each_context,
each_blocks[i] = create_each_block(get_each_context(ctx, each_value, i)); ctx => ctx.comments,
} null,
create_each_block,
null
);
return { return {
c() { c() {
for (let i = 0; i < each_blocks.length; i += 1) { create_each_blocks(each_blocks);
each_blocks[i].c();
}
t0 = space(); t0 = space();
p = element("p"); p = element("p");
@ -103,9 +107,7 @@ function create_fragment(ctx) {
}, },
m(target, anchor) { m(target, anchor) {
for (let i = 0; i < each_blocks.length; i += 1) { mount_each_blocks(each_blocks, target, anchor);
each_blocks[i].m(target, anchor);
}
insert(target, t0, anchor); insert(target, t0, anchor);
insert(target, p, anchor); insert(target, p, anchor);
@ -120,19 +122,19 @@ function create_fragment(ctx) {
for (i = 0; i < each_value.length; i += 1) { for (i = 0; i < each_value.length; i += 1) {
const child_ctx = get_each_context(ctx, each_value, i); const child_ctx = get_each_context(ctx, each_value, i);
if (each_blocks[i]) { if (each_blocks.b[i]) {
each_blocks[i].p(changed, child_ctx); each_blocks.b[i].p(changed, child_ctx);
} else { } else {
each_blocks[i] = create_each_block(child_ctx); each_blocks.b[i] = create_each_block(child_ctx);
each_blocks[i].c(); each_blocks.b[i].c();
each_blocks[i].m(t0.parentNode, t0); each_blocks.b[i].m(t0.parentNode, t0);
} }
} }
for (; i < each_blocks.length; i += 1) { for (; i < each_blocks.b.length; i += 1) {
each_blocks[i].d(1); each_blocks.b[i].d(1);
} }
each_blocks.length = each_value.length; each_blocks.b.length = each_value.length;
} }
if (changed.foo) { if (changed.foo) {
@ -144,7 +146,7 @@ function create_fragment(ctx) {
o: noop, o: noop,
d(detaching) { d(detaching) {
destroy_each(each_blocks, detaching); destroy_each_blocks(each_blocks, detaching);
if (detaching) { if (detaching) {
detach(t0); detach(t0);

49
test/js/samples/each-block-keyed-animated/expected.js
Unescape View File

@ -3,13 +3,17 @@ import {
SvelteComponent, SvelteComponent,
append, append,
create_animation, create_animation,
create_each_blocks,
destroy_each_blocks,
detach, detach,
element, element,
empty, empty,
fix_and_destroy_block, fix_and_destroy_block,
fix_position, fix_position,
init, init,
init_each_block,
insert, insert,
mount_each_blocks,
noop, noop,
safe_not_equal, safe_not_equal,
set_data, set_data,
@ -24,7 +28,7 @@ function get_each_context(ctx, list, i) {
} }
// (19:0) {#each things as thing (thing.id)} // (19:0) {#each things as thing (thing.id)}
function create_each_block(key_1, ctx) { function create_each_block(ctx, key_1) {
var div, t_value = ctx.thing.name + "", t, rect, stop_animation = noop; var div, t_value = ctx.thing.name + "", t, rect, stop_animation = noop;
return { return {
@ -72,49 +76,52 @@ function create_each_block(key_1, ctx) {
} }
function create_fragment(ctx) { function create_fragment(ctx) {
var each_blocks = [], each_1_lookup = new Map(), each_1_anchor; var each_1_anchor;
let each_value = ctx.things; let each_value = ctx.things;
const get_key = ctx => ctx.thing.id; let each_blocks = init_each_block(
ctx,
for (let i = 0; i < each_value.length; i += 1) { get_each_context,
let child_ctx = get_each_context(ctx, each_value, i); ctx => ctx.things,
let key = get_key(child_ctx); ctx => ctx.thing.id,
each_1_lookup.set(key, each_blocks[i] = create_each_block(key, child_ctx)); create_each_block,
} null
);
return { return {
c() { c() {
for (let i = 0; i < each_blocks.length; i += 1) { create_each_blocks(each_blocks);
each_blocks[i].c();
}
each_1_anchor = empty(); each_1_anchor = empty();
}, },
m(target, anchor) { m(target, anchor) {
for (let i = 0; i < each_blocks.length; i += 1) { mount_each_blocks(each_blocks, target, anchor);
each_blocks[i].m(target, anchor);
}
insert(target, each_1_anchor, anchor); insert(target, each_1_anchor, anchor);
}, },
p(changed, ctx) { p(changed, ctx) {
const each_value = ctx.things; const each_value = ctx.things;
for (let i = 0; i < each_blocks.length; i += 1) each_blocks[i].r(); for (let i = 0; i < each_blocks.b.length; i += 1) each_blocks.b[i].r();
each_blocks = update_keyed_each(each_blocks, changed, get_key, 1, ctx, each_value, each_1_lookup, each_1_anchor.parentNode, fix_and_destroy_block, create_each_block, each_1_anchor, get_each_context); update_keyed_each(
for (let i = 0; i < each_blocks.length; i += 1) each_blocks[i].a(); each_blocks,
changed,
1,
ctx,
each_1_anchor.parentNode,
fix_and_destroy_block,
each_1_anchor
);
for (let i = 0; i < each_blocks.b.length; i += 1) each_blocks.b[i].a();
}, },
i: noop, i: noop,
o: noop, o: noop,
d(detaching) { d(detaching) {
for (let i = 0; i < each_blocks.length; i += 1) { destroy_each_blocks(each_blocks, detaching);
each_blocks[i].d(detaching);
}
if (detaching) { if (detaching) {
detach(each_1_anchor); detach(each_1_anchor);

45
test/js/samples/each-block-keyed/expected.js
Unescape View File

@ -2,12 +2,16 @@
import { import {
SvelteComponent, SvelteComponent,
append, append,
create_each_blocks,
destroy_block, destroy_block,
destroy_each_blocks,
detach, detach,
element, element,
empty, empty,
init, init,
init_each_block,
insert, insert,
mount_each_blocks,
noop, noop,
safe_not_equal, safe_not_equal,
set_data, set_data,
@ -22,7 +26,7 @@ function get_each_context(ctx, list, i) {
} }
// (5:0) {#each things as thing (thing.id)} // (5:0) {#each things as thing (thing.id)}
function create_each_block(key_1, ctx) { function create_each_block(ctx, key_1) {
var div, t_value = ctx.thing.name + "", t; var div, t_value = ctx.thing.name + "", t;
return { return {
@ -56,47 +60,50 @@ function create_each_block(key_1, ctx) {
} }
function create_fragment(ctx) { function create_fragment(ctx) {
var each_blocks = [], each_1_lookup = new Map(), each_1_anchor; var each_1_anchor;
let each_value = ctx.things; let each_value = ctx.things;
const get_key = ctx => ctx.thing.id; let each_blocks = init_each_block(
ctx,
for (let i = 0; i < each_value.length; i += 1) { get_each_context,
let child_ctx = get_each_context(ctx, each_value, i); ctx => ctx.things,
let key = get_key(child_ctx); ctx => ctx.thing.id,
each_1_lookup.set(key, each_blocks[i] = create_each_block(key, child_ctx)); create_each_block,
} null
);
return { return {
c() { c() {
for (let i = 0; i < each_blocks.length; i += 1) { create_each_blocks(each_blocks);
each_blocks[i].c();
}
each_1_anchor = empty(); each_1_anchor = empty();
}, },
m(target, anchor) { m(target, anchor) {
for (let i = 0; i < each_blocks.length; i += 1) { mount_each_blocks(each_blocks, target, anchor);
each_blocks[i].m(target, anchor);
}
insert(target, each_1_anchor, anchor); insert(target, each_1_anchor, anchor);
}, },
p(changed, ctx) { p(changed, ctx) {
const each_value = ctx.things; const each_value = ctx.things;
each_blocks = update_keyed_each(each_blocks, changed, get_key, 1, ctx, each_value, each_1_lookup, each_1_anchor.parentNode, destroy_block, create_each_block, each_1_anchor, get_each_context); update_keyed_each(
each_blocks,
changed,
1,
ctx,
each_1_anchor.parentNode,
destroy_block,
each_1_anchor
);
}, },
i: noop, i: noop,
o: noop, o: noop,
d(detaching) { d(detaching) {
for (let i = 0; i < each_blocks.length; i += 1) { destroy_each_blocks(each_blocks, detaching);
each_blocks[i].d(detaching);
}
if (detaching) { if (detaching) {
detach(each_1_anchor); detach(each_1_anchor);

Write Preview
Loading…
Cancel
Save