svelte2tsx 0.7.31 → 0.7.33

package/index.js

@@ -5212,7 +5212,7 @@ function addComponentExport(params) {
         addSimpleComponentExport(params);
     }
 }
-function addGenericsComponentExport({ events, canHaveAnyProp, exportedNames, componentDocumentation, fileName, mode, usesAccessors, str, generics, usesSlots, isSvelte5, noSvelteComponentTyped }) {
+function addGenericsComponentExport({ events, canHaveAnyProp, exportedNames, componentDocumentation, fileName, mode, usesAccessors, isTsFile, str, generics, usesSlots, isSvelte5, noSvelteComponentTyped }) {
     const genericsDef = generics.toDefinitionString();
     const genericsRef = generics.toReferencesString();
     const doc = componentDocumentation.getFormatted();
@@ -5220,6 +5220,8 @@ function addGenericsComponentExport({ events, canHaveAnyProp, exportedNames, com
     function returnType(forPart) {
         return `ReturnType<__sveltets_Render${genericsRef}['${forPart}']>`;
     }
+    // TODO once Svelte 4 compatibility is dropped, we can simplify this, because since TS 4.7 it is possible to use generics
+    // like this: `typeof render<T>` - which wasn't possibly before, hence the class + methods workaround.
     let statement = `
 class __sveltets_Render${genericsDef} {
     props() {
@@ -5231,12 +5233,21 @@ class __sveltets_Render${genericsDef} {
     slots() {
         return render${genericsRef}().slots;
     }
-${isSvelte5
+`;
+    // For Svelte 5+ we assume TS > 4.7
+    if (isSvelte5 && !isTsFile && exportedNames.usesRunes()) {
+        statement = `
+class __sveltets_Render${genericsDef} {
+    props(): ReturnType<typeof render${genericsRef}>['props'] { return null as any; }
+    events(): ReturnType<typeof render${genericsRef}>['events'] { return null as any; }
+    slots(): ReturnType<typeof render${genericsRef}>['slots'] { return null as any; }
+`;
+    }
+    statement += isSvelte5
         ? `    bindings() { return ${exportedNames.createBindingsStr()}; }
     exports() { return ${exportedNames.hasExports() ? `render${genericsRef}().exports` : '{}'}; }
-}`
-        : '}'}
-`;
+}\n`
+        : '}\n';
     const svelteComponentClass = noSvelteComponentTyped
         ? 'SvelteComponent'
         : 'SvelteComponentTyped';
@@ -5462,7 +5473,7 @@ function classNameFromFilename(filename, appendSuffix) {
     }
 }
 
-function createRenderFunction({ str, scriptTag, scriptDestination, slots, events, exportedNames, uses$$props, uses$$restProps, uses$$slots, uses$$SlotsInterface, generics, mode }) {
+function createRenderFunction({ str, scriptTag, scriptDestination, slots, events, exportedNames, uses$$props, uses$$restProps, uses$$slots, uses$$SlotsInterface, generics, isTsFile, mode }) {
     const htmlx = str.original;
     let propsDecl = '';
     if (uses$$props) {
@@ -5497,8 +5508,8 @@ function createRenderFunction({ str, scriptTag, scriptDestination, slots, events
                 end--;
             }
             str.overwrite(scriptTag.start + 1, start - 1, `function render`);
-            str.overwrite(start - 1, start, `<`); // if the generics are unused, only this char is colored opaque
-            str.overwrite(end, scriptTagEnd, `>() {${propsDecl}\n`);
+            str.overwrite(start - 1, start, isTsFile ? '<' : `<${IGNORE_START_COMMENT}`); // if the generics are unused, only this char is colored opaque
+            str.overwrite(end, scriptTagEnd, `>${isTsFile ? '' : IGNORE_END_COMMENT}() {${propsDecl}\n`);
         }
         else {
             str.overwrite(scriptTag.start + 1, scriptTagEnd, `function render${generics.toDefinitionString(true)}() {${propsDecl}\n`);
@@ -5998,8 +6009,9 @@ function getCurrentPrepends(str, index) {
  */
 class HoistableInterfaces {
     constructor() {
-        this.import_value_set = new Set();
-        this.import_type_set = new Set();
+        this.module_types = new Set();
+        this.disallowed_types = new Set();
+        this.disallowed_values = new Set();
         this.interface_map = new Map();
         this.props_interface = {
             name: '',
@@ -6008,6 +6020,7 @@ class HoistableInterfaces {
             value_deps: new Set()
         };
     }
+    /** should be called before analyzeInstanceScriptNode */
     analyzeModuleScriptNode(node) {
         // Handle Import Declarations
         if (ts.isImportDeclaration(node) && node.importClause) {
@@ -6017,10 +6030,7 @@ class HoistableInterfaces {
                 node.importClause.namedBindings.elements.forEach((element) => {
                     const import_name = element.name.text;
                     if (is_type_only || element.isTypeOnly) {
-                        this.import_type_set.add(import_name);
-                    }
-                    else {
-                        this.import_value_set.add(import_name);
+                        this.module_types.add(import_name);
                     }
                 });
             }
@@ -6028,10 +6038,7 @@ class HoistableInterfaces {
             if (node.importClause.name) {
                 const default_import = node.importClause.name.text;
                 if (is_type_only) {
-                    this.import_type_set.add(default_import);
-                }
-                else {
-                    this.import_value_set.add(default_import);
+                    this.module_types.add(default_import);
                 }
             }
             // Handle namespace imports
@@ -6039,35 +6046,15 @@ class HoistableInterfaces {
                 ts.isNamespaceImport(node.importClause.namedBindings)) {
                 const namespace_import = node.importClause.namedBindings.name.text;
                 if (is_type_only) {
-                    this.import_type_set.add(namespace_import);
-                }
-                else {
-                    this.import_value_set.add(namespace_import);
+                    this.module_types.add(namespace_import);
                 }
             }
         }
-        // Handle top-level declarations
-        if (ts.isVariableStatement(node)) {
-            node.declarationList.declarations.forEach((declaration) => {
-                if (ts.isIdentifier(declaration.name)) {
-                    this.import_value_set.add(declaration.name.text);
-                }
-            });
-        }
-        if (ts.isFunctionDeclaration(node) && node.name) {
-            this.import_value_set.add(node.name.text);
-        }
-        if (ts.isClassDeclaration(node) && node.name) {
-            this.import_value_set.add(node.name.text);
-        }
-        if (ts.isEnumDeclaration(node)) {
-            this.import_value_set.add(node.name.text);
-        }
         if (ts.isTypeAliasDeclaration(node)) {
-            this.import_type_set.add(node.name.text);
+            this.module_types.add(node.name.text);
         }
         if (ts.isInterfaceDeclaration(node)) {
-            this.import_type_set.add(node.name.text);
+            this.module_types.add(node.name.text);
         }
     }
     analyzeInstanceScriptNode(node) {
@@ -6080,10 +6067,7 @@ class HoistableInterfaces {
                 node.importClause.namedBindings.elements.forEach((element) => {
                     const import_name = element.name.text;
                     if (is_type_only) {
-                        this.import_type_set.add(import_name);
-                    }
-                    else {
-                        this.import_value_set.add(import_name);
+                        this.module_types.add(import_name);
                     }
                 });
             }
@@ -6091,10 +6075,7 @@ class HoistableInterfaces {
             if (node.importClause.name) {
                 const default_import = node.importClause.name.text;
                 if (is_type_only) {
-                    this.import_type_set.add(default_import);
-                }
-                else {
-                    this.import_value_set.add(default_import);
+                    this.module_types.add(default_import);
                 }
             }
             // Handle namespace imports
@@ -6102,10 +6083,7 @@ class HoistableInterfaces {
                 ts.isNamespaceImport(node.importClause.namedBindings)) {
                 const namespace_import = node.importClause.namedBindings.name.text;
                 if (is_type_only) {
-                    this.import_type_set.add(namespace_import);
-                }
-                else {
-                    this.import_value_set.add(namespace_import);
+                    this.module_types.add(namespace_import);
                 }
             }
         }
@@ -6126,9 +6104,9 @@ class HoistableInterfaces {
                     });
                 }
             });
-            if (this.import_type_set.has(interface_name)) {
-                // shadowed; delete because we can't hoist
-                this.import_type_set.delete(interface_name);
+            if (this.module_types.has(interface_name)) {
+                // shadowed; we can't hoist
+                this.disallowed_types.add(interface_name);
             }
             else {
                 this.interface_map.set(interface_name, {
@@ -6145,9 +6123,9 @@ 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);
-            if (this.import_type_set.has(alias_name)) {
-                // shadowed; delete because we can't hoist
-                this.import_type_set.delete(alias_name);
+            if (this.module_types.has(alias_name)) {
+                // shadowed; we can't hoist
+                this.disallowed_types.add(alias_name);
             }
             else {
                 this.interface_map.set(alias_name, {
@@ -6161,24 +6139,18 @@ class HoistableInterfaces {
         if (ts.isVariableStatement(node)) {
             node.declarationList.declarations.forEach((declaration) => {
                 if (ts.isIdentifier(declaration.name)) {
-                    this.import_value_set.delete(declaration.name.text);
+                    this.disallowed_values.add(declaration.name.text);
                 }
             });
         }
         if (ts.isFunctionDeclaration(node) && node.name) {
-            this.import_value_set.delete(node.name.text);
+            this.disallowed_values.add(node.name.text);
         }
         if (ts.isClassDeclaration(node) && node.name) {
-            this.import_value_set.delete(node.name.text);
+            this.disallowed_values.add(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);
+            this.disallowed_values.add(node.name.text);
         }
     }
     analyze$propsRune(node) {
@@ -6216,11 +6188,24 @@ class HoistableInterfaces {
                 if (hoistable_interfaces.has(interface_name)) {
                     continue;
                 }
-                const can_hoist = [...deps.type_deps, ...deps.value_deps].every((dep) => {
-                    return (this.import_type_set.has(dep) ||
-                        this.import_value_set.has(dep) ||
-                        hoistable_interfaces.has(dep));
-                });
+                let can_hoist = true;
+                for (const dep of deps.type_deps) {
+                    if (this.disallowed_types.has(dep)) {
+                        this.disallowed_types.add(interface_name);
+                        can_hoist = false;
+                        break;
+                    }
+                    if (this.interface_map.has(dep) && !hoistable_interfaces.has(dep)) {
+                        can_hoist = false;
+                    }
+                }
+                for (const dep of deps.value_deps) {
+                    if (this.disallowed_values.has(dep)) {
+                        this.disallowed_types.add(interface_name);
+                        can_hoist = false;
+                        break;
+                    }
+                }
                 if (can_hoist) {
                     hoistable_interfaces.set(interface_name, deps.node);
                     progress = true;
@@ -6232,9 +6217,7 @@ class HoistableInterfaces {
                 ...this.props_interface.type_deps,
                 ...this.props_interface.value_deps
             ].every((dep) => {
-                return (this.import_type_set.has(dep) ||
-                    this.import_value_set.has(dep) ||
-                    hoistable_interfaces.has(dep));
+                return !this.disallowed_types.has(dep) && !this.disallowed_values.has(dep);
             });
             if (can_hoist) {
                 hoistable_interfaces.set(this.props_interface.name, this.props_interface.node);
@@ -6249,7 +6232,7 @@ class HoistableInterfaces {
         if (!this.props_interface.name)
             return;
         for (const generic of generics) {
-            this.import_type_set.delete(generic);
+            this.disallowed_types.add(generic);
         }
         const hoistable = this.determineHoistableInterfaces();
         if (hoistable.has(this.props_interface.name)) {
@@ -6277,8 +6260,8 @@ class HoistableInterfaces {
             return hoistable;
         }
     }
-    getAllowedValues() {
-        return this.import_value_set;
+    isAllowedReference(reference) {
+        return !this.disallowed_values.has(reference);
     }
     /**
      * Collects type and value dependencies from a given TypeNode.
@@ -7747,6 +7730,7 @@ function svelte2tsx(svelte, options = { parse: compiler.parse }) {
     const str = new MagicString(svelte);
     const basename = path.basename(options.filename || '');
     const svelte5Plus = Number(options.version[0]) > 4;
+    const isTsFile = options === null || options === void 0 ? void 0 : options.isTsFile;
     // process the htmlx as a svelte template
     let { htmlAst, moduleScriptTag, scriptTag, rootSnippets, slots, uses$$props, uses$$slots, uses$$restProps, events, componentDocumentation, resolvedStores, usesAccessors, isRunes } = processSvelteTemplate(str, options.parse || compiler.parse, {
         ...options,
@@ -7775,7 +7759,7 @@ function svelte2tsx(svelte, options = { parse: compiler.parse }) {
         : instanceScriptTarget;
     const implicitStoreValues = new ImplicitStoreValues(resolvedStores, renderFunctionStart);
     //move the instance script and process the content
-    let exportedNames = new ExportedNames(str, 0, basename, options === null || options === void 0 ? void 0 : options.isTsFile, svelte5Plus, isRunes);
+    let exportedNames = new ExportedNames(str, 0, basename, isTsFile, svelte5Plus, isRunes);
     let generics = new Generics(str, 0, { attributes: [] });
     let uses$$SlotsInterface = false;
     if (scriptTag) {
@@ -7783,7 +7767,7 @@ function svelte2tsx(svelte, options = { parse: compiler.parse }) {
         if (scriptTag.start != instanceScriptTarget) {
             str.move(scriptTag.start, scriptTag.end, instanceScriptTarget);
         }
-        const res = processInstanceScriptContent(str, scriptTag, events, implicitStoreValues, options.mode, moduleAst, options === null || options === void 0 ? void 0 : options.isTsFile, basename, svelte5Plus, isRunes);
+        const res = processInstanceScriptContent(str, scriptTag, events, implicitStoreValues, options.mode, moduleAst, isTsFile, basename, svelte5Plus, isRunes);
         uses$$props = uses$$props || res.uses$$props;
         uses$$restProps = uses$$restProps || res.uses$$restProps;
         uses$$slots = uses$$slots || res.uses$$slots;
@@ -7807,6 +7791,7 @@ function svelte2tsx(svelte, options = { parse: compiler.parse }) {
         uses$$SlotsInterface,
         generics,
         svelte5Plus,
+        isTsFile,
         mode: options.mode
     });
     // we need to process the module script after the instance script has moved otherwise we get warnings about moving edited items
@@ -7817,14 +7802,14 @@ function svelte2tsx(svelte, options = { parse: compiler.parse }) {
         }
     }
     if (moduleScriptTag || scriptTag) {
-        const allowed = exportedNames.hoistableInterfaces.getAllowedValues();
         for (const [start, end, globals] of rootSnippets) {
             const hoist_to_module = moduleScriptTag &&
-                (globals.size === 0 || [...globals.keys()].every((id) => allowed.has(id)));
+                (globals.size === 0 ||
+                    [...globals.keys()].every((id) => exportedNames.hoistableInterfaces.isAllowedReference(id)));
             if (hoist_to_module) {
                 str.move(start, end, scriptTag
                     ? scriptTag.start + 1 // +1 because imports are also moved at that position, and we want to move interfaces after imports
-                    : moduleScriptTag.end);
+                    : instanceScriptTarget);
             }
             else if (scriptTag) {
                 str.move(start, end, renderFunctionStart);
@@ -7835,7 +7820,7 @@ function svelte2tsx(svelte, options = { parse: compiler.parse }) {
         str,
         canHaveAnyProp: !exportedNames.uses$$Props && (uses$$props || uses$$restProps),
         events,
-        isTsFile: options === null || options === void 0 ? void 0 : options.isTsFile,
+        isTsFile,
         exportedNames,
         usesAccessors,
         usesSlots: slots.size > 0,

package/index.mjs

@@ -5192,7 +5192,7 @@ function addComponentExport(params) {
         addSimpleComponentExport(params);
     }
 }
-function addGenericsComponentExport({ events, canHaveAnyProp, exportedNames, componentDocumentation, fileName, mode, usesAccessors, str, generics, usesSlots, isSvelte5, noSvelteComponentTyped }) {
+function addGenericsComponentExport({ events, canHaveAnyProp, exportedNames, componentDocumentation, fileName, mode, usesAccessors, isTsFile, str, generics, usesSlots, isSvelte5, noSvelteComponentTyped }) {
     const genericsDef = generics.toDefinitionString();
     const genericsRef = generics.toReferencesString();
     const doc = componentDocumentation.getFormatted();
@@ -5200,6 +5200,8 @@ function addGenericsComponentExport({ events, canHaveAnyProp, exportedNames, com
     function returnType(forPart) {
         return `ReturnType<__sveltets_Render${genericsRef}['${forPart}']>`;
     }
+    // TODO once Svelte 4 compatibility is dropped, we can simplify this, because since TS 4.7 it is possible to use generics
+    // like this: `typeof render<T>` - which wasn't possibly before, hence the class + methods workaround.
     let statement = `
 class __sveltets_Render${genericsDef} {
     props() {
@@ -5211,12 +5213,21 @@ class __sveltets_Render${genericsDef} {
     slots() {
         return render${genericsRef}().slots;
     }
-${isSvelte5
+`;
+    // For Svelte 5+ we assume TS > 4.7
+    if (isSvelte5 && !isTsFile && exportedNames.usesRunes()) {
+        statement = `
+class __sveltets_Render${genericsDef} {
+    props(): ReturnType<typeof render${genericsRef}>['props'] { return null as any; }
+    events(): ReturnType<typeof render${genericsRef}>['events'] { return null as any; }
+    slots(): ReturnType<typeof render${genericsRef}>['slots'] { return null as any; }
+`;
+    }
+    statement += isSvelte5
         ? `    bindings() { return ${exportedNames.createBindingsStr()}; }
     exports() { return ${exportedNames.hasExports() ? `render${genericsRef}().exports` : '{}'}; }
-}`
-        : '}'}
-`;
+}\n`
+        : '}\n';
     const svelteComponentClass = noSvelteComponentTyped
         ? 'SvelteComponent'
         : 'SvelteComponentTyped';
@@ -5442,7 +5453,7 @@ function classNameFromFilename(filename, appendSuffix) {
     }
 }
 
-function createRenderFunction({ str, scriptTag, scriptDestination, slots, events, exportedNames, uses$$props, uses$$restProps, uses$$slots, uses$$SlotsInterface, generics, mode }) {
+function createRenderFunction({ str, scriptTag, scriptDestination, slots, events, exportedNames, uses$$props, uses$$restProps, uses$$slots, uses$$SlotsInterface, generics, isTsFile, mode }) {
     const htmlx = str.original;
     let propsDecl = '';
     if (uses$$props) {
@@ -5477,8 +5488,8 @@ function createRenderFunction({ str, scriptTag, scriptDestination, slots, events
                 end--;
             }
             str.overwrite(scriptTag.start + 1, start - 1, `function render`);
-            str.overwrite(start - 1, start, `<`); // if the generics are unused, only this char is colored opaque
-            str.overwrite(end, scriptTagEnd, `>() {${propsDecl}\n`);
+            str.overwrite(start - 1, start, isTsFile ? '<' : `<${IGNORE_START_COMMENT}`); // if the generics are unused, only this char is colored opaque
+            str.overwrite(end, scriptTagEnd, `>${isTsFile ? '' : IGNORE_END_COMMENT}() {${propsDecl}\n`);
         }
         else {
             str.overwrite(scriptTag.start + 1, scriptTagEnd, `function render${generics.toDefinitionString(true)}() {${propsDecl}\n`);
@@ -5978,8 +5989,9 @@ function getCurrentPrepends(str, index) {
  */
 class HoistableInterfaces {
     constructor() {
-        this.import_value_set = new Set();
-        this.import_type_set = new Set();
+        this.module_types = new Set();
+        this.disallowed_types = new Set();
+        this.disallowed_values = new Set();
         this.interface_map = new Map();
         this.props_interface = {
             name: '',
@@ -5988,6 +6000,7 @@ class HoistableInterfaces {
             value_deps: new Set()
         };
     }
+    /** should be called before analyzeInstanceScriptNode */
     analyzeModuleScriptNode(node) {
         // Handle Import Declarations
         if (ts.isImportDeclaration(node) && node.importClause) {
@@ -5997,10 +6010,7 @@ class HoistableInterfaces {
                 node.importClause.namedBindings.elements.forEach((element) => {
                     const import_name = element.name.text;
                     if (is_type_only || element.isTypeOnly) {
-                        this.import_type_set.add(import_name);
-                    }
-                    else {
-                        this.import_value_set.add(import_name);
+                        this.module_types.add(import_name);
                     }
                 });
             }
@@ -6008,10 +6018,7 @@ class HoistableInterfaces {
             if (node.importClause.name) {
                 const default_import = node.importClause.name.text;
                 if (is_type_only) {
-                    this.import_type_set.add(default_import);
-                }
-                else {
-                    this.import_value_set.add(default_import);
+                    this.module_types.add(default_import);
                 }
             }
             // Handle namespace imports
@@ -6019,35 +6026,15 @@ class HoistableInterfaces {
                 ts.isNamespaceImport(node.importClause.namedBindings)) {
                 const namespace_import = node.importClause.namedBindings.name.text;
                 if (is_type_only) {
-                    this.import_type_set.add(namespace_import);
-                }
-                else {
-                    this.import_value_set.add(namespace_import);
+                    this.module_types.add(namespace_import);
                 }
             }
         }
-        // Handle top-level declarations
-        if (ts.isVariableStatement(node)) {
-            node.declarationList.declarations.forEach((declaration) => {
-                if (ts.isIdentifier(declaration.name)) {
-                    this.import_value_set.add(declaration.name.text);
-                }
-            });
-        }
-        if (ts.isFunctionDeclaration(node) && node.name) {
-            this.import_value_set.add(node.name.text);
-        }
-        if (ts.isClassDeclaration(node) && node.name) {
-            this.import_value_set.add(node.name.text);
-        }
-        if (ts.isEnumDeclaration(node)) {
-            this.import_value_set.add(node.name.text);
-        }
         if (ts.isTypeAliasDeclaration(node)) {
-            this.import_type_set.add(node.name.text);
+            this.module_types.add(node.name.text);
         }
         if (ts.isInterfaceDeclaration(node)) {
-            this.import_type_set.add(node.name.text);
+            this.module_types.add(node.name.text);
         }
     }
     analyzeInstanceScriptNode(node) {
@@ -6060,10 +6047,7 @@ class HoistableInterfaces {
                 node.importClause.namedBindings.elements.forEach((element) => {
                     const import_name = element.name.text;
                     if (is_type_only) {
-                        this.import_type_set.add(import_name);
-                    }
-                    else {
-                        this.import_value_set.add(import_name);
+                        this.module_types.add(import_name);
                     }
                 });
             }
@@ -6071,10 +6055,7 @@ class HoistableInterfaces {
             if (node.importClause.name) {
                 const default_import = node.importClause.name.text;
                 if (is_type_only) {
-                    this.import_type_set.add(default_import);
-                }
-                else {
-                    this.import_value_set.add(default_import);
+                    this.module_types.add(default_import);
                 }
             }
             // Handle namespace imports
@@ -6082,10 +6063,7 @@ class HoistableInterfaces {
                 ts.isNamespaceImport(node.importClause.namedBindings)) {
                 const namespace_import = node.importClause.namedBindings.name.text;
                 if (is_type_only) {
-                    this.import_type_set.add(namespace_import);
-                }
-                else {
-                    this.import_value_set.add(namespace_import);
+                    this.module_types.add(namespace_import);
                 }
             }
         }
@@ -6106,9 +6084,9 @@ class HoistableInterfaces {
                     });
                 }
             });
-            if (this.import_type_set.has(interface_name)) {
-                // shadowed; delete because we can't hoist
-                this.import_type_set.delete(interface_name);
+            if (this.module_types.has(interface_name)) {
+                // shadowed; we can't hoist
+                this.disallowed_types.add(interface_name);
             }
             else {
                 this.interface_map.set(interface_name, {
@@ -6125,9 +6103,9 @@ 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);
-            if (this.import_type_set.has(alias_name)) {
-                // shadowed; delete because we can't hoist
-                this.import_type_set.delete(alias_name);
+            if (this.module_types.has(alias_name)) {
+                // shadowed; we can't hoist
+                this.disallowed_types.add(alias_name);
             }
             else {
                 this.interface_map.set(alias_name, {
@@ -6141,24 +6119,18 @@ class HoistableInterfaces {
         if (ts.isVariableStatement(node)) {
             node.declarationList.declarations.forEach((declaration) => {
                 if (ts.isIdentifier(declaration.name)) {
-                    this.import_value_set.delete(declaration.name.text);
+                    this.disallowed_values.add(declaration.name.text);
                 }
             });
         }
         if (ts.isFunctionDeclaration(node) && node.name) {
-            this.import_value_set.delete(node.name.text);
+            this.disallowed_values.add(node.name.text);
         }
         if (ts.isClassDeclaration(node) && node.name) {
-            this.import_value_set.delete(node.name.text);
+            this.disallowed_values.add(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);
+            this.disallowed_values.add(node.name.text);
         }
     }
     analyze$propsRune(node) {
@@ -6196,11 +6168,24 @@ class HoistableInterfaces {
                 if (hoistable_interfaces.has(interface_name)) {
                     continue;
                 }
-                const can_hoist = [...deps.type_deps, ...deps.value_deps].every((dep) => {
-                    return (this.import_type_set.has(dep) ||
-                        this.import_value_set.has(dep) ||
-                        hoistable_interfaces.has(dep));
-                });
+                let can_hoist = true;
+                for (const dep of deps.type_deps) {
+                    if (this.disallowed_types.has(dep)) {
+                        this.disallowed_types.add(interface_name);
+                        can_hoist = false;
+                        break;
+                    }
+                    if (this.interface_map.has(dep) && !hoistable_interfaces.has(dep)) {
+                        can_hoist = false;
+                    }
+                }
+                for (const dep of deps.value_deps) {
+                    if (this.disallowed_values.has(dep)) {
+                        this.disallowed_types.add(interface_name);
+                        can_hoist = false;
+                        break;
+                    }
+                }
                 if (can_hoist) {
                     hoistable_interfaces.set(interface_name, deps.node);
                     progress = true;
@@ -6212,9 +6197,7 @@ class HoistableInterfaces {
                 ...this.props_interface.type_deps,
                 ...this.props_interface.value_deps
             ].every((dep) => {
-                return (this.import_type_set.has(dep) ||
-                    this.import_value_set.has(dep) ||
-                    hoistable_interfaces.has(dep));
+                return !this.disallowed_types.has(dep) && !this.disallowed_values.has(dep);
             });
             if (can_hoist) {
                 hoistable_interfaces.set(this.props_interface.name, this.props_interface.node);
@@ -6229,7 +6212,7 @@ class HoistableInterfaces {
         if (!this.props_interface.name)
             return;
         for (const generic of generics) {
-            this.import_type_set.delete(generic);
+            this.disallowed_types.add(generic);
         }
         const hoistable = this.determineHoistableInterfaces();
         if (hoistable.has(this.props_interface.name)) {
@@ -6257,8 +6240,8 @@ class HoistableInterfaces {
             return hoistable;
         }
     }
-    getAllowedValues() {
-        return this.import_value_set;
+    isAllowedReference(reference) {
+        return !this.disallowed_values.has(reference);
     }
     /**
      * Collects type and value dependencies from a given TypeNode.
@@ -7727,6 +7710,7 @@ function svelte2tsx(svelte, options = { parse }) {
     const str = new MagicString(svelte);
     const basename = path__default.basename(options.filename || '');
     const svelte5Plus = Number(options.version[0]) > 4;
+    const isTsFile = options === null || options === void 0 ? void 0 : options.isTsFile;
     // process the htmlx as a svelte template
     let { htmlAst, moduleScriptTag, scriptTag, rootSnippets, slots, uses$$props, uses$$slots, uses$$restProps, events, componentDocumentation, resolvedStores, usesAccessors, isRunes } = processSvelteTemplate(str, options.parse || parse, {
         ...options,
@@ -7755,7 +7739,7 @@ function svelte2tsx(svelte, options = { parse }) {
         : instanceScriptTarget;
     const implicitStoreValues = new ImplicitStoreValues(resolvedStores, renderFunctionStart);
     //move the instance script and process the content
-    let exportedNames = new ExportedNames(str, 0, basename, options === null || options === void 0 ? void 0 : options.isTsFile, svelte5Plus, isRunes);
+    let exportedNames = new ExportedNames(str, 0, basename, isTsFile, svelte5Plus, isRunes);
     let generics = new Generics(str, 0, { attributes: [] });
     let uses$$SlotsInterface = false;
     if (scriptTag) {
@@ -7763,7 +7747,7 @@ function svelte2tsx(svelte, options = { parse }) {
         if (scriptTag.start != instanceScriptTarget) {
             str.move(scriptTag.start, scriptTag.end, instanceScriptTarget);
         }
-        const res = processInstanceScriptContent(str, scriptTag, events, implicitStoreValues, options.mode, moduleAst, options === null || options === void 0 ? void 0 : options.isTsFile, basename, svelte5Plus, isRunes);
+        const res = processInstanceScriptContent(str, scriptTag, events, implicitStoreValues, options.mode, moduleAst, isTsFile, basename, svelte5Plus, isRunes);
         uses$$props = uses$$props || res.uses$$props;
         uses$$restProps = uses$$restProps || res.uses$$restProps;
         uses$$slots = uses$$slots || res.uses$$slots;
@@ -7787,6 +7771,7 @@ function svelte2tsx(svelte, options = { parse }) {
         uses$$SlotsInterface,
         generics,
         svelte5Plus,
+        isTsFile,
         mode: options.mode
     });
     // we need to process the module script after the instance script has moved otherwise we get warnings about moving edited items
@@ -7797,14 +7782,14 @@ function svelte2tsx(svelte, options = { parse }) {
         }
     }
     if (moduleScriptTag || scriptTag) {
-        const allowed = exportedNames.hoistableInterfaces.getAllowedValues();
         for (const [start, end, globals] of rootSnippets) {
             const hoist_to_module = moduleScriptTag &&
-                (globals.size === 0 || [...globals.keys()].every((id) => allowed.has(id)));
+                (globals.size === 0 ||
+                    [...globals.keys()].every((id) => exportedNames.hoistableInterfaces.isAllowedReference(id)));
             if (hoist_to_module) {
                 str.move(start, end, scriptTag
                     ? scriptTag.start + 1 // +1 because imports are also moved at that position, and we want to move interfaces after imports
-                    : moduleScriptTag.end);
+                    : instanceScriptTarget);
             }
             else if (scriptTag) {
                 str.move(start, end, renderFunctionStart);
@@ -7815,7 +7800,7 @@ function svelte2tsx(svelte, options = { parse }) {
         str,
         canHaveAnyProp: !exportedNames.uses$$Props && (uses$$props || uses$$restProps),
         events,
-        isTsFile: options === null || options === void 0 ? void 0 : options.isTsFile,
+        isTsFile,
         exportedNames,
         usesAccessors,
         usesSlots: slots.size > 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte2tsx",
-  "version": "0.7.31",
+  "version": "0.7.33",
   "description": "Convert Svelte components to TSX for type checking",
   "author": "David Pershouse",
   "license": "MIT",
@@ -40,7 +40,7 @@
     "svelte": "~4.2.19",
     "tiny-glob": "^0.2.6",
     "tslib": "^2.4.0",
-    "typescript": "~5.6.3"
+    "typescript": "^5.7.2"
   },
   "peerDependencies": {
     "svelte": "^3.55 || ^4.0.0-next.0 || ^4.0 || ^5.0.0-next.0",