svelte2tsx 0.7.9 → 0.7.11

package/index.js

@@ -1480,8 +1480,8 @@ function parseAttributes(str, start) {
     return attrs;
 }
 // Regex ensures that attributes with > characters in them still result in the content being matched correctly
-const scriptRegex = /(<!--[^]*?-->)|(<script((?:\s+[^=>'"\/]+=(?:"[^"]*"|'[^']*'|[^>\s]+)|\s+[^=>'"\/]+)*\s*)>)([\S\s]*?)<\/script>/g;
-const styleRegex = /(<!--[^]*?-->)|(<style((?:\s+[^=>'"\/]+=(?:"[^"]*"|'[^']*'|[^>\s]+)|\s+[^=>'"\/]+)*\s*)>)([\S\s]*?)<\/style>/g;
+const scriptRegex = /(<!--[^]*?-->)|(<script((?:\s+[^=>'"\/\s]+=(?:"[^"]*"|'[^']*'|[^>\s]+)|\s+[^=>'"\/\s]+)*\s*)>)([\S\s]*?)<\/script>/g;
+const styleRegex = /(<!--[^]*?-->)|(<style((?:\s+[^=>'"\/\s]+=(?:"[^"]*"|'[^']*'|[^>\s]+)|\s+[^=>'"\/\s]+)*\s*)>)([\S\s]*?)<\/style>/g;
 function extractTag(htmlx, tag) {
     const exp = tag === 'script' ? scriptRegex : styleRegex;
     const matches = [];
@@ -3092,22 +3092,21 @@ function handleTransitionDirective(str, attr, element) {
  * ```
  */
 function handleSnippet(str, snippetBlock, component) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     const isImplicitProp = component !== undefined;
     const endSnippet = str.original.lastIndexOf('{', snippetBlock.end - 1);
     // Return something to silence the "snippet type not assignable to return type void" error
     str.overwrite(endSnippet, snippetBlock.end, `};return __sveltets_2_any(0)}${isImplicitProp ? '' : ';'}`, {
         contentOnly: true
     });
-    const startEnd = str.original.indexOf('}', 
-    // context was the first iteration in a .next release, remove at some point
-    ((_b = (_a = snippetBlock.parameters) === null || _a === void 0 ? void 0 : _a.at(-1)) === null || _b === void 0 ? void 0 : _b.end) || snippetBlock.expression.end) + 1;
+    const lastParameter = (_a = snippetBlock.parameters) === null || _a === void 0 ? void 0 : _a.at(-1);
+    const startEnd = str.original.indexOf('}', (_d = (_c = (_b = lastParameter === null || lastParameter === void 0 ? void 0 : lastParameter.typeAnnotation) === null || _b === void 0 ? void 0 : _b.end) !== null && _c !== void 0 ? _c : lastParameter === null || lastParameter === void 0 ? void 0 : lastParameter.end) !== null && _d !== void 0 ? _d : snippetBlock.expression.end) + 1;
     if (isImplicitProp) {
         str.overwrite(snippetBlock.start, snippetBlock.expression.start, '', { contentOnly: true });
         const transforms = ['('];
-        if ((_c = snippetBlock.parameters) === null || _c === void 0 ? void 0 : _c.length) {
-            const start = (_d = snippetBlock.parameters) === null || _d === void 0 ? void 0 : _d[0].start;
-            const end = snippetBlock.parameters.at(-1).end;
+        if ((_e = snippetBlock.parameters) === null || _e === void 0 ? void 0 : _e.length) {
+            const start = snippetBlock.parameters[0].start;
+            const end = (_g = (_f = lastParameter.typeAnnotation) === null || _f === void 0 ? void 0 : _f.end) !== null && _g !== void 0 ? _g : lastParameter.end;
             transforms.push([start, end]);
             str.overwrite(snippetBlock.expression.end, start, '', {
                 contentOnly: true
@@ -3123,14 +3122,26 @@ function handleSnippet(str, snippetBlock, component) {
     }
     else {
         let generic = '';
-        if ((_e = snippetBlock.parameters) === null || _e === void 0 ? void 0 : _e.length) {
+        if ((_h = snippetBlock.parameters) === null || _h === void 0 ? void 0 : _h.length) {
             generic = `<[${snippetBlock.parameters
                 .map((p) => {
-                var _a;
-                return ((_a = p.typeAnnotation) === null || _a === void 0 ? void 0 : _a.typeAnnotation)
-                    ? str.original.slice(p.typeAnnotation.typeAnnotation.start, p.typeAnnotation.typeAnnotation.end)
-                    : // slap any on to it to silence "implicit any" errors; JSDoc people can't add types to snippets
-                        'any';
+                var _a, _b;
+                let typeAnnotation = p.typeAnnotation;
+                if (!typeAnnotation && p.type === 'AssignmentPattern') {
+                    typeAnnotation = (_a = p.left) === null || _a === void 0 ? void 0 : _a.typeAnnotation;
+                    if (!typeAnnotation) {
+                        typeAnnotation = (_b = p.right) === null || _b === void 0 ? void 0 : _b.typeAnnotation;
+                    }
+                }
+                // fall back to `any` to silence "implicit any" errors; JSDoc people can't add types to snippets
+                let type = 'any';
+                if (typeAnnotation === null || typeAnnotation === void 0 ? void 0 : typeAnnotation.typeAnnotation) {
+                    type = str.original.slice(typeAnnotation.typeAnnotation.start, typeAnnotation.typeAnnotation.end);
+                }
+                if (p.optional || p.type === 'AssignmentPattern') {
+                    type += '?';
+                }
+                return type;
             })
                 .join(', ')}]>`;
         }
@@ -3140,9 +3151,9 @@ function handleSnippet(str, snippetBlock, component) {
             [snippetBlock.expression.start, snippetBlock.expression.end],
             typeAnnotation + ' = ('
         ];
-        if ((_f = snippetBlock.parameters) === null || _f === void 0 ? void 0 : _f.length) {
+        if ((_j = snippetBlock.parameters) === null || _j === void 0 ? void 0 : _j.length) {
             const start = snippetBlock.parameters[0].start;
-            const end = snippetBlock.parameters.at(-1).end;
+            const end = (_l = (_k = lastParameter.typeAnnotation) === null || _k === void 0 ? void 0 : _k.end) !== null && _l !== void 0 ? _l : lastParameter.end;
             transforms.push([start, end]);
         }
         transforms.push(') => {async () => {'); // inner async function for potential #await blocks

package/index.mjs

@@ -1460,8 +1460,8 @@ function parseAttributes(str, start) {
     return attrs;
 }
 // Regex ensures that attributes with > characters in them still result in the content being matched correctly
-const scriptRegex = /(<!--[^]*?-->)|(<script((?:\s+[^=>'"\/]+=(?:"[^"]*"|'[^']*'|[^>\s]+)|\s+[^=>'"\/]+)*\s*)>)([\S\s]*?)<\/script>/g;
-const styleRegex = /(<!--[^]*?-->)|(<style((?:\s+[^=>'"\/]+=(?:"[^"]*"|'[^']*'|[^>\s]+)|\s+[^=>'"\/]+)*\s*)>)([\S\s]*?)<\/style>/g;
+const scriptRegex = /(<!--[^]*?-->)|(<script((?:\s+[^=>'"\/\s]+=(?:"[^"]*"|'[^']*'|[^>\s]+)|\s+[^=>'"\/\s]+)*\s*)>)([\S\s]*?)<\/script>/g;
+const styleRegex = /(<!--[^]*?-->)|(<style((?:\s+[^=>'"\/\s]+=(?:"[^"]*"|'[^']*'|[^>\s]+)|\s+[^=>'"\/\s]+)*\s*)>)([\S\s]*?)<\/style>/g;
 function extractTag(htmlx, tag) {
     const exp = tag === 'script' ? scriptRegex : styleRegex;
     const matches = [];
@@ -3072,22 +3072,21 @@ function handleTransitionDirective(str, attr, element) {
  * ```
  */
 function handleSnippet(str, snippetBlock, component) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     const isImplicitProp = component !== undefined;
     const endSnippet = str.original.lastIndexOf('{', snippetBlock.end - 1);
     // Return something to silence the "snippet type not assignable to return type void" error
     str.overwrite(endSnippet, snippetBlock.end, `};return __sveltets_2_any(0)}${isImplicitProp ? '' : ';'}`, {
         contentOnly: true
     });
-    const startEnd = str.original.indexOf('}', 
-    // context was the first iteration in a .next release, remove at some point
-    ((_b = (_a = snippetBlock.parameters) === null || _a === void 0 ? void 0 : _a.at(-1)) === null || _b === void 0 ? void 0 : _b.end) || snippetBlock.expression.end) + 1;
+    const lastParameter = (_a = snippetBlock.parameters) === null || _a === void 0 ? void 0 : _a.at(-1);
+    const startEnd = str.original.indexOf('}', (_d = (_c = (_b = lastParameter === null || lastParameter === void 0 ? void 0 : lastParameter.typeAnnotation) === null || _b === void 0 ? void 0 : _b.end) !== null && _c !== void 0 ? _c : lastParameter === null || lastParameter === void 0 ? void 0 : lastParameter.end) !== null && _d !== void 0 ? _d : snippetBlock.expression.end) + 1;
     if (isImplicitProp) {
         str.overwrite(snippetBlock.start, snippetBlock.expression.start, '', { contentOnly: true });
         const transforms = ['('];
-        if ((_c = snippetBlock.parameters) === null || _c === void 0 ? void 0 : _c.length) {
-            const start = (_d = snippetBlock.parameters) === null || _d === void 0 ? void 0 : _d[0].start;
-            const end = snippetBlock.parameters.at(-1).end;
+        if ((_e = snippetBlock.parameters) === null || _e === void 0 ? void 0 : _e.length) {
+            const start = snippetBlock.parameters[0].start;
+            const end = (_g = (_f = lastParameter.typeAnnotation) === null || _f === void 0 ? void 0 : _f.end) !== null && _g !== void 0 ? _g : lastParameter.end;
             transforms.push([start, end]);
             str.overwrite(snippetBlock.expression.end, start, '', {
                 contentOnly: true
@@ -3103,14 +3102,26 @@ function handleSnippet(str, snippetBlock, component) {
     }
     else {
         let generic = '';
-        if ((_e = snippetBlock.parameters) === null || _e === void 0 ? void 0 : _e.length) {
+        if ((_h = snippetBlock.parameters) === null || _h === void 0 ? void 0 : _h.length) {
             generic = `<[${snippetBlock.parameters
                 .map((p) => {
-                var _a;
-                return ((_a = p.typeAnnotation) === null || _a === void 0 ? void 0 : _a.typeAnnotation)
-                    ? str.original.slice(p.typeAnnotation.typeAnnotation.start, p.typeAnnotation.typeAnnotation.end)
-                    : // slap any on to it to silence "implicit any" errors; JSDoc people can't add types to snippets
-                        'any';
+                var _a, _b;
+                let typeAnnotation = p.typeAnnotation;
+                if (!typeAnnotation && p.type === 'AssignmentPattern') {
+                    typeAnnotation = (_a = p.left) === null || _a === void 0 ? void 0 : _a.typeAnnotation;
+                    if (!typeAnnotation) {
+                        typeAnnotation = (_b = p.right) === null || _b === void 0 ? void 0 : _b.typeAnnotation;
+                    }
+                }
+                // fall back to `any` to silence "implicit any" errors; JSDoc people can't add types to snippets
+                let type = 'any';
+                if (typeAnnotation === null || typeAnnotation === void 0 ? void 0 : typeAnnotation.typeAnnotation) {
+                    type = str.original.slice(typeAnnotation.typeAnnotation.start, typeAnnotation.typeAnnotation.end);
+                }
+                if (p.optional || p.type === 'AssignmentPattern') {
+                    type += '?';
+                }
+                return type;
             })
                 .join(', ')}]>`;
         }
@@ -3120,9 +3131,9 @@ function handleSnippet(str, snippetBlock, component) {
             [snippetBlock.expression.start, snippetBlock.expression.end],
             typeAnnotation + ' = ('
         ];
-        if ((_f = snippetBlock.parameters) === null || _f === void 0 ? void 0 : _f.length) {
+        if ((_j = snippetBlock.parameters) === null || _j === void 0 ? void 0 : _j.length) {
             const start = snippetBlock.parameters[0].start;
-            const end = snippetBlock.parameters.at(-1).end;
+            const end = (_l = (_k = lastParameter.typeAnnotation) === null || _k === void 0 ? void 0 : _k.end) !== null && _l !== void 0 ? _l : lastParameter.end;
             transforms.push([start, end]);
         }
         transforms.push(') => {async () => {'); // inner async function for potential #await blocks

package/package.json

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