@constructive-io/graphql-codegen 3.2.1 → 3.3.0

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

@@ -1,6 +1,12 @@
+/**
+ * Model class generator for ORM client (Babel AST-based)
+ *
+ * Generates per-table model classes with findMany, findFirst, create, update, delete methods.
+ * Each method uses function overloads for IDE autocompletion of select objects.
+ */
 import * as t from '@babel/types';
 import { generateCode } from '../babel-ast';
-import { getTableNames, getOrderByTypeName, getFilterTypeName, lcFirst, getGeneratedFileHeader, } from '../utils';
+import { getFilterTypeName, getGeneratedFileHeader, getOrderByTypeName, getPrimaryKeyInfo, getTableNames, hasValidPrimaryKey, lcFirst, } from '../utils';
 function createImportDeclaration(moduleSpecifier, namedImports, typeOnly = false) {
     const specifiers = namedImports.map((name) => t.importSpecifier(t.identifier(name), t.identifier(name)));
     const decl = t.importDeclaration(specifiers, t.stringLiteral(moduleSpecifier));
@@ -32,11 +38,36 @@ function createClassMethod(name, typeParameters, params, returnType, body) {
     method.returnType = returnType;
     return method;
 }
-function createConstTypeParam(constraintTypeName) {
-    const param = t.tsTypeParameter(t.tsTypeReference(t.identifier(constraintTypeName)), null, 'S');
-    param.const = true;
+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]);
 }
