svelte2tsx 0.7.41 → 0.7.43

package/index.js

@@ -2183,6 +2183,16 @@ class Element {
             transform(this.str, endStart, this.node.end, this.endTransformation);
         }
     }
+    isCustomElement() {
+        var _a, _b, _c;
+        if (this.tagName.includes('-')) {
+            return true;
+        }
+        if ((_c = (_b = (_a = this.node.attributes) === null || _a === void 0 ? void 0 : _a.find((a) => a.name === 'is')) === null || _b === void 0 ? void 0 : _b.value[0]) === null || _c === void 0 ? void 0 : _c.data.includes('-')) {
+            return true;
+        }
+        return false;
+    }
     getStartTransformation() {
         var _a, _b;
         const createElement = `${this.typingsNamespace}.createElement`;
@@ -2603,7 +2613,7 @@ function handleAttribute(str, attr, parent, preserveCase, svelte5Plus, element)
     const transformAttributeCase = (name) => {
         if (!preserveCase &&
             !svgAttributes.find((x) => x == name) &&
-            !(element instanceof Element && element.tagName.includes('-')) &&
+            !(element instanceof Element && element.isCustomElement()) &&
             !(svelte5Plus && name.startsWith('on'))) {
             return name.toLowerCase();
         }
@@ -3187,6 +3197,13 @@ function handleMustacheTag(str, node, parent) {
         // handled inside Attribute.ts / StyleDirective.ts
         return;
     }
+    const text = str.original.slice(node.start + 1, node.end - 1);
+    if (text.trimStart().startsWith('{')) {
+        // possibly an object literal, wrapping it in parentheses so it's treated as an expression
+        str.overwrite(node.start, node.start + 1, ';(', { contentOnly: true });
+        str.overwrite(node.end - 1, node.end, ');', { contentOnly: true });
+        return;
+    }
     str.overwrite(node.start, node.start + 1, '', { contentOnly: true });
     str.overwrite(node.end - 1, node.end, ';', { contentOnly: true });
 }
@@ -5072,7 +5089,6 @@ function convertHtmlxToJsx(str, ast, tags, options = { svelte5Plus: false }) {
                     case 'Title':
                     case 'Document':
                     case 'Body':
-                    case 'SvelteHTML':
                     case 'SvelteBoundary':
                     case 'Slot':
                     case 'SlotTemplate':
@@ -5201,7 +5217,6 @@ function convertHtmlxToJsx(str, ast, tags, options = { svelte5Plus: false }) {
                     case 'Head':
                     case 'Title':
                     case 'Body':
-                    case 'SvelteHTML':
                     case 'SvelteBoundary':
                     case 'Document':
                     case 'Slot':
@@ -8162,9 +8177,11 @@ function loadTsconfig(config, svelteMap) {
         options: {
             ...options,
             noEmit: false, // Set to true in case of jsconfig, force false, else nothing is emitted
-            moduleResolution: 
-            // NodeJS: up to 4.9, Node10: since 5.0
-            (_a = ts.ModuleResolutionKind.NodeJs) !== null && _a !== void 0 ? _a : ts.ModuleResolutionKind.Node10, // Classic if not set, which gives wrong results
+            moduleResolution: options.moduleResolution &&
+                options.moduleResolution !== ts.ModuleResolutionKind.Classic
+                ? options.moduleResolution
+                : // NodeJS: up to 4.9, Node10: since 5.0
+                    ((_a = ts.ModuleResolutionKind.NodeJs) !== null && _a !== void 0 ? _a : ts.ModuleResolutionKind.Node10), // Classic if not set, which gives wrong results
             declaration: true, // Needed for d.ts file generation
             emitDeclarationOnly: true, // We only want d.ts file generation
             declarationDir: config.declarationDir, // Where to put the declarations

package/index.mjs

@@ -2163,6 +2163,16 @@ class Element {
             transform(this.str, endStart, this.node.end, this.endTransformation);
         }
     }
+    isCustomElement() {
+        var _a, _b, _c;
+        if (this.tagName.includes('-')) {
+            return true;
+        }
+        if ((_c = (_b = (_a = this.node.attributes) === null || _a === void 0 ? void 0 : _a.find((a) => a.name === 'is')) === null || _b === void 0 ? void 0 : _b.value[0]) === null || _c === void 0 ? void 0 : _c.data.includes('-')) {
+            return true;
+        }
+        return false;
+    }
     getStartTransformation() {
         var _a, _b;
         const createElement = `${this.typingsNamespace}.createElement`;
@@ -2583,7 +2593,7 @@ function handleAttribute(str, attr, parent, preserveCase, svelte5Plus, element)
     const transformAttributeCase = (name) => {
         if (!preserveCase &&
             !svgAttributes.find((x) => x == name) &&
-            !(element instanceof Element && element.tagName.includes('-')) &&
+            !(element instanceof Element && element.isCustomElement()) &&
             !(svelte5Plus && name.startsWith('on'))) {
             return name.toLowerCase();
         }
@@ -3167,6 +3177,13 @@ function handleMustacheTag(str, node, parent) {
         // handled inside Attribute.ts / StyleDirective.ts
         return;
     }
+    const text = str.original.slice(node.start + 1, node.end - 1);
+    if (text.trimStart().startsWith('{')) {
+        // possibly an object literal, wrapping it in parentheses so it's treated as an expression
+        str.overwrite(node.start, node.start + 1, ';(', { contentOnly: true });
+        str.overwrite(node.end - 1, node.end, ');', { contentOnly: true });
+        return;
+    }
     str.overwrite(node.start, node.start + 1, '', { contentOnly: true });
     str.overwrite(node.end - 1, node.end, ';', { contentOnly: true });
 }
@@ -5052,7 +5069,6 @@ function convertHtmlxToJsx(str, ast, tags, options = { svelte5Plus: false }) {
                     case 'Title':
                     case 'Document':
                     case 'Body':
-                    case 'SvelteHTML':
                     case 'SvelteBoundary':
                     case 'Slot':
                     case 'SlotTemplate':
@@ -5181,7 +5197,6 @@ function convertHtmlxToJsx(str, ast, tags, options = { svelte5Plus: false }) {
                     case 'Head':
                     case 'Title':
                     case 'Body':
-                    case 'SvelteHTML':
                     case 'SvelteBoundary':
                     case 'Document':
                     case 'Slot':
@@ -8142,9 +8157,11 @@ function loadTsconfig(config, svelteMap) {
         options: {
             ...options,
             noEmit: false, // Set to true in case of jsconfig, force false, else nothing is emitted
-            moduleResolution: 
-            // NodeJS: up to 4.9, Node10: since 5.0
-            (_a = ts.ModuleResolutionKind.NodeJs) !== null && _a !== void 0 ? _a : ts.ModuleResolutionKind.Node10, // Classic if not set, which gives wrong results
+            moduleResolution: options.moduleResolution &&
+                options.moduleResolution !== ts.ModuleResolutionKind.Classic
+                ? options.moduleResolution
+                : // NodeJS: up to 4.9, Node10: since 5.0
+                    ((_a = ts.ModuleResolutionKind.NodeJs) !== null && _a !== void 0 ? _a : ts.ModuleResolutionKind.Node10), // Classic if not set, which gives wrong results
             declaration: true, // Needed for d.ts file generation
             emitDeclarationOnly: true, // We only want d.ts file generation
             declarationDir: config.declarationDir, // Where to put the declarations

package/package.json

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