@constructive-io/graphql-codegen 2.21.0 → 2.22.0

package/cli/codegen/barrel.d.ts

@@ -15,8 +15,11 @@ export declare function generateQueriesBarrel(tables: CleanTable[]): string;
 export declare function generateMutationsBarrel(tables: CleanTable[]): string;
 /**
  * Generate the main index.ts barrel file
+ *
+ * @param tables - The tables to include in the SDK
+ * @param hasSchemaTypes - Whether schema-types.ts was generated
  */
-export declare function generateMainBarrel(tables: CleanTable[]): string;
+export declare function generateMainBarrel(tables: CleanTable[], hasSchemaTypes?: boolean): string;
 /**
  * Generate queries barrel including custom query operations
  */

package/cli/codegen/barrel.js

@@ -12,10 +12,7 @@ const type_resolver_1 = require("./type-resolver");
  * Generate the queries/index.ts barrel file
  */
 function generateQueriesBarrel(tables) {
-    const lines = [
-        (0, ts_ast_1.createFileHeader)('Query hooks barrel export'),
-        '',
-    ];
+    const lines = [(0, ts_ast_1.createFileHeader)('Query hooks barrel export'), ''];
     // Export all query hooks
     for (const table of tables) {
         const listHookName = (0, utils_1.getListQueryHookName)(table);
@@ -51,31 +48,40 @@ function generateMutationsBarrel(tables) {
 }
 /**
  * Generate the main index.ts barrel file
+ *
+ * @param tables - The tables to include in the SDK
+ * @param hasSchemaTypes - Whether schema-types.ts was generated
  */
-function generateMainBarrel(tables) {
+function generateMainBarrel(tables, hasSchemaTypes = false) {
     const tableNames = tables.map((t) => t.name).join(', ');
+    const schemaTypesExport = hasSchemaTypes
+        ? `
+// Schema types (input, payload, enum types)
+export * from './schema-types';
+`
+        : '';
     return `/**
  * Auto-generated GraphQL SDK
  * @generated by @constructive-io/graphql-codegen
- * 
+ *
  * Tables: ${tableNames}
- * 
+ *
  * Usage:
- * 
+ *
  * 1. Configure the client:
  * \`\`\`ts
  * import { configure } from './generated';
- * 
+ *
  * configure({
  *   endpoint: 'https://api.example.com/graphql',
  *   headers: { Authorization: 'Bearer <token>' },
  * });
  * \`\`\`
- * 
+ *
  * 2. Use the hooks:
  * \`\`\`tsx
  * import { useCarsQuery, useCreateCarMutation } from './generated';
- * 
+ *
  * function MyComponent() {
  *   const { data, isLoading } = useCarsQuery({ first: 10 });
  *   const { mutate } = useCreateCarMutation();
@@ -89,7 +95,7 @@ export * from './client';
 
 // Entity and filter types
 export * from './types';
-
+${schemaTypesExport}
 // Query hooks
 export * from './queries';
 

package/cli/codegen/client.js

@@ -56,6 +56,39 @@ export function getConfig(): GraphQLClientConfig {
   return globalConfig;
 }
 
+/**
+ * Set a single header value
+ * Useful for updating Authorization after login
+ *
+ * @example
+ * \`\`\`ts
+ * setHeader('Authorization', 'Bearer <new-token>');
+ * \`\`\`
+ */
+export function setHeader(key: string, value: string): void {
+  const config = getConfig();
+  globalConfig = {
+    ...config,
+    headers: { ...config.headers, [key]: value },
+  };
+}
+
+/**
+ * Merge multiple headers into the current configuration
+ *
+ * @example
+ * \`\`\`ts
+ * setHeaders({ Authorization: 'Bearer <token>', 'X-Custom': 'value' });
+ * \`\`\`
+ */
+export function setHeaders(headers: Record<string, string>): void {
+  const config = getConfig();
+  globalConfig = {
+    ...config,
+    headers: { ...config.headers, ...headers },
+  };
+}
+
 // ============================================================================
 // Error handling
 // ============================================================================

package/cli/codegen/custom-mutations.d.ts

@@ -23,6 +23,8 @@ export interface GenerateCustomMutationHookOptions {
     skipQueryField?: boolean;
     /** Whether to generate React Query hooks (default: true for backwards compatibility) */
     reactQueryEnabled?: boolean;
+    /** Table entity type names (for import path resolution) */
+    tableTypeNames?: Set<string>;
 }
 /**
  * Generate a custom mutation hook file
@@ -36,6 +38,8 @@ export interface GenerateAllCustomMutationHooksOptions {
     skipQueryField?: boolean;
     /** Whether to generate React Query hooks (default: true for backwards compatibility) */
     reactQueryEnabled?: boolean;
+    /** Table entity type names (for import path resolution) */
+    tableTypeNames?: Set<string>;
 }
 /**
  * Generate all custom mutation hook files

package/cli/codegen/custom-mutations.js

@@ -25,13 +25,15 @@ function generateCustomMutationHook(options) {
     }
 }
 function generateCustomMutationHookInternal(options) {
-    const { operation, typeRegistry, maxDepth = 2, skipQueryField = true } = options;
+    const { operation, typeRegistry, maxDepth = 2, skipQueryField = true, tableTypeNames } = options;
     const project = (0, ts_ast_1.createProject)();
     const hookName = (0, type_resolver_1.getOperationHookName)(operation.name, 'mutation');
     const fileName = (0, type_resolver_1.getOperationFileName)(operation.name, 'mutation');
     const variablesTypeName = (0, type_resolver_1.getOperationVariablesTypeName)(operation.name, 'mutation');
     const resultTypeName = (0, type_resolver_1.getOperationResultTypeName)(operation.name, 'mutation');
     const documentConstName = (0, type_resolver_1.getDocumentConstName)(operation.name, 'mutation');
+    // Create type tracker to collect referenced types (with table type awareness)
+    const tracker = (0, type_resolver_1.createTypeTracker)({ tableTypeNames });
     // Generate GraphQL document
     const mutationDocument = (0, schema_gql_ast_1.buildCustomMutationString)({
         operation,
@@ -42,8 +44,21 @@ function generateCustomMutationHookInternal(options) {
     const sourceFile = (0, ts_ast_1.createSourceFile)(project, fileName);
     // Add file header
     sourceFile.insertText(0, (0, ts_ast_1.createFileHeader)(`Custom mutation hook for ${operation.name}`) + '\n\n');
+    // Generate variables interface if there are arguments (with tracking)
+    let variablesProps = [];
+    if (operation.args.length > 0) {
+        variablesProps = generateVariablesProperties(operation.args, tracker);
+    }
+    // Generate result interface (with tracking)
+    const resultType = (0, type_resolver_1.typeRefToTsType)(operation.returnType, tracker);
+    const resultProps = [
+        { name: operation.name, type: resultType },
+    ];
+    // Get importable types from tracker (separated by source)
+    const schemaTypes = tracker.getImportableTypes(); // From schema-types.ts
+    const tableTypes = tracker.getTableTypes(); // From types.ts
     // Add imports
-    sourceFile.addImportDeclarations([
+    const imports = [
         (0, ts_ast_1.createImport)({
             moduleSpecifier: '@tanstack/react-query',
             namedImports: ['useMutation'],
@@ -53,21 +68,31 @@ function generateCustomMutationHookInternal(options) {
             moduleSpecifier: '../client',
             namedImports: ['execute'],
         }),
-    ]);
+    ];
+    // Add types.ts import for table entity types
+    if (tableTypes.length > 0) {
+        imports.push((0, ts_ast_1.createImport)({
+            moduleSpecifier: '../types',
+            typeOnlyNamedImports: tableTypes,
+        }));
+    }
+    // Add schema-types import for Input/Payload/Enum types
+    if (schemaTypes.length > 0) {
+        imports.push((0, ts_ast_1.createImport)({
+            moduleSpecifier: '../schema-types',
+            typeOnlyNamedImports: schemaTypes,
+        }));
+    }
+    sourceFile.addImportDeclarations(imports);
     // Add mutation document constant
     sourceFile.addVariableStatement((0, ts_ast_1.createConst)(documentConstName, '`\n' + mutationDocument + '`', {
         docs: ['GraphQL mutation document'],
     }));
-    // Generate variables interface if there are arguments
+    // Add variables interface
     if (operation.args.length > 0) {
-        const variablesProps = generateVariablesProperties(operation.args);
         sourceFile.addInterface((0, ts_ast_1.createInterface)(variablesTypeName, variablesProps));
     }
-    // Generate result interface
-    const resultType = (0, type_resolver_1.typeRefToTsType)(operation.returnType);
-    const resultProps = [
-        { name: operation.name, type: resultType },
-    ];
+    // Add result interface
     sourceFile.addInterface((0, ts_ast_1.createInterface)(resultTypeName, resultProps));
     // Generate hook function
     const hookParams = generateHookParameters(operation, variablesTypeName, resultTypeName);
@@ -91,10 +116,10 @@ function generateCustomMutationHookInternal(options) {
 /**
  * Generate interface properties from CleanArguments
  */
-function generateVariablesProperties(args) {
+function generateVariablesProperties(args, tracker) {
     return args.map((arg) => ({
         name: arg.name,
-        type: (0, type_resolver_1.typeRefToTsType)(arg.type),
+        type: (0, type_resolver_1.typeRefToTsType)(arg.type, tracker),
         optional: !(0, type_resolver_1.isTypeRequired)(arg.type),
         docs: arg.description ? [arg.description] : undefined,
     }));
@@ -143,7 +168,7 @@ function generateHookBody(operation, documentConstName, variablesTypeName, resul
  * When reactQueryEnabled is false, returns empty array since mutations require React Query
  */
 function generateAllCustomMutationHooks(options) {
-    const { operations, typeRegistry, maxDepth = 2, skipQueryField = true, reactQueryEnabled = true } = options;
+    const { operations, typeRegistry, maxDepth = 2, skipQueryField = true, reactQueryEnabled = true, tableTypeNames } = options;
     return operations
         .filter((op) => op.kind === 'mutation')
         .map((operation) => generateCustomMutationHook({
@@ -152,6 +177,7 @@ function generateAllCustomMutationHooks(options) {
         maxDepth,
         skipQueryField,
         reactQueryEnabled,
+        tableTypeNames,
     }))
         .filter((result) => result !== null);
 }

package/cli/codegen/custom-queries.d.ts

@@ -23,6 +23,8 @@ export interface GenerateCustomQueryHookOptions {
     skipQueryField?: boolean;
     /** Whether to generate React Query hooks (default: true for backwards compatibility) */
     reactQueryEnabled?: boolean;
+    /** Table entity type names (for import path resolution) */
+    tableTypeNames?: Set<string>;
 }
 /**
  * Generate a custom query hook file
@@ -35,6 +37,8 @@ export interface GenerateAllCustomQueryHooksOptions {
     skipQueryField?: boolean;
     /** Whether to generate React Query hooks (default: true for backwards compatibility) */
     reactQueryEnabled?: boolean;
+    /** Table entity type names (for import path resolution) */
+    tableTypeNames?: Set<string>;
 }
 /**
  * Generate all custom query hook files

package/cli/codegen/custom-queries.js

@@ -10,7 +10,7 @@ const utils_1 = require("./utils");
  * Generate a custom query hook file
  */
 function generateCustomQueryHook(options) {
-    const { operation, typeRegistry, maxDepth = 2, skipQueryField = true, reactQueryEnabled = true } = options;
+    const { operation, typeRegistry, maxDepth = 2, skipQueryField = true, reactQueryEnabled = true, tableTypeNames } = options;
     const project = (0, ts_ast_1.createProject)();
     const hookName = (0, type_resolver_1.getOperationHookName)(operation.name, 'query');
     const fileName = (0, type_resolver_1.getOperationFileName)(operation.name, 'query');
@@ -18,6 +18,8 @@ function generateCustomQueryHook(options) {
     const resultTypeName = (0, type_resolver_1.getOperationResultTypeName)(operation.name, 'query');
     const documentConstName = (0, type_resolver_1.getDocumentConstName)(operation.name, 'query');
     const queryKeyName = (0, type_resolver_1.getQueryKeyName)(operation.name);
+    // Create type tracker to collect referenced types (with table type awareness)
+    const tracker = (0, type_resolver_1.createTypeTracker)({ tableTypeNames });
     // Generate GraphQL document
     const queryDocument = (0, schema_gql_ast_1.buildCustomQueryString)({
         operation,
@@ -31,6 +33,19 @@ function generateCustomQueryHook(options) {
         ? `Custom query hook for ${operation.name}`
         : `Custom query functions for ${operation.name}`;
     sourceFile.insertText(0, (0, ts_ast_1.createFileHeader)(headerText) + '\n\n');
+    // Generate variables interface if there are arguments (with tracking)
+    let variablesProps = [];
+    if (operation.args.length > 0) {
+        variablesProps = generateVariablesProperties(operation.args, tracker);
+    }
+    // Generate result interface (with tracking)
+    const resultType = (0, type_resolver_1.typeRefToTsType)(operation.returnType, tracker);
+    const resultProps = [
+        { name: operation.name, type: resultType },
+    ];
+    // Get importable types from tracker (separated by source)
+    const schemaTypes = tracker.getImportableTypes(); // From schema-types.ts
+    const tableTypes = tracker.getTableTypes(); // From types.ts
     // Add imports - conditionally include React Query imports
     const imports = [];
     if (reactQueryEnabled) {
@@ -45,21 +60,30 @@ function generateCustomQueryHook(options) {
         namedImports: ['execute'],
         typeOnlyNamedImports: ['ExecuteOptions'],
     }));
+    // Add types.ts import for table entity types
+    if (tableTypes.length > 0) {
+        imports.push((0, ts_ast_1.createImport)({
+            moduleSpecifier: '../types',
+            typeOnlyNamedImports: tableTypes,
+        }));
+    }
+    // Add schema-types import for Input/Payload/Enum types
+    if (schemaTypes.length > 0) {
+        imports.push((0, ts_ast_1.createImport)({
+            moduleSpecifier: '../schema-types',
+            typeOnlyNamedImports: schemaTypes,
+        }));
+    }
     sourceFile.addImportDeclarations(imports);
     // Add query document constant
     sourceFile.addVariableStatement((0, ts_ast_1.createConst)(documentConstName, '`\n' + queryDocument + '`', {
         docs: ['GraphQL query document'],
     }));
-    // Generate variables interface if there are arguments
+    // Add variables interface
     if (operation.args.length > 0) {
-        const variablesProps = generateVariablesProperties(operation.args);
         sourceFile.addInterface((0, ts_ast_1.createInterface)(variablesTypeName, variablesProps));
     }
-    // Generate result interface
-    const resultType = (0, type_resolver_1.typeRefToTsType)(operation.returnType);
-    const resultProps = [
-        { name: operation.name, type: resultType },
-    ];
+    // Add result interface
     sourceFile.addInterface((0, ts_ast_1.createInterface)(resultTypeName, resultProps));
     // Query key factory
     if (operation.args.length > 0) {
@@ -130,10 +154,10 @@ function generateCustomQueryHook(options) {
 /**
  * Generate interface properties from CleanArguments
  */
-function generateVariablesProperties(args) {
+function generateVariablesProperties(args, tracker) {
     return args.map((arg) => ({
         name: arg.name,
-        type: (0, type_resolver_1.typeRefToTsType)(arg.type),
+        type: (0, type_resolver_1.typeRefToTsType)(arg.type, tracker),
         optional: !(0, type_resolver_1.isTypeRequired)(arg.type),
         docs: arg.description ? [arg.description] : undefined,
     }));
@@ -355,7 +379,7 @@ await ${fnName}(queryClient);
  * Generate all custom query hook files
  */
 function generateAllCustomQueryHooks(options) {
-    const { operations, typeRegistry, maxDepth = 2, skipQueryField = true, reactQueryEnabled = true } = options;
+    const { operations, typeRegistry, maxDepth = 2, skipQueryField = true, reactQueryEnabled = true, tableTypeNames } = options;
     return operations
         .filter((op) => op.kind === 'query')
         .map((operation) => generateCustomQueryHook({
@@ -364,5 +388,6 @@ function generateAllCustomQueryHooks(options) {
         maxDepth,
         skipQueryField,
         reactQueryEnabled,
+        tableTypeNames,
     }));
 }

package/cli/codegen/gql-ast.js

@@ -147,16 +147,20 @@ function buildSingleQueryAST(config) {
     const { table } = config;
     const queryName = (0, utils_1.getSingleRowQueryName)(table);
     const scalarFields = (0, utils_1.getScalarFields)(table);
-    // Variable definitions - assume UUID primary key
+    // Get primary key info dynamically from table constraints
+    const pkFields = (0, utils_1.getPrimaryKeyInfo)(table);
+    // For simplicity, use first PK field (most common case)
+    const pkField = pkFields[0];
+    // Variable definitions - use dynamic PK field name and type
     const variableDefinitions = [
         t.variableDefinition({
-            variable: t.variable({ name: 'id' }),
-            type: t.nonNullType({ type: t.namedType({ type: 'UUID' }) }),
+            variable: t.variable({ name: pkField.name }),
+            type: t.nonNullType({ type: t.namedType({ type: pkField.gqlType }) }),
         }),
     ];
-    // Query arguments
+    // Query arguments - use dynamic PK field name
     const args = [
-        t.argument({ name: 'id', value: t.variable({ name: 'id' }) }),
+        t.argument({ name: pkField.name, value: t.variable({ name: pkField.name }) }),
     ];
     // Field selections
     const fieldSelections = createFieldSelections(scalarFields);

package/cli/codegen/index.js

@@ -5,11 +5,13 @@ exports.generateAllFiles = generateAllFiles;
 exports.generate = generate;
 const client_1 = require("./client");
 const types_1 = require("./types");
+const schema_types_generator_1 = require("./schema-types-generator");
 const queries_1 = require("./queries");
 const mutations_1 = require("./mutations");
 const custom_queries_1 = require("./custom-queries");
 const custom_mutations_1 = require("./custom-mutations");
 const barrel_1 = require("./barrel");
+const utils_1 = require("./utils");
 // ============================================================================
 // Main orchestrator
 // ============================================================================
@@ -34,12 +36,33 @@ function generate(options) {
         path: 'client.ts',
         content: (0, client_1.generateClientFile)(),
     });
-    // 2. Generate types.ts
+    // Collect table type names for import path resolution
+    const tableTypeNames = new Set(tables.map((t) => (0, utils_1.getTableNames)(t).typeName));
+    // 2. Generate schema-types.ts for custom operations (if any)
+    // NOTE: This must come BEFORE types.ts so that types.ts can import enum types
+    let hasSchemaTypes = false;
+    let generatedEnumNames = [];
+    if (customOperations && customOperations.typeRegistry) {
+        const schemaTypesResult = (0, schema_types_generator_1.generateSchemaTypesFile)({
+            typeRegistry: customOperations.typeRegistry,
+            tableTypeNames,
+        });
+        // Only include if there's meaningful content
+        if (schemaTypesResult.content.split('\n').length > 10) {
+            files.push({
+                path: 'schema-types.ts',
+                content: schemaTypesResult.content,
+            });
+            hasSchemaTypes = true;
+            generatedEnumNames = schemaTypesResult.generatedEnums || [];
+        }
+    }
+    // 3. Generate types.ts (can now import enums from schema-types)
     files.push({
         path: 'types.ts',
-        content: (0, types_1.generateTypesFile)(tables),
+        content: (0, types_1.generateTypesFile)(tables, { enumsFromSchemaTypes: generatedEnumNames }),
     });
-    // 3. Generate table-based query hooks (queries/*.ts)
+    // 4. Generate table-based query hooks (queries/*.ts)
     const queryHooks = (0, queries_1.generateAllQueryHooks)(tables, { reactQueryEnabled });
     for (const hook of queryHooks) {
         files.push({
@@ -47,7 +70,7 @@ function generate(options) {
             content: hook.content,
         });
     }
-    // 4. Generate custom query hooks if available
+    // 5. Generate custom query hooks if available
     let customQueryHooks = [];
     if (customOperations && customOperations.queries.length > 0) {
         customQueryHooks = (0, custom_queries_1.generateAllCustomQueryHooks)({
@@ -56,6 +79,7 @@ function generate(options) {
             maxDepth,
             skipQueryField,
             reactQueryEnabled,
+            tableTypeNames,
         });
         for (const hook of customQueryHooks) {
             files.push({
@@ -72,7 +96,10 @@ function generate(options) {
             : (0, barrel_1.generateQueriesBarrel)(tables),
     });
     // 6. Generate table-based mutation hooks (mutations/*.ts)
-    const mutationHooks = (0, mutations_1.generateAllMutationHooks)(tables, { reactQueryEnabled });
+    const mutationHooks = (0, mutations_1.generateAllMutationHooks)(tables, {
+        reactQueryEnabled,
+        enumsFromSchemaTypes: generatedEnumNames,
+    });
     for (const hook of mutationHooks) {
         files.push({
             path: `mutations/${hook.fileName}`,
@@ -88,6 +115,7 @@ function generate(options) {
             maxDepth,
             skipQueryField,
             reactQueryEnabled,
+            tableTypeNames,
         });
         for (const hook of customMutationHooks) {
             files.push({
@@ -103,10 +131,10 @@ function generate(options) {
             ? (0, barrel_1.generateCustomMutationsBarrel)(tables, customMutationHooks.map((h) => h.operationName))
             : (0, barrel_1.generateMutationsBarrel)(tables),
     });
-    // 9. Generate main index.ts barrel
+    // 9. Generate main index.ts barrel (with schema-types if present)
     files.push({
         path: 'index.ts',
-        content: (0, barrel_1.generateMainBarrel)(tables),
+        content: (0, barrel_1.generateMainBarrel)(tables, hasSchemaTypes),
     });
     return {
         files,

package/cli/codegen/mutations.d.ts

@@ -15,6 +15,8 @@ export interface GeneratedMutationFile {
 export interface MutationGeneratorOptions {
     /** Whether to generate React Query hooks (default: true for backwards compatibility) */
     reactQueryEnabled?: boolean;
+    /** Enum type names that are available from schema-types.ts */
+    enumsFromSchemaTypes?: string[];
 }
 /**
  * Generate create mutation hook file content using AST