sveld 0.25.3 → 0.25.5

package/README.md

@@ -332,21 +332,13 @@ export let kind = "primary";
 // inferred type: "string"
 ```
 
-For template literal default values, `sveld` automatically infers [template literal types](https://www.typescriptlang.org/docs/handbook/2/template-literal-types.html) when possible:
+For template literal default values, `sveld` infers the type as `string`:
 
 ```js
 export let id = `ccs-${Math.random().toString(36)}`;
-// inferred type: `ccs-${string}` & {}
-
-export let prefix = `prefix-`;
-// inferred type: `prefix-` & {}
-
-export let suffix = `-suffix`;
-// inferred type: `-suffix` & {}
+// inferred type: "string"
 ```
 
-The `& {}` intersection type makes the template literal type more permissive, allowing regular strings to be assigned while preserving the template literal type for better autocomplete and type hints. This provides more precise type checking than a generic `string` type while remaining flexible. For complex expressions in template literals, the type defaults to `string` for safety.
-
 Use the `@type` tag to explicitly document the type. In the following example, the `kind` property has an enumerated (enum) type.
 
 Signature:

package/lib/ComponentParser.d.ts

@@ -128,16 +128,6 @@ export default class ComponentParser {
      * (e.g., Number.POSITIVE_INFINITY, Math.PI, etc.)
      */
     private isNumericConstant;
-    /**
-     * Infers the TypeScript type for an expression in a template literal.
-     * Returns a type string that can be used in a template literal type.
-     */
-    private inferExpressionType;
-    /**
-     * Infers a template literal type from a TemplateLiteral AST node.
-     * Returns a TypeScript template literal type string like `prefix-${string}`.
-     */
-    private inferTemplateLiteralType;
     private sourceAtPos;
     private collectReactiveVars;
     private addProp;

package/lib/ComponentParser.js

@@ -131,119 +131,6 @@ class ComponentParser {
         }
         return false;
     }
-    /**
-     * Infers the TypeScript type for an expression in a template literal.
-     * Returns a type string that can be used in a template literal type.
-     */
-    inferExpressionType(expr) {
-        if (!expr || typeof expr !== "object" || !("type" in expr)) {
-            return "string";
-        }
-        /**
-         * @example `"hello"` → `"hello"`
-         * @example `42` → `42`
-         * @example `true` → `true`
-         */
-        if (expr.type === "Literal") {
-            if (typeof expr.value === "string") {
-                return `"${expr.value}"`;
-            }
-            if (typeof expr.value === "number") {
-                return `${expr.value}`;
-            }
-            if (typeof expr.value === "boolean") {
-                return `${expr.value}`;
-            }
-            return "string";
-        }
-        /**
-         * @example `someVar` → `string`
-         */
-        if (expr.type === "Identifier") {
-            // For variables, we can't know the exact type, so default to string
-            // Users can add explicit @type annotations if they need more precision
-            return "string";
-        }
-        /**
-         * @example `Math.PI` → `number`
-         * @example `Number.MAX_VALUE` → `number`
-         * @example `Math.random().toString` → `string`
-         */
-        if (expr.type === "MemberExpression") {
-            // Check if it's a well-known numeric constant
-            if (this.isNumericConstant(expr)) {
-                return "number";
-            }
-            // For other member expressions, default to string
-            // Common cases like Math.random().toString(36) will be string
-            return "string";
-        }
-        /**
-         * @example `Math.random().toString(36)` → `string`
-         * @example `someFunction()` → `string`
-         */
-        if (expr.type === "CallExpression") {
-            // Most call expressions in template literals return strings or numbers
-            // Default to string for safety
-            return "string";
-        }
-        /**
-         * @example `a + b` → `string`
-         * @example `x * y` → `string`
-         */
-        if (expr.type === "BinaryExpression") {
-            // For string concatenation or arithmetic, default to string
-            return "string";
-        }
-        return "string";
-    }
-    /**
-     * Infers a template literal type from a TemplateLiteral AST node.
-     * Returns a TypeScript template literal type string like `prefix-${string}`.
-     */
-    inferTemplateLiteralType(templateLiteral) {
-        if (!templateLiteral || typeof templateLiteral !== "object" || templateLiteral.type !== "TemplateLiteral") {
-            return "string";
-        }
-        const quasis = templateLiteral.quasis || [];
-        const expressions = templateLiteral.expressions || [];
-        // If there are no expressions, it's a static string
-        if (expressions.length === 0) {
-            if (quasis.length === 1) {
-                const staticValue = quasis[0].value?.cooked || quasis[0].value?.raw || "";
-                // Escape backticks and backslashes in the static string
-                const escaped = staticValue.replace(/\\/g, "\\\\").replace(/`/g, "\\`");
-                const templateLiteralType = `\`${escaped}\``;
-                // Use the (template-literal & {}) trick to make the type more permissive
-                return `(${templateLiteralType} & {})`;
-            }
-            return "string";
-        }
-        // Build the template literal type
-        const parts = [];
-        for (let i = 0; i < quasis.length; i++) {
-            const quasi = quasis[i];
-            const staticValue = quasi.value?.cooked || quasi.value?.raw || "";
-            // Escape backticks and backslashes in static parts
-            const escaped = staticValue.replace(/\\/g, "\\\\").replace(/`/g, "\\`");
-            if (escaped) {
-                parts.push(escaped);
-            }
-            // Add the expression type if there's a corresponding expression
-            if (i < expressions.length) {
-                const exprType = this.inferExpressionType(expressions[i]);
-                parts.push(`\${${exprType}}`);
-            }
-        }
-        // If we couldn't build a meaningful template literal type, fall back to string
-        if (parts.length === 0) {
-            return "string";
-        }
-        const templateLiteralType = `\`${parts.join("")}\``;
-        // Use the (template-literal & {}) trick to make the type more permissive
-        // This allows regular strings to be assigned while preserving template literal type for autocomplete
-        return `(${templateLiteralType} & {})`;
-    }
     sourceAtPos(start, end) {
         return this.source?.slice(start, end);
     }
