svelte2tsx 0.7.48 → 0.7.50

package/index.d.ts

@@ -90,6 +90,11 @@ export function svelte2tsx(
          * valid JS that tsc can process without errors.
          */
         emitJsDoc?: boolean;
+        /**
+         * Rewrites relative imports that resolve outside the workspace so they stay valid
+         * from the generated file location.
+         */
+        rewriteExternalImports?: InternalHelpers.RewriteExternalImportsConfig;
     }
 ): SvelteCompiledToTsx
 
@@ -163,7 +168,8 @@ export const internalHelpers: {
         fileName: string,
         kitFilesSettings: InternalHelpers.KitFilesSettings,
         getSource: () => ts.SourceFile | undefined,
-        surround?: (code: string) => string
+        surround?: (code: string) => string,
+        rewriteExternalImports?: InternalHelpers.RewriteExternalImportsConfig
     ) => { text: string; addedCode: InternalHelpers.AddedCode[] } | undefined,
     toVirtualPos: (pos: number, addedCode: InternalHelpers.AddedCode[]) => number,
     toOriginalPos: (pos: number, addedCode: InternalHelpers.AddedCode[]) => {pos: number; inGenerated: boolean},
@@ -201,4 +207,9 @@ export namespace InternalHelpers {
         universalHooksPath: string;
         paramsPath: string;
     }
+
+    export interface RewriteExternalImportsConfig {
+        workspacePath: string;
+        generatedPath: string;
+    }
 }

package/index.js

@@ -2,8 +2,8 @@
 
 var dedent = require('dedent-js');
 var ts = require('typescript');
-var scule = require('scule');
 var path = require('path');
+var scule = require('scule');
 var compiler = require('svelte/compiler');
 
 function _interopNamespaceDefault(e) {
@@ -4897,6 +4897,109 @@ function handleAttachTag(tag, element) {
     }
 }
 
