@constructive-io/graphql-codegen 3.2.1 → 3.3.0

package/esm/core/codegen/mutations.js

@@ -1,441 +1,376 @@
+/**
+ * Mutation hook generators - delegates to ORM model methods (Babel AST-based)
+ *
+ * Output structure:
+ * mutations/
+ *   useCreateCarMutation.ts  -> ORM create
+ *   useUpdateCarMutation.ts  -> ORM update
+ *   useDeleteCarMutation.ts  -> ORM delete
+ */
 import * as t from '@babel/types';
-import { generateCode, addJSDocComment, typedParam, createTypedCallExpression } from './babel-ast';
-import { buildCreateMutationAST, buildUpdateMutationAST, buildDeleteMutationAST, printGraphQL, } from './gql-ast';
-import { getTableNames, getCreateMutationHookName, getUpdateMutationHookName, getDeleteMutationHookName, getCreateMutationFileName, getUpdateMutationFileName, getDeleteMutationFileName, getCreateMutationName, getUpdateMutationName, getDeleteMutationName, getScalarFields, getPrimaryKeyInfo, fieldTypeToTs, ucFirst, lcFirst, getGeneratedFileHeader, } from './utils';
-function isAutoGeneratedField(fieldName, pkFieldNames) {
-    const name = fieldName.toLowerCase();
-    if (pkFieldNames.has(fieldName))
-        return true;
-    const timestampPatterns = [
-        'createdat', 'created_at', 'createddate', 'created_date',
-        'updatedat', 'updated_at', 'updateddate', 'updated_date',
-        'deletedat', 'deleted_at',
-    ];
-    return timestampPatterns.includes(name);
+import { addJSDocComment, buildSelectionArgsCall, callExpr, constDecl, createFunctionParam, createImportDeclaration, createSTypeParam, createTypeReExport, destructureParamsWithSelection, exportDeclareFunction, exportFunction, generateHookFileCode, getClientCallUnwrap, inferSelectResultType, objectProp, omitType, returnUseMutation, selectionConfigType, shorthandProp, spreadObj, sRef, typeRef, typeLiteralWithProps, useMutationOptionsType, useMutationResultType, voidStatement, } from './hooks-ast';
+import { getCreateMutationFileName, getCreateMutationHookName, getCreateMutationName, getDeleteMutationFileName, getDeleteMutationHookName, getDeleteMutationName, getPrimaryKeyInfo, getTableNames, getUpdateMutationFileName, getUpdateMutationHookName, getUpdateMutationName, hasValidPrimaryKey, lcFirst, } from './utils';
+function buildMutationResultType(mutationName, singularName, relationTypeName, selectType) {
+    return typeLiteralWithProps([
+        {
+            name: mutationName,
+            type: typeLiteralWithProps([
+                {
+                    name: singularName,
+                    type: inferSelectResultType(relationTypeName, selectType),
+                },
+            ]),
+        },
+    ]);
+}
+function buildFieldsSelectionType(s, selectTypeName) {
+    return t.tsParenthesizedType(t.tsIntersectionType([
+        t.tsTypeLiteral([
+            t.tsPropertySignature(t.identifier('fields'), t.tsTypeAnnotation(s)),
+        ]),
+        typeRef('StrictSelect', [s, typeRef(selectTypeName)]),
+    ]));
 }
 export function generateCreateMutationHook(table, options = {}) {
-    const { reactQueryEnabled = true, enumsFromSchemaTypes = [], useCentralizedKeys = true, hasRelationships = false, tableTypeNames = new Set(), } = options;
-    if (!reactQueryEnabled) {
+    const { reactQueryEnabled = true, useCentralizedKeys = true } = options;
+    if (!reactQueryEnabled)
         return null;
-    }
-    const enumSet = new Set(enumsFromSchemaTypes);
     const { typeName, singularName } = getTableNames(table);
     const hookName = getCreateMutationHookName(table);
+    const mutationName = getCreateMutationName(table);
     const keysName = `${lcFirst(typeName)}Keys`;
     const mutationKeysName = `${lcFirst(typeName)}MutationKeys`;
-    const scopeTypeName = `${typeName}Scope`;
-    const mutationName = getCreateMutationName(table);
-    const scalarFields = getScalarFields(table);
-    const pkFieldNames = new Set(getPrimaryKeyInfo(table).map((pk) => pk.name));
-    const usedEnums = new Set();
-    const usedTableTypes = new Set();
-    for (const field of scalarFields) {
-        const cleanType = field.type.gqlType.replace(/!/g, '');
-        if (enumSet.has(cleanType)) {
-            usedEnums.add(cleanType);
-        }
-        else if (tableTypeNames.has(cleanType) && cleanType !== typeName) {
-            // Track table types used in scalar fields (excluding the main type which is already imported)
-            usedTableTypes.add(cleanType);
-        }
-    }
-    const mutationAST = buildCreateMutationAST({ table });
-    const mutationDocument = printGraphQL(mutationAST);
+    const selectTypeName = `${typeName}Select`;
+    const relationTypeName = `${typeName}WithRelations`;
+    const createInputTypeName = `Create${typeName}Input`;
     const statements = [];
-    const reactQueryImport = t.importDeclaration([
-        t.importSpecifier(t.identifier('useMutation'), t.identifier('useMutation')),
-        t.importSpecifier(t.identifier('useQueryClient'), t.identifier('useQueryClient')),
-    ], t.stringLiteral('@tanstack/react-query'));
-    statements.push(reactQueryImport);
-    const reactQueryTypeImport = t.importDeclaration([t.importSpecifier(t.identifier('UseMutationOptions'), t.identifier('UseMutationOptions'))], t.stringLiteral('@tanstack/react-query'));
-    reactQueryTypeImport.importKind = 'type';
-    statements.push(reactQueryTypeImport);
-    const clientImport = t.importDeclaration([t.importSpecifier(t.identifier('execute'), t.identifier('execute'))], t.stringLiteral('../client'));
-    statements.push(clientImport);
-    // Import the main type and any other table types used in scalar fields
-    const allTypesToImport = [typeName, ...Array.from(usedTableTypes)].sort();
-    const typesImport = t.importDeclaration(allTypesToImport.map((t_) => t.importSpecifier(t.identifier(t_), t.identifier(t_))), t.stringLiteral('../types'));
-    typesImport.importKind = 'type';
-    statements.push(typesImport);
-    if (usedEnums.size > 0) {
-        const enumImport = t.importDeclaration(Array.from(usedEnums).sort().map((e) => t.importSpecifier(t.identifier(e), t.identifier(e))), t.stringLiteral('../schema-types'));
-        enumImport.importKind = 'type';
-        statements.push(enumImport);
-    }
-    if (useCentralizedKeys) {
-        const queryKeyImport = t.importDeclaration([t.importSpecifier(t.identifier(keysName), t.identifier(keysName))], t.stringLiteral('../query-keys'));
-        statements.push(queryKeyImport);
-        if (hasRelationships) {
-            const scopeTypeImport = t.importDeclaration([t.importSpecifier(t.identifier(scopeTypeName), t.identifier(scopeTypeName))], t.stringLiteral('../query-keys'));
-            scopeTypeImport.importKind = 'type';
-            statements.push(scopeTypeImport);
-        }
-        const mutationKeyImport = t.importDeclaration([t.importSpecifier(t.identifier(mutationKeysName), t.identifier(mutationKeysName))], t.stringLiteral('../mutation-keys'));
-        statements.push(mutationKeyImport);
-    }
-    const reExportDecl = t.exportNamedDeclaration(null, [t.exportSpecifier(t.identifier(typeName), t.identifier(typeName))], t.stringLiteral('../types'));
-    reExportDecl.exportKind = 'type';
-    statements.push(reExportDecl);
-    const mutationDocConst = t.variableDeclaration('const', [
-        t.variableDeclarator(t.identifier(`${mutationName}MutationDocument`), t.templateLiteral([t.templateElement({ raw: '\n' + mutationDocument, cooked: '\n' + mutationDocument }, true)], [])),
-    ]);
-    statements.push(t.exportNamedDeclaration(mutationDocConst));
-    const inputFields = scalarFields
-        .filter((f) => !isAutoGeneratedField(f.name, pkFieldNames))
-        .map((f) => {
-        const prop = t.tsPropertySignature(t.identifier(f.name), t.tsTypeAnnotation(t.tsUnionType([
-            t.tsTypeReference(t.identifier(fieldTypeToTs(f.type))),
-            t.tsNullKeyword(),
-        ])));
-        prop.optional = true;
-        return prop;
-    });
-    const createInputInterface = t.tsInterfaceDeclaration(t.identifier(`${typeName}CreateInput`), null, null, t.tsInterfaceBody(inputFields));
-    addJSDocComment(createInputInterface, [`Input type for creating a ${typeName}`]);
-    statements.push(createInputInterface);
-    const variablesInterfaceBody = t.tsInterfaceBody([
-        t.tsPropertySignature(t.identifier('input'), t.tsTypeAnnotation(t.tsTypeLiteral([
-            t.tsPropertySignature(t.identifier(lcFirst(typeName)), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(`${typeName}CreateInput`)))),
-        ]))),
-    ]);
-    const variablesInterface = t.tsInterfaceDeclaration(t.identifier(`${ucFirst(mutationName)}MutationVariables`), null, null, variablesInterfaceBody);
-    statements.push(t.exportNamedDeclaration(variablesInterface));
-    const resultInterfaceBody = t.tsInterfaceBody([
-        t.tsPropertySignature(t.identifier(mutationName), t.tsTypeAnnotation(t.tsTypeLiteral([
-            t.tsPropertySignature(t.identifier(singularName), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(typeName)))),
-        ]))),
-    ]);
-    const resultInterface = t.tsInterfaceDeclaration(t.identifier(`${ucFirst(mutationName)}MutationResult`), null, null, resultInterfaceBody);
-    statements.push(t.exportNamedDeclaration(resultInterface));
-    const hookBodyStatements = [];
-    hookBodyStatements.push(t.variableDeclaration('const', [
-        t.variableDeclarator(t.identifier('queryClient'), t.callExpression(t.identifier('useQueryClient'), [])),
+    // Imports
+    statements.push(createImportDeclaration('@tanstack/react-query', [
+        'useMutation',
+        'useQueryClient',
     ]));
-    const mutationOptions = [];
+    statements.push(createImportDeclaration('@tanstack/react-query', ['UseMutationOptions', 'UseMutationResult'], true));
+    statements.push(createImportDeclaration('../client', ['getClient']));
+    statements.push(createImportDeclaration('../selection', ['buildSelectionArgs']));
+    statements.push(createImportDeclaration('../selection', ['SelectionConfig'], true));
     if (useCentralizedKeys) {
-        mutationOptions.push(t.objectProperty(t.identifier('mutationKey'), t.callExpression(t.memberExpression(t.identifier(mutationKeysName), t.identifier('create')), [])));
+        statements.push(createImportDeclaration('../query-keys', [keysName]));
+        statements.push(createImportDeclaration('../mutation-keys', [mutationKeysName]));
     }
-    mutationOptions.push(t.objectProperty(t.identifier('mutationFn'), t.arrowFunctionExpression([typedParam('variables', t.tsTypeReference(t.identifier(`${ucFirst(mutationName)}MutationVariables`)))], createTypedCallExpression(t.identifier('execute'), [t.identifier(`${mutationName}MutationDocument`), t.identifier('variables')], [
-        t.tsTypeReference(t.identifier(`${ucFirst(mutationName)}MutationResult`)),
-        t.tsTypeReference(t.identifier(`${ucFirst(mutationName)}MutationVariables`)),
-    ]))));
-    const invalidateQueryKey = useCentralizedKeys
-        ? t.callExpression(t.memberExpression(t.identifier(keysName), t.identifier('lists')), [])
-        : t.arrayExpression([t.stringLiteral(typeName.toLowerCase()), t.stringLiteral('list')]);
-    mutationOptions.push(t.objectProperty(t.identifier('onSuccess'), t.arrowFunctionExpression([], t.blockStatement([
-        t.expressionStatement(t.callExpression(t.memberExpression(t.identifier('queryClient'), t.identifier('invalidateQueries')), [t.objectExpression([t.objectProperty(t.identifier('queryKey'), invalidateQueryKey)])])),
-    ]))));
-    mutationOptions.push(t.spreadElement(t.identifier('options')));
-    hookBodyStatements.push(t.returnStatement(t.callExpression(t.identifier('useMutation'), [t.objectExpression(mutationOptions)])));
-    const optionsTypeStr = `Omit<UseMutationOptions<${ucFirst(mutationName)}MutationResult, Error, ${ucFirst(mutationName)}MutationVariables>, 'mutationFn'>`;
-    const optionsParam = t.identifier('options');
-    optionsParam.optional = true;
-    optionsParam.typeAnnotation = t.tsTypeAnnotation(t.tsTypeReference(t.identifier(optionsTypeStr)));
-    const hookFunc = t.functionDeclaration(t.identifier(hookName), [optionsParam], t.blockStatement(hookBodyStatements));
-    const hookExport = t.exportNamedDeclaration(hookFunc);
-    addJSDocComment(hookExport, [
+    statements.push(createImportDeclaration('../../orm/input-types', [selectTypeName, relationTypeName, createInputTypeName], true));
+    statements.push(createImportDeclaration('../../orm/select-types', ['InferSelectResult', 'StrictSelect'], true));
+    // Re-exports
+    statements.push(createTypeReExport([selectTypeName, relationTypeName, createInputTypeName], '../../orm/input-types'));
+    // Variable type: CreateTypeName['singularName']
+    const createVarType = t.tsIndexedAccessType(typeRef(createInputTypeName), t.tsLiteralType(t.stringLiteral(singularName)));
+    const resultType = (sel) => buildMutationResultType(mutationName, singularName, relationTypeName, sel);
+    // Overload 1: with fields
+    const o1ParamType = t.tsIntersectionType([
+        t.tsTypeLiteral([
+            t.tsPropertySignature(t.identifier('selection'), t.tsTypeAnnotation(buildFieldsSelectionType(sRef(), selectTypeName))),
+        ]),
+        useMutationOptionsType(resultType(sRef()), createVarType),
+    ]);
+    const o1 = exportDeclareFunction(hookName, createSTypeParam(selectTypeName), [createFunctionParam('params', o1ParamType)], useMutationResultType(resultType(sRef()), createVarType));
+    addJSDocComment(o1, [
         `Mutation hook for creating a ${typeName}`,
         '',
         '@example',
         '```tsx',
-        `const { mutate, isPending } = ${hookName}();`,
-        '',
-        'mutate({',
-        '  input: {',
-        `    ${lcFirst(typeName)}: {`,
-        '      // ... fields',
-        '    },',
-        '  },',
+        `const { mutate, isPending } = ${hookName}({`,
+        '  selection: { fields: { id: true, name: true } },',
         '});',
+        '',
+        "mutate({ name: 'New item' });",
         '```',
     ]);
-    statements.push(hookExport);
-    const code = generateCode(statements);
-    const content = getGeneratedFileHeader(`Create mutation hook for ${typeName}`) + '\n\n' + code;
+    statements.push(o1);
+    // Implementation
+    const implSelProp = t.tsPropertySignature(t.identifier('selection'), t.tsTypeAnnotation(selectionConfigType(typeRef(selectTypeName))));
+    const implParamType = t.tsIntersectionType([
+        t.tsTypeLiteral([implSelProp]),
+        omitType(typeRef('UseMutationOptions', [
+            t.tsAnyKeyword(),
+            typeRef('Error'),
+            createVarType,
+        ]), ['mutationFn']),
+    ]);
+    const body = [];
+    body.push(buildSelectionArgsCall(selectTypeName));
+    body.push(destructureParamsWithSelection('mutationOptions'));
+    body.push(voidStatement('_selection'));
+    body.push(constDecl('queryClient', callExpr('useQueryClient', [])));
+    const mutationKeyExpr = useCentralizedKeys
+        ? callExpr(t.memberExpression(t.identifier(mutationKeysName), t.identifier('create')), [])
+        : undefined;
+    // mutationFn: (data: CreateInput['singular']) => getClient().singular.create({ data, select: ... }).unwrap()
+    const dataParam = createFunctionParam('data', createVarType);
+    const mutationFnExpr = t.arrowFunctionExpression([dataParam], getClientCallUnwrap(singularName, 'create', t.objectExpression([
+        shorthandProp('data'),
+        objectProp('select', t.memberExpression(t.identifier('args'), t.identifier('select'))),
+    ])));
+    // onSuccess: invalidate lists
+    const listKeyExpr = useCentralizedKeys
+        ? callExpr(t.memberExpression(t.identifier(keysName), t.identifier('lists')), [])
+        : t.arrayExpression([
+            t.stringLiteral(typeName.toLowerCase()),
+            t.stringLiteral('list'),
+        ]);
+    const onSuccessFn = t.arrowFunctionExpression([], t.blockStatement([
+        t.expressionStatement(callExpr(t.memberExpression(t.identifier('queryClient'), t.identifier('invalidateQueries')), [t.objectExpression([objectProp('queryKey', listKeyExpr)])])),
+    ]));
+    body.push(returnUseMutation(mutationFnExpr, [
+        objectProp('onSuccess', onSuccessFn),
+        spreadObj(t.identifier('mutationOptions')),
+    ], mutationKeyExpr));
+    statements.push(exportFunction(hookName, null, [createFunctionParam('params', implParamType)], body));
     return {
         fileName: getCreateMutationFileName(table),
-        content,
+        content: generateHookFileCode(`Create mutation hook for ${typeName}`, statements),
     };
 }
 export function generateUpdateMutationHook(table, options = {}) {
-    const { reactQueryEnabled = true, enumsFromSchemaTypes = [], useCentralizedKeys = true, hasRelationships = false, tableTypeNames = new Set(), } = options;
-    if (!reactQueryEnabled) {
+    const { reactQueryEnabled = true, useCentralizedKeys = true } = options;
+    if (!reactQueryEnabled)
         return null;
-    }
-    if (table.query?.update === null) {
+    if (table.query?.update === null)
+        return null;
+    if (!hasValidPrimaryKey(table))
         return null;
-    }
-    const enumSet = new Set(enumsFromSchemaTypes);
     const { typeName, singularName } = getTableNames(table);
     const hookName = getUpdateMutationHookName(table);
     const mutationName = getUpdateMutationName(table);
-    const scalarFields = getScalarFields(table);
     const keysName = `${lcFirst(typeName)}Keys`;
     const mutationKeysName = `${lcFirst(typeName)}MutationKeys`;
-    const scopeTypeName = `${typeName}Scope`;
+    const selectTypeName = `${typeName}Select`;
+    const relationTypeName = `${typeName}WithRelations`;
+    const patchTypeName = `${typeName}Patch`;
     const pkFields = getPrimaryKeyInfo(table);
     const pkField = pkFields[0];
-    const pkFieldNames = new Set(pkFields.map((pk) => pk.name));
-    const usedEnums = new Set();
-    const usedTableTypes = new Set();
-    for (const field of scalarFields) {
-        const cleanType = field.type.gqlType.replace(/!/g, '');
-        if (enumSet.has(cleanType)) {
-            usedEnums.add(cleanType);
-        }
-        else if (tableTypeNames.has(cleanType) && cleanType !== typeName) {
-            usedTableTypes.add(cleanType);
-        }
-    }
-    const mutationAST = buildUpdateMutationAST({ table });
-    const mutationDocument = printGraphQL(mutationAST);
+    const pkTsType = pkField.tsType === 'string' ? t.tsStringKeyword() : t.tsNumberKeyword();
     const statements = [];
-    const reactQueryImport = t.importDeclaration([
-        t.importSpecifier(t.identifier('useMutation'), t.identifier('useMutation')),
-        t.importSpecifier(t.identifier('useQueryClient'), t.identifier('useQueryClient')),
-    ], t.stringLiteral('@tanstack/react-query'));
-    statements.push(reactQueryImport);
-    const reactQueryTypeImport = t.importDeclaration([t.importSpecifier(t.identifier('UseMutationOptions'), t.identifier('UseMutationOptions'))], t.stringLiteral('@tanstack/react-query'));
-    reactQueryTypeImport.importKind = 'type';
-    statements.push(reactQueryTypeImport);
-    const clientImport = t.importDeclaration([t.importSpecifier(t.identifier('execute'), t.identifier('execute'))], t.stringLiteral('../client'));
-    statements.push(clientImport);
-    // Import the main type and any other table types used in scalar fields
-    const allTypesToImportUpdate = [typeName, ...Array.from(usedTableTypes)].sort();
-    const typesImport = t.importDeclaration(allTypesToImportUpdate.map((t_) => t.importSpecifier(t.identifier(t_), t.identifier(t_))), t.stringLiteral('../types'));
-    typesImport.importKind = 'type';
-    statements.push(typesImport);
-    if (usedEnums.size > 0) {
-        const enumImport = t.importDeclaration(Array.from(usedEnums).sort().map((e) => t.importSpecifier(t.identifier(e), t.identifier(e))), t.stringLiteral('../schema-types'));
-        enumImport.importKind = 'type';
-        statements.push(enumImport);
-    }
+    // Imports
+    statements.push(createImportDeclaration('@tanstack/react-query', [
+        'useMutation',
+        'useQueryClient',
+    ]));
+    statements.push(createImportDeclaration('@tanstack/react-query', ['UseMutationOptions', 'UseMutationResult'], true));
+    statements.push(createImportDeclaration('../client', ['getClient']));
+    statements.push(createImportDeclaration('../selection', ['buildSelectionArgs']));
+    statements.push(createImportDeclaration('../selection', ['SelectionConfig'], true));
     if (useCentralizedKeys) {
-        const queryKeyImport = t.importDeclaration([t.importSpecifier(t.identifier(keysName), t.identifier(keysName))], t.stringLiteral('../query-keys'));
-        statements.push(queryKeyImport);
-        if (hasRelationships) {
-            const scopeTypeImport = t.importDeclaration([t.importSpecifier(t.identifier(scopeTypeName), t.identifier(scopeTypeName))], t.stringLiteral('../query-keys'));
-            scopeTypeImport.importKind = 'type';
-            statements.push(scopeTypeImport);
-        }
-        const mutationKeyImport = t.importDeclaration([t.importSpecifier(t.identifier(mutationKeysName), t.identifier(mutationKeysName))], t.stringLiteral('../mutation-keys'));
-        statements.push(mutationKeyImport);
+        statements.push(createImportDeclaration('../query-keys', [keysName]));
+        statements.push(createImportDeclaration('../mutation-keys', [mutationKeysName]));
     }
-    const reExportDecl = t.exportNamedDeclaration(null, [t.exportSpecifier(t.identifier(typeName), t.identifier(typeName))], t.stringLiteral('../types'));
-    reExportDecl.exportKind = 'type';
-    statements.push(reExportDecl);
-    const mutationDocConst = t.variableDeclaration('const', [
-        t.variableDeclarator(t.identifier(`${mutationName}MutationDocument`), t.templateLiteral([t.templateElement({ raw: '\n' + mutationDocument, cooked: '\n' + mutationDocument }, true)], [])),
+    statements.push(createImportDeclaration('../../orm/input-types', [selectTypeName, relationTypeName, patchTypeName], true));
+    statements.push(createImportDeclaration('../../orm/select-types', ['InferSelectResult', 'StrictSelect'], true));
+    // Re-exports
+    statements.push(createTypeReExport([selectTypeName, relationTypeName, patchTypeName], '../../orm/input-types'));
+    // Variable type: { pkField: type; patch: PatchType }
+    const updateVarType = t.tsTypeLiteral([
+        t.tsPropertySignature(t.identifier(pkField.name), t.tsTypeAnnotation(pkTsType)),
+        t.tsPropertySignature(t.identifier('patch'), t.tsTypeAnnotation(typeRef(patchTypeName))),
     ]);
-    statements.push(t.exportNamedDeclaration(mutationDocConst));
-    const patchFields = scalarFields
-        .filter((f) => !pkFieldNames.has(f.name))
-        .map((f) => {
-        const prop = t.tsPropertySignature(t.identifier(f.name), t.tsTypeAnnotation(t.tsUnionType([
-            t.tsTypeReference(t.identifier(fieldTypeToTs(f.type))),
-            t.tsNullKeyword(),
-        ])));
-        prop.optional = true;
-        return prop;
-    });
-    const patchInterface = t.tsInterfaceDeclaration(t.identifier(`${typeName}Patch`), null, null, t.tsInterfaceBody(patchFields));
-    addJSDocComment(patchInterface, [`Patch type for updating a ${typeName} - all fields optional`]);
-    statements.push(patchInterface);
-    const pkTypeAnnotation = pkField.tsType === 'string'
-        ? t.tsStringKeyword()
-        : pkField.tsType === 'number'
-            ? t.tsNumberKeyword()
-            : t.tsTypeReference(t.identifier(pkField.tsType));
-    const variablesInterfaceBody = t.tsInterfaceBody([
-        t.tsPropertySignature(t.identifier('input'), t.tsTypeAnnotation(t.tsTypeLiteral([
-            t.tsPropertySignature(t.identifier(pkField.name), t.tsTypeAnnotation(pkTypeAnnotation)),
-            t.tsPropertySignature(t.identifier('patch'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(`${typeName}Patch`)))),
-        ]))),
+    const resultType = (sel) => buildMutationResultType(mutationName, singularName, relationTypeName, sel);
+    // Overload 1: with fields
+    const o1ParamType = t.tsIntersectionType([
+        t.tsTypeLiteral([
+            t.tsPropertySignature(t.identifier('selection'), t.tsTypeAnnotation(buildFieldsSelectionType(sRef(), selectTypeName))),
+        ]),
+        useMutationOptionsType(resultType(sRef()), updateVarType),
     ]);
-    const variablesInterface = t.tsInterfaceDeclaration(t.identifier(`${ucFirst(mutationName)}MutationVariables`), null, null, variablesInterfaceBody);
-    statements.push(t.exportNamedDeclaration(variablesInterface));
-    const resultInterfaceBody = t.tsInterfaceBody([
-        t.tsPropertySignature(t.identifier(mutationName), t.tsTypeAnnotation(t.tsTypeLiteral([
-            t.tsPropertySignature(t.identifier(singularName), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(typeName)))),
-        ]))),
-    ]);
-    const resultInterface = t.tsInterfaceDeclaration(t.identifier(`${ucFirst(mutationName)}MutationResult`), null, null, resultInterfaceBody);
-    statements.push(t.exportNamedDeclaration(resultInterface));
-    const hookBodyStatements = [];
-    hookBodyStatements.push(t.variableDeclaration('const', [
-        t.variableDeclarator(t.identifier('queryClient'), t.callExpression(t.identifier('useQueryClient'), [])),
-    ]));
-    const mutationOptions = [];
-    if (useCentralizedKeys) {
-        mutationOptions.push(t.objectProperty(t.identifier('mutationKey'), t.memberExpression(t.identifier(mutationKeysName), t.identifier('all'))));
-    }
-    mutationOptions.push(t.objectProperty(t.identifier('mutationFn'), t.arrowFunctionExpression([typedParam('variables', t.tsTypeReference(t.identifier(`${ucFirst(mutationName)}MutationVariables`)))], createTypedCallExpression(t.identifier('execute'), [t.identifier(`${mutationName}MutationDocument`), t.identifier('variables')], [
-        t.tsTypeReference(t.identifier(`${ucFirst(mutationName)}MutationResult`)),
-        t.tsTypeReference(t.identifier(`${ucFirst(mutationName)}MutationVariables`)),
-    ]))));
-    const detailQueryKey = useCentralizedKeys
-        ? t.callExpression(t.memberExpression(t.identifier(keysName), t.identifier('detail')), [t.memberExpression(t.memberExpression(t.identifier('variables'), t.identifier('input')), t.identifier(pkField.name))])
-        : t.arrayExpression([
-            t.stringLiteral(typeName.toLowerCase()),
-            t.stringLiteral('detail'),
-            t.memberExpression(t.memberExpression(t.identifier('variables'), t.identifier('input')), t.identifier(pkField.name)),
-        ]);
-    const listQueryKey = useCentralizedKeys
-        ? t.callExpression(t.memberExpression(t.identifier(keysName), t.identifier('lists')), [])
-        : t.arrayExpression([t.stringLiteral(typeName.toLowerCase()), t.stringLiteral('list')]);
-    mutationOptions.push(t.objectProperty(t.identifier('onSuccess'), t.arrowFunctionExpression([t.identifier('_'), t.identifier('variables')], t.blockStatement([
-        t.expressionStatement(t.callExpression(t.memberExpression(t.identifier('queryClient'), t.identifier('invalidateQueries')), [t.objectExpression([t.objectProperty(t.identifier('queryKey'), detailQueryKey)])])),
-        t.expressionStatement(t.callExpression(t.memberExpression(t.identifier('queryClient'), t.identifier('invalidateQueries')), [t.objectExpression([t.objectProperty(t.identifier('queryKey'), listQueryKey)])])),
-    ]))));
-    mutationOptions.push(t.spreadElement(t.identifier('options')));
-    hookBodyStatements.push(t.returnStatement(t.callExpression(t.identifier('useMutation'), [t.objectExpression(mutationOptions)])));
-    const optionsTypeStr = `Omit<UseMutationOptions<${ucFirst(mutationName)}MutationResult, Error, ${ucFirst(mutationName)}MutationVariables>, 'mutationFn'>`;
-    const optionsParam = t.identifier('options');
-    optionsParam.optional = true;
-    optionsParam.typeAnnotation = t.tsTypeAnnotation(t.tsTypeReference(t.identifier(optionsTypeStr)));
-    const hookFunc = t.functionDeclaration(t.identifier(hookName), [optionsParam], t.blockStatement(hookBodyStatements));
-    const hookExport = t.exportNamedDeclaration(hookFunc);
-    addJSDocComment(hookExport, [
+    const o1 = exportDeclareFunction(hookName, createSTypeParam(selectTypeName), [createFunctionParam('params', o1ParamType)], useMutationResultType(resultType(sRef()), updateVarType));
+    addJSDocComment(o1, [
         `Mutation hook for updating a ${typeName}`,
         '',
         '@example',
         '```tsx',
-        `const { mutate, isPending } = ${hookName}();`,
-        '',
-        'mutate({',
-        '  input: {',
-        `    ${pkField.name}: ${pkField.tsType === 'string' ? "'value-here'" : '123'},`,
-        '    patch: {',
-        '      // ... fields to update',
-        '    },',
-        '  },',
+        `const { mutate, isPending } = ${hookName}({`,
+        '  selection: { fields: { id: true, name: true } },',
         '});',
+        '',
+        `mutate({ ${pkField.name}: 'value-here', patch: { name: 'Updated' } });`,
         '```',
     ]);
-    statements.push(hookExport);
-    const code = generateCode(statements);
-    const content = getGeneratedFileHeader(`Update mutation hook for ${typeName}`) + '\n\n' + code;
+    statements.push(o1);
+    // Implementation
+    const implSelProp = t.tsPropertySignature(t.identifier('selection'), t.tsTypeAnnotation(selectionConfigType(typeRef(selectTypeName))));
+    const implParamType = t.tsIntersectionType([
+        t.tsTypeLiteral([implSelProp]),
+        omitType(typeRef('UseMutationOptions', [
+            t.tsAnyKeyword(),
+            typeRef('Error'),
+            updateVarType,
+        ]), ['mutationFn']),
+    ]);
+    const body = [];
+    body.push(buildSelectionArgsCall(selectTypeName));
+    body.push(destructureParamsWithSelection('mutationOptions'));
+    body.push(voidStatement('_selection'));
+    body.push(constDecl('queryClient', callExpr('useQueryClient', [])));
+    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()
+    const destructParam = t.objectPattern([
+        shorthandProp(pkField.name),
+        shorthandProp('patch'),
+    ]);
+    destructParam.typeAnnotation = t.tsTypeAnnotation(updateVarType);
+    const mutationFnExpr = t.arrowFunctionExpression([destructParam], getClientCallUnwrap(singularName, 'update', t.objectExpression([
+        objectProp('where', t.objectExpression([shorthandProp(pkField.name)])),
+        objectProp('data', t.identifier('patch')),
+        objectProp('select', t.memberExpression(t.identifier('args'), t.identifier('select'))),
+    ])));
+    // onSuccess: invalidate detail and lists
+    const detailKeyExpr = useCentralizedKeys
+        ? callExpr(t.memberExpression(t.identifier(keysName), t.identifier('detail')), [
+            t.memberExpression(t.identifier('variables'), t.identifier(pkField.name)),
+        ])
+        : t.arrayExpression([
+            t.stringLiteral(typeName.toLowerCase()),
+            t.stringLiteral('detail'),
+            t.memberExpression(t.identifier('variables'), t.identifier(pkField.name)),
+        ]);
+    const listKeyExpr = useCentralizedKeys
+        ? callExpr(t.memberExpression(t.identifier(keysName), t.identifier('lists')), [])
+        : t.arrayExpression([
+            t.stringLiteral(typeName.toLowerCase()),
+            t.stringLiteral('list'),
+        ]);
+    const onSuccessParam = t.identifier('_');
+    const variablesParam = t.identifier('variables');
+    const onSuccessFn = t.arrowFunctionExpression([onSuccessParam, variablesParam], t.blockStatement([
+        t.expressionStatement(callExpr(t.memberExpression(t.identifier('queryClient'), t.identifier('invalidateQueries')), [t.objectExpression([objectProp('queryKey', detailKeyExpr)])])),
+        t.expressionStatement(callExpr(t.memberExpression(t.identifier('queryClient'), t.identifier('invalidateQueries')), [t.objectExpression([objectProp('queryKey', listKeyExpr)])])),
+    ]));
+    body.push(returnUseMutation(mutationFnExpr, [
+        objectProp('onSuccess', onSuccessFn),
+        spreadObj(t.identifier('mutationOptions')),
+    ], mutationKeyExpr));
+    statements.push(exportFunction(hookName, null, [createFunctionParam('params', implParamType)], body));
     return {
         fileName: getUpdateMutationFileName(table),
-        content,
+        content: generateHookFileCode(`Update mutation hook for ${typeName}`, statements),
     };
 }
 export function generateDeleteMutationHook(table, options = {}) {
-    const { reactQueryEnabled = true, useCentralizedKeys = true, hasRelationships = false, } = options;
-    if (!reactQueryEnabled) {
+    const { reactQueryEnabled = true, useCentralizedKeys = true } = options;
+    if (!reactQueryEnabled)
         return null;
-    }
-    if (table.query?.delete === null) {
+    if (table.query?.delete === null)
         return null;
-    }
-    const { typeName } = getTableNames(table);
+    if (!hasValidPrimaryKey(table))
+        return null;
+    const { typeName, singularName } = getTableNames(table);
     const hookName = getDeleteMutationHookName(table);
     const mutationName = getDeleteMutationName(table);
     const keysName = `${lcFirst(typeName)}Keys`;
     const mutationKeysName = `${lcFirst(typeName)}MutationKeys`;
-    const scopeTypeName = `${typeName}Scope`;
+    const selectTypeName = `${typeName}Select`;
+    const relationTypeName = `${typeName}WithRelations`;
     const pkFields = getPrimaryKeyInfo(table);
     const pkField = pkFields[0];
-    const mutationAST = buildDeleteMutationAST({ table });
-    const mutationDocument = printGraphQL(mutationAST);
+    const pkTsType = pkField.tsType === 'string' ? t.tsStringKeyword() : t.tsNumberKeyword();
     const statements = [];
-    const reactQueryImport = t.importDeclaration([
-        t.importSpecifier(t.identifier('useMutation'), t.identifier('useMutation')),
-        t.importSpecifier(t.identifier('useQueryClient'), t.identifier('useQueryClient')),
-    ], t.stringLiteral('@tanstack/react-query'));
-    statements.push(reactQueryImport);
-    const reactQueryTypeImport = t.importDeclaration([t.importSpecifier(t.identifier('UseMutationOptions'), t.identifier('UseMutationOptions'))], t.stringLiteral('@tanstack/react-query'));
-    reactQueryTypeImport.importKind = 'type';
-    statements.push(reactQueryTypeImport);
-    const clientImport = t.importDeclaration([t.importSpecifier(t.identifier('execute'), t.identifier('execute'))], t.stringLiteral('../client'));
-    statements.push(clientImport);
+    // Imports
+    statements.push(createImportDeclaration('@tanstack/react-query', [
+        'useMutation',
+        'useQueryClient',
+    ]));
+    statements.push(createImportDeclaration('@tanstack/react-query', ['UseMutationOptions', 'UseMutationResult'], true));
+    statements.push(createImportDeclaration('../client', ['getClient']));
+    statements.push(createImportDeclaration('../selection', ['buildSelectionArgs']));
+    statements.push(createImportDeclaration('../selection', ['SelectionConfig'], true));
     if (useCentralizedKeys) {
-        const queryKeyImport = t.importDeclaration([t.importSpecifier(t.identifier(keysName), t.identifier(keysName))], t.stringLiteral('../query-keys'));
-        statements.push(queryKeyImport);
-        if (hasRelationships) {
-            const scopeTypeImport = t.importDeclaration([t.importSpecifier(t.identifier(scopeTypeName), t.identifier(scopeTypeName))], t.stringLiteral('../query-keys'));
-            scopeTypeImport.importKind = 'type';
-            statements.push(scopeTypeImport);
-        }
-        const mutationKeyImport = t.importDeclaration([t.importSpecifier(t.identifier(mutationKeysName), t.identifier(mutationKeysName))], t.stringLiteral('../mutation-keys'));
-        statements.push(mutationKeyImport);
+        statements.push(createImportDeclaration('../query-keys', [keysName]));
+        statements.push(createImportDeclaration('../mutation-keys', [mutationKeysName]));
     }
-    const mutationDocConst = t.variableDeclaration('const', [
-        t.variableDeclarator(t.identifier(`${mutationName}MutationDocument`), t.templateLiteral([t.templateElement({ raw: '\n' + mutationDocument, cooked: '\n' + mutationDocument }, true)], [])),
+    statements.push(createImportDeclaration('../../orm/input-types', [selectTypeName, relationTypeName], true));
+    statements.push(createImportDeclaration('../../orm/select-types', ['InferSelectResult', 'StrictSelect'], true));
+    // Re-exports
+    statements.push(createTypeReExport([selectTypeName, relationTypeName], '../../orm/input-types'));
+    // Variable type: { pkField: type }
+    const deleteVarType = t.tsTypeLiteral([
+        t.tsPropertySignature(t.identifier(pkField.name), t.tsTypeAnnotation(pkTsType)),
     ]);
-    statements.push(t.exportNamedDeclaration(mutationDocConst));
-    const pkTypeAnnotation = pkField.tsType === 'string'
-        ? t.tsStringKeyword()
-        : pkField.tsType === 'number'
-            ? t.tsNumberKeyword()
-            : t.tsTypeReference(t.identifier(pkField.tsType));
-    const variablesInterfaceBody = t.tsInterfaceBody([
-        t.tsPropertySignature(t.identifier('input'), t.tsTypeAnnotation(t.tsTypeLiteral([
-            t.tsPropertySignature(t.identifier(pkField.name), t.tsTypeAnnotation(pkTypeAnnotation)),
-        ]))),
+    const resultType = (sel) => buildMutationResultType(mutationName, singularName, relationTypeName, sel);
+    // Overload 1: with fields
+    const o1ParamType = t.tsIntersectionType([
+        t.tsTypeLiteral([
+            t.tsPropertySignature(t.identifier('selection'), t.tsTypeAnnotation(buildFieldsSelectionType(sRef(), selectTypeName))),
+        ]),
+        useMutationOptionsType(resultType(sRef()), deleteVarType),
     ]);
-    const variablesInterface = t.tsInterfaceDeclaration(t.identifier(`${ucFirst(mutationName)}MutationVariables`), null, null, variablesInterfaceBody);
-    statements.push(t.exportNamedDeclaration(variablesInterface));
-    const clientMutationIdProp = t.tsPropertySignature(t.identifier('clientMutationId'), t.tsTypeAnnotation(t.tsUnionType([t.tsStringKeyword(), t.tsNullKeyword()])));
-    const resultInterfaceBody = t.tsInterfaceBody([
-        t.tsPropertySignature(t.identifier(mutationName), t.tsTypeAnnotation(t.tsTypeLiteral([clientMutationIdProp]))),
-    ]);
-    const resultInterface = t.tsInterfaceDeclaration(t.identifier(`${ucFirst(mutationName)}MutationResult`), null, null, resultInterfaceBody);
-    statements.push(t.exportNamedDeclaration(resultInterface));
-    const hookBodyStatements = [];
-    hookBodyStatements.push(t.variableDeclaration('const', [
-        t.variableDeclarator(t.identifier('queryClient'), t.callExpression(t.identifier('useQueryClient'), [])),
-    ]));
-    const mutationOptions = [];
-    if (useCentralizedKeys) {
-        mutationOptions.push(t.objectProperty(t.identifier('mutationKey'), t.memberExpression(t.identifier(mutationKeysName), t.identifier('all'))));
-    }
-    mutationOptions.push(t.objectProperty(t.identifier('mutationFn'), t.arrowFunctionExpression([typedParam('variables', t.tsTypeReference(t.identifier(`${ucFirst(mutationName)}MutationVariables`)))], createTypedCallExpression(t.identifier('execute'), [t.identifier(`${mutationName}MutationDocument`), t.identifier('variables')], [
-        t.tsTypeReference(t.identifier(`${ucFirst(mutationName)}MutationResult`)),
-        t.tsTypeReference(t.identifier(`${ucFirst(mutationName)}MutationVariables`)),
-    ]))));
-    const detailQueryKey = useCentralizedKeys
-        ? t.callExpression(t.memberExpression(t.identifier(keysName), t.identifier('detail')), [t.memberExpression(t.memberExpression(t.identifier('variables'), t.identifier('input')), t.identifier(pkField.name))])
-        : t.arrayExpression([
-            t.stringLiteral(typeName.toLowerCase()),
-            t.stringLiteral('detail'),
-            t.memberExpression(t.memberExpression(t.identifier('variables'), t.identifier('input')), t.identifier(pkField.name)),
-        ]);
-    const listQueryKey = useCentralizedKeys
-        ? t.callExpression(t.memberExpression(t.identifier(keysName), t.identifier('lists')), [])
-        : t.arrayExpression([t.stringLiteral(typeName.toLowerCase()), t.stringLiteral('list')]);
-    mutationOptions.push(t.objectProperty(t.identifier('onSuccess'), t.arrowFunctionExpression([t.identifier('_'), t.identifier('variables')], t.blockStatement([
-        t.expressionStatement(t.callExpression(t.memberExpression(t.identifier('queryClient'), t.identifier('removeQueries')), [t.objectExpression([t.objectProperty(t.identifier('queryKey'), detailQueryKey)])])),
-        t.expressionStatement(t.callExpression(t.memberExpression(t.identifier('queryClient'), t.identifier('invalidateQueries')), [t.objectExpression([t.objectProperty(t.identifier('queryKey'), listQueryKey)])])),
-    ]))));
-    mutationOptions.push(t.spreadElement(t.identifier('options')));
-    hookBodyStatements.push(t.returnStatement(t.callExpression(t.identifier('useMutation'), [t.objectExpression(mutationOptions)])));
-    const optionsTypeStr = `Omit<UseMutationOptions<${ucFirst(mutationName)}MutationResult, Error, ${ucFirst(mutationName)}MutationVariables>, 'mutationFn'>`;
-    const optionsParam = t.identifier('options');
-    optionsParam.optional = true;
-    optionsParam.typeAnnotation = t.tsTypeAnnotation(t.tsTypeReference(t.identifier(optionsTypeStr)));
-    const hookFunc = t.functionDeclaration(t.identifier(hookName), [optionsParam], t.blockStatement(hookBodyStatements));
-    const hookExport = t.exportNamedDeclaration(hookFunc);
-    addJSDocComment(hookExport, [
-        `Mutation hook for deleting a ${typeName}`,
+    const o1 = exportDeclareFunction(hookName, createSTypeParam(selectTypeName), [createFunctionParam('params', o1ParamType)], useMutationResultType(resultType(sRef()), deleteVarType));
+    addJSDocComment(o1, [
+        `Mutation hook for deleting a ${typeName} with typed selection`,
         '',
         '@example',
         '```tsx',
-        `const { mutate, isPending } = ${hookName}();`,
-        '',
-        'mutate({',
-        '  input: {',
-        `    ${pkField.name}: ${pkField.tsType === 'string' ? "'value-to-delete'" : '123'},`,
-        '  },',
+        `const { mutate, isPending } = ${hookName}({`,
+        '  selection: { fields: { id: true } },',
         '});',
+        '',
+        `mutate({ ${pkField.name}: ${pkField.tsType === 'string' ? "'value-to-delete'" : '123'} });`,
         '```',
     ]);
-    statements.push(hookExport);
-    const code = generateCode(statements);
-    const content = getGeneratedFileHeader(`Delete mutation hook for ${typeName}`) + '\n\n' + code;
+    statements.push(o1);
+    // Implementation
+    const implSelProp = t.tsPropertySignature(t.identifier('selection'), t.tsTypeAnnotation(selectionConfigType(typeRef(selectTypeName))));
+    const implParamType = t.tsIntersectionType([
+        t.tsTypeLiteral([implSelProp]),
+        omitType(typeRef('UseMutationOptions', [
+            t.tsAnyKeyword(),
+            typeRef('Error'),
+            deleteVarType,
+        ]), ['mutationFn']),
+    ]);
+    const body = [];
+    body.push(buildSelectionArgsCall(selectTypeName));
+    body.push(destructureParamsWithSelection('mutationOptions'));
+    body.push(voidStatement('_selection'));
+    body.push(constDecl('queryClient', callExpr('useQueryClient', [])));
+    const mutationKeyExpr = useCentralizedKeys
+        ? t.memberExpression(t.identifier(mutationKeysName), t.identifier('all'))
+        : undefined;
+    // mutationFn: ({ pkField }: { pkField: type }) =>
+    //   getClient().singular.delete({ where: { pkField }, select: ... }).unwrap()
+    const destructParam = t.objectPattern([shorthandProp(pkField.name)]);
+    destructParam.typeAnnotation = t.tsTypeAnnotation(deleteVarType);
+    const mutationFnExpr = t.arrowFunctionExpression([destructParam], getClientCallUnwrap(singularName, 'delete', t.objectExpression([
+        objectProp('where', t.objectExpression([shorthandProp(pkField.name)])),
+        objectProp('select', t.memberExpression(t.identifier('args'), t.identifier('select'))),
+    ])));
+    // onSuccess: remove detail, invalidate lists
+    const detailKeyExpr = useCentralizedKeys
+        ? callExpr(t.memberExpression(t.identifier(keysName), t.identifier('detail')), [
+            t.memberExpression(t.identifier('variables'), t.identifier(pkField.name)),
+        ])
+        : t.arrayExpression([
+            t.stringLiteral(typeName.toLowerCase()),
+            t.stringLiteral('detail'),
+            t.memberExpression(t.identifier('variables'), t.identifier(pkField.name)),
+        ]);
+    const listKeyExpr = useCentralizedKeys
+        ? callExpr(t.memberExpression(t.identifier(keysName), t.identifier('lists')), [])
+        : t.arrayExpression([
+            t.stringLiteral(typeName.toLowerCase()),
+            t.stringLiteral('list'),
+        ]);
+    const onSuccessFn = t.arrowFunctionExpression([t.identifier('_'), t.identifier('variables')], t.blockStatement([
+        t.expressionStatement(callExpr(t.memberExpression(t.identifier('queryClient'), t.identifier('removeQueries')), [t.objectExpression([objectProp('queryKey', detailKeyExpr)])])),
+        t.expressionStatement(callExpr(t.memberExpression(t.identifier('queryClient'), t.identifier('invalidateQueries')), [t.objectExpression([objectProp('queryKey', listKeyExpr)])])),
+    ]));
+    body.push(returnUseMutation(mutationFnExpr, [
+        objectProp('onSuccess', onSuccessFn),
+        spreadObj(t.identifier('mutationOptions')),
+    ], mutationKeyExpr));
+    statements.push(exportFunction(hookName, null, [createFunctionParam('params', implParamType)], body));
     return {
         fileName: getDeleteMutationFileName(table),
-        content,
+        content: generateHookFileCode(`Delete mutation hook for ${typeName}`, statements),
     };
 }
 export function generateAllMutationHooks(tables, options = {}) {