tywrap 0.2.0 → 0.3.0

package/src/core/generator.ts

@@ -3,9 +3,12 @@
  */
 
 import type {
+  PythonGenericParameter,
   PythonFunction,
   PythonClass,
   PythonModule,
+  PythonType,
+  PythonTypeAlias,
   GeneratedCode,
   TypescriptType,
 } from '../types/index.js';
@@ -13,6 +16,19 @@ import { globalCache } from '../utils/cache.js';
 
 import { TypeMapper } from './mapper.js';
 
+interface GenericRenderParam {
+  name: string;
+  declaration: string;
+}
+
+interface GenericRenderContext {
+  currentModule?: string;
+  declaration: string;
+  typeArguments: string;
+  emittedNames: Set<string>;
+  emittedParamSpecs: Set<string>;
+}
+
 export class CodeGenerator {
   private readonly mapper: TypeMapper;
   private readonly reservedTsIdentifiers = new Set([
@@ -109,6 +125,217 @@ export class CodeGenerator {
       });
   }
 
+  private getTypeParameters(
+    typeParameters?: readonly PythonGenericParameter[]
+  ): readonly PythonGenericParameter[] {
+    return typeParameters ?? [];
+  }
+
+  private buildGenericRenderContext(
+    typeParameters: readonly PythonGenericParameter[],
+    types: readonly PythonType[],
+    currentModule?: string
+  ): GenericRenderContext {
+    const callableParamSpecs = new Set<string>();
+    types.forEach(type => this.collectCallableParamSpecs(type, callableParamSpecs));
+
+    const emitted: GenericRenderParam[] = [];
+    const emittedNames = new Set<string>();
+    const emittedParamSpecs = new Set<string>();
+
+    typeParameters.forEach(param => {
+      if (
+        param.kind === 'typevar' &&
+        !param.bound &&
+        !(param.constraints && param.constraints.length > 0) &&
+        (!param.variance || param.variance === 'invariant')
+      ) {
+        emitted.push({ name: param.name, declaration: param.name });
+        emittedNames.add(param.name);
+        return;
+      }
+
+      if (param.kind === 'paramspec' && callableParamSpecs.has(param.name)) {
+        emitted.push({ name: param.name, declaration: `${param.name} extends unknown[]` });
+        emittedNames.add(param.name);
+        emittedParamSpecs.add(param.name);
+      }
+    });
+
+    return {
+      currentModule,
+      declaration:
+        emitted.length > 0 ? `<${emitted.map(param => param.declaration).join(', ')}>` : '',
+      typeArguments: emitted.length > 0 ? `<${emitted.map(param => param.name).join(', ')}>` : '',
+      emittedNames,
+      emittedParamSpecs,
+    };
+  }
+
+  private mergeGenericRenderContexts(
+    outer: GenericRenderContext,
+    inner: GenericRenderContext
+  ): GenericRenderContext {
+    return {
+      currentModule: inner.currentModule ?? outer.currentModule,
+      declaration: inner.declaration,
+      typeArguments: inner.typeArguments,
+      emittedNames: new Set([...outer.emittedNames, ...inner.emittedNames]),
+      emittedParamSpecs: new Set([...outer.emittedParamSpecs, ...inner.emittedParamSpecs]),
+    };
+  }
+
+  private collectCallableParamSpecs(type: PythonType, out: Set<string>): void {
+    switch (type.kind) {
+      case 'collection':
+        type.itemTypes.forEach(item => this.collectCallableParamSpecs(item, out));
+        break;
+      case 'paramspec':
+        out.add(type.name);
+        break;
+      case 'union':
+        type.types.forEach(item => this.collectCallableParamSpecs(item, out));
+        break;
+      case 'optional':
+        this.collectCallableParamSpecs(type.type, out);
+        break;
+      case 'generic':
+        type.typeArgs.forEach(item => this.collectCallableParamSpecs(item, out));
+        break;
+      case 'callable':
+        if (type.parameterSpec?.kind === 'paramspec') {
+          out.add(type.parameterSpec.name);
+        }
+        type.parameters.forEach(item => this.collectCallableParamSpecs(item, out));
+        this.collectCallableParamSpecs(type.returnType, out);
+        break;
+      case 'annotated':
+        this.collectCallableParamSpecs(type.base, out);
+        break;
+      case 'final':
+      case 'classvar':
+        this.collectCallableParamSpecs(type.type, out);
+        break;
+      case 'unpack':
+        this.collectCallableParamSpecs(type.type, out);
+        break;
+      default:
+        break;
+    }
+  }
+
+  private sanitizeType(type: PythonType, ctx: GenericRenderContext): PythonType {
+    const unknownType = (): PythonType => ({ kind: 'custom', name: 'Any', module: 'typing' });
+
+    switch (type.kind) {
+      case 'primitive':
+      case 'literal':
+        return type;
+      case 'custom':
+        return type;
+      case 'collection':
+        return {
+          ...type,
+          itemTypes: type.itemTypes.map(item => this.sanitizeType(item, ctx)),
+        };
+      case 'union':
+        return {
+          ...type,
+          types: type.types.map(item => this.sanitizeType(item, ctx)),
+        };
+      case 'optional':
+        return { ...type, type: this.sanitizeType(type.type, ctx) };
+      case 'generic':
+        return {
+          ...type,
+          module: type.module === ctx.currentModule ? undefined : type.module,
+          typeArgs: type.typeArgs.map(item => this.sanitizeType(item, ctx)),
+        };
+      case 'callable':
+        if (type.parameterSpec && !ctx.emittedParamSpecs.has(type.parameterSpec.name)) {
+          return {
+            ...type,
+            parameters: [{ kind: 'custom', name: '...' }],
+            parameterSpec: undefined,
+            returnType: this.sanitizeType(type.returnType, ctx),
+          };
+        }
+        return {
+          ...type,
+          parameters: type.parameters.map(item => this.sanitizeType(item, ctx)),
+          parameterSpec:
+            type.parameterSpec && ctx.emittedParamSpecs.has(type.parameterSpec.name)
+              ? type.parameterSpec
+              : undefined,
+          returnType: this.sanitizeType(type.returnType, ctx),
+        };
+      case 'annotated':
+        return { ...type, base: this.sanitizeType(type.base, ctx) };
+      case 'typevar':
+      case 'paramspec':
+        return ctx.emittedNames.has(type.name) ? type : unknownType();
+      case 'paramspec_args':
+        return {
+          kind: 'collection',
+          name: 'list',
+          itemTypes: [unknownType()],
+        };
+      case 'paramspec_kwargs':
+        return {
+          kind: 'collection',
+          name: 'dict',
+          itemTypes: [{ kind: 'primitive', name: 'str' }, unknownType()],
+        };
+      case 'typevartuple':
+        return unknownType();
+      case 'unpack':
+        return unknownType();
+      case 'final':
+        return { ...type, type: this.sanitizeType(type.type, ctx) };
+      case 'classvar':
+        return { ...type, type: this.sanitizeType(type.type, ctx) };
+    }
+  }
+
+  private typeToTsFromPython(
+    type: PythonType,
+    ctx: GenericRenderContext,
+    mappingContext: 'value' | 'return'
+  ): string {
+    return this.typeToTs(this.mapper.mapPythonType(this.sanitizeType(type, ctx), mappingContext));
+  }
+
+  private renderLooksLikeKwargsExpr(
+    valueExpr: string,
+    options: {
+      keywordOnlyNames: string[];
+      requiredKwOnlyNames: string[];
+      hasVarKwArgs: boolean;
+    }
+  ): string {
+    const base = `typeof ${valueExpr} === 'object' && ${valueExpr} !== null && !globalThis.Array.isArray(${valueExpr}) && (Object.getPrototypeOf(${valueExpr}) === Object.prototype || Object.getPrototypeOf(${valueExpr}) === null)`;
+
+    const keyCheck = (() => {
+      if (options.requiredKwOnlyNames.length > 0) {
+        return options.requiredKwOnlyNames
+          .map(k => `Object.prototype.hasOwnProperty.call(${valueExpr}, ${JSON.stringify(k)})`)
+          .join(' && ');
+      }
+      if (options.hasVarKwArgs) {
+        // With **kwargs, any plain object could be kwargs.
+        return 'true';
+      }
+      if (options.keywordOnlyNames.length > 0) {
+        return options.keywordOnlyNames
+          .map(k => `Object.prototype.hasOwnProperty.call(${valueExpr}, ${JSON.stringify(k)})`)
+          .join(' || ');
+      }
+      return 'false';
+    })();
+
+    return `(${base} && (${keyCheck}))`;
+  }
+
   generateFunctionWrapper(
     func: PythonFunction,
     moduleName?: string,
@@ -119,25 +346,84 @@ export class CodeGenerator {
       annotatedJSDoc ? func.parameters.map(p => String(p.type)) : undefined
     );
     const filteredParams = func.parameters.filter(p => p.name !== 'self' && p.name !== 'cls');
-    const renderParam = (p: (typeof filteredParams)[number]): string => {
+    const keywordOnlyParams = filteredParams.filter(p => p.keywordOnly);
+    const positionalOnlyNames = filteredParams.filter(p => p.positionalOnly).map(p => p.name);
+    const hasVarKwArgs = filteredParams.some(p => p.kwArgs);
+    const needsKwargsParam = keywordOnlyParams.length > 0 || hasVarKwArgs;
+
+    const varArgsParam = filteredParams.find(p => p.varArgs);
+    const needsVarArgsArray = Boolean(varArgsParam) && needsKwargsParam;
+
+    const positionalParams = filteredParams.filter(p => !p.keywordOnly && !p.varArgs && !p.kwArgs);
+    const genericContext = this.buildGenericRenderContext(
+      this.getTypeParameters(func.typeParameters),
+      [func.returnType, ...filteredParams.map(param => param.type)],
+      moduleName
+    );
+    const typeParamDecl = genericContext.declaration;
+
+    const tsTypeForValue = (p: (typeof filteredParams)[number]): string =>
+      this.typeToTsFromPython(p.type, genericContext, 'value');
+
+    const kwargsType = (() => {
+      if (!needsKwargsParam) {
+        return '';
+      }
+      if (keywordOnlyParams.length === 0 && hasVarKwArgs) {
+        return 'Record<string, unknown>';
+      }
+      const props = keywordOnlyParams
+        .map(p => `${JSON.stringify(p.name)}${p.optional ? '?' : ''}: ${tsTypeForValue(p)};`)
+        .join(' ');
+      const obj = `{ ${props} }`;
+      return hasVarKwArgs ? `(${obj} & Record<string, unknown>)` : obj;
+    })();
+
+    const renderPositionalParam = (
+      p: (typeof positionalParams)[number],
+      forceRequired = false
+    ): string => {
       const pname = this.escapeIdentifier(p.name);
-      if (p.varArgs) {
+      const opt = !forceRequired && p.optional ? '?' : '';
+      return `${pname}${opt}: ${tsTypeForValue(p)}`;
+    };
+
+    const renderVarArgsParam = (forceRequired = false): string | null => {
+      if (!varArgsParam) {
+        return null;
+      }
+      const pname = this.escapeIdentifier(varArgsParam.name);
+      if (!needsVarArgsArray) {
         return `...${pname}: unknown[]`;
       }
-      if (p.kwArgs) {
-        return `kwargs?: Record<string, unknown>`;
+      const opt = forceRequired ? '' : '?';
+      return `${pname}${opt}: unknown[]`;
+    };
+
+    const renderKwargsParam = (forceRequired = false): string | null => {
+      if (!needsKwargsParam) {
+        return null;
       }
-      return `${pname}${p.optional ? '?' : ''}: ${this.typeToTs(
-        this.mapper.mapPythonType(p.type, 'value')
-      )}`;
+      const opt = forceRequired ? '' : '?';
+      return `kwargs${opt}: ${kwargsType}`;
     };
-    const paramDecl = filteredParams.map(renderParam).join(', ');
-    const positionalParams = filteredParams.filter(p => !p.kwArgs);
-    const callArgs = positionalParams
-      .map(p => (p.varArgs ? `...${this.escapeIdentifier(p.name)}` : this.escapeIdentifier(p.name)))
-      .join(', ');
-    const hasKwArgs = filteredParams.some(p => p.kwArgs);
-    const returnType = this.typeToTs(this.mapper.mapPythonType(func.returnType, 'return'));
+
+    const implParams: string[] = [];
+    for (const p of positionalParams) {
+      implParams.push(renderPositionalParam(p));
+    }
+    const varArgsDecl = renderVarArgsParam(false);
+    if (varArgsDecl) {
+      implParams.push(varArgsDecl);
+    }
+    const kwargsDecl = needsKwargsParam ? `kwargs?: ${kwargsType}` : null;
+    if (kwargsDecl) {
+      implParams.push(kwargsDecl);
+    }
+    const paramDecl = implParams.join(', ');
+
+    const hasKwArgs = needsKwargsParam;
+    const returnType = this.typeToTsFromPython(func.returnType, genericContext, 'return');
     const fname = this.escapeIdentifier(func.name);
     const moduleId = moduleName ?? '__main__';
 
@@ -146,25 +432,171 @@ export class CodeGenerator {
     // `fn(a)`, `fn(a, b)`, ... all to typecheck. We emit a family of overloads that progressively
     // "drop" optional tail args, but also include the full positional signature (<= length) so a
     // call that supplies all args still matches an overload.
-    const positional = filteredParams.filter(p => !p.varArgs && !p.kwArgs);
-    const firstOptionalIndex = positional.findIndex(p => p.optional);
+    const firstOptionalIndex = positionalParams.findIndex(p => p.optional);
+    const requiredKwOnlyNames = keywordOnlyParams.filter(p => !p.optional).map(p => p.name);
+    const keywordOnlyNames = keywordOnlyParams.map(p => p.name);
     const overloads: string[] = [];
-    if (firstOptionalIndex >= 0) {
-      for (let i = firstOptionalIndex; i <= positional.length; i++) {
-        const head = positional.slice(0, i);
-        const rest = filteredParams.filter(p => p.varArgs || p.kwArgs);
-        const sigParams = [...head, ...rest].map(renderParam).join(', ');
-        overloads.push(`export function ${fname}(${sigParams}): Promise<${returnType}>;`);
+    if (requiredKwOnlyNames.length > 0) {
+      // Required keyword-only params must be represented with a required `kwargs` parameter.
+      // Avoid "required after optional" by emitting overloads where all preceding parameters are required.
+      const requiredPosCount =
+        firstOptionalIndex >= 0 ? firstOptionalIndex : positionalParams.length;
+      for (let i = requiredPosCount; i <= positionalParams.length; i++) {
+        const head = positionalParams.slice(0, i).map(p => renderPositionalParam(p, true));
+        const rest: string[] = [];
+        const v = (() => {
+          if (!varArgsParam) {
+            return null;
+          }
+          const pname = this.escapeIdentifier(varArgsParam.name);
+          if (!needsVarArgsArray) {
+            return `...${pname}: unknown[]`;
+          }
+          // In overloads where `kwargs` is required, keep the `args` surrogate parameter required,
+          // but allow `undefined` as a placeholder so callers can omit varargs while still passing kwargs.
+          return `${pname}: unknown[] | undefined`;
+        })();
+        if (v) {
+          rest.push(v);
+        }
+        const k = renderKwargsParam(true);
+        if (k) {
+          rest.push(k);
+        }
+        overloads.push(
+          `export function ${fname}${typeParamDecl}(${[...head, ...rest].join(', ')}): Promise<${returnType}>;`
+        );
+        if (varArgsParam && needsVarArgsArray) {
+          // Also allow callers to omit the varargs surrogate parameter entirely (i.e. `fn(kwargs)`).
+          overloads.push(
+            `export function ${fname}${typeParamDecl}(${[...head, renderKwargsParam(true)].join(', ')}): Promise<${returnType}>;`
+          );
+        }
+      }
+    } else if (firstOptionalIndex >= 0 && !varArgsParam && !needsKwargsParam) {
+      for (let i = firstOptionalIndex; i <= positionalParams.length; i++) {
+        const head = positionalParams.slice(0, i).map(p => renderPositionalParam(p));
+        const rest: string[] = [];
+        const v = renderVarArgsParam(false);
+        if (v) {
+          rest.push(v);
+        }
+        const k = renderKwargsParam(false);
+        if (k) {
+          rest.push(k);
+        }
+        overloads.push(
+          `export function ${fname}${typeParamDecl}(${[...head, ...rest].join(', ')}): Promise<${returnType}>;`
+        );
       }
     }
 
     const overloadDecl = overloads.length > 0 ? `${overloads.join('\n')}\n` : '';
-    const ts = `${jsdoc}${overloadDecl}export async function ${fname}(${paramDecl}): Promise<${returnType}> {
-  return getRuntimeBridge().call('${moduleId}', '${func.name}', [${callArgs}]${hasKwArgs ? ', kwargs' : ''});
+    const guardLines: string[] = [];
+    if (hasKwArgs && positionalOnlyNames.length > 0) {
+      guardLines.push(
+        `  const __positionalOnly = ${JSON.stringify(positionalOnlyNames)} as const;`
+      );
+      guardLines.push(`  for (const key of __positionalOnly) {`);
+      guardLines.push(`    if (__kwargs && Object.prototype.hasOwnProperty.call(__kwargs, key)) {`);
+      guardLines.push(
+        `      throw new Error(\`${func.name} does not accept positional-only argument "\${key}" as a keyword argument\`);`
+      );
+      guardLines.push(`    }`);
+      guardLines.push(`  }`);
+    }
+    if (hasKwArgs && requiredKwOnlyNames.length > 0) {
+      guardLines.push(
+        `  const __requiredKwOnly = ${JSON.stringify(requiredKwOnlyNames)} as const;`
+      );
+      guardLines.push(`  const __missing: string[] = [];`);
+      guardLines.push(`  for (const key of __requiredKwOnly) {`);
+      guardLines.push(
+        `    if (!__kwargs || !Object.prototype.hasOwnProperty.call(__kwargs, key)) {`
+      );
+      guardLines.push(`      __missing.push(key);`);
+      guardLines.push(`    }`);
+      guardLines.push(`  }`);
+      guardLines.push(`  if (__missing.length > 0) {`);
+      guardLines.push(
+        `    throw new Error(\`Missing required keyword-only arguments for ${func.name}: \${__missing.join(', ')}\`);`
+      );
+      guardLines.push(`  }`);
+    }
+    const guards = guardLines.length > 0 ? `${guardLines.join('\n')}\n` : '';
+
+    const firstOptionalPosIndex = positionalParams.findIndex(p => p.optional);
+    const requiredPosCount =
+      firstOptionalPosIndex >= 0 ? firstOptionalPosIndex : positionalParams.length;
+    const callPreludeLines: string[] = [];
+    if (hasKwArgs) {
+      callPreludeLines.push(`  let __kwargs = kwargs;`);
+    }
+    const positionalArgExprs = positionalParams.map(p => this.escapeIdentifier(p.name));
+    callPreludeLines.push(`  const __args: unknown[] = [${positionalArgExprs.join(', ')}];`);
+    if (requiredPosCount < positionalParams.length) {
+      callPreludeLines.push(
+        `  while (__args.length > ${requiredPosCount} && __args[__args.length - 1] === undefined) {`
+      );
+      callPreludeLines.push(`    __args.pop();`);
+      callPreludeLines.push(`  }`);
+    }
+    if (hasKwArgs && requiredPosCount < positionalParams.length) {
+      const looksLikeKwargs = this.renderLooksLikeKwargsExpr('__candidate', {
+        keywordOnlyNames,
+        requiredKwOnlyNames,
+        hasVarKwArgs,
+      });
+      callPreludeLines.push(
+        `  if (__kwargs === undefined && __args.length > ${requiredPosCount}) {`
+      );
+      callPreludeLines.push(`    const __candidate = __args[__args.length - 1];`);
+      callPreludeLines.push(`    if (${looksLikeKwargs}) {`);
+      callPreludeLines.push(`      __kwargs = __candidate as any;`);
+      callPreludeLines.push(`      __args.pop();`);
+      callPreludeLines.push(`    }`);
+      callPreludeLines.push(`  }`);
+    }
+    if (varArgsParam) {
+      const vname = this.escapeIdentifier(varArgsParam.name);
+      if (needsVarArgsArray) {
+        const looksLikeKwargs = this.renderLooksLikeKwargsExpr(vname, {
+          keywordOnlyNames,
+          requiredKwOnlyNames,
+          hasVarKwArgs,
+        });
+        callPreludeLines.push(`  let __varargs: unknown[] = [];`);
+        callPreludeLines.push(`  if (${vname} !== undefined) {`);
+        callPreludeLines.push(`    if (globalThis.Array.isArray(${vname})) {`);
+        callPreludeLines.push(`      __varargs = ${vname};`);
+        callPreludeLines.push(`    } else if (__kwargs === undefined && ${looksLikeKwargs}) {`);
+        callPreludeLines.push(`      __kwargs = ${vname} as any;`);
+        callPreludeLines.push(`    } else {`);
+        callPreludeLines.push(
+          `      throw new Error(\`${func.name} expected ${varArgsParam.name} to be an array\`);`
+        );
+        callPreludeLines.push(`    }`);
+        callPreludeLines.push(`  }`);
+        callPreludeLines.push(`  __args.push(...__varargs);`);
+      } else {
+        callPreludeLines.push(`  __args.push(...${vname});`);
+      }
+    }
+    const callPrelude = callPreludeLines.length > 0 ? `${callPreludeLines.join('\n')}\n` : '';
+
+    const ts = `${jsdoc}${overloadDecl}export async function ${fname}${typeParamDecl}(${paramDecl}): Promise<${returnType}> {
+${callPrelude}${guards}  return getRuntimeBridge().call('${moduleId}', '${func.name}', __args${
+      hasKwArgs ? ', __kwargs' : ''
+    });
 }
 `;
 
-    return this.wrap(ts, [func.name]);
+    const declarationBody =
+      overloads.length > 0
+        ? overloadDecl
+        : `export function ${fname}${typeParamDecl}(${paramDecl}): Promise<${returnType}>;\n`;
+
+    return this.wrap(ts, `${jsdoc}${declarationBody}`, [func.name]);
   }
 
   generateClassWrapper(
@@ -173,140 +605,534 @@ export class CodeGenerator {
     _annotatedJSDoc = false
   ): GeneratedCode {
     const jsdoc = this.generateJsDoc(cls.docstring);
-    // Structural type aliases for special kinds
+    const classGenericContext = this.buildGenericRenderContext(
+      this.getTypeParameters(cls.typeParameters),
+      [
+        ...cls.properties.map(property => property.type),
+        ...cls.methods.flatMap(method => [
+          method.returnType,
+          ...method.parameters.map(p => p.type),
+        ]),
+      ],
+      moduleName
+    );
+    const classTypeParamDecl = classGenericContext.declaration;
+    const cname = this.escapeIdentifier(cls.name);
+    const classSelfType = `${cname}${classGenericContext.typeArguments}`;
+    const tsValueType = (p: (typeof cls.methods)[number]['parameters'][number]): string =>
+      this.typeToTsFromPython(p.type, classGenericContext, 'value');
+
+    const wrapAlias = (body: string): GeneratedCode => {
+      const ts = `${jsdoc}export type ${cname}${classTypeParamDecl} = ${body}\n`;
+      return this.wrap(ts, ts, [cls.name]);
+    };
+
     if (cls.decorators.includes('__typed_dict__') || cls.kind === 'typed_dict') {
       const props = cls.properties
         .map(p => {
           const pname = this.escapeIdentifier(p.name);
           const opt = (p as unknown as { optional?: boolean }).optional === true ? '?' : '';
-          const t = this.typeToTs(this.mapper.mapPythonType(p.type, 'value'));
+          const t = this.typeToTsFromPython(p.type, classGenericContext, 'value');
           return `${pname}${opt}: ${t};`;
         })
         .join(' ');
-      const cname = this.escapeIdentifier(cls.name);
-      const ts = `${jsdoc}export type ${cname} = { ${props} }\n`;
-      return this.wrap(ts, [cls.name]);
+      return wrapAlias(`{ ${props} }`);
     }
 
     if (cls.kind === 'namedtuple') {
-      // NamedTuple -> readonly tuple type alias `[T1, T2, ...]`
       const elements = cls.properties.map(p =>
-        this.typeToTs(this.mapper.mapPythonType(p.type, 'value'))
+        this.typeToTsFromPython(p.type, classGenericContext, 'value')
       );
-      const cname = this.escapeIdentifier(cls.name);
-      const ts = `${jsdoc}export type ${cname} = readonly [${elements.join(', ')}]\n`;
-      return this.wrap(ts, [cls.name]);
+      return wrapAlias(`readonly [${elements.join(', ')}]`);
     }
 
     if (cls.kind === 'protocol') {
-      // Protocol -> structural interface-like type alias for attributes and callables (subset)
       const props = cls.properties
         .map(
           p =>
-            `${this.escapeIdentifier(p.name)}: ${this.typeToTs(this.mapper.mapPythonType(p.type, 'value'))};`
+            `${this.escapeIdentifier(p.name)}: ${this.typeToTsFromPython(p.type, classGenericContext, 'value')};`
         )
         .join(' ');
       const methods = cls.methods
+        .filter(m => m.name !== '__init__')
         .map(m => {
           const fparams = m.parameters.filter(p => p.name !== 'self' && p.name !== 'cls');
+          const methodOwnGenericContext = this.buildGenericRenderContext(
+            this.getTypeParameters(m.typeParameters),
+            [m.returnType, ...fparams.map(param => param.type)],
+            moduleName
+          );
+          const methodGenericContext = this.mergeGenericRenderContexts(
+            classGenericContext,
+            methodOwnGenericContext
+          );
+          const methodTypeParamDecl = methodOwnGenericContext.declaration;
           const paramsDecl = fparams
             .map(
               p =>
-                `${this.escapeIdentifier(p.name)}${p.optional ? '?' : ''}: ${this.typeToTs(this.mapper.mapPythonType(p.type, 'value'))}`
+                `${this.escapeIdentifier(p.name)}${p.optional ? '?' : ''}: ${this.typeToTsFromPython(p.type, methodGenericContext, 'value')}`
             )
             .join(', ');
-          const returnType = this.typeToTs(this.mapper.mapPythonType(m.returnType, 'return'));
-          return `${this.escapeIdentifier(m.name)}: (${paramsDecl}) => ${returnType};`;
+          const returnType = this.typeToTsFromPython(m.returnType, methodGenericContext, 'return');
+          return `${this.escapeIdentifier(m.name)}: ${methodTypeParamDecl}(${paramsDecl}) => ${returnType};`;
         })
         .join(' ');
-      const cname = this.escapeIdentifier(cls.name);
-      const ts = `${jsdoc}export type ${cname} = { ${props} ${methods} }\n`;
-      return this.wrap(ts, [cls.name]);
+      return wrapAlias(`{ ${props} ${methods} }`);
     }
 
     if (cls.kind === 'dataclass' || cls.kind === 'pydantic') {
-      // Data containers -> object type alias
       const props = cls.properties
         .map(p => {
           const pname = this.escapeIdentifier(p.name);
           const opt = (p as unknown as { optional?: boolean }).optional === true ? '?' : '';
-          const t = this.typeToTs(this.mapper.mapPythonType(p.type, 'value'));
+          const t = this.typeToTsFromPython(p.type, classGenericContext, 'value');
           return `${pname}${opt}: ${t};`;
         })
         .join(' ');
-      const cname = this.escapeIdentifier(cls.name);
-      const ts = `${jsdoc}export type ${cname} = { ${props} }\n`;
-      return this.wrap(ts, [cls.name]);
+      return wrapAlias(`{ ${props} }`);
     }
+
     const sortedMethods = [...cls.methods].sort((a, b) => a.name.localeCompare(b.name));
-    const methodBodies = sortedMethods
-      .filter(m => m.name !== '__init__')
-      .map(m => {
-        const fparams = m.parameters.filter(p => p.name !== 'self' && p.name !== 'cls');
-        const paramsDecl = fparams
-          .map(p =>
-            p.varArgs
-              ? `...${this.escapeIdentifier(p.name)}: unknown[]`
-              : p.kwArgs
-                ? `kwargs?: Record<string, unknown>`
-                : `${this.escapeIdentifier(p.name)}${p.optional ? '?' : ''}: ${this.typeToTs(this.mapper.mapPythonType(p.type, 'value'))}`
-          )
-          .join(', ');
-        const positionalParams = fparams.filter(p => !p.kwArgs);
-        const callPassthrough = positionalParams
-          .map(p =>
-            p.varArgs ? `...${this.escapeIdentifier(p.name)}` : this.escapeIdentifier(p.name)
-          )
-          .join(', ');
-        const hasKwArgs = fparams.some(p => p.kwArgs);
-        const returnType = this.typeToTs(this.mapper.mapPythonType(m.returnType, 'return'));
-        return `  async ${this.escapeIdentifier(m.name)}(${paramsDecl}): Promise<${returnType}> { return getRuntimeBridge().callMethod(this.__handle, '${m.name}', [${callPassthrough}]${hasKwArgs ? ', kwargs' : ''}); }`;
-      })
-      .join('\n');
+    const methodBodies: string[] = [];
+    const methodDeclarations: string[] = [];
+
+    sortedMethods
+      .filter(method => method.name !== '__init__')
+      .forEach(method => {
+        const fparams = method.parameters.filter(p => p.name !== 'self' && p.name !== 'cls');
+        const methodOwnGenericContext = this.buildGenericRenderContext(
+          this.getTypeParameters(method.typeParameters),
+          [method.returnType, ...fparams.map(param => param.type)],
+          moduleName
+        );
+        const methodGenericContext = this.mergeGenericRenderContexts(
+          classGenericContext,
+          methodOwnGenericContext
+        );
+        const methodTypeParamDecl = methodOwnGenericContext.declaration;
+        const methodTsValueType = (p: (typeof fparams)[number]): string =>
+          this.typeToTsFromPython(p.type, methodGenericContext, 'value');
+        const keywordOnlyParams = fparams.filter(p => p.keywordOnly);
+        const positionalOnlyNames = fparams.filter(p => p.positionalOnly).map(p => p.name);
+        const hasVarKwArgs = fparams.some(p => p.kwArgs);
+        const needsKwargsParam = keywordOnlyParams.length > 0 || hasVarKwArgs;
+        const varArgsParam = fparams.find(p => p.varArgs);
+        const needsVarArgsArray = Boolean(varArgsParam) && needsKwargsParam;
+        const positionalParams = fparams.filter(p => !p.keywordOnly && !p.varArgs && !p.kwArgs);
+        const firstOptionalPosIndex = positionalParams.findIndex(p => p.optional);
+        const requiredPosCount =
+          firstOptionalPosIndex >= 0 ? firstOptionalPosIndex : positionalParams.length;
+        const keywordOnlyNames = keywordOnlyParams.map(p => p.name);
+
+        const renderPositionalParam = (
+          p: (typeof positionalParams)[number],
+          forceRequired = false
+        ): string => {
+          const pname = this.escapeIdentifier(p.name);
+          const opt = !forceRequired && p.optional ? '?' : '';
+          return `${pname}${opt}: ${methodTsValueType(p)}`;
+        };
+
+        const kwargsType = (() => {
+          if (!needsKwargsParam) {
+            return '';
+          }
+          if (keywordOnlyParams.length === 0 && hasVarKwArgs) {
+            return 'Record<string, unknown>';
+          }
+          const props = keywordOnlyParams
+            .map(p => `${JSON.stringify(p.name)}${p.optional ? '?' : ''}: ${methodTsValueType(p)};`)
+            .join(' ');
+          const obj = `{ ${props} }`;
+          return hasVarKwArgs ? `(${obj} & Record<string, unknown>)` : obj;
+        })();
+
+        const paramsDeclParts: string[] = [];
+        positionalParams.forEach(p => {
+          paramsDeclParts.push(renderPositionalParam(p));
+        });
+        if (varArgsParam) {
+          const vname = this.escapeIdentifier(varArgsParam.name);
+          paramsDeclParts.push(
+            needsVarArgsArray ? `${vname}?: unknown[]` : `...${vname}: unknown[]`
+          );
+        }
+        if (needsKwargsParam) {
+          paramsDeclParts.push(`kwargs?: ${kwargsType}`);
+        }
+        const paramsDecl = paramsDeclParts.join(', ');
+
+        const requiredKwOnlyNames = keywordOnlyParams.filter(p => !p.optional).map(p => p.name);
+        const returnType = this.typeToTsFromPython(
+          method.returnType,
+          methodGenericContext,
+          'return'
+        );
+        const mname = this.escapeIdentifier(method.name);
+
+        const overloads: string[] = [];
+        if (needsKwargsParam && requiredKwOnlyNames.length > 0) {
+          const firstOptionalIndex = positionalParams.findIndex(p => p.optional);
+          const requiredPosCount =
+            firstOptionalIndex >= 0 ? firstOptionalIndex : positionalParams.length;
+          for (let i = requiredPosCount; i <= positionalParams.length; i++) {
+            const head = positionalParams.slice(0, i).map(p => renderPositionalParam(p, true));
+            const rest: string[] = [];
+            if (varArgsParam) {
+              const vname = this.escapeIdentifier(varArgsParam.name);
+              rest.push(
+                needsVarArgsArray ? `${vname}: unknown[] | undefined` : `...${vname}: unknown[]`
+              );
+            }
+            rest.push(`kwargs: ${kwargsType}`);
+            overloads.push(
+              `  ${mname}${methodTypeParamDecl}(${[...head, ...rest].join(', ')}): Promise<${returnType}>;`
+            );
+            if (varArgsParam && needsVarArgsArray) {
+              overloads.push(
+                `  ${mname}${methodTypeParamDecl}(${[...head, `kwargs: ${kwargsType}`].join(', ')}): Promise<${returnType}>;`
+              );
+            }
+          }
+        }
+        const overloadDecl = overloads.length > 0 ? `${overloads.join('\n')}\n` : '';
+
+        const callPreludeLines: string[] = [];
+        if (needsKwargsParam) {
+          callPreludeLines.push(`    let __kwargs = kwargs;`);
+        }
+        const positionalArgExprs = positionalParams.map(p => this.escapeIdentifier(p.name));
+        callPreludeLines.push(`    const __args: unknown[] = [${positionalArgExprs.join(', ')}];`);
+        if (requiredPosCount < positionalParams.length) {
+          callPreludeLines.push(
+            `    while (__args.length > ${requiredPosCount} && __args[__args.length - 1] === undefined) {`
+          );
+          callPreludeLines.push(`      __args.pop();`);
+          callPreludeLines.push(`    }`);
+        }
+        if (needsKwargsParam && requiredPosCount < positionalParams.length) {
+          const looksLikeKwargs = this.renderLooksLikeKwargsExpr('__candidate', {
+            keywordOnlyNames,
+            requiredKwOnlyNames,
+            hasVarKwArgs,
+          });
+          callPreludeLines.push(
+            `    if (__kwargs === undefined && __args.length > ${requiredPosCount}) {`
+          );
+          callPreludeLines.push(`      const __candidate = __args[__args.length - 1];`);
+          callPreludeLines.push(`      if (${looksLikeKwargs}) {`);
+          callPreludeLines.push(`        __kwargs = __candidate as any;`);
+          callPreludeLines.push(`        __args.pop();`);
+          callPreludeLines.push(`      }`);
+          callPreludeLines.push(`    }`);
+        }
+        if (varArgsParam) {
+          const vname = this.escapeIdentifier(varArgsParam.name);
+          if (needsVarArgsArray) {
+            const looksLikeKwargs = this.renderLooksLikeKwargsExpr(vname, {
+              keywordOnlyNames,
+              requiredKwOnlyNames,
+              hasVarKwArgs,
+            });
+            callPreludeLines.push(`    let __varargs: unknown[] = [];`);
+            callPreludeLines.push(`    if (${vname} !== undefined) {`);
+            callPreludeLines.push(`      if (globalThis.Array.isArray(${vname})) {`);
+            callPreludeLines.push(`        __varargs = ${vname};`);
+            callPreludeLines.push(
+              `      } else if (__kwargs === undefined && ${looksLikeKwargs}) {`
+            );
+            callPreludeLines.push(`        __kwargs = ${vname} as any;`);
+            callPreludeLines.push(`      } else {`);
+            callPreludeLines.push(
+              `        throw new Error(\`${method.name} expected ${varArgsParam.name} to be an array\`);`
+            );
+            callPreludeLines.push(`      }`);
+            callPreludeLines.push(`    }`);
+            callPreludeLines.push(`    __args.push(...__varargs);`);
+          } else {
+            callPreludeLines.push(`    __args.push(...${vname});`);
+          }
+        }
+        const callPrelude = callPreludeLines.length > 0 ? `${callPreludeLines.join('\n')}\n` : '';
+
+        const guardLines: string[] = [];
+        if (needsKwargsParam && positionalOnlyNames.length > 0) {
+          guardLines.push(
+            `    const __positionalOnly = ${JSON.stringify(positionalOnlyNames)} as const;`
+          );
+          guardLines.push(`    for (const key of __positionalOnly) {`);
+          guardLines.push(
+            `      if (__kwargs && Object.prototype.hasOwnProperty.call(__kwargs, key)) {`
+          );
+          guardLines.push(
+            `        throw new Error(\`${method.name} does not accept positional-only argument "\${key}" as a keyword argument\`);`
+          );
+          guardLines.push(`      }`);
+          guardLines.push(`    }`);
+        }
+        if (needsKwargsParam && requiredKwOnlyNames.length > 0) {
+          guardLines.push(
+            `    const __requiredKwOnly = ${JSON.stringify(requiredKwOnlyNames)} as const;`
+          );
+          guardLines.push(`    const __missing: string[] = [];`);
+          guardLines.push(`    for (const key of __requiredKwOnly) {`);
+          guardLines.push(
+            `      if (!__kwargs || !Object.prototype.hasOwnProperty.call(__kwargs, key)) {`
+          );
+          guardLines.push(`        __missing.push(key);`);
+          guardLines.push(`      }`);
+          guardLines.push(`    }`);
+          guardLines.push(`    if (__missing.length > 0) {`);
+          guardLines.push(
+            `      throw new Error(\`Missing required keyword-only arguments for ${method.name}: \${__missing.join(', ')}\`);`
+          );
+          guardLines.push(`    }`);
+        }
+        const guards = guardLines.length > 0 ? `${guardLines.join('\n')}\n` : '';
+
+        methodBodies.push(`${overloadDecl}  async ${mname}${methodTypeParamDecl}(${paramsDecl}): Promise<${returnType}> {
+${callPrelude}${guards}    return getRuntimeBridge().callMethod(this.__handle, '${method.name}', __args${
+          needsKwargsParam ? ', __kwargs' : ''
+        });
+  }`);
+        methodDeclarations.push(
+          `${overloadDecl}${overloads.length > 0 ? '' : `  ${mname}${methodTypeParamDecl}(${paramsDecl}): Promise<${returnType}>;\n`}`
+        );
+      });
 
-    // Constructor typing from __init__
     const init = cls.methods.find(m => m.name === '__init__');
-    const ctorParams = init
-      ? init.parameters
-          .filter(p => p.name !== 'self' && p.name !== 'cls')
-          .map(p =>
-            p.varArgs
-              ? `...${this.escapeIdentifier(p.name)}: unknown[]`
-              : p.kwArgs
-                ? `kwargs?: Record<string, unknown>`
-                : `${this.escapeIdentifier(p.name)}${p.optional ? '?' : ''}: ${this.typeToTs(this.mapper.mapPythonType(p.type, 'value'))}`
-          )
-          .join(', ')
-      : `...args: unknown[]`;
-
-    const ctorHasKwArgs = init
-      ? init.parameters.some(p => p.name !== 'self' && p.name !== 'cls' && p.kwArgs)
-      : false;
-
-    const ctorArgsPassthrough = init
-      ? init.parameters
-          .filter(p => p.name !== 'self' && p.name !== 'cls' && !p.kwArgs)
-          .map(p =>
-            p.varArgs ? `...${this.escapeIdentifier(p.name)}` : this.escapeIdentifier(p.name)
-          )
-          .join(', ')
-      : '...args';
+    const ctorSpec = (() => {
+      if (!init) {
+        return {
+          overloadDecl: '',
+          declaration: `  static create${classTypeParamDecl}(...args: unknown[]): Promise<${classSelfType}>;\n`,
+          paramsDecl: `...args: unknown[]`,
+          callPrelude: `    const __args: unknown[] = [...args];\n`,
+          hasKwargs: false,
+          guardLines: [] as string[],
+        };
+      }
+
+      const fparams = init.parameters.filter(p => p.name !== 'self' && p.name !== 'cls');
+      const keywordOnlyParams = fparams.filter(p => p.keywordOnly);
+      const positionalOnlyNames = fparams.filter(p => p.positionalOnly).map(p => p.name);
+      const hasVarKwArgs = fparams.some(p => p.kwArgs);
+      const needsKwargsParam = keywordOnlyParams.length > 0 || hasVarKwArgs;
+      const varArgsParam = fparams.find(p => p.varArgs);
+      const needsVarArgsArray = Boolean(varArgsParam) && needsKwargsParam;
+      const positionalParams = fparams.filter(p => !p.keywordOnly && !p.varArgs && !p.kwArgs);
+      const firstOptionalPosIndex = positionalParams.findIndex(p => p.optional);
+      const requiredPosCount =
+        firstOptionalPosIndex >= 0 ? firstOptionalPosIndex : positionalParams.length;
+      const keywordOnlyNames = keywordOnlyParams.map(p => p.name);
+
+      const renderPositionalParam = (
+        p: (typeof positionalParams)[number],
+        forceRequired = false
+      ): string => {
+        const pname = this.escapeIdentifier(p.name);
+        const opt = !forceRequired && p.optional ? '?' : '';
+        return `${pname}${opt}: ${tsValueType(p)}`;
+      };
+
+      const kwargsType = (() => {
+        if (!needsKwargsParam) {
+          return '';
+        }
+        if (keywordOnlyParams.length === 0 && hasVarKwArgs) {
+          return 'Record<string, unknown>';
+        }
+        const props = keywordOnlyParams
+          .map(p => `${JSON.stringify(p.name)}${p.optional ? '?' : ''}: ${tsValueType(p)};`)
+          .join(' ');
+        const obj = `{ ${props} }`;
+        return hasVarKwArgs ? `(${obj} & Record<string, unknown>)` : obj;
+      })();
+
+      const paramsDeclParts: string[] = [];
+      positionalParams.forEach(p => {
+        paramsDeclParts.push(renderPositionalParam(p));
+      });
+      if (varArgsParam) {
+        const vname = this.escapeIdentifier(varArgsParam.name);
+        paramsDeclParts.push(needsVarArgsArray ? `${vname}?: unknown[]` : `...${vname}: unknown[]`);
+      }
+      if (needsKwargsParam) {
+        paramsDeclParts.push(`kwargs?: ${kwargsType}`);
+      }
+      const paramsDecl = paramsDeclParts.join(', ');
+
+      const requiredKwOnlyNames = keywordOnlyParams.filter(p => !p.optional).map(p => p.name);
+      const overloads: string[] = [];
+      if (needsKwargsParam && requiredKwOnlyNames.length > 0) {
+        const firstOptionalIndex = positionalParams.findIndex(p => p.optional);
+        const requiredPosCount =
+          firstOptionalIndex >= 0 ? firstOptionalIndex : positionalParams.length;
+        for (let i = requiredPosCount; i <= positionalParams.length; i++) {
+          const head = positionalParams.slice(0, i).map(p => renderPositionalParam(p, true));
+          const rest: string[] = [];
+          if (varArgsParam) {
+            const vname = this.escapeIdentifier(varArgsParam.name);
+            rest.push(
+              needsVarArgsArray ? `${vname}: unknown[] | undefined` : `...${vname}: unknown[]`
+            );
+          }
+          rest.push(`kwargs: ${kwargsType}`);
+          overloads.push(
+            `  static create${classTypeParamDecl}(${[...head, ...rest].join(', ')}): Promise<${classSelfType}>;`
+          );
+          if (varArgsParam && needsVarArgsArray) {
+            overloads.push(
+              `  static create${classTypeParamDecl}(${[...head, `kwargs: ${kwargsType}`].join(', ')}): Promise<${classSelfType}>;`
+            );
+          }
+        }
+      }
+      const overloadDecl = overloads.length > 0 ? `${overloads.join('\n')}\n` : '';
+      const declaration =
+        overloads.length > 0
+          ? overloadDecl
+          : `  static create${classTypeParamDecl}(${paramsDecl}): Promise<${classSelfType}>;\n`;
+
+      const guardLines: string[] = [];
+      const callPreludeLines: string[] = [];
+      if (needsKwargsParam) {
+        callPreludeLines.push(`    let __kwargs = kwargs;`);
+      }
+      const positionalArgExprs = positionalParams.map(p => this.escapeIdentifier(p.name));
+      callPreludeLines.push(`    const __args: unknown[] = [${positionalArgExprs.join(', ')}];`);
+      if (requiredPosCount < positionalParams.length) {
+        callPreludeLines.push(
+          `    while (__args.length > ${requiredPosCount} && __args[__args.length - 1] === undefined) {`
+        );
+        callPreludeLines.push(`      __args.pop();`);
+        callPreludeLines.push(`    }`);
+      }
+      if (needsKwargsParam && requiredPosCount < positionalParams.length) {
+        const looksLikeKwargs = this.renderLooksLikeKwargsExpr('__candidate', {
+          keywordOnlyNames,
+          requiredKwOnlyNames,
+          hasVarKwArgs,
+        });
+        callPreludeLines.push(
+          `    if (__kwargs === undefined && __args.length > ${requiredPosCount}) {`
+        );
+        callPreludeLines.push(`      const __candidate = __args[__args.length - 1];`);
+        callPreludeLines.push(`      if (${looksLikeKwargs}) {`);
+        callPreludeLines.push(`        __kwargs = __candidate as any;`);
+        callPreludeLines.push(`        __args.pop();`);
+        callPreludeLines.push(`      }`);
+        callPreludeLines.push(`    }`);
+      }
+      if (varArgsParam) {
+        const vname = this.escapeIdentifier(varArgsParam.name);
+        if (needsVarArgsArray) {
+          const looksLikeKwargs = this.renderLooksLikeKwargsExpr(vname, {
+            keywordOnlyNames,
+            requiredKwOnlyNames,
+            hasVarKwArgs,
+          });
+          callPreludeLines.push(`    let __varargs: unknown[] = [];`);
+          callPreludeLines.push(`    if (${vname} !== undefined) {`);
+          callPreludeLines.push(`      if (globalThis.Array.isArray(${vname})) {`);
+          callPreludeLines.push(`        __varargs = ${vname};`);
+          callPreludeLines.push(`      } else if (__kwargs === undefined && ${looksLikeKwargs}) {`);
+          callPreludeLines.push(`        __kwargs = ${vname} as any;`);
+          callPreludeLines.push(`      } else {`);
+          callPreludeLines.push(
+            `        throw new Error(\`__init__ expected ${varArgsParam.name} to be an array\`);`
+          );
+          callPreludeLines.push(`      }`);
+          callPreludeLines.push(`    }`);
+          callPreludeLines.push(`    __args.push(...__varargs);`);
+        } else {
+          callPreludeLines.push(`    __args.push(...${vname});`);
+        }
+      }
+      const callPrelude = callPreludeLines.length > 0 ? `${callPreludeLines.join('\n')}\n` : '';
+
+      if (needsKwargsParam && positionalOnlyNames.length > 0) {
+        guardLines.push(
+          `    const __positionalOnly = ${JSON.stringify(positionalOnlyNames)} as const;`
+        );
+        guardLines.push(`    for (const key of __positionalOnly) {`);
+        guardLines.push(
+          `      if (__kwargs && Object.prototype.hasOwnProperty.call(__kwargs, key)) {`
+        );
+        guardLines.push(
+          `        throw new Error(\`__init__ does not accept positional-only argument "\${key}" as a keyword argument\`);`
+        );
+        guardLines.push(`      }`);
+        guardLines.push(`    }`);
+      }
+      if (needsKwargsParam && requiredKwOnlyNames.length > 0) {
+        guardLines.push(
+          `    const __requiredKwOnly = ${JSON.stringify(requiredKwOnlyNames)} as const;`
+        );
+        guardLines.push(`    const __missing: string[] = [];`);
+        guardLines.push(`    for (const key of __requiredKwOnly) {`);
+        guardLines.push(
+          `      if (!__kwargs || !Object.prototype.hasOwnProperty.call(__kwargs, key)) {`
+        );
+        guardLines.push(`        __missing.push(key);`);
+        guardLines.push(`      }`);
+        guardLines.push(`    }`);
+        guardLines.push(`    if (__missing.length > 0) {`);
+        guardLines.push(
+          `      throw new Error(\`Missing required keyword-only arguments for __init__: \${__missing.join(', ')}\`);`
+        );
+        guardLines.push(`    }`);
+      }
+
+      return {
+        overloadDecl,
+        declaration,
+        paramsDecl,
+        callPrelude,
+        hasKwargs: needsKwargsParam,
+        guardLines,
+      };
+    })();
 
-    const cname = this.escapeIdentifier(cls.name);
     const moduleId = moduleName ?? '__main__';
-    const methodsSection = methodBodies ? `\n${methodBodies}\n` : '\n';
-    const ts = `${jsdoc}export class ${cname} {
+    const methodsSection = methodBodies.length > 0 ? `\n${methodBodies.join('\n')}\n` : '\n';
+    const declarationMethodsSection =
+      methodDeclarations.length > 0 ? `\n${methodDeclarations.join('')}\n` : '\n';
+    const ctorGuards = ctorSpec.guardLines.length > 0 ? `${ctorSpec.guardLines.join('\n')}\n` : '';
+    const newClassExpr = `new ${cname}${classGenericContext.typeArguments}(handle)`;
+    const ts = `${jsdoc}export class ${cname}${classTypeParamDecl} {
   private readonly __handle: string;
   private constructor(handle: string) { this.__handle = handle; }
-  static async create(${ctorParams}): Promise<${cname}> {
-    const handle = await getRuntimeBridge().instantiate<string>('${moduleId}', '${cls.name}', [${ctorArgsPassthrough}]${ctorHasKwArgs ? ', kwargs' : ''});
-    return new ${cname}(handle);
+${ctorSpec.overloadDecl}  static async create${classTypeParamDecl}(${ctorSpec.paramsDecl}): Promise<${classSelfType}> {
+${ctorSpec.callPrelude}${ctorGuards}    const handle = await getRuntimeBridge().instantiate<string>('${moduleId}', '${cls.name}', __args${
+      ctorSpec.hasKwargs ? ', __kwargs' : ''
+    });
+    return ${newClassExpr};
   }
-  static fromHandle(handle: string): ${cname} { return new ${cname}(handle); }${methodsSection}  async disposeHandle(): Promise<void> { await getRuntimeBridge().disposeInstance(this.__handle); }
+  static fromHandle${classTypeParamDecl}(handle: string): ${classSelfType} { return ${newClassExpr}; }${methodsSection}  async disposeHandle(): Promise<void> { await getRuntimeBridge().disposeInstance(this.__handle); }
 }
 `;
 
-    return this.wrap(ts, [cls.name]);
+    const declaration = `${jsdoc}export class ${cname}${classTypeParamDecl} {
+  private readonly __handle: string;
+  private constructor(handle: string);
+${ctorSpec.declaration}  static fromHandle${classTypeParamDecl}(handle: string): ${classSelfType};${declarationMethodsSection}  disposeHandle(): Promise<void>;
+}
+`;
+
+    return this.wrap(ts, declaration, [cls.name]);
+  }
+
+  generateTypeAlias(alias: PythonTypeAlias, moduleName?: string): GeneratedCode {
+    const genericContext = this.buildGenericRenderContext(
+      this.getTypeParameters(alias.typeParameters),
+      [alias.type],
+      moduleName
+    );
+    const aliasName = this.escapeIdentifier(alias.name, { preserveCase: true });
+    const body = this.typeToTsFromPython(alias.type, genericContext, 'value');
+    const ts = `export type ${aliasName}${genericContext.declaration} = ${body}\n`;
+    return this.wrap(ts, ts, [alias.name]);
   }
 
   /**
@@ -335,16 +1161,22 @@ export class CodeGenerator {
   }
 
   generateModuleDefinition(module: PythonModule, annotatedJSDoc = false): GeneratedCode {
-    const functionCodes = [...module.functions]
+    const functionResults = [...module.functions]
+      .sort((a, b) => a.name.localeCompare(b.name))
+      .map(f => this.generateFunctionWrapper(f, module.name, annotatedJSDoc));
+    const classResults = [...module.classes]
       .sort((a, b) => a.name.localeCompare(b.name))
-      .map(f => this.generateFunctionWrapper(f, module.name, annotatedJSDoc).typescript)
-      .join('\n');
-    const classCodes = [...module.classes]
+      .map(c => this.generateClassWrapper(c, module.name, annotatedJSDoc));
+    const typeAliasResults = [...(module.typeAliases ?? [])]
       .sort((a, b) => a.name.localeCompare(b.name))
-      .map(c => this.generateClassWrapper(c, module.name, annotatedJSDoc).typescript)
-      .join('\n');
+      .map(alias => this.generateTypeAlias(alias, module.name));
+
+    const functionCodes = functionResults.map(result => result.typescript).join('\n');
+    const classCodes = classResults.map(result => result.typescript).join('\n');
+    const typeAliasCodes = typeAliasResults.map(result => result.typescript).join('\n');
 
     const header = `// Generated by tywrap\n// Module: ${module.name}\n// DO NOT EDIT MANUALLY\n\n`;
+    const declarationHeader = `// Generated by tywrap\n// Type Declarations\n// DO NOT EDIT MANUALLY\n\n`;
     const hasRuntimeClasses = module.classes.some(c => {
       const kind = c.kind ?? 'class';
       return kind === 'class' && !c.decorators.includes('__typed_dict__');
@@ -352,8 +1184,13 @@ export class CodeGenerator {
     const needsRuntime = module.functions.length > 0 || hasRuntimeClasses;
     const bridgeDecl = needsRuntime ? `import { getRuntimeBridge } from 'tywrap/runtime';\n\n` : '';
 
-    const ts = `${header + bridgeDecl + functionCodes}\n${classCodes}`;
-    return this.wrap(ts, [module.name]);
+    const ts = `${`${header}${bridgeDecl}${functionCodes}\n${classCodes}\n${typeAliasCodes}`.trimEnd()}\n`;
+    const declaration = `${`${declarationHeader}${functionResults
+      .map(result => result.declaration)
+      .join('\n')}\n${classResults
+      .map(result => result.declaration)
+      .join('\n')}\n${typeAliasResults.map(result => result.declaration).join('\n')}`.trimEnd()}\n`;
+    return this.wrap(ts, declaration, [module.name]);
   }
 
   private generateJsDoc(doc?: string, paramAnnotations?: readonly string[]): string {
@@ -373,10 +1210,10 @@ export class CodeGenerator {
     return `/**\n${lines.join('\n')}\n */\n`;
   }
 
-  private wrap(typescript: string, _sources: string[]): GeneratedCode {
+  private wrap(typescript: string, declaration: string, _sources: string[]): GeneratedCode {
     return {
       typescript,
-      declaration: '',
+      declaration,
       sourceMap: undefined,
       metadata: {
         generatedAt: new Date(),
@@ -438,6 +1275,9 @@ export class CodeGenerator {
       }
       case 'custom': {
         const c = type as { kind: 'custom'; name: string };
+        if (!/^[A-Za-z_$][A-Za-z0-9_$]*$/.test(c.name)) {
+          return 'unknown';
+        }
         return c.name;
       }
       case 'literal': {