+function toPosixPath(value) {
+    return value.replace(/\\/g, '/');
+}
+function isWithinDirectory(filePath, directoryPath) {
+    const relative = path.relative(path.resolve(directoryPath), path.resolve(filePath));
+    return relative === '' || (!relative.startsWith('..') && !path.isAbsolute(relative));
+}
+function splitImportSpecifier(specifier) {
+    const queryIndex = specifier.indexOf('?');
+    const hashIndex = specifier.indexOf('#');
+    const cutIndex = queryIndex === -1
+        ? hashIndex
+        : hashIndex === -1
+            ? queryIndex
+            : Math.min(queryIndex, hashIndex);
+    if (cutIndex === -1) {
+        return { pathPart: specifier, suffix: '' };
+    }
+    return {
+        pathPart: specifier.slice(0, cutIndex),
+        suffix: specifier.slice(cutIndex)
+    };
+}
+function getExternalImportRewrite(specifier, options) {
+    const sourceDir = path.dirname(options.sourcePath);
+    const generatedDir = path.dirname(options.generatedPath);
+    const { pathPart, suffix } = splitImportSpecifier(specifier);
+    if (!pathPart.startsWith('../')) {
+        return null;
+    }
+    const targetPath = path.resolve(sourceDir, pathPart);
+    if (isWithinDirectory(targetPath, options.workspacePath)) {
+        return null;
+    }
+    const rewrittenRelative = toPosixPath(path.relative(generatedDir, targetPath));
+    const rewritten = `${rewrittenRelative}${suffix}`;
+    if (rewritten === specifier) {
+        return null;
+    }
+    return {
+        rewritten,
+        insertedPrefix: rewrittenRelative.slice(0, rewrittenRelative.length - pathPart.length)
+    };
+}
+function getImportTypeSpecifierLiteral(ts_impl, node) {
+    const argument = node.argument;
+    if (ts_impl.isLiteralTypeNode(argument) && ts_impl.isStringLiteralLike(argument.literal)) {
+        return argument.literal;
+    }
+    return undefined;
+}
+function rewriteImportTypesInNode(ts_impl, node, applyImportRewrite) {
+    if (ts_impl.isImportTypeNode(node)) {
+        const specifier = getImportTypeSpecifierLiteral(ts_impl, node);
+        if (specifier) {
+            applyImportRewrite(specifier);
+        }
+    }
+    ts_impl.forEachChild(node, (child) => rewriteImportTypesInNode(ts_impl, child, applyImportRewrite));
+}
+function rewriteExternalImportsInNode(ts_impl, node, options, on_rewrite) {
+    const applyImportRewrite = (module_specifier) => {
+        const rewrite = getExternalImportRewrite(module_specifier.text, options);
+        if (rewrite) {
+            on_rewrite(module_specifier, rewrite);
+        }
+    };
+    if (ts_impl.isImportDeclaration(node) || ts_impl.isExportDeclaration(node)) {
+        if (node.moduleSpecifier && ts_impl.isStringLiteralLike(node.moduleSpecifier)) {
+            applyImportRewrite(node.moduleSpecifier);
+        }
+    }
+    else if (ts_impl.isCallExpression(node)) {
+        const firstArg = node.arguments[0];
+        if (firstArg && ts_impl.isStringLiteralLike(firstArg)) {
+            const isDynamicImport = node.expression.kind === ts_impl.SyntaxKind.ImportKeyword;
+            const isRequireCall = ts_impl.isIdentifier(node.expression) && node.expression.text === 'require';
+            if (isDynamicImport || isRequireCall) {
+                applyImportRewrite(firstArg);
+            }
+        }
+    }
+    else if (ts_impl.isImportTypeNode(node)) {
+        const specifier = getImportTypeSpecifierLiteral(ts_impl, node);
+        if (specifier) {
+            applyImportRewrite(specifier);
+        }
+    }
+    const jsDoc = node.jsDoc;
+    if (jsDoc) {
+        for (const doc of jsDoc) {
+            rewriteImportTypesInNode(ts_impl, doc, applyImportRewrite);
+        }
+    }
+}
+function forEachExternalImportRewrite(ts_impl, source, options, on_rewrite) {
+    const visit = (node) => {
+        rewriteExternalImportsInNode(ts_impl, node, options, on_rewrite);
+        ts_impl.forEachChild(node, visit);
+    };
+    ts_impl.forEachChild(source, visit);
+}
+
 /**
  * Walks the HTMLx part of the Svelte component
  * and converts it to JSX
@@ -4968,6 +5071,45 @@ function convertHtmlxToJsx(str, ast, tags, options = { svelte5Plus: false }) {
     const handleStyleTag = (node) => {
         str.remove(node.start, node.end);
     };
+    const rewriteImportSpecifier = (importSpecifier) => {
+        var _a;
+        if (!options.rewriteExternalImports) {
+            return importSpecifier;
+        }
+        const rewrite = getExternalImportRewrite(importSpecifier, options.rewriteExternalImports);
+        return (_a = rewrite === null || rewrite === void 0 ? void 0 : rewrite.rewritten) !== null && _a !== void 0 ? _a : importSpecifier;
+    };
+    const rewriteImportsInComment = (comment) => {
+        if (!options.rewriteExternalImports) {
+            return;
+        }
+        const original = str.original.slice(comment.start, comment.end);
+        const rewritten = original.replace(/import\(\s*(['"])([^'"]+)\1\s*\)/g, (fullMatch, quote, importSpecifier) => {
+            const specifier = rewriteImportSpecifier(importSpecifier);
+            return specifier === importSpecifier
+                ? fullMatch
+                : `import(${quote}${specifier}${quote})`;
+        });
+        if (rewritten !== original) {
+            str.overwrite(comment.start, comment.end, rewritten);
+        }
+    };
+    const rewriteNodeCommentImports = (node) => {
+        var _a, _b, _c;
+        if (!options.rewriteExternalImports) {
+            return;
+        }
+        const nodeWithcomments = node;
+        for (const comment of (_a = nodeWithcomments.leadingComments) !== null && _a !== void 0 ? _a : []) {
+            rewriteImportsInComment(comment);
+        }
+        for (const comment of (_b = nodeWithcomments.trailingComments) !== null && _b !== void 0 ? _b : []) {
+            rewriteImportsInComment(comment);
+        }
+        for (const comment of (_c = nodeWithcomments.innerComments) !== null && _c !== void 0 ? _c : []) {
+            rewriteImportsInComment(comment);
+        }
+    };
     const slotHandler = new SlotHandler(str.original);
     let templateScope = new TemplateScope();
     const handleComponentLet = (component) => {
@@ -5008,12 +5150,25 @@ function convertHtmlxToJsx(str, ast, tags, options = { svelte5Plus: false }) {
                 isDeclaration.value = true;
             }
             try {
+                rewriteNodeCommentImports(node);
                 switch (node.type) {
                     case 'Identifier':
                         handleIdentifier(node);
                         stores.handleIdentifier(node, parent, prop);
                         eventHandler.handleIdentifier(node, parent, prop);
                         break;
+                    case 'ImportExpression': {
+                        const source = node.source;
+                        if (options.rewriteExternalImports &&
+                            (source === null || source === void 0 ? void 0 : source.type) === 'Literal' &&
+                            typeof source.value === 'string') {
+                            const rewrite = getExternalImportRewrite(source.value, options.rewriteExternalImports);
+                            if (rewrite) {
+                                str.overwrite(source.start + 1, source.end - 1, rewrite.rewritten);
+                            }
+                        }
+                        break;
+                    }
                     case 'IfBlock':
                         handleIf(str, node);
                         break;
@@ -5375,6 +5530,8 @@ function findExports(ts, source, isTsFile) {
             const declaration = statement.declarationList.declarations[0];
             const hasTypeDefinition = !!declaration.type ||
                 (!isTsFile && !!ts.getJSDocType(declaration)) ||
+                (!isTsFile &&
+                    ts.getJSDocTags(declaration).some((t) => t.tagName.text === 'satisfies')) ||
                 (!!declaration.initializer && ts.isSatisfiesExpression(declaration.initializer));
             if (declaration.initializer &&
                 (ts.isFunctionExpression(declaration.initializer) ||
@@ -5459,7 +5616,7 @@ function isParamsFile(fileName, basename, paramsPath) {
         !basename.includes('.test') &&
         !basename.includes('.spec'));
 }
-function upsertKitFile(ts, fileName, kitFilesSettings, getSource, surround = (text) => text) {
+function upsertKitFile(ts, fileName, kitFilesSettings, getSource, surround = (text) => text, rewriteExternalImports) {
     var _a, _b, _c, _d;
     let basename = path.basename(fileName);
     const result = (_d = (_c = (_b = (_a = upsertKitRouteFile(ts, basename, getSource, surround)) !== null && _a !== void 0 ? _a : upsertKitServerHooksFile(ts, fileName, basename, kitFilesSettings.serverHooksPath, getSource, surround)) !== null && _b !== void 0 ? _b : upsertKitClientHooksFile(ts, fileName, basename, kitFilesSettings.clientHooksPath, getSource, surround)) !== null && _c !== void 0 ? _c : upsertKitUniversalHooksFile(ts, fileName, basename, kitFilesSettings.universalHooksPath, getSource, surround)) !== null && _d !== void 0 ? _d : upsertKitParamsFile(ts, fileName, basename, kitFilesSettings.paramsPath, getSource, surround);
@@ -5475,8 +5632,34 @@ function upsertKitFile(ts, fileName, kitFilesSettings, getSource, surround = (te
         pos = added.originalPos;
     }
     text += originalText.slice(pos);
+    if (rewriteExternalImports) {
+        const source = getSource();
+        if (source) {
+            const rewriteOptions = {
+                sourcePath: fileName,
+                generatedPath: rewriteExternalImports.generatedPath,
+                workspacePath: rewriteExternalImports.workspacePath
+            };
+            applyExternalImportRewritesToAddedCode(ts, source, addedCode, rewriteOptions);
+            let rewritePos = 0;
+            text = '';
+            for (const added of addedCode) {
+                text += originalText.slice(rewritePos, added.originalPos) + added.inserted;
+                rewritePos = added.originalPos;
+            }
+            text += originalText.slice(rewritePos);
+        }
+    }
     return { text, addedCode };
 }
+function applyExternalImportRewritesToAddedCode(ts_impl, source, addedCode, rewriteOptions) {
+    forEachExternalImportRewrite(ts_impl, source, rewriteOptions, (module_specifier, rewrite) => {
+        if (!rewrite.insertedPrefix) {
+            return;
+        }
+        insertCode(addedCode, module_specifier.getStart(source) + 1, rewrite.insertedPrefix);
+    });
+}
 function upsertKitRouteFile(ts, basename, getSource, surround) {
     if (!isKitRouteFile(basename))
         return;
@@ -5492,15 +5675,27 @@ function upsertKitRouteFile(ts, basename, getSource, surround) {
     // add type to load function if not explicitly typed
     const load = exports.get('load');
     if ((load === null || load === void 0 ? void 0 : load.type) === 'function' && load.node.parameters.length === 1 && !load.hasTypeDefinition) {
-        const pos = load.node.parameters[0].getEnd();
-        const inserted = surround(`: import('./$types.js').${basename.includes('layout') ? 'Layout' : 'Page'}${basename.includes('server') ? 'Server' : ''}LoadEvent`);
-        insert(pos, inserted);
+        const load_type = `import('./$types.js').${basename.includes('layout') ? 'Layout' : 'Page'}${basename.includes('server') ? 'Server' : ''}Load`;
+        if (isTsFile) {
+            const pos = load.node.parameters[0].getEnd();
+            const inserted = surround(`: ${load_type}Event`);
+            insert(pos, inserted);
+        }
+        else {
+            addJsDocParamToFunction(surround, insert, ts, load.node, `${load_type}Event`);
+        }
     }
     else if ((load === null || load === void 0 ? void 0 : load.type) === 'var' && !load.hasTypeDefinition) {
-        // "const load = ..." will be transformed into
-        // "const load = (...) satisfies PageLoad"
-        insert(load.node.initializer.getStart(), surround('('));
-        insert(load.node.initializer.getEnd(), surround(`) satisfies import('./$types.js').${basename.includes('layout') ? 'Layout' : 'Page'}${basename.includes('server') ? 'Server' : ''}Load`));
+        const load_type = `import('./$types.js').${basename.includes('layout') ? 'Layout' : 'Page'}${basename.includes('server') ? 'Server' : ''}Load`;
+        if (isTsFile) {
+            // "const load = ..." will be transformed into
+            // "const load = (...) satisfies PageLoad"
+            insert(load.node.initializer.getStart(), surround('('));
+            insert(load.node.initializer.getEnd(), surround(`) satisfies ${load_type}`));
+        }
+        else {
+            addJsDocSatisfiesToVariable(surround, insert, load.node, load_type);
+        }
     }
     // add type to entries function if not explicitly typed
     const entries = exports.get('entries');
@@ -5508,28 +5703,36 @@ function upsertKitRouteFile(ts, basename, getSource, surround) {
         entries.node.parameters.length === 0 &&
         !entries.hasTypeDefinition &&
         !basename.includes('layout')) {
-        if (!entries.node.type && entries.node.body) {
+        if (isTsFile && !entries.node.type && entries.node.body) {
             const returnPos = ts.isArrowFunction(entries.node)
                 ? entries.node.equalsGreaterThanToken.getStart()
                 : entries.node.body.getStart();
             const returnInsertion = surround(`: ReturnType<import('./$types.js').EntryGenerator> `);
             insert(returnPos, returnInsertion);
         }
+        else if (!isTsFile) {
+            addJsDocTypeToFunction(surround, insert, entries.node, `import('./$types.js').EntryGenerator`);
+        }
     }
     // add type to actions variable if not explicitly typed
     const actions = exports.get('actions');
     if ((actions === null || actions === void 0 ? void 0 : actions.type) === 'var' && !actions.hasTypeDefinition && actions.node.initializer) {
-        const pos = actions.node.initializer.getEnd();
-        const inserted = surround(` satisfies import('./$types.js').Actions`);
-        insert(pos, inserted);
-    }
-    addTypeToVariable(exports, surround, insert, 'prerender', `boolean | 'auto'`);
-    addTypeToVariable(exports, surround, insert, 'trailingSlash', `'never' | 'always' | 'ignore'`);
-    addTypeToVariable(exports, surround, insert, 'ssr', `boolean`);
-    addTypeToVariable(exports, surround, insert, 'csr', `boolean`);
+        if (isTsFile) {
+            const pos = actions.node.initializer.getEnd();
+            const inserted = surround(` satisfies import('./$types.js').Actions`);
+            insert(pos, inserted);
+        }
+        else {
+            addJsDocSatisfiesToVariable(surround, insert, actions.node, `import('./$types.js').Actions`);
+        }
+    }
+    addTypeToVariable(exports, surround, insert, isTsFile, 'prerender', `boolean | 'auto'`);
+    addTypeToVariable(exports, surround, insert, isTsFile, 'trailingSlash', `'never' | 'always' | 'ignore'`);
+    addTypeToVariable(exports, surround, insert, isTsFile, 'ssr', `boolean`);
+    addTypeToVariable(exports, surround, insert, isTsFile, 'csr', `boolean`);
     // add types to GET/PUT/POST/PATCH/DELETE/OPTIONS/HEAD if not explicitly typed
     const insertApiMethod = (name) => {
-        addTypeToFunction(ts, exports, surround, insert, name, `import('./$types.js').RequestEvent`, `Response | Promise<Response>`);
+        addTypeToFunction(ts, exports, surround, insert, isTsFile, name, `import('./$types.js').RequestEvent`, `Response | Promise<Response>`);
     };
     insertApiMethod('GET');
     insertApiMethod('PUT');
@@ -5554,7 +5757,7 @@ function upsertKitParamsFile(ts, fileName, basename, paramsPath, getSource, surr
     };
     const isTsFile = basename.endsWith('.ts');
     const exports = findExports(ts, source, isTsFile);
-    addTypeToFunction(ts, exports, surround, insert, 'match', 'string', 'boolean');
+    addTypeToFunction(ts, exports, surround, insert, isTsFile, 'match', 'string', 'boolean');
     return { addedCode, originalText: source.getFullText() };
 }
 function upsertKitClientHooksFile(ts, fileName, basename, clientHooksPath, getSource, surround) {
@@ -5570,7 +5773,7 @@ function upsertKitClientHooksFile(ts, fileName, basename, clientHooksPath, getSo
     };
     const isTsFile = basename.endsWith('.ts');
     const exports = findExports(ts, source, isTsFile);
-    addTypeToFunction(ts, exports, surround, insert, 'handleError', `import('@sveltejs/kit').HandleClientError`);
+    addTypeToFunction(ts, exports, surround, insert, isTsFile, 'handleError', `import('@sveltejs/kit').HandleClientError`);
     return { addedCode, originalText: source.getFullText() };
 }
 function upsertKitServerHooksFile(ts, fileName, basename, serverHooksPath, getSource, surround) {
@@ -5587,7 +5790,7 @@ function upsertKitServerHooksFile(ts, fileName, basename, serverHooksPath, getSo
     const isTsFile = basename.endsWith('.ts');
     const exports = findExports(ts, source, isTsFile);
     const addType = (name, type) => {
-        addTypeToFunction(ts, exports, surround, insert, name, type);
+        addTypeToFunction(ts, exports, surround, insert, isTsFile, name, type);
     };
     addType('handleError', `import('@sveltejs/kit').HandleServerError`);
     addType('handle', `import('@sveltejs/kit').Handle`);
@@ -5607,32 +5810,68 @@ function upsertKitUniversalHooksFile(ts, fileName, basename, universalHooksPath,
     };
     const isTsFile = basename.endsWith('.ts');
     const exports = findExports(ts, source, isTsFile);
-    addTypeToFunction(ts, exports, surround, insert, 'reroute', `import('@sveltejs/kit').Reroute`);
+    addTypeToFunction(ts, exports, surround, insert, isTsFile, 'reroute', `import('@sveltejs/kit').Reroute`);
     return { addedCode, originalText: source.getFullText() };
 }
-function addTypeToVariable(exports, surround, insert, name, type) {
+function addTypeToVariable(exports, surround, insert, isTsFile, name, type) {
     const variable = exports.get(name);
     if ((variable === null || variable === void 0 ? void 0 : variable.type) === 'var' && !variable.hasTypeDefinition && variable.node.initializer) {
-        const pos = variable.node.name.getEnd();
-        const inserted = surround(` : ${type}`);
-        insert(pos, inserted);
+        if (isTsFile) {
+            const pos = variable.node.name.getEnd();
+            const inserted = surround(` : ${type}`);
+            insert(pos, inserted);
+        }
+        else {
+            addJsDocTypeToVariable(surround, insert, variable.node, type);
+        }
     }
 }
-function addTypeToFunction(ts, exports, surround, insert, name, type, returnType) {
+function addTypeToFunction(ts, exports, surround, insert, isTsFile, name, type, returnType) {
     const fn = exports.get(name);
     if ((fn === null || fn === void 0 ? void 0 : fn.type) === 'function' && fn.node.parameters.length === 1 && !fn.hasTypeDefinition) {
-        const paramPos = fn.node.parameters[0].getEnd();
-        const paramInsertion = surround(!returnType ? `: Parameters<${type}>[0]` : `: ${type}`);
-        insert(paramPos, paramInsertion);
-        if (!fn.node.type && fn.node.body) {
-            const returnPos = ts.isArrowFunction(fn.node)
-                ? fn.node.equalsGreaterThanToken.getStart()
-                : fn.node.body.getStart();
-            const returnInsertion = surround(!returnType ? `: ReturnType<${type}> ` : `: ${returnType} `);
-            insert(returnPos, returnInsertion);
+        if (isTsFile) {
+            const paramPos = fn.node.parameters[0].getEnd();
+            const paramInsertion = surround(!returnType ? `: Parameters<${type}>[0]` : `: ${type}`);
+            insert(paramPos, paramInsertion);
+            if (!fn.node.type && fn.node.body) {
+                const returnPos = ts.isArrowFunction(fn.node)
+                    ? fn.node.equalsGreaterThanToken.getStart()
+                    : fn.node.body.getStart();
+                const returnInsertion = surround(!returnType ? `: ReturnType<${type}> ` : `: ${returnType} `);
+                insert(returnPos, returnInsertion);
+            }
+        }
+        else {
+            const jsdoc_type = returnType === undefined ? type : `(arg0: ${type}) => ${returnType}`;
+            addJsDocTypeToFunction(surround, insert, fn.node, jsdoc_type);
         }
     }
 }
+function addJsDocTypeToVariable(surround, insert, node, type) {
+    if (!node.initializer) {
+        return;
+    }
+    insert(node.initializer.getStart(), surround(`/** @type {${type}} */ (`));
+    insert(node.initializer.getEnd(), surround(`)`));
+}
+function addJsDocSatisfiesToVariable(surround, insert, node, type) {
+    if (!node.initializer) {
+        return;
+    }
+    insert(node.initializer.getStart(), surround(`/** @satisfies {${type}} */ (`));
+    insert(node.initializer.getEnd(), surround(`)`));
+}
+function addJsDocTypeToFunction(surround, insert, node, type) {
+    insert(node.getStart(), surround(`/** @type {${type}} */ `));
+}
+function addJsDocParamToFunction(surround, insert, ts, node, type) {
+    const parameter = node.parameters[0];
+    if (!parameter) {
+        return;
+    }
+    const parameter_name = ts.isIdentifier(parameter.name) ? parameter.name.text : 'arg0';
+    insert(node.getStart(), surround(`/** @param {${type}} ${parameter_name} */ `));
+}
 function insertCode(addedCode, pos, inserted) {
     var _a, _b, _c, _d;
     const insertionIdx = addedCode.findIndex((c) => c.originalPos > pos);
@@ -7686,7 +7925,7 @@ class InterfacesAndTypes {
     }
 }
 
-function processInstanceScriptContent(str, script, events, implicitStoreValues, mode, moduleAst, isTSFile, basename, isSvelte5Plus, isRunes, emitJsDoc) {
+function processInstanceScriptContent(str, script, events, implicitStoreValues, mode, moduleAst, isTSFile, basename, isSvelte5Plus, isRunes, emitJsDoc, rewriteExternalImports) {
     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);
@@ -7798,6 +8037,11 @@ function processInstanceScriptContent(str, script, events, implicitStoreValues,
     const walk = (node, parent) => {
         var _a, _b, _c;
         const onLeaveCallbacks = [];
+        if (rewriteExternalImports) {
+            rewriteExternalImportsInNode(ts, node, rewriteExternalImports, (specifier, rewrite) => {
+                str.overwrite(specifier.getStart(tsAst) + astOffset + 1, specifier.getEnd() + astOffset - 1, rewrite.rewritten);
+            });
+        }
         if (parent === tsAst) {
             exportedNames.hoistableInterfaces.analyzeInstanceScriptNode(node);
         }
@@ -7981,7 +8225,7 @@ function createModuleAst(str, script) {
     const astOffset = script.content.start;
     return { htmlx, tsAst, astOffset };
 }
-function processModuleScriptTag(str, script, implicitStoreValues, moduleAst) {
+function processModuleScriptTag(str, script, implicitStoreValues, moduleAst, rewriteExternalImports) {
     const { htmlx, tsAst, astOffset } = moduleAst;
     const generics = new Generics(str, astOffset, script);
     if (generics.genericsAttr) {
@@ -7989,6 +8233,11 @@ function processModuleScriptTag(str, script, implicitStoreValues, moduleAst) {
         throwError(start, start + 8, 'The generics attribute is only allowed on the instance script', str.original);
     }
     const walk = (node) => {
+        if (rewriteExternalImports) {
+            rewriteExternalImportsInNode(ts, node, rewriteExternalImports, (specifier, rewrite) => {
+                str.overwrite(specifier.getStart(tsAst) + astOffset + 1, specifier.getEnd() + astOffset - 1, rewrite.rewritten);
+            });
+        }
         resolveImplicitStoreValue(node, implicitStoreValues, str, astOffset);
         generics.throwIfIsGeneric(node);
         throwIfIs$$EventsDeclaration(node, str, astOffset);
@@ -8052,6 +8301,13 @@ function svelte2tsx(svelte, options = { parse: compiler.parse }) {
     options.mode = options.mode || 'ts';
     options.version = options.version || compiler.VERSION;
     const str = new MagicString(svelte);
+    const rewriteExternalImportsOptions = options.rewriteExternalImports && options.filename
+        ? {
+            sourcePath: options.filename,
+            generatedPath: options.rewriteExternalImports.generatedPath,
+            workspacePath: options.rewriteExternalImports.workspacePath
+        }
+        : undefined;
     const basename = path.basename(options.filename || '');
     const svelte5Plus = Number(options.version[0]) > 4;
     const isTsFile = options === null || options === void 0 ? void 0 : options.isTsFile;
@@ -8059,7 +8315,8 @@ function svelte2tsx(svelte, options = { parse: compiler.parse }) {
     // 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,
-        svelte5Plus
+        svelte5Plus,
+        rewriteExternalImports: rewriteExternalImportsOptions
     });
     /* Rearrange the script tags so that module is first, and instance second followed finally by the template
      * This is a bit convoluted due to some trouble I had with magic string. A simple str.move(start,end,0) for each script wasn't enough
@@ -8093,7 +8350,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, isTsFile, basename, svelte5Plus, isRunes, emitJsDoc);
+        const res = processInstanceScriptContent(str, scriptTag, events, implicitStoreValues, options.mode, moduleAst, isTsFile, basename, svelte5Plus, isRunes, emitJsDoc, rewriteExternalImportsOptions);
         uses$$props = uses$$props || res.uses$$props;
         uses$$restProps = uses$$restProps || res.uses$$restProps;
         uses$$slots = uses$$slots || res.uses$$slots;
@@ -8127,7 +8384,7 @@ function svelte2tsx(svelte, options = { parse: compiler.parse }) {
     });
     // we need to process the module script after the instance script has moved otherwise we get warnings about moving edited items
     if (moduleScriptTag) {
-        processModuleScriptTag(str, moduleScriptTag, new ImplicitStoreValues(implicitStoreValues.getAccessedStores(), renderFunctionStart, svelte5Plus, scriptTag || options.mode === 'ts' ? undefined : (input) => `</>;${input}<>`), moduleAst);
+        processModuleScriptTag(str, moduleScriptTag, new ImplicitStoreValues(implicitStoreValues.getAccessedStores(), renderFunctionStart, svelte5Plus, scriptTag || options.mode === 'ts' ? undefined : (input) => `</>;${input}<>`), moduleAst, rewriteExternalImportsOptions);
         if (!scriptTag) {
             moduleAst.tsAst.forEachChild((node) => exportedNames.hoistableInterfaces.analyzeModuleScriptNode(node));
         }

package/index.mjs

@@ -1,8 +1,8 @@
 import dedent from 'dedent-js';
 import ts from 'typescript';
-import { pascalCase } from 'scule';
 import * as path from 'path';
 import path__default, { join, resolve, dirname, basename } from 'path';
+import { pascalCase } from 'scule';
 import { VERSION, parse } from 'svelte/compiler';
 
 const comma = ','.charCodeAt(0);
@@ -4877,6 +4877,109 @@ function handleAttachTag(tag, element) {
     }
 }
 
+function toPosixPath(value) {
+    return value.replace(/\\/g, '/');
+}
+function isWithinDirectory(filePath, directoryPath) {
+    const relative = path__default.relative(path__default.resolve(directoryPath), path__default.resolve(filePath));
+    return relative === '' || (!relative.startsWith('..') && !path__default.isAbsolute(relative));
+}
+function splitImportSpecifier(specifier) {
+    const queryIndex = specifier.indexOf('?');
+    const hashIndex = specifier.indexOf('#');
+    const cutIndex = queryIndex === -1
+        ? hashIndex
+        : hashIndex === -1
+            ? queryIndex
+            : Math.min(queryIndex, hashIndex);
+    if (cutIndex === -1) {
+        return { pathPart: specifier, suffix: '' };
+    }
+    return {
+        pathPart: specifier.slice(0, cutIndex),
+        suffix: specifier.slice(cutIndex)
+    };
+}
+function getExternalImportRewrite(specifier, options) {
+    const sourceDir = path__default.dirname(options.sourcePath);
+    const generatedDir = path__default.dirname(options.generatedPath);
+    const { pathPart, suffix } = splitImportSpecifier(specifier);
+    if (!pathPart.startsWith('../')) {
+        return null;
+    }
+    const targetPath = path__default.resolve(sourceDir, pathPart);
+    if (isWithinDirectory(targetPath, options.workspacePath)) {
+        return null;
+    }
+    const rewrittenRelative = toPosixPath(path__default.relative(generatedDir, targetPath));
+    const rewritten = `${rewrittenRelative}${suffix}`;
+    if (rewritten === specifier) {
+        return null;
+    }
+    return {
+        rewritten,
+        insertedPrefix: rewrittenRelative.slice(0, rewrittenRelative.length - pathPart.length)
+    };
+}
+function getImportTypeSpecifierLiteral(ts_impl, node) {
+    const argument = node.argument;
+    if (ts_impl.isLiteralTypeNode(argument) && ts_impl.isStringLiteralLike(argument.literal)) {
+        return argument.literal;
+    }
+    return undefined;
+}
+function rewriteImportTypesInNode(ts_impl, node, applyImportRewrite) {
+    if (ts_impl.isImportTypeNode(node)) {
+        const specifier = getImportTypeSpecifierLiteral(ts_impl, node);
+        if (specifier) {
+            applyImportRewrite(specifier);
+        }
+    }
+    ts_impl.forEachChild(node, (child) => rewriteImportTypesInNode(ts_impl, child, applyImportRewrite));
+}
+function rewriteExternalImportsInNode(ts_impl, node, options, on_rewrite) {
+    const applyImportRewrite = (module_specifier) => {
+        const rewrite = getExternalImportRewrite(module_specifier.text, options);
+        if (rewrite) {
+            on_rewrite(module_specifier, rewrite);
+        }
+    };
+    if (ts_impl.isImportDeclaration(node) || ts_impl.isExportDeclaration(node)) {
+        if (node.moduleSpecifier && ts_impl.isStringLiteralLike(node.moduleSpecifier)) {
+            applyImportRewrite(node.moduleSpecifier);
+        }
+    }
+    else if (ts_impl.isCallExpression(node)) {
+        const firstArg = node.arguments[0];
+        if (firstArg && ts_impl.isStringLiteralLike(firstArg)) {
+            const isDynamicImport = node.expression.kind === ts_impl.SyntaxKind.ImportKeyword;
+            const isRequireCall = ts_impl.isIdentifier(node.expression) && node.expression.text === 'require';
+            if (isDynamicImport || isRequireCall) {
+                applyImportRewrite(firstArg);
+            }
+        }
+    }
+    else if (ts_impl.isImportTypeNode(node)) {
+        const specifier = getImportTypeSpecifierLiteral(ts_impl, node);
+        if (specifier) {
+            applyImportRewrite(specifier);
+        }
+    }
+    const jsDoc = node.jsDoc;
+    if (jsDoc) {
+        for (const doc of jsDoc) {
+            rewriteImportTypesInNode(ts_impl, doc, applyImportRewrite);
+        }
+    }
+}
+function forEachExternalImportRewrite(ts_impl, source, options, on_rewrite) {
+    const visit = (node) => {
+        rewriteExternalImportsInNode(ts_impl, node, options, on_rewrite);
+        ts_impl.forEachChild(node, visit);
+    };
+    ts_impl.forEachChild(source, visit);
+}
+
 /**
  * Walks the HTMLx part of the Svelte component
  * and converts it to JSX
@@ -4948,6 +5051,45 @@ function convertHtmlxToJsx(str, ast, tags, options = { svelte5Plus: false }) {
     const handleStyleTag = (node) => {
         str.remove(node.start, node.end);
     };
+    const rewriteImportSpecifier = (importSpecifier) => {
+        var _a;
+        if (!options.rewriteExternalImports) {
+            return importSpecifier;
+        }
+        const rewrite = getExternalImportRewrite(importSpecifier, options.rewriteExternalImports);
+        return (_a = rewrite === null || rewrite === void 0 ? void 0 : rewrite.rewritten) !== null && _a !== void 0 ? _a : importSpecifier;
+    };
+    const rewriteImportsInComment = (comment) => {
+        if (!options.rewriteExternalImports) {
+            return;
+        }
+        const original = str.original.slice(comment.start, comment.end);
+        const rewritten = original.replace(/import\(\s*(['"])([^'"]+)\1\s*\)/g, (fullMatch, quote, importSpecifier) => {
+            const specifier = rewriteImportSpecifier(importSpecifier);
+            return specifier === importSpecifier
+                ? fullMatch
+                : `import(${quote}${specifier}${quote})`;
+        });
+        if (rewritten !== original) {
+            str.overwrite(comment.start, comment.end, rewritten);
+        }
+    };
+    const rewriteNodeCommentImports = (node) => {
+        var _a, _b, _c;
+        if (!options.rewriteExternalImports) {
+            return;
+        }
+        const nodeWithcomments = node;
+        for (const comment of (_a = nodeWithcomments.leadingComments) !== null && _a !== void 0 ? _a : []) {
+            rewriteImportsInComment(comment);
+        }
+        for (const comment of (_b = nodeWithcomments.trailingComments) !== null && _b !== void 0 ? _b : []) {
+            rewriteImportsInComment(comment);
+        }
+        for (const comment of (_c = nodeWithcomments.innerComments) !== null && _c !== void 0 ? _c : []) {
+            rewriteImportsInComment(comment);
+        }
+    };
     const slotHandler = new SlotHandler(str.original);
     let templateScope = new TemplateScope();
     const handleComponentLet = (component) => {
@@ -4988,12 +5130,25 @@ function convertHtmlxToJsx(str, ast, tags, options = { svelte5Plus: false }) {
                 isDeclaration.value = true;
             }
             try {
+                rewriteNodeCommentImports(node);
                 switch (node.type) {
                     case 'Identifier':
                         handleIdentifier(node);
                         stores.handleIdentifier(node, parent, prop);
                         eventHandler.handleIdentifier(node, parent, prop);
                         break;
+                    case 'ImportExpression': {
+                        const source = node.source;
+                        if (options.rewriteExternalImports &&
+                            (source === null || source === void 0 ? void 0 : source.type) === 'Literal' &&
+                            typeof source.value === 'string') {
+                            const rewrite = getExternalImportRewrite(source.value, options.rewriteExternalImports);
+                            if (rewrite) {
+                                str.overwrite(source.start + 1, source.end - 1, rewrite.rewritten);
+                            }
+                        }
+                        break;
+                    }
                     case 'IfBlock':
                         handleIf(str, node);
                         break;
@@ -5355,6 +5510,8 @@ function findExports(ts, source, isTsFile) {
             const declaration = statement.declarationList.declarations[0];
             const hasTypeDefinition = !!declaration.type ||
                 (!isTsFile && !!ts.getJSDocType(declaration)) ||
+                (!isTsFile &&
+                    ts.getJSDocTags(declaration).some((t) => t.tagName.text === 'satisfies')) ||
                 (!!declaration.initializer && ts.isSatisfiesExpression(declaration.initializer));
             if (declaration.initializer &&
                 (ts.isFunctionExpression(declaration.initializer) ||
@@ -5439,7 +5596,7 @@ function isParamsFile(fileName, basename, paramsPath) {
         !basename.includes('.test') &&
         !basename.includes('.spec'));
 }
-function upsertKitFile(ts, fileName, kitFilesSettings, getSource, surround = (text) => text) {
+function upsertKitFile(ts, fileName, kitFilesSettings, getSource, surround = (text) => text, rewriteExternalImports) {
     var _a, _b, _c, _d;
     let basename = path__default.basename(fileName);
     const result = (_d = (_c = (_b = (_a = upsertKitRouteFile(ts, basename, getSource, surround)) !== null && _a !== void 0 ? _a : upsertKitServerHooksFile(ts, fileName, basename, kitFilesSettings.serverHooksPath, getSource, surround)) !== null && _b !== void 0 ? _b : upsertKitClientHooksFile(ts, fileName, basename, kitFilesSettings.clientHooksPath, getSource, surround)) !== null && _c !== void 0 ? _c : upsertKitUniversalHooksFile(ts, fileName, basename, kitFilesSettings.universalHooksPath, getSource, surround)) !== null && _d !== void 0 ? _d : upsertKitParamsFile(ts, fileName, basename, kitFilesSettings.paramsPath, getSource, surround);
@@ -5455,8 +5612,34 @@ function upsertKitFile(ts, fileName, kitFilesSettings, getSource, surround = (te
         pos = added.originalPos;
     }
     text += originalText.slice(pos);
+    if (rewriteExternalImports) {
+        const source = getSource();
+        if (source) {
+            const rewriteOptions = {
+                sourcePath: fileName,
+                generatedPath: rewriteExternalImports.generatedPath,
+                workspacePath: rewriteExternalImports.workspacePath
+            };
+            applyExternalImportRewritesToAddedCode(ts, source, addedCode, rewriteOptions);
+            let rewritePos = 0;
+            text = '';
+            for (const added of addedCode) {
+                text += originalText.slice(rewritePos, added.originalPos) + added.inserted;
+                rewritePos = added.originalPos;
+            }
+            text += originalText.slice(rewritePos);
+        }
+    }
     return { text, addedCode };
 }
+function applyExternalImportRewritesToAddedCode(ts_impl, source, addedCode, rewriteOptions) {
+    forEachExternalImportRewrite(ts_impl, source, rewriteOptions, (module_specifier, rewrite) => {
+        if (!rewrite.insertedPrefix) {
+            return;
+        }
+        insertCode(addedCode, module_specifier.getStart(source) + 1, rewrite.insertedPrefix);
+    });
+}
 function upsertKitRouteFile(ts, basename, getSource, surround) {
     if (!isKitRouteFile(basename))
         return;
@@ -5472,15 +5655,27 @@ function upsertKitRouteFile(ts, basename, getSource, surround) {
     // add type to load function if not explicitly typed
     const load = exports.get('load');
     if ((load === null || load === void 0 ? void 0 : load.type) === 'function' && load.node.parameters.length === 1 && !load.hasTypeDefinition) {
-        const pos = load.node.parameters[0].getEnd();
-        const inserted = surround(`: import('./$types.js').${basename.includes('layout') ? 'Layout' : 'Page'}${basename.includes('server') ? 'Server' : ''}LoadEvent`);
-        insert(pos, inserted);
+        const load_type = `import('./$types.js').${basename.includes('layout') ? 'Layout' : 'Page'}${basename.includes('server') ? 'Server' : ''}Load`;
+        if (isTsFile) {
+            const pos = load.node.parameters[0].getEnd();
+            const inserted = surround(`: ${load_type}Event`);
+            insert(pos, inserted);
+        }
+        else {
+            addJsDocParamToFunction(surround, insert, ts, load.node, `${load_type}Event`);
+        }
     }
     else if ((load === null || load === void 0 ? void 0 : load.type) === 'var' && !load.hasTypeDefinition) {
-        // "const load = ..." will be transformed into
-        // "const load = (...) satisfies PageLoad"
-        insert(load.node.initializer.getStart(), surround('('));
-        insert(load.node.initializer.getEnd(), surround(`) satisfies import('./$types.js').${basename.includes('layout') ? 'Layout' : 'Page'}${basename.includes('server') ? 'Server' : ''}Load`));
+        const load_type = `import('./$types.js').${basename.includes('layout') ? 'Layout' : 'Page'}${basename.includes('server') ? 'Server' : ''}Load`;
+        if (isTsFile) {
+            // "const load = ..." will be transformed into
+            // "const load = (...) satisfies PageLoad"
+            insert(load.node.initializer.getStart(), surround('('));
+            insert(load.node.initializer.getEnd(), surround(`) satisfies ${load_type}`));
+        }
+        else {
+            addJsDocSatisfiesToVariable(surround, insert, load.node, load_type);
+        }
     }
     // add type to entries function if not explicitly typed
     const entries = exports.get('entries');
@@ -5488,28 +5683,36 @@ function upsertKitRouteFile(ts, basename, getSource, surround) {
         entries.node.parameters.length === 0 &&
         !entries.hasTypeDefinition &&
         !basename.includes('layout')) {
-        if (!entries.node.type && entries.node.body) {
+        if (isTsFile && !entries.node.type && entries.node.body) {
             const returnPos = ts.isArrowFunction(entries.node)
                 ? entries.node.equalsGreaterThanToken.getStart()
                 : entries.node.body.getStart();
             const returnInsertion = surround(`: ReturnType<import('./$types.js').EntryGenerator> `);
             insert(returnPos, returnInsertion);
         }
+        else if (!isTsFile) {
+            addJsDocTypeToFunction(surround, insert, entries.node, `import('./$types.js').EntryGenerator`);
+        }
     }
     // add type to actions variable if not explicitly typed
     const actions = exports.get('actions');
     if ((actions === null || actions === void 0 ? void 0 : actions.type) === 'var' && !actions.hasTypeDefinition && actions.node.initializer) {
-        const pos = actions.node.initializer.getEnd();
-        const inserted = surround(` satisfies import('./$types.js').Actions`);
-        insert(pos, inserted);
-    }
-    addTypeToVariable(exports, surround, insert, 'prerender', `boolean | 'auto'`);
-    addTypeToVariable(exports, surround, insert, 'trailingSlash', `'never' | 'always' | 'ignore'`);
-    addTypeToVariable(exports, surround, insert, 'ssr', `boolean`);
-    addTypeToVariable(exports, surround, insert, 'csr', `boolean`);
+        if (isTsFile) {
+            const pos = actions.node.initializer.getEnd();
+            const inserted = surround(` satisfies import('./$types.js').Actions`);
+            insert(pos, inserted);
+        }
+        else {
+            addJsDocSatisfiesToVariable(surround, insert, actions.node, `import('./$types.js').Actions`);
+        }
+    }
+    addTypeToVariable(exports, surround, insert, isTsFile, 'prerender', `boolean | 'auto'`);
+    addTypeToVariable(exports, surround, insert, isTsFile, 'trailingSlash', `'never' | 'always' | 'ignore'`);
+    addTypeToVariable(exports, surround, insert, isTsFile, 'ssr', `boolean`);
+    addTypeToVariable(exports, surround, insert, isTsFile, 'csr', `boolean`);
     // add types to GET/PUT/POST/PATCH/DELETE/OPTIONS/HEAD if not explicitly typed
     const insertApiMethod = (name) => {
-        addTypeToFunction(ts, exports, surround, insert, name, `import('./$types.js').RequestEvent`, `Response | Promise<Response>`);
+        addTypeToFunction(ts, exports, surround, insert, isTsFile, name, `import('./$types.js').RequestEvent`, `Response | Promise<Response>`);
     };
     insertApiMethod('GET');
     insertApiMethod('PUT');
@@ -5534,7 +5737,7 @@ function upsertKitParamsFile(ts, fileName, basename, paramsPath, getSource, surr
     };
     const isTsFile = basename.endsWith('.ts');
     const exports = findExports(ts, source, isTsFile);
-    addTypeToFunction(ts, exports, surround, insert, 'match', 'string', 'boolean');
+    addTypeToFunction(ts, exports, surround, insert, isTsFile, 'match', 'string', 'boolean');
     return { addedCode, originalText: source.getFullText() };
 }
 function upsertKitClientHooksFile(ts, fileName, basename, clientHooksPath, getSource, surround) {
@@ -5550,7 +5753,7 @@ function upsertKitClientHooksFile(ts, fileName, basename, clientHooksPath, getSo
     };
     const isTsFile = basename.endsWith('.ts');
     const exports = findExports(ts, source, isTsFile);
-    addTypeToFunction(ts, exports, surround, insert, 'handleError', `import('@sveltejs/kit').HandleClientError`);
+    addTypeToFunction(ts, exports, surround, insert, isTsFile, 'handleError', `import('@sveltejs/kit').HandleClientError`);
     return { addedCode, originalText: source.getFullText() };
 }
 function upsertKitServerHooksFile(ts, fileName, basename, serverHooksPath, getSource, surround) {
@@ -5567,7 +5770,7 @@ function upsertKitServerHooksFile(ts, fileName, basename, serverHooksPath, getSo
     const isTsFile = basename.endsWith('.ts');
     const exports = findExports(ts, source, isTsFile);
     const addType = (name, type) => {
-        addTypeToFunction(ts, exports, surround, insert, name, type);
+        addTypeToFunction(ts, exports, surround, insert, isTsFile, name, type);
     };
     addType('handleError', `import('@sveltejs/kit').HandleServerError`);
     addType('handle', `import('@sveltejs/kit').Handle`);
@@ -5587,32 +5790,68 @@ function upsertKitUniversalHooksFile(ts, fileName, basename, universalHooksPath,
     };
     const isTsFile = basename.endsWith('.ts');
     const exports = findExports(ts, source, isTsFile);
-    addTypeToFunction(ts, exports, surround, insert, 'reroute', `import('@sveltejs/kit').Reroute`);
+    addTypeToFunction(ts, exports, surround, insert, isTsFile, 'reroute', `import('@sveltejs/kit').Reroute`);
     return { addedCode, originalText: source.getFullText() };
 }
-function addTypeToVariable(exports, surround, insert, name, type) {
+function addTypeToVariable(exports, surround, insert, isTsFile, name, type) {
     const variable = exports.get(name);
     if ((variable === null || variable === void 0 ? void 0 : variable.type) === 'var' && !variable.hasTypeDefinition && variable.node.initializer) {
-        const pos = variable.node.name.getEnd();
-        const inserted = surround(` : ${type}`);
-        insert(pos, inserted);
+        if (isTsFile) {
+            const pos = variable.node.name.getEnd();
+            const inserted = surround(` : ${type}`);
+            insert(pos, inserted);
+        }
+        else {
+            addJsDocTypeToVariable(surround, insert, variable.node, type);
+        }
     }
 }
-function addTypeToFunction(ts, exports, surround, insert, name, type, returnType) {
+function addTypeToFunction(ts, exports, surround, insert, isTsFile, name, type, returnType) {
     const fn = exports.get(name);
     if ((fn === null || fn === void 0 ? void 0 : fn.type) === 'function' && fn.node.parameters.length === 1 && !fn.hasTypeDefinition) {
-        const paramPos = fn.node.parameters[0].getEnd();
-        const paramInsertion = surround(!returnType ? `: Parameters<${type}>[0]` : `: ${type}`);
-        insert(paramPos, paramInsertion);
-        if (!fn.node.type && fn.node.body) {
-            const returnPos = ts.isArrowFunction(fn.node)
-                ? fn.node.equalsGreaterThanToken.getStart()
-                : fn.node.body.getStart();
-            const returnInsertion = surround(!returnType ? `: ReturnType<${type}> ` : `: ${returnType} `);
-            insert(returnPos, returnInsertion);
+        if (isTsFile) {
+            const paramPos = fn.node.parameters[0].getEnd();
+            const paramInsertion = surround(!returnType ? `: Parameters<${type}>[0]` : `: ${type}`);
+            insert(paramPos, paramInsertion);
+            if (!fn.node.type && fn.node.body) {
+                const returnPos = ts.isArrowFunction(fn.node)
+                    ? fn.node.equalsGreaterThanToken.getStart()
+                    : fn.node.body.getStart();
+                const returnInsertion = surround(!returnType ? `: ReturnType<${type}> ` : `: ${returnType} `);
+                insert(returnPos, returnInsertion);
+            }
+        }
+        else {
+            const jsdoc_type = returnType === undefined ? type : `(arg0: ${type}) => ${returnType}`;
+            addJsDocTypeToFunction(surround, insert, fn.node, jsdoc_type);
         }
     }
 }
+function addJsDocTypeToVariable(surround, insert, node, type) {
+    if (!node.initializer) {
+        return;
+    }
+    insert(node.initializer.getStart(), surround(`/** @type {${type}} */ (`));
+    insert(node.initializer.getEnd(), surround(`)`));
+}
+function addJsDocSatisfiesToVariable(surround, insert, node, type) {
+    if (!node.initializer) {
+        return;
+    }
+    insert(node.initializer.getStart(), surround(`/** @satisfies {${type}} */ (`));
+    insert(node.initializer.getEnd(), surround(`)`));
+}
+function addJsDocTypeToFunction(surround, insert, node, type) {
+    insert(node.getStart(), surround(`/** @type {${type}} */ `));
+}
+function addJsDocParamToFunction(surround, insert, ts, node, type) {
+    const parameter = node.parameters[0];
+    if (!parameter) {
+        return;
+    }
+    const parameter_name = ts.isIdentifier(parameter.name) ? parameter.name.text : 'arg0';
+    insert(node.getStart(), surround(`/** @param {${type}} ${parameter_name} */ `));
+}
 function insertCode(addedCode, pos, inserted) {
     var _a, _b, _c, _d;
     const insertionIdx = addedCode.findIndex((c) => c.originalPos > pos);
@@ -7666,7 +7905,7 @@ class InterfacesAndTypes {
     }
 }
 
-function processInstanceScriptContent(str, script, events, implicitStoreValues, mode, moduleAst, isTSFile, basename, isSvelte5Plus, isRunes, emitJsDoc) {
+function processInstanceScriptContent(str, script, events, implicitStoreValues, mode, moduleAst, isTSFile, basename, isSvelte5Plus, isRunes, emitJsDoc, rewriteExternalImports) {
     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);
@@ -7778,6 +8017,11 @@ function processInstanceScriptContent(str, script, events, implicitStoreValues,
     const walk = (node, parent) => {
         var _a, _b, _c;
         const onLeaveCallbacks = [];
+        if (rewriteExternalImports) {
+            rewriteExternalImportsInNode(ts, node, rewriteExternalImports, (specifier, rewrite) => {
+                str.overwrite(specifier.getStart(tsAst) + astOffset + 1, specifier.getEnd() + astOffset - 1, rewrite.rewritten);
+            });
+        }
         if (parent === tsAst) {
             exportedNames.hoistableInterfaces.analyzeInstanceScriptNode(node);
         }
@@ -7961,7 +8205,7 @@ function createModuleAst(str, script) {
     const astOffset = script.content.start;
     return { htmlx, tsAst, astOffset };
 }
-function processModuleScriptTag(str, script, implicitStoreValues, moduleAst) {
+function processModuleScriptTag(str, script, implicitStoreValues, moduleAst, rewriteExternalImports) {
     const { htmlx, tsAst, astOffset } = moduleAst;
     const generics = new Generics(str, astOffset, script);
     if (generics.genericsAttr) {
@@ -7969,6 +8213,11 @@ function processModuleScriptTag(str, script, implicitStoreValues, moduleAst) {
         throwError(start, start + 8, 'The generics attribute is only allowed on the instance script', str.original);
     }
     const walk = (node) => {
+        if (rewriteExternalImports) {
+            rewriteExternalImportsInNode(ts, node, rewriteExternalImports, (specifier, rewrite) => {
+                str.overwrite(specifier.getStart(tsAst) + astOffset + 1, specifier.getEnd() + astOffset - 1, rewrite.rewritten);
+            });
+        }
         resolveImplicitStoreValue(node, implicitStoreValues, str, astOffset);
         generics.throwIfIsGeneric(node);
         throwIfIs$$EventsDeclaration(node, str, astOffset);
@@ -8032,6 +8281,13 @@ function svelte2tsx(svelte, options = { parse }) {
     options.mode = options.mode || 'ts';
     options.version = options.version || VERSION;
     const str = new MagicString(svelte);
+    const rewriteExternalImportsOptions = options.rewriteExternalImports && options.filename
+        ? {
+            sourcePath: options.filename,
+            generatedPath: options.rewriteExternalImports.generatedPath,
+            workspacePath: options.rewriteExternalImports.workspacePath
+        }
+        : undefined;
     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;
@@ -8039,7 +8295,8 @@ function svelte2tsx(svelte, options = { parse }) {
     // 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,
-        svelte5Plus
+        svelte5Plus,
+        rewriteExternalImports: rewriteExternalImportsOptions
     });
     /* Rearrange the script tags so that module is first, and instance second followed finally by the template
      * This is a bit convoluted due to some trouble I had with magic string. A simple str.move(start,end,0) for each script wasn't enough
@@ -8073,7 +8330,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, isTsFile, basename, svelte5Plus, isRunes, emitJsDoc);
+        const res = processInstanceScriptContent(str, scriptTag, events, implicitStoreValues, options.mode, moduleAst, isTsFile, basename, svelte5Plus, isRunes, emitJsDoc, rewriteExternalImportsOptions);
         uses$$props = uses$$props || res.uses$$props;
         uses$$restProps = uses$$restProps || res.uses$$restProps;
         uses$$slots = uses$$slots || res.uses$$slots;
@@ -8107,7 +8364,7 @@ function svelte2tsx(svelte, options = { parse }) {
     });
     // we need to process the module script after the instance script has moved otherwise we get warnings about moving edited items
     if (moduleScriptTag) {
-        processModuleScriptTag(str, moduleScriptTag, new ImplicitStoreValues(implicitStoreValues.getAccessedStores(), renderFunctionStart, svelte5Plus, scriptTag || options.mode === 'ts' ? undefined : (input) => `</>;${input}<>`), moduleAst);
+        processModuleScriptTag(str, moduleScriptTag, new ImplicitStoreValues(implicitStoreValues.getAccessedStores(), renderFunctionStart, svelte5Plus, scriptTag || options.mode === 'ts' ? undefined : (input) => `</>;${input}<>`), moduleAst, rewriteExternalImportsOptions);
         if (!scriptTag) {
             moduleAst.tsAst.forEachChild((node) => exportedNames.hoistableInterfaces.analyzeModuleScriptNode(node));
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte2tsx",
-  "version": "0.7.48",
+  "version": "0.7.50",
   "description": "Convert Svelte components to TSX for type checking",
   "author": "The Svelte Community",
   "license": "MIT",