@@ -949,9 +836,9 @@ class ComponentParser {
                                     // Otherwise, don't infer type, just preserve existing type annotation.
                                 }
                                 else if (init.type === "TemplateLiteral") {
-                                    // Handle template literals - infer template literal type when possible
+                                    // Handle template literals - they always evaluate to strings
                                     value = this.sourceAtPos(init.start, init.end);
-                                    type = this.inferTemplateLiteralType(init);
+                                    type = "string";
                                 }
                                 else {
                                     value = init.raw;
@@ -1142,9 +1029,9 @@ class ComponentParser {
                                 // Otherwise, don't infer type, just preserve existing type annotation.
                             }
                             else if (init.type === "TemplateLiteral") {
-                                // Handle template literals - infer template literal type when possible
+                                // Handle template literals - they always evaluate to strings
                                 value = this.sourceAtPos(init.start, init.end);
-                                type = this.inferTemplateLiteralType(init);
+                                type = "string";
                             }
                             else {
                                 value = init.raw;

package/lib/writer/writer-ts-definitions-core.js

@@ -68,6 +68,8 @@ function addCommentLine(value, returnValue) {
     return `* ${returnValue || value}\n`;
 }
 function genPropDef(def) {
+    // Collect existing prop names to avoid conflicts with snippet props
+    const existingPropNames = new Set(def.props.filter((prop) => !prop.isFunctionDeclaration && prop.kind !== "const").map((prop) => prop.name));
     const initial_props = def.props
         .filter((prop) => !prop.isFunctionDeclaration && prop.kind !== "const")
         .map((prop) => {
@@ -91,7 +93,18 @@ function genPropDef(def) {
       ${prop_comments.length > 0 ? `/**\n${prop_comments}*/` : EMPTY_STR}
       ${prop.name}${prop.isRequired ? "" : "?"}: ${prop_value};`;
     });
-    const props = initial_props.join("\n");
+    // Generate snippet props for named slots (Svelte 5 compatibility)
+    // Skip default slots and slots that conflict with existing prop names
+    const snippet_props = (def.slots || [])
+        .filter((slot) => !slot.default && slot.name != null && !existingPropNames.has(slot.name))
+        .map((slot) => {
+        const slotName = slot.name;
+        const key = clampKey(slotName);
+        const description = slot.description ? `/** ${slot.description} */\n      ` : "";
+        return `
+      ${description}${key}?: () => void;`;
+    });
+    const props = [...initial_props, ...snippet_props].join("\n");
     const props_name = `${def.moduleName}Props`;
     let prop_def = EMPTY_STR;
     const genericsName = def.generics ? `<${def.generics[0]}>` : "";
@@ -443,6 +456,7 @@ function writeTsDefinition(component) {
         rest_props,
         extends: _extends,
         generics,
+        slots,
     });
     const generic = generics ? `<${generics[1]}>` : "";
     const genericProps = generics ? `${props_name}<${generics[0]}>` : props_name;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sveld",
-  "version": "0.25.3",
+  "version": "0.25.5",
   "license": "Apache-2.0",
   "description": "Generate TypeScript definitions for your Svelte components.",
   "main": "./lib/index.js",