@constructive-io/graphql-codegen 3.3.2 → 4.0.1

package/README.md

@@ -183,8 +183,6 @@ interface GraphQLSDKConfigTarget {
   // Generator flags
   reactQuery?: boolean;                 // Generate React Query hooks (output: {output}/hooks)
   orm?: boolean;                        // Generate ORM client (output: {output}/orm)
-  browserCompatible?: boolean;          // Generate browser-compatible code (default: true)
-                                        // Set to false for Node.js with localhost DNS fix
 
   // Table filtering (for CRUD operations from _meta)
   tables?: {
@@ -685,8 +683,6 @@ Generator Options:
   -o, --output <dir>               Output directory
   -t, --target <name>              Target name (for multi-target configs)
   -a, --authorization <token>      Authorization header value
-  --browser-compatible             Generate browser-compatible code (default: true)
-                                   Set to false for Node.js with localhost DNS fix
   --skip-custom-operations         Only generate table CRUD operations
   --dry-run                        Preview without writing files
   -v, --verbose                    Show detailed output

package/cli/index.js

@@ -80,10 +80,11 @@ const commands = async (argv, prompter, _options) => {
             let hasError = false;
             for (const name of names) {
                 console.log(`\n[${name}]`);
-                const result = await (0, generate_1.generate)({
-                    ...targets[name],
-                    ...cliOptions,
-                });
+                const targetConfig = { ...targets[name], ...cliOptions };
+                if (targets[name].db && targetConfig.db) {
+                    targetConfig.db = { ...targets[name].db, ...targetConfig.db };
+                }
+                const result = await (0, generate_1.generate)(targetConfig);
                 (0, shared_1.printResult)(result);
                 if (!result.success)
                     hasError = true;

package/cli/shared.js

@@ -162,7 +162,10 @@ function flattenDbFields(config) {
 function buildDbConfig(options) {
     const { schemas, apiNames, ...rest } = options;
     if (schemas || apiNames) {
-        return { ...rest, db: { schemas, apiNames } };
+        return {
+            ...rest,
+            db: filterDefined({ schemas, apiNames }),
+        };
     }
     return rest;
 }
@@ -202,5 +205,9 @@ function buildGenerateOptions(answers, fileConfig = {}) {
     const camelized = (0, exports.camelizeArgv)(answers);
     const normalized = normalizeCodegenListOptions(camelized);
     const withDb = buildDbConfig(normalized);
-    return { ...fileConfig, ...withDb };
+    const merged = { ...fileConfig, ...withDb };
+    if (fileConfig.db && merged.db) {
+        merged.db = { ...fileConfig.db, ...merged.db };
+    }
+    return merged;
 }

package/core/ast.js

@@ -36,6 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteOne = exports.patchOne = exports.createOne = exports.getOne = exports.getMany = exports.getCount = exports.getAll = void 0;
 exports.getSelections = getSelections;
 const t = __importStar(require("gql-ast"));
+const graphql_1 = require("graphql");
 const inflekt_1 = require("inflekt");
 const custom_ast_1 = require("./custom-ast");
 const NON_MUTABLE_PROPS = ['createdAt', 'createdBy', 'updatedAt', 'updatedBy'];
@@ -76,7 +77,7 @@ const createGqlMutation = ({ operationName, mutationName, selectArgs, selections
     return t.document({
         definitions: [
             t.operationDefinition({
-                operation: 'mutation',
+                operation: graphql_1.OperationTypeNode.MUTATION,
                 name: mutationName,
                 variableDefinitions,
                 selectionSet: t.selectionSet({ selections: opSel }),
@@ -105,7 +106,7 @@ const getAll = ({ queryName, operationName, selection, }) => {
     const ast = t.document({
         definitions: [
             t.operationDefinition({
-                operation: 'query',
+                operation: graphql_1.OperationTypeNode.QUERY,
                 name: queryName,
                 selectionSet: t.selectionSet({ selections: opSel }),
             }),
@@ -149,7 +150,7 @@ const getCount = ({ queryName, operationName, query, }) => {
     const ast = t.document({
         definitions: [
             t.operationDefinition({
-                operation: 'query',
+                operation: graphql_1.OperationTypeNode.QUERY,
                 name: queryName,
                 variableDefinitions,
                 selectionSet: t.selectionSet({ selections: opSel }),
@@ -249,7 +250,7 @@ const getMany = ({ builder, queryName, operationName, query, selection, }) => {
     const ast = t.document({
         definitions: [
             t.operationDefinition({
-                operation: 'query',
+                operation: graphql_1.OperationTypeNode.QUERY,
                 name: queryName,
                 variableDefinitions,
                 selectionSet: t.selectionSet({
@@ -306,7 +307,7 @@ const getOne = ({ queryName, operationName, query, selection, }) => {
     const ast = t.document({
         definitions: [
             t.operationDefinition({
-                operation: 'query',
+                operation: graphql_1.OperationTypeNode.QUERY,
                 name: queryName,
                 variableDefinitions,
                 selectionSet: t.selectionSet({ selections: opSel }),

package/core/codegen/custom-mutations.js

@@ -112,7 +112,7 @@ function generateCustomMutationHookInternal(options) {
         statements.push((0, hooks_ast_1.createImportDeclaration)('../../orm/input-types', inputTypeImports, true));
     }
     if (hasSelect) {
-        statements.push((0, hooks_ast_1.createImportDeclaration)('../../orm/select-types', ['InferSelectResult', 'StrictSelect'], true));
+        statements.push((0, hooks_ast_1.createImportDeclaration)('../../orm/select-types', ['InferSelectResult', 'HookStrictSelect', 'StrictSelect'], true));
     }
     // Re-exports
     if (hasArgs) {
@@ -127,39 +127,38 @@ function generateCustomMutationHookInternal(options) {
             ? (0, hooks_ast_1.typeRef)(varTypeName)
             : t.tsVoidKeyword();
         const selectedResultType = (sel) => (0, hooks_ast_1.customSelectResultTypeLiteral)(operation.name, operation.returnType, payloadTypeName, sel);
-        // Overload 1: with selection.fields
-        const o1ParamType = t.tsIntersectionType([
+        const paramsType = t.tsIntersectionType([
             t.tsTypeLiteral([
                 t.tsPropertySignature(t.identifier('selection'), t.tsTypeAnnotation(t.tsParenthesizedType(t.tsIntersectionType([
                     t.tsTypeLiteral([
-                        t.tsPropertySignature(t.identifier('fields'), t.tsTypeAnnotation((0, hooks_ast_1.sRef)())),
+                        t.tsPropertySignature(t.identifier('fields'), t.tsTypeAnnotation(t.tsIntersectionType([(0, hooks_ast_1.sRef)(), (0, hooks_ast_1.typeRef)(selectTypeName)]))),
+                    ]),
+                    (0, hooks_ast_1.typeRef)('HookStrictSelect', [
+                        (0, hooks_ast_1.typeRef)('NoInfer', [(0, hooks_ast_1.sRef)()]),
+                        (0, hooks_ast_1.typeRef)(selectTypeName),
                     ]),
-                    (0, hooks_ast_1.typeRef)('StrictSelect', [(0, hooks_ast_1.sRef)(), (0, hooks_ast_1.typeRef)(selectTypeName)]),
                 ])))),
             ]),
             (0, hooks_ast_1.useMutationOptionsType)(selectedResultType((0, hooks_ast_1.sRef)()), mutationVarType),
         ]);
-        statements.push((0, hooks_ast_1.exportDeclareFunction)(hookName, (0, hooks_ast_1.createSTypeParam)(selectTypeName), [(0, hooks_ast_1.createFunctionParam)('params', o1ParamType)], (0, hooks_ast_1.useMutationResultType)(selectedResultType((0, hooks_ast_1.sRef)()), mutationVarType)));
-        // Implementation
-        const implSelProp = t.tsPropertySignature(t.identifier('selection'), t.tsTypeAnnotation((0, hooks_ast_1.selectionConfigType)((0, hooks_ast_1.typeRef)(selectTypeName))));
-        const implParamType = t.tsIntersectionType([
-            t.tsTypeLiteral([implSelProp]),
-            (0, hooks_ast_1.omitType)((0, hooks_ast_1.typeRef)('UseMutationOptions', [
-                t.tsAnyKeyword(),
-                (0, hooks_ast_1.typeRef)('Error'),
-                mutationVarType,
-            ]), ['mutationFn']),
-        ]);
         const body = [];
-        body.push((0, hooks_ast_1.buildSelectionArgsCall)(selectTypeName));
+        body.push((0, hooks_ast_1.buildSelectionArgsCall)((0, hooks_ast_1.sRef)()));
         body.push((0, hooks_ast_1.destructureParamsWithSelection)('mutationOptions'));
         body.push((0, hooks_ast_1.voidStatement)('_selection'));
         const mutationKeyExpr = useCentralizedKeys
             ? (0, hooks_ast_1.callExpr)(t.memberExpression(t.identifier('customMutationKeys'), t.identifier(operation.name)), [])
             : undefined;
-        const selectArgExpr = t.objectExpression([
+        // Cast to ORM's StrictSelect (not HookStrictSelect) since the ORM
+        // method signature requires { select: S } & StrictSelect<S, XxxSelect>.
+        // Strictness is already enforced at the hook parameter level.
+        const selectArgExpr = t.tsAsExpression(t.objectExpression([
             (0, hooks_ast_1.objectProp)('select', t.memberExpression(t.identifier('args'), t.identifier('select'))),
-        ]);
+        ]), t.tsIntersectionType([
+            t.tsTypeLiteral([
+                t.tsPropertySignature(t.identifier('select'), t.tsTypeAnnotation((0, hooks_ast_1.sRef)())),
+            ]),
+            (0, hooks_ast_1.typeRef)('StrictSelect', [(0, hooks_ast_1.sRef)(), (0, hooks_ast_1.typeRef)(selectTypeName)]),
+        ]));
         let mutationFnExpr;
         if (hasArgs) {
             const variablesParam = (0, hooks_ast_1.createFunctionParam)('variables', (0, hooks_ast_1.typeRef)(varTypeName));
@@ -169,13 +168,14 @@ function generateCustomMutationHookInternal(options) {
             mutationFnExpr = t.arrowFunctionExpression([], (0, hooks_ast_1.getClientCustomCallUnwrap)('mutation', operation.name, [], selectArgExpr));
         }
         body.push((0, hooks_ast_1.returnUseMutation)(mutationFnExpr, [(0, hooks_ast_1.spreadObj)(t.identifier('mutationOptions'))], mutationKeyExpr));
-        statements.push((0, hooks_ast_1.exportFunction)(hookName, null, [(0, hooks_ast_1.createFunctionParam)('params', implParamType)], body));
+        statements.push((0, hooks_ast_1.exportFunction)(hookName, (0, hooks_ast_1.createSTypeParam)(selectTypeName), [(0, hooks_ast_1.createFunctionParam)('params', paramsType)], body, (0, hooks_ast_1.useMutationResultType)(selectedResultType((0, hooks_ast_1.sRef)()), mutationVarType)));
     }
     else {
         // Without select: simple hook (scalar return type)
-        const resultTypeStr = (0, type_resolver_1.typeRefToTsType)(operation.returnType, tracker);
+        (0, type_resolver_1.typeRefToTsType)(operation.returnType, tracker);
+        const resultTsType = (0, hooks_ast_1.typeRefToTsTypeAST)(operation.returnType);
         const resultTypeLiteral = t.tsTypeLiteral([
-            t.tsPropertySignature(t.identifier(operation.name), t.tsTypeAnnotation((0, hooks_ast_1.typeRef)(resultTypeStr))),
+            t.tsPropertySignature(t.identifier(operation.name), t.tsTypeAnnotation(resultTsType)),
         ]);
         const mutationVarType = hasArgs
             ? (0, hooks_ast_1.typeRef)(varTypeName)

package/core/codegen/custom-queries.js

@@ -65,10 +65,11 @@ function generateCustomQueryHook(options) {
     const tracker = (0, type_resolver_1.createTypeTracker)({ tableTypeNames });
     const hasArgs = operation.args.length > 0;
     const hasRequiredArgs = operation.args.some((arg) => (0, type_resolver_1.isTypeRequired)(arg.type));
-    const resultType = (0, type_resolver_1.typeRefToTsType)(operation.returnType, tracker);
+    (0, type_resolver_1.typeRefToTsType)(operation.returnType, tracker);
     for (const arg of operation.args) {
         (0, type_resolver_1.typeRefToTsType)(arg.type, tracker);
     }
+    const resultTsType = (0, hooks_ast_1.typeRefToTsTypeAST)(operation.returnType);
     const selectTypeName = (0, select_helpers_1.getSelectTypeName)(operation.returnType);
     const payloadTypeName = (0, type_resolver_1.getTypeBaseName)(operation.returnType);
     const hasSelect = !!selectTypeName && !!payloadTypeName;
@@ -106,7 +107,7 @@ function generateCustomQueryHook(options) {
         statements.push((0, hooks_ast_1.createImportDeclaration)('../../orm/input-types', inputTypeImports, true));
     }
     if (hasSelect) {
-        statements.push((0, hooks_ast_1.createImportDeclaration)('../../orm/select-types', ['InferSelectResult', 'StrictSelect'], true));
+        statements.push((0, hooks_ast_1.createImportDeclaration)('../../orm/select-types', ['InferSelectResult', 'HookStrictSelect'], true));
     }
     // Re-exports
     if (hasArgs) {
@@ -158,9 +159,12 @@ function generateCustomQueryHook(options) {
     // Helper to build the fields+StrictSelect intersection type
     const fieldsSelectionType = (s) => t.tsParenthesizedType(t.tsIntersectionType([
         t.tsTypeLiteral([
-            t.tsPropertySignature(t.identifier('fields'), t.tsTypeAnnotation(s)),
+            t.tsPropertySignature(t.identifier('fields'), t.tsTypeAnnotation(t.tsIntersectionType([s, (0, hooks_ast_1.typeRef)(selectTypeName)]))),
+        ]),
+        (0, hooks_ast_1.typeRef)('HookStrictSelect', [
+            (0, hooks_ast_1.typeRef)('NoInfer', [s]),
+            (0, hooks_ast_1.typeRef)(selectTypeName),
         ]),
-        (0, hooks_ast_1.typeRef)('StrictSelect', [s, (0, hooks_ast_1.typeRef)(selectTypeName)]),
     ]));
     const selectedResultType = (sel) => (0, hooks_ast_1.customSelectResultTypeLiteral)(operation.name, operation.returnType, payloadTypeName, sel);
     // Hook
@@ -178,10 +182,11 @@ function generateCustomQueryHook(options) {
             // Overload 1: with selection.fields
             const o1Props = [];
             if (hasArgs) {
-                const varType = hasRequiredArgs
-                    ? (0, hooks_ast_1.typeRef)(varTypeName)
-                    : t.tsUnionType([(0, hooks_ast_1.typeRef)(varTypeName), t.tsUndefinedKeyword()]);
-                o1Props.push(t.tsPropertySignature(t.identifier('variables'), t.tsTypeAnnotation(varType)));
+                const varProp = t.tsPropertySignature(t.identifier('variables'), t.tsTypeAnnotation((0, hooks_ast_1.typeRef)(varTypeName)));
+                if (!hasRequiredArgs) {
+                    varProp.optional = true;
+                }
+                o1Props.push(varProp);
             }
             o1Props.push(t.tsPropertySignature(t.identifier('selection'), t.tsTypeAnnotation(fieldsSelectionType((0, hooks_ast_1.sRef)()))));
             const o1ParamType = t.tsIntersectionType([
@@ -267,7 +272,7 @@ function generateCustomQueryHook(options) {
         else {
             // Without select: simple hook (scalar return type)
             const resultTypeLiteral = t.tsTypeLiteral([
-                t.tsPropertySignature(t.identifier(operation.name), t.tsTypeAnnotation((0, hooks_ast_1.typeRef)(resultType))),
+                t.tsPropertySignature(t.identifier(operation.name), t.tsTypeAnnotation(resultTsType)),
             ]);
             const optType = (0, hooks_ast_1.omitType)((0, hooks_ast_1.typeRef)('UseQueryOptions', [
                 resultTypeLiteral,
@@ -346,10 +351,11 @@ function generateCustomQueryHook(options) {
         // Overload 1: with fields
         const f1Props = [];
         if (hasArgs) {
-            const varType = hasRequiredArgs
-                ? (0, hooks_ast_1.typeRef)(varTypeName)
-                : t.tsUnionType([(0, hooks_ast_1.typeRef)(varTypeName), t.tsUndefinedKeyword()]);
-            f1Props.push(t.tsPropertySignature(t.identifier('variables'), t.tsTypeAnnotation(varType)));
+            const varProp = t.tsPropertySignature(t.identifier('variables'), t.tsTypeAnnotation((0, hooks_ast_1.typeRef)(varTypeName)));
+            if (!hasRequiredArgs) {
+                varProp.optional = true;
+            }
+            f1Props.push(varProp);
         }
         f1Props.push(t.tsPropertySignature(t.identifier('selection'), t.tsTypeAnnotation(fieldsSelectionType((0, hooks_ast_1.sRef)()))));
         const f1Decl = (0, hooks_ast_1.exportAsyncDeclareFunction)(fetchFnName, (0, hooks_ast_1.createSTypeParam)(selectTypeName), [(0, hooks_ast_1.createFunctionParam)('params', t.tsTypeLiteral(f1Props))], (0, hooks_ast_1.typeRef)('Promise', [selectedResultType((0, hooks_ast_1.sRef)())]));
@@ -452,10 +458,11 @@ function generateCustomQueryHook(options) {
             // Overload 1: with fields
             const p1Props = [];
             if (hasArgs) {
-                const varType = hasRequiredArgs
-                    ? (0, hooks_ast_1.typeRef)(varTypeName)
-                    : t.tsUnionType([(0, hooks_ast_1.typeRef)(varTypeName), t.tsUndefinedKeyword()]);
-                p1Props.push(t.tsPropertySignature(t.identifier('variables'), t.tsTypeAnnotation(varType)));
+                const varProp = t.tsPropertySignature(t.identifier('variables'), t.tsTypeAnnotation((0, hooks_ast_1.typeRef)(varTypeName)));
+                if (!hasRequiredArgs) {
+                    varProp.optional = true;
+                }
+                p1Props.push(varProp);
             }
             p1Props.push(t.tsPropertySignature(t.identifier('selection'), t.tsTypeAnnotation(fieldsSelectionType((0, hooks_ast_1.sRef)()))));
             const p1Decl = (0, hooks_ast_1.exportAsyncDeclareFunction)(prefetchFnName, (0, hooks_ast_1.createSTypeParam)(selectTypeName), [

package/core/codegen/hooks-ast.d.ts

@@ -70,6 +70,6 @@ export declare function generateHookFileCode(headerDescription: string, statemen
 export declare function scopeTypeLiteral(scopeTypeName: string): t.TSTypeLiteral;
 export declare function wrapInferSelectResultType(typeRefNode: CleanArgument['type'], payloadTypeName: string, selectType: t.TSType): t.TSType;
 export declare function typeRefToTsTypeAST(typeRefNode: CleanArgument['type']): t.TSType;
-export declare function buildSelectionArgsCall(selectTypeName: string): t.VariableDeclaration;
+export declare function buildSelectionArgsCall(selectType: string | t.TSType): t.VariableDeclaration;
 export declare function buildListSelectionArgsCall(selectTypeName: string, filterTypeName: string, orderByTypeName: string): t.VariableDeclaration;
 export declare function customSelectResultTypeLiteral(opName: string, returnType: CleanArgument['type'], payloadTypeName: string, selectType: t.TSType): t.TSTypeLiteral;

package/core/codegen/hooks-ast.js

@@ -194,7 +194,10 @@ function selectionConfigType(selectType) {
     return typeRef('SelectionConfig', [selectType]);
 }
 function strictSelectType(selectType, shapeTypeName) {
-    return typeRef('StrictSelect', [selectType, typeRef(shapeTypeName)]);
+    return typeRef('HookStrictSelect', [
+        typeRef('NoInfer', [selectType]),
+        typeRef(shapeTypeName),
+    ]);
 }
 function withFieldsSelectionType(selectType, selectTypeName) {
     return t.tsIntersectionType([
@@ -463,8 +466,15 @@ function scopeTypeLiteral(scopeTypeName) {
 // Type conversion helpers (GraphQL -> AST)
 // ============================================================================
 function wrapInferSelectResultType(typeRefNode, payloadTypeName, selectType) {
+    const nonNullable = wrapInferSelectResultTypeNonNullable(typeRefNode, payloadTypeName, selectType);
+    if (typeRefNode.kind === 'NON_NULL') {
+        return nonNullable;
+    }
+    return t.tsUnionType([nonNullable, t.tsNullKeyword()]);
+}
+function wrapInferSelectResultTypeNonNullable(typeRefNode, payloadTypeName, selectType) {
     if (typeRefNode.kind === 'NON_NULL' && typeRefNode.ofType) {
-        return wrapInferSelectResultType(typeRefNode.ofType, payloadTypeName, selectType);
+        return wrapInferSelectResultTypeNonNullable(typeRefNode.ofType, payloadTypeName, selectType);
     }
     if (typeRefNode.kind === 'LIST' && typeRefNode.ofType) {
         return t.tsArrayType(wrapInferSelectResultType(typeRefNode.ofType, payloadTypeName, selectType));
@@ -472,8 +482,15 @@ function wrapInferSelectResultType(typeRefNode, payloadTypeName, selectType) {
     return inferSelectResultType(payloadTypeName, selectType);
 }
 function typeRefToTsTypeAST(typeRefNode) {
+    const nonNullable = typeRefToTsTypeASTNonNullable(typeRefNode);
+    if (typeRefNode.kind === 'NON_NULL') {
+        return nonNullable;
+    }
+    return t.tsUnionType([nonNullable, t.tsNullKeyword()]);
+}
+function typeRefToTsTypeASTNonNullable(typeRefNode) {
     if (typeRefNode.kind === 'NON_NULL' && typeRefNode.ofType) {
-        return typeRefToTsTypeAST(typeRefNode.ofType);
+        return typeRefToTsTypeASTNonNullable(typeRefNode.ofType);
     }
     if (typeRefNode.kind === 'LIST' && typeRefNode.ofType) {
         return t.tsArrayType(typeRefToTsTypeAST(typeRefNode.ofType));
@@ -490,13 +507,13 @@ function typeRefToTsTypeAST(typeRefNode) {
     }
     return typeRef(typeRefNode.name ?? 'unknown');
 }
-function buildSelectionArgsCall(selectTypeName) {
+function buildSelectionArgsCall(selectType) {
     const call = t.callExpression(t.identifier('buildSelectionArgs'), [
         t.memberExpression(t.identifier('params'), t.identifier('selection')),
     ]);
     // @ts-ignore - Babel types support typeParameters on CallExpression for TS
     call.typeParameters = t.tsTypeParameterInstantiation([
-        typeRef(selectTypeName),
+        typeof selectType === 'string' ? typeRef(selectType) : selectType,
     ]);
     return constDecl('args', call);
 }

package/core/codegen/index.d.ts

@@ -42,7 +42,7 @@ export interface GenerateResult {
     };
 }
 export interface GenerateOptions {
-    /** Tables from _meta introspection */
+    /** Tables from GraphQL introspection */
     tables: CleanTable[];
     /** Custom operations from __schema introspection */
     customOperations?: {

package/core/codegen/mutations.js

@@ -65,9 +65,12 @@ function buildMutationResultType(mutationName, singularName, relationTypeName, s
 function buildFieldsSelectionType(s, selectTypeName) {
     return t.tsParenthesizedType(t.tsIntersectionType([
         t.tsTypeLiteral([
-            t.tsPropertySignature(t.identifier('fields'), t.tsTypeAnnotation(s)),
+            t.tsPropertySignature(t.identifier('fields'), t.tsTypeAnnotation(t.tsIntersectionType([s, (0, hooks_ast_1.typeRef)(selectTypeName)]))),
+        ]),
+        (0, hooks_ast_1.typeRef)('HookStrictSelect', [
+            (0, hooks_ast_1.typeRef)('NoInfer', [s]),
+            (0, hooks_ast_1.typeRef)(selectTypeName),
         ]),
-        (0, hooks_ast_1.typeRef)('StrictSelect', [s, (0, hooks_ast_1.typeRef)(selectTypeName)]),
     ]));
 }
 function generateCreateMutationHook(table, options = {}) {
@@ -97,7 +100,7 @@ function generateCreateMutationHook(table, options = {}) {
         statements.push((0, hooks_ast_1.createImportDeclaration)('../mutation-keys', [mutationKeysName]));
     }
     statements.push((0, hooks_ast_1.createImportDeclaration)('../../orm/input-types', [selectTypeName, relationTypeName, createInputTypeName], true));
-    statements.push((0, hooks_ast_1.createImportDeclaration)('../../orm/select-types', ['InferSelectResult', 'StrictSelect'], true));
+    statements.push((0, hooks_ast_1.createImportDeclaration)('../../orm/select-types', ['InferSelectResult', 'HookStrictSelect'], true));
     // Re-exports
     statements.push((0, hooks_ast_1.createTypeReExport)([selectTypeName, relationTypeName, createInputTypeName], '../../orm/input-types'));
     // Variable type: CreateTypeName['singularName']
@@ -186,6 +189,7 @@ function generateUpdateMutationHook(table, options = {}) {
     const patchTypeName = `${typeName}Patch`;
     const pkFields = (0, utils_1.getPrimaryKeyInfo)(table);
     const pkField = pkFields[0];
+    const patchFieldName = table.query?.patchFieldName ?? (0, utils_1.lcFirst)(typeName) + 'Patch';
     const pkTsType = pkField.tsType === 'string' ? t.tsStringKeyword() : t.tsNumberKeyword();
     const statements = [];
     // Imports
@@ -202,13 +206,13 @@ function generateUpdateMutationHook(table, options = {}) {
         statements.push((0, hooks_ast_1.createImportDeclaration)('../mutation-keys', [mutationKeysName]));
     }
     statements.push((0, hooks_ast_1.createImportDeclaration)('../../orm/input-types', [selectTypeName, relationTypeName, patchTypeName], true));
-    statements.push((0, hooks_ast_1.createImportDeclaration)('../../orm/select-types', ['InferSelectResult', 'StrictSelect'], true));
+    statements.push((0, hooks_ast_1.createImportDeclaration)('../../orm/select-types', ['InferSelectResult', 'HookStrictSelect'], true));
     // Re-exports
     statements.push((0, hooks_ast_1.createTypeReExport)([selectTypeName, relationTypeName, patchTypeName], '../../orm/input-types'));
-    // Variable type: { pkField: type; patch: PatchType }
+    // Variable type: { pkField: type; patchFieldName: PatchType }
     const updateVarType = t.tsTypeLiteral([
         t.tsPropertySignature(t.identifier(pkField.name), t.tsTypeAnnotation(pkTsType)),
-        t.tsPropertySignature(t.identifier('patch'), t.tsTypeAnnotation((0, hooks_ast_1.typeRef)(patchTypeName))),
+        t.tsPropertySignature(t.identifier(patchFieldName), t.tsTypeAnnotation((0, hooks_ast_1.typeRef)(patchTypeName))),
     ]);
     const resultType = (sel) => buildMutationResultType(mutationName, singularName, relationTypeName, sel);
     // Overload 1: with fields
@@ -228,7 +232,7 @@ function generateUpdateMutationHook(table, options = {}) {
         '  selection: { fields: { id: true, name: true } },',
         '});',
         '',
-        `mutate({ ${pkField.name}: 'value-here', patch: { name: 'Updated' } });`,
+        `mutate({ ${pkField.name}: 'value-here', ${patchFieldName}: { name: 'Updated' } });`,
         '```',
     ]);
     statements.push(o1);
@@ -250,16 +254,16 @@ function generateUpdateMutationHook(table, options = {}) {
     const mutationKeyExpr = useCentralizedKeys
         ? t.memberExpression(t.identifier(mutationKeysName), t.identifier('all'))
         : undefined;
-    // mutationFn: ({ pkField, patch }: { pkField: type; patch: PatchType }) =>
-    //   getClient().singular.update({ where: { pkField }, data: patch, select: ... }).unwrap()
+    // mutationFn: ({ pkField, patchFieldName }: VarType) =>
+    //   getClient().singular.update({ where: { pkField }, data: patchFieldName, select: ... }).unwrap()
     const destructParam = t.objectPattern([
         (0, hooks_ast_1.shorthandProp)(pkField.name),
-        (0, hooks_ast_1.shorthandProp)('patch'),
+        (0, hooks_ast_1.shorthandProp)(patchFieldName),
     ]);
     destructParam.typeAnnotation = t.tsTypeAnnotation(updateVarType);
     const mutationFnExpr = t.arrowFunctionExpression([destructParam], (0, hooks_ast_1.getClientCallUnwrap)(singularName, 'update', t.objectExpression([
         (0, hooks_ast_1.objectProp)('where', t.objectExpression([(0, hooks_ast_1.shorthandProp)(pkField.name)])),
-        (0, hooks_ast_1.objectProp)('data', t.identifier('patch')),
+        (0, hooks_ast_1.objectProp)('data', t.identifier(patchFieldName)),
         (0, hooks_ast_1.objectProp)('select', t.memberExpression(t.identifier('args'), t.identifier('select'))),
     ])));
     // onSuccess: invalidate detail and lists
@@ -327,7 +331,7 @@ function generateDeleteMutationHook(table, options = {}) {
         statements.push((0, hooks_ast_1.createImportDeclaration)('../mutation-keys', [mutationKeysName]));
     }
     statements.push((0, hooks_ast_1.createImportDeclaration)('../../orm/input-types', [selectTypeName, relationTypeName], true));
-    statements.push((0, hooks_ast_1.createImportDeclaration)('../../orm/select-types', ['InferSelectResult', 'StrictSelect'], true));
+    statements.push((0, hooks_ast_1.createImportDeclaration)('../../orm/select-types', ['InferSelectResult', 'HookStrictSelect'], true));
     // Re-exports
     statements.push((0, hooks_ast_1.createTypeReExport)([selectTypeName, relationTypeName], '../../orm/input-types'));
     // Variable type: { pkField: type }

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

@@ -142,8 +142,15 @@ function parseTypeAnnotation(typeStr) {
     return t.tsTypeReference(t.identifier(typeStr));
 }
 function buildSelectedResultTsType(typeRef, payloadTypeName) {
+    const nonNullable = buildSelectedResultTsTypeNonNullable(typeRef, payloadTypeName);
+    if (typeRef.kind === 'NON_NULL') {
+        return nonNullable;
+    }
+    return t.tsUnionType([nonNullable, t.tsNullKeyword()]);
+}
+function buildSelectedResultTsTypeNonNullable(typeRef, payloadTypeName) {
     if (typeRef.kind === 'NON_NULL' && typeRef.ofType) {
-        return buildSelectedResultTsType(typeRef.ofType, payloadTypeName);
+        return buildSelectedResultTsTypeNonNullable(typeRef.ofType, payloadTypeName);
     }
     if (typeRef.kind === 'LIST' && typeRef.ofType) {
         return t.tsArrayType(buildSelectedResultTsType(typeRef.ofType, payloadTypeName));
@@ -153,6 +160,34 @@ function buildSelectedResultTsType(typeRef, payloadTypeName) {
         t.tsTypeReference(t.identifier('S')),
     ]));
 }
+function scalarTsTypeToAst(typeName) {
+    if (typeName === 'string')
+        return t.tsStringKeyword();
+    if (typeName === 'number')
+        return t.tsNumberKeyword();
+    if (typeName === 'boolean')
+        return t.tsBooleanKeyword();
+    return t.tsUnknownKeyword();
+}
+function buildRawResultTsType(typeRef) {
+    const nonNullable = buildRawResultTsTypeNonNullable(typeRef);
+    if (typeRef.kind === 'NON_NULL') {
+        return nonNullable;
+    }
+    return t.tsUnionType([nonNullable, t.tsNullKeyword()]);
+}
+function buildRawResultTsTypeNonNullable(typeRef) {
+    if (typeRef.kind === 'NON_NULL' && typeRef.ofType) {
+        return buildRawResultTsTypeNonNullable(typeRef.ofType);
+    }
+    if (typeRef.kind === 'LIST' && typeRef.ofType) {
+        return t.tsArrayType(buildRawResultTsType(typeRef.ofType));
+    }
+    if (typeRef.kind === 'SCALAR') {
+        return scalarTsTypeToAst((0, type_resolver_1.scalarToTsType)(typeRef.name ?? 'unknown'));
+    }
+    return t.tsTypeReference(t.identifier(typeRef.name ?? 'unknown'));
+}
 function buildOperationMethod(op, operationType) {
     const hasArgs = op.args.length > 0;
     const varTypeName = `${(0, utils_1.ucFirst)(op.name)}Variables`;
@@ -235,10 +270,9 @@ function buildOperationMethod(op, operationType) {
     }
     else {
         // Scalar/Connection type: use raw TS type directly
-        const rawTsType = (0, type_resolver_1.typeRefToTsType)(op.returnType);
         newExpr.typeParameters = t.tsTypeParameterInstantiation([
             t.tsTypeLiteral([
-                t.tsPropertySignature(t.identifier(op.name), t.tsTypeAnnotation(parseTypeAnnotation(rawTsType))),
+                t.tsPropertySignature(t.identifier(op.name), t.tsTypeAnnotation(buildRawResultTsType(op.returnType))),
             ]),
         ]);
     }