feat(interface-type-handler): Handle generic interfaces

ARCHITECTURE.md

@@ -221,7 +221,7 @@ This directory contains a collection of specialized handler modules, each respon
 **Object-Like Type Handlers** (extend `ObjectLikeBaseHandler`):
 
 - <mcfile name="object-type-handler.ts" path="src/handlers/typebox/object/object-type-handler.ts"></mcfile>: Handles TypeScript object types and type literals.
-- <mcfile name="interface-type-handler.ts" path="src/handlers/typebox/object/interface-type-handler.ts"></mcfile>: Handles TypeScript interface declarations, including support for interface inheritance using `Type.Composite` to combine base interfaces with extended properties.
+- <mcfile name="interface-type-handler.ts" path="src/handlers/typebox/object/interface-type-handler.ts"></mcfile>: Handles TypeScript interface declarations, including support for interface inheritance using `Type.Composite` to combine base interfaces with extended properties. Supports generic interfaces with type parameters, generating parameterized functions that accept TypeBox schemas as arguments. Handles generic type calls in heritage clauses, converting expressions like `A<number>` to `A(Type.Number())` for proper TypeBox composition.
 
 **Collection Type Handlers** (extend `CollectionBaseHandler`):
 
@@ -257,7 +257,7 @@ This directory contains a collection of parser classes, each extending the `Base
 - <mcfile name="parse-imports.ts" path="src/parsers/parse-imports.ts"></mcfile>: Implements the `ImportParser` class, responsible for resolving and processing TypeScript import declarations.
 - <mcfile name="parse-type-aliases.ts" path="src/parsers/parse-type-aliases.ts"></mcfile>: Implements the `TypeAliasParser` class, responsible for processing TypeScript `type alias` declarations.
 - <mcfile name="parse-function-declarations.ts" path="src/parsers/parse-function-declarations.ts"></mcfile>: Implements the `FunctionDeclarationParser` class, responsible for processing TypeScript function declarations and converting them to TypeBox function schemas.
-- <mcfile name="parse-interfaces.ts" path="src/parsers/parse-interfaces.ts"></mcfile>: Implements the `InterfaceParser` class, responsible for processing TypeScript interface declarations with support for inheritance through dependency ordering and `Type.Composite` generation.
+- <mcfile name="parse-interfaces.ts" path="src/parsers/parse-interfaces.ts"></mcfile>: Implements the `InterfaceParser` class, responsible for processing TypeScript interface declarations with support for inheritance through dependency ordering and `Type.Composite` generation. Handles generic interfaces by generating parameterized functions with type parameters that accept TypeBox schemas as arguments.
 
 ### Performance Considerations
 

src/handlers/typebox/object/interface-type-handler.ts

@@ -1,31 +1,27 @@
 import { ObjectLikeBaseHandler } from '@daxserver/validation-schema-codegen/handlers/typebox/object/object-like-base-handler'
 import { makeTypeCall } from '@daxserver/validation-schema-codegen/utils/typebox-codegen-utils'
-import { InterfaceDeclaration, Node, ts } from 'ts-morph'
+import { HeritageClause, InterfaceDeclaration, Node, ts, TypeParameterDeclaration } from 'ts-morph'
 
 export class InterfaceTypeHandler extends ObjectLikeBaseHandler {
   canHandle(node: Node): boolean {
     return Node.isInterfaceDeclaration(node)
   }
 
   handle(node: InterfaceDeclaration): ts.Expression {
+    const typeParameters = node.getTypeParameters()
     const heritageClauses = node.getHeritageClauses()
     const baseObjectType = this.createObjectType(this.processProperties(node.getProperties()))
 
+    // If interface has type parameters, generate a function
+    if (typeParameters.length > 0) {
+      return this.createGenericInterfaceFunction(typeParameters, baseObjectType, heritageClauses)
+    }
+
     if (heritageClauses.length === 0) {
       return baseObjectType
     }
 
-    const extendedTypes: ts.Expression[] = []
-
-    for (const heritageClause of heritageClauses) {
-      if (heritageClause.getToken() === ts.SyntaxKind.ExtendsKeyword) {
-        for (const typeNode of heritageClause.getTypeNodes()) {
-          // For interface inheritance, we reference the already processed interface by name
-          const referencedTypeName = typeNode.getText()
-          extendedTypes.push(ts.factory.createIdentifier(referencedTypeName))
-        }
-      }
-    }
+    const extendedTypes = this.collectExtendedTypes(heritageClauses)
 
     if (extendedTypes.length === 0) {
       return baseObjectType
@@ -36,4 +32,108 @@ export class InterfaceTypeHandler extends ObjectLikeBaseHandler {
 
     return makeTypeCall('Composite', [ts.factory.createArrayLiteralExpression(allTypes, true)])
   }
+
+  private createGenericInterfaceFunction(
+    typeParameters: TypeParameterDeclaration[],
+    baseObjectType: ts.Expression,
+    heritageClauses: HeritageClause[],
+  ): ts.Expression {
+    // Create function parameters for each type parameter
+    const functionParams = typeParameters.map((typeParam) => {
+      const paramName = typeParam.getName()
+
+      return ts.factory.createParameterDeclaration(
+        undefined,
+        undefined,
+        ts.factory.createIdentifier(paramName),
+        undefined,
+        ts.factory.createTypeReferenceNode(paramName, undefined),
+        undefined,
+      )
+    })
+
+    // Create function body
+    let functionBody: ts.Expression = baseObjectType
+
+    // Handle heritage clauses for generic interfaces
+    const extendedTypes = this.collectExtendedTypes(heritageClauses)
+
+    if (extendedTypes.length > 0) {
+      const allTypes = [...extendedTypes, baseObjectType]
+      functionBody = makeTypeCall('Composite', [
+        ts.factory.createArrayLiteralExpression(allTypes, true),
+      ])
+    }
+
+    // Create type parameters for the function
+    const functionTypeParams = typeParameters.map((typeParam) => {
+      const paramName = typeParam.getName()
+
+      return ts.factory.createTypeParameterDeclaration(
+        undefined,
+        ts.factory.createIdentifier(paramName),
+        ts.factory.createTypeReferenceNode('TSchema', undefined),
+        undefined,
+      )
+    })
+
+    // Create arrow function
+    return ts.factory.createArrowFunction(
+      undefined,
+      ts.factory.createNodeArray(functionTypeParams),
+      functionParams,
+      undefined,
+      ts.factory.createToken(ts.SyntaxKind.EqualsGreaterThanToken),
+      functionBody,
+    )
+  }
+
+  private parseGenericTypeCall(typeText: string): ts.Expression | null {
+    const match = typeText.match(/^([^<]+)<([^>]+)>$/)
+
+    if (match && match[1] && match[2]) {
+      const baseName = match[1].trim()
+      const typeArg = match[2].trim()
+
+      return ts.factory.createCallExpression(ts.factory.createIdentifier(baseName), undefined, [
+        this.createTypeExpression(typeArg),
+      ])
+    }
+
+    return null
+  }
+
+  private createTypeExpression(typeArg: string): ts.Expression {
+    // Convert common TypeScript types to TypeBox calls
+    switch (typeArg) {
+      case 'number':
+        return makeTypeCall('Number')
+      case 'string':
+        return makeTypeCall('String')
+      case 'boolean':
+        return makeTypeCall('Boolean')
+      default:
+        // For other types, assume it's a reference
+        return ts.factory.createIdentifier(typeArg)
+    }
+  }
+
+  private collectExtendedTypes(heritageClauses: HeritageClause[]): ts.Expression[] {
+    const extendedTypes: ts.Expression[] = []
+
+    for (const heritageClause of heritageClauses) {
+      if (heritageClause.getToken() !== ts.SyntaxKind.ExtendsKeyword) {
+        continue
+      }
+
+      for (const typeNode of heritageClause.getTypeNodes()) {
+        const typeText = typeNode.getText()
+        extendedTypes.push(
+          this.parseGenericTypeCall(typeText) ?? ts.factory.createIdentifier(typeText),
+        )
+      }
+    }
+
+    return extendedTypes
+  }
 }

src/parsers/parse-interfaces.ts

@@ -1,7 +1,12 @@
 import { BaseParser } from '@daxserver/validation-schema-codegen/parsers/base-parser'
 import { addStaticTypeAlias } from '@daxserver/validation-schema-codegen/utils/add-static-type-alias'
 import { getTypeBoxType } from '@daxserver/validation-schema-codegen/utils/typebox-call'
-import { InterfaceDeclaration, ts, VariableDeclarationKind } from 'ts-morph'
+import {
+  InterfaceDeclaration,
+  ts,
+  TypeParameterDeclaration,
+  VariableDeclarationKind,
+} from 'ts-morph'
 
 export class InterfaceParser extends BaseParser {
   parse(interfaceDecl: InterfaceDeclaration): void {
@@ -24,6 +29,20 @@ export class InterfaceParser extends BaseParser {
 
     this.processedTypes.add(interfaceName)
 
+    const typeParameters = interfaceDecl.getTypeParameters()
+    const isExported = this.getIsExported(interfaceDecl, isImported)
+
+    // Check if interface has type parameters (generic)
+    if (typeParameters.length > 0) {
+      this.parseGenericInterface(interfaceDecl, isExported)
+    } else {
+      this.parseRegularInterface(interfaceDecl, isExported)
+    }
+  }
+
+  private parseRegularInterface(interfaceDecl: InterfaceDeclaration, isExported: boolean): void {
+    const interfaceName = interfaceDecl.getName()
+
     // Generate TypeBox type definition
     const typeboxTypeNode = getTypeBoxType(interfaceDecl)
     const typeboxType = this.printer.printNode(
@@ -32,8 +51,6 @@ export class InterfaceParser extends BaseParser {
       this.newSourceFile.compilerNode,
     )
 
-    const isExported = this.getIsExported(interfaceDecl, isImported)
-
     this.newSourceFile.addVariableStatement({
       isExported,
       declarationKind: VariableDeclarationKind.Const,
@@ -53,4 +70,91 @@ export class InterfaceParser extends BaseParser {
       isExported,
     )
   }
+
+  private parseGenericInterface(interfaceDecl: InterfaceDeclaration, isExported: boolean): void {
+    const interfaceName = interfaceDecl.getName()
+    const typeParameters = interfaceDecl.getTypeParameters()
+
+    // Generate TypeBox function definition
+    const typeboxTypeNode = getTypeBoxType(interfaceDecl)
+    const typeboxType = this.printer.printNode(
+      ts.EmitHint.Expression,
+      typeboxTypeNode,
+      this.newSourceFile.compilerNode,
+    )
+
+    // Add the function declaration
+    this.newSourceFile.addVariableStatement({
+      isExported,
+      declarationKind: VariableDeclarationKind.Const,
+      declarations: [
+        {
+          name: interfaceName,
+          initializer: typeboxType,
+        },
+      ],
+    })
+
+    // Add generic type alias: type A<T extends TSchema> = Static<ReturnType<typeof A<T>>>
+    this.addGenericTypeAlias(interfaceName, typeParameters, isExported)
+  }
+
+  private addGenericTypeAlias(
+    name: string,
+    typeParameters: TypeParameterDeclaration[],
+    isExported: boolean,
+  ): void {
+    // Create type parameters for the type alias
+    const typeParamDeclarations = typeParameters.map((typeParam) => {
+      const paramName = typeParam.getName()
+      return ts.factory.createTypeParameterDeclaration(
+        undefined,
+        ts.factory.createIdentifier(paramName),
+        ts.factory.createTypeReferenceNode('TSchema', undefined),
+        undefined,
+      )
+    })
+
+    // Create the type: Static<ReturnType<typeof A<T>>>
+    const typeParamNames = typeParameters.map((tp) => tp.getName())
+    const typeArguments = typeParamNames.map((paramName) =>
+      ts.factory.createTypeReferenceNode(paramName, undefined),
+    )
+
+    // Create typeof A<T> expression - we need to create a type reference with type arguments
+    const typeReferenceWithArgs = ts.factory.createTypeReferenceNode(
+      ts.factory.createIdentifier(name),
+      typeArguments,
+    )
+
+    const typeofExpression = ts.factory.createTypeQueryNode(
+      typeReferenceWithArgs.typeName,
+      typeReferenceWithArgs.typeArguments,
+    )
+
+    const returnTypeExpression = ts.factory.createTypeReferenceNode(
+      ts.factory.createIdentifier('ReturnType'),
+      [typeofExpression],
+    )
+
+    const staticTypeNode = ts.factory.createTypeReferenceNode(
+      ts.factory.createIdentifier('Static'),
+      [returnTypeExpression],
+    )
+
+    const staticType = this.printer.printNode(
+      ts.EmitHint.Unspecified,
+      staticTypeNode,
+      this.newSourceFile.compilerNode,
+    )
+
+    this.newSourceFile.addTypeAlias({
+      isExported,
+      name,
+      typeParameters: typeParamDeclarations.map((tp) =>
+        this.printer.printNode(ts.EmitHint.Unspecified, tp, this.newSourceFile.compilerNode),
+      ),
+      type: staticType,
+    })
+  }
 }

src/ts-morph-codegen.ts

@@ -30,16 +30,30 @@ export const generateCode = async ({
     overwrite: true,
   })
 
+  // Check if any interfaces have generic type parameters
+  const hasGenericInterfaces = sourceFile
+    .getInterfaces()
+    .some((i) => i.getTypeParameters().length > 0)
+
   // Add imports
+  const namedImports = [
+    'Type',
+    {
+      name: 'Static',
+      isTypeOnly: true,
+    },
+  ]
+
+  if (hasGenericInterfaces) {
+    namedImports.push({
+      name: 'TSchema',
+      isTypeOnly: true,
+    })
+  }
+
   newSourceFile.addImportDeclaration({
     moduleSpecifier: '@sinclair/typebox',
-    namedImports: [
-      'Type',
-      {
-        name: 'Static',
-        isTypeOnly: true,
-      },
-    ],
+    namedImports,
   })
 
   const parserOptions = {

tests/handlers/typebox/interfaces.test.ts

@@ -200,5 +200,35 @@ describe('Interfaces', () => {
         `),
       )
     })
+
+    test('generic types', () => {
+      const sourceFile = createSourceFile(
+        project,
+        `
+          interface A<T> { a: T }
+          interface B extends A<number> { b: number }
+        `,
+      )
+
+      expect(generateFormattedCode(sourceFile)).resolves.toBe(
+        formatWithPrettier(
+          `
+          const A = <T extends TSchema>(T: T) => Type.Object({
+            a: T
+          });
+
+          type A<T extends TSchema> = Static<ReturnType<typeof A<T>>>;
+
+          const B = Type.Composite([A(Type.Number()), Type.Object({
+            b: Type.Number()
+          })]);
+
+          type B = Static<typeof B>;
+        `,
+          true,
+          true,
+        ),
+      )
+    })
   })
 })