+function tsTypeFromPrimitive(typeName) {
+    if (typeName === 'string')
+        return t.tsStringKeyword();
+    if (typeName === 'number')
+        return t.tsNumberKeyword();
+    if (typeName === 'boolean')
+        return t.tsBooleanKeyword();
+    return t.tsTypeReference(t.identifier(typeName));
+}
+/** Build a required `select: S` property for overload signatures */
+function requiredSelectProp() {
+    const prop = t.tsPropertySignature(t.identifier('select'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('S'))));
+    prop.optional = false;
+    return prop;
+}
+/** Build `StrictSelect<S, XxxSelect>` type reference for overload intersections */
+function strictSelectGuard(selectTypeName) {
+    return t.tsTypeReference(t.identifier('StrictSelect'), t.tsTypeParameterInstantiation([
+        t.tsTypeReference(t.identifier('S')),
+        t.tsTypeReference(t.identifier(selectTypeName)),
+    ]));
+}
 export function generateModelFile(table, _useSharedTypes) {
     const { typeName, singularName, pluralName } = getTableNames(table);
     const modelName = `${typeName}Model`;
@@ -51,6 +82,8 @@ export function generateModelFile(table, _useSharedTypes) {
     const updateInputTypeName = `Update${typeName}Input`;
     const deleteInputTypeName = `Delete${typeName}Input`;
     const patchTypeName = `${typeName}Patch`;
+    const pkFields = getPrimaryKeyInfo(table);
+    const pkField = pkFields[0];
     const pluralQueryName = table.query?.all ?? pluralName;
     const createMutationName = table.query?.create ?? `create${typeName}`;
     const updateMutationName = table.query?.update;
@@ -58,17 +91,35 @@ export function generateModelFile(table, _useSharedTypes) {
     const statements = [];
     statements.push(createImportDeclaration('../client', ['OrmClient']));
     statements.push(createImportDeclaration('../query-builder', [
-        'QueryBuilder', 'buildFindManyDocument', 'buildFindFirstDocument',
-        'buildCreateDocument', 'buildUpdateDocument', 'buildDeleteDocument',
+        'QueryBuilder',
+        'buildFindManyDocument',
+        'buildFindFirstDocument',
+        'buildFindOneDocument',
+        'buildCreateDocument',
+        'buildUpdateByPkDocument',
+        'buildDeleteByPkDocument',
     ]));
     statements.push(createImportDeclaration('../select-types', [
-        'ConnectionResult', 'FindManyArgs', 'FindFirstArgs', 'CreateArgs',
-        'UpdateArgs', 'DeleteArgs', 'InferSelectResult', 'DeepExact',
+        'ConnectionResult',
+        'FindManyArgs',
+        'FindFirstArgs',
+        'CreateArgs',
+        'UpdateArgs',
+        'DeleteArgs',
+        'InferSelectResult',
+        'StrictSelect',
     ], true));
     statements.push(createImportDeclaration('../input-types', [
-        typeName, relationTypeName, selectTypeName, whereTypeName, orderByTypeName,
-        createInputTypeName, updateInputTypeName, patchTypeName,
+        typeName,
+        relationTypeName,
+        selectTypeName,
+        whereTypeName,
+        orderByTypeName,
+        createInputTypeName,
+        updateInputTypeName,
+        patchTypeName,
     ], true));
+    statements.push(createImportDeclaration('../input-types', ['connectionFieldsMap']));
     const classBody = [];
     // Constructor
     const constructorParam = t.identifier('client');
@@ -76,162 +127,289 @@ export function generateModelFile(table, _useSharedTypes) {
     const paramProp = t.tsParameterProperty(constructorParam);
     paramProp.accessibility = 'private';
     classBody.push(t.classMethod('constructor', t.identifier('constructor'), [paramProp], t.blockStatement([])));
-    // findMany method
-    // Use DeepExact<S, SelectType> to enforce strict field validation
-    const findManyParam = t.identifier('args');
-    findManyParam.optional = true;
-    findManyParam.typeAnnotation = t.tsTypeAnnotation(t.tsTypeReference(t.identifier('FindManyArgs'), t.tsTypeParameterInstantiation([
-        t.tsTypeReference(t.identifier('DeepExact'), t.tsTypeParameterInstantiation([
-            t.tsTypeReference(t.identifier('S')),
-            t.tsTypeReference(t.identifier(selectTypeName)),
-        ])),
-        t.tsTypeReference(t.identifier(whereTypeName)),
-        t.tsTypeReference(t.identifier(orderByTypeName)),
-    ])));
-    const findManyReturnType = t.tsTypeAnnotation(t.tsTypeReference(t.identifier('QueryBuilder'), t.tsTypeParameterInstantiation([
-        t.tsTypeLiteral([
-            t.tsPropertySignature(t.identifier(pluralQueryName), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('ConnectionResult'), t.tsTypeParameterInstantiation([
-                t.tsTypeReference(t.identifier('InferSelectResult'), t.tsTypeParameterInstantiation([
-                    t.tsTypeReference(t.identifier(relationTypeName)),
-                    t.tsTypeReference(t.identifier('S')),
-                ])),
-            ])))),
-        ]),
-    ])));
-    const findManyArgs = [
-        t.stringLiteral(typeName),
-        t.stringLiteral(pluralQueryName),
-        t.optionalMemberExpression(t.identifier('args'), t.identifier('select'), false, true),
-        t.objectExpression([
-            t.objectProperty(t.identifier('where'), t.optionalMemberExpression(t.identifier('args'), t.identifier('where'), false, true)),
-            t.objectProperty(t.identifier('orderBy'), t.tsAsExpression(t.optionalMemberExpression(t.identifier('args'), t.identifier('orderBy'), false, true), t.tsUnionType([t.tsArrayType(t.tsStringKeyword()), t.tsUndefinedKeyword()]))),
-            t.objectProperty(t.identifier('first'), t.optionalMemberExpression(t.identifier('args'), t.identifier('first'), false, true)),
-            t.objectProperty(t.identifier('last'), t.optionalMemberExpression(t.identifier('args'), t.identifier('last'), false, true)),
-            t.objectProperty(t.identifier('after'), t.optionalMemberExpression(t.identifier('args'), t.identifier('after'), false, true)),
-            t.objectProperty(t.identifier('before'), t.optionalMemberExpression(t.identifier('args'), t.identifier('before'), false, true)),
-            t.objectProperty(t.identifier('offset'), t.optionalMemberExpression(t.identifier('args'), t.identifier('offset'), false, true)),
-        ]),
-        t.stringLiteral(whereTypeName),
-        t.stringLiteral(orderByTypeName),
-    ];
-    classBody.push(createClassMethod('findMany', createConstTypeParam(selectTypeName), [findManyParam], findManyReturnType, buildMethodBody('buildFindManyDocument', findManyArgs, 'query', typeName, pluralQueryName)));
-    // findFirst method
-    const findFirstParam = t.identifier('args');
-    findFirstParam.optional = true;
-    findFirstParam.typeAnnotation = t.tsTypeAnnotation(t.tsTypeReference(t.identifier('FindFirstArgs'), t.tsTypeParameterInstantiation([
-        t.tsTypeReference(t.identifier('DeepExact'), t.tsTypeParameterInstantiation([
-            t.tsTypeReference(t.identifier('S')),
-            t.tsTypeReference(t.identifier(selectTypeName)),
-        ])),
-        t.tsTypeReference(t.identifier(whereTypeName)),
-    ])));
-    const findFirstReturnType = t.tsTypeAnnotation(t.tsTypeReference(t.identifier('QueryBuilder'), t.tsTypeParameterInstantiation([
-        t.tsTypeLiteral([
-            t.tsPropertySignature(t.identifier(pluralQueryName), t.tsTypeAnnotation(t.tsTypeLiteral([
-                t.tsPropertySignature(t.identifier('nodes'), t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier('InferSelectResult'), t.tsTypeParameterInstantiation([
-                    t.tsTypeReference(t.identifier(relationTypeName)),
-                    t.tsTypeReference(t.identifier('S')),
-                ]))))),
-            ]))),
-        ]),
-    ])));
-    const findFirstArgs = [
-        t.stringLiteral(typeName),
-        t.stringLiteral(pluralQueryName),
-        t.optionalMemberExpression(t.identifier('args'), t.identifier('select'), false, true),
-        t.objectExpression([
-            t.objectProperty(t.identifier('where'), t.optionalMemberExpression(t.identifier('args'), t.identifier('where'), false, true)),
-        ]),
-        t.stringLiteral(whereTypeName),
-    ];
-    classBody.push(createClassMethod('findFirst', createConstTypeParam(selectTypeName), [findFirstParam], findFirstReturnType, buildMethodBody('buildFindFirstDocument', findFirstArgs, 'query', typeName, pluralQueryName)));
-    // create method
-    const createParam = t.identifier('args');
-    createParam.typeAnnotation = t.tsTypeAnnotation(t.tsTypeReference(t.identifier('CreateArgs'), t.tsTypeParameterInstantiation([
-        t.tsTypeReference(t.identifier('DeepExact'), t.tsTypeParameterInstantiation([
-            t.tsTypeReference(t.identifier('S')),
-            t.tsTypeReference(t.identifier(selectTypeName)),
-        ])),
-        t.tsIndexedAccessType(t.tsTypeReference(t.identifier(createInputTypeName)), t.tsLiteralType(t.stringLiteral(singularName))),
-    ])));
-    const createReturnType = t.tsTypeAnnotation(t.tsTypeReference(t.identifier('QueryBuilder'), t.tsTypeParameterInstantiation([
-        t.tsTypeLiteral([
-            t.tsPropertySignature(t.identifier(createMutationName), t.tsTypeAnnotation(t.tsTypeLiteral([
-                t.tsPropertySignature(t.identifier(entityLower), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('InferSelectResult'), t.tsTypeParameterInstantiation([
-                    t.tsTypeReference(t.identifier(relationTypeName)),
-                    t.tsTypeReference(t.identifier('S')),
+    // Reusable type reference factories
+    const sRef = () => t.tsTypeReference(t.identifier('S'));
+    const selectRef = () => t.tsTypeReference(t.identifier(selectTypeName));
+    const pkTsType = () => tsTypeFromPrimitive(pkField.tsType);
+    // ── findMany ───────────────────────────────────────────────────────────
+    {
+        const argsType = (sel) => t.tsTypeReference(t.identifier('FindManyArgs'), t.tsTypeParameterInstantiation([
+            sel,
+            t.tsTypeReference(t.identifier(whereTypeName)),
+            t.tsTypeReference(t.identifier(orderByTypeName)),
+        ]));
+        const retType = (sel) => t.tsTypeAnnotation(t.tsTypeReference(t.identifier('QueryBuilder'), t.tsTypeParameterInstantiation([
+            t.tsTypeLiteral([
+                t.tsPropertySignature(t.identifier(pluralQueryName), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('ConnectionResult'), t.tsTypeParameterInstantiation([
+                    t.tsTypeReference(t.identifier('InferSelectResult'), t.tsTypeParameterInstantiation([
+                        t.tsTypeReference(t.identifier(relationTypeName)),
+                        sel,
+                    ])),
                 ])))),
-            ]))),
-        ]),
-    ])));
-    const createArgs = [
-        t.stringLiteral(typeName),
-        t.stringLiteral(createMutationName),
-        t.stringLiteral(entityLower),
-        t.memberExpression(t.identifier('args'), t.identifier('select')),
-        t.memberExpression(t.identifier('args'), t.identifier('data')),
-        t.stringLiteral(createInputTypeName),
-    ];
-    classBody.push(createClassMethod('create', createConstTypeParam(selectTypeName), [createParam], createReturnType, buildMethodBody('buildCreateDocument', createArgs, 'mutation', typeName, createMutationName)));
-    // update method (if available)
+            ]),
+        ])));
+        // Overload 1: with select (autocompletion)
+        const o1Param = t.identifier('args');
+        o1Param.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),
+            t.stringLiteral(pluralQueryName),
+            selectExpr,
+            t.objectExpression([
+                t.objectProperty(t.identifier('where'), t.optionalMemberExpression(t.identifier('args'), t.identifier('where'), false, true)),
+                t.objectProperty(t.identifier('orderBy'), t.tsAsExpression(t.optionalMemberExpression(t.identifier('args'), t.identifier('orderBy'), false, true), t.tsUnionType([
+                    t.tsArrayType(t.tsStringKeyword()),
+                    t.tsUndefinedKeyword(),
+                ]))),
+                t.objectProperty(t.identifier('first'), t.optionalMemberExpression(t.identifier('args'), t.identifier('first'), false, true)),
+                t.objectProperty(t.identifier('last'), t.optionalMemberExpression(t.identifier('args'), t.identifier('last'), false, true)),
+                t.objectProperty(t.identifier('after'), t.optionalMemberExpression(t.identifier('args'), t.identifier('after'), false, true)),
+                t.objectProperty(t.identifier('before'), t.optionalMemberExpression(t.identifier('args'), t.identifier('before'), false, true)),
+                t.objectProperty(t.identifier('offset'), t.optionalMemberExpression(t.identifier('args'), t.identifier('offset'), false, true)),
+            ]),
+            t.stringLiteral(whereTypeName),
+            t.stringLiteral(orderByTypeName),
+            t.identifier('connectionFieldsMap'),
+        ];
+        classBody.push(createClassMethod('findMany', null, [implParam], null, buildMethodBody('buildFindManyDocument', bodyArgs, 'query', typeName, pluralQueryName)));
+    }
+    // ── findFirst ──────────────────────────────────────────────────────────
+    {
+        const argsType = (sel) => t.tsTypeReference(t.identifier('FindFirstArgs'), t.tsTypeParameterInstantiation([
+            sel,
+            t.tsTypeReference(t.identifier(whereTypeName)),
+        ]));
+        const retType = (sel) => t.tsTypeAnnotation(t.tsTypeReference(t.identifier('QueryBuilder'), t.tsTypeParameterInstantiation([
+            t.tsTypeLiteral([
+                t.tsPropertySignature(t.identifier(pluralQueryName), t.tsTypeAnnotation(t.tsTypeLiteral([
+                    t.tsPropertySignature(t.identifier('nodes'), t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier('InferSelectResult'), t.tsTypeParameterInstantiation([
+                        t.tsTypeReference(t.identifier(relationTypeName)),
+                        sel,
+                    ]))))),
+                ]))),
+            ]),
+        ])));
+        // Overload 1: with select (autocompletion)
+        const o1Param = t.identifier('args');
+        o1Param.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),
+            t.stringLiteral(pluralQueryName),
+            selectExpr,
+            t.objectExpression([
+                t.objectProperty(t.identifier('where'), t.optionalMemberExpression(t.identifier('args'), t.identifier('where'), false, true)),
+            ]),
+            t.stringLiteral(whereTypeName),
+            t.identifier('connectionFieldsMap'),
+        ];
+        classBody.push(createClassMethod('findFirst', null, [implParam], null, buildMethodBody('buildFindFirstDocument', bodyArgs, 'query', typeName, pluralQueryName)));
+    }
+    // ── findOne ────────────────────────────────────────────────────────────
+    const singleQueryName = table.query?.one;
+    if (singleQueryName && hasValidPrimaryKey(table)) {
+        const pkGqlType = pkField.gqlType.replace(/!/g, '') + '!';
+        const retType = (sel) => t.tsTypeAnnotation(t.tsTypeReference(t.identifier('QueryBuilder'), t.tsTypeParameterInstantiation([
+            t.tsTypeLiteral([
+                t.tsPropertySignature(t.identifier(singleQueryName), t.tsTypeAnnotation(t.tsUnionType([
+                    t.tsTypeReference(t.identifier('InferSelectResult'), t.tsTypeParameterInstantiation([
+                        t.tsTypeReference(t.identifier(relationTypeName)),
+                        sel,
+                    ])),
+                    t.tsNullKeyword(),
+                ]))),
+            ]),
+        ])));
+        const pkProp = () => {
+            const prop = t.tsPropertySignature(t.identifier(pkField.name), t.tsTypeAnnotation(pkTsType()));
+            prop.optional = false;
+            return prop;
+        };
+        // Overload 1: with select (autocompletion)
+        const o1Param = t.identifier('args');
+        o1Param.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)));
+    }
+    // ── create ─────────────────────────────────────────────────────────────
+    {
+        const dataType = () => t.tsIndexedAccessType(t.tsTypeReference(t.identifier(createInputTypeName)), t.tsLiteralType(t.stringLiteral(singularName)));
+        const argsType = (sel) => t.tsTypeReference(t.identifier('CreateArgs'), t.tsTypeParameterInstantiation([sel, dataType()]));
+        const retType = (sel) => t.tsTypeAnnotation(t.tsTypeReference(t.identifier('QueryBuilder'), t.tsTypeParameterInstantiation([
+            t.tsTypeLiteral([
+                t.tsPropertySignature(t.identifier(createMutationName), t.tsTypeAnnotation(t.tsTypeLiteral([
+                    t.tsPropertySignature(t.identifier(entityLower), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('InferSelectResult'), t.tsTypeParameterInstantiation([
+                        t.tsTypeReference(t.identifier(relationTypeName)),
+                        sel,
+                    ])))),
+                ]))),
+            ]),
+        ])));
+        // Overload 1: with select (autocompletion)
+        const o1Param = t.identifier('args');
+        o1Param.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),
+            t.stringLiteral(createMutationName),
+            t.stringLiteral(entityLower),
+            selectExpr,
+            t.memberExpression(t.identifier('args'), t.identifier('data')),
+            t.stringLiteral(createInputTypeName),
+            t.identifier('connectionFieldsMap'),
+        ];
+        classBody.push(createClassMethod('create', null, [implParam], null, buildMethodBody('buildCreateDocument', bodyArgs, 'mutation', typeName, createMutationName)));
+    }
+    // ── update ─────────────────────────────────────────────────────────────
     if (updateMutationName) {
-        const updateParam = t.identifier('args');
-        updateParam.typeAnnotation = t.tsTypeAnnotation(t.tsTypeReference(t.identifier('UpdateArgs'), t.tsTypeParameterInstantiation([
-            t.tsTypeReference(t.identifier('DeepExact'), t.tsTypeParameterInstantiation([
-                t.tsTypeReference(t.identifier('S')),
-                t.tsTypeReference(t.identifier(selectTypeName)),
-            ])),
-            t.tsTypeLiteral([t.tsPropertySignature(t.identifier('id'), t.tsTypeAnnotation(t.tsStringKeyword()))]),
+        const whereLiteral = () => t.tsTypeLiteral([
+            (() => {
+                const prop = t.tsPropertySignature(t.identifier(pkField.name), t.tsTypeAnnotation(pkTsType()));
+                prop.optional = false;
+                return prop;
+            })(),
+        ]);
+        const argsType = (sel) => t.tsTypeReference(t.identifier('UpdateArgs'), t.tsTypeParameterInstantiation([
+            sel,
+            whereLiteral(),
             t.tsTypeReference(t.identifier(patchTypeName)),
-        ])));
-        const updateReturnType = t.tsTypeAnnotation(t.tsTypeReference(t.identifier('QueryBuilder'), t.tsTypeParameterInstantiation([
+        ]));
+        const retType = (sel) => t.tsTypeAnnotation(t.tsTypeReference(t.identifier('QueryBuilder'), t.tsTypeParameterInstantiation([
             t.tsTypeLiteral([
                 t.tsPropertySignature(t.identifier(updateMutationName), t.tsTypeAnnotation(t.tsTypeLiteral([
                     t.tsPropertySignature(t.identifier(entityLower), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('InferSelectResult'), t.tsTypeParameterInstantiation([
                         t.tsTypeReference(t.identifier(relationTypeName)),
-                        t.tsTypeReference(t.identifier('S')),
+                        sel,
                     ])))),
                 ]))),
             ]),
         ])));
-        const updateArgs = [
+        // Overload 1: with select (autocompletion)
+        const o1Param = t.identifier('args');
+        o1Param.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 bodyArgs = [
             t.stringLiteral(typeName),
             t.stringLiteral(updateMutationName),
             t.stringLiteral(entityLower),
-            t.memberExpression(t.identifier('args'), t.identifier('select')),
-            t.memberExpression(t.identifier('args'), t.identifier('where')),
+            selectExpr,
+            t.memberExpression(t.memberExpression(t.identifier('args'), t.identifier('where')), t.identifier(pkField.name)),
             t.memberExpression(t.identifier('args'), t.identifier('data')),
             t.stringLiteral(updateInputTypeName),
+            t.stringLiteral(pkField.name),
+            t.identifier('connectionFieldsMap'),
         ];
-        classBody.push(createClassMethod('update', createConstTypeParam(selectTypeName), [updateParam], updateReturnType, buildMethodBody('buildUpdateDocument', updateArgs, 'mutation', typeName, updateMutationName)));
+        classBody.push(createClassMethod('update', null, [implParam], null, buildMethodBody('buildUpdateByPkDocument', bodyArgs, 'mutation', typeName, updateMutationName)));
     }
-    // delete method (if available)
+    // ── delete ─────────────────────────────────────────────────────────────
     if (deleteMutationName) {
-        const deleteParam = t.identifier('args');
-        deleteParam.typeAnnotation = t.tsTypeAnnotation(t.tsTypeReference(t.identifier('DeleteArgs'), t.tsTypeParameterInstantiation([
-            t.tsTypeLiteral([t.tsPropertySignature(t.identifier('id'), t.tsTypeAnnotation(t.tsStringKeyword()))]),
-        ])));
-        const deleteReturnType = t.tsTypeAnnotation(t.tsTypeReference(t.identifier('QueryBuilder'), t.tsTypeParameterInstantiation([
+        const whereLiteral = () => t.tsTypeLiteral([
+            (() => {
+                const prop = t.tsPropertySignature(t.identifier(pkField.name), t.tsTypeAnnotation(pkTsType()));
+                prop.optional = false;
+                return prop;
+            })(),
+        ]);
+        const argsType = (sel) => t.tsTypeReference(t.identifier('DeleteArgs'), t.tsTypeParameterInstantiation([whereLiteral(), sel]));
+        const retType = (sel) => t.tsTypeAnnotation(t.tsTypeReference(t.identifier('QueryBuilder'), t.tsTypeParameterInstantiation([
             t.tsTypeLiteral([
                 t.tsPropertySignature(t.identifier(deleteMutationName), t.tsTypeAnnotation(t.tsTypeLiteral([
-                    t.tsPropertySignature(t.identifier(entityLower), t.tsTypeAnnotation(t.tsTypeLiteral([t.tsPropertySignature(t.identifier('id'), t.tsTypeAnnotation(t.tsStringKeyword()))]))),
+                    t.tsPropertySignature(t.identifier(entityLower), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('InferSelectResult'), t.tsTypeParameterInstantiation([
+                        t.tsTypeReference(t.identifier(relationTypeName)),
+                        sel,
+                    ])))),
                 ]))),
             ]),
         ])));
-        const deleteArgs = [
+        // Overload 1: with select (autocompletion)
+        const o1Param = t.identifier('args');
+        o1Param.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),
             t.stringLiteral(deleteMutationName),
             t.stringLiteral(entityLower),
-            t.memberExpression(t.identifier('args'), t.identifier('where')),
+            t.memberExpression(t.memberExpression(t.identifier('args'), t.identifier('where')), t.identifier(pkField.name)),
             t.stringLiteral(deleteInputTypeName),
+            t.stringLiteral(pkField.name),
+            selectExpr,
+            t.identifier('connectionFieldsMap'),
         ];
-        classBody.push(createClassMethod('delete', null, [deleteParam], deleteReturnType, buildMethodBody('buildDeleteDocument', deleteArgs, 'mutation', typeName, deleteMutationName)));
+        classBody.push(createClassMethod('delete', null, [implParam], null, buildMethodBody('buildDeleteByPkDocument', bodyArgs, 'mutation', typeName, deleteMutationName)));
     }
     const classDecl = t.classDeclaration(t.identifier(modelName), null, t.classBody(classBody));
     statements.push(t.exportNamedDeclaration(classDecl));
     const header = getGeneratedFileHeader(`${typeName} model for ORM client`);
     const code = generateCode(statements);
-    return { fileName, content: header + '\n' + code, modelName, tableName: table.name };
+    return {
+        fileName,
+        content: header + '\n' + code,
+        modelName,
+        tableName: table.name,
+    };
 }
 export function generateAllModelFiles(tables, useSharedTypes) {
     return tables.map((table) => generateModelFile(table, useSharedTypes));

package/esm/core/codegen/orm/select-types.d.ts

@@ -47,16 +47,10 @@ export interface NestedSelectConfig {
 /**
  * Recursively validates select objects, rejecting unknown keys.
  *
- * This type ensures that users can only select fields that actually exist
- * in the GraphQL schema. It returns `never` if any excess keys are found
- * at any nesting level, causing a TypeScript compile error.
- *
- * Why this is needed:
- * TypeScript's excess property checking has a quirk where it only catches
- * invalid fields when they are the ONLY fields. When mixed with valid fields
- * (e.g., `{ id: true, invalidField: true }`), the structural typing allows
- * the excess property through. This type explicitly checks for and rejects
- * such cases.
+ * NOTE: This type is intentionally NOT used in generated parameter positions
+ * (conditional types block IDE autocompletion). Parameters use `S` directly
+ * with `S extends XxxSelect` constraints, which provides full
+ * autocompletion via TypeScript's contextual typing.
  *
  * @example
  * // This will cause a type error because 'invalid' doesn't exist:
@@ -71,12 +65,22 @@ export interface NestedSelectConfig {
 export type DeepExact<T, Shape> = T extends Shape ? Exclude<keyof T, keyof Shape> extends never ? {
     [K in keyof T]: K extends keyof Shape ? T[K] extends {
         select: infer NS;
-    } ? Shape[K] extends {
+    } ? Extract<Shape[K], {
+        select?: unknown;
+    }> extends {
         select?: infer ShapeNS;
-    } ? {
+    } ? DeepExact<Omit<T[K], 'select'> & {
         select: DeepExact<NS, NonNullable<ShapeNS>>;
-    } : T[K] : T[K] : never;
+    }, Extract<Shape[K], {
+        select?: unknown;
+    }>> : never : T[K] : never;
 } : never : never;
+/**
+ * Enforces exact select shape while keeping contextual typing on `S extends XxxSelect`.
+ * Use this as an intersection in overloads:
+ * `{ select: S } & StrictSelect<S, XxxSelect>`.
+ */
+export type StrictSelect<S, Shape> = S extends DeepExact<S, Shape> ? {} : never;
 /**
  * Infers the result type from a select configuration
  *
@@ -172,8 +176,9 @@ export interface UpdateArgs<TSelect, TWhere, TData> {
 /**
  * Arguments for delete operations
  */
-export interface DeleteArgs<TWhere> {
+export interface DeleteArgs<TWhere, TSelect = undefined> {
     where: TWhere;
+    select?: TSelect;
 }
 /**
  * Helper type to get the final result type from a query

package/esm/core/codegen/queries.d.ts

@@ -1,11 +1,3 @@
-/**
- * Query hook generators using Babel AST-based code generation
- *
- * Output structure:
- * queries/
- *   useCarsQuery.ts    - List query hook
- *   useCarQuery.ts     - Single item query hook
- */
 import type { CleanTable } from '../../types/schema';
 export interface GeneratedQueryFile {
     fileName: string;