From 8b9db8226f3d76e02bbf511de92fef0409d4ded1 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Wed, 15 Mar 2023 16:46:05 +0100
Subject: [PATCH] format
---
src/compiler/compile/nodes/shared/Context.ts | 10 ++---
.../compile/render_dom/wrappers/AwaitBlock.ts | 6 +--
.../compile/render_dom/wrappers/EachBlock.ts | 7 ++--
.../wrappers/shared/add_const_tags.ts | 42 +++++++++----------
.../_config.js | 8 ++--
.../main.svelte | 10 ++---
6 files changed, 41 insertions(+), 42 deletions(-)
diff --git a/src/compiler/compile/nodes/shared/Context.ts b/src/compiler/compile/nodes/shared/Context.ts
index fb2b6a6318..3957ed2173 100644
--- a/src/compiler/compile/nodes/shared/Context.ts
+++ b/src/compiler/compile/nodes/shared/Context.ts
@@ -135,21 +135,21 @@ export function unpack_destructuring({
let new_modifier: (node: Node) => Node;
if (property.computed) {
- // e.g { [computedProperty]: ... }
+ // e.g { [computedProperty]: ... }
const property_name = `computed_property_${number_of_computed_props.n}`;
- number_of_computed_props.n += 1;
+ number_of_computed_props.n += 1;
contexts.push({
type: 'ComputedProperty',
- property_name,
- key
+ property_name,
+ key
});
new_modifier = (node) => x`${modifier(node)}[${property_name}]`;
used_properties.push(x`${property_name}`);
} else if (key.type === 'Identifier') {
// e.g. { someProperty: ... }
- const property_name = key.name;
+ const property_name = key.name;
new_modifier = (node) => x`${modifier(node)}.${property_name}`;
used_properties.push(x`"${property_name}"`);
} else if (key.type === 'Literal') {
diff --git a/src/compiler/compile/render_dom/wrappers/AwaitBlock.ts b/src/compiler/compile/render_dom/wrappers/AwaitBlock.ts
index 21741ada9b..534595f4a9 100644
--- a/src/compiler/compile/render_dom/wrappers/AwaitBlock.ts
+++ b/src/compiler/compile/render_dom/wrappers/AwaitBlock.ts
@@ -99,11 +99,11 @@ class AwaitBlockBranch extends Wrapper {
render_get_context() {
const props = this.is_destructured ? this.value_contexts.map(prop => {
- const to_ctx = name => this.renderer.reference(name);
if (prop.type === 'ComputedProperty') {
- const expression = new Expression(this.renderer.component, this.node, this.has_consts(this.node) ? this.node.scope : null, prop.key);
- return b`const ${prop.property_name} = ${expression.manipulate(this.block, '#ctx')};`;
+ const expression = new Expression(this.renderer.component, this.node, this.has_consts(this.node) ? this.node.scope : null, prop.key);
+ return b`const ${prop.property_name} = ${expression.manipulate(this.block, '#ctx')};`;
} else {
+ const to_ctx = name => this.renderer.reference(name);
return b`#ctx[${this.block.renderer.context_lookup.get(prop.key.name).index}] = ${prop.default_modifier(prop.modifier(x`#ctx[${this.value_index}]`), to_ctx)};`;
}
}) : null;
diff --git a/src/compiler/compile/render_dom/wrappers/EachBlock.ts b/src/compiler/compile/render_dom/wrappers/EachBlock.ts
index c4df9935ed..9c1af7ce44 100644
--- a/src/compiler/compile/render_dom/wrappers/EachBlock.ts
+++ b/src/compiler/compile/render_dom/wrappers/EachBlock.ts
@@ -365,13 +365,12 @@ export default class EachBlockWrapper extends Wrapper {
}
this.context_props = this.node.contexts.map(prop => {
- const to_ctx = (name: string) => renderer.context_lookup.has(name) ? x`child_ctx[${renderer.context_lookup.get(name).index}]` : { type: 'Identifier', name } as Node;
-
if (prop.type === 'DestructuredVariable') {
+ const to_ctx = (name: string) => renderer.context_lookup.has(name) ? x`child_ctx[${renderer.context_lookup.get(name).index}]` : { type: 'Identifier', name } as Node;
return b`child_ctx[${renderer.context_lookup.get(prop.key.name).index}] = ${prop.default_modifier(prop.modifier(x`list[i]`), to_ctx)};`;
} else {
- const expression = new Expression(this.renderer.component, this.node, this.node.scope, prop.key);
- return b`const ${prop.property_name} = ${expression.manipulate(block, 'child_ctx')};`;
+ const expression = new Expression(this.renderer.component, this.node, this.node.scope, prop.key);
+ return b`const ${prop.property_name} = ${expression.manipulate(block, 'child_ctx')};`;
}
});
diff --git a/src/compiler/compile/render_dom/wrappers/shared/add_const_tags.ts b/src/compiler/compile/render_dom/wrappers/shared/add_const_tags.ts
index 484d5dfd5f..b7c14c2c38 100644
--- a/src/compiler/compile/render_dom/wrappers/shared/add_const_tags.ts
+++ b/src/compiler/compile/render_dom/wrappers/shared/add_const_tags.ts
@@ -5,29 +5,29 @@ import Renderer from '../../Renderer';
import Expression from '../../../nodes/shared/Expression';
export function add_const_tags(block: Block, const_tags: ConstTag[], ctx: string) {
- const const_tags_props = [];
- const_tags.forEach((const_tag, i) => {
- const name = `#constants_${i}`;
- const_tags_props.push(b`const ${name} = ${const_tag.expression.manipulate(block, ctx)}`);
- const to_ctx = (name: string) => block.renderer.context_lookup.has(name) ? x`${ctx}[${block.renderer.context_lookup.get(name).index}]` : { type: 'Identifier', name } as Node;
+ const const_tags_props = [];
+ const_tags.forEach((const_tag, i) => {
+ const name = `#constants_${i}`;
+ const_tags_props.push(b`const ${name} = ${const_tag.expression.manipulate(block, ctx)}`);
+ const to_ctx = (name: string) => block.renderer.context_lookup.has(name) ? x`${ctx}[${block.renderer.context_lookup.get(name).index}]` : { type: 'Identifier', name } as Node;
- const_tag.contexts.forEach(context => {
- if (context.type === 'DestructuredVariable') {
- const_tags_props.push(b`${ctx}[${block.renderer.context_lookup.get(context.key.name).index}] = ${context.default_modifier(context.modifier({ type: 'Identifier', name }), to_ctx)}`);
- } else {
- const expression = new Expression(block.renderer.component, const_tag, const_tag.scope, context.key);
- const_tags_props.push(b`const ${context.property_name} = ${expression.manipulate(block, ctx)}`);
- }
- });
- });
- return const_tags_props;
+ const_tag.contexts.forEach(context => {
+ if (context.type === 'DestructuredVariable') {
+ const_tags_props.push(b`${ctx}[${block.renderer.context_lookup.get(context.key.name).index}] = ${context.default_modifier(context.modifier({ type: 'Identifier', name }), to_ctx)}`);
+ } else {
+ const expression = new Expression(block.renderer.component, const_tag, const_tag.scope, context.key);
+ const_tags_props.push(b`const ${context.property_name} = ${expression.manipulate(block, ctx)}`);
+ }
+ });
+ });
+ return const_tags_props;
}
export function add_const_tags_context(renderer: Renderer, const_tags: ConstTag[]) {
- const_tags.forEach(const_tag => {
- const_tag.contexts.forEach(context => {
- if (context.type !== 'DestructuredVariable') return;
- renderer.add_to_context(context.key.name, true);
- });
- });
+ const_tags.forEach(const_tag => {
+ const_tag.contexts.forEach(context => {
+ if (context.type !== 'DestructuredVariable') return;
+ renderer.add_to_context(context.key.name, true);
+ });
+ });
}
diff --git a/test/runtime/samples/await-then-destruct-computed-props/_config.js b/test/runtime/samples/await-then-destruct-computed-props/_config.js
index 91ba4882b9..6d147535e3 100644
--- a/test/runtime/samples/await-then-destruct-computed-props/_config.js
+++ b/test/runtime/samples/await-then-destruct-computed-props/_config.js
@@ -7,7 +7,7 @@ export default {
`
propA: 3
propB: 7
- num: 3
+ num: 3
rest: {"prop3":{"prop9":9,"prop10":10}}
propZ: 5
propY: 6
@@ -15,13 +15,13 @@ export default {
`
);
- await (component.object = Promise.resolve({ prop1: 'one', prop2: 'two', prop3: { prop7: 'seven' }, prop4: { prop10: 'ten' }}));
- assert.htmlEqual(
+ await (component.object = Promise.resolve({ prop1: 'one', prop2: 'two', prop3: { prop7: 'seven' }, prop4: { prop10: 'ten' }}));
+ assert.htmlEqual(
target.innerHTML,
`
propA: seven
propB: ten
- num: 5
+ num: 5
rest: {"prop1":"one","prop2":"two"}
propZ: 5
propY: 6
diff --git a/test/runtime/samples/await-then-destruct-computed-props/main.svelte b/test/runtime/samples/await-then-destruct-computed-props/main.svelte
index a20edb44d3..71756d6cf3 100644
--- a/test/runtime/samples/await-then-destruct-computed-props/main.svelte
+++ b/test/runtime/samples/await-then-destruct-computed-props/main.svelte
@@ -1,15 +1,15 @@
{#await object then { [`prop${num++}`]: { [`prop${num + 3}`]: propA }, [`prop${num++}`]: { [`prop${num + 5}`]: propB }, ...rest }}
propA: {propA}
propB: {propB}
- num: {num}
+ num: {num}
rest: {JSON.stringify(rest)}
{/await}