@constructive-io/graphql-codegen 3.2.1 → 3.3.0

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

@@ -36,12 +36,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.collectInputTypeNames = collectInputTypeNames;
 exports.collectPayloadTypeNames = collectPayloadTypeNames;
 exports.generateInputTypesFile = generateInputTypesFile;
+/**
+ * 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.
+ */
 const t = __importStar(require("@babel/types"));
-const babel_ast_1 = require("../babel-ast");
-const utils_1 = require("../utils");
 const inflekt_1 = require("inflekt");
-const type_resolver_1 = require("../type-resolver");
+const babel_ast_1 = require("../babel-ast");
 const scalars_1 = require("../scalars");
+const type_resolver_1 = require("../type-resolver");
+const utils_1 = require("../utils");
 // ============================================================================
 // Constants
 // ============================================================================
@@ -118,7 +130,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));
         }
     }
@@ -402,9 +416,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', [
@@ -839,6 +851,10 @@ function generateCrudInputTypes(table) {
     const statements = [];
     const { typeName } = (0, utils_1.getTableNames)(table);
     const patchName = `${typeName}Patch`;
+    const pkFields = (0, utils_1.getPrimaryKeyInfo)(table);
+    const pkField = pkFields[0];
+    const pkFieldName = pkField?.name ?? 'id';
+    const pkFieldTsType = pkField?.tsType ?? 'string';
     // Create input
     statements.push(buildCreateInputInterface(table));
     // Patch interface
@@ -846,13 +862,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;
 }
@@ -987,8 +1003,7 @@ function collectPayloadTypeNames(operations) {
     const payloadTypes = new Set();
     for (const op of operations) {
         const baseName = (0, type_resolver_1.getTypeBaseName)(op.returnType);
-        if (baseName &&
-            (baseName.endsWith('Payload') || !baseName.endsWith('Connection'))) {
+        if (baseName) {
             payloadTypes.add(baseName);
         }
     }
@@ -1093,6 +1108,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 } = (0, utils_1.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)
 // ============================================================================
 /**
@@ -1100,30 +1157,35 @@ function generatePayloadTypes(typeRegistry, usedPayloadTypes, alreadyGeneratedTy
  */
 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/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;