@constructive-io/graphql-codegen 2.21.0 → 2.22.1

package/esm/cli/codegen/queries.js

@@ -1,6 +1,6 @@
 import { createProject, createSourceFile, getFormattedOutput, createFileHeader, createImport, createInterface, createConst, createTypeAlias, createUnionType, createFilterInterface, } from './ts-ast';
 import { buildListQueryAST, buildSingleQueryAST, printGraphQL, } from './gql-ast';
-import { getTableNames, getListQueryHookName, getSingleQueryHookName, getListQueryFileName, getSingleQueryFileName, getAllRowsQueryName, getSingleRowQueryName, getFilterTypeName, getOrderByTypeName, getScalarFields, getScalarFilterType, toScreamingSnake, ucFirst, } from './utils';
+import { getTableNames, getListQueryHookName, getSingleQueryHookName, getListQueryFileName, getSingleQueryFileName, getAllRowsQueryName, getSingleRowQueryName, getFilterTypeName, getOrderByTypeName, getScalarFields, getScalarFilterType, getPrimaryKeyInfo, toScreamingSnake, ucFirst, } from './utils';
 // ============================================================================
 // List query hook generator
 // ============================================================================
@@ -28,7 +28,7 @@ export function generateListQueryHook(table, options = {}) {
     // Collect all filter types used by this table's fields
     const filterTypesUsed = new Set();
     for (const field of scalarFields) {
-        const filterType = getScalarFilterType(field.type.gqlType);
+        const filterType = getScalarFilterType(field.type.gqlType, field.type.isArray);
         if (filterType) {
             filterTypesUsed.add(filterType);
         }
@@ -66,12 +66,14 @@ export function generateListQueryHook(table, options = {}) {
     // Generate filter interface
     const fieldFilters = scalarFields
         .map((field) => {
-        const filterType = getScalarFilterType(field.type.gqlType);
+        const filterType = getScalarFilterType(field.type.gqlType, field.type.isArray);
         return filterType ? { fieldName: field.name, filterType } : null;
     })
         .filter((f) => f !== null);
-    sourceFile.addInterface(createFilterInterface(filterTypeName, fieldFilters));
+    // Note: Not exported to avoid conflicts with schema-types
+    sourceFile.addInterface(createFilterInterface(filterTypeName, fieldFilters, { isExported: false }));
     // Generate OrderBy type
+    // Note: Not exported to avoid conflicts with schema-types
     const orderByValues = [
         ...scalarFields.flatMap((f) => [
             `${toScreamingSnake(f.name)}_ASC`,
@@ -81,7 +83,7 @@ export function generateListQueryHook(table, options = {}) {
         'PRIMARY_KEY_ASC',
         'PRIMARY_KEY_DESC',
     ];
-    sourceFile.addTypeAlias(createTypeAlias(orderByTypeName, createUnionType(orderByValues)));
+    sourceFile.addTypeAlias(createTypeAlias(orderByTypeName, createUnionType(orderByValues), { isExported: false }));
     // Variables interface
     const variablesProps = [
         { name: 'first', type: 'number', optional: true },
@@ -264,6 +266,13 @@ export function generateSingleQueryHook(table, options = {}) {
     const { typeName, singularName } = getTableNames(table);
     const hookName = getSingleQueryHookName(table);
     const queryName = getSingleRowQueryName(table);
+    // Get primary key info dynamically from table constraints
+    const pkFields = getPrimaryKeyInfo(table);
+    // For simplicity, use first PK field (most common case)
+    // Composite PKs would need more complex handling
+    const pkField = pkFields[0];
+    const pkName = pkField.name;
+    const pkTsType = pkField.tsType;
     // Generate GraphQL document via AST
     const queryAST = buildSingleQueryAST({ table });
     const queryDocument = printGraphQL(queryAST);
@@ -303,9 +312,9 @@ export function generateSingleQueryHook(table, options = {}) {
     sourceFile.addStatements('\n// ============================================================================');
     sourceFile.addStatements('// Types');
     sourceFile.addStatements('// ============================================================================\n');
-    // Variables interface
+    // Variables interface - use dynamic PK field name and type
     sourceFile.addInterface(createInterface(`${ucFirst(singularName)}QueryVariables`, [
-        { name: 'id', type: 'string' },
+        { name: pkName, type: pkTsType },
     ]));
     // Result interface
     sourceFile.addInterface(createInterface(`${ucFirst(singularName)}QueryResult`, [
@@ -315,20 +324,20 @@ export function generateSingleQueryHook(table, options = {}) {
     sourceFile.addStatements('\n// ============================================================================');
     sourceFile.addStatements('// Query Key');
     sourceFile.addStatements('// ============================================================================\n');
-    // Query key factory
-    sourceFile.addVariableStatement(createConst(`${queryName}QueryKey`, `(id: string) =>
-  ['${typeName.toLowerCase()}', 'detail', id] as const`));
+    // Query key factory - use dynamic PK field name and type
+    sourceFile.addVariableStatement(createConst(`${queryName}QueryKey`, `(${pkName}: ${pkTsType}) =>
+  ['${typeName.toLowerCase()}', 'detail', ${pkName}] as const`));
     // Add React Query hook section (only if enabled)
     if (reactQueryEnabled) {
         sourceFile.addStatements('\n// ============================================================================');
         sourceFile.addStatements('// Hook');
         sourceFile.addStatements('// ============================================================================\n');
-        // Hook function
+        // Hook function - use dynamic PK field name and type
         sourceFile.addFunction({
             name: hookName,
             isExported: true,
             parameters: [
-                { name: 'id', type: 'string' },
+                { name: pkName, type: pkTsType },
                 {
                     name: 'options',
                     type: `Omit<UseQueryOptions<${ucFirst(singularName)}QueryResult, Error>, 'queryKey' | 'queryFn'>`,
@@ -336,24 +345,24 @@ export function generateSingleQueryHook(table, options = {}) {
                 },
             ],
             statements: `return useQuery({
-    queryKey: ${queryName}QueryKey(id),
+    queryKey: ${queryName}QueryKey(${pkName}),
     queryFn: () => execute<${ucFirst(singularName)}QueryResult, ${ucFirst(singularName)}QueryVariables>(
       ${queryName}QueryDocument,
-      { id }
+      { ${pkName} }
     ),
-    enabled: !!id && (options?.enabled !== false),
+    enabled: !!${pkName} && (options?.enabled !== false),
     ...options,
   });`,
             docs: [
                 {
-                    description: `Query hook for fetching a single ${typeName} by ID
+                    description: `Query hook for fetching a single ${typeName} by primary key
 
 @example
 \`\`\`tsx
-const { data, isLoading } = ${hookName}('uuid-here');
+const { data, isLoading } = ${hookName}(${pkTsType === 'string' ? "'value-here'" : '123'});
 
 if (data?.${queryName}) {
-  console.log(data.${queryName}.id);
+  console.log(data.${queryName}.${pkName});
 }
 \`\`\``,
                 },
@@ -364,13 +373,13 @@ if (data?.${queryName}) {
     sourceFile.addStatements('\n// ============================================================================');
     sourceFile.addStatements('// Standalone Functions (non-React)');
     sourceFile.addStatements('// ============================================================================\n');
-    // Fetch function (standalone, no React)
+    // Fetch function (standalone, no React) - use dynamic PK
     sourceFile.addFunction({
         name: `fetch${ucFirst(singularName)}Query`,
         isExported: true,
         isAsync: true,
         parameters: [
-            { name: 'id', type: 'string' },
+            { name: pkName, type: pkTsType },
             {
                 name: 'options',
                 type: 'ExecuteOptions',
@@ -380,21 +389,21 @@ if (data?.${queryName}) {
         returnType: `Promise<${ucFirst(singularName)}QueryResult>`,
         statements: `return execute<${ucFirst(singularName)}QueryResult, ${ucFirst(singularName)}QueryVariables>(
     ${queryName}QueryDocument,
-    { id },
+    { ${pkName} },
     options
   );`,
         docs: [
             {
-                description: `Fetch a single ${typeName} by ID without React hooks
+                description: `Fetch a single ${typeName} by primary key without React hooks
 
 @example
 \`\`\`ts
-const data = await fetch${ucFirst(singularName)}Query('uuid-here');
+const data = await fetch${ucFirst(singularName)}Query(${pkTsType === 'string' ? "'value-here'" : '123'});
 \`\`\``,
             },
         ],
     });
-    // Prefetch function (for SSR/QueryClient) - only if React Query is enabled
+    // Prefetch function (for SSR/QueryClient) - only if React Query is enabled, use dynamic PK
     if (reactQueryEnabled) {
         sourceFile.addFunction({
             name: `prefetch${ucFirst(singularName)}Query`,
@@ -402,7 +411,7 @@ const data = await fetch${ucFirst(singularName)}Query('uuid-here');
             isAsync: true,
             parameters: [
                 { name: 'queryClient', type: 'QueryClient' },
-                { name: 'id', type: 'string' },
+                { name: pkName, type: pkTsType },
                 {
                     name: 'options',
                     type: 'ExecuteOptions',
@@ -411,10 +420,10 @@ const data = await fetch${ucFirst(singularName)}Query('uuid-here');
             ],
             returnType: 'Promise<void>',
             statements: `await queryClient.prefetchQuery({
-    queryKey: ${queryName}QueryKey(id),
+    queryKey: ${queryName}QueryKey(${pkName}),
     queryFn: () => execute<${ucFirst(singularName)}QueryResult, ${ucFirst(singularName)}QueryVariables>(
       ${queryName}QueryDocument,
-      { id },
+      { ${pkName} },
       options
     ),
   });`,
@@ -424,7 +433,7 @@ const data = await fetch${ucFirst(singularName)}Query('uuid-here');
 
 @example
 \`\`\`ts
-await prefetch${ucFirst(singularName)}Query(queryClient, 'uuid-here');
+await prefetch${ucFirst(singularName)}Query(queryClient, ${pkTsType === 'string' ? "'value-here'" : '123'});
 \`\`\``,
                 },
             ],

package/esm/cli/codegen/scalars.d.ts

@@ -4,9 +4,11 @@
 export declare const SCALAR_TS_MAP: Record<string, string>;
 export declare const SCALAR_FILTER_MAP: Record<string, string>;
 export declare const SCALAR_NAMES: Set<string>;
-export interface ScalarToTsOptions {
+/** All base filter type names - skip these in schema-types.ts to avoid duplicates */
+export declare const BASE_FILTER_TYPE_NAMES: Set<string>;
+export declare function scalarToTsType(scalarName: string, options?: {
     unknownScalar?: 'unknown' | 'name';
     overrides?: Record<string, string>;
-}
-export declare function scalarToTsType(scalarName: string, options?: ScalarToTsOptions): string;
-export declare function scalarToFilterType(scalarName: string): string | null;
+}): string;
+/** Get the filter type for a scalar (handles both scalar and array types) */
+export declare function scalarToFilterType(scalarName: string, isArray?: boolean): string | null;

package/esm/cli/codegen/scalars.js

@@ -32,6 +32,8 @@ export const SCALAR_TS_MAP = {
     MacAddr: 'string',
     TsVector: 'string',
     TsQuery: 'string',
+    // File upload
+    Upload: 'File',
 };
 export const SCALAR_FILTER_MAP = {
     String: 'StringFilter',
@@ -52,15 +54,21 @@ export const SCALAR_FILTER_MAP = {
     Interval: 'StringFilter',
 };
 export const SCALAR_NAMES = new Set(Object.keys(SCALAR_TS_MAP));
+/** Scalars that have list filter variants (e.g., StringListFilter) */
+const LIST_FILTER_SCALARS = new Set(['String', 'Int', 'UUID']);
+/** All base filter type names - skip these in schema-types.ts to avoid duplicates */
+export const BASE_FILTER_TYPE_NAMES = new Set([
+    ...new Set(Object.values(SCALAR_FILTER_MAP)),
+    ...Array.from(LIST_FILTER_SCALARS).map((s) => `${s}ListFilter`),
+]);
 export function scalarToTsType(scalarName, options = {}) {
-    const override = options.overrides?.[scalarName];
-    if (override)
-        return override;
-    const mapped = SCALAR_TS_MAP[scalarName];
-    if (mapped)
-        return mapped;
-    return options.unknownScalar === 'unknown' ? 'unknown' : scalarName;
+    return options.overrides?.[scalarName] ?? SCALAR_TS_MAP[scalarName] ?? (options.unknownScalar === 'unknown' ? 'unknown' : scalarName);
 }
-export function scalarToFilterType(scalarName) {
+/** Get the filter type for a scalar (handles both scalar and array types) */
+export function scalarToFilterType(scalarName, isArray = false) {
+    const baseName = scalarName === 'ID' ? 'UUID' : scalarName;
+    if (isArray) {
+        return LIST_FILTER_SCALARS.has(baseName) ? `${baseName}ListFilter` : null;
+    }
     return SCALAR_FILTER_MAP[scalarName] ?? null;
 }

package/esm/cli/codegen/schema-types-generator.d.ts

@@ -0,0 +1,26 @@
+import type { TypeRegistry } from '../../types/schema';
+export interface GeneratedSchemaTypesFile {
+    fileName: string;
+    content: string;
+    /** List of enum type names that were generated */
+    generatedEnums: string[];
+    /** List of table entity types that are referenced */
+    referencedTableTypes: string[];
+}
+export interface GenerateSchemaTypesOptions {
+    /** The TypeRegistry containing all GraphQL types */
+    typeRegistry: TypeRegistry;
+    /** Type names that already exist in types.ts (table entity types) */
+    tableTypeNames: Set<string>;
+}
+export interface PayloadTypesResult {
+    generatedTypes: Set<string>;
+    referencedTableTypes: Set<string>;
+}
+/**
+ * Generate comprehensive schema-types.ts file using ts-morph AST
+ *
+ * This generates all Input/Payload/Enum types from the TypeRegistry
+ * that are needed by custom mutation/query hooks.
+ */
+export declare function generateSchemaTypesFile(options: GenerateSchemaTypesOptions): GeneratedSchemaTypesFile;

package/esm/cli/codegen/schema-types-generator.js

@@ -0,0 +1,362 @@
+import { createProject, createSourceFile, getMinimalFormattedOutput, createFileHeader, createInterface, createTypeAlias, addSectionComment, } from './ts-ast';
+import { getTypeBaseName } from './type-resolver';
+import { scalarToTsType, SCALAR_NAMES, BASE_FILTER_TYPE_NAMES } from './scalars';
+// ============================================================================
+// Constants
+// ============================================================================
+/**
+ * Types that should not be generated (scalars, built-ins, types generated elsewhere)
+ */
+const SKIP_TYPES = new Set([
+    ...SCALAR_NAMES,
+    // GraphQL built-ins
+    'Query',
+    'Mutation',
+    'Subscription',
+    '__Schema',
+    '__Type',
+    '__Field',
+    '__InputValue',
+    '__EnumValue',
+    '__Directive',
+    // Note: PageInfo and Cursor are NOT skipped - they're needed by Connection types
+    // Base filter types (generated in types.ts via filters.ts)
+    ...BASE_FILTER_TYPE_NAMES,
+]);
+/**
+ * Type name patterns to skip (regex patterns)
+ *
+ * Note: We intentionally DO NOT skip Connection, Edge, Filter, or Patch types
+ * because they may be referenced by custom operations or payload types.
+ * Only skip Condition and OrderBy which are typically not needed.
+ */
+const SKIP_TYPE_PATTERNS = [
+    /Condition$/, // e.g., UserCondition (filter conditions are separate)
+    /OrderBy$/, // e.g., UsersOrderBy (ordering is handled separately)
+];
+// ============================================================================
+// Type Conversion Utilities
+// ============================================================================
+/**
+ * Convert a CleanTypeRef to TypeScript type string
+ */
+function typeRefToTs(typeRef) {
+    if (typeRef.kind === 'NON_NULL') {
+        if (typeRef.ofType) {
+            return typeRefToTs(typeRef.ofType);
+        }
+        return typeRef.name ?? 'unknown';
+    }
+    if (typeRef.kind === 'LIST') {
+        if (typeRef.ofType) {
+            return `${typeRefToTs(typeRef.ofType)}[]`;
+        }
+        return 'unknown[]';
+    }
+    // Scalar or named type
+    const name = typeRef.name ?? 'unknown';
+    return scalarToTsType(name, { unknownScalar: 'name' });
+}
+/**
+ * Check if a type is required (NON_NULL)
+ */
+function isRequired(typeRef) {
+    return typeRef.kind === 'NON_NULL';
+}
+/**
+ * Check if a type should be skipped
+ */
+function shouldSkipType(typeName, tableTypeNames) {
+    // Skip scalars and built-ins
+    if (SKIP_TYPES.has(typeName))
+        return true;
+    // Skip table entity types (already in types.ts)
+    if (tableTypeNames.has(typeName))
+        return true;
+    // Skip types matching patterns
+    for (const pattern of SKIP_TYPE_PATTERNS) {
+        if (pattern.test(typeName))
+            return true;
+    }
+    // Skip table-specific types that would conflict with inline types in table-based hooks.
+    // Note: Patch and CreateInput are now NOT exported from hooks (isExported: false),
+    // so we only skip Filter types here.
+    // The Filter and OrderBy types are generated inline (non-exported) by table query hooks,
+    // but schema-types should still generate them for custom operations that need them.
+    // Actually, we don't skip any table-based types now since hooks don't export them.
+    return false;
+}
+// ============================================================================
+// ENUM Types Generator
+// ============================================================================
+/**
+ * Add ENUM types to source file
+ */
+function addEnumTypes(sourceFile, typeRegistry, tableTypeNames) {
+    const generatedTypes = new Set();
+    addSectionComment(sourceFile, 'Enum Types');
+    for (const [typeName, typeInfo] of typeRegistry) {
+        if (typeInfo.kind !== 'ENUM')
+            continue;
+        if (shouldSkipType(typeName, tableTypeNames))
+            continue;
+        if (!typeInfo.enumValues || typeInfo.enumValues.length === 0)
+            continue;
+        const values = typeInfo.enumValues.map((v) => `'${v}'`).join(' | ');
+        sourceFile.addTypeAlias(createTypeAlias(typeName, values));
+        generatedTypes.add(typeName);
+    }
+    return generatedTypes;
+}
+// ============================================================================
+// INPUT_OBJECT Types Generator
+// ============================================================================
+/**
+ * Add INPUT_OBJECT types to source file
+ * Uses iteration to handle nested input types
+ */
+function addInputObjectTypes(sourceFile, typeRegistry, tableTypeNames, alreadyGenerated) {
+    const generatedTypes = new Set(alreadyGenerated);
+    const typesToGenerate = new Set();
+    // Collect all INPUT_OBJECT types
+    for (const [typeName, typeInfo] of typeRegistry) {
+        if (typeInfo.kind !== 'INPUT_OBJECT')
+            continue;
+        if (shouldSkipType(typeName, tableTypeNames))
+            continue;
+        if (generatedTypes.has(typeName))
+            continue;
+        typesToGenerate.add(typeName);
+    }
+    if (typesToGenerate.size === 0)
+        return generatedTypes;
+    addSectionComment(sourceFile, 'Input Object Types');
+    // Process all types - no artificial limit
+    while (typesToGenerate.size > 0) {
+        const typeNameResult = typesToGenerate.values().next();
+        if (typeNameResult.done)
+            break;
+        const typeName = typeNameResult.value;
+        typesToGenerate.delete(typeName);
+        if (generatedTypes.has(typeName))
+            continue;
+        const typeInfo = typeRegistry.get(typeName);
+        if (!typeInfo || typeInfo.kind !== 'INPUT_OBJECT')
+            continue;
+        generatedTypes.add(typeName);
+        if (typeInfo.inputFields && typeInfo.inputFields.length > 0) {
+            const properties = [];
+            for (const field of typeInfo.inputFields) {
+                const optional = !isRequired(field.type);
+                const tsType = typeRefToTs(field.type);
+                properties.push({
+                    name: field.name,
+                    type: tsType,
+                    optional,
+                    docs: field.description ? [field.description] : undefined,
+                });
+                // Follow nested Input types
+                const baseType = getTypeBaseName(field.type);
+                if (baseType &&
+                    !generatedTypes.has(baseType) &&
+                    !shouldSkipType(baseType, tableTypeNames)) {
+                    const nestedType = typeRegistry.get(baseType);
+                    if (nestedType?.kind === 'INPUT_OBJECT') {
+                        typesToGenerate.add(baseType);
+                    }
+                }
+            }
+            sourceFile.addInterface(createInterface(typeName, properties));
+        }
+        else {
+            // Empty input object
+            sourceFile.addInterface(createInterface(typeName, []));
+        }
+    }
+    return generatedTypes;
+}
+// ============================================================================
+// UNION Types Generator
+// ============================================================================
+/**
+ * Add UNION types to source file
+ */
+function addUnionTypes(sourceFile, typeRegistry, tableTypeNames, alreadyGenerated) {
+    const generatedTypes = new Set(alreadyGenerated);
+    const unionTypesToGenerate = new Set();
+    // Collect all UNION types
+    for (const [typeName, typeInfo] of typeRegistry) {
+        if (typeInfo.kind !== 'UNION')
+            continue;
+        if (shouldSkipType(typeName, tableTypeNames))
+            continue;
+        if (generatedTypes.has(typeName))
+            continue;
+        unionTypesToGenerate.add(typeName);
+    }
+    if (unionTypesToGenerate.size === 0)
+        return generatedTypes;
+    addSectionComment(sourceFile, 'Union Types');
+    for (const typeName of unionTypesToGenerate) {
+        const typeInfo = typeRegistry.get(typeName);
+        if (!typeInfo || typeInfo.kind !== 'UNION')
+            continue;
+        if (!typeInfo.possibleTypes || typeInfo.possibleTypes.length === 0)
+            continue;
+        // Generate union type as TypeScript union
+        const unionMembers = typeInfo.possibleTypes.join(' | ');
+        sourceFile.addTypeAlias(createTypeAlias(typeName, unionMembers));
+        generatedTypes.add(typeName);
+    }
+    return generatedTypes;
+}
+/**
+ * Collect return types from Query and Mutation root types
+ * This dynamically discovers what OBJECT types need to be generated
+ * based on actual schema structure, not pattern matching
+ */
+function collectReturnTypesFromRootTypes(typeRegistry, tableTypeNames) {
+    const returnTypes = new Set();
+    // Get Query and Mutation root types
+    const queryType = typeRegistry.get('Query');
+    const mutationType = typeRegistry.get('Mutation');
+    const processFields = (fields) => {
+        if (!fields)
+            return;
+        for (const field of fields) {
+            const baseType = getTypeBaseName(field.type);
+            if (baseType && !shouldSkipType(baseType, tableTypeNames)) {
+                const typeInfo = typeRegistry.get(baseType);
+                if (typeInfo?.kind === 'OBJECT') {
+                    returnTypes.add(baseType);
+                }
+            }
+        }
+    };
+    if (queryType?.fields)
+        processFields(queryType.fields);
+    if (mutationType?.fields)
+        processFields(mutationType.fields);
+    return returnTypes;
+}
+/**
+ * Add Payload OBJECT types to source file
+ * These are return types from mutations (e.g., LoginPayload, BootstrapUserPayload)
+ *
+ * Also tracks which table entity types are referenced so they can be imported.
+ *
+ * Uses dynamic type discovery from Query/Mutation return types instead of pattern matching.
+ */
+function addPayloadObjectTypes(sourceFile, typeRegistry, tableTypeNames, alreadyGenerated) {
+    const generatedTypes = new Set(alreadyGenerated);
+    const referencedTableTypes = new Set();
+    // Dynamically collect return types from Query and Mutation
+    const typesToGenerate = collectReturnTypesFromRootTypes(typeRegistry, tableTypeNames);
+    // Filter out already generated types
+    for (const typeName of Array.from(typesToGenerate)) {
+        if (generatedTypes.has(typeName)) {
+            typesToGenerate.delete(typeName);
+        }
+    }
+    if (typesToGenerate.size === 0) {
+        return { generatedTypes, referencedTableTypes };
+    }
+    addSectionComment(sourceFile, 'Payload/Return Object Types');
+    // Process all types - no artificial limit
+    while (typesToGenerate.size > 0) {
+        const typeNameResult = typesToGenerate.values().next();
+        if (typeNameResult.done)
+            break;
+        const typeName = typeNameResult.value;
+        typesToGenerate.delete(typeName);
+        if (generatedTypes.has(typeName))
+            continue;
+        const typeInfo = typeRegistry.get(typeName);
+        if (!typeInfo || typeInfo.kind !== 'OBJECT')
+            continue;
+        generatedTypes.add(typeName);
+        if (typeInfo.fields && typeInfo.fields.length > 0) {
+            const properties = [];
+            for (const field of typeInfo.fields) {
+                const baseType = getTypeBaseName(field.type);
+                // Skip Query and Mutation fields
+                if (baseType === 'Query' || baseType === 'Mutation')
+                    continue;
+                const tsType = typeRefToTs(field.type);
+                const isNullable = !isRequired(field.type);
+                properties.push({
+                    name: field.name,
+                    type: isNullable ? `${tsType} | null` : tsType,
+                    optional: isNullable,
+                    docs: field.description ? [field.description] : undefined,
+                });
+                // Track table entity types that are referenced
+                if (baseType && tableTypeNames.has(baseType)) {
+                    referencedTableTypes.add(baseType);
+                }
+                // Follow nested OBJECT types that aren't table types
+                if (baseType &&
+                    !generatedTypes.has(baseType) &&
+                    !shouldSkipType(baseType, tableTypeNames)) {
+                    const nestedType = typeRegistry.get(baseType);
+                    if (nestedType?.kind === 'OBJECT') {
+                        typesToGenerate.add(baseType);
+                    }
+                }
+            }
+            sourceFile.addInterface(createInterface(typeName, properties));
+        }
+        else {
+            // Empty payload object
+            sourceFile.addInterface(createInterface(typeName, []));
+        }
+    }
+    return { generatedTypes, referencedTableTypes };
+}
+// ============================================================================
+// Main Generator
+// ============================================================================
+/**
+ * Generate comprehensive schema-types.ts file using ts-morph AST
+ *
+ * This generates all Input/Payload/Enum types from the TypeRegistry
+ * that are needed by custom mutation/query hooks.
+ */
+export function generateSchemaTypesFile(options) {
+    const { typeRegistry, tableTypeNames } = options;
+    const project = createProject();
+    const sourceFile = createSourceFile(project, 'schema-types.ts');
+    // Add file header
+    sourceFile.insertText(0, createFileHeader('GraphQL schema types for custom operations') + '\n');
+    // Track all generated types
+    let generatedTypes = new Set();
+    // 1. Generate ENUM types
+    const enumTypes = addEnumTypes(sourceFile, typeRegistry, tableTypeNames);
+    generatedTypes = new Set([...generatedTypes, ...enumTypes]);
+    // 2. Generate UNION types
+    const unionTypes = addUnionTypes(sourceFile, typeRegistry, tableTypeNames, generatedTypes);
+    generatedTypes = new Set([...generatedTypes, ...unionTypes]);
+    // 3. Generate INPUT_OBJECT types
+    const inputTypes = addInputObjectTypes(sourceFile, typeRegistry, tableTypeNames, generatedTypes);
+    generatedTypes = new Set([...generatedTypes, ...inputTypes]);
+    // 4. Generate Payload OBJECT types
+    const payloadResult = addPayloadObjectTypes(sourceFile, typeRegistry, tableTypeNames, generatedTypes);
+    // 5. Add imports from types.ts (table entity types + base filter types)
+    const referencedTableTypes = Array.from(payloadResult.referencedTableTypes).sort();
+    // Always import base filter types since generated Filter interfaces reference them
+    const baseFilterImports = Array.from(BASE_FILTER_TYPE_NAMES).sort();
+    const allTypesImports = [...referencedTableTypes, ...baseFilterImports];
+    if (allTypesImports.length > 0) {
+        // Insert import after the file header comment
+        const importStatement = `import type { ${allTypesImports.join(', ')} } from './types';\n\n`;
+        // Find position after header (after first */ + newlines)
+        const headerEndIndex = sourceFile.getFullText().indexOf('*/') + 3;
+        sourceFile.insertText(headerEndIndex, '\n' + importStatement);
+    }
+    return {
+        fileName: 'schema-types.ts',
+        content: getMinimalFormattedOutput(sourceFile),
+        generatedEnums: Array.from(enumTypes).sort(),
+        referencedTableTypes,
+    };
+}

package/esm/cli/codegen/ts-ast.d.ts

@@ -66,7 +66,9 @@ export declare function createInterface(name: string, properties: InterfacePrope
 export declare function createFilterInterface(name: string, fieldFilters: Array<{
     fieldName: string;
     filterType: string;
-}>): InterfaceDeclarationStructure;
+}>, options?: {
+    isExported?: boolean;
+}): InterfaceDeclarationStructure;
 /**
  * Create type alias declaration structure
  */

package/esm/cli/codegen/ts-ast.js

@@ -143,7 +143,7 @@ export function createInterface(name, properties, options) {
 /**
  * Create filter interface with standard PostGraphile operators
  */
-export function createFilterInterface(name, fieldFilters) {
+export function createFilterInterface(name, fieldFilters, options) {
     const properties = [
         ...fieldFilters.map((f) => ({
             name: f.fieldName,
@@ -154,7 +154,7 @@ export function createFilterInterface(name, fieldFilters) {
         { name: 'or', type: `${name}[]`, optional: true, docs: ['Logical OR'] },
         { name: 'not', type: name, optional: true, docs: ['Logical NOT'] },
     ];
-    return createInterface(name, properties);
+    return createInterface(name, properties, { isExported: options?.isExported ?? true });
 }
 // ============================================================================
 // Type alias builders