@constructive-io/graphql-codegen 3.3.2 → 4.0.0

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

@@ -365,6 +365,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 (scalars_1.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 (scalars_1.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)
 // ============================================================================
@@ -546,15 +581,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);
@@ -566,30 +598,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);
@@ -601,30 +630,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);
@@ -634,15 +660,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);
@@ -784,7 +807,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))
@@ -798,12 +821,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 = (0, utils_1.getCreateInputTypeName)(table);
+    const createInputType = typeRegistry.get(createInputTypeName);
+    if (!createInputType ||
+        createInputType.kind !== 'INPUT_OBJECT' ||
+        !createInputType.inputFields) {
+        return null;
+    }
+    const { singularName } = (0, utils_1.getTableNames)(table);
+    const entityArg = createInputType.inputFields.find((field) => field.name === singularName) ??
+        createInputType.inputFields.find((field) => field.name !== 'clientMutationId');
+    if (!entityArg)
+        return null;
+    const entityInputTypeName = (0, type_resolver_1.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 } = (0, utils_1.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)));
@@ -847,7 +918,7 @@ function buildPatchProperties(table) {
 /**
  * Generate CRUD input type statements for a table
  */
-function generateCrudInputTypes(table) {
+function generateCrudInputTypes(table, typeRegistry) {
     const statements = [];
     const { typeName } = (0, utils_1.getTableNames)(table);
     const patchName = `${typeName}Patch`;
@@ -856,14 +927,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 ?? (0, utils_1.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`, [
@@ -875,10 +947,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');
@@ -1081,15 +1153,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 {
@@ -1160,13 +1229,16 @@ function generateInputTypesFile(typeRegistry, usedInputTypes, tables, usedPayloa
     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));
@@ -1181,7 +1253,7 @@ function generateInputTypesFile(typeRegistry, usedInputTypes, tables, usedPayloa
         // 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.

package/core/codegen/orm/model-generator.js

@@ -50,7 +50,7 @@ function createImportDeclaration(moduleSpecifier, namedImports, typeOnly = false
     decl.importKind = typeOnly ? 'type' : 'value';
     return decl;
 }
-function buildMethodBody(builderFn, args, operation, typeName, fieldName) {
+function buildMethodBody(builderFn, args, operation, typeName, fieldName, extraProps = []) {
     const destructureDecl = t.variableDeclaration('const', [
         t.variableDeclarator(t.objectPattern([
             t.objectProperty(t.identifier('document'), t.identifier('document'), false, true),
@@ -65,6 +65,7 @@ function buildMethodBody(builderFn, args, operation, typeName, fieldName) {
             t.objectProperty(t.identifier('fieldName'), t.stringLiteral(fieldName)),
             t.objectProperty(t.identifier('document'), t.identifier('document'), false, true),
             t.objectProperty(t.identifier('variables'), t.identifier('variables'), false, true),
+            ...extraProps,
         ]),
     ]));
     return [destructureDecl, returnStmt];
@@ -75,10 +76,6 @@ function createClassMethod(name, typeParameters, params, returnType, body) {
     method.returnType = returnType;
     return method;
 }
-function createDeclareMethod(name, typeParameters, params, returnType) {
-    const method = t.tsDeclareMethod(null, t.identifier(name), typeParameters, params, returnType);
-    return method;
-}
 function createTypeParam(constraintTypeName, defaultType) {
     const param = t.tsTypeParameter(t.tsTypeReference(t.identifier(constraintTypeName)), defaultType ?? null, 'S');
     return t.tsTypeParameterDeclaration([param]);
@@ -122,6 +119,8 @@ function generateModelFile(table, _useSharedTypes) {
     const pkFields = (0, utils_1.getPrimaryKeyInfo)(table);
     const pkField = pkFields[0];
     const pluralQueryName = table.query?.all ?? pluralName;
+    const singleQueryName = table.query?.one;
+    const singleResultFieldName = (0, utils_1.getSingleRowQueryName)(table);
     const createMutationName = table.query?.create ?? `create${typeName}`;
     const updateMutationName = table.query?.update;
     const deleteMutationName = table.query?.delete;
@@ -166,7 +165,6 @@ function generateModelFile(table, _useSharedTypes) {
     classBody.push(t.classMethod('constructor', t.identifier('constructor'), [paramProp], t.blockStatement([])));
     // Reusable type reference factories
     const sRef = () => t.tsTypeReference(t.identifier('S'));
-    const selectRef = () => t.tsTypeReference(t.identifier(selectTypeName));
     const pkTsType = () => tsTypeFromPrimitive(pkField.tsType);
     // ── findMany ───────────────────────────────────────────────────────────
     {
@@ -185,17 +183,12 @@ function generateModelFile(table, _useSharedTypes) {
                 ])))),
             ]),
         ])));
-        // Overload 1: with select (autocompletion)
-        const o1Param = t.identifier('args');
-        o1Param.typeAnnotation = t.tsTypeAnnotation(t.tsIntersectionType([
+        const implParam = t.identifier('args');
+        implParam.typeAnnotation = t.tsTypeAnnotation(t.tsIntersectionType([
             argsType(sRef()),
             t.tsTypeLiteral([requiredSelectProp()]),
             strictSelectGuard(selectTypeName),
         ]));
-        classBody.push(createDeclareMethod('findMany', createTypeParam(selectTypeName), [o1Param], retType(sRef())));
-        // Implementation
-        const implParam = t.identifier('args');
-        implParam.typeAnnotation = t.tsTypeAnnotation(argsType(selectRef()));
         const selectExpr = t.memberExpression(t.identifier('args'), t.identifier('select'));
         const bodyArgs = [
             t.stringLiteral(typeName),
@@ -217,7 +210,7 @@ function generateModelFile(table, _useSharedTypes) {
             t.stringLiteral(orderByTypeName),
             t.identifier('connectionFieldsMap'),
         ];
-        classBody.push(createClassMethod('findMany', null, [implParam], null, buildMethodBody('buildFindManyDocument', bodyArgs, 'query', typeName, pluralQueryName)));
+        classBody.push(createClassMethod('findMany', createTypeParam(selectTypeName), [implParam], retType(sRef()), buildMethodBody('buildFindManyDocument', bodyArgs, 'query', typeName, pluralQueryName)));
     }
     // ── findFirst ──────────────────────────────────────────────────────────
     {
@@ -235,17 +228,12 @@ function generateModelFile(table, _useSharedTypes) {
                 ]))),
             ]),
         ])));
-        // Overload 1: with select (autocompletion)
-        const o1Param = t.identifier('args');
-        o1Param.typeAnnotation = t.tsTypeAnnotation(t.tsIntersectionType([
+        const implParam = t.identifier('args');
+        implParam.typeAnnotation = t.tsTypeAnnotation(t.tsIntersectionType([
             argsType(sRef()),
             t.tsTypeLiteral([requiredSelectProp()]),
             strictSelectGuard(selectTypeName),
         ]));
-        classBody.push(createDeclareMethod('findFirst', createTypeParam(selectTypeName), [o1Param], retType(sRef())));
-        // Implementation
-        const implParam = t.identifier('args');
-        implParam.typeAnnotation = t.tsTypeAnnotation(argsType(selectRef()));
         const selectExpr = t.memberExpression(t.identifier('args'), t.identifier('select'));
         const bodyArgs = [
             t.stringLiteral(typeName),
@@ -257,15 +245,13 @@ function generateModelFile(table, _useSharedTypes) {
             t.stringLiteral(whereTypeName),
             t.identifier('connectionFieldsMap'),
         ];
-        classBody.push(createClassMethod('findFirst', null, [implParam], null, buildMethodBody('buildFindFirstDocument', bodyArgs, 'query', typeName, pluralQueryName)));
+        classBody.push(createClassMethod('findFirst', createTypeParam(selectTypeName), [implParam], retType(sRef()), buildMethodBody('buildFindFirstDocument', bodyArgs, 'query', typeName, pluralQueryName)));
     }
     // ── findOne ────────────────────────────────────────────────────────────
-    const singleQueryName = table.query?.one;
-    if (singleQueryName && (0, utils_1.hasValidPrimaryKey)(table)) {
-        const pkGqlType = pkField.gqlType.replace(/!/g, '') + '!';
+    if ((0, utils_1.hasValidPrimaryKey)(table)) {
         const retType = (sel) => t.tsTypeAnnotation(t.tsTypeReference(t.identifier('QueryBuilder'), t.tsTypeParameterInstantiation([
             t.tsTypeLiteral([
-                t.tsPropertySignature(t.identifier(singleQueryName), t.tsTypeAnnotation(t.tsUnionType([
+                t.tsPropertySignature(t.identifier(singleResultFieldName), t.tsTypeAnnotation(t.tsUnionType([
                     t.tsTypeReference(t.identifier('InferSelectResult'), t.tsTypeParameterInstantiation([
                         t.tsTypeReference(t.identifier(relationTypeName)),
                         sel,
@@ -279,33 +265,59 @@ function generateModelFile(table, _useSharedTypes) {
             prop.optional = false;
             return prop;
         };
-        // Overload 1: with select (autocompletion)
-        const o1Param = t.identifier('args');
-        o1Param.typeAnnotation = t.tsTypeAnnotation(t.tsIntersectionType([
+        const implParam = t.identifier('args');
+        implParam.typeAnnotation = t.tsTypeAnnotation(t.tsIntersectionType([
             t.tsTypeLiteral([pkProp(), requiredSelectProp()]),
             strictSelectGuard(selectTypeName),
         ]));
-        classBody.push(createDeclareMethod('findOne', createTypeParam(selectTypeName), [o1Param], retType(sRef())));
-        // Implementation
-        const implParam = t.identifier('args');
-        implParam.typeAnnotation = t.tsTypeAnnotation(t.tsTypeLiteral([
-            pkProp(),
-            (() => {
-                const prop = t.tsPropertySignature(t.identifier('select'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(selectTypeName))));
-                return prop;
-            })(),
-        ]));
         const selectExpr = t.memberExpression(t.identifier('args'), t.identifier('select'));
-        const bodyArgs = [
-            t.stringLiteral(typeName),
-            t.stringLiteral(singleQueryName),
-            t.memberExpression(t.identifier('args'), t.identifier(pkField.name)),
-            selectExpr,
-            t.stringLiteral(pkField.name),
-            t.stringLiteral(pkGqlType),
-            t.identifier('connectionFieldsMap'),
-        ];
-        classBody.push(createClassMethod('findOne', null, [implParam], null, buildMethodBody('buildFindOneDocument', bodyArgs, 'query', typeName, singleQueryName)));
+        if (singleQueryName) {
+            const pkGqlType = pkField.gqlType.replace(/!/g, '') + '!';
+            const bodyArgs = [
+                t.stringLiteral(typeName),
+                t.stringLiteral(singleQueryName),
+                t.memberExpression(t.identifier('args'), t.identifier(pkField.name)),
+                selectExpr,
+                t.stringLiteral(pkField.name),
+                t.stringLiteral(pkGqlType),
+                t.identifier('connectionFieldsMap'),
+            ];
+            classBody.push(createClassMethod('findOne', createTypeParam(selectTypeName), [implParam], retType(sRef()), buildMethodBody('buildFindOneDocument', bodyArgs, 'query', typeName, singleResultFieldName)));
+        }
+        else {
+            const idExpr = t.memberExpression(t.identifier('args'), t.identifier(pkField.name));
+            const findOneArgs = t.objectExpression([
+                t.objectProperty(t.identifier('where'), t.objectExpression([
+                    t.objectProperty(t.identifier(pkField.name), t.objectExpression([
+                        t.objectProperty(t.identifier('equalTo'), idExpr),
+                    ])),
+                ])),
+                t.objectProperty(t.identifier('first'), t.numericLiteral(1)),
+            ]);
+            const bodyArgs = [
+                t.stringLiteral(typeName),
+                t.stringLiteral(pluralQueryName),
+                selectExpr,
+                findOneArgs,
+                t.stringLiteral(whereTypeName),
+                t.stringLiteral(orderByTypeName),
+                t.identifier('connectionFieldsMap'),
+            ];
+            const firstNodeExpr = t.optionalMemberExpression(t.optionalMemberExpression(t.memberExpression(t.identifier('data'), t.identifier(pluralQueryName)), t.identifier('nodes'), false, true), t.numericLiteral(0), true, true);
+            const transformDataParam = t.identifier('data');
+            const transformedNodesProp = t.tsPropertySignature(t.identifier('nodes'), t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier('InferSelectResult'), t.tsTypeParameterInstantiation([
+                t.tsTypeReference(t.identifier(relationTypeName)),
+                sRef(),
+            ])))));
+            transformedNodesProp.optional = true;
+            const transformedCollectionProp = t.tsPropertySignature(t.identifier(pluralQueryName), t.tsTypeAnnotation(t.tsTypeLiteral([transformedNodesProp])));
+            transformedCollectionProp.optional = true;
+            transformDataParam.typeAnnotation = t.tsTypeAnnotation(t.tsTypeLiteral([transformedCollectionProp]));
+            const transformFn = t.arrowFunctionExpression([transformDataParam], t.objectExpression([
+                t.objectProperty(t.stringLiteral(singleResultFieldName), t.logicalExpression('??', firstNodeExpr, t.nullLiteral())),
+            ]));
+            classBody.push(createClassMethod('findOne', createTypeParam(selectTypeName), [implParam], retType(sRef()), buildMethodBody('buildFindManyDocument', bodyArgs, 'query', typeName, singleResultFieldName, [t.objectProperty(t.identifier('transform'), transformFn)])));
+        }
     }
     // ── create ─────────────────────────────────────────────────────────────
     {
@@ -321,17 +333,12 @@ function generateModelFile(table, _useSharedTypes) {
                 ]))),
             ]),
         ])));
-        // Overload 1: with select (autocompletion)
-        const o1Param = t.identifier('args');
-        o1Param.typeAnnotation = t.tsTypeAnnotation(t.tsIntersectionType([
+        const implParam = t.identifier('args');
+        implParam.typeAnnotation = t.tsTypeAnnotation(t.tsIntersectionType([
             argsType(sRef()),
             t.tsTypeLiteral([requiredSelectProp()]),
             strictSelectGuard(selectTypeName),
         ]));
-        classBody.push(createDeclareMethod('create', createTypeParam(selectTypeName), [o1Param], retType(sRef())));
-        // Implementation
-        const implParam = t.identifier('args');
-        implParam.typeAnnotation = t.tsTypeAnnotation(argsType(selectRef()));
         const selectExpr = t.memberExpression(t.identifier('args'), t.identifier('select'));
         const bodyArgs = [
             t.stringLiteral(typeName),
@@ -342,7 +349,7 @@ function generateModelFile(table, _useSharedTypes) {
             t.stringLiteral(createInputTypeName),
             t.identifier('connectionFieldsMap'),
         ];
-        classBody.push(createClassMethod('create', null, [implParam], null, buildMethodBody('buildCreateDocument', bodyArgs, 'mutation', typeName, createMutationName)));
+        classBody.push(createClassMethod('create', createTypeParam(selectTypeName), [implParam], retType(sRef()), buildMethodBody('buildCreateDocument', bodyArgs, 'mutation', typeName, createMutationName)));
     }
     // ── update ─────────────────────────────────────────────────────────────
     if (updateMutationName) {
@@ -368,18 +375,14 @@ function generateModelFile(table, _useSharedTypes) {
                 ]))),
             ]),
         ])));
-        // Overload 1: with select (autocompletion)
-        const o1Param = t.identifier('args');
-        o1Param.typeAnnotation = t.tsTypeAnnotation(t.tsIntersectionType([
+        const implParam = t.identifier('args');
+        implParam.typeAnnotation = t.tsTypeAnnotation(t.tsIntersectionType([
             argsType(sRef()),
             t.tsTypeLiteral([requiredSelectProp()]),
             strictSelectGuard(selectTypeName),
         ]));
-        classBody.push(createDeclareMethod('update', createTypeParam(selectTypeName), [o1Param], retType(sRef())));
-        // Implementation
-        const implParam = t.identifier('args');
-        implParam.typeAnnotation = t.tsTypeAnnotation(argsType(selectRef()));
         const selectExpr = t.memberExpression(t.identifier('args'), t.identifier('select'));
+        const patchFieldName = table.query?.patchFieldName ?? (0, utils_1.lcFirst)(typeName) + 'Patch';
         const bodyArgs = [
             t.stringLiteral(typeName),
             t.stringLiteral(updateMutationName),
@@ -389,9 +392,10 @@ function generateModelFile(table, _useSharedTypes) {
             t.memberExpression(t.identifier('args'), t.identifier('data')),
             t.stringLiteral(updateInputTypeName),
             t.stringLiteral(pkField.name),
+            t.stringLiteral(patchFieldName),
             t.identifier('connectionFieldsMap'),
         ];
-        classBody.push(createClassMethod('update', null, [implParam], null, buildMethodBody('buildUpdateByPkDocument', bodyArgs, 'mutation', typeName, updateMutationName)));
+        classBody.push(createClassMethod('update', createTypeParam(selectTypeName), [implParam], retType(sRef()), buildMethodBody('buildUpdateByPkDocument', bodyArgs, 'mutation', typeName, updateMutationName)));
     }
     // ── delete ─────────────────────────────────────────────────────────────
     if (deleteMutationName) {
@@ -413,17 +417,12 @@ function generateModelFile(table, _useSharedTypes) {
                 ]))),
             ]),
         ])));
-        // Overload 1: with select (autocompletion)
-        const o1Param = t.identifier('args');
-        o1Param.typeAnnotation = t.tsTypeAnnotation(t.tsIntersectionType([
+        const implParam = t.identifier('args');
+        implParam.typeAnnotation = t.tsTypeAnnotation(t.tsIntersectionType([
             argsType(sRef()),
             t.tsTypeLiteral([requiredSelectProp()]),
             strictSelectGuard(selectTypeName),
         ]));
-        classBody.push(createDeclareMethod('delete', createTypeParam(selectTypeName), [o1Param], retType(sRef())));
-        // Implementation
-        const implParam = t.identifier('args');
-        implParam.typeAnnotation = t.tsTypeAnnotation(argsType(selectRef()));
         const selectExpr = t.memberExpression(t.identifier('args'), t.identifier('select'));
         const bodyArgs = [
             t.stringLiteral(typeName),
@@ -435,7 +434,7 @@ function generateModelFile(table, _useSharedTypes) {
             selectExpr,
             t.identifier('connectionFieldsMap'),
         ];
-        classBody.push(createClassMethod('delete', null, [implParam], null, buildMethodBody('buildDeleteByPkDocument', bodyArgs, 'mutation', typeName, deleteMutationName)));
+        classBody.push(createClassMethod('delete', createTypeParam(selectTypeName), [implParam], retType(sRef()), buildMethodBody('buildDeleteByPkDocument', bodyArgs, 'mutation', typeName, deleteMutationName)));
     }
     const classDecl = t.classDeclaration(t.identifier(modelName), null, t.classBody(classBody));
     statements.push(t.exportNamedDeclaration(classDecl));