svelte2tsx 0.7.25 → 0.7.26

package/index.js

@@ -4752,11 +4752,17 @@ class HoistableInterfaces {
                     });
                 }
             });
-            this.interface_map.set(interface_name, {
-                type_deps: type_dependencies,
-                value_deps: value_dependencies,
-                node
-            });
+            if (this.import_type_set.has(interface_name)) {
+                // shadowed; delete because we can't hoist
+                this.import_type_set.delete(interface_name);
+            }
+            else {
+                this.interface_map.set(interface_name, {
+                    type_deps: type_dependencies,
+                    value_deps: value_dependencies,
+                    node
+                });
+            }
         }
         // Handle Type Alias Declarations
         if (ts.isTypeAliasDeclaration(node)) {
@@ -4765,12 +4771,41 @@ class HoistableInterfaces {
             const value_dependencies = new Set();
             const generics = (_d = (_c = node.typeParameters) === null || _c === void 0 ? void 0 : _c.map((param) => param.name.text)) !== null && _d !== void 0 ? _d : [];
             this.collectTypeDependencies(node.type, type_dependencies, value_dependencies, generics);
-            this.interface_map.set(alias_name, {
-                type_deps: type_dependencies,
-                value_deps: value_dependencies,
-                node
+            if (this.import_type_set.has(alias_name)) {
+                // shadowed; delete because we can't hoist
+                this.import_type_set.delete(alias_name);
+            }
+            else {
+                this.interface_map.set(alias_name, {
+                    type_deps: type_dependencies,
+                    value_deps: value_dependencies,
+                    node
+                });
+            }
+        }
+        // Handle top-level declarations: They could shadow module declarations; delete them from the set of allowed import values
+        if (ts.isVariableStatement(node)) {
+            node.declarationList.declarations.forEach((declaration) => {
+                if (ts.isIdentifier(declaration.name)) {
+                    this.import_value_set.delete(declaration.name.text);
+                }
             });
         }
+        if (ts.isFunctionDeclaration(node) && node.name) {
+            this.import_value_set.delete(node.name.text);
+        }
+        if (ts.isClassDeclaration(node) && node.name) {
+            this.import_value_set.delete(node.name.text);
+        }
+        if (ts.isEnumDeclaration(node)) {
+            this.import_value_set.delete(node.name.text);
+        }
+        if (ts.isTypeAliasDeclaration(node)) {
+            this.import_type_set.delete(node.name.text);
+        }
+        if (ts.isInterfaceDeclaration(node)) {
+            this.import_type_set.delete(node.name.text);
+        }
     }
     analyze$propsRune(node) {
         var _a, _b;
@@ -4836,9 +4871,12 @@ class HoistableInterfaces {
     /**
      * Moves all interfaces that can be hoisted to the top of the script, if the $props rune's type is hoistable.
      */
-    moveHoistableInterfaces(str, astOffset, scriptStart) {
+    moveHoistableInterfaces(str, astOffset, scriptStart, generics) {
         if (!this.props_interface.name)
             return;
+        for (const generic of generics) {
+            this.import_type_set.delete(generic);
+        }
         const hoistable = this.determineHoistableInterfaces();
         if (hoistable.has(this.props_interface.name)) {
             for (const [, node] of hoistable) {
@@ -6345,8 +6383,10 @@ class Generics {
         var _a, _b, _c, _d;
         this.str = str;
         this.astOffset = astOffset;
+        /** The whole `T extends boolean` */
         this.definitions = [];
         this.typeReferences = [];
+        /** The `T` in `T extends boolean` */
         this.references = [];
         this.genericsAttr = script.attributes.find((attr) => attr.name === 'generics');
         const generics = (_b = (_a = this.genericsAttr) === null || _a === void 0 ? void 0 : _a.value[0]) === null || _b === void 0 ? void 0 : _b.raw;
@@ -6405,6 +6445,9 @@ class Generics {
     getTypeReferences() {
         return this.typeReferences;
     }
+    getReferences() {
+        return this.references;
+    }
     toDefinitionString(addIgnore = false) {
         const surround = addIgnore ? surroundWithIgnoreComments : (str) => str;
         return this.definitions.length ? surround(`<${this.definitions.join(',')}>`) : '';
@@ -6706,7 +6749,7 @@ function processInstanceScriptContent(str, script, events, implicitStoreValues,
         // break dts generation (file will not be generated).
         transformInterfacesToTypes(tsAst, str, astOffset, nodesToMove);
     }
-    exportedNames.hoistableInterfaces.moveHoistableInterfaces(str, astOffset, script.start);
+    exportedNames.hoistableInterfaces.moveHoistableInterfaces(str, astOffset, script.start, generics.getReferences());
     return {
         exportedNames,
         events,

package/index.mjs

@@ -4732,11 +4732,17 @@ class HoistableInterfaces {
                     });
                 }
             });
-            this.interface_map.set(interface_name, {
-                type_deps: type_dependencies,
-                value_deps: value_dependencies,
-                node
-            });
+            if (this.import_type_set.has(interface_name)) {
+                // shadowed; delete because we can't hoist
+                this.import_type_set.delete(interface_name);
+            }
+            else {
+                this.interface_map.set(interface_name, {
+                    type_deps: type_dependencies,
+                    value_deps: value_dependencies,
+                    node
+                });
+            }
         }
         // Handle Type Alias Declarations
         if (ts.isTypeAliasDeclaration(node)) {
@@ -4745,12 +4751,41 @@ class HoistableInterfaces {
             const value_dependencies = new Set();
             const generics = (_d = (_c = node.typeParameters) === null || _c === void 0 ? void 0 : _c.map((param) => param.name.text)) !== null && _d !== void 0 ? _d : [];
             this.collectTypeDependencies(node.type, type_dependencies, value_dependencies, generics);
-            this.interface_map.set(alias_name, {
-                type_deps: type_dependencies,
-                value_deps: value_dependencies,
-                node
+            if (this.import_type_set.has(alias_name)) {
+                // shadowed; delete because we can't hoist
+                this.import_type_set.delete(alias_name);
+            }
+            else {
+                this.interface_map.set(alias_name, {
+                    type_deps: type_dependencies,
+                    value_deps: value_dependencies,
+                    node
+                });
+            }
+        }
+        // Handle top-level declarations: They could shadow module declarations; delete them from the set of allowed import values
+        if (ts.isVariableStatement(node)) {
+            node.declarationList.declarations.forEach((declaration) => {
+                if (ts.isIdentifier(declaration.name)) {
+                    this.import_value_set.delete(declaration.name.text);
+                }
             });
         }
+        if (ts.isFunctionDeclaration(node) && node.name) {
+            this.import_value_set.delete(node.name.text);
+        }
+        if (ts.isClassDeclaration(node) && node.name) {
+            this.import_value_set.delete(node.name.text);
+        }
+        if (ts.isEnumDeclaration(node)) {
+            this.import_value_set.delete(node.name.text);
+        }
+        if (ts.isTypeAliasDeclaration(node)) {
+            this.import_type_set.delete(node.name.text);
+        }
+        if (ts.isInterfaceDeclaration(node)) {
+            this.import_type_set.delete(node.name.text);
+        }
     }
     analyze$propsRune(node) {
         var _a, _b;
@@ -4816,9 +4851,12 @@ class HoistableInterfaces {
     /**
      * Moves all interfaces that can be hoisted to the top of the script, if the $props rune's type is hoistable.
      */
-    moveHoistableInterfaces(str, astOffset, scriptStart) {
+    moveHoistableInterfaces(str, astOffset, scriptStart, generics) {
         if (!this.props_interface.name)
             return;
+        for (const generic of generics) {
+            this.import_type_set.delete(generic);
+        }
         const hoistable = this.determineHoistableInterfaces();
         if (hoistable.has(this.props_interface.name)) {
             for (const [, node] of hoistable) {
@@ -6325,8 +6363,10 @@ class Generics {
         var _a, _b, _c, _d;
         this.str = str;
         this.astOffset = astOffset;
+        /** The whole `T extends boolean` */
         this.definitions = [];
         this.typeReferences = [];
+        /** The `T` in `T extends boolean` */
         this.references = [];
         this.genericsAttr = script.attributes.find((attr) => attr.name === 'generics');
         const generics = (_b = (_a = this.genericsAttr) === null || _a === void 0 ? void 0 : _a.value[0]) === null || _b === void 0 ? void 0 : _b.raw;
@@ -6385,6 +6425,9 @@ class Generics {
     getTypeReferences() {
         return this.typeReferences;
     }
+    getReferences() {
+        return this.references;
+    }
     toDefinitionString(addIgnore = false) {
         const surround = addIgnore ? surroundWithIgnoreComments : (str) => str;
         return this.definitions.length ? surround(`<${this.definitions.join(',')}>`) : '';
@@ -6686,7 +6729,7 @@ function processInstanceScriptContent(str, script, events, implicitStoreValues,
         // break dts generation (file will not be generated).
         transformInterfacesToTypes(tsAst, str, astOffset, nodesToMove);
     }
-    exportedNames.hoistableInterfaces.moveHoistableInterfaces(str, astOffset, script.start);
+    exportedNames.hoistableInterfaces.moveHoistableInterfaces(str, astOffset, script.start, generics.getReferences());
     return {
         exportedNames,
         events,

package/package.json

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