svelte2tsx 0.7.11 → 0.7.12

package/index.js

@@ -3246,7 +3246,7 @@ function convertHtmlxToJsx(str, ast, onWalk = null, onLeave = null, options = {
                             estreeTypedParent.type === 'InlineComponent'
                             ? element
                             : undefined);
-                        if (!element) {
+                        if (parent === ast) {
                             // root snippet -> move to instance script
                             rootSnippets.push([node.start, node.end]);
                         }
@@ -6051,7 +6051,7 @@ function processInstanceScriptContent(str, script, events, implicitStoreValues,
         }
     };
     const walk = (node, parent) => {
-        var _a;
+        var _a, _b, _c;
         const onLeaveCallbacks = [];
         generics.addIfIsGeneric(node);
         if (is$$EventsDeclaration(node)) {
@@ -6094,7 +6094,10 @@ function processInstanceScriptContent(str, script, events, implicitStoreValues,
         if (ts.isVariableDeclaration(node)) {
             events.checkIfIsStringLiteralDeclaration(node);
             events.checkIfDeclarationInstantiatedEventDispatcher(node);
-            implicitStoreValues.addVariableDeclaration(node);
+            // Only top level declarations can be stores
+            if (((_b = (_a = node.parent) === null || _a === void 0 ? void 0 : _a.parent) === null || _b === void 0 ? void 0 : _b.parent) === tsAst) {
+                implicitStoreValues.addVariableDeclaration(node);
+            }
         }
         if (ts.isCallExpression(node)) {
             events.checkIfCallExpressionIsDispatch(node);
@@ -6139,7 +6142,7 @@ function processInstanceScriptContent(str, script, events, implicitStoreValues,
         // Defensively call function (checking for undefined) because it got added only recently (TS 4.0)
         // and therefore might break people using older TS versions
         // Don't transform in ts mode because <type>value type assertions are valid in this case
-        if (mode !== 'ts' && ((_a = ts.isTypeAssertionExpression) === null || _a === void 0 ? void 0 : _a.call(ts, node))) {
+        if (mode !== 'ts' && ((_c = ts.isTypeAssertionExpression) === null || _c === void 0 ? void 0 : _c.call(ts, node))) {
             handleTypeAssertion(str, node, astOffset);
         }
         //to save a bunch of condition checks on each node, we recurse into processChild which skips all the checks for top level items

package/index.mjs

@@ -3226,7 +3226,7 @@ function convertHtmlxToJsx(str, ast, onWalk = null, onLeave = null, options = {
                             estreeTypedParent.type === 'InlineComponent'
                             ? element
                             : undefined);
-                        if (!element) {
+                        if (parent === ast) {
                             // root snippet -> move to instance script
                             rootSnippets.push([node.start, node.end]);
                         }
@@ -6031,7 +6031,7 @@ function processInstanceScriptContent(str, script, events, implicitStoreValues,
         }
     };
     const walk = (node, parent) => {
-        var _a;
+        var _a, _b, _c;
         const onLeaveCallbacks = [];
         generics.addIfIsGeneric(node);
         if (is$$EventsDeclaration(node)) {
@@ -6074,7 +6074,10 @@ function processInstanceScriptContent(str, script, events, implicitStoreValues,
         if (ts.isVariableDeclaration(node)) {
             events.checkIfIsStringLiteralDeclaration(node);
             events.checkIfDeclarationInstantiatedEventDispatcher(node);
-            implicitStoreValues.addVariableDeclaration(node);
+            // Only top level declarations can be stores
+            if (((_b = (_a = node.parent) === null || _a === void 0 ? void 0 : _a.parent) === null || _b === void 0 ? void 0 : _b.parent) === tsAst) {
+                implicitStoreValues.addVariableDeclaration(node);
+            }
         }
         if (ts.isCallExpression(node)) {
             events.checkIfCallExpressionIsDispatch(node);
@@ -6119,7 +6122,7 @@ function processInstanceScriptContent(str, script, events, implicitStoreValues,
         // Defensively call function (checking for undefined) because it got added only recently (TS 4.0)
         // and therefore might break people using older TS versions
         // Don't transform in ts mode because <type>value type assertions are valid in this case
-        if (mode !== 'ts' && ((_a = ts.isTypeAssertionExpression) === null || _a === void 0 ? void 0 : _a.call(ts, node))) {
+        if (mode !== 'ts' && ((_c = ts.isTypeAssertionExpression) === null || _c === void 0 ? void 0 : _c.call(ts, node))) {
             handleTypeAssertion(str, node, astOffset);
         }
         //to save a bunch of condition checks on each node, we recurse into processChild which skips all the checks for top level items

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte2tsx",
-  "version": "0.7.11",
+  "version": "0.7.12",
   "description": "Convert Svelte components to TSX for type checking",
   "author": "David Pershouse",
   "license": "MIT",