@constructive-io/graphql-codegen 2.24.0 → 2.26.0

package/cli/codegen/babel-ast.d.ts

@@ -44,3 +44,10 @@ export declare function typedParam(name: string, typeAnnotation: t.TSType, optio
  * Create keyof typeof expression - complex nested type operators
  */
 export declare function keyofTypeof(name: string): t.TSTypeOperator;
+/**
+ * Create a call expression with TypeScript type parameters
+ *
+ * This is used to generate typed function calls like:
+ * execute<ResultType, VariablesType>(document, variables)
+ */
+export declare function createTypedCallExpression(callee: t.Expression, args: (t.Expression | t.SpreadElement)[], typeParams: t.TSType[]): t.CallExpression;

package/cli/codegen/babel-ast.js

@@ -44,6 +44,7 @@ exports.asConst = asConst;
 exports.constArray = constArray;
 exports.typedParam = typedParam;
 exports.keyofTypeof = keyofTypeof;
+exports.createTypedCallExpression = createTypedCallExpression;
 /**
  * Babel AST utilities for code generation
  *
@@ -143,3 +144,17 @@ function keyofTypeof(name) {
     keyofOp.operator = 'keyof';
     return keyofOp;
 }
+/**
+ * Create a call expression with TypeScript type parameters
+ *
+ * This is used to generate typed function calls like:
+ * execute<ResultType, VariablesType>(document, variables)
+ */
+function createTypedCallExpression(callee, args, typeParams) {
+    const call = t.callExpression(callee, args);
+    if (typeParams.length > 0) {
+        // @ts-ignore - Babel types support typeParameters on CallExpression for TS
+        call.typeParameters = t.tsTypeParameterInstantiation(typeParams);
+    }
+    return call;
+}

package/cli/codegen/barrel.js

@@ -56,9 +56,12 @@ function generateQueriesBarrel(tables) {
     // Export all query hooks
     for (const table of tables) {
         const listHookName = (0, utils_1.getListQueryHookName)(table);
-        const singleHookName = (0, utils_1.getSingleQueryHookName)(table);
         statements.push(exportAllFrom(`./${listHookName}`));
-        statements.push(exportAllFrom(`./${singleHookName}`));
+        // Only export single query hook if table has valid primary key
+        if ((0, utils_1.hasValidPrimaryKey)(table)) {
+            const singleHookName = (0, utils_1.getSingleQueryHookName)(table);
+            statements.push(exportAllFrom(`./${singleHookName}`));
+        }
     }
     // Add file header as leading comment on first statement
     if (statements.length > 0) {
@@ -175,17 +178,30 @@ function generateMainBarrel(tables, options = {}) {
  */
 function generateCustomQueriesBarrel(tables, customQueryNames) {
     const statements = [];
+    const exportedHooks = new Set();
     // Export all table query hooks
     for (const table of tables) {
         const listHookName = (0, utils_1.getListQueryHookName)(table);
-        const singleHookName = (0, utils_1.getSingleQueryHookName)(table);
-        statements.push(exportAllFrom(`./${listHookName}`));
-        statements.push(exportAllFrom(`./${singleHookName}`));
+        if (!exportedHooks.has(listHookName)) {
+            statements.push(exportAllFrom(`./${listHookName}`));
+            exportedHooks.add(listHookName);
+        }
+        // Only export single query hook if table has valid primary key
+        if ((0, utils_1.hasValidPrimaryKey)(table)) {
+            const singleHookName = (0, utils_1.getSingleQueryHookName)(table);
+            if (!exportedHooks.has(singleHookName)) {
+                statements.push(exportAllFrom(`./${singleHookName}`));
+                exportedHooks.add(singleHookName);
+            }
+        }
     }
-    // Add custom query hooks
+    // Add custom query hooks (skip if already exported from table hooks)
     for (const name of customQueryNames) {
         const hookName = (0, type_resolver_1.getOperationHookName)(name, 'query');
-        statements.push(exportAllFrom(`./${hookName}`));
+        if (!exportedHooks.has(hookName)) {
+            statements.push(exportAllFrom(`./${hookName}`));
+            exportedHooks.add(hookName);
+        }
     }
     // Add file header as leading comment on first statement
     if (statements.length > 0) {
@@ -202,24 +218,37 @@ function generateCustomQueriesBarrel(tables, customQueryNames) {
  */
 function generateCustomMutationsBarrel(tables, customMutationNames) {
     const statements = [];
+    const exportedHooks = new Set();
     // Export all table mutation hooks
     for (const table of tables) {
         const createHookName = (0, utils_1.getCreateMutationHookName)(table);
-        const updateHookName = (0, utils_1.getUpdateMutationHookName)(table);
-        const deleteHookName = (0, utils_1.getDeleteMutationHookName)(table);
-        statements.push(exportAllFrom(`./${createHookName}`));
+        if (!exportedHooks.has(createHookName)) {
+            statements.push(exportAllFrom(`./${createHookName}`));
+            exportedHooks.add(createHookName);
+        }
         // Only add update/delete if they exist
         if (table.query?.update !== null) {
-            statements.push(exportAllFrom(`./${updateHookName}`));
+            const updateHookName = (0, utils_1.getUpdateMutationHookName)(table);
+            if (!exportedHooks.has(updateHookName)) {
+                statements.push(exportAllFrom(`./${updateHookName}`));
+                exportedHooks.add(updateHookName);
+            }
         }
         if (table.query?.delete !== null) {
-            statements.push(exportAllFrom(`./${deleteHookName}`));
+            const deleteHookName = (0, utils_1.getDeleteMutationHookName)(table);
+            if (!exportedHooks.has(deleteHookName)) {
+                statements.push(exportAllFrom(`./${deleteHookName}`));
+                exportedHooks.add(deleteHookName);
+            }
         }
     }
-    // Add custom mutation hooks
+    // Add custom mutation hooks (skip if already exported from table hooks)
     for (const name of customMutationNames) {
         const hookName = (0, type_resolver_1.getOperationHookName)(name, 'mutation');
-        statements.push(exportAllFrom(`./${hookName}`));
+        if (!exportedHooks.has(hookName)) {
+            statements.push(exportAllFrom(`./${hookName}`));
+            exportedHooks.add(hookName);
+        }
     }
     // Add file header as leading comment on first statement
     if (statements.length > 0) {

package/cli/codegen/custom-mutations.js

@@ -131,13 +131,13 @@ function generateCustomMutationHookInternal(options) {
         mutationOptions.push(t.objectProperty(t.identifier('mutationKey'), t.callExpression(t.memberExpression(t.identifier('customMutationKeys'), t.identifier(operation.name)), [])));
     }
     if (hasArgs) {
-        mutationOptions.push(t.objectProperty(t.identifier('mutationFn'), t.arrowFunctionExpression([(0, babel_ast_1.typedParam)('variables', t.tsTypeReference(t.identifier(variablesTypeName)))], t.callExpression(t.identifier('execute'), [
-            t.identifier(documentConstName),
-            t.identifier('variables'),
+        mutationOptions.push(t.objectProperty(t.identifier('mutationFn'), t.arrowFunctionExpression([(0, babel_ast_1.typedParam)('variables', t.tsTypeReference(t.identifier(variablesTypeName)))], (0, babel_ast_1.createTypedCallExpression)(t.identifier('execute'), [t.identifier(documentConstName), t.identifier('variables')], [
+            t.tsTypeReference(t.identifier(resultTypeName)),
+            t.tsTypeReference(t.identifier(variablesTypeName)),
         ]))));
     }
     else {
-        mutationOptions.push(t.objectProperty(t.identifier('mutationFn'), t.arrowFunctionExpression([], t.callExpression(t.identifier('execute'), [t.identifier(documentConstName)]))));
+        mutationOptions.push(t.objectProperty(t.identifier('mutationFn'), t.arrowFunctionExpression([], (0, babel_ast_1.createTypedCallExpression)(t.identifier('execute'), [t.identifier(documentConstName)], [t.tsTypeReference(t.identifier(resultTypeName))]))));
     }
     mutationOptions.push(t.spreadElement(t.identifier('options')));
     hookBodyStatements.push(t.returnStatement(t.callExpression(t.identifier('useMutation'), [t.objectExpression(mutationOptions)])));

package/cli/codegen/custom-queries.js

@@ -152,9 +152,9 @@ function generateCustomQueryHook(options) {
         const useQueryOptions = [];
         if (hasArgs) {
             useQueryOptions.push(t.objectProperty(t.identifier('queryKey'), t.callExpression(t.identifier(queryKeyName), [t.identifier('variables')])));
-            useQueryOptions.push(t.objectProperty(t.identifier('queryFn'), t.arrowFunctionExpression([], t.callExpression(t.identifier('execute'), [
-                t.identifier(documentConstName),
-                t.identifier('variables'),
+            useQueryOptions.push(t.objectProperty(t.identifier('queryFn'), t.arrowFunctionExpression([], (0, babel_ast_1.createTypedCallExpression)(t.identifier('execute'), [t.identifier(documentConstName), t.identifier('variables')], [
+                t.tsTypeReference(t.identifier(resultTypeName)),
+                t.tsTypeReference(t.identifier(variablesTypeName)),
             ]))));
             if (hasRequiredArgs) {
                 useQueryOptions.push(t.objectProperty(t.identifier('enabled'), t.logicalExpression('&&', t.unaryExpression('!', t.unaryExpression('!', t.identifier('variables'))), t.binaryExpression('!==', t.optionalMemberExpression(t.identifier('options'), t.identifier('enabled'), false, true), t.booleanLiteral(false)))));
@@ -162,7 +162,7 @@ function generateCustomQueryHook(options) {
         }
         else {
             useQueryOptions.push(t.objectProperty(t.identifier('queryKey'), t.callExpression(t.identifier(queryKeyName), [])));
-            useQueryOptions.push(t.objectProperty(t.identifier('queryFn'), t.arrowFunctionExpression([], t.callExpression(t.identifier('execute'), [t.identifier(documentConstName)]))));
+            useQueryOptions.push(t.objectProperty(t.identifier('queryFn'), t.arrowFunctionExpression([], (0, babel_ast_1.createTypedCallExpression)(t.identifier('execute'), [t.identifier(documentConstName)], [t.tsTypeReference(t.identifier(resultTypeName))]))));
         }
         useQueryOptions.push(t.spreadElement(t.identifier('options')));
         hookBodyStatements.push(t.returnStatement(t.callExpression(t.identifier('useQuery'), [t.objectExpression(useQueryOptions)])));
@@ -199,18 +199,13 @@ function generateCustomQueryHook(options) {
     const hasRequiredArgs = operation.args.some((arg) => (0, type_resolver_1.isTypeRequired)(arg.type));
     const fetchBodyStatements = [];
     if (hasArgs) {
-        fetchBodyStatements.push(t.returnStatement(t.callExpression(t.identifier('execute'), [
-            t.identifier(documentConstName),
-            t.identifier('variables'),
-            t.identifier('options'),
+        fetchBodyStatements.push(t.returnStatement((0, babel_ast_1.createTypedCallExpression)(t.identifier('execute'), [t.identifier(documentConstName), t.identifier('variables'), t.identifier('options')], [
+            t.tsTypeReference(t.identifier(resultTypeName)),
+            t.tsTypeReference(t.identifier(variablesTypeName)),
         ])));
     }
     else {
-        fetchBodyStatements.push(t.returnStatement(t.callExpression(t.identifier('execute'), [
-            t.identifier(documentConstName),
-            t.identifier('undefined'),
-            t.identifier('options'),
-        ])));
+        fetchBodyStatements.push(t.returnStatement((0, babel_ast_1.createTypedCallExpression)(t.identifier('execute'), [t.identifier(documentConstName), t.identifier('undefined'), t.identifier('options')], [t.tsTypeReference(t.identifier(resultTypeName))])));
     }
     const fetchParams = [];
     if (hasArgs) {
@@ -238,19 +233,14 @@ function generateCustomQueryHook(options) {
         const prefetchQueryOptions = [];
         if (hasArgs) {
             prefetchQueryOptions.push(t.objectProperty(t.identifier('queryKey'), t.callExpression(t.identifier(queryKeyName), [t.identifier('variables')])));
-            prefetchQueryOptions.push(t.objectProperty(t.identifier('queryFn'), t.arrowFunctionExpression([], t.callExpression(t.identifier('execute'), [
-                t.identifier(documentConstName),
-                t.identifier('variables'),
-                t.identifier('options'),
+            prefetchQueryOptions.push(t.objectProperty(t.identifier('queryFn'), t.arrowFunctionExpression([], (0, babel_ast_1.createTypedCallExpression)(t.identifier('execute'), [t.identifier(documentConstName), t.identifier('variables'), t.identifier('options')], [
+                t.tsTypeReference(t.identifier(resultTypeName)),
+                t.tsTypeReference(t.identifier(variablesTypeName)),
             ]))));
         }
         else {
             prefetchQueryOptions.push(t.objectProperty(t.identifier('queryKey'), t.callExpression(t.identifier(queryKeyName), [])));
-            prefetchQueryOptions.push(t.objectProperty(t.identifier('queryFn'), t.arrowFunctionExpression([], t.callExpression(t.identifier('execute'), [
-                t.identifier(documentConstName),
-                t.identifier('undefined'),
-                t.identifier('options'),
-            ]))));
+            prefetchQueryOptions.push(t.objectProperty(t.identifier('queryFn'), t.arrowFunctionExpression([], (0, babel_ast_1.createTypedCallExpression)(t.identifier('execute'), [t.identifier(documentConstName), t.identifier('undefined'), t.identifier('options')], [t.tsTypeReference(t.identifier(resultTypeName))]))));
         }
         prefetchBodyStatements.push(t.expressionStatement(t.awaitExpression(t.callExpression(t.memberExpression(t.identifier('queryClient'), t.identifier('prefetchQuery')), [t.objectExpression(prefetchQueryOptions)]))));
         const prefetchParams = [

package/cli/codegen/gql-ast.js

@@ -80,22 +80,39 @@ function buildListQueryAST(config) {
     const { table } = config;
     const queryName = (0, utils_1.getAllRowsQueryName)(table);
     const filterType = (0, utils_1.getFilterTypeName)(table);
+    const conditionType = (0, utils_1.getConditionTypeName)(table);
     const orderByType = (0, utils_1.getOrderByTypeName)(table);
     const scalarFields = (0, utils_1.getScalarFields)(table);
-    // Variable definitions
+    // Variable definitions - all pagination arguments from PostGraphile
     const variableDefinitions = [
         t.variableDefinition({
             variable: t.variable({ name: 'first' }),
             type: t.namedType({ type: 'Int' }),
         }),
+        t.variableDefinition({
+            variable: t.variable({ name: 'last' }),
+            type: t.namedType({ type: 'Int' }),
+        }),
         t.variableDefinition({
             variable: t.variable({ name: 'offset' }),
             type: t.namedType({ type: 'Int' }),
         }),
+        t.variableDefinition({
+            variable: t.variable({ name: 'before' }),
+            type: t.namedType({ type: 'Cursor' }),
+        }),
+        t.variableDefinition({
+            variable: t.variable({ name: 'after' }),
+            type: t.namedType({ type: 'Cursor' }),
+        }),
         t.variableDefinition({
             variable: t.variable({ name: 'filter' }),
             type: t.namedType({ type: filterType }),
         }),
+        t.variableDefinition({
+            variable: t.variable({ name: 'condition' }),
+            type: t.namedType({ type: conditionType }),
+        }),
         t.variableDefinition({
             variable: t.variable({ name: 'orderBy' }),
             type: t.listType({
@@ -106,8 +123,12 @@ function buildListQueryAST(config) {
     // Query arguments
     const args = [
         t.argument({ name: 'first', value: t.variable({ name: 'first' }) }),
+        t.argument({ name: 'last', value: t.variable({ name: 'last' }) }),
         t.argument({ name: 'offset', value: t.variable({ name: 'offset' }) }),
+        t.argument({ name: 'before', value: t.variable({ name: 'before' }) }),
+        t.argument({ name: 'after', value: t.variable({ name: 'after' }) }),
         t.argument({ name: 'filter', value: t.variable({ name: 'filter' }) }),
+        t.argument({ name: 'condition', value: t.variable({ name: 'condition' }) }),
         t.argument({ name: 'orderBy', value: t.variable({ name: 'orderBy' }) }),
     ];
     // Field selections

package/cli/codegen/index.js

@@ -157,6 +157,7 @@ function generate(options) {
         enumsFromSchemaTypes: generatedEnumNames,
         useCentralizedKeys,
         hasRelationships,
+        tableTypeNames,
     });
     for (const hook of mutationHooks) {
         files.push({

package/cli/codegen/mutations.d.ts

@@ -17,6 +17,8 @@ export interface MutationGeneratorOptions {
     enumsFromSchemaTypes?: string[];
     useCentralizedKeys?: boolean;
     hasRelationships?: boolean;
+    /** All table type names for determining which types to import from types.ts vs schema-types.ts */
+    tableTypeNames?: Set<string>;
 }
 export declare function generateCreateMutationHook(table: CleanTable, options?: MutationGeneratorOptions): GeneratedMutationFile | null;
 export declare function generateUpdateMutationHook(table: CleanTable, options?: MutationGeneratorOptions): GeneratedMutationFile | null;

package/cli/codegen/mutations.js

@@ -53,7 +53,7 @@ function isAutoGeneratedField(fieldName, pkFieldNames) {
     return timestampPatterns.includes(name);
 }
 function generateCreateMutationHook(table, options = {}) {
-    const { reactQueryEnabled = true, enumsFromSchemaTypes = [], useCentralizedKeys = true, hasRelationships = false, } = options;
+    const { reactQueryEnabled = true, enumsFromSchemaTypes = [], useCentralizedKeys = true, hasRelationships = false, tableTypeNames = new Set(), } = options;
     if (!reactQueryEnabled) {
         return null;
     }
@@ -67,11 +67,16 @@ function generateCreateMutationHook(table, options = {}) {
     const scalarFields = (0, utils_1.getScalarFields)(table);
     const pkFieldNames = new Set((0, utils_1.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 = (0, gql_ast_1.buildCreateMutationAST)({ table });
     const mutationDocument = (0, gql_ast_1.printGraphQL)(mutationAST);
@@ -86,7 +91,9 @@ function generateCreateMutationHook(table, options = {}) {
     statements.push(reactQueryTypeImport);
     const clientImport = t.importDeclaration([t.importSpecifier(t.identifier('execute'), t.identifier('execute'))], t.stringLiteral('../client'));
     statements.push(clientImport);
-    const typesImport = t.importDeclaration([t.importSpecifier(t.identifier(typeName), t.identifier(typeName))], t.stringLiteral('../types'));
+    // 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) {
@@ -147,9 +154,9 @@ function generateCreateMutationHook(table, options = {}) {
     if (useCentralizedKeys) {
         mutationOptions.push(t.objectProperty(t.identifier('mutationKey'), t.callExpression(t.memberExpression(t.identifier(mutationKeysName), t.identifier('create')), [])));
     }
-    mutationOptions.push(t.objectProperty(t.identifier('mutationFn'), t.arrowFunctionExpression([(0, babel_ast_1.typedParam)('variables', t.tsTypeReference(t.identifier(`${(0, utils_1.ucFirst)(mutationName)}MutationVariables`)))], t.callExpression(t.identifier('execute'), [
-        t.identifier(`${mutationName}MutationDocument`),
-        t.identifier('variables'),
+    mutationOptions.push(t.objectProperty(t.identifier('mutationFn'), t.arrowFunctionExpression([(0, babel_ast_1.typedParam)('variables', t.tsTypeReference(t.identifier(`${(0, utils_1.ucFirst)(mutationName)}MutationVariables`)))], (0, babel_ast_1.createTypedCallExpression)(t.identifier('execute'), [t.identifier(`${mutationName}MutationDocument`), t.identifier('variables')], [
+        t.tsTypeReference(t.identifier(`${(0, utils_1.ucFirst)(mutationName)}MutationResult`)),
+        t.tsTypeReference(t.identifier(`${(0, utils_1.ucFirst)(mutationName)}MutationVariables`)),
     ]))));
     const invalidateQueryKey = useCentralizedKeys
         ? t.callExpression(t.memberExpression(t.identifier(keysName), t.identifier('lists')), [])
@@ -190,7 +197,7 @@ function generateCreateMutationHook(table, options = {}) {
     };
 }
 function generateUpdateMutationHook(table, options = {}) {
-    const { reactQueryEnabled = true, enumsFromSchemaTypes = [], useCentralizedKeys = true, hasRelationships = false, } = options;
+    const { reactQueryEnabled = true, enumsFromSchemaTypes = [], useCentralizedKeys = true, hasRelationships = false, tableTypeNames = new Set(), } = options;
     if (!reactQueryEnabled) {
         return null;
     }
@@ -209,11 +216,15 @@ function generateUpdateMutationHook(table, options = {}) {
     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 = (0, gql_ast_1.buildUpdateMutationAST)({ table });
     const mutationDocument = (0, gql_ast_1.printGraphQL)(mutationAST);
@@ -228,7 +239,9 @@ function generateUpdateMutationHook(table, options = {}) {
     statements.push(reactQueryTypeImport);
     const clientImport = t.importDeclaration([t.importSpecifier(t.identifier('execute'), t.identifier('execute'))], t.stringLiteral('../client'));
     statements.push(clientImport);
-    const typesImport = t.importDeclaration([t.importSpecifier(t.identifier(typeName), t.identifier(typeName))], t.stringLiteral('../types'));
+    // 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) {
@@ -295,9 +308,9 @@ function generateUpdateMutationHook(table, options = {}) {
     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([(0, babel_ast_1.typedParam)('variables', t.tsTypeReference(t.identifier(`${(0, utils_1.ucFirst)(mutationName)}MutationVariables`)))], t.callExpression(t.identifier('execute'), [
-        t.identifier(`${mutationName}MutationDocument`),
-        t.identifier('variables'),
+    mutationOptions.push(t.objectProperty(t.identifier('mutationFn'), t.arrowFunctionExpression([(0, babel_ast_1.typedParam)('variables', t.tsTypeReference(t.identifier(`${(0, utils_1.ucFirst)(mutationName)}MutationVariables`)))], (0, babel_ast_1.createTypedCallExpression)(t.identifier('execute'), [t.identifier(`${mutationName}MutationDocument`), t.identifier('variables')], [
+        t.tsTypeReference(t.identifier(`${(0, utils_1.ucFirst)(mutationName)}MutationResult`)),
+        t.tsTypeReference(t.identifier(`${(0, utils_1.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))])
@@ -417,9 +430,9 @@ function generateDeleteMutationHook(table, options = {}) {
     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([(0, babel_ast_1.typedParam)('variables', t.tsTypeReference(t.identifier(`${(0, utils_1.ucFirst)(mutationName)}MutationVariables`)))], t.callExpression(t.identifier('execute'), [
-        t.identifier(`${mutationName}MutationDocument`),
-        t.identifier('variables'),
+    mutationOptions.push(t.objectProperty(t.identifier('mutationFn'), t.arrowFunctionExpression([(0, babel_ast_1.typedParam)('variables', t.tsTypeReference(t.identifier(`${(0, utils_1.ucFirst)(mutationName)}MutationVariables`)))], (0, babel_ast_1.createTypedCallExpression)(t.identifier('execute'), [t.identifier(`${mutationName}MutationDocument`), t.identifier('variables')], [
+        t.tsTypeReference(t.identifier(`${(0, utils_1.ucFirst)(mutationName)}MutationResult`)),
+        t.tsTypeReference(t.identifier(`${(0, utils_1.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))])