svelte2tsx 0.7.21 → 0.7.22

package/index.js

@@ -4549,12 +4549,13 @@ function is$$PropsDeclaration(node) {
     return isInterfaceOrTypeDeclaration(node) && node.name.text === '$$Props';
 }
 class ExportedNames {
-    constructor(str, astOffset, basename, isTsFile, isSvelte5Plus) {
+    constructor(str, astOffset, basename, isTsFile, isSvelte5Plus, isRunes) {
         this.str = str;
         this.astOffset = astOffset;
         this.basename = basename;
         this.isTsFile = isTsFile;
         this.isSvelte5Plus = isSvelte5Plus;
+        this.isRunes = isRunes;
         this.usesAccessors = false;
         /**
          * Uses the `$$Props` type
@@ -4636,10 +4637,10 @@ class ExportedNames {
         if (ts.isNamedExports(exportClause)) {
             for (const ne of exportClause.elements) {
                 if (ne.propertyName) {
-                    this.addExport(ne.propertyName, false, ne.name);
+                    this.addExport(ne.propertyName, false, ne.name, undefined, undefined, true);
                 }
                 else {
-                    this.addExport(ne.name, false);
+                    this.addExport(ne.name, false, undefined, undefined, undefined, true);
                 }
             }
             //we can remove entire statement
@@ -4976,7 +4977,7 @@ class ExportedNames {
     /**
      * Adds export to map
      */
-    addExport(name, isLet, target = null, type = null, required = false) {
+    addExport(name, isLet, target = null, type = null, required = false, isNamedExport = false) {
         const existingDeclaration = this.possibleExports.get(name.text);
         if (target) {
             this.exports.set(name.text, {
@@ -4984,7 +4985,8 @@ class ExportedNames {
                 type: (type === null || type === void 0 ? void 0 : type.getText()) || (existingDeclaration === null || existingDeclaration === void 0 ? void 0 : existingDeclaration.type),
                 identifierText: target.text,
                 required: required || (existingDeclaration === null || existingDeclaration === void 0 ? void 0 : existingDeclaration.required),
-                doc: this.getDoc(target) || (existingDeclaration === null || existingDeclaration === void 0 ? void 0 : existingDeclaration.doc)
+                doc: this.getDoc(target) || (existingDeclaration === null || existingDeclaration === void 0 ? void 0 : existingDeclaration.doc),
+                isNamedExport
             });
         }
         else {
@@ -4992,7 +4994,8 @@ class ExportedNames {
                 isLet: isLet || (existingDeclaration === null || existingDeclaration === void 0 ? void 0 : existingDeclaration.isLet),
                 type: existingDeclaration === null || existingDeclaration === void 0 ? void 0 : existingDeclaration.type,
                 required: existingDeclaration === null || existingDeclaration === void 0 ? void 0 : existingDeclaration.required,
-                doc: existingDeclaration === null || existingDeclaration === void 0 ? void 0 : existingDeclaration.doc
+                doc: existingDeclaration === null || existingDeclaration === void 0 ? void 0 : existingDeclaration.doc,
+                isNamedExport
             });
         }
         if (existingDeclaration === null || existingDeclaration === void 0 ? void 0 : existingDeclaration.isLet) {
@@ -5103,7 +5106,7 @@ class ExportedNames {
      */
     createExportsStr() {
         const names = Array.from(this.exports.entries());
-        const others = names.filter(([, { isLet }]) => !isLet);
+        const others = names.filter(([, { isLet, isNamedExport }]) => !isLet || (this.usesRunes() && isNamedExport));
         const needsAccessors = this.usesAccessors && names.length > 0 && !this.usesRunes(); // runes mode doesn't support accessors
         if (this.isSvelte5Plus) {
             let str = '';
@@ -5175,7 +5178,7 @@ class ExportedNames {
             this.isSvelte5Plus && globals.some((global) => runes.includes(global));
     }
     usesRunes() {
-        return this.hasRunesGlobals || this.hasPropsRune();
+        return this.hasRunesGlobals || this.hasPropsRune() || this.isRunes;
     }
 }
 
@@ -6135,12 +6138,12 @@ class InterfacesAndTypes {
     }
 }
 
-function processInstanceScriptContent(str, script, events, implicitStoreValues, mode, hasModuleScript, isTSFile, basename, isSvelte5Plus) {
+function processInstanceScriptContent(str, script, events, implicitStoreValues, mode, hasModuleScript, isTSFile, basename, isSvelte5Plus, isRunes) {
     const htmlx = str.original;
     const scriptContent = htmlx.substring(script.content.start, script.content.end);
     const tsAst = ts.createSourceFile('component.ts.svelte', scriptContent, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
     const astOffset = script.content.start;
-    const exportedNames = new ExportedNames(str, astOffset, basename, isTSFile, isSvelte5Plus);
+    const exportedNames = new ExportedNames(str, astOffset, basename, isTSFile, isSvelte5Plus, isRunes);
     const generics = new Generics(str, astOffset, script);
     const interfacesAndTypes = new InterfacesAndTypes();
     const implicitTopLevelNames = new ImplicitTopLevelNames(str, astOffset);
@@ -6781,6 +6784,7 @@ function processSvelteTemplate(str, parse, options) {
     let uses$$restProps = false;
     let uses$$slots = false;
     let usesAccessors = !!options.accessors;
+    let isRunes = false;
     const componentDocumentation = new ComponentDocumentation();
     //track if we are in a declaration scope
     const isDeclaration = { value: false };
@@ -6804,6 +6808,9 @@ function processSvelteTemplate(str, parse, options) {
                         usesAccessors = true;
                     }
                     break;
+                case 'runes':
+                    isRunes = true;
+                    break;
             }
         }
     };
@@ -6983,7 +6990,8 @@ function processSvelteTemplate(str, parse, options) {
         uses$$slots,
         componentDocumentation,
         resolvedStores,
-        usesAccessors
+        usesAccessors,
+        isRunes
     };
 }
 function svelte2tsx(svelte, options = { parse: compiler.parse }) {
@@ -6993,7 +7001,7 @@ function svelte2tsx(svelte, options = { parse: compiler.parse }) {
     const basename = path.basename(options.filename || '');
     const svelte5Plus = Number(options.version[0]) > 4;
     // process the htmlx as a svelte template
-    let { htmlAst, moduleScriptTag, scriptTag, rootSnippets, slots, uses$$props, uses$$slots, uses$$restProps, events, componentDocumentation, resolvedStores, usesAccessors } = processSvelteTemplate(str, options.parse || compiler.parse, {
+    let { htmlAst, moduleScriptTag, scriptTag, rootSnippets, slots, uses$$props, uses$$slots, uses$$restProps, events, componentDocumentation, resolvedStores, usesAccessors, isRunes } = processSvelteTemplate(str, options.parse || compiler.parse, {
         ...options,
         svelte5Plus
     });
@@ -7018,7 +7026,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);
+    let exportedNames = new ExportedNames(str, 0, basename, options === null || options === void 0 ? void 0 : options.isTsFile, svelte5Plus, isRunes);
     let generics = new Generics(str, 0, { attributes: [] });
     let uses$$SlotsInterface = false;
     if (scriptTag) {
@@ -7027,7 +7035,7 @@ function svelte2tsx(svelte, options = { parse: compiler.parse }) {
             str.move(scriptTag.start, scriptTag.end, instanceScriptTarget);
         }
         const res = processInstanceScriptContent(str, scriptTag, events, implicitStoreValues, options.mode, 
-        /**hasModuleScripts */ !!moduleScriptTag, options === null || options === void 0 ? void 0 : options.isTsFile, basename, svelte5Plus);
+        /**hasModuleScripts */ !!moduleScriptTag, options === null || options === void 0 ? void 0 : options.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;

package/index.mjs

@@ -4529,12 +4529,13 @@ function is$$PropsDeclaration(node) {
     return isInterfaceOrTypeDeclaration(node) && node.name.text === '$$Props';
 }
 class ExportedNames {
-    constructor(str, astOffset, basename, isTsFile, isSvelte5Plus) {
+    constructor(str, astOffset, basename, isTsFile, isSvelte5Plus, isRunes) {
         this.str = str;
         this.astOffset = astOffset;
         this.basename = basename;
         this.isTsFile = isTsFile;
         this.isSvelte5Plus = isSvelte5Plus;
+        this.isRunes = isRunes;
         this.usesAccessors = false;
         /**
          * Uses the `$$Props` type
@@ -4616,10 +4617,10 @@ class ExportedNames {
         if (ts.isNamedExports(exportClause)) {
             for (const ne of exportClause.elements) {
                 if (ne.propertyName) {
-                    this.addExport(ne.propertyName, false, ne.name);
+                    this.addExport(ne.propertyName, false, ne.name, undefined, undefined, true);
                 }
                 else {
-                    this.addExport(ne.name, false);
+                    this.addExport(ne.name, false, undefined, undefined, undefined, true);
                 }
             }
             //we can remove entire statement
@@ -4956,7 +4957,7 @@ class ExportedNames {
     /**
      * Adds export to map
      */
-    addExport(name, isLet, target = null, type = null, required = false) {
+    addExport(name, isLet, target = null, type = null, required = false, isNamedExport = false) {
         const existingDeclaration = this.possibleExports.get(name.text);
         if (target) {
             this.exports.set(name.text, {
@@ -4964,7 +4965,8 @@ class ExportedNames {
                 type: (type === null || type === void 0 ? void 0 : type.getText()) || (existingDeclaration === null || existingDeclaration === void 0 ? void 0 : existingDeclaration.type),
                 identifierText: target.text,
                 required: required || (existingDeclaration === null || existingDeclaration === void 0 ? void 0 : existingDeclaration.required),
-                doc: this.getDoc(target) || (existingDeclaration === null || existingDeclaration === void 0 ? void 0 : existingDeclaration.doc)
+                doc: this.getDoc(target) || (existingDeclaration === null || existingDeclaration === void 0 ? void 0 : existingDeclaration.doc),
+                isNamedExport
             });
         }
         else {
@@ -4972,7 +4974,8 @@ class ExportedNames {
                 isLet: isLet || (existingDeclaration === null || existingDeclaration === void 0 ? void 0 : existingDeclaration.isLet),
                 type: existingDeclaration === null || existingDeclaration === void 0 ? void 0 : existingDeclaration.type,
                 required: existingDeclaration === null || existingDeclaration === void 0 ? void 0 : existingDeclaration.required,
-                doc: existingDeclaration === null || existingDeclaration === void 0 ? void 0 : existingDeclaration.doc
+                doc: existingDeclaration === null || existingDeclaration === void 0 ? void 0 : existingDeclaration.doc,
+                isNamedExport
             });
         }
         if (existingDeclaration === null || existingDeclaration === void 0 ? void 0 : existingDeclaration.isLet) {
@@ -5083,7 +5086,7 @@ class ExportedNames {
      */
     createExportsStr() {
         const names = Array.from(this.exports.entries());
-        const others = names.filter(([, { isLet }]) => !isLet);
+        const others = names.filter(([, { isLet, isNamedExport }]) => !isLet || (this.usesRunes() && isNamedExport));
         const needsAccessors = this.usesAccessors && names.length > 0 && !this.usesRunes(); // runes mode doesn't support accessors
         if (this.isSvelte5Plus) {
             let str = '';
@@ -5155,7 +5158,7 @@ class ExportedNames {
             this.isSvelte5Plus && globals.some((global) => runes.includes(global));
     }
     usesRunes() {
-        return this.hasRunesGlobals || this.hasPropsRune();
+        return this.hasRunesGlobals || this.hasPropsRune() || this.isRunes;
     }
 }
 
@@ -6115,12 +6118,12 @@ class InterfacesAndTypes {
     }
 }
 
-function processInstanceScriptContent(str, script, events, implicitStoreValues, mode, hasModuleScript, isTSFile, basename, isSvelte5Plus) {
+function processInstanceScriptContent(str, script, events, implicitStoreValues, mode, hasModuleScript, isTSFile, basename, isSvelte5Plus, isRunes) {
     const htmlx = str.original;
     const scriptContent = htmlx.substring(script.content.start, script.content.end);
     const tsAst = ts.createSourceFile('component.ts.svelte', scriptContent, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
     const astOffset = script.content.start;
-    const exportedNames = new ExportedNames(str, astOffset, basename, isTSFile, isSvelte5Plus);
+    const exportedNames = new ExportedNames(str, astOffset, basename, isTSFile, isSvelte5Plus, isRunes);
     const generics = new Generics(str, astOffset, script);
     const interfacesAndTypes = new InterfacesAndTypes();
     const implicitTopLevelNames = new ImplicitTopLevelNames(str, astOffset);
@@ -6761,6 +6764,7 @@ function processSvelteTemplate(str, parse, options) {
     let uses$$restProps = false;
     let uses$$slots = false;
     let usesAccessors = !!options.accessors;
+    let isRunes = false;
     const componentDocumentation = new ComponentDocumentation();
     //track if we are in a declaration scope
     const isDeclaration = { value: false };
@@ -6784,6 +6788,9 @@ function processSvelteTemplate(str, parse, options) {
                         usesAccessors = true;
                     }
                     break;
+                case 'runes':
+                    isRunes = true;
+                    break;
             }
         }
     };
@@ -6963,7 +6970,8 @@ function processSvelteTemplate(str, parse, options) {
         uses$$slots,
         componentDocumentation,
         resolvedStores,
-        usesAccessors
+        usesAccessors,
+        isRunes
     };
 }
 function svelte2tsx(svelte, options = { parse }) {
@@ -6973,7 +6981,7 @@ function svelte2tsx(svelte, options = { parse }) {
     const basename = path__default.basename(options.filename || '');
     const svelte5Plus = Number(options.version[0]) > 4;
     // process the htmlx as a svelte template
-    let { htmlAst, moduleScriptTag, scriptTag, rootSnippets, slots, uses$$props, uses$$slots, uses$$restProps, events, componentDocumentation, resolvedStores, usesAccessors } = processSvelteTemplate(str, options.parse || parse, {
+    let { htmlAst, moduleScriptTag, scriptTag, rootSnippets, slots, uses$$props, uses$$slots, uses$$restProps, events, componentDocumentation, resolvedStores, usesAccessors, isRunes } = processSvelteTemplate(str, options.parse || parse, {
         ...options,
         svelte5Plus
     });
@@ -6998,7 +7006,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);
+    let exportedNames = new ExportedNames(str, 0, basename, options === null || options === void 0 ? void 0 : options.isTsFile, svelte5Plus, isRunes);
     let generics = new Generics(str, 0, { attributes: [] });
     let uses$$SlotsInterface = false;
     if (scriptTag) {
@@ -7007,7 +7015,7 @@ function svelte2tsx(svelte, options = { parse }) {
             str.move(scriptTag.start, scriptTag.end, instanceScriptTarget);
         }
         const res = processInstanceScriptContent(str, scriptTag, events, implicitStoreValues, options.mode, 
-        /**hasModuleScripts */ !!moduleScriptTag, options === null || options === void 0 ? void 0 : options.isTsFile, basename, svelte5Plus);
+        /**hasModuleScripts */ !!moduleScriptTag, options === null || options === void 0 ? void 0 : options.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;

package/package.json

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