fix bind:this used before assign (#363)

sveltejs · Jul 26, 2020 · 5348104 · 5348104
1 parent 9fe3db5
commit 5348104
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 9 deletions.
diff --git a/packages/svelte2tsx/src/htmlxtojsx.ts b/packages/svelte2tsx/src/htmlxtojsx.ts
@@ -204,8 +204,12 @@ export function convertHtmlxToJsx(
 
             if (thisType) {
                 str.remove(attr.start, attr.expression.start);
-                str.appendLeft(attr.expression.start, `{...__sveltets_ensureType(${thisType}, `);
-                str.overwrite(attr.expression.end, attr.end, ')}');
+                str.appendLeft(attr.expression.start, '{...__sveltets_empty(');
+                str.overwrite(
+                    attr.expression.end,
+                    attr.end,
+                    `=__sveltets_instanceOf(${thisType}))}`
+                );
                 return;
             }
         }

diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this-component/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this-component/expected.jsx
@@ -1 +1 @@
-<><Component type="radio" {...__sveltets_ensureType(Component, element)} value="Plain"/></>
+<><Component type="radio" {...__sveltets_empty(element=__sveltets_instanceOf(Component))} value="Plain"/></>
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this-svelte-body/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this-svelte-body/expected.jsx
@@ -1 +1 @@
-<><sveltebody {...__sveltets_ensureType(HTMLBodyElement, element)} /></>
+<><sveltebody {...__sveltets_empty(element=__sveltets_instanceOf(HTMLBodyElement))} /></>
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this-svelte-component/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this-svelte-component/expected.jsx
@@ -1 +1 @@
-<><sveltecomponent this={A} {...__sveltets_ensureType(__sveltets_componentType(), element)} /></>
+<><sveltecomponent this={A} {...__sveltets_empty(element=__sveltets_instanceOf(__sveltets_componentType()))} /></>
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this-svelte-self/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this-svelte-self/expected.jsx
@@ -1,3 +1,3 @@
 <>{() => {if (false){<>
-    <svelteself {...__sveltets_ensureType(__sveltets_componentType(), element)} />
+    <svelteself {...__sveltets_empty(element=__sveltets_instanceOf(__sveltets_componentType()))} />
 </>}}}</>
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this/expected.jsx
@@ -1 +1 @@
-<><input type="radio" {...__sveltets_ensureType(HTMLElement, element)} value="Plain"/></>
+<><input type="radio" {...__sveltets_empty(element=__sveltets_instanceOf(HTMLElement))} value="Plain"/></>
diff --git a/packages/svelte2tsx/test/sourcemaps/repl.html b/packages/svelte2tsx/test/sourcemaps/repl.html
@@ -135,7 +135,7 @@
 				<TableOfContents sections={sections} slug={slug} selected={selected}/>
 			</div>
 
-			<div class="chapter-markup" {...__sveltets_ensureType(HTMLElement, scrollable)}>
+			<div class="chapter-markup" {...__sveltets_empty(scrollable=__sveltets_instanceOf(HTMLElement))}>
 				{ chapter.html}
 
 				<div class="controls">
@@ -159,7 +159,7 @@
 
 		<div class="tutorial-repl">
 			<Repl
-				{...__sveltets_ensureType(Repl, repl)}
+				{...__sveltets_empty(repl=__sveltets_instanceOf(Repl))}
 				workersUrl="workers"
 				svelteUrl={svelteUrl}
 				rollupUrl={rollupUrl}