@constructive-io/graphql-codegen 3.2.1 → 3.3.0

package/esm/core/codegen/orm/barrel.d.ts

@@ -1,8 +1,3 @@
-/**
- * Barrel file generators for ORM client (Babel AST-based)
- *
- * Generates index.ts files that re-export all models and operations.
- */
 import type { CleanTable } from '../../../types/schema';
 export interface GeneratedBarrelFile {
     fileName: string;

package/esm/core/codegen/orm/barrel.js

@@ -1,6 +1,11 @@
+/**
+ * Barrel file generators for ORM client (Babel AST-based)
+ *
+ * Generates index.ts files that re-export all models and operations.
+ */
 import * as t from '@babel/types';
 import { generateCode } from '../babel-ast';
-import { getTableNames, lcFirst, getGeneratedFileHeader } from '../utils';
+import { getGeneratedFileHeader, getTableNames, lcFirst } from '../utils';
 /**
  * Generate the models/index.ts barrel file
  */

package/esm/core/codegen/orm/client-generator.d.ts

@@ -1,8 +1,3 @@
-/**
- * ORM Client generator (Babel AST-based)
- *
- * Generates the createClient() factory function and main client file.
- */
 import type { CleanTable } from '../../../types/schema';
 export interface GeneratedClientFile {
     fileName: string;

package/esm/core/codegen/orm/client-generator.js

@@ -1,8 +1,13 @@
+/**
+ * ORM Client generator (Babel AST-based)
+ *
+ * Generates the createClient() factory function and main client file.
+ */
 import * as t from '@babel/types';
-import { generateCode, commentBlock } from '../babel-ast';
-import { getTableNames, lcFirst, getGeneratedFileHeader } from '../utils';
 import * as fs from 'fs';
 import * as path from 'path';
+import { commentBlock, generateCode } from '../babel-ast';
+import { getGeneratedFileHeader, getTableNames, lcFirst } from '../utils';
 /**
  * Find a template file path.
  * Templates are at ../templates/ relative to this file in both src/ and dist/.

package/esm/core/codegen/orm/client.js

@@ -34,7 +34,9 @@ export class FetchAdapter {
             return {
                 ok: false,
                 data: null,
-                errors: [{ message: `HTTP ${response.status}: ${response.statusText}` }],
+                errors: [
+                    { message: `HTTP ${response.status}: ${response.statusText}` },
+                ],
             };
         }
         const json = (await response.json());

package/esm/core/codegen/orm/custom-ops-generator.d.ts

@@ -1,9 +1,3 @@
-/**
- * Custom operations generator for ORM client (Babel AST-based)
- *
- * Generates db.query.* and db.mutation.* namespaces for non-table operations
- * like login, register, currentUser, etc.
- */
 import type { CleanOperation } from '../../../types/schema';
 export interface GeneratedCustomOpsFile {
     fileName: string;

package/esm/core/codegen/orm/custom-ops-generator.js

@@ -1,8 +1,14 @@
+/**
+ * Custom operations generator for ORM client (Babel AST-based)
+ *
+ * Generates db.query.* and db.mutation.* namespaces for non-table operations
+ * like login, register, currentUser, etc.
+ */
 import * as t from '@babel/types';
 import { generateCode } from '../babel-ast';
-import { ucFirst, getGeneratedFileHeader } from '../utils';
-import { typeRefToTsType, isTypeRequired, getTypeBaseName, } from '../type-resolver';
-import { SCALAR_NAMES } from '../scalars';
+import { NON_SELECT_TYPES, getSelectTypeName } from '../select-helpers';
+import { getTypeBaseName, isTypeRequired, typeRefToTsType, } from '../type-resolver';
+import { getGeneratedFileHeader, ucFirst } from '../utils';
 /**
  * Collect all input type names used by operations
  * Includes Input, Filter, OrderBy, and Condition types
@@ -23,12 +29,6 @@ function collectInputTypeNamesFromOps(operations) {
     }
     return Array.from(inputTypes);
 }
-// Types that don't need Select types
-const NON_SELECT_TYPES = new Set([
-    ...SCALAR_NAMES,
-    'Query',
-    'Mutation',
-]);
 /**
  * Collect all payload/return type names from operations (for Select types)
  * Filters out scalar types
@@ -39,8 +39,6 @@ function collectPayloadTypeNamesFromOps(operations) {
         const baseName = getTypeBaseName(op.returnType);
         if (baseName &&
             !baseName.endsWith('Connection') &&
-            baseName !== 'Query' &&
-            baseName !== 'Mutation' &&
             !NON_SELECT_TYPES.has(baseName)) {
             payloadTypes.add(baseName);
         }
@@ -48,19 +46,20 @@ function collectPayloadTypeNamesFromOps(operations) {
     return Array.from(payloadTypes);
 }
 /**
- * Get the Select type name for a return type
- * Returns null for scalar types, Connection types (no select needed)
+ * Collect Connection and other non-scalar return type names that need importing
+ * (for typing QueryBuilder results on scalar/Connection operations)
  */
-function getSelectTypeName(returnType) {
-    const baseName = getTypeBaseName(returnType);
-    if (baseName &&
-        !NON_SELECT_TYPES.has(baseName) &&
-        baseName !== 'Query' &&
-        baseName !== 'Mutation' &&
-        !baseName.endsWith('Connection')) {
-        return `${baseName}Select`;
+function collectRawReturnTypeNames(operations) {
+    const types = new Set();
+    for (const op of operations) {
+        const baseName = getTypeBaseName(op.returnType);
+        if (baseName &&
+            !NON_SELECT_TYPES.has(baseName) &&
+            baseName.endsWith('Connection')) {
+            types.add(baseName);
+        }
     }
-    return null;
+    return Array.from(types);
 }
 function createImportDeclaration(moduleSpecifier, namedImports, typeOnly = false) {
     const specifiers = namedImports.map((name) => t.importSpecifier(t.identifier(name), t.identifier(name)));
@@ -95,7 +94,9 @@ function parseTypeAnnotation(typeStr) {
     if (typeStr === 'unknown')
         return t.tsUnknownKeyword();
     if (typeStr.includes(' | ')) {
-        const parts = typeStr.split(' | ').map((p) => parseTypeAnnotation(p.trim()));
+        const parts = typeStr
+            .split(' | ')
+            .map((p) => parseTypeAnnotation(p.trim()));
         return t.tsUnionType(parts);
     }
     if (typeStr.endsWith('[]')) {
@@ -103,6 +104,18 @@ function parseTypeAnnotation(typeStr) {
     }
     return t.tsTypeReference(t.identifier(typeStr));
 }
+function buildSelectedResultTsType(typeRef, payloadTypeName) {
+    if (typeRef.kind === 'NON_NULL' && typeRef.ofType) {
+        return buildSelectedResultTsType(typeRef.ofType, payloadTypeName);
+    }
+    if (typeRef.kind === 'LIST' && typeRef.ofType) {
+        return t.tsArrayType(buildSelectedResultTsType(typeRef.ofType, payloadTypeName));
+    }
+    return t.tsTypeReference(t.identifier('InferSelectResult'), t.tsTypeParameterInstantiation([
+        t.tsTypeReference(t.identifier(payloadTypeName)),
+        t.tsTypeReference(t.identifier('S')),
+    ]));
+}
 function buildOperationMethod(op, operationType) {
     const hasArgs = op.args.length > 0;
     const varTypeName = `${ucFirst(op.name)}Variables`;
@@ -120,25 +133,25 @@ function buildOperationMethod(op, operationType) {
         params.push(argsParam);
     }
     const optionsParam = t.identifier('options');
-    optionsParam.optional = true;
+    optionsParam.optional = !selectTypeName;
     if (selectTypeName) {
-        // Use DeepExact<S, SelectType> to enforce strict field validation
-        // This catches invalid fields even when mixed with valid ones
-        optionsParam.typeAnnotation = t.tsTypeAnnotation(t.tsTypeLiteral([
-            (() => {
-                const prop = t.tsPropertySignature(t.identifier('select'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('DeepExact'), t.tsTypeParameterInstantiation([
-                    t.tsTypeReference(t.identifier('S')),
-                    t.tsTypeReference(t.identifier(selectTypeName)),
-                ]))));
-                prop.optional = true;
-                return prop;
-            })(),
+        const selectProp = t.tsPropertySignature(t.identifier('select'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('S'))));
+        selectProp.optional = false;
+        optionsParam.typeAnnotation = t.tsTypeAnnotation(t.tsIntersectionType([
+            t.tsTypeLiteral([selectProp]),
+            t.tsTypeReference(t.identifier('StrictSelect'), t.tsTypeParameterInstantiation([
+                t.tsTypeReference(t.identifier('S')),
+                t.tsTypeReference(t.identifier(selectTypeName)),
+            ])),
         ]));
     }
     else {
         optionsParam.typeAnnotation = t.tsTypeAnnotation(t.tsTypeLiteral([
             (() => {
-                const prop = t.tsPropertySignature(t.identifier('select'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Record'), t.tsTypeParameterInstantiation([t.tsStringKeyword(), t.tsUnknownKeyword()]))));
+                const prop = t.tsPropertySignature(t.identifier('select'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Record'), t.tsTypeParameterInstantiation([
+                    t.tsStringKeyword(),
+                    t.tsUnknownKeyword(),
+                ]))));
                 prop.optional = true;
                 return prop;
             })(),
@@ -146,6 +159,12 @@ function buildOperationMethod(op, operationType) {
     }
     params.push(optionsParam);
     // Build the QueryBuilder call
+    const selectExpr = selectTypeName
+        ? t.memberExpression(t.identifier('options'), t.identifier('select'))
+        : t.optionalMemberExpression(t.identifier('options'), t.identifier('select'), false, true);
+    const entityTypeExpr = selectTypeName && payloadTypeName
+        ? t.stringLiteral(payloadTypeName)
+        : t.identifier('undefined');
     const queryBuilderArgs = t.objectExpression([
         t.objectProperty(t.identifier('client'), t.identifier('client'), false, true),
         t.objectProperty(t.identifier('operation'), t.stringLiteral(operationType)),
@@ -155,23 +174,34 @@ function buildOperationMethod(op, operationType) {
             t.stringLiteral(operationType),
             t.stringLiteral(ucFirst(op.name)),
             t.stringLiteral(op.name),
-            t.optionalMemberExpression(t.identifier('options'), t.identifier('select'), false, true),
+            selectExpr,
             hasArgs ? t.identifier('args') : t.identifier('undefined'),
             t.arrayExpression(varDefs.map((v) => t.objectExpression([
                 t.objectProperty(t.identifier('name'), t.stringLiteral(v.name)),
                 t.objectProperty(t.identifier('type'), t.stringLiteral(v.type)),
             ]))),
+            t.identifier('connectionFieldsMap'),
+            entityTypeExpr,
         ])),
     ]);
-    const newExpr = t.newExpression(t.identifier('QueryBuilder'), [queryBuilderArgs]);
-    // Add type parameter if we have a select type
+    const newExpr = t.newExpression(t.identifier('QueryBuilder'), [
+        queryBuilderArgs,
+    ]);
+    // Add type parameter to QueryBuilder for typed .unwrap() results
     if (selectTypeName && payloadTypeName) {
+        // Select-based type: use InferSelectResult<PayloadType, S>
+        newExpr.typeParameters = t.tsTypeParameterInstantiation([
+            t.tsTypeLiteral([
+                t.tsPropertySignature(t.identifier(op.name), t.tsTypeAnnotation(buildSelectedResultTsType(op.returnType, payloadTypeName))),
+            ]),
+        ]);
+    }
+    else {
+        // Scalar/Connection type: use raw TS type directly
+        const rawTsType = typeRefToTsType(op.returnType);
         newExpr.typeParameters = t.tsTypeParameterInstantiation([
             t.tsTypeLiteral([
-                t.tsPropertySignature(t.identifier(op.name), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('InferSelectResult'), t.tsTypeParameterInstantiation([
-                    t.tsTypeReference(t.identifier(payloadTypeName)),
-                    t.tsTypeReference(t.identifier('S')),
-                ])))),
+                t.tsPropertySignature(t.identifier(op.name), t.tsTypeAnnotation(parseTypeAnnotation(rawTsType))),
             ]),
         ]);
     }
@@ -179,7 +209,6 @@ function buildOperationMethod(op, operationType) {
     // Add type parameters to arrow function if we have a select type
     if (selectTypeName) {
         const typeParam = t.tsTypeParameter(t.tsTypeReference(t.identifier(selectTypeName)), null, 'S');
-        typeParam.const = true;
         arrowFunc.typeParameters = t.tsTypeParameterDeclaration([typeParam]);
     }
     return t.objectProperty(t.identifier(op.name), arrowFunc);
@@ -193,14 +222,26 @@ export function generateCustomQueryOpsFile(operations) {
     const inputTypeNames = collectInputTypeNamesFromOps(operations);
     const payloadTypeNames = collectPayloadTypeNamesFromOps(operations);
     const selectTypeNames = payloadTypeNames.map((p) => `${p}Select`);
-    const allTypeImports = [...new Set([...inputTypeNames, ...payloadTypeNames, ...selectTypeNames])];
+    const rawReturnTypeNames = collectRawReturnTypeNames(operations);
+    const allTypeImports = [
+        ...new Set([
+            ...inputTypeNames,
+            ...payloadTypeNames,
+            ...selectTypeNames,
+            ...rawReturnTypeNames,
+        ]),
+    ];
     // Add imports
     statements.push(createImportDeclaration('../client', ['OrmClient']));
-    statements.push(createImportDeclaration('../query-builder', ['QueryBuilder', 'buildCustomDocument']));
-    statements.push(createImportDeclaration('../select-types', ['InferSelectResult', 'DeepExact'], true));
+    statements.push(createImportDeclaration('../query-builder', [
+        'QueryBuilder',
+        'buildCustomDocument',
+    ]));
+    statements.push(createImportDeclaration('../select-types', ['InferSelectResult', 'StrictSelect'], true));
     if (allTypeImports.length > 0) {
         statements.push(createImportDeclaration('../input-types', allTypeImports, true));
     }
+    statements.push(createImportDeclaration('../input-types', ['connectionFieldsMap']));
     // Generate variable interfaces
     for (const op of operations) {
         const varInterface = createVariablesInterface(op);
@@ -231,14 +272,26 @@ export function generateCustomMutationOpsFile(operations) {
     const inputTypeNames = collectInputTypeNamesFromOps(operations);
     const payloadTypeNames = collectPayloadTypeNamesFromOps(operations);
     const selectTypeNames = payloadTypeNames.map((p) => `${p}Select`);
-    const allTypeImports = [...new Set([...inputTypeNames, ...payloadTypeNames, ...selectTypeNames])];
+    const rawReturnTypeNames = collectRawReturnTypeNames(operations);
+    const allTypeImports = [
+        ...new Set([
+            ...inputTypeNames,
+            ...payloadTypeNames,
+            ...selectTypeNames,
+            ...rawReturnTypeNames,
+        ]),
+    ];
     // Add imports
     statements.push(createImportDeclaration('../client', ['OrmClient']));
-    statements.push(createImportDeclaration('../query-builder', ['QueryBuilder', 'buildCustomDocument']));
-    statements.push(createImportDeclaration('../select-types', ['InferSelectResult', 'DeepExact'], true));
+    statements.push(createImportDeclaration('../query-builder', [
+        'QueryBuilder',
+        'buildCustomDocument',
+    ]));
+    statements.push(createImportDeclaration('../select-types', ['InferSelectResult', 'StrictSelect'], true));
     if (allTypeImports.length > 0) {
         statements.push(createImportDeclaration('../input-types', allTypeImports, true));
     }
+    statements.push(createImportDeclaration('../input-types', ['connectionFieldsMap']));
     // Generate variable interfaces
     for (const op of operations) {
         const varInterface = createVariablesInterface(op);

package/esm/core/codegen/orm/index.d.ts

@@ -4,8 +4,8 @@
  * Main entry point for ORM code generation. Coordinates all generators
  * and produces the complete ORM client output.
  */
-import type { CleanTable, CleanOperation, TypeRegistry } from '../../../types/schema';
 import type { GraphQLSDKConfigTarget } from '../../../types/config';
+import type { CleanOperation, CleanTable, TypeRegistry } from '../../../types/schema';
 export interface GeneratedFile {
     path: string;
     content: string;
@@ -39,7 +39,7 @@ export interface GenerateOrmResult {
  * Generate all ORM client files
  */
 export declare function generateOrm(options: GenerateOrmOptions): GenerateOrmResult;
-export { generateOrmClientFile, generateQueryBuilderFile, generateSelectTypesFile, } from './client-generator';
-export { generateModelFile, generateAllModelFiles } from './model-generator';
-export { generateCustomQueryOpsFile, generateCustomMutationOpsFile } from './custom-ops-generator';
 export { generateModelsBarrel, generateTypesBarrel } from './barrel';
+export { generateOrmClientFile, generateQueryBuilderFile, generateSelectTypesFile, } from './client-generator';
+export { generateCustomMutationOpsFile, generateCustomQueryOpsFile, } from './custom-ops-generator';
+export { generateAllModelFiles, generateModelFile } from './model-generator';

package/esm/core/codegen/orm/index.js

@@ -1,8 +1,8 @@
-import { generateOrmClientFile, generateQueryBuilderFile, generateSelectTypesFile, generateCreateClientFile, } from './client-generator';
-import { generateAllModelFiles } from './model-generator';
-import { generateCustomQueryOpsFile, generateCustomMutationOpsFile, } from './custom-ops-generator';
 import { generateModelsBarrel, generateTypesBarrel } from './barrel';
-import { generateInputTypesFile, collectInputTypeNames, collectPayloadTypeNames } from './input-types-generator';
+import { generateCreateClientFile, generateOrmClientFile, generateQueryBuilderFile, generateSelectTypesFile, } from './client-generator';
+import { generateCustomMutationOpsFile, generateCustomQueryOpsFile, } from './custom-ops-generator';
+import { collectInputTypeNames, collectPayloadTypeNames, generateInputTypesFile, } from './input-types-generator';
+import { generateAllModelFiles } from './model-generator';
 /**
  * Generate all ORM client files
  */
@@ -18,9 +18,15 @@ export function generateOrm(options) {
     const clientFile = generateOrmClientFile();
     files.push({ path: clientFile.fileName, content: clientFile.content });
     const queryBuilderFile = generateQueryBuilderFile();
-    files.push({ path: queryBuilderFile.fileName, content: queryBuilderFile.content });
+    files.push({
+        path: queryBuilderFile.fileName,
+        content: queryBuilderFile.content,
+    });
     const selectTypesFile = generateSelectTypesFile();
-    files.push({ path: selectTypesFile.fileName, content: selectTypesFile.content });
+    files.push({
+        path: selectTypesFile.fileName,
+        content: selectTypesFile.content,
+    });
     // 2. Generate model files
     const modelFiles = generateAllModelFiles(tables, useSharedTypes);
     for (const modelFile of modelFiles) {
@@ -34,7 +40,8 @@ export function generateOrm(options) {
     files.push({ path: modelsBarrel.fileName, content: modelsBarrel.content });
     // 4. Generate comprehensive input types (entities, filters, orderBy, CRUD inputs, custom inputs, payload types)
     // Always generate if we have tables or custom operations
-    if (tables.length > 0 || (typeRegistry && (hasCustomQueries || hasCustomMutations))) {
+    if (tables.length > 0 ||
+        (typeRegistry && (hasCustomQueries || hasCustomMutations))) {
         const allOps = [
             ...(customOperations?.queries ?? []),
             ...(customOperations?.mutations ?? []),
@@ -59,7 +66,10 @@ export function generateOrm(options) {
             }
         }
         const inputTypesFile = generateInputTypesFile(typeRegistry ?? new Map(), usedInputTypes, tables, usedPayloadTypes);
-        files.push({ path: inputTypesFile.fileName, content: inputTypesFile.content });
+        files.push({
+            path: inputTypesFile.fileName,
+            content: inputTypesFile.content,
+        });
     }
     // 5. Generate custom operations (if any)
     if (hasCustomQueries && customOperations?.queries) {
@@ -68,7 +78,10 @@ export function generateOrm(options) {
     }
     if (hasCustomMutations && customOperations?.mutations) {
         const mutationOpsFile = generateCustomMutationOpsFile(customOperations.mutations);
-        files.push({ path: mutationOpsFile.fileName, content: mutationOpsFile.content });
+        files.push({
+            path: mutationOpsFile.fileName,
+            content: mutationOpsFile.content,
+        });
     }
     // 6. Generate types barrel
     const typesBarrel = generateTypesBarrel(useSharedTypes);
@@ -87,7 +100,7 @@ export function generateOrm(options) {
     };
 }
 // Re-export generators for direct use
-export { generateOrmClientFile, generateQueryBuilderFile, generateSelectTypesFile, } from './client-generator';
-export { generateModelFile, generateAllModelFiles } from './model-generator';
-export { generateCustomQueryOpsFile, generateCustomMutationOpsFile } from './custom-ops-generator';
 export { generateModelsBarrel, generateTypesBarrel } from './barrel';
+export { generateOrmClientFile, generateQueryBuilderFile, generateSelectTypesFile, } from './client-generator';
+export { generateCustomMutationOpsFile, generateCustomQueryOpsFile, } from './custom-ops-generator';
+export { generateAllModelFiles, generateModelFile } from './model-generator';

package/esm/core/codegen/orm/input-types-generator.d.ts

@@ -1,16 +1,4 @@
-/**
- * Input types generator for ORM client (Babel AST-based)
- *
- * Generates TypeScript interfaces for:
- * 1. Scalar filter types (StringFilter, IntFilter, UUIDFilter, etc.)
- * 2. Entity interfaces (User, Order, etc.)
- * 3. Table filter types (UserFilter, OrderFilter, etc.)
- * 4. OrderBy enums (UsersOrderBy, OrdersOrderBy, etc.)
- * 5. Input types (LoginInput, CreateUserInput, etc.)
- *
- * Uses Babel AST for robust code generation.
- */
-import type { TypeRegistry, CleanArgument, CleanTable } from '../../../types/schema';
+import type { CleanArgument, CleanTable, TypeRegistry } from '../../../types/schema';
 export interface GeneratedInputTypesFile {
     fileName: string;
     content: string;

package/esm/core/codegen/orm/input-types-generator.js

@@ -1,9 +1,21 @@
+/**
+ * Input types generator for ORM client (Babel AST-based)
+ *
+ * Generates TypeScript interfaces for:
+ * 1. Scalar filter types (StringFilter, IntFilter, UUIDFilter, etc.)
+ * 2. Entity interfaces (User, Order, etc.)
+ * 3. Table filter types (UserFilter, OrderFilter, etc.)
+ * 4. OrderBy enums (UsersOrderBy, OrdersOrderBy, etc.)
+ * 5. Input types (LoginInput, CreateUserInput, etc.)
+ *
+ * Uses Babel AST for robust code generation.
+ */
 import * as t from '@babel/types';
-import { generateCode, addLineComment } from '../babel-ast';
-import { getTableNames, getFilterTypeName, getConditionTypeName, getOrderByTypeName, isRelationField, getGeneratedFileHeader, } from '../utils';
 import { pluralize } from 'inflekt';
+import { addLineComment, generateCode } from '../babel-ast';
+import { scalarToFilterType, scalarToTsType } from '../scalars';
 import { getTypeBaseName } from '../type-resolver';
-import { scalarToTsType, scalarToFilterType } from '../scalars';
+import { getConditionTypeName, getFilterTypeName, getGeneratedFileHeader, getOrderByTypeName, getPrimaryKeyInfo, getTableNames, isRelationField, } from '../utils';
 // ============================================================================
 // Constants
 // ============================================================================
@@ -80,7 +92,9 @@ function parseTypeString(typeStr) {
         const match = typeStr.match(/^([^<]+)<(.+)>$/);
         if (match) {
             const [, baseName, params] = match;
-            const typeParams = params.split(',').map((p) => parseTypeString(p.trim()));
+            const typeParams = params
+                .split(',')
+                .map((p) => parseTypeString(p.trim()));
             return t.tsTypeReference(t.identifier(baseName), t.tsTypeParameterInstantiation(typeParams));
         }
     }
@@ -364,9 +378,7 @@ function generateRelationHelperTypes() {
         createPropertySignature('pageInfo', 'PageInfo', false),
     ];
     const connectionResultBody = t.tsInterfaceBody(connectionResultProps);
-    const connectionResultDecl = t.tsInterfaceDeclaration(t.identifier('ConnectionResult'), t.tsTypeParameterDeclaration([
-        t.tsTypeParameter(null, null, 'T'),
-    ]), null, connectionResultBody);
+    const connectionResultDecl = t.tsInterfaceDeclaration(t.identifier('ConnectionResult'), t.tsTypeParameterDeclaration([t.tsTypeParameter(null, null, 'T')]), null, connectionResultBody);
     statements.push(t.exportNamedDeclaration(connectionResultDecl));
     // PageInfo interface
     statements.push(createExportedInterface('PageInfo', [
@@ -801,6 +813,10 @@ function generateCrudInputTypes(table) {
     const statements = [];
     const { typeName } = getTableNames(table);
     const patchName = `${typeName}Patch`;
+    const pkFields = getPrimaryKeyInfo(table);
+    const pkField = pkFields[0];
+    const pkFieldName = pkField?.name ?? 'id';
+    const pkFieldTsType = pkField?.tsType ?? 'string';
     // Create input
     statements.push(buildCreateInputInterface(table));
     // Patch interface
@@ -808,13 +824,13 @@ function generateCrudInputTypes(table) {
     // Update input
     statements.push(createExportedInterface(`Update${typeName}Input`, [
         { name: 'clientMutationId', type: 'string', optional: true },
-        { name: 'id', type: 'string', optional: false },
+        { name: pkFieldName, type: pkFieldTsType, optional: false },
         { name: 'patch', type: patchName, optional: false },
     ]));
     // Delete input
     statements.push(createExportedInterface(`Delete${typeName}Input`, [
         { name: 'clientMutationId', type: 'string', optional: true },
-        { name: 'id', type: 'string', optional: false },
+        { name: pkFieldName, type: pkFieldTsType, optional: false },
     ]));
     return statements;
 }
@@ -949,8 +965,7 @@ export function collectPayloadTypeNames(operations) {
     const payloadTypes = new Set();
     for (const op of operations) {
         const baseName = getTypeBaseName(op.returnType);
-        if (baseName &&
-            (baseName.endsWith('Payload') || !baseName.endsWith('Connection'))) {
+        if (baseName) {
             payloadTypes.add(baseName);
         }
     }
@@ -1055,6 +1070,48 @@ function generatePayloadTypes(typeRegistry, usedPayloadTypes, alreadyGeneratedTy
     return statements;
 }
 // ============================================================================
+// Connection Fields Map Generator
+// ============================================================================
+/**
+ * Generate a runtime map of entity type → { fieldName: relatedTypeName }
+ * for all hasMany and manyToMany relations. Used by buildSelections()
+ * to detect connection fields that need `nodes { ... }` wrapping.
+ */
+function generateConnectionFieldsMap(tables, tableByName) {
+    const properties = [];
+    for (const table of tables) {
+        const { typeName } = getTableNames(table);
+        const fieldEntries = [];
+        for (const relation of table.relations.hasMany) {
+            if (!relation.fieldName)
+                continue;
+            const relatedTypeName = getRelatedTypeName(relation.referencedByTable, tableByName);
+            fieldEntries.push(t.objectProperty(t.stringLiteral(relation.fieldName), t.stringLiteral(relatedTypeName)));
+        }
+        for (const relation of table.relations.manyToMany) {
+            if (!relation.fieldName)
+                continue;
+            const relatedTypeName = getRelatedTypeName(relation.rightTable, tableByName);
+            fieldEntries.push(t.objectProperty(t.stringLiteral(relation.fieldName), t.stringLiteral(relatedTypeName)));
+        }
+        if (fieldEntries.length > 0) {
+            properties.push(t.objectProperty(t.stringLiteral(typeName), t.objectExpression(fieldEntries)));
+        }
+    }
+    const decl = t.variableDeclaration('const', [
+        t.variableDeclarator(t.identifier('connectionFieldsMap'), t.tsAsExpression(t.objectExpression(properties), t.tsTypeReference(t.identifier('Record'), t.tsTypeParameterInstantiation([
+            t.tsStringKeyword(),
+            t.tsTypeReference(t.identifier('Record'), t.tsTypeParameterInstantiation([
+                t.tsStringKeyword(),
+                t.tsStringKeyword(),
+            ])),
+        ])))),
+    ]);
+    const statements = [t.exportNamedDeclaration(decl)];
+    addSectionComment(statements, 'Connection Fields Map');
+    return statements;
+}
+// ============================================================================
 // Main Generator (AST-based)
 // ============================================================================
 /**
@@ -1062,30 +1119,35 @@ function generatePayloadTypes(typeRegistry, usedPayloadTypes, alreadyGeneratedTy
  */
 export function generateInputTypesFile(typeRegistry, usedInputTypes, tables, usedPayloadTypes) {
     const statements = [];
+    const tablesList = tables ?? [];
+    const hasTables = tablesList.length > 0;
+    const tableByName = new Map(tablesList.map((table) => [table.name, table]));
     // 1. Scalar filter types
     statements.push(...generateScalarFilterTypes());
     // 2. Enum types used by table fields
-    if (tables && tables.length > 0) {
-        const enumTypes = collectEnumTypesFromTables(tables, typeRegistry);
+    if (hasTables) {
+        const enumTypes = collectEnumTypesFromTables(tablesList, typeRegistry);
         statements.push(...generateEnumTypes(typeRegistry, enumTypes));
     }
     // 3. Entity and relation types (if tables provided)
-    if (tables && tables.length > 0) {
-        const tableByName = new Map(tables.map((table) => [table.name, table]));
-        statements.push(...generateEntityTypes(tables));
+    if (hasTables) {
+        statements.push(...generateEntityTypes(tablesList));
         statements.push(...generateRelationHelperTypes());
-        statements.push(...generateEntityRelationTypes(tables, tableByName));
-        statements.push(...generateEntityWithRelations(tables));
-        statements.push(...generateEntitySelectTypes(tables, tableByName));
+        statements.push(...generateEntityRelationTypes(tablesList, tableByName));
+        statements.push(...generateEntityWithRelations(tablesList));
+        statements.push(...generateEntitySelectTypes(tablesList, tableByName));
         // 4. Table filter types
-        statements.push(...generateTableFilterTypes(tables));
+        statements.push(...generateTableFilterTypes(tablesList));
         // 4b. Table condition types (simple equality filter)
-        statements.push(...generateTableConditionTypes(tables));
+        statements.push(...generateTableConditionTypes(tablesList));
         // 5. OrderBy types
-        statements.push(...generateOrderByTypes(tables));
+        statements.push(...generateOrderByTypes(tablesList));
         // 6. CRUD input types
-        statements.push(...generateAllCrudInputTypes(tables));
+        statements.push(...generateAllCrudInputTypes(tablesList));
     }
+    // 6b. Connection fields map (runtime metadata for buildSelections)
+    // Always emit this export so generated model/custom-op imports stay valid.
+    statements.push(...generateConnectionFieldsMap(tablesList, tableByName));
     // 7. Custom input types from TypeRegistry
     const tableCrudTypes = tables ? buildTableCrudTypeNames(tables) : undefined;
     statements.push(...generateCustomInputTypes(typeRegistry, usedInputTypes, tableCrudTypes));

package/esm/core/codegen/orm/model-generator.d.ts

@@ -1,8 +1,3 @@
-/**
- * Model class generator for ORM client (Babel AST-based)
- *
- * Generates per-table model classes with findMany, findFirst, create, update, delete methods.
- */
 import type { CleanTable } from '../../../types/schema';
 export interface GeneratedModelFile {
     fileName: string;