sveld 0.25.7 → 0.25.8

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

@@ -1,5 +1,5 @@
 import type { ComponentDocApi } from "../rollup-plugin";
 export declare function formatTsProps(props?: string): string;
 export declare function getTypeDefs(def: Pick<ComponentDocApi, "typedefs">): string;
-export declare function getContextDefs(def: Pick<ComponentDocApi, "contexts">): string;
+export declare function getContextDefs(def: Pick<ComponentDocApi, "contexts" | "generics">): string;
 export declare function writeTsDefinition(component: ComponentDocApi): string;

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

@@ -38,6 +38,10 @@ function getTypeDefs(def) {
 function getContextDefs(def) {
     if (!def.contexts || def.contexts.length === 0)
         return EMPTY_STR;
+    // Extract generic parameter for context types if generics are defined
+    // and the context properties reference the generic type
+    const genericsName = def.generics ? def.generics[0] : null;
+    const genericsType = def.generics ? def.generics[1] : null;
     return def.contexts
         .map((context) => {
         const props = context.properties
@@ -48,11 +52,15 @@ function getContextDefs(def) {
         })
             .join("\n  ");
         const contextComment = context.description ? `/**\n * ${context.description}\n */\n` : "";
+        // Check if any context property types reference the generic type name
+        const referencesGeneric = genericsName && context.properties.some((prop) => prop.type.includes(genericsName));
+        // Build the generic suffix for the context type if it references generics
+        const genericSuffix = referencesGeneric && genericsType ? `<${genericsType}>` : "";
         // Use Record<string, never> for empty context objects instead of {}
         if (context.properties.length === 0) {
             return `${contextComment}export type ${context.typeName} = Record<string, never>;`;
         }
-        return `${contextComment}export type ${context.typeName} = {\n  ${props}\n};`;
+        return `${contextComment}export type ${context.typeName}${genericSuffix} = {\n  ${props}\n};`;
     })
         .join("\n\n");
 }
@@ -487,7 +495,7 @@ function writeTsDefinition(component) {
   ${genImports({ extends: _extends })}
   ${genModuleExports({ moduleExports })}
   ${getTypeDefs({ typedefs })}
-  ${getContextDefs({ contexts })}
+  ${contexts && contexts.length > 0 ? "\n" : ""}${getContextDefs({ contexts, generics })}
   ${prop_def}
   ${genComponentComment({ componentComment })}
   export default class ${moduleName === "default" ? "" : moduleName}${generic} extends SvelteComponentTyped<

package/package.json

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