@constructive-io/graphql-codegen 3.3.2 → 4.0.1

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

@@ -13,9 +13,9 @@
 import * as t from '@babel/types';
 import { pluralize } from 'inflekt';
 import { addLineComment, generateCode } from '../babel-ast';
-import { scalarToFilterType, scalarToTsType } from '../scalars';
+import { SCALAR_NAMES, scalarToFilterType, scalarToTsType } from '../scalars';
 import { getTypeBaseName } from '../type-resolver';
-import { getConditionTypeName, getFilterTypeName, getGeneratedFileHeader, getOrderByTypeName, getPrimaryKeyInfo, getTableNames, isRelationField, } from '../utils';
+import { getCreateInputTypeName, getConditionTypeName, getFilterTypeName, getGeneratedFileHeader, getOrderByTypeName, getPrimaryKeyInfo, getTableNames, isRelationField, lcFirst, } from '../utils';
 // ============================================================================
 // Constants
 // ============================================================================
@@ -327,6 +327,41 @@ function generateEnumTypes(typeRegistry, enumTypeNames) {
     }
     return statements;
 }
+function collectCustomScalarTypes(typeRegistry, tables, excludedTypeNames) {
+    const customScalarTypes = new Set();
+    const tableTypeNames = new Set(tables.map((table) => table.name));
+    for (const [typeName, typeInfo] of typeRegistry) {
+        if (typeInfo.kind !== 'SCALAR')
+            continue;
+        if (SCALAR_NAMES.has(typeName))
+            continue;
+        if (excludedTypeNames.has(typeName))
+            continue;
+        customScalarTypes.add(typeName);
+    }
+    for (const table of tables) {
+        for (const field of table.fields) {
+            const fieldType = typeof field.type === 'string' ? field.type : field.type.gqlType;
+            if (SCALAR_NAMES.has(fieldType))
+                continue;
+            if (excludedTypeNames.has(fieldType))
+                continue;
+            if (tableTypeNames.has(fieldType))
+                continue;
+            if (isLikelyEnumType(fieldType, typeRegistry))
+                continue;
+            customScalarTypes.add(fieldType);
+        }
+    }
+    return Array.from(customScalarTypes).sort();
+}
+function generateCustomScalarTypes(customScalarTypes) {
+    if (customScalarTypes.length === 0)
+        return [];
+    const statements = customScalarTypes.map((scalarType) => createExportedTypeAlias(scalarType, 'unknown'));
+    addSectionComment(statements, 'Custom Scalar Types');
+    return statements;
+}
 // ============================================================================
 // Entity Types Generator (AST-based)
 // ============================================================================
@@ -508,15 +543,12 @@ function buildSelectTypeLiteral(table, tableByName) {
     for (const relation of table.relations.belongsTo) {
         if (relation.fieldName) {
             const relatedTypeName = getRelatedTypeName(relation.referencesTable, tableByName);
-            const prop = t.tsPropertySignature(t.identifier(relation.fieldName), t.tsTypeAnnotation(t.tsUnionType([
-                t.tsBooleanKeyword(),
-                t.tsTypeLiteral([
-                    (() => {
-                        const selectProp = t.tsPropertySignature(t.identifier('select'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(`${relatedTypeName}Select`))));
-                        selectProp.optional = true;
-                        return selectProp;
-                    })(),
-                ]),
+            const prop = t.tsPropertySignature(t.identifier(relation.fieldName), t.tsTypeAnnotation(t.tsTypeLiteral([
+                (() => {
+                    const selectProp = t.tsPropertySignature(t.identifier('select'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(`${relatedTypeName}Select`))));
+                    selectProp.optional = false;
+                    return selectProp;
+                })(),
             ])));
             prop.optional = true;
             members.push(prop);
@@ -528,30 +560,27 @@ function buildSelectTypeLiteral(table, tableByName) {
             const relatedTypeName = getRelatedTypeName(relation.referencedByTable, tableByName);
             const filterName = getRelatedFilterName(relation.referencedByTable, tableByName);
             const orderByName = getRelatedOrderByName(relation.referencedByTable, tableByName);
-            const prop = t.tsPropertySignature(t.identifier(relation.fieldName), t.tsTypeAnnotation(t.tsUnionType([
-                t.tsBooleanKeyword(),
-                t.tsTypeLiteral([
-                    (() => {
-                        const p = t.tsPropertySignature(t.identifier('select'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(`${relatedTypeName}Select`))));
-                        p.optional = true;
-                        return p;
-                    })(),
-                    (() => {
-                        const p = t.tsPropertySignature(t.identifier('first'), t.tsTypeAnnotation(t.tsNumberKeyword()));
-                        p.optional = true;
-                        return p;
-                    })(),
-                    (() => {
-                        const p = t.tsPropertySignature(t.identifier('filter'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(filterName))));
-                        p.optional = true;
-                        return p;
-                    })(),
-                    (() => {
-                        const p = t.tsPropertySignature(t.identifier('orderBy'), t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier(orderByName)))));
-                        p.optional = true;
-                        return p;
-                    })(),
-                ]),
+            const prop = t.tsPropertySignature(t.identifier(relation.fieldName), t.tsTypeAnnotation(t.tsTypeLiteral([
+                (() => {
+                    const p = t.tsPropertySignature(t.identifier('select'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(`${relatedTypeName}Select`))));
+                    p.optional = false;
+                    return p;
+                })(),
+                (() => {
+                    const p = t.tsPropertySignature(t.identifier('first'), t.tsTypeAnnotation(t.tsNumberKeyword()));
+                    p.optional = true;
+                    return p;
+                })(),
+                (() => {
+                    const p = t.tsPropertySignature(t.identifier('filter'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(filterName))));
+                    p.optional = true;
+                    return p;
+                })(),
+                (() => {
+                    const p = t.tsPropertySignature(t.identifier('orderBy'), t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier(orderByName)))));
+                    p.optional = true;
+                    return p;
+                })(),
             ])));
             prop.optional = true;
             members.push(prop);
@@ -563,30 +592,27 @@ function buildSelectTypeLiteral(table, tableByName) {
             const relatedTypeName = getRelatedTypeName(relation.rightTable, tableByName);
             const filterName = getRelatedFilterName(relation.rightTable, tableByName);
             const orderByName = getRelatedOrderByName(relation.rightTable, tableByName);
-            const prop = t.tsPropertySignature(t.identifier(relation.fieldName), t.tsTypeAnnotation(t.tsUnionType([
-                t.tsBooleanKeyword(),
-                t.tsTypeLiteral([
-                    (() => {
-                        const p = t.tsPropertySignature(t.identifier('select'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(`${relatedTypeName}Select`))));
-                        p.optional = true;
-                        return p;
-                    })(),
-                    (() => {
-                        const p = t.tsPropertySignature(t.identifier('first'), t.tsTypeAnnotation(t.tsNumberKeyword()));
-                        p.optional = true;
-                        return p;
-                    })(),
-                    (() => {
-                        const p = t.tsPropertySignature(t.identifier('filter'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(filterName))));
-                        p.optional = true;
-                        return p;
-                    })(),
-                    (() => {
-                        const p = t.tsPropertySignature(t.identifier('orderBy'), t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier(orderByName)))));
-                        p.optional = true;
-                        return p;
-                    })(),
-                ]),
+            const prop = t.tsPropertySignature(t.identifier(relation.fieldName), t.tsTypeAnnotation(t.tsTypeLiteral([
+                (() => {
+                    const p = t.tsPropertySignature(t.identifier('select'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(`${relatedTypeName}Select`))));
+                    p.optional = false;
+                    return p;
+                })(),
+                (() => {
+                    const p = t.tsPropertySignature(t.identifier('first'), t.tsTypeAnnotation(t.tsNumberKeyword()));
+                    p.optional = true;
+                    return p;
+                })(),
+                (() => {
+                    const p = t.tsPropertySignature(t.identifier('filter'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(filterName))));
+                    p.optional = true;
+                    return p;
+                })(),
+                (() => {
+                    const p = t.tsPropertySignature(t.identifier('orderBy'), t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier(orderByName)))));
+                    p.optional = true;
+                    return p;
+                })(),
             ])));
             prop.optional = true;
             members.push(prop);
@@ -596,15 +622,12 @@ function buildSelectTypeLiteral(table, tableByName) {
     for (const relation of table.relations.hasOne) {
         if (relation.fieldName) {
             const relatedTypeName = getRelatedTypeName(relation.referencedByTable, tableByName);
-            const prop = t.tsPropertySignature(t.identifier(relation.fieldName), t.tsTypeAnnotation(t.tsUnionType([
-                t.tsBooleanKeyword(),
-                t.tsTypeLiteral([
-                    (() => {
-                        const selectProp = t.tsPropertySignature(t.identifier('select'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(`${relatedTypeName}Select`))));
-                        selectProp.optional = true;
-                        return selectProp;
-                    })(),
-                ]),
+            const prop = t.tsPropertySignature(t.identifier(relation.fieldName), t.tsTypeAnnotation(t.tsTypeLiteral([
+                (() => {
+                    const selectProp = t.tsPropertySignature(t.identifier('select'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(`${relatedTypeName}Select`))));
+                    selectProp.optional = false;
+                    return selectProp;
+                })(),
             ])));
             prop.optional = true;
             members.push(prop);
@@ -746,7 +769,7 @@ function generateOrderByTypes(tables) {
 /**
  * Build the nested data object fields for Create input
  */
-function buildCreateDataFields(table) {
+function buildCreateDataFieldsFromTable(table) {
     const fields = [];
     for (const field of table.fields) {
         if (EXCLUDED_MUTATION_FIELDS.includes(field.name))
@@ -760,12 +783,60 @@ function buildCreateDataFields(table) {
     }
     return fields;
 }
+/**
+ * Build Create input fields from schema Input types when available.
+ *
+ * This follows the actual GraphQL input shape:
+ * `CreateXInput { clientMutationId?, x: XInput! }`
+ */
+function buildCreateDataFieldsFromSchema(table, typeRegistry) {
+    const createInputTypeName = getCreateInputTypeName(table);
+    const createInputType = typeRegistry.get(createInputTypeName);
+    if (!createInputType ||
+        createInputType.kind !== 'INPUT_OBJECT' ||
+        !createInputType.inputFields) {
+        return null;
+    }
+    const { singularName } = getTableNames(table);
+    const entityArg = createInputType.inputFields.find((field) => field.name === singularName) ??
+        createInputType.inputFields.find((field) => field.name !== 'clientMutationId');
+    if (!entityArg)
+        return null;
+    const entityInputTypeName = getTypeBaseName(entityArg.type);
+    if (!entityInputTypeName)
+        return null;
+    const entityInputType = typeRegistry.get(entityInputTypeName);
+    if (!entityInputType ||
+        entityInputType.kind !== 'INPUT_OBJECT' ||
+        !entityInputType.inputFields) {
+        return null;
+    }
+    const fields = [];
+    for (const field of entityInputType.inputFields) {
+        if (EXCLUDED_MUTATION_FIELDS.includes(field.name)) {
+            continue;
+        }
+        fields.push({
+            name: field.name,
+            type: typeRefToTs(field.type),
+            optional: !isRequired(field.type),
+        });
+    }
+    return fields;
+}
+/**
+ * Build Create input fields, preferring schema-derived Input object fields.
+ */
+function buildCreateDataFields(table, typeRegistry) {
+    return (buildCreateDataFieldsFromSchema(table, typeRegistry) ??
+        buildCreateDataFieldsFromTable(table));
+}
 /**
  * Build Create input interface as AST
  */
-function buildCreateInputInterface(table) {
+function buildCreateInputInterface(table, typeRegistry) {
     const { typeName, singularName } = getTableNames(table);
-    const fields = buildCreateDataFields(table);
+    const fields = buildCreateDataFields(table, typeRegistry);
     // Build the nested object type for the entity data
     const nestedProps = fields.map((field) => {
         const prop = t.tsPropertySignature(t.identifier(field.name), t.tsTypeAnnotation(parseTypeString(field.type)));
@@ -809,7 +880,7 @@ function buildPatchProperties(table) {
 /**
  * Generate CRUD input type statements for a table
  */
-function generateCrudInputTypes(table) {
+function generateCrudInputTypes(table, typeRegistry) {
     const statements = [];
     const { typeName } = getTableNames(table);
     const patchName = `${typeName}Patch`;
@@ -818,14 +889,15 @@ function generateCrudInputTypes(table) {
     const pkFieldName = pkField?.name ?? 'id';
     const pkFieldTsType = pkField?.tsType ?? 'string';
     // Create input
-    statements.push(buildCreateInputInterface(table));
+    statements.push(buildCreateInputInterface(table, typeRegistry));
     // Patch interface
     statements.push(createExportedInterface(patchName, buildPatchProperties(table)));
-    // Update input
+    // Update input - v5 uses entity-specific patch field names (e.g., "userPatch")
+    const patchFieldName = table.query?.patchFieldName ?? lcFirst(typeName) + 'Patch';
     statements.push(createExportedInterface(`Update${typeName}Input`, [
         { name: 'clientMutationId', type: 'string', optional: true },
         { name: pkFieldName, type: pkFieldTsType, optional: false },
-        { name: 'patch', type: patchName, optional: false },
+        { name: patchFieldName, type: patchName, optional: false },
     ]));
     // Delete input
     statements.push(createExportedInterface(`Delete${typeName}Input`, [
@@ -837,10 +909,10 @@ function generateCrudInputTypes(table) {
 /**
  * Generate all CRUD input type statements
  */
-function generateAllCrudInputTypes(tables) {
+function generateAllCrudInputTypes(tables, typeRegistry) {
     const statements = [];
     for (const table of tables) {
-        statements.push(...generateCrudInputTypes(table));
+        statements.push(...generateCrudInputTypes(table, typeRegistry));
     }
     if (statements.length > 0) {
         addSectionComment(statements, 'CRUD Input Types');
@@ -1043,15 +1115,12 @@ function generatePayloadTypes(typeRegistry, usedPayloadTypes, alreadyGeneratedTy
             const nestedType = baseType ? typeRegistry.get(baseType) : null;
             let propType;
             if (nestedType?.kind === 'OBJECT') {
-                propType = t.tsUnionType([
-                    t.tsBooleanKeyword(),
-                    t.tsTypeLiteral([
-                        (() => {
-                            const p = t.tsPropertySignature(t.identifier('select'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(`${baseType}Select`))));
-                            p.optional = true;
-                            return p;
-                        })(),
-                    ]),
+                propType = t.tsTypeLiteral([
+                    (() => {
+                        const p = t.tsPropertySignature(t.identifier('select'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(`${baseType}Select`))));
+                        p.optional = false;
+                        return p;
+                    })(),
                 ]);
             }
             else {
@@ -1122,13 +1191,16 @@ export function generateInputTypesFile(typeRegistry, usedInputTypes, tables, use
     const tablesList = tables ?? [];
     const hasTables = tablesList.length > 0;
     const tableByName = new Map(tablesList.map((table) => [table.name, table]));
+    const enumTypes = hasTables
+        ? collectEnumTypesFromTables(tablesList, typeRegistry)
+        : new Set();
+    const customScalarTypes = collectCustomScalarTypes(typeRegistry, tablesList, enumTypes);
     // 1. Scalar filter types
     statements.push(...generateScalarFilterTypes());
     // 2. Enum types used by table fields
-    if (hasTables) {
-        const enumTypes = collectEnumTypesFromTables(tablesList, typeRegistry);
-        statements.push(...generateEnumTypes(typeRegistry, enumTypes));
-    }
+    statements.push(...generateEnumTypes(typeRegistry, enumTypes));
+    // 2b. Unknown/custom scalar aliases for schema-specific scalars
+    statements.push(...generateCustomScalarTypes(customScalarTypes));
     // 3. Entity and relation types (if tables provided)
     if (hasTables) {
         statements.push(...generateEntityTypes(tablesList));
@@ -1143,7 +1215,7 @@ export function generateInputTypesFile(typeRegistry, usedInputTypes, tables, use
         // 5. OrderBy types
         statements.push(...generateOrderByTypes(tablesList));
         // 6. CRUD input types
-        statements.push(...generateAllCrudInputTypes(tablesList));
+        statements.push(...generateAllCrudInputTypes(tablesList, typeRegistry));
     }
     // 6b. Connection fields map (runtime metadata for buildSelections)
     // Always emit this export so generated model/custom-op imports stay valid.