svelte2tsx 0.7.27 → 0.7.29

package/index.js

@@ -6178,15 +6178,20 @@ class HoistableInterfaces {
         if (hoistable.has(this.props_interface.name)) {
             for (const [name, node] of hoistable) {
                 let pos = node.pos + astOffset;
-                // node.pos includes preceeding whitespace, which could mean we accidentally also move stuff appended to a previous node
-                if (name !== '$$ComponentProps') {
+                if (name === '$$ComponentProps') {
+                    // So that organize imports doesn't mess with the types
+                    str.prependRight(pos, '\n');
+                }
+                else {
+                    // node.pos includes preceeding whitespace, which could mean we accidentally also move stuff appended to a previous node
                     if (str.original[pos] === '\r') {
                         pos++;
                     }
                     if (/\s/.test(str.original[pos])) {
                         pos++;
                     }
-                    // jsdoc comments would be ignored if they are on the same line as the ;, so we add a newline, too
+                    // jsdoc comments would be ignored if they are on the same line as the ;, so we add a newline, too.
+                    // Also helps with organize imports not messing with the types
                     str.prependRight(pos, ';\n');
                     str.appendLeft(node.end + astOffset, ';');
                 }
@@ -7265,9 +7270,8 @@ function handleImportDeclaration(node, str, astOffset, scriptStart, sourceFile)
  */
 function handleFirstInstanceImport(tsAst, astOffset, hasModuleScript, str) {
     var _a;
-    const firstImport = tsAst.statements
-        .filter(ts.isImportDeclaration)
-        .sort((a, b) => a.end - b.end)[0];
+    const imports = tsAst.statements.filter(ts.isImportDeclaration).sort((a, b) => a.end - b.end);
+    const firstImport = imports[0];
     if (!firstImport) {
         return;
     }
@@ -7276,6 +7280,13 @@ function handleFirstInstanceImport(tsAst, astOffset, hasModuleScript, str) {
         ? firstComment.pos + firstImport.getFullStart()
         : firstImport.getStart();
     str.appendRight(start + astOffset, '\n' + (hasModuleScript ? '\n' : ''));
+    // Add a semi-colon to the last import if it doesn't have one, to prevent auto completion
+    // and imports from being added at the wrong position
+    const lastImport = imports[imports.length - 1];
+    const end = lastImport.end + astOffset - 1;
+    if (str.original[end] !== ';') {
+        str.overwrite(end, lastImport.end + astOffset, str.original[end] + ';\n');
+    }
 }
 
 function flatten(arr) {

package/index.mjs

@@ -6158,15 +6158,20 @@ class HoistableInterfaces {
         if (hoistable.has(this.props_interface.name)) {
             for (const [name, node] of hoistable) {
                 let pos = node.pos + astOffset;
-                // node.pos includes preceeding whitespace, which could mean we accidentally also move stuff appended to a previous node
-                if (name !== '$$ComponentProps') {
+                if (name === '$$ComponentProps') {
+                    // So that organize imports doesn't mess with the types
+                    str.prependRight(pos, '\n');
+                }
+                else {
+                    // node.pos includes preceeding whitespace, which could mean we accidentally also move stuff appended to a previous node
                     if (str.original[pos] === '\r') {
                         pos++;
                     }
                     if (/\s/.test(str.original[pos])) {
                         pos++;
                     }
-                    // jsdoc comments would be ignored if they are on the same line as the ;, so we add a newline, too
+                    // jsdoc comments would be ignored if they are on the same line as the ;, so we add a newline, too.
+                    // Also helps with organize imports not messing with the types
                     str.prependRight(pos, ';\n');
                     str.appendLeft(node.end + astOffset, ';');
                 }
@@ -7245,9 +7250,8 @@ function handleImportDeclaration(node, str, astOffset, scriptStart, sourceFile)
  */
 function handleFirstInstanceImport(tsAst, astOffset, hasModuleScript, str) {
     var _a;
-    const firstImport = tsAst.statements
-        .filter(ts.isImportDeclaration)
-        .sort((a, b) => a.end - b.end)[0];
+    const imports = tsAst.statements.filter(ts.isImportDeclaration).sort((a, b) => a.end - b.end);
+    const firstImport = imports[0];
     if (!firstImport) {
         return;
     }
@@ -7256,6 +7260,13 @@ function handleFirstInstanceImport(tsAst, astOffset, hasModuleScript, str) {
         ? firstComment.pos + firstImport.getFullStart()
         : firstImport.getStart();
     str.appendRight(start + astOffset, '\n' + (hasModuleScript ? '\n' : ''));
+    // Add a semi-colon to the last import if it doesn't have one, to prevent auto completion
+    // and imports from being added at the wrong position
+    const lastImport = imports[imports.length - 1];
+    const end = lastImport.end + astOffset - 1;
+    if (str.original[end] !== ';') {
+        str.overwrite(end, lastImport.end + astOffset, str.original[end] + ';\n');
+    }
 }
 
 function flatten(arr) {

package/package.json

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