svelte2tsx 0.7.51 → 0.7.53

package/index.js

@@ -2810,12 +2810,9 @@ function handleAttribute(str, attr, parent, preserveCase, svelte5Plus, element)
             if (!needsNumberConversion) {
                 attributeValue.push(quote);
             }
-            if (includesTemplateLiteralQuote && attrVal.data.split('\n').length > 1) {
-                // Multiline attribute value text which can't be wrapped in a template literal
-                // -> ensure it's still a valid transformation by transforming the actual line break
-                str.overwrite(attrVal.start, attrVal.end, attrVal.data.split('\n').join('\\n'), {
-                    contentOnly: true
-                });
+            const escapedValue = tryEscapeAttributeValue(attrVal.data, !includesTemplateLiteralQuote);
+            if (escapedValue !== null) {
+                str.overwrite(attrVal.start, attrVal.end, escapedValue, { contentOnly: true });
             }
             attributeValue.push([attrVal.start, attrVal.end]);
             if (!needsNumberConversion) {
@@ -2849,6 +2846,15 @@ function handleAttribute(str, attr, parent, preserveCase, svelte5Plus, element)
 function attributeValueIsOfType(value, type) {
     return value !== true && value.length == 1 && value[0].type == type;
 }
+function tryEscapeAttributeValue(str, useTemplateLiteral) {
+    // Multiline attribute value text which can't be wrapped in a template literal
+    // -> ensure it's still a valid transformation by transforming the actual line break
+    // \ is not a valid escape in HTML, but it could be part of the attribute value and would break the generated code
+    if (!str.includes('\\') && (useTemplateLiteral || !str.includes('\n'))) {
+        return null;
+    }
+    return JSON.stringify(str).slice(1, -1);
+}
 
 /**
  * This needs to be called on the way out, not on the way on, when walking,
@@ -5906,7 +5912,7 @@ function upsertKitRouteFile(ts, basename, getSource, surround) {
     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, isTsFile, name, `import('./$types.js').RequestEvent`, `Response | Promise<Response>`);
+        addTypeToFunction(ts, exports, surround, insert, isTsFile, name, `import('./$types.js').RequestEvent`, `Response | Promise<Response>`, `Promise<Response>`);
     };
     insertApiMethod('GET');
     insertApiMethod('PUT');
@@ -6000,7 +6006,8 @@ function addTypeToVariable(exports, surround, insert, isTsFile, name, type) {
         }
     }
 }
-function addTypeToFunction(ts, exports, surround, insert, isTsFile, name, type, returnType) {
+function addTypeToFunction(ts, exports, surround, insert, isTsFile, name, type, returnType, asyncReturnType) {
+    var _a, _b;
     const fn = exports.get(name);
     if ((fn === null || fn === void 0 ? void 0 : fn.type) === 'function' && fn.node.parameters.length === 1 && !fn.hasTypeDefinition) {
         if (isTsFile) {
@@ -6008,10 +6015,12 @@ function addTypeToFunction(ts, exports, surround, insert, isTsFile, name, type,
             const paramInsertion = surround(!returnType ? `: Parameters<${type}>[0]` : `: ${type}`);
             insert(paramPos, paramInsertion);
             if (!fn.node.type && fn.node.body) {
+                const isAsync = (_b = (_a = fn.node.modifiers) === null || _a === void 0 ? void 0 : _a.some((m) => m.kind === ts.SyntaxKind.AsyncKeyword)) !== null && _b !== void 0 ? _b : false;
+                const effectiveReturnType = isAsync && asyncReturnType ? asyncReturnType : returnType;
                 const returnPos = ts.isArrowFunction(fn.node)
                     ? fn.node.equalsGreaterThanToken.getStart()
                     : fn.node.body.getStart();
-                const returnInsertion = surround(!returnType ? `: ReturnType<${type}> ` : `: ${returnType} `);
+                const returnInsertion = surround(!effectiveReturnType ? `: ReturnType<${type}> ` : `: ${effectiveReturnType} `);
                 insert(returnPos, returnInsertion);
             }
         }

package/index.mjs

@@ -2790,12 +2790,9 @@ function handleAttribute(str, attr, parent, preserveCase, svelte5Plus, element)
             if (!needsNumberConversion) {
                 attributeValue.push(quote);
             }
-            if (includesTemplateLiteralQuote && attrVal.data.split('\n').length > 1) {
-                // Multiline attribute value text which can't be wrapped in a template literal
-                // -> ensure it's still a valid transformation by transforming the actual line break
-                str.overwrite(attrVal.start, attrVal.end, attrVal.data.split('\n').join('\\n'), {
-                    contentOnly: true
-                });
+            const escapedValue = tryEscapeAttributeValue(attrVal.data, !includesTemplateLiteralQuote);
+            if (escapedValue !== null) {
+                str.overwrite(attrVal.start, attrVal.end, escapedValue, { contentOnly: true });
             }
             attributeValue.push([attrVal.start, attrVal.end]);
             if (!needsNumberConversion) {
@@ -2829,6 +2826,15 @@ function handleAttribute(str, attr, parent, preserveCase, svelte5Plus, element)
 function attributeValueIsOfType(value, type) {
     return value !== true && value.length == 1 && value[0].type == type;
 }
+function tryEscapeAttributeValue(str, useTemplateLiteral) {
+    // Multiline attribute value text which can't be wrapped in a template literal
+    // -> ensure it's still a valid transformation by transforming the actual line break
+    // \ is not a valid escape in HTML, but it could be part of the attribute value and would break the generated code
+    if (!str.includes('\\') && (useTemplateLiteral || !str.includes('\n'))) {
+        return null;
+    }
+    return JSON.stringify(str).slice(1, -1);
+}
 
 /**
  * This needs to be called on the way out, not on the way on, when walking,
@@ -5886,7 +5892,7 @@ function upsertKitRouteFile(ts, basename, getSource, surround) {
     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, isTsFile, name, `import('./$types.js').RequestEvent`, `Response | Promise<Response>`);
+        addTypeToFunction(ts, exports, surround, insert, isTsFile, name, `import('./$types.js').RequestEvent`, `Response | Promise<Response>`, `Promise<Response>`);
     };
     insertApiMethod('GET');
     insertApiMethod('PUT');
@@ -5980,7 +5986,8 @@ function addTypeToVariable(exports, surround, insert, isTsFile, name, type) {
         }
     }
 }
-function addTypeToFunction(ts, exports, surround, insert, isTsFile, name, type, returnType) {
+function addTypeToFunction(ts, exports, surround, insert, isTsFile, name, type, returnType, asyncReturnType) {
+    var _a, _b;
     const fn = exports.get(name);
     if ((fn === null || fn === void 0 ? void 0 : fn.type) === 'function' && fn.node.parameters.length === 1 && !fn.hasTypeDefinition) {
         if (isTsFile) {
@@ -5988,10 +5995,12 @@ function addTypeToFunction(ts, exports, surround, insert, isTsFile, name, type,
             const paramInsertion = surround(!returnType ? `: Parameters<${type}>[0]` : `: ${type}`);
             insert(paramPos, paramInsertion);
             if (!fn.node.type && fn.node.body) {
+                const isAsync = (_b = (_a = fn.node.modifiers) === null || _a === void 0 ? void 0 : _a.some((m) => m.kind === ts.SyntaxKind.AsyncKeyword)) !== null && _b !== void 0 ? _b : false;
+                const effectiveReturnType = isAsync && asyncReturnType ? asyncReturnType : returnType;
                 const returnPos = ts.isArrowFunction(fn.node)
                     ? fn.node.equalsGreaterThanToken.getStart()
                     : fn.node.body.getStart();
-                const returnInsertion = surround(!returnType ? `: ReturnType<${type}> ` : `: ${returnType} `);
+                const returnInsertion = surround(!effectiveReturnType ? `: ReturnType<${type}> ` : `: ${effectiveReturnType} `);
                 insert(returnPos, returnInsertion);
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte2tsx",
-  "version": "0.7.51",
+  "version": "0.7.53",
   "description": "Convert Svelte components to TSX for type checking",
   "author": "The Svelte Community",
   "license": "MIT",
@@ -29,7 +29,6 @@
     "@types/node": "^18.0.0",
     "@types/unist": "^2.0.3",
     "@types/vfile": "^3.0.2",
-    "builtin-modules": "^3.3.0",
     "estree-walker": "^2.0.1",
     "magic-string": "^0.30.11",
     "mocha": "^9.2.0",