From 66eaaef90235aa1c69fb0036f9d82cfb91f8b94b Mon Sep 17 00:00:00 2001 From: "Lyu, Wei Da" Date: Tue, 29 Nov 2022 13:27:48 +0800 Subject: [PATCH 1/2] filter out $$_ completions --- .../plugins/typescript/features/CompletionProvider.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/language-server/src/plugins/typescript/features/CompletionProvider.ts b/packages/language-server/src/plugins/typescript/features/CompletionProvider.ts index b802f0063..14bfd5bec 100644 --- a/packages/language-server/src/plugins/typescript/features/CompletionProvider.ts +++ b/packages/language-server/src/plugins/typescript/features/CompletionProvider.ts @@ -881,10 +881,13 @@ function isValidCompletion( ? (value: ts.CompletionEntry) => startsWithUppercase.test(value.name) : () => true; - const isNoSvelte2tsxCompletion = (value: ts.CompletionEntry) => - value.kindModifiers !== 'declare' || - (!value.name.startsWith('__sveltets_') && !svelte2tsxTypes.has(value.name)); + const isNoSvelte2tsxCompletion = (value: ts.CompletionEntry) => { + if (value.kindModifiers === 'declare') { + return !value.name.startsWith('__sveltets_') && !svelte2tsxTypes.has(value.name); + } + return !value.name.startsWith('$$_'); + }; const isCompletionInHTMLStartTag = !!getNodeIfIsInHTMLStartTag( document.html, document.offsetAt(position) From 0be78572dd23d3f7324d313f1bd4c90442c30b8d Mon Sep 17 00:00:00 2001 From: "Lyu, Wei Da" Date: Tue, 29 Nov 2022 13:29:43 +0800 Subject: [PATCH 2/2] revert name to prevent spell-check mistake in the generated variable for component tag --- .../undeclared-component/expected.json | 18 ++++++++++ .../undeclared-component/expectedv2.json | 18 ++++++++++ .../undeclared-component/input.svelte | 4 +++ .../htmlxtojsx_v2/nodes/InlineComponent.ts | 9 +++-- .../samples/attribute-bare/expectedv2.js | 2 +- .../attribute-foreign-ns/expectedv2.js | 2 +- .../attribute-invalid-jsx-name/expectedv2.js | 2 +- .../samples/attribute-multiline/expectedv2.js | 6 ++-- .../samples/attribute-multiple/expectedv2.js | 2 +- .../expectedv2.js | 2 +- .../samples/attribute-number/expectedv2.js | 2 +- .../attribute-optional-chaining/expectedv2.js | 2 +- .../samples/attribute-quoted/expectedv2.js | 4 +-- .../samples/attribute-shorthand/expectedv2.js | 2 +- .../samples/attribute-text/expectedv2.js | 2 +- .../binding-this-component/expectedv2.js | 2 +- .../expectedv2.js | 2 +- .../expectedv2.js | 2 +- .../expectedv2.js | 2 +- .../component-default-slot-let/expectedv2.js | 2 +- .../component-default-slot/expectedv2.js | 2 +- .../component-multi-slot/expectedv2.js | 10 +++--- .../samples/component-name-dot/expectedv2.js | 4 +-- .../component-named-slot/expectedv2.js | 6 ++-- .../samples/component-no-slots/expectedv2.js | 4 +-- .../component-slot-infer-props/expectedv2.js | 4 +-- .../expectedv2.js | 8 ++--- .../custom-css-properties/expectedv2.js | 2 +- .../samples/directive-quoted/expectedv2.js | 2 +- .../samples/editing-binding/expectedv2.js | 2 +- .../editing-event-handler/expectedv2.js | 2 +- .../samples/editing-mustache/expectedv2.js | 2 +- .../samples/editing-props/expectedv2.js | 2 +- .../expectedv2.js | 2 +- .../expectedv2.js | 2 +- .../event-handler-component/expectedv2.js | 2 +- .../expectedv2.js | 2 +- .../if-nested-slot-let-shadowed/expectedv2.js | 34 +++++++++---------- .../samples/if-nested-slot-let/expectedv2.js | 12 +++---- .../quotes-inside-quotes/expectedv2.js | 4 +-- .../samples/svelte-fragment/expectedv2.js | 10 +++--- .../attributes-foreign-ns/expectedv2.ts | 2 +- .../expectedv2.ts | 2 +- .../expectedv2.ts | 4 +-- .../component-slot-let-forward/expectedv2.ts | 2 +- .../component-slot-nest-scope/expectedv2.ts | 2 +- .../component-slot-no-space/expectedv2.ts | 2 +- .../samples/const-tag-component/expectedv2.ts | 16 ++++----- .../expectedv2.ts | 2 +- .../expectedv2.ts | 4 +-- .../expectedv2.ts | 2 +- .../event-bubble-component/expectedv2.ts | 2 +- .../samples/import-single-quote/expectedv2.ts | 2 +- .../script-style-like-component/expectedv2.ts | 4 +-- .../self-closing-component/expectedv2.ts | 2 +- .../samples/stores-mustache/expectedv2.ts | 2 +- .../expectedv2.ts | 2 +- .../expectedv2.ts | 2 +- .../uses-svelte-components/expectedv2.ts | 2 +- 59 files changed, 153 insertions(+), 108 deletions(-) create mode 100644 packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/undeclared-component/expected.json create mode 100644 packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/undeclared-component/expectedv2.json create mode 100644 packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/undeclared-component/input.svelte diff --git a/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/undeclared-component/expected.json b/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/undeclared-component/expected.json new file mode 100644 index 000000000..5f5fd2690 --- /dev/null +++ b/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/undeclared-component/expected.json @@ -0,0 +1,18 @@ +[ + { + "range": { "start": { "line": 2, "character": 1 }, "end": { "line": 2, "character": 10 } }, + "severity": 1, + "source": "ts", + "message": "Cannot find name 'Component'.", + "code": 2304, + "tags": [] + }, + { + "range": { "start": { "line": 3, "character": 1 }, "end": { "line": 3, "character": 22 } }, + "severity": 1, + "source": "ts", + "message": "Cannot find name 'SomeLongComponentName'.", + "code": 2304, + "tags": [] + } +] diff --git a/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/undeclared-component/expectedv2.json b/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/undeclared-component/expectedv2.json new file mode 100644 index 000000000..5f5fd2690 --- /dev/null +++ b/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/undeclared-component/expectedv2.json @@ -0,0 +1,18 @@ +[ + { + "range": { "start": { "line": 2, "character": 1 }, "end": { "line": 2, "character": 10 } }, + "severity": 1, + "source": "ts", + "message": "Cannot find name 'Component'.", + "code": 2304, + "tags": [] + }, + { + "range": { "start": { "line": 3, "character": 1 }, "end": { "line": 3, "character": 22 } }, + "severity": 1, + "source": "ts", + "message": "Cannot find name 'SomeLongComponentName'.", + "code": 2304, + "tags": [] + } +] diff --git a/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/undeclared-component/input.svelte b/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/undeclared-component/input.svelte new file mode 100644 index 000000000..90373f8fb --- /dev/null +++ b/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/undeclared-component/input.svelte @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/InlineComponent.ts b/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/InlineComponent.ts index d6556b877..667c59e8f 100644 --- a/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/InlineComponent.ts +++ b/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/InlineComponent.ts @@ -83,9 +83,14 @@ export class InlineComponent { // is actually a proper Svelte component, which would lead to errors // when accessing things like $$prop_def. Therefore widen the type // here, falling back to a any-typed component to ensure the user doesn't - // get weird follup-errors all over the place. The diagnostic error + // get weird followup-errors all over the place. The diagnostic error // will be on the __sveltets_2_ensureComponent part, giving a more helpful message - this._name = '$$_' + sanitizePropName(this.node.name) + this.computeDepth(); + // The name is reversed here so that when the component is undeclared, + // TypeScript won't suggest the undeclared variable to be a misspelling of the generated variable + this._name = + '$$_' + + Array.from(sanitizePropName(this.node.name)).reverse().join('') + + this.computeDepth(); const constructorName = this._name + 'C'; const nodeNameStart = isSvelteComponentTag ? this.node.expression.start diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-bare/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-bare/expectedv2.js index 2418099cc..da491855c 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-bare/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-bare/expectedv2.js @@ -1 +1 @@ - { const $$_SomeComponent0C = __sveltets_2_ensureComponent(SomeComponent); new $$_SomeComponent0C({ target: __sveltets_2_any(), props: {"relaxed":true,}});} \ No newline at end of file + { const $$_tnenopmoCemoS0C = __sveltets_2_ensureComponent(SomeComponent); new $$_tnenopmoCemoS0C({ target: __sveltets_2_any(), props: {"relaxed":true,}});} \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-foreign-ns/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-foreign-ns/expectedv2.js index 0fb415072..940620225 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-foreign-ns/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-foreign-ns/expectedv2.js @@ -1,2 +1,2 @@ - { const $$_SomeComponent0C = __sveltets_2_ensureComponent(SomeComponent); new $$_SomeComponent0C({ target: __sveltets_2_any(), props: { "attrName":`text`,"attrCase":`text`,}});} + { const $$_tnenopmoCemoS0C = __sveltets_2_ensureComponent(SomeComponent); new $$_tnenopmoCemoS0C({ target: __sveltets_2_any(), props: { "attrName":`text`,"attrCase":`text`,}});} { svelteHTML.createElement("someelement", { "attrName":`text`,"attrCase":true,});} \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-invalid-jsx-name/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-invalid-jsx-name/expectedv2.js index e227d11cd..a9bc891e6 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-invalid-jsx-name/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-invalid-jsx-name/expectedv2.js @@ -1,2 +1,2 @@ - { const $$_Hello0C = __sveltets_2_ensureComponent(Hello); new $$_Hello0C({ target: __sveltets_2_any(), props: { "|-wtf":`foo`,}}); Hello} + { const $$_olleH0C = __sveltets_2_ensureComponent(Hello); new $$_olleH0C({ target: __sveltets_2_any(), props: { "|-wtf":`foo`,}}); Hello} { svelteHTML.createElement("div", { "--custom-prop":`foo`,}); } \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-multiline/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-multiline/expectedv2.js index 7f1b80cf4..2b21486b1 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-multiline/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-multiline/expectedv2.js @@ -1,7 +1,7 @@ - { const $$_Comp0C = __sveltets_2_ensureComponent(Comp); new $$_Comp0C({ target: __sveltets_2_any(), props: { "multilineattr":`hello + { const $$_pmoC0C = __sveltets_2_ensureComponent(Comp); new $$_pmoC0C({ target: __sveltets_2_any(), props: { "multilineattr":`hello world`,}});} - { const $$_Comp0C = __sveltets_2_ensureComponent(Comp); new $$_Comp0C({ target: __sveltets_2_any(), props: { "multilineattr":"he`llo\nworld",}});} - { const $$_Comp0C = __sveltets_2_ensureComponent(Comp); new $$_Comp0C({ target: __sveltets_2_any(), props: { "multilineattr":` + { const $$_pmoC0C = __sveltets_2_ensureComponent(Comp); new $$_pmoC0C({ target: __sveltets_2_any(), props: { "multilineattr":"he`llo\nworld",}});} + { const $$_pmoC0C = __sveltets_2_ensureComponent(Comp); new $$_pmoC0C({ target: __sveltets_2_any(), props: { "multilineattr":` color: ${color} display: block`,}});} diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-multiple/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-multiple/expectedv2.js index 1e80bbe3f..173c14421 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-multiple/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-multiple/expectedv2.js @@ -1 +1 @@ - { const $$_SomeComponent0C = __sveltets_2_ensureComponent(SomeComponent); new $$_SomeComponent0C({ target: __sveltets_2_any(), props: { "attr":`text ${value}`,"attrd":`t${thing}`,"attrdd":`t${thing}`,}});} \ No newline at end of file + { const $$_tnenopmoCemoS0C = __sveltets_2_ensureComponent(SomeComponent); new $$_tnenopmoCemoS0C({ target: __sveltets_2_any(), props: { "attr":`text ${value}`,"attrd":`t${thing}`,"attrdd":`t${thing}`,}});} \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-nullish-coalescing/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-nullish-coalescing/expectedv2.js index 6619d1348..2926e6e4a 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-nullish-coalescing/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-nullish-coalescing/expectedv2.js @@ -1 +1 @@ - { const $$_SomeComponent0C = __sveltets_2_ensureComponent(SomeComponent); new $$_SomeComponent0C({ target: __sveltets_2_any(), props: { "attr":obj ?? 'shorthand',}});} \ No newline at end of file + { const $$_tnenopmoCemoS0C = __sveltets_2_ensureComponent(SomeComponent); new $$_tnenopmoCemoS0C({ target: __sveltets_2_any(), props: { "attr":obj ?? 'shorthand',}});} \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-number/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-number/expectedv2.js index f09e0ebe1..955497e6d 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-number/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-number/expectedv2.js @@ -1,2 +1,2 @@ - { const $$_SomeComponent0C = __sveltets_2_ensureComponent(SomeComponent); new $$_SomeComponent0C({ target: __sveltets_2_any(), props: { "tabindex":`1`,}});} + { const $$_tnenopmoCemoS0C = __sveltets_2_ensureComponent(SomeComponent); new $$_tnenopmoCemoS0C({ target: __sveltets_2_any(), props: { "tabindex":`1`,}});} { svelteHTML.createElement("div", { "tabindex":1,"maxlength":1,"minlength":1,"span":1,"role":`none`,}); } \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-optional-chaining/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-optional-chaining/expectedv2.js index 6f58ad688..71b3808f0 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-optional-chaining/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-optional-chaining/expectedv2.js @@ -1 +1 @@ - { const $$_SomeComponent0C = __sveltets_2_ensureComponent(SomeComponent); new $$_SomeComponent0C({ target: __sveltets_2_any(), props: { "attr":obj?.shorthand,}});} \ No newline at end of file + { const $$_tnenopmoCemoS0C = __sveltets_2_ensureComponent(SomeComponent); new $$_tnenopmoCemoS0C({ target: __sveltets_2_any(), props: { "attr":obj?.shorthand,}});} \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-quoted/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-quoted/expectedv2.js index 07256c8bb..4a737fa66 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-quoted/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-quoted/expectedv2.js @@ -1,2 +1,2 @@ - { const $$_SomeComponent0C = __sveltets_2_ensureComponent(SomeComponent); new $$_SomeComponent0C({ target: __sveltets_2_any(), props: { "attr":shorthand,}});} - { const $$_SomeComponent0C = __sveltets_2_ensureComponent(SomeComponent); new $$_SomeComponent0C({ target: __sveltets_2_any(), props: { "attr":shorthand,}});} \ No newline at end of file + { const $$_tnenopmoCemoS0C = __sveltets_2_ensureComponent(SomeComponent); new $$_tnenopmoCemoS0C({ target: __sveltets_2_any(), props: { "attr":shorthand,}});} + { const $$_tnenopmoCemoS0C = __sveltets_2_ensureComponent(SomeComponent); new $$_tnenopmoCemoS0C({ target: __sveltets_2_any(), props: { "attr":shorthand,}});} \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-shorthand/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-shorthand/expectedv2.js index 132affddf..76120f48d 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-shorthand/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-shorthand/expectedv2.js @@ -1 +1 @@ - { const $$_SomeComponent0C = __sveltets_2_ensureComponent(SomeComponent); new $$_SomeComponent0C({ target: __sveltets_2_any(), props: { shorthand,}});} \ No newline at end of file + { const $$_tnenopmoCemoS0C = __sveltets_2_ensureComponent(SomeComponent); new $$_tnenopmoCemoS0C({ target: __sveltets_2_any(), props: { shorthand,}});} \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-text/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-text/expectedv2.js index ea27f8ec2..3d87779e8 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-text/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-text/expectedv2.js @@ -1 +1 @@ - { const $$_SomeComponent0C = __sveltets_2_ensureComponent(SomeComponent); new $$_SomeComponent0C({ target: __sveltets_2_any(), props: { "attr":`text`,"attrtwo":`text`,}});} \ No newline at end of file + { const $$_tnenopmoCemoS0C = __sveltets_2_ensureComponent(SomeComponent); new $$_tnenopmoCemoS0C({ target: __sveltets_2_any(), props: { "attr":`text`,"attrtwo":`text`,}});} \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this-component/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this-component/expectedv2.js index 368c2a44e..e803526e1 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this-component/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this-component/expectedv2.js @@ -1 +1 @@ - { const $$_Component0C = __sveltets_2_ensureComponent(Component); const $$_Component0 = new $$_Component0C({ target: __sveltets_2_any(), props: { "type":`radio`,"value":`Plain`,}});element = $$_Component0;} \ No newline at end of file + { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); const $$_tnenopmoC0 = new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: { "type":`radio`,"value":`Plain`,}});element = $$_tnenopmoC0;} \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this-svelte-component/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this-svelte-component/expectedv2.js index a9f5cc236..6422a33a6 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this-svelte-component/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this-svelte-component/expectedv2.js @@ -1 +1 @@ - { const $$_svelte_component0C = __sveltets_2_ensureComponent(A); const $$_svelte_component0 = new $$_svelte_component0C({ target: __sveltets_2_any(), props: { }});element = $$_svelte_component0;} \ No newline at end of file + { const $$_tnenopmoc_etlevs0C = __sveltets_2_ensureComponent(A); const $$_tnenopmoc_etlevs0 = new $$_tnenopmoc_etlevs0C({ target: __sveltets_2_any(), props: { }});element = $$_tnenopmoc_etlevs0;} \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/component-default-slot-empty/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/component-default-slot-empty/expectedv2.js index 0bec02503..c040c207c 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/component-default-slot-empty/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/component-default-slot-empty/expectedv2.js @@ -1 +1 @@ - { const $$_Component0C = __sveltets_2_ensureComponent(Component); const $$_Component0 = new $$_Component0C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,var:new_var,other_var,} = $$_Component0.$$slot_def.default;$$_$$; }Component} \ No newline at end of file + { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); const $$_tnenopmoC0 = new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,var:new_var,other_var,} = $$_tnenopmoC0.$$slot_def.default;$$_$$; }Component} \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/component-default-slot-let-destructure/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/component-default-slot-let-destructure/expectedv2.js index 81612fd1f..7539cff13 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/component-default-slot-let-destructure/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/component-default-slot-let-destructure/expectedv2.js @@ -1,3 +1,3 @@ - { const $$_Component0C = __sveltets_2_ensureComponent(Component); const $$_Component0 = new $$_Component0C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,thing:{ a },} = $$_Component0.$$slot_def.default;$$_$$; + { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); const $$_tnenopmoC0 = new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,thing:{ a },} = $$_tnenopmoC0.$$slot_def.default;$$_$$; { svelteHTML.createElement("h1", {}); a ; } }Component} \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/component-default-slot-let/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/component-default-slot-let/expectedv2.js index 1d8af41cc..6a396d05f 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/component-default-slot-let/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/component-default-slot-let/expectedv2.js @@ -1,3 +1,3 @@ - { const $$_Component0C = __sveltets_2_ensureComponent(Component); const $$_Component0 = new $$_Component0C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,name:n,thing,} = $$_Component0.$$slot_def.default;$$_$$; + { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); const $$_tnenopmoC0 = new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,name:n,thing,} = $$_tnenopmoC0.$$slot_def.default;$$_$$; { svelteHTML.createElement("h1", {}); thing; n; } }Component} \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/component-default-slot/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/component-default-slot/expectedv2.js index cdbe8c76a..d0fd32f13 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/component-default-slot/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/component-default-slot/expectedv2.js @@ -1,3 +1,3 @@ - { const $$_Component0C = __sveltets_2_ensureComponent(Component); new $$_Component0C({ target: __sveltets_2_any(), props: {}}); + { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: {}}); { svelteHTML.createElement("h1", {}); } Component} \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/component-multi-slot/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/component-multi-slot/expectedv2.js index d0a63856c..ad72b2bfd 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/component-multi-slot/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/component-multi-slot/expectedv2.js @@ -1,11 +1,11 @@ - { const $$_Component0C = __sveltets_2_ensureComponent(Component); const $$_Component0 = new $$_Component0C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,var:new_var,} = $$_Component0.$$slot_def.default;$$_$$; + { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); const $$_tnenopmoC0 = new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,var:new_var,} = $$_tnenopmoC0.$$slot_def.default;$$_$$; { svelteHTML.createElement("h1", {}); new_var; } - {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,slotvar:newvar,} = $$_Component0.$$slot_def["someslot"];$$_$$;{ svelteHTML.createElement("div", { });newvar; + {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,slotvar:newvar,} = $$_tnenopmoC0.$$slot_def["someslot"];$$_$$;{ svelteHTML.createElement("div", { });newvar; { svelteHTML.createElement("h2", {}); newvar; } }} - {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,newvar2,} = $$_Component0.$$slot_def["slotwithoutchildren"];$$_$$;{ svelteHTML.createElement("div", { });newvar2; }} - {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,hi1,hi2,hi3:hi3alias,} = $$_Component0.$$slot_def["slotwithmultiplelets"];$$_$$;{ svelteHTML.createElement("div", { }); }} - {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,} = $$_Component0.$$slot_def["desc"];$$_$$;{ svelteHTML.createElement("p", { }); + {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,newvar2,} = $$_tnenopmoC0.$$slot_def["slotwithoutchildren"];$$_$$;{ svelteHTML.createElement("div", { });newvar2; }} + {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,hi1,hi2,hi3:hi3alias,} = $$_tnenopmoC0.$$slot_def["slotwithmultiplelets"];$$_$$;{ svelteHTML.createElement("div", { }); }} + {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,} = $$_tnenopmoC0.$$slot_def["desc"];$$_$$;{ svelteHTML.createElement("p", { }); }} }Component} \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/component-name-dot/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/component-name-dot/expectedv2.js index 958fecf4e..e694249d2 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/component-name-dot/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/component-name-dot/expectedv2.js @@ -1,2 +1,2 @@ - { const $$_Dotted_ComponentName0C = __sveltets_2_ensureComponent(Dotted.ComponentName); new $$_Dotted_ComponentName0C({ target: __sveltets_2_any(), props: {}});} - { const $$_Dotted_ComponentName0C = __sveltets_2_ensureComponent(Dotted.ComponentName); new $$_Dotted_ComponentName0C({ target: __sveltets_2_any(), props: {}}); Dotted.ComponentName} \ No newline at end of file + { const $$_emaNtnenopmoC_dettoD0C = __sveltets_2_ensureComponent(Dotted.ComponentName); new $$_emaNtnenopmoC_dettoD0C({ target: __sveltets_2_any(), props: {}});} + { const $$_emaNtnenopmoC_dettoD0C = __sveltets_2_ensureComponent(Dotted.ComponentName); new $$_emaNtnenopmoC_dettoD0C({ target: __sveltets_2_any(), props: {}}); Dotted.ComponentName} \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/component-named-slot/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/component-named-slot/expectedv2.js index 3618214b1..c03717e49 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/component-named-slot/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/component-named-slot/expectedv2.js @@ -1,8 +1,8 @@ - { const $$_Parent0C = __sveltets_2_ensureComponent(Parent); const $$_Parent0 = new $$_Parent0C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,foo,bar:baz,} = $$_Parent0.$$slot_def.default;$$_$$; - {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,bla,} = $$_Parent0.$$slot_def["named"];$$_$$;{ const $$_Component1C = __sveltets_2_ensureComponent(Component); new $$_Component1C({ target: __sveltets_2_any(), props: { }}); + { const $$_tneraP0C = __sveltets_2_ensureComponent(Parent); const $$_tneraP0 = new $$_tneraP0C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,foo,bar:baz,} = $$_tneraP0.$$slot_def.default;$$_$$; + {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,bla,} = $$_tneraP0.$$slot_def["named"];$$_$$;{ const $$_tnenopmoC1C = __sveltets_2_ensureComponent(Component); new $$_tnenopmoC1C({ target: __sveltets_2_any(), props: { }}); foo; baz; bla; }Component} - { const $$_Component1C = __sveltets_2_ensureComponent(Component); const $$_Component1 = new $$_Component1C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,blubb,} = $$_Component1.$$slot_def.default;$$_$$; + { const $$_tnenopmoC1C = __sveltets_2_ensureComponent(Component); const $$_tnenopmoC1 = new $$_tnenopmoC1C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,blubb,} = $$_tnenopmoC1.$$slot_def.default;$$_$$; blubb; }Component} }Parent} \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/component-no-slots/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/component-no-slots/expectedv2.js index 4f01626cf..ae0d49e46 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/component-no-slots/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/component-no-slots/expectedv2.js @@ -1,2 +1,2 @@ - { const $$_Component0C = __sveltets_2_ensureComponent(Component); new $$_Component0C({ target: __sveltets_2_any(), props: { "someProp":true,}}); Component} - { const $$_Component0C = __sveltets_2_ensureComponent(Component); new $$_Component0C({ target: __sveltets_2_any(), props: { "someProp":true,}});} \ No newline at end of file + { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: { "someProp":true,}}); Component} + { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: { "someProp":true,}});} \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/component-slot-infer-props/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/component-slot-infer-props/expectedv2.js index 7f5ea7326..4c0c80e7f 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/component-slot-infer-props/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/component-slot-infer-props/expectedv2.js @@ -1,5 +1,5 @@ - { const $$_Parent0C = __sveltets_2_ensureComponent(Parent); const $$_Parent0 = new $$_Parent0C({ target: __sveltets_2_any(), props: { "bare":true,shorthand,"text1":`val1`,"text2":`val2`,"text3":`a${a}b${b}`,"textEmpty":"","literal":true,"strLiteral":'foo',"complex":{a},"a-dashed-complex":{a},...__sveltets_2_cssProp({"--custom-cssprop":`foo`}),}});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,foo,} = $$_Parent0.$$slot_def.default;$$_$$; - {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,bar,} = $$_Parent0.$$slot_def["named"];$$_$$;{ const $$_Component1C = __sveltets_2_ensureComponent(Component); new $$_Component1C({ target: __sveltets_2_any(), props: { }}); + { const $$_tneraP0C = __sveltets_2_ensureComponent(Parent); const $$_tneraP0 = new $$_tneraP0C({ target: __sveltets_2_any(), props: { "bare":true,shorthand,"text1":`val1`,"text2":`val2`,"text3":`a${a}b${b}`,"textEmpty":"","literal":true,"strLiteral":'foo',"complex":{a},"a-dashed-complex":{a},...__sveltets_2_cssProp({"--custom-cssprop":`foo`}),}});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,foo,} = $$_tneraP0.$$slot_def.default;$$_$$; + {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,bar,} = $$_tneraP0.$$slot_def["named"];$$_$$;{ const $$_tnenopmoC1C = __sveltets_2_ensureComponent(Component); new $$_tnenopmoC1C({ target: __sveltets_2_any(), props: { }}); foo; bar; }Component} { svelteHTML.createElement("div", {}); diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/component-slot-shadowed-prop/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/component-slot-shadowed-prop/expectedv2.js index 7e7df9551..a48ac5078 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/component-slot-shadowed-prop/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/component-slot-shadowed-prop/expectedv2.js @@ -1,7 +1,7 @@ - { const $$_Component0C = __sveltets_2_ensureComponent(Component); const $$_Component0 = new $$_Component0C({ target: __sveltets_2_any(), props: { unshadowed1,"foo":unshadowed2,subthing,shadowed1,"shadowed-2":shadowed2,"templateString":` ${complex} `,"complex":{complex},}});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,name:n,shadowed1,shadowed2,subthing,} = $$_Component0.$$slot_def.default;$$_$$; - {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,subthing,} = $$_Component0.$$slot_def["sub1"];$$_$$;{ svelteHTML.createElement("p", { });thing;subthing; }} + { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); const $$_tnenopmoC0 = new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: { unshadowed1,"foo":unshadowed2,subthing,shadowed1,"shadowed-2":shadowed2,"templateString":` ${complex} `,"complex":{complex},}});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,name:n,shadowed1,shadowed2,subthing,} = $$_tnenopmoC0.$$slot_def.default;$$_$$; + {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,subthing,} = $$_tnenopmoC0.$$slot_def["sub1"];$$_$$;{ svelteHTML.createElement("p", { });thing;subthing; }} - {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,subthing,othersubthing,} = $$_Component0.$$slot_def["sub2"];$$_$$;{ const $$_Sub1C = __sveltets_2_ensureComponent(Sub); new $$_Sub1C({ target: __sveltets_2_any(), props: { subthing,}});thing;subthing; }Sub} + {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,subthing,othersubthing,} = $$_tnenopmoC0.$$slot_def["sub2"];$$_$$;{ const $$_buS1C = __sveltets_2_ensureComponent(Sub); new $$_buS1C({ target: __sveltets_2_any(), props: { subthing,}});thing;subthing; }Sub} - { const $$_Sub1C = __sveltets_2_ensureComponent(Sub); const $$_Sub1 = new $$_Sub1C({ target: __sveltets_2_any(), props: { subthing,}});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,subthing,othersubthing,} = $$_Sub1.$$slot_def.default;$$_$$;thing;subthing; }Sub} + { const $$_buS1C = __sveltets_2_ensureComponent(Sub); const $$_buS1 = new $$_buS1C({ target: __sveltets_2_any(), props: { subthing,}});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,subthing,othersubthing,} = $$_buS1.$$slot_def.default;$$_$$;thing;subthing; }Sub} }Component} \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/custom-css-properties/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/custom-css-properties/expectedv2.js index f3c9890f7..1968d107d 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/custom-css-properties/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/custom-css-properties/expectedv2.js @@ -1 +1 @@ - { const $$_Component0C = __sveltets_2_ensureComponent(Component); new $$_Component0C({ target: __sveltets_2_any(), props: { ...__sveltets_2_cssProp({"--custom-css-property1":'hi'}),...__sveltets_2_cssProp({"--custom-css-property2":`hi`}),"betweenprop":true,...__sveltets_2_cssProp({"--custom-css-property3":`hi${jo}hi`}),...__sveltets_2_cssProp({"--custom-css-property4":`hi${jo}hi`}),...__sveltets_2_cssProp({"--custom-css-property5":`hi${jo}hi`}),}});} \ No newline at end of file + { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: { ...__sveltets_2_cssProp({"--custom-css-property1":'hi'}),...__sveltets_2_cssProp({"--custom-css-property2":`hi`}),"betweenprop":true,...__sveltets_2_cssProp({"--custom-css-property3":`hi${jo}hi`}),...__sveltets_2_cssProp({"--custom-css-property4":`hi${jo}hi`}),...__sveltets_2_cssProp({"--custom-css-property5":`hi${jo}hi`}),}});} \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/directive-quoted/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/directive-quoted/expectedv2.js index d262844c9..57df4fdb0 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/directive-quoted/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/directive-quoted/expectedv2.js @@ -1,5 +1,5 @@ { svelteHTML.createElement("h1", { "on:click":()=>console.log("click"),}); } - { const $$_Component0C = __sveltets_2_ensureComponent(Component); const $$_Component0 = new $$_Component0C({ target: __sveltets_2_any(), props: { }});$$_Component0.$on("click", test);} + { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); const $$_tnenopmoC0 = new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: { }});$$_tnenopmoC0.$on("click", test);} {const $$action_0 = __sveltets_2_ensureAction(action(svelteHTML.mapElementTag('img'),(thing)));{ svelteHTML.createElement("img", __sveltets_2_union($$action_0), { });}} { svelteHTML.createElement("img", { });__sveltets_2_ensureTransition(fade(svelteHTML.mapElementTag('img'),(params)));} { svelteHTML.createElement("img", { });classthing;} diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/editing-binding/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-binding/expectedv2.js index cac5e098d..d568573db 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/editing-binding/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-binding/expectedv2.js @@ -1,3 +1,3 @@ { svelteHTML.createElement("input", { });obj.;} { svelteHTML.createElement("input", { "bind:value":obj.,});} - { const $$_Input0C = __sveltets_2_ensureComponent(Input); new $$_Input0C({ target: __sveltets_2_any(), props: { value:obj.,}});} \ No newline at end of file + { const $$_tupnI0C = __sveltets_2_ensureComponent(Input); new $$_tupnI0C({ target: __sveltets_2_any(), props: { value:obj.,}});} \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/editing-event-handler/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-event-handler/expectedv2.js index 8993cfc30..d2d98b0a6 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/editing-event-handler/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-event-handler/expectedv2.js @@ -1,3 +1,3 @@ { svelteHTML.createElement("div", { "on:click":handlers.,}); } - { const $$_Component0C = __sveltets_2_ensureComponent(Component); const $$_Component0 = new $$_Component0C({ target: __sveltets_2_any(), props: { }});$$_Component0.$on("click", handlers.);} \ No newline at end of file + { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); const $$_tnenopmoC0 = new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: { }});$$_tnenopmoC0.$on("click", handlers.);} \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/editing-mustache/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-mustache/expectedv2.js index 9184d4519..70381be0c 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/editing-mustache/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-mustache/expectedv2.js @@ -2,5 +2,5 @@ abc. ; abc?. ; abc ?; a+; - { const $$_Component0C = __sveltets_2_ensureComponent(Component); new $$_Component0C({ target: __sveltets_2_any(), props: { "regex":/.*/,}});} + { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: { "regex":/.*/,}});} { svelteHTML.createElement("span", {}); } \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/editing-props/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-props/expectedv2.js index d2febe316..a6874976b 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/editing-props/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-props/expectedv2.js @@ -1,3 +1,3 @@ { svelteHTML.createElement("label", { "id":''.,}); } - { const $$_Component0C = __sveltets_2_ensureComponent(Component); new $$_Component0C({ target: __sveltets_2_any(), props: { "hi":''?.,}}); Component} \ No newline at end of file + { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: { "hi":''?.,}}); Component} \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/event-handler-component-bare/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/event-handler-component-bare/expectedv2.js index e03ae5176..60f0d4a9a 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/event-handler-component-bare/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/event-handler-component-bare/expectedv2.js @@ -1 +1 @@ - { const $$_Component0C = __sveltets_2_ensureComponent(Component); const $$_Component0 = new $$_Component0C({ target: __sveltets_2_any(), props: { }});$$_Component0.$on("click", () => {});} \ No newline at end of file + { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); const $$_tnenopmoC0 = new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: { }});$$_tnenopmoC0.$on("click", () => {});} \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/event-handler-component-infer-props/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/event-handler-component-infer-props/expectedv2.js index f880af8de..885138fa4 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/event-handler-component-infer-props/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/event-handler-component-infer-props/expectedv2.js @@ -1 +1 @@ - { const $$_Component0C = __sveltets_2_ensureComponent(Component); const $$_Component0 = new $$_Component0C({ target: __sveltets_2_any(), props: { "bare":true,shorthand,"text1":`val1`,"text2":`val2`,"text3":`a${a}b${b}`,"textEmpty":"","literal":true,"strLiteral":'foo',"complex":{a},"a-dashed-complex":{a},...__sveltets_2_cssProp({"--custom-cssprop":`foo`}),}});$$_Component0.$on("click", e => e);} \ No newline at end of file + { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); const $$_tnenopmoC0 = new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: { "bare":true,shorthand,"text1":`val1`,"text2":`val2`,"text3":`a${a}b${b}`,"textEmpty":"","literal":true,"strLiteral":'foo',"complex":{a},"a-dashed-complex":{a},...__sveltets_2_cssProp({"--custom-cssprop":`foo`}),}});$$_tnenopmoC0.$on("click", e => e);} \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/event-handler-component/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/event-handler-component/expectedv2.js index a44ea3ff9..0c7b77ecb 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/event-handler-component/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/event-handler-component/expectedv2.js @@ -1 +1 @@ - { const $$_Component0C = __sveltets_2_ensureComponent(Component); const $$_Component0 = new $$_Component0C({ target: __sveltets_2_any(), props: { }});$$_Component0.$on("event", () => click());$$_Component0.$on("UpperCaseEvent", () => log('hi'));} \ No newline at end of file + { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); const $$_tnenopmoC0 = new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: { }});$$_tnenopmoC0.$on("event", () => click());$$_tnenopmoC0.$on("UpperCaseEvent", () => log('hi'));} \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/event-handler-svelte-component/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/event-handler-svelte-component/expectedv2.js index 31573a197..e6db841ca 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/event-handler-svelte-component/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/event-handler-svelte-component/expectedv2.js @@ -1 +1 @@ - { const $$_svelte_component0C = __sveltets_2_ensureComponent(Whatever); const $$_svelte_component0 = new $$_svelte_component0C({ target: __sveltets_2_any(), props: { }});$$_svelte_component0.$on("submit", handleSubmit);} \ No newline at end of file + { const $$_tnenopmoc_etlevs0C = __sveltets_2_ensureComponent(Whatever); const $$_tnenopmoc_etlevs0 = new $$_tnenopmoc_etlevs0C({ target: __sveltets_2_any(), props: { }});$$_tnenopmoc_etlevs0.$on("submit", handleSubmit);} \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/if-nested-slot-let-shadowed/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/if-nested-slot-let-shadowed/expectedv2.js index 9f5e3e847..4882bf2db 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/if-nested-slot-let-shadowed/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/if-nested-slot-let-shadowed/expectedv2.js @@ -1,38 +1,38 @@ if(hello && hello1){ - { const $$_Comp0C = __sveltets_2_ensureComponent(Comp); const $$_Comp0 = new $$_Comp0C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,hello,} = $$_Comp0.$$slot_def.default;$$_$$; + { const $$_pmoC0C = __sveltets_2_ensureComponent(Comp); const $$_pmoC0 = new $$_pmoC0C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,hello,} = $$_pmoC0.$$slot_def.default;$$_$$; hello; - { const $$_Comp1C = __sveltets_2_ensureComponent(Comp); const $$_Comp1 = new $$_Comp1C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,hello,} = $$_Comp1.$$slot_def.default;$$_$$; + { const $$_pmoC1C = __sveltets_2_ensureComponent(Comp); const $$_pmoC1 = new $$_pmoC1C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,hello,} = $$_pmoC1.$$slot_def.default;$$_$$; if(hello){ hello; } }Comp} - { const $$_Comp1C = __sveltets_2_ensureComponent(Comp); const $$_Comp1 = new $$_Comp1C({ target: __sveltets_2_any(), props: { hello,}});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,hello,} = $$_Comp1.$$slot_def.default;$$_$$; + { const $$_pmoC1C = __sveltets_2_ensureComponent(Comp); const $$_pmoC1 = new $$_pmoC1C({ target: __sveltets_2_any(), props: { hello,}});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,hello,} = $$_pmoC1.$$slot_def.default;$$_$$; if(hello){ hello; } }Comp} - {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,hello,} = $$_Comp0.$$slot_def["named1"];$$_$$;{ svelteHTML.createElement("svelte:fragment", { }); + {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,hello,} = $$_pmoC0.$$slot_def["named1"];$$_$$;{ svelteHTML.createElement("svelte:fragment", { }); if(hello){ hello; } }} - {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,hello,} = $$_Comp0.$$slot_def["named2"];$$_$$;{ svelteHTML.createElement("p", { }); + {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,hello,} = $$_pmoC0.$$slot_def["named2"];$$_$$;{ svelteHTML.createElement("p", { }); if(hello){ hello; } }} - {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,hello,} = $$_Comp0.$$slot_def["named3"];$$_$$;{ const $$_Comp1C = __sveltets_2_ensureComponent(Comp); new $$_Comp1C({ target: __sveltets_2_any(), props: { }}); + {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,hello,} = $$_pmoC0.$$slot_def["named3"];$$_$$;{ const $$_pmoC1C = __sveltets_2_ensureComponent(Comp); new $$_pmoC1C({ target: __sveltets_2_any(), props: { }}); if(hello){ hello; } }Comp} if(hello){ - { const $$_Comp1C = __sveltets_2_ensureComponent(Comp); const $$_Comp1 = new $$_Comp1C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,hello,} = $$_Comp1.$$slot_def.default;$$_$$; + { const $$_pmoC1C = __sveltets_2_ensureComponent(Comp); const $$_pmoC1 = new $$_pmoC1C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,hello,} = $$_pmoC1.$$slot_def.default;$$_$$; if(hello){ hello; } }Comp} - { const $$_Comp1C = __sveltets_2_ensureComponent(Comp); const $$_Comp1 = new $$_Comp1C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,foo,} = $$_Comp1.$$slot_def.default;$$_$$; + { const $$_pmoC1C = __sveltets_2_ensureComponent(Comp); const $$_pmoC1 = new $$_pmoC1C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,foo,} = $$_pmoC1.$$slot_def.default;$$_$$; const hello = foo; if(hello){ hello; @@ -41,25 +41,25 @@ if(hello && hello1){ } }Comp} if(hi && bye){ - { const $$_Comp0C = __sveltets_2_ensureComponent(Comp); const $$_Comp0 = new $$_Comp0C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,foo:bye,} = $$_Comp0.$$slot_def.default;$$_$$; + { const $$_pmoC0C = __sveltets_2_ensureComponent(Comp); const $$_pmoC0 = new $$_pmoC0C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,foo:bye,} = $$_pmoC0.$$slot_def.default;$$_$$; bye; }Comp} } else if (cool){ - { const $$_Comp0C = __sveltets_2_ensureComponent(Comp); const $$_Comp0 = new $$_Comp0C({ target: __sveltets_2_any(), props: {}}); - {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,cool,hello,} = $$_Comp0.$$slot_def["named"];$$_$$;{ svelteHTML.createElement("div", { }); + { const $$_pmoC0C = __sveltets_2_ensureComponent(Comp); const $$_pmoC0 = new $$_pmoC0C({ target: __sveltets_2_any(), props: {}}); + {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,cool,hello,} = $$_pmoC0.$$slot_def["named"];$$_$$;{ svelteHTML.createElement("div", { }); hello; }} Comp} }else{ - { const $$_Comp0C = __sveltets_2_ensureComponent(Comp); const $$_Comp0 = new $$_Comp0C({ target: __sveltets_2_any(), props: {}}); - {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,foo:hello,hello1:other,} = $$_Comp0.$$slot_def["named"];$$_$$;{ svelteHTML.createElement("div", { }); + { const $$_pmoC0C = __sveltets_2_ensureComponent(Comp); const $$_pmoC0 = new $$_pmoC0C({ target: __sveltets_2_any(), props: {}}); + {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,foo:hello,hello1:other,} = $$_pmoC0.$$slot_def["named"];$$_$$;{ svelteHTML.createElement("div", { }); hello; }} Comp} } } - { const $$_Comp0C = __sveltets_2_ensureComponent(Comp); const $$_Comp0 = new $$_Comp0C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,hello,} = $$_Comp0.$$slot_def.default;$$_$$; + { const $$_pmoC0C = __sveltets_2_ensureComponent(Comp); const $$_pmoC0 = new $$_pmoC0C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,hello,} = $$_pmoC0.$$slot_def.default;$$_$$; if(hello && bye){ hello; bye; } else if (hello && bye){ @@ -67,7 +67,7 @@ if(hello && hello1){ }else{ hello; bye; } - {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,hello,} = $$_Comp0.$$slot_def["named1"];$$_$$;{ svelteHTML.createElement("svelte:fragment", { }); + {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,hello,} = $$_pmoC0.$$slot_def["named1"];$$_$$;{ svelteHTML.createElement("svelte:fragment", { }); if(hello && bye){ hello; bye; } else if (hello && bye){ @@ -76,7 +76,7 @@ if(hello && hello1){ hello; bye; } }} - {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,hello,} = $$_Comp0.$$slot_def["named2"];$$_$$;{ svelteHTML.createElement("p", { }); + {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,hello,} = $$_pmoC0.$$slot_def["named2"];$$_$$;{ svelteHTML.createElement("p", { }); if(hello && bye){ hello; bye; } else if (hello && bye){ @@ -85,7 +85,7 @@ if(hello && hello1){ hello; bye; } }} - {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,foo,} = $$_Comp0.$$slot_def["named3"];$$_$$;{ svelteHTML.createElement("p", { }); + {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,foo,} = $$_pmoC0.$$slot_def["named3"];$$_$$;{ svelteHTML.createElement("p", { }); const hello = foo; if(hello && bye){ hello; bye; diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/if-nested-slot-let/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/if-nested-slot-let/expectedv2.js index 64bd6d2fa..f731b5392 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/if-nested-slot-let/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/if-nested-slot-let/expectedv2.js @@ -1,20 +1,20 @@ if(hello){ - { const $$_Comp0C = __sveltets_2_ensureComponent(Comp); const $$_Comp0 = new $$_Comp0C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,foo,} = $$_Comp0.$$slot_def.default;$$_$$; + { const $$_pmoC0C = __sveltets_2_ensureComponent(Comp); const $$_pmoC0 = new $$_pmoC0C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,foo,} = $$_pmoC0.$$slot_def.default;$$_$$; foo; }Comp} if(hi && bye){ - { const $$_Comp0C = __sveltets_2_ensureComponent(Comp); const $$_Comp0 = new $$_Comp0C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,foo:bar,} = $$_Comp0.$$slot_def.default;$$_$$; + { const $$_pmoC0C = __sveltets_2_ensureComponent(Comp); const $$_pmoC0 = new $$_pmoC0C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,foo:bar,} = $$_pmoC0.$$slot_def.default;$$_$$; bar; }Comp} } else if (cool){ - { const $$_Comp0C = __sveltets_2_ensureComponent(Comp); const $$_Comp0 = new $$_Comp0C({ target: __sveltets_2_any(), props: {}}); - {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,foo,foo1,} = $$_Comp0.$$slot_def["named"];$$_$$;{ svelteHTML.createElement("div", { }); + { const $$_pmoC0C = __sveltets_2_ensureComponent(Comp); const $$_pmoC0 = new $$_pmoC0C({ target: __sveltets_2_any(), props: {}}); + {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,foo,foo1,} = $$_pmoC0.$$slot_def["named"];$$_$$;{ svelteHTML.createElement("div", { }); foo; }} Comp} }else{ - { const $$_Comp0C = __sveltets_2_ensureComponent(Comp); const $$_Comp0 = new $$_Comp0C({ target: __sveltets_2_any(), props: {}}); - {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,foo:bar,} = $$_Comp0.$$slot_def["named"];$$_$$;{ svelteHTML.createElement("div", { }); + { const $$_pmoC0C = __sveltets_2_ensureComponent(Comp); const $$_pmoC0 = new $$_pmoC0C({ target: __sveltets_2_any(), props: {}}); + {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,foo:bar,} = $$_pmoC0.$$slot_def["named"];$$_$$;{ svelteHTML.createElement("div", { }); bar; }} Comp} diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/quotes-inside-quotes/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/quotes-inside-quotes/expectedv2.js index 1819265ed..ede6f159b 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/quotes-inside-quotes/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/quotes-inside-quotes/expectedv2.js @@ -1,2 +1,2 @@ - { const $$_Component0C = __sveltets_2_ensureComponent(Component); const $$_Component0 = new $$_Component0C({ target: __sveltets_2_any(), props: { "placeholder":`'`,}});$$_Component0.$on("keydown", () => {});} - { const $$_Component0C = __sveltets_2_ensureComponent(Component); const $$_Component0 = new $$_Component0C({ target: __sveltets_2_any(), props: { "placeholder":`"`,}});$$_Component0.$on("keydown", () => {});} \ No newline at end of file + { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); const $$_tnenopmoC0 = new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: { "placeholder":`'`,}});$$_tnenopmoC0.$on("keydown", () => {});} + { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); const $$_tnenopmoC0 = new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: { "placeholder":`"`,}});$$_tnenopmoC0.$on("keydown", () => {});} \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/svelte-fragment/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/svelte-fragment/expectedv2.js index 313266094..c6f20b49e 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/svelte-fragment/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/svelte-fragment/expectedv2.js @@ -1,19 +1,19 @@ - { const $$_Component0C = __sveltets_2_ensureComponent(Component); const $$_Component0 = new $$_Component0C({ target: __sveltets_2_any(), props: {}}); + { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); const $$_tnenopmoC0 = new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: {}}); { svelteHTML.createElement("svelte:fragment", {}); { svelteHTML.createElement("p", {}); } } - {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,} = $$_Component0.$$slot_def["named"];$$_$$;{ svelteHTML.createElement("svelte:fragment", { }); + {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,} = $$_tnenopmoC0.$$slot_def["named"];$$_$$;{ svelteHTML.createElement("svelte:fragment", { }); { svelteHTML.createElement("p", {}); } }} Component} - { const $$_Component0C = __sveltets_2_ensureComponent(Component); const $$_Component0 = new $$_Component0C({ target: __sveltets_2_any(), props: {}}); - {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,foo,bar:baz,} = $$_Component0.$$slot_def.default;$$_$$;{ svelteHTML.createElement("svelte:fragment", { }); + { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); const $$_tnenopmoC0 = new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: {}}); + {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,foo,bar:baz,} = $$_tnenopmoC0.$$slot_def.default;$$_$$;{ svelteHTML.createElement("svelte:fragment", { }); { svelteHTML.createElement("p", {});foo; baz; } }} - {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,foo,bar:baz,} = $$_Component0.$$slot_def["named"];$$_$$;{ svelteHTML.createElement("svelte:fragment", { }); + {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,foo,bar:baz,} = $$_tnenopmoC0.$$slot_def["named"];$$_$$;{ svelteHTML.createElement("svelte:fragment", { }); { svelteHTML.createElement("p", {});foo; baz; } }} Component} \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/attributes-foreign-ns/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/attributes-foreign-ns/expectedv2.ts index ecb4564ae..6bb9ac24f 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/attributes-foreign-ns/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/attributes-foreign-ns/expectedv2.ts @@ -1,7 +1,7 @@ /// ;function render() { async () => { { svelteHTML.createElement("element", { "someAttr":`hi`,"someOtherAttribute":`there`,}); } - { const $$_Component0C = __sveltets_2_ensureComponent(Component); new $$_Component0C({ target: __sveltets_2_any(), props: { "someAttr":`5`,"otherAttr":6,}});}}; + { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: { "someAttr":`5`,"otherAttr":6,}});}}; return { props: {}, slots: {}, events: {} }} export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) { diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-forward-with-props/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-forward-with-props/expectedv2.ts index 31b64b29b..ddcdc82ee 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-forward-with-props/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-forward-with-props/expectedv2.ts @@ -1,7 +1,7 @@ /// ;function render() { /*Ωignore_startΩ*/;const __sveltets_createSlot = __sveltets_2_createCreateSlot();/*Ωignore_endΩ*/ -async () => { { const $$_Parent0C = __sveltets_2_ensureComponent(Parent); const $$_Parent0 = new $$_Parent0C({ target: __sveltets_2_any(), props: { "propA":true,propB,"propC":`val1`,"propD":`val2`,"propE":`a${a}b${b}`,}});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,foo,} = $$_Parent0.$$slot_def.default;$$_$$; +async () => { { const $$_tneraP0C = __sveltets_2_ensureComponent(Parent); const $$_tneraP0 = new $$_tneraP0C({ target: __sveltets_2_any(), props: { "propA":true,propB,"propC":`val1`,"propD":`val2`,"propE":`a${a}b${b}`,}});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,foo,} = $$_tneraP0.$$slot_def.default;$$_$$; { __sveltets_createSlot("default", { foo,});} }Parent}}; return { props: {}, slots: {'default': {foo:__sveltets_1_instanceOf(Parent).$$slot_def['default'].foo}}, events: {} }} diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-let-forward-named-slot/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-let-forward-named-slot/expectedv2.ts index 70658b001..b18e0009e 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-let-forward-named-slot/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-let-forward-named-slot/expectedv2.ts @@ -1,8 +1,8 @@ /// ;function render() { /*Ωignore_startΩ*/;const __sveltets_createSlot = __sveltets_2_createCreateSlot();/*Ωignore_endΩ*/ -async () => { { const $$_Component0C = __sveltets_2_ensureComponent(Component); const $$_Component0 = new $$_Component0C({ target: __sveltets_2_any(), props: {}}); - {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,a,} = $$_Component0.$$slot_def["b"];$$_$$;{ svelteHTML.createElement("div", { }); +async () => { { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); const $$_tnenopmoC0 = new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: {}}); + {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,a,} = $$_tnenopmoC0.$$slot_def["b"];$$_$$;{ svelteHTML.createElement("div", { }); { __sveltets_createSlot("default", {a,}); } }} Component}}; diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-let-forward/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-let-forward/expectedv2.ts index 18306b69d..22f9526a1 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-let-forward/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-let-forward/expectedv2.ts @@ -1,7 +1,7 @@ /// ;function render() { /*Ωignore_startΩ*/;const __sveltets_createSlot = __sveltets_2_createCreateSlot();/*Ωignore_endΩ*/ -async () => { { const $$_Component0C = __sveltets_2_ensureComponent(Component); const $$_Component0 = new $$_Component0C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,name:n,thing,whatever:{ bla },} = $$_Component0.$$slot_def.default;$$_$$; +async () => { { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); const $$_tnenopmoC0 = new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,name:n,thing,whatever:{ bla },} = $$_tnenopmoC0.$$slot_def.default;$$_$$; { __sveltets_createSlot("default", { n,thing,bla,});} }Component}}; return { props: {}, slots: {'default': {n:__sveltets_1_instanceOf(Component).$$slot_def['default'].name, thing:__sveltets_1_instanceOf(Component).$$slot_def['default'].thing, bla:(({ bla }) => bla)(__sveltets_1_instanceOf(Component).$$slot_def['default'].whatever)}}, events: {} }} diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-nest-scope/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-nest-scope/expectedv2.ts index 97bb77ec1..8454caa5c 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-nest-scope/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-nest-scope/expectedv2.ts @@ -7,7 +7,7 @@ async () => { for(let item of __sveltets_2_ensureArray(items)){ } { __sveltets_createSlot("second", { a,}); } } - { const $$_Component0C = __sveltets_2_ensureComponent(Component); const $$_Component0 = new $$_Component0C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,c,} = $$_Component0.$$slot_def.default;$$_$$; c ; }Component} + { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); const $$_tnenopmoC0 = new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,c,} = $$_tnenopmoC0.$$slot_def.default;$$_$$; c ; }Component} { const $$_value = await (promise);{ const d = $$_value; d; }} diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-no-space/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-no-space/expectedv2.ts index 909ec9c21..0f75f4976 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-no-space/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-no-space/expectedv2.ts @@ -7,7 +7,7 @@ function render() { ; async () => { - { svelteHTML.createElement("div", {}); { const $$_Test1C = __sveltets_2_ensureComponent(Test); const $$_Test1 = new $$_Test1C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,t,} = $$_Test1.$$slot_def.default;$$_$$; }Test} }}; + { svelteHTML.createElement("div", {}); { const $$_tseT1C = __sveltets_2_ensureComponent(Test); const $$_tseT1 = new $$_tseT1C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,t,} = $$_tseT1.$$slot_def.default;$$_$$; }Test} }}; return { props: {}, slots: {}, events: {} }} export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) { diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/const-tag-component/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/const-tag-component/expectedv2.ts index ba7138951..ed3fceb61 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/const-tag-component/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/const-tag-component/expectedv2.ts @@ -13,22 +13,22 @@ function render() { ; async () => { - { const $$_Component0C = __sveltets_2_ensureComponent(Component); const $$_Component0 = new $$_Component0C({ target: __sveltets_2_any(), props: {box,}}); - {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,box,} = $$_Component0.$$slot_def["box1"];$$_$$;{ svelteHTML.createElement("svelte:fragment", { }); + { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); const $$_tnenopmoC0 = new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: {box,}}); + {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,box,} = $$_tnenopmoC0.$$slot_def["box1"];$$_$$;{ svelteHTML.createElement("svelte:fragment", { }); const {area, volume} = calculate(box.width, box.height, constant); const perimeter = (box.width + box.height) * constant; const [width, height, sum] = [box.width * constant, box.height, box.width * constant + box.height]; { svelteHTML.createElement("div", {});area; volume; perimeter; width; height; sum; } }} - {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,width,height,} = $$_Component0.$$slot_def["box2"];$$_$$;{ svelteHTML.createElement("svelte:fragment", { }); + {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,width,height,} = $$_tnenopmoC0.$$slot_def["box2"];$$_$$;{ svelteHTML.createElement("svelte:fragment", { }); const {area, volume} = calculate(width, height, constant); const perimeter = (width + height) * constant; const [_width, _height, sum] = [width * constant, height, width * constant + height]; { svelteHTML.createElement("div", {});area; volume; perimeter; _width; _height; sum; } }} - {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,box:{width, height},} = $$_Component0.$$slot_def.default;$$_$$;{ svelteHTML.createElement("svelte:fragment", { }); + {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,box:{width, height},} = $$_tnenopmoC0.$$slot_def.default;$$_$$;{ svelteHTML.createElement("svelte:fragment", { }); const {area, volume} = calculate(width, height, constant); const perimeter = (width + height) * constant; const [_width, _height, sum] = [width * constant, height, width * constant + height]; @@ -36,15 +36,15 @@ async () => { }} Component} - { const $$_Component0C = __sveltets_2_ensureComponent(Component); const $$_Component0 = new $$_Component0C({ target: __sveltets_2_any(), props: { box,}});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,box,} = $$_Component0.$$slot_def.default;$$_$$; - {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,box,} = $$_Component0.$$slot_def["box1"];$$_$$;{ svelteHTML.createElement("div", { }); + { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); const $$_tnenopmoC0 = new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: { box,}});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,box,} = $$_tnenopmoC0.$$slot_def.default;$$_$$; + {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,box,} = $$_tnenopmoC0.$$slot_def["box1"];$$_$$;{ svelteHTML.createElement("div", { }); const {area, volume} = calculate(box.width, box.height, constant); const perimeter = (box.width + box.height) * constant; const [width, height, sum] = [box.width * constant, box.height, box.width * constant + box.height]; { svelteHTML.createElement("div", {});area; volume; perimeter; width; height; sum; } }} - {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,width,height,} = $$_Component0.$$slot_def["box2"];$$_$$;{ svelteHTML.createElement("div", { }); + {const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,width,height,} = $$_tnenopmoC0.$$slot_def["box2"];$$_$$;{ svelteHTML.createElement("div", { }); const {area, volume} = calculate(width, height, constant); const perimeter = (width + height) * constant; const [_width, _height, sum] = [width * constant, height, width * constant + height]; @@ -57,7 +57,7 @@ async () => { { svelteHTML.createElement("div", {});area; volume; perimeter; width; height; sum; } }Component} - { const $$_Component0C = __sveltets_2_ensureComponent(Component); const $$_Component0 = new $$_Component0C({ target: __sveltets_2_any(), props: { box,}});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,box:{width, height},} = $$_Component0.$$slot_def.default;$$_$$; + { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); const $$_tnenopmoC0 = new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: { box,}});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,box:{width, height},} = $$_tnenopmoC0.$$slot_def.default;$$_$$; const {area, volume} = calculate(width, height, constant); const perimeter = (width + height) * constant; const [_width, _height, sum] = [width * constant, height, width * constant + height]; diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/custom-css-properties-with-$store/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/custom-css-properties-with-$store/expectedv2.ts index 998e36419..ce4d058e4 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/custom-css-properties-with-$store/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/custom-css-properties-with-$store/expectedv2.ts @@ -1,6 +1,6 @@ /// ;function render() { -async () => { { const $$_Component0C = __sveltets_2_ensureComponent(Component); new $$_Component0C({ target: __sveltets_2_any(), props: { ...__sveltets_2_cssProp({"--custom-css-property1":$jo}),...__sveltets_2_cssProp({"--custom-css-property2":`hi${$jo}hi`}),...__sveltets_2_cssProp({"--custom-css-property3":`hi${$jo}hi`}),...__sveltets_2_cssProp({"--custom-css-property4":`hi${$jo}hi`}),}});}}; +async () => { { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: { ...__sveltets_2_cssProp({"--custom-css-property1":$jo}),...__sveltets_2_cssProp({"--custom-css-property2":`hi${$jo}hi`}),...__sveltets_2_cssProp({"--custom-css-property3":`hi${$jo}hi`}),...__sveltets_2_cssProp({"--custom-css-property4":`hi${$jo}hi`}),}});}}; return { props: {}, slots: {}, events: {} }} export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) { diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component-multi/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component-multi/expectedv2.ts index 294125d18..1c7ae3bfa 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component-multi/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component-multi/expectedv2.ts @@ -1,7 +1,7 @@ /// ;function render() { -async () => { { const $$_Button0C = __sveltets_2_ensureComponent(Button); const $$_Button0 = new $$_Button0C({ target: __sveltets_2_any(), props: { }});$$_Button0.$on("click", () => {}); Button} - { const $$_Radio0C = __sveltets_2_ensureComponent(Radio); const $$_Radio0 = new $$_Radio0C({ target: __sveltets_2_any(), props: { }});$$_Radio0.$on("click", () => {}); Radio}}; +async () => { { const $$_nottuB0C = __sveltets_2_ensureComponent(Button); const $$_nottuB0 = new $$_nottuB0C({ target: __sveltets_2_any(), props: { }});$$_nottuB0.$on("click", () => {}); Button} + { const $$_oidaR0C = __sveltets_2_ensureComponent(Radio); const $$_oidaR0 = new $$_oidaR0C({ target: __sveltets_2_any(), props: { }});$$_oidaR0.$on("click", () => {}); Radio}}; return { props: {}, slots: {}, events: {'click':__sveltets_1_unionType(__sveltets_1_bubbleEventDef(__sveltets_1_instanceOf(Button).$$events_def, 'click'),__sveltets_1_bubbleEventDef(__sveltets_1_instanceOf(Radio).$$events_def, 'click'))} }} export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) { diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component-with-props/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component-with-props/expectedv2.ts index a8d0056de..9406a6632 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component-with-props/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component-with-props/expectedv2.ts @@ -1,6 +1,6 @@ /// ;function render() { -async () => { { const $$_Component0C = __sveltets_2_ensureComponent(Component); const $$_Component0 = new $$_Component0C({ target: __sveltets_2_any(), props: { "propA":true,propB,"propC":`val1`,"propD":`val2`,"propE":`a${a}b${b}`,}});$$_Component0.$on("click", () => {});}}; +async () => { { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); const $$_tnenopmoC0 = new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: { "propA":true,propB,"propC":`val1`,"propD":`val2`,"propE":`a${a}b${b}`,}});$$_tnenopmoC0.$on("click", () => {});}}; return { props: {}, slots: {}, events: {'click':__sveltets_1_bubbleEventDef(__sveltets_1_instanceOf(Component).$$events_def, 'click')} }} export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) { diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component/expectedv2.ts index 77322954a..a834d6318 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component/expectedv2.ts @@ -1,6 +1,6 @@ /// ;function render() { -async () => { { const $$_Button0C = __sveltets_2_ensureComponent(Button); const $$_Button0 = new $$_Button0C({ target: __sveltets_2_any(), props: { }});$$_Button0.$on("click", () => {}); Button}}; +async () => { { const $$_nottuB0C = __sveltets_2_ensureComponent(Button); const $$_nottuB0 = new $$_nottuB0C({ target: __sveltets_2_any(), props: { }});$$_nottuB0.$on("click", () => {}); Button}}; return { props: {}, slots: {}, events: {'click':__sveltets_1_bubbleEventDef(__sveltets_1_instanceOf(Button).$$events_def, 'click')} }} export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) { diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/import-single-quote/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/import-single-quote/expectedv2.ts index 44b642dea..17df095d2 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/import-single-quote/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/import-single-quote/expectedv2.ts @@ -5,7 +5,7 @@ function render() { ; -async () => { { const $$_Test0C = __sveltets_2_ensureComponent(Test); new $$_Test0C({ target: __sveltets_2_any(), props: { "b":`6`,}}); Test} +async () => { { const $$_tseT0C = __sveltets_2_ensureComponent(Test); new $$_tseT0C({ target: __sveltets_2_any(), props: { "b":`6`,}}); Test} }; return { props: {}, slots: {}, events: {} }} diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/script-style-like-component/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/script-style-like-component/expectedv2.ts index c615e08ba..4f9d5a18c 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/script-style-like-component/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/script-style-like-component/expectedv2.ts @@ -5,10 +5,10 @@ ; async () => { - { const $$_Script0C = __sveltets_2_ensureComponent(Script); new $$_Script0C({ target: __sveltets_2_any(), props: {}}); + { const $$_tpircS0C = __sveltets_2_ensureComponent(Script); new $$_tpircS0C({ target: __sveltets_2_any(), props: {}}); { svelteHTML.createElement("p", {}); } Script} - { const $$_Style0C = __sveltets_2_ensureComponent(Style); new $$_Style0C({ target: __sveltets_2_any(), props: {}});}}; + { const $$_elytS0C = __sveltets_2_ensureComponent(Style); new $$_elytS0C({ target: __sveltets_2_any(), props: {}});}}; return { props: {}, slots: {}, events: {} }} export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) { diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/self-closing-component/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/self-closing-component/expectedv2.ts index 2a77e83b5..46cde170b 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/self-closing-component/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/self-closing-component/expectedv2.ts @@ -6,7 +6,7 @@ function render() { let a = 'b'; ; -async () => { { const $$_Test0C = __sveltets_2_ensureComponent(Test); new $$_Test0C({ target: __sveltets_2_any(), props: { "b":`6`,}});} +async () => { { const $$_tseT0C = __sveltets_2_ensureComponent(Test); new $$_tseT0C({ target: __sveltets_2_any(), props: { "b":`6`,}});} }; return { props: {}, slots: {}, events: {} }} diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/stores-mustache/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/stores-mustache/expectedv2.ts index 49730c132..31dbd2231 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/stores-mustache/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/stores-mustache/expectedv2.ts @@ -1,6 +1,6 @@ /// ;function render() { -async () => { { const $$_Me0C = __sveltets_2_ensureComponent(Me); new $$_Me0C({ target: __sveltets_2_any(), props: { "f":`${$s} `,}});}}; +async () => { { const $$_eM0C = __sveltets_2_ensureComponent(Me); new $$_eM0C({ target: __sveltets_2_any(), props: { "f":`${$s} `,}});}}; return { props: {}, slots: {}, events: {} }} export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) { diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-in-event-binding/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-in-event-binding/expectedv2.ts index 15cd1a579..56e747bc6 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-in-event-binding/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-in-event-binding/expectedv2.ts @@ -1,6 +1,6 @@ /// ;function render() { -async () => { { const $$_Component0C = __sveltets_2_ensureComponent(Component); const $$_Component0 = new $$_Component0C({ target: __sveltets_2_any(), props: { }});$$_Component0.$on("click", $check ? method1 : method2);} +async () => { { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); const $$_tnenopmoC0 = new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: { }});$$_tnenopmoC0.$on("click", $check ? method1 : method2);} { svelteHTML.createElement("button", { "on:click":$check ? method1 : method2,}); }}; return { props: {}, slots: {}, events: {} }} diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components-let-forward/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components-let-forward/expectedv2.ts index e65b4c104..37850bae8 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components-let-forward/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components-let-forward/expectedv2.ts @@ -6,7 +6,7 @@ async () => {if(true){ { __sveltets_createSlot("default", { prop,});} }} } - { const $$_svelte_component0C = __sveltets_2_ensureComponent(testComponent); const $$_svelte_component0 = new $$_svelte_component0C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,prop,} = $$_svelte_component0.$$slot_def.default;$$_$$; + { const $$_tnenopmoc_etlevs0C = __sveltets_2_ensureComponent(testComponent); const $$_tnenopmoc_etlevs0 = new $$_tnenopmoc_etlevs0C({ target: __sveltets_2_any(), props: { }});{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,prop,} = $$_tnenopmoc_etlevs0.$$slot_def.default;$$_$$; { __sveltets_createSlot("default", { prop,});} }}}; return { props: {}, slots: {'default': {prop:__sveltets_1_instanceOf(__sveltets_1_componentType()).$$slot_def['default'].prop}}, events: {} }} diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components/expectedv2.ts index 6912e025b..6711c655e 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components/expectedv2.ts @@ -3,7 +3,7 @@ async () => {if(true){ { __sveltets_2_createComponentAny({ "prop1":1,});} } - { const $$_svelte_component0C = __sveltets_2_ensureComponent(testComponent); new $$_svelte_component0C({ target: __sveltets_2_any(), props: { "propa":5,}}); + { const $$_tnenopmoc_etlevs0C = __sveltets_2_ensureComponent(testComponent); new $$_tnenopmoc_etlevs0C({ target: __sveltets_2_any(), props: { "propa":5,}}); { svelteHTML.createElement("h1", {}); } } { svelteHTML.createElement("svelte:window", { "on:click":e => {},});}