svelte2tsx 0.6.7 → 0.6.8

package/index.d.ts

@@ -128,6 +128,7 @@ export const internalHelpers: {
     )=> boolean,
     isParamsFile: (fileName: string, basename: string, paramsPath: string) =>boolean,
     upsertKitFile: (
+        _ts: typeof ts,
         fileName: string,
         kitFilesSettings: InternalHelpers.KitFilesSettings,
         getSource: () => ts.SourceFile | undefined,
@@ -135,7 +136,7 @@ export const internalHelpers: {
     ) => { text: string; addedCode: InternalHelpers.AddedCode[] } | undefined,
     toVirtualPos: (pos: number, addedCode: InternalHelpers.AddedCode[]) => number,
     toOriginalPos: (pos: number, addedCode: InternalHelpers.AddedCode[]) => {pos: number; inGenerated: boolean},
-    findExports: (source: ts.SourceFile, isTsFile: boolean) => Map<
+    findExports: (_ts: typeof ts, source: ts.SourceFile, isTsFile: boolean) => Map<
         string,
         | {
             type: 'function';

package/index.js

@@ -5997,7 +5997,7 @@ function isSubpath(maybeParent, maybeChild) {
 /**
  * Finds the top level const/let/function exports of a source file.
  */
-function findExports(source, isTsFile) {
+function findExports(ts, source, isTsFile) {
     var _a, _b, _c, _d;
     const exports = new Map();
     // TODO handle indirect exports?
@@ -6009,7 +6009,7 @@ function findExports(source, isTsFile) {
             exports.set(statement.name.text, {
                 type: 'function',
                 node: statement,
-                hasTypeDefinition: hasTypedParameter(statement, isTsFile)
+                hasTypeDefinition: hasTypedParameter(ts, statement, isTsFile)
             });
         }
         if (ts.isVariableStatement(statement) &&
@@ -6034,7 +6034,7 @@ function findExports(source, isTsFile) {
                 exports.set(declaration.name.getText(), {
                     type: 'function',
                     node,
-                    hasTypeDefinition: hasTypeDefinition || hasTypedParameter(node, isTsFile)
+                    hasTypeDefinition: hasTypeDefinition || hasTypedParameter(ts, node, isTsFile)
                 });
             }
             else {
@@ -6048,7 +6048,7 @@ function findExports(source, isTsFile) {
     }
     return exports;
 }
-function hasTypedParameter(node, isTsFile) {
+function hasTypedParameter(ts, node, isTsFile) {
     var _a;
     return (!!((_a = node.parameters[0]) === null || _a === void 0 ? void 0 : _a.type) ||
         (!isTsFile &&
@@ -6104,10 +6104,10 @@ function isParamsFile(fileName, basename, paramsPath) {
         !basename.includes('.test') &&
         !basename.includes('.spec'));
 }
-function upsertKitFile(fileName, kitFilesSettings, getSource, surround = (text) => text) {
+function upsertKitFile(ts, fileName, kitFilesSettings, getSource, surround = (text) => text) {
     var _a, _b, _c;
     let basename = path.basename(fileName);
-    const result = (_c = (_b = (_a = upserKitRouteFile(fileName, basename, getSource, surround)) !== null && _a !== void 0 ? _a : upserKitServerHooksFile(fileName, basename, kitFilesSettings.serverHooksPath, getSource, surround)) !== null && _b !== void 0 ? _b : upserKitClientHooksFile(fileName, basename, kitFilesSettings.clientHooksPath, getSource, surround)) !== null && _c !== void 0 ? _c : upserKitParamsFile(fileName, basename, kitFilesSettings.paramsPath, getSource, surround);
+    const result = (_c = (_b = (_a = upserKitRouteFile(ts, fileName, basename, getSource, surround)) !== null && _a !== void 0 ? _a : upserKitServerHooksFile(ts, fileName, basename, kitFilesSettings.serverHooksPath, getSource, surround)) !== null && _b !== void 0 ? _b : upserKitClientHooksFile(ts, fileName, basename, kitFilesSettings.clientHooksPath, getSource, surround)) !== null && _c !== void 0 ? _c : upserKitParamsFile(ts, fileName, basename, kitFilesSettings.paramsPath, getSource, surround);
     if (!result) {
         return;
     }
@@ -6122,7 +6122,7 @@ function upsertKitFile(fileName, kitFilesSettings, getSource, surround = (text)
     text += originalText.slice(pos);
     return { text, addedCode };
 }
-function upserKitRouteFile(fileName, basename, getSource, surround) {
+function upserKitRouteFile(ts, fileName, basename, getSource, surround) {
     if (!isKitRouteFile(fileName, basename))
         return;
     const source = getSource();
@@ -6133,7 +6133,7 @@ function upserKitRouteFile(fileName, basename, getSource, surround) {
         insertCode(addedCode, pos, inserted);
     };
     const isTsFile = basename.endsWith('.ts');
-    const exports = findExports(source, isTsFile);
+    const exports = findExports(ts, source, isTsFile);
     // 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) {
@@ -6154,7 +6154,7 @@ function upserKitRouteFile(fileName, basename, getSource, surround) {
     addTypeToVariable(exports, surround, insert, 'csr', `boolean`);
     // add types to GET/PUT/POST/PATCH/DELETE/OPTIONS if not explicitly typed
     const insertApiMethod = (name) => {
-        addTypeToFunction(exports, surround, insert, name, `import('./$types').RequestEvent`, `Response | Promise<Response>`);
+        addTypeToFunction(ts, exports, surround, insert, name, `import('./$types').RequestEvent`, `Response | Promise<Response>`);
     };
     insertApiMethod('GET');
     insertApiMethod('PUT');
@@ -6164,7 +6164,7 @@ function upserKitRouteFile(fileName, basename, getSource, surround) {
     insertApiMethod('OPTIONS');
     return { addedCode, originalText: source.getFullText() };
 }
-function upserKitParamsFile(fileName, basename, paramsPath, getSource, surround) {
+function upserKitParamsFile(ts, fileName, basename, paramsPath, getSource, surround) {
     if (!isParamsFile(fileName, basename, paramsPath)) {
         return;
     }
@@ -6176,11 +6176,11 @@ function upserKitParamsFile(fileName, basename, paramsPath, getSource, surround)
         insertCode(addedCode, pos, inserted);
     };
     const isTsFile = basename.endsWith('.ts');
-    const exports = findExports(source, isTsFile);
-    addTypeToFunction(exports, surround, insert, 'match', 'string', 'boolean');
+    const exports = findExports(ts, source, isTsFile);
+    addTypeToFunction(ts, exports, surround, insert, 'match', 'string', 'boolean');
     return { addedCode, originalText: source.getFullText() };
 }
-function upserKitClientHooksFile(fileName, basename, clientHooksPath, getSource, surround) {
+function upserKitClientHooksFile(ts, fileName, basename, clientHooksPath, getSource, surround) {
     if (!isClientHooksFile(fileName, basename, clientHooksPath)) {
         return;
     }
@@ -6192,11 +6192,11 @@ function upserKitClientHooksFile(fileName, basename, clientHooksPath, getSource,
         insertCode(addedCode, pos, inserted);
     };
     const isTsFile = basename.endsWith('.ts');
-    const exports = findExports(source, isTsFile);
-    addTypeToFunction(exports, surround, insert, 'handleError', `import('@sveltejs/kit').HandleClientError`);
+    const exports = findExports(ts, source, isTsFile);
+    addTypeToFunction(ts, exports, surround, insert, 'handleError', `import('@sveltejs/kit').HandleClientError`);
     return { addedCode, originalText: source.getFullText() };
 }
-function upserKitServerHooksFile(fileName, basename, serverHooksPath, getSource, surround) {
+function upserKitServerHooksFile(ts, fileName, basename, serverHooksPath, getSource, surround) {
     if (!isServerHooksFile(fileName, basename, serverHooksPath)) {
         return;
     }
@@ -6208,9 +6208,9 @@ function upserKitServerHooksFile(fileName, basename, serverHooksPath, getSource,
         insertCode(addedCode, pos, inserted);
     };
     const isTsFile = basename.endsWith('.ts');
-    const exports = findExports(source, isTsFile);
+    const exports = findExports(ts, source, isTsFile);
     const addType = (name, type) => {
-        addTypeToFunction(exports, surround, insert, name, type);
+        addTypeToFunction(ts, exports, surround, insert, name, type);
     };
     addType('handleError', `import('@sveltejs/kit').HandleServerError`);
     addType('handle', `import('@sveltejs/kit').Handle`);
@@ -6225,15 +6225,17 @@ function addTypeToVariable(exports, surround, insert, name, type) {
         insert(pos, inserted);
     }
 }
-function addTypeToFunction(exports, surround, insert, name, type, returnType) {
+function addTypeToFunction(ts, exports, surround, insert, 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 = fn.node.body.getStart();
-            const returnInsertion = surround(!returnType ? `: ReturnType<${type}>` : `: ${returnType}`);
+            const returnPos = ts.isArrowFunction(fn.node)
+                ? fn.node.equalsGreaterThanToken.getStart()
+                : fn.node.body.getStart();
+            const returnInsertion = surround(!returnType ? `: ReturnType<${type}> ` : `: ${returnType} `);
             insert(returnPos, returnInsertion);
         }
     }

package/index.mjs

@@ -5977,44 +5977,44 @@ function isSubpath(maybeParent, maybeChild) {
 /**
  * Finds the top level const/let/function exports of a source file.
  */
-function findExports(source, isTsFile) {
+function findExports(ts, source, isTsFile) {
     var _a, _b, _c, _d;
     const exports = new Map();
     // TODO handle indirect exports?
     for (const statement of source.statements) {
-        if (ts__default.isFunctionDeclaration(statement) &&
+        if (ts.isFunctionDeclaration(statement) &&
             statement.name &&
-            ((_b = (_a = ts__default.getModifiers(statement)) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.kind) === ts__default.SyntaxKind.ExportKeyword) {
+            ((_b = (_a = ts.getModifiers(statement)) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.kind) === ts.SyntaxKind.ExportKeyword) {
             // export function x ...
             exports.set(statement.name.text, {
                 type: 'function',
                 node: statement,
-                hasTypeDefinition: hasTypedParameter(statement, isTsFile)
+                hasTypeDefinition: hasTypedParameter(ts, statement, isTsFile)
             });
         }
-        if (ts__default.isVariableStatement(statement) &&
+        if (ts.isVariableStatement(statement) &&
             statement.declarationList.declarations.length === 1 &&
-            ((_d = (_c = ts__default.getModifiers(statement)) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.kind) === ts__default.SyntaxKind.ExportKeyword) {
+            ((_d = (_c = ts.getModifiers(statement)) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.kind) === ts.SyntaxKind.ExportKeyword) {
             // export const x = ...
             const declaration = statement.declarationList.declarations[0];
             const hasTypeDefinition = !!declaration.type ||
-                (!isTsFile && !!ts__default.getJSDocType(declaration)) ||
-                (!!declaration.initializer && ts__default.isSatisfiesExpression(declaration.initializer));
+                (!isTsFile && !!ts.getJSDocType(declaration)) ||
+                (!!declaration.initializer && ts.isSatisfiesExpression(declaration.initializer));
             if (declaration.initializer &&
-                (ts__default.isFunctionExpression(declaration.initializer) ||
-                    ts__default.isArrowFunction(declaration.initializer) ||
-                    (ts__default.isSatisfiesExpression(declaration.initializer) &&
-                        ts__default.isParenthesizedExpression(declaration.initializer.expression) &&
-                        (ts__default.isFunctionExpression(declaration.initializer.expression.expression) ||
-                            ts__default.isArrowFunction(declaration.initializer.expression.expression))))) {
-                const node = ts__default.isSatisfiesExpression(declaration.initializer)
+                (ts.isFunctionExpression(declaration.initializer) ||
+                    ts.isArrowFunction(declaration.initializer) ||
+                    (ts.isSatisfiesExpression(declaration.initializer) &&
+                        ts.isParenthesizedExpression(declaration.initializer.expression) &&
+                        (ts.isFunctionExpression(declaration.initializer.expression.expression) ||
+                            ts.isArrowFunction(declaration.initializer.expression.expression))))) {
+                const node = ts.isSatisfiesExpression(declaration.initializer)
                     ? declaration.initializer.expression
                         .expression
                     : declaration.initializer;
                 exports.set(declaration.name.getText(), {
                     type: 'function',
                     node,
-                    hasTypeDefinition: hasTypeDefinition || hasTypedParameter(node, isTsFile)
+                    hasTypeDefinition: hasTypeDefinition || hasTypedParameter(ts, node, isTsFile)
                 });
             }
             else {
@@ -6028,12 +6028,12 @@ function findExports(source, isTsFile) {
     }
     return exports;
 }
-function hasTypedParameter(node, isTsFile) {
+function hasTypedParameter(ts, node, isTsFile) {
     var _a;
     return (!!((_a = node.parameters[0]) === null || _a === void 0 ? void 0 : _a.type) ||
         (!isTsFile &&
-            (!!ts__default.getJSDocType(node) ||
-                (node.parameters[0] && !!ts__default.getJSDocParameterTags(node.parameters[0]).length))));
+            (!!ts.getJSDocType(node) ||
+                (node.parameters[0] && !!ts.getJSDocParameterTags(node.parameters[0]).length))));
 }
 
 const kitPageFiles = new Set(['+page', '+layout', '+page.server', '+layout.server', '+server']);
@@ -6084,10 +6084,10 @@ function isParamsFile(fileName, basename, paramsPath) {
         !basename.includes('.test') &&
         !basename.includes('.spec'));
 }
-function upsertKitFile(fileName, kitFilesSettings, getSource, surround = (text) => text) {
+function upsertKitFile(ts, fileName, kitFilesSettings, getSource, surround = (text) => text) {
     var _a, _b, _c;
     let basename = path__default.basename(fileName);
-    const result = (_c = (_b = (_a = upserKitRouteFile(fileName, basename, getSource, surround)) !== null && _a !== void 0 ? _a : upserKitServerHooksFile(fileName, basename, kitFilesSettings.serverHooksPath, getSource, surround)) !== null && _b !== void 0 ? _b : upserKitClientHooksFile(fileName, basename, kitFilesSettings.clientHooksPath, getSource, surround)) !== null && _c !== void 0 ? _c : upserKitParamsFile(fileName, basename, kitFilesSettings.paramsPath, getSource, surround);
+    const result = (_c = (_b = (_a = upserKitRouteFile(ts, fileName, basename, getSource, surround)) !== null && _a !== void 0 ? _a : upserKitServerHooksFile(ts, fileName, basename, kitFilesSettings.serverHooksPath, getSource, surround)) !== null && _b !== void 0 ? _b : upserKitClientHooksFile(ts, fileName, basename, kitFilesSettings.clientHooksPath, getSource, surround)) !== null && _c !== void 0 ? _c : upserKitParamsFile(ts, fileName, basename, kitFilesSettings.paramsPath, getSource, surround);
     if (!result) {
         return;
     }
@@ -6102,7 +6102,7 @@ function upsertKitFile(fileName, kitFilesSettings, getSource, surround = (text)
     text += originalText.slice(pos);
     return { text, addedCode };
 }
-function upserKitRouteFile(fileName, basename, getSource, surround) {
+function upserKitRouteFile(ts, fileName, basename, getSource, surround) {
     if (!isKitRouteFile(fileName, basename))
         return;
     const source = getSource();
@@ -6113,7 +6113,7 @@ function upserKitRouteFile(fileName, basename, getSource, surround) {
         insertCode(addedCode, pos, inserted);
     };
     const isTsFile = basename.endsWith('.ts');
-    const exports = findExports(source, isTsFile);
+    const exports = findExports(ts, source, isTsFile);
     // 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) {
@@ -6134,7 +6134,7 @@ function upserKitRouteFile(fileName, basename, getSource, surround) {
     addTypeToVariable(exports, surround, insert, 'csr', `boolean`);
     // add types to GET/PUT/POST/PATCH/DELETE/OPTIONS if not explicitly typed
     const insertApiMethod = (name) => {
-        addTypeToFunction(exports, surround, insert, name, `import('./$types').RequestEvent`, `Response | Promise<Response>`);
+        addTypeToFunction(ts, exports, surround, insert, name, `import('./$types').RequestEvent`, `Response | Promise<Response>`);
     };
     insertApiMethod('GET');
     insertApiMethod('PUT');
@@ -6144,7 +6144,7 @@ function upserKitRouteFile(fileName, basename, getSource, surround) {
     insertApiMethod('OPTIONS');
     return { addedCode, originalText: source.getFullText() };
 }
-function upserKitParamsFile(fileName, basename, paramsPath, getSource, surround) {
+function upserKitParamsFile(ts, fileName, basename, paramsPath, getSource, surround) {
     if (!isParamsFile(fileName, basename, paramsPath)) {
         return;
     }
@@ -6156,11 +6156,11 @@ function upserKitParamsFile(fileName, basename, paramsPath, getSource, surround)
         insertCode(addedCode, pos, inserted);
     };
     const isTsFile = basename.endsWith('.ts');
-    const exports = findExports(source, isTsFile);
-    addTypeToFunction(exports, surround, insert, 'match', 'string', 'boolean');
+    const exports = findExports(ts, source, isTsFile);
+    addTypeToFunction(ts, exports, surround, insert, 'match', 'string', 'boolean');
     return { addedCode, originalText: source.getFullText() };
 }
-function upserKitClientHooksFile(fileName, basename, clientHooksPath, getSource, surround) {
+function upserKitClientHooksFile(ts, fileName, basename, clientHooksPath, getSource, surround) {
     if (!isClientHooksFile(fileName, basename, clientHooksPath)) {
         return;
     }
@@ -6172,11 +6172,11 @@ function upserKitClientHooksFile(fileName, basename, clientHooksPath, getSource,
         insertCode(addedCode, pos, inserted);
     };
     const isTsFile = basename.endsWith('.ts');
-    const exports = findExports(source, isTsFile);
-    addTypeToFunction(exports, surround, insert, 'handleError', `import('@sveltejs/kit').HandleClientError`);
+    const exports = findExports(ts, source, isTsFile);
+    addTypeToFunction(ts, exports, surround, insert, 'handleError', `import('@sveltejs/kit').HandleClientError`);
     return { addedCode, originalText: source.getFullText() };
 }
-function upserKitServerHooksFile(fileName, basename, serverHooksPath, getSource, surround) {
+function upserKitServerHooksFile(ts, fileName, basename, serverHooksPath, getSource, surround) {
     if (!isServerHooksFile(fileName, basename, serverHooksPath)) {
         return;
     }
@@ -6188,9 +6188,9 @@ function upserKitServerHooksFile(fileName, basename, serverHooksPath, getSource,
         insertCode(addedCode, pos, inserted);
     };
     const isTsFile = basename.endsWith('.ts');
-    const exports = findExports(source, isTsFile);
+    const exports = findExports(ts, source, isTsFile);
     const addType = (name, type) => {
-        addTypeToFunction(exports, surround, insert, name, type);
+        addTypeToFunction(ts, exports, surround, insert, name, type);
     };
     addType('handleError', `import('@sveltejs/kit').HandleServerError`);
     addType('handle', `import('@sveltejs/kit').Handle`);
@@ -6205,15 +6205,17 @@ function addTypeToVariable(exports, surround, insert, name, type) {
         insert(pos, inserted);
     }
 }
-function addTypeToFunction(exports, surround, insert, name, type, returnType) {
+function addTypeToFunction(ts, exports, surround, insert, 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 = fn.node.body.getStart();
-            const returnInsertion = surround(!returnType ? `: ReturnType<${type}>` : `: ${returnType}`);
+            const returnPos = ts.isArrowFunction(fn.node)
+                ? fn.node.equalsGreaterThanToken.getStart()
+                : fn.node.body.getStart();
+            const returnInsertion = surround(!returnType ? `: ReturnType<${type}> ` : `: ${returnType} `);
             insert(returnPos, returnInsertion);
         }
     }

package/package.json

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