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

everything working except some destructuring stuff

Browse Source
pull/1173/head
Rich Harris 7 years ago
parent 242f08e328
commit b94f63ed70
6 changed files with 100 additions and 79 deletions
Show Stats Download Patch File Download Diff File

42
src/generators/Generator.ts
Unescape View File

@ -242,26 +242,30 @@ export default class Generator {
if (name === 'event' && isEventHandler) { if (name === 'event' && isEventHandler) {
// noop // noop
} else if (contexts.has(name)) { } else if (contexts.has(name)) {
// const contextName = contexts.get(name); // if (self.constructor.name === 'DomGenerator') { // TODO filthy, temporary hack
// if (contextName !== name) { const contextName = contexts.get(name);
// // this is true for 'reserved' names like `state` and `component`, if (contextName !== name) {
// // also destructured contexts // this is true for 'reserved' names like `state` and `component`,
// code.overwrite( // also destructured contexts
// node.start,
// node.start + name.length, code.overwrite(
// contextName, node.start,
// { storeName: true, contentOnly: false } node.start + name.length,
// ); contextName,
{ storeName: true, contentOnly: false }
// const destructuredName = contextName.replace(/\[\d+\]/, ''); );
// if (destructuredName !== contextName) {
// // so that hoisting the context works correctly const destructuredName = contextName.replace(/\[\d+\]/, '');
// usedContexts.add(destructuredName); if (destructuredName !== contextName) {
// } // so that hoisting the context works correctly
usedContexts.add(destructuredName);
}
}
// TODO filthy, temporary hack
// if (!isEventHandler) code.prependRight(node.start, `state.`);
// } // }
// TODO filthy, temporary hack
if (self.constructor.name === 'DomGenerator') code.prependRight(node.start, `state.`);
usedContexts.add(name); usedContexts.add(name);
} else if (helpers.has(name)) { } else if (helpers.has(name)) {
let object = node; let object = node;
@ -270,7 +274,7 @@ export default class Generator {
const alias = self.templateVars.get(`helpers-${name}`); const alias = self.templateVars.get(`helpers-${name}`);
if (alias !== name) code.overwrite(object.start, object.end, alias); if (alias !== name) code.overwrite(object.start, object.end, alias);
} else if (indexes.has(name)) { } else if (indexes.has(name)) {
if (self.constructor.name === 'DomGenerator') code.prependRight(node.start, `state.`); if (self.constructor.name === 'DomGenerator' && !isEventHandler) code.prependRight(node.start, `state.`);
const context = indexes.get(name); const context = indexes.get(name);
usedContexts.add(context); // TODO is this right? usedContexts.add(context); // TODO is this right?

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

@ -114,7 +114,12 @@ export default class Block {
this.aliases = new Map(); this.aliases = new Map();
this.variables = new Map(); this.variables = new Map();
this.getUniqueName = this.generator.getUniqueNameMaker([]); // TODO this is wrong... we probably don't need this any more // this.getUniqueName = this.generator.getUniqueNameMaker([]); // TODO this is wrong... we probably don't need this any more
const getUniqueName = this.generator.getUniqueNameMaker([]); // TODO this is wrong... we probably don't need this any more
this.getUniqueName = name => {
return getUniqueName(name);
}
this.hasUpdateMethod = false; // determined later this.hasUpdateMethod = false; // determined later
} }
@ -189,6 +194,19 @@ export default class Block {
this.builders.mount.addLine(`${this.autofocus}.focus();`); this.builders.mount.addLine(`${this.autofocus}.focus();`);
} }
// TODO `this.contexts` is possibly redundant post-#1122
const initializers = [];
const updaters = [];
this.contexts.forEach((alias, name) => {
// TODO only the ones that are actually used in this block...
const assignment = `${alias} = state.${name}`;
initializers.push(assignment);
updaters.push(`${assignment};`);
this.hasUpdateMethod = true;
});
// minor hack – we need to ensure that any {{{triples}}} are detached first // minor hack – we need to ensure that any {{{triples}}} are detached first
this.builders.unmount.addBlockAtStart(this.builders.detachRaw.toString()); this.builders.unmount.addBlockAtStart(this.builders.detachRaw.toString());
@ -248,11 +266,12 @@ export default class Block {
} }
if (this.hasUpdateMethod) { if (this.hasUpdateMethod) {
if (this.builders.update.isEmpty()) { if (this.builders.update.isEmpty() && updaters.length === 0) {
properties.addBlock(`p: @noop,`); properties.addBlock(`p: @noop,`);
} else { } else {
properties.addBlock(deindent` properties.addBlock(deindent`
p: function update(changed, state) { p: function update(changed, state) {
${updaters}
${this.builders.update} ${this.builders.update}
}, },
`); `);
@ -327,6 +346,8 @@ export default class Block {
return deindent` return deindent`
${this.comment && `// ${escape(this.comment)}`} ${this.comment && `// ${escape(this.comment)}`}
function ${this.name}(#component${this.key ? `, ${localKey}` : ''}, state) { function ${this.name}(#component${this.key ? `, ${localKey}` : ''}, state) {
${initializers.length > 0 &&
`var ${initializers.join(', ')};`}
${this.variables.size > 0 && ${this.variables.size > 0 &&
`var ${Array.from(this.variables.keys()) `var ${Array.from(this.variables.keys())
.map(key => { .map(key => {

12
src/generators/nodes/AwaitBlock.ts
Unescape View File

@ -125,10 +125,12 @@ export default class AwaitBlock extends Node {
if (@isPromise(${promise})) { if (@isPromise(${promise})) {
${promise}.then(function(${value}) { ${promise}.then(function(${value}) {
var state = #component.get(); var state = #component.get();
${replace_await_block}(${token}, ${create_then_block}, @assign({}, state, { ${this.then.block.context}: ${value} })); ${resolved} = { ${this.then.block.context}: ${value} };
${replace_await_block}(${token}, ${create_then_block}, @assign({}, state, ${resolved}));
}, function (${error}) { }, function (${error}) {
var state = #component.get(); var state = #component.get();
${replace_await_block}(${token}, ${create_catch_block}, @assign({}, state, { ${this.catch.block.context}: ${error} })); ${resolved} = { ${this.catch.block.context}: ${error} };
${replace_await_block}(${token}, ${create_catch_block}, @assign({}, state, ${resolved}));
}); });
// if we previously had a then/catch block, destroy it // if we previously had a then/catch block, destroy it
@ -137,9 +139,9 @@ export default class AwaitBlock extends Node {
return true; return true;
} }
} else { } else {
${resolved} = ${promise}; ${resolved} = { ${this.then.block.context}: ${promise} };
if (${await_block_type} !== ${create_then_block}) { if (${await_block_type} !== ${create_then_block}) {
${replace_await_block}(${token}, ${create_then_block}, @assign({}, state, { ${this.then.block.context}: ${resolved} })); ${replace_await_block}(${token}, ${create_then_block}, @assign({}, state, ${resolved}));
return true; return true;
} }
} }
@ -182,7 +184,7 @@ export default class AwaitBlock extends Node {
if (${conditions.join(' && ')}) { if (${conditions.join(' && ')}) {
// nothing // nothing
} else { } else {
${await_block}.p(changed, state); ${await_block}.p(changed, @assign({}, state, ${resolved}));
} }
`); `);
} else { } else {

80
src/generators/nodes/EachBlock.ts
Unescape View File

@ -34,67 +34,57 @@ export default class EachBlock extends Node {
const { dependencies } = this.metadata; const { dependencies } = this.metadata;
block.addDependencies(dependencies); block.addDependencies(dependencies);
const indexNames = new Map(block.indexNames);
const indexName = this.index || `${this.context}_index`;
indexNames.set(this.context, indexName);
const listNames = new Map(block.listNames);
const listName = (
(this.expression.type === 'MemberExpression' && !this.expression.computed) ? this.expression.property.name :
this.expression.type === 'Identifier' ? this.expression.name :
`each_value`
);
listNames.set(this.context, listName);
const contextTypes = new Map(block.contextTypes);
contextTypes.set(this.context, 'each');
const context = this.context;
const contexts = new Map(block.contexts);
contexts.set(this.context, context); // TODO this is now redundant
const indexes = new Map(block.indexes);
if (this.index) indexes.set(this.index, this.context);
const changeableIndexes = new Map(block.changeableIndexes);
if (this.index) changeableIndexes.set(this.index, this.key);
if (this.destructuredContexts) {
for (let i = 0; i < this.destructuredContexts.length; i += 1) {
contexts.set(this.destructuredContexts[i], `${context}[${i}]`);
}
}
this.block = block.child({ this.block = block.child({
comment: createDebuggingComment(this, this.generator), comment: createDebuggingComment(this, this.generator),
name: this.generator.getUniqueName('create_each_block'), name: this.generator.getUniqueName('create_each_block'),
context: this.context, context: this.context,
key: this.key, key: this.key,
contexts, contexts: new Map(block.contexts),
contextTypes, contextTypes: new Map(block.contextTypes),
indexes, indexes: new Map(block.indexes),
changeableIndexes, changeableIndexes: new Map(block.changeableIndexes),
listName, listName: (
indexName, (this.expression.type === 'MemberExpression' && !this.expression.computed) ? this.expression.property.name :
this.expression.type === 'Identifier' ? this.expression.name :
`each_value`
),
indexName: this.index || `${this.context}_index`,
indexNames, indexNames: new Map(block.indexNames),
listNames listNames: new Map(block.listNames)
}); });
this.contextProps = [ this.block.contextTypes.set(this.context, 'each');
`${context}: ${listName}[#i]`, this.block.indexNames.set(this.context, this.block.indexName);
`${indexName}: #i` this.block.listNames.set(this.context, this.block.listName);
]; if (this.index) {
this.block.indexes.set(this.index, this.context);
this.block.changeableIndexes.set(this.index, this.key)
}
const context = this.block.getUniqueName(this.context);
this.block.contexts.set(this.context, context); // TODO this is now redundant?
if (this.destructuredContexts) { if (this.destructuredContexts) {
for (let i = 0; i < this.destructuredContexts.length; i += 1) { for (let i = 0; i < this.destructuredContexts.length; i += 1) {
contexts.set(this.destructuredContexts[i], `${context}[${i}]`); this.block.contexts.set(this.destructuredContexts[i], `${context}[${i}]`);
this.contextProps.push(`${this.destructuredContexts[i]}: ${listName}[#i][${i}]`);
} }
} }
this.contextProps = [
`${this.context}: ${this.block.listName}[#i]`,
`${this.block.indexName}: #i`
];
// if (this.destructuredContexts) {
// for (let i = 0; i < this.destructuredContexts.length; i += 1) {
// contexts.set(this.destructuredContexts[i], `${context}[${i}]`);
// this.contextProps.push(`${this.destructuredContexts[i]}: ${this.block.listName}[#i][${i}]`);
// }
// }
this.generator.blocks.push(this.block); this.generator.blocks.push(this.block);
this.initChildren(this.block, stripWhitespace, nextSibling); this.initChildren(this.block, stripWhitespace, nextSibling);
block.addDependencies(this.block.dependencies); block.addDependencies(this.block.dependencies);

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

@ -284,7 +284,8 @@ function create_main_fragment(component, state) {
// (1:0) {{#each comments as comment, i}} // (1:0) {{#each comments as comment, i}}
function create_each_block(component, state) { function create_each_block(component, state) {
var div, strong, text, text_1, span, text_2_value = state.comment.author, text_2, text_3, text_4_value = state.elapsed(state.comment.time, state.time), text_4, text_5, text_6, raw_value = state.comment.html, raw_before; var comment = state.comment;
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;
return { return {
c: function create() { c: function create() {
@ -323,15 +324,16 @@ function create_each_block(component, state) {
}, },
p: function update(changed, state) { p: function update(changed, state) {
if ((changed.comments) && text_2_value !== (text_2_value = state.comment.author)) { comment = state.comment;
if ((changed.comments) && text_2_value !== (text_2_value = comment.author)) {
text_2.data = text_2_value; text_2.data = text_2_value;
} }
if ((changed.elapsed || changed.comments || changed.time) && text_4_value !== (text_4_value = state.elapsed(state.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 ((changed.comments) && raw_value !== (raw_value = state.comment.html)) { if ((changed.comments) && raw_value !== (raw_value = comment.html)) {
detachAfter(raw_before); detachAfter(raw_before);
raw_before.insertAdjacentHTML("afterend", raw_value); raw_before.insertAdjacentHTML("afterend", raw_value);
} }

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

@ -84,7 +84,8 @@ function create_main_fragment(component, state) {
// (1:0) {{#each comments as comment, i}} // (1:0) {{#each comments as comment, i}}
function create_each_block(component, state) { function create_each_block(component, state) {
var div, strong, text, text_1, span, text_2_value = state.comment.author, text_2, text_3, text_4_value = state.elapsed(state.comment.time, state.time), text_4, text_5, text_6, raw_value = state.comment.html, raw_before; var comment = state.comment;
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;
return { return {
c: function create() { c: function create() {
@ -123,15 +124,16 @@ function create_each_block(component, state) {
}, },
p: function update(changed, state) { p: function update(changed, state) {
if ((changed.comments) && text_2_value !== (text_2_value = state.comment.author)) { comment = state.comment;
if ((changed.comments) && text_2_value !== (text_2_value = comment.author)) {
text_2.data = text_2_value; text_2.data = text_2_value;
} }
if ((changed.elapsed || changed.comments || changed.time) && text_4_value !== (text_4_value = state.elapsed(state.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 ((changed.comments) && raw_value !== (raw_value = state.comment.html)) { if ((changed.comments) && raw_value !== (raw_value = comment.html)) {
detachAfter(raw_before); detachAfter(raw_before);
raw_before.insertAdjacentHTML("afterend", raw_value); raw_before.insertAdjacentHTML("afterend", raw_value);
} }

Write Preview
Loading…
Cancel
Save