svelte2tsx 0.6.20 → 0.6.22

package/index.js

@@ -1315,7 +1315,16 @@ function extractTag(htmlx, tag) {
     return matches;
 }
 function findVerbatimElements(htmlx) {
-    return [...extractTag(htmlx, 'script'), ...extractTag(htmlx, 'style')];
+    const styleTags = extractTag(htmlx, 'style');
+    const tags = extractTag(htmlx, 'script');
+    for (const styleTag of styleTags) {
+        // Could happen if someone has a `<style>...</style>` string in their script tag
+        const insideScript = tags.some((tag) => tag.start < styleTag.start && tag.end > styleTag.end);
+        if (!insideScript) {
+            tags.push(styleTag);
+        }
+    }
+    return tags;
 }
 function blankVerbatimContent(htmlx, verbatimElements) {
     let output = htmlx;
@@ -3752,6 +3761,7 @@ function upserKitRouteFile(ts, basename, getSource, surround) {
     insertApiMethod('DELETE');
     insertApiMethod('OPTIONS');
     insertApiMethod('HEAD');
+    insertApiMethod('fallback');
     return { addedCode, originalText: source.getFullText() };
 }
 function upserKitParamsFile(ts, fileName, basename, paramsPath, getSource, surround) {
@@ -4233,17 +4243,16 @@ class ExportedNames {
             // - The check if exports are assignable to $$Props is not done because a component should be allowed
             //   to use less props than defined (it just ignores them)
             // - __sveltets_2_ensureRightProps needs to be declared in a way that doesn't affect the type result of props
-            return ('{...__sveltets_2_ensureRightProps<{' +
+            return ('{ ...__sveltets_2_ensureRightProps<{' +
                 this.createReturnElementsType(lets).join(',') +
-                '}>(__sveltets_2_any("") as $$Props), ' +
-                '...{} as unknown as $$Props, ...{' +
+                '}>(__sveltets_2_any("") as $$Props)} as ' +
                 // We add other exports of classes and functions here because
                 // they need to appear in the props object in order to properly
                 // type bind:xx but they are not needed to be part of $$Props
-                this.createReturnElements(others, false).join(', ') +
-                '} as {' +
-                this.createReturnElementsType(others).join(',') +
-                '}}');
+                (others.length
+                    ? '{' + this.createReturnElementsType(others).join(',') + '} & '
+                    : '') +
+                '$$Props');
         }
         if (names.length === 0 && !uses$$propsOr$$restProps) {
             // Necessary, because {} roughly equals to any

package/index.mjs

@@ -1295,7 +1295,16 @@ function extractTag(htmlx, tag) {
     return matches;
 }
 function findVerbatimElements(htmlx) {
-    return [...extractTag(htmlx, 'script'), ...extractTag(htmlx, 'style')];
+    const styleTags = extractTag(htmlx, 'style');
+    const tags = extractTag(htmlx, 'script');
+    for (const styleTag of styleTags) {
+        // Could happen if someone has a `<style>...</style>` string in their script tag
+        const insideScript = tags.some((tag) => tag.start < styleTag.start && tag.end > styleTag.end);
+        if (!insideScript) {
+            tags.push(styleTag);
+        }
+    }
+    return tags;
 }
 function blankVerbatimContent(htmlx, verbatimElements) {
     let output = htmlx;
@@ -3732,6 +3741,7 @@ function upserKitRouteFile(ts, basename, getSource, surround) {
     insertApiMethod('DELETE');
     insertApiMethod('OPTIONS');
     insertApiMethod('HEAD');
+    insertApiMethod('fallback');
     return { addedCode, originalText: source.getFullText() };
 }
 function upserKitParamsFile(ts, fileName, basename, paramsPath, getSource, surround) {
@@ -4213,17 +4223,16 @@ class ExportedNames {
             // - The check if exports are assignable to $$Props is not done because a component should be allowed
             //   to use less props than defined (it just ignores them)
             // - __sveltets_2_ensureRightProps needs to be declared in a way that doesn't affect the type result of props
-            return ('{...__sveltets_2_ensureRightProps<{' +
+            return ('{ ...__sveltets_2_ensureRightProps<{' +
                 this.createReturnElementsType(lets).join(',') +
-                '}>(__sveltets_2_any("") as $$Props), ' +
-                '...{} as unknown as $$Props, ...{' +
+                '}>(__sveltets_2_any("") as $$Props)} as ' +
                 // We add other exports of classes and functions here because
                 // they need to appear in the props object in order to properly
                 // type bind:xx but they are not needed to be part of $$Props
-                this.createReturnElements(others, false).join(', ') +
-                '} as {' +
-                this.createReturnElementsType(others).join(',') +
-                '}}');
+                (others.length
+                    ? '{' + this.createReturnElementsType(others).join(',') + '} & '
+                    : '') +
+                '$$Props');
         }
         if (names.length === 0 && !uses$$propsOr$$restProps) {
             // Necessary, because {} roughly equals to any

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte2tsx",
-  "version": "0.6.20",
+  "version": "0.6.22",
   "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.1.3"
+    "typescript": "^5.2.2"
   },
   "peerDependencies": {
     "svelte": "^3.55 || ^4.0.0-next.0 || ^4.0",