From d09968a7690be04a0e453ef5bf3a3f766e62fbef Mon Sep 17 00:00:00 2001 From: tanhauhau Date: Wed, 14 Jul 2021 09:46:50 +0800 Subject: [PATCH 1/3] destructuring store assignment --- src/runtime/internal/utils.ts | 3 +- .../_config.js | 11 ++++++ .../main.svelte | 34 +++++++++++++++++++ 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 test/runtime/samples/store-assignment-updates-destructure/_config.js create mode 100644 test/runtime/samples/store-assignment-updates-destructure/main.svelte diff --git a/src/runtime/internal/utils.ts b/src/runtime/internal/utils.ts index 9f3da8589a9c..0595bf2cf414 100644 --- a/src/runtime/internal/utils.ts +++ b/src/runtime/internal/utils.ts @@ -159,7 +159,8 @@ export function null_to_empty(value) { return value == null ? '' : value; } -export function set_store_value(store, ret, value = ret) { +export function set_store_value(store, ret, value) { + if (arguments.length === 2) value = ret; store.set(value); return ret; } diff --git a/test/runtime/samples/store-assignment-updates-destructure/_config.js b/test/runtime/samples/store-assignment-updates-destructure/_config.js new file mode 100644 index 000000000000..7a1023614c2c --- /dev/null +++ b/test/runtime/samples/store-assignment-updates-destructure/_config.js @@ -0,0 +1,11 @@ +export default { + html: ` +
$userName1: user1
+
$userName2: undefined
+
$userName3: undefined
+
$userName4: user4
+
$userName5: undefined
+
$userName6: user6
+
$userName7: undefined
+ ` +}; diff --git a/test/runtime/samples/store-assignment-updates-destructure/main.svelte b/test/runtime/samples/store-assignment-updates-destructure/main.svelte new file mode 100644 index 000000000000..b9033a402c9b --- /dev/null +++ b/test/runtime/samples/store-assignment-updates-destructure/main.svelte @@ -0,0 +1,34 @@ + + +
$userName1: {$userName1}
+
$userName2: {$userName2}
+
$userName3: {$userName3}
+
$userName4: {$userName4}
+
$userName5: {$userName5}
+
$userName6: {$userName6}
+
$userName7: {$userName7}
\ No newline at end of file From c9c8d600e4c672b507d58944181e049e57a43bdc Mon Sep 17 00:00:00 2001 From: Tan Li Hau Date: Wed, 21 Jul 2021 12:54:36 +0800 Subject: [PATCH 2/3] Update main.svelte --- .../main.svelte | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/test/runtime/samples/store-assignment-updates-destructure/main.svelte b/test/runtime/samples/store-assignment-updates-destructure/main.svelte index b9033a402c9b..71e02fe16d8e 100644 --- a/test/runtime/samples/store-assignment-updates-destructure/main.svelte +++ b/test/runtime/samples/store-assignment-updates-destructure/main.svelte @@ -1,13 +1,13 @@
$userName1: {$userName1}
@@ -31,4 +31,4 @@
$userName4: {$userName4}
$userName5: {$userName5}
$userName6: {$userName6}
-
$userName7: {$userName7}
\ No newline at end of file +
$userName7: {$userName7}
From a0dc37de34cac24447b1ea16b6d95ec6d3b13f70 Mon Sep 17 00:00:00 2001 From: tanhauhau Date: Sat, 24 Jul 2021 10:41:59 +0800 Subject: [PATCH 3/3] remove argument check --- src/runtime/internal/utils.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/runtime/internal/utils.ts b/src/runtime/internal/utils.ts index 0595bf2cf414..41e56863fb1f 100644 --- a/src/runtime/internal/utils.ts +++ b/src/runtime/internal/utils.ts @@ -160,7 +160,6 @@ export function null_to_empty(value) { } export function set_store_value(store, ret, value) { - if (arguments.length === 2) value = ret; store.set(value); return ret; }