@constructive-io/graphql-codegen 2.24.0 → 2.26.0

package/cli/index.js

@@ -42,6 +42,17 @@ const generate_1 = require("./commands/generate");
 const generate_orm_1 = require("./commands/generate-orm");
 const watch_1 = require("./watch");
 const config_1 = require("../types/config");
+/**
+ * Format duration in a human-readable way
+ * - Under 1 second: show milliseconds (e.g., "123ms")
+ * - Over 1 second: show seconds with 2 decimal places (e.g., "1.23s")
+ */
+function formatDuration(ms) {
+    if (ms < 1000) {
+        return `${Math.round(ms)}ms`;
+    }
+    return `${(ms / 1000).toFixed(2)}s`;
+}
 const program = new commander_1.Command();
 /**
  * Load configuration for watch mode, merging CLI options with config file
@@ -61,23 +72,27 @@ async function loadWatchConfig(options) {
         }
         baseConfig = loadResult.config;
     }
-    // Merge CLI options with config
-    const mergedConfig = {
-        endpoint: options.endpoint || baseConfig.endpoint || '',
-        output: baseConfig.output,
-        headers: baseConfig.headers,
-        tables: baseConfig.tables,
-        queries: baseConfig.queries,
-        mutations: baseConfig.mutations,
-        excludeFields: baseConfig.excludeFields,
-        hooks: baseConfig.hooks,
-        postgraphile: baseConfig.postgraphile,
-        codegen: baseConfig.codegen,
-        orm: baseConfig.orm,
-        reactQuery: baseConfig.reactQuery,
+    if ((0, config_1.isMultiConfig)(baseConfig)) {
+        if (!options.target) {
+            console.error('x Watch mode requires --target when using multiple targets.');
+            return null;
+        }
+        if (!baseConfig.targets[options.target]) {
+            console.error(`x Target "${options.target}" not found in config file.`);
+            return null;
+        }
+    }
+    else if (options.target) {
+        console.error('x Config file does not define targets. Remove --target.');
+        return null;
+    }
+    const sourceOverrides = {};
+    if (options.endpoint) {
+        sourceOverrides.endpoint = options.endpoint;
+        sourceOverrides.schema = undefined;
+    }
+    const watchOverrides = {
         watch: {
-            ...baseConfig.watch,
-            // CLI options override config
             ...(options.pollInterval !== undefined && {
                 pollInterval: options.pollInterval,
             }),
@@ -86,11 +101,26 @@ async function loadWatchConfig(options) {
             ...(options.clear !== undefined && { clearScreen: options.clear }),
         },
     };
-    if (!mergedConfig.endpoint) {
-        console.error('x No endpoint specified. Use --endpoint or create a config file with "graphql-codegen init".');
+    let mergedTarget;
+    if ((0, config_1.isMultiConfig)(baseConfig)) {
+        const defaults = baseConfig.defaults ?? {};
+        const targetConfig = baseConfig.targets[options.target];
+        mergedTarget = (0, config_1.mergeConfig)(defaults, targetConfig);
+    }
+    else {
+        mergedTarget = baseConfig;
+    }
+    mergedTarget = (0, config_1.mergeConfig)(mergedTarget, sourceOverrides);
+    mergedTarget = (0, config_1.mergeConfig)(mergedTarget, watchOverrides);
+    if (!mergedTarget.endpoint) {
+        console.error('x No endpoint specified. Watch mode only supports live endpoints.');
+        return null;
+    }
+    if (mergedTarget.schema) {
+        console.error('x Watch mode is only supported with an endpoint, not schema.');
         return null;
     }
-    return (0, config_1.resolveConfig)(mergedConfig);
+    return (0, config_1.resolveConfig)(mergedTarget);
 }
 program
     .name('graphql-codegen')
@@ -105,17 +135,19 @@ program
     .option('-e, --endpoint <url>', 'GraphQL endpoint URL to pre-populate')
     .option('-o, --output <dir>', 'Output directory to pre-populate', './generated')
     .action(async (options) => {
+    const startTime = performance.now();
     const result = await (0, init_1.initCommand)({
         directory: options.directory,
         force: options.force,
         endpoint: options.endpoint,
         output: options.output,
     });
+    const duration = formatDuration(performance.now() - startTime);
     if (result.success) {
-        console.log('[ok]', result.message);
+        console.log('[ok]', result.message, `(${duration})`);
     }
     else {
-        console.error('x', result.message);
+        console.error('x', result.message, `(${duration})`);
         process.exit(1);
     }
 });
@@ -124,6 +156,7 @@ program
     .command('generate')
     .description('Generate SDK from GraphQL endpoint or schema file')
     .option('-c, --config <path>', 'Path to config file')
+    .option('-t, --target <name>', 'Target name in config file')
     .option('-e, --endpoint <url>', 'GraphQL endpoint URL (overrides config)')
     .option('-s, --schema <path>', 'Path to GraphQL schema file (.graphql)')
     .option('-o, --output <dir>', 'Output directory (overrides config)')
@@ -136,6 +169,7 @@ program
     .option('--touch <file>', 'File to touch on schema change')
     .option('--no-clear', 'Do not clear terminal on regeneration')
     .action(async (options) => {
+    const startTime = performance.now();
     // Validate source options
     if (options.endpoint && options.schema) {
         console.error('x Cannot use both --endpoint and --schema. Choose one source.');
@@ -156,6 +190,8 @@ program
             generatorType: 'generate',
             verbose: options.verbose,
             authorization: options.authorization,
+            configPath: options.config,
+            target: options.target,
             outputDir: options.output,
         });
         return;
@@ -163,6 +199,7 @@ program
     // Normal one-shot generation
     const result = await (0, generate_1.generateCommand)({
         config: options.config,
+        target: options.target,
         endpoint: options.endpoint,
         schema: options.schema,
         output: options.output,
@@ -170,8 +207,34 @@ program
         verbose: options.verbose,
         dryRun: options.dryRun,
     });
+    const duration = formatDuration(performance.now() - startTime);
+    const targetResults = result.targets ?? [];
+    const hasNamedTargets = targetResults.length > 0 &&
+        (targetResults.length > 1 || targetResults[0]?.name !== 'default');
+    if (hasNamedTargets) {
+        console.log(result.success ? '[ok]' : 'x', result.message);
+        targetResults.forEach((target) => {
+            const status = target.success ? '[ok]' : 'x';
+            console.log(`\n${status} ${target.message}`);
+            if (target.tables && target.tables.length > 0) {
+                console.log('  Tables:');
+                target.tables.forEach((table) => console.log(`    - ${table}`));
+            }
+            if (target.filesWritten && target.filesWritten.length > 0) {
+                console.log('  Files written:');
+                target.filesWritten.forEach((file) => console.log(`    - ${file}`));
+            }
+            if (!target.success && target.errors) {
+                target.errors.forEach((error) => console.error(`  - ${error}`));
+            }
+        });
+        if (!result.success) {
+            process.exit(1);
+        }
+        return;
+    }
     if (result.success) {
-        console.log('[ok]', result.message);
+        console.log('[ok]', result.message, `(${duration})`);
         if (result.tables && result.tables.length > 0) {
             console.log('\nTables:');
             result.tables.forEach((t) => console.log(`  - ${t}`));
@@ -182,7 +245,7 @@ program
         }
     }
     else {
-        console.error('x', result.message);
+        console.error('x', result.message, `(${duration})`);
         if (result.errors) {
             result.errors.forEach((e) => console.error('  -', e));
         }
@@ -194,9 +257,10 @@ program
     .command('generate-orm')
     .description('Generate Prisma-like ORM client from GraphQL endpoint or schema file')
     .option('-c, --config <path>', 'Path to config file')
+    .option('-t, --target <name>', 'Target name in config file')
     .option('-e, --endpoint <url>', 'GraphQL endpoint URL (overrides config)')
     .option('-s, --schema <path>', 'Path to GraphQL schema file (.graphql)')
-    .option('-o, --output <dir>', 'Output directory (overrides config)', './generated/orm')
+    .option('-o, --output <dir>', 'Output directory (overrides config)')
     .option('-a, --authorization <header>', 'Authorization header value')
     .option('-v, --verbose', 'Verbose output', false)
     .option('--dry-run', 'Dry run - show what would be generated without writing files', false)
@@ -207,6 +271,7 @@ program
     .option('--touch <file>', 'File to touch on schema change')
     .option('--no-clear', 'Do not clear terminal on regeneration')
     .action(async (options) => {
+    const startTime = performance.now();
     // Validate source options
     if (options.endpoint && options.schema) {
         console.error('x Cannot use both --endpoint and --schema. Choose one source.');
@@ -227,6 +292,8 @@ program
             generatorType: 'generate-orm',
             verbose: options.verbose,
             authorization: options.authorization,
+            configPath: options.config,
+            target: options.target,
             outputDir: options.output,
             skipCustomOperations: options.skipCustomOperations,
         });
@@ -235,6 +302,7 @@ program
     // Normal one-shot generation
     const result = await (0, generate_orm_1.generateOrmCommand)({
         config: options.config,
+        target: options.target,
         endpoint: options.endpoint,
         schema: options.schema,
         output: options.output,
@@ -243,8 +311,42 @@ program
         dryRun: options.dryRun,
         skipCustomOperations: options.skipCustomOperations,
     });
+    const duration = formatDuration(performance.now() - startTime);
+    const targetResults = result.targets ?? [];
+    const hasNamedTargets = targetResults.length > 0 &&
+        (targetResults.length > 1 || targetResults[0]?.name !== 'default');
+    if (hasNamedTargets) {
+        console.log(result.success ? '[ok]' : 'x', result.message);
+        targetResults.forEach((target) => {
+            const status = target.success ? '[ok]' : 'x';
+            console.log(`\n${status} ${target.message}`);
+            if (target.tables && target.tables.length > 0) {
+                console.log('  Tables:');
+                target.tables.forEach((table) => console.log(`    - ${table}`));
+            }
+            if (target.customQueries && target.customQueries.length > 0) {
+                console.log('  Custom Queries:');
+                target.customQueries.forEach((query) => console.log(`    - ${query}`));
+            }
+            if (target.customMutations && target.customMutations.length > 0) {
+                console.log('  Custom Mutations:');
+                target.customMutations.forEach((mutation) => console.log(`    - ${mutation}`));
+            }
+            if (target.filesWritten && target.filesWritten.length > 0) {
+                console.log('  Files written:');
+                target.filesWritten.forEach((file) => console.log(`    - ${file}`));
+            }
+            if (!target.success && target.errors) {
+                target.errors.forEach((error) => console.error(`  - ${error}`));
+            }
+        });
+        if (!result.success) {
+            process.exit(1);
+        }
+        return;
+    }
     if (result.success) {
-        console.log('[ok]', result.message);
+        console.log('[ok]', result.message, `(${duration})`);
         if (result.tables && result.tables.length > 0) {
             console.log('\nTables:');
             result.tables.forEach((t) => console.log(`  - ${t}`));
@@ -263,7 +365,7 @@ program
         }
     }
     else {
-        console.error('x', result.message);
+        console.error('x', result.message, `(${duration})`);
         if (result.errors) {
             result.errors.forEach((e) => console.error('  -', e));
         }
@@ -279,6 +381,7 @@ program
     .option('-a, --authorization <header>', 'Authorization header value')
     .option('--json', 'Output as JSON', false)
     .action(async (options) => {
+    const startTime = performance.now();
     // Validate source options
     if (!options.endpoint && !options.schema) {
         console.error('x Either --endpoint or --schema must be provided.');
@@ -299,11 +402,12 @@ program
         console.log('Fetching schema from', source.describe(), '...');
         const { introspection } = await source.fetch();
         const tables = inferTablesFromIntrospection(introspection);
+        const duration = formatDuration(performance.now() - startTime);
         if (options.json) {
             console.log(JSON.stringify(tables, null, 2));
         }
         else {
-            console.log(`\n[ok] Found ${tables.length} tables:\n`);
+            console.log(`\n[ok] Found ${tables.length} tables (${duration}):\n`);
             tables.forEach((table) => {
                 const fieldCount = table.fields.length;
                 const relationCount = table.relations.belongsTo.length +
@@ -315,7 +419,8 @@ program
         }
     }
     catch (err) {
-        console.error('x Failed to introspect schema:', err instanceof Error ? err.message : err);
+        const duration = formatDuration(performance.now() - startTime);
+        console.error('x Failed to introspect schema:', err instanceof Error ? err.message : err, `(${duration})`);
         process.exit(1);
     }
 });

package/cli/watch/orchestrator.d.ts

@@ -10,6 +10,10 @@ export interface WatchOrchestratorOptions {
     generatorType: GeneratorType;
     verbose: boolean;
     authorization?: string;
+    /** Config file path for regeneration */
+    configPath?: string;
+    /** Target name for multi-target configs */
+    target?: string;
     /** Override output directory (for ORM) */
     outputDir?: string;
     /** Skip custom operations flag */

package/cli/watch/orchestrator.js

@@ -138,6 +138,8 @@ class WatchOrchestrator {
             let result;
             if (this.options.generatorType === 'generate') {
                 result = await (0, generate_1.generateCommand)({
+                    config: this.options.configPath,
+                    target: this.options.target,
                     endpoint: this.options.config.endpoint,
                     output: this.options.outputDir ?? this.options.config.output,
                     authorization: this.options.authorization,
@@ -147,6 +149,8 @@ class WatchOrchestrator {
             }
             else {
                 result = await (0, generate_orm_1.generateOrmCommand)({
+                    config: this.options.configPath,
+                    target: this.options.target,
                     endpoint: this.options.config.endpoint,
                     output: this.options.outputDir ?? this.options.config.orm?.output,
                     authorization: this.options.authorization,

package/esm/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/esm/cli/codegen/babel-ast.js

@@ -95,3 +95,17 @@ export 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)
+ */
+export 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/esm/cli/codegen/barrel.js

@@ -1,6 +1,6 @@
 import * as t from '@babel/types';
 import { generateCode, addJSDocComment } from './babel-ast';
-import { getListQueryHookName, getSingleQueryHookName, getCreateMutationHookName, getUpdateMutationHookName, getDeleteMutationHookName, } from './utils';
+import { getListQueryHookName, getSingleQueryHookName, getCreateMutationHookName, getUpdateMutationHookName, getDeleteMutationHookName, hasValidPrimaryKey, } from './utils';
 import { getOperationHookName } from './type-resolver';
 /**
  * Helper to create export * from './module' statement
@@ -16,9 +16,12 @@ export function generateQueriesBarrel(tables) {
     // Export all query hooks
     for (const table of tables) {
         const listHookName = getListQueryHookName(table);
-        const singleHookName = getSingleQueryHookName(table);
         statements.push(exportAllFrom(`./${listHookName}`));
-        statements.push(exportAllFrom(`./${singleHookName}`));
+        // Only export single query hook if table has valid primary key
+        if (hasValidPrimaryKey(table)) {
+            const singleHookName = getSingleQueryHookName(table);
+            statements.push(exportAllFrom(`./${singleHookName}`));
+        }
     }
     // Add file header as leading comment on first statement
     if (statements.length > 0) {
@@ -135,17 +138,30 @@ export function generateMainBarrel(tables, options = {}) {
  */
 export function generateCustomQueriesBarrel(tables, customQueryNames) {
     const statements = [];
+    const exportedHooks = new Set();
     // Export all table query hooks
     for (const table of tables) {
         const listHookName = getListQueryHookName(table);
-        const singleHookName = 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 (hasValidPrimaryKey(table)) {
+            const singleHookName = 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 = 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) {
@@ -162,24 +178,37 @@ export function generateCustomQueriesBarrel(tables, customQueryNames) {
  */
 export function generateCustomMutationsBarrel(tables, customMutationNames) {
     const statements = [];
+    const exportedHooks = new Set();
     // Export all table mutation hooks
     for (const table of tables) {
         const createHookName = getCreateMutationHookName(table);
-        const updateHookName = getUpdateMutationHookName(table);
-        const deleteHookName = 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 = getUpdateMutationHookName(table);
+            if (!exportedHooks.has(updateHookName)) {
+                statements.push(exportAllFrom(`./${updateHookName}`));
+                exportedHooks.add(updateHookName);
+            }
         }
         if (table.query?.delete !== null) {
-            statements.push(exportAllFrom(`./${deleteHookName}`));
+            const deleteHookName = 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 = 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/esm/cli/codegen/custom-mutations.js

@@ -1,5 +1,5 @@
 import * as t from '@babel/types';
-import { generateCode, addJSDocComment, typedParam } from './babel-ast';
+import { generateCode, addJSDocComment, typedParam, createTypedCallExpression } from './babel-ast';
 import { buildCustomMutationString } from './schema-gql-ast';
 import { typeRefToTsType, isTypeRequired, getOperationHookName, getOperationFileName, getOperationVariablesTypeName, getOperationResultTypeName, getDocumentConstName, createTypeTracker, } from './type-resolver';
 import { getGeneratedFileHeader } from './utils';
@@ -94,13 +94,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([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([typedParam('variables', t.tsTypeReference(t.identifier(variablesTypeName)))], 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([], 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/esm/cli/codegen/custom-queries.js

@@ -1,5 +1,5 @@
 import * as t from '@babel/types';
-import { generateCode, addJSDocComment, typedParam } from './babel-ast';
+import { generateCode, addJSDocComment, typedParam, createTypedCallExpression } from './babel-ast';
 import { buildCustomQueryString } from './schema-gql-ast';
 import { typeRefToTsType, isTypeRequired, getOperationHookName, getOperationFileName, getOperationVariablesTypeName, getOperationResultTypeName, getDocumentConstName, getQueryKeyName, createTypeTracker, } from './type-resolver';
 import { ucFirst, getGeneratedFileHeader } from './utils';
@@ -115,9 +115,9 @@ export 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([], 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)))));
@@ -125,7 +125,7 @@ export 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([], 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)])));
@@ -162,18 +162,13 @@ export function generateCustomQueryHook(options) {
     const hasRequiredArgs = operation.args.some((arg) => 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(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(createTypedCallExpression(t.identifier('execute'), [t.identifier(documentConstName), t.identifier('undefined'), t.identifier('options')], [t.tsTypeReference(t.identifier(resultTypeName))])));
     }
     const fetchParams = [];
     if (hasArgs) {
@@ -201,19 +196,14 @@ export 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([], 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([], 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/esm/cli/codegen/gql-ast.js

@@ -6,7 +6,7 @@
  */
 import * as t from 'gql-ast';
 import { print } from 'graphql';
-import { getTableNames, getAllRowsQueryName, getSingleRowQueryName, getCreateMutationName, getUpdateMutationName, getDeleteMutationName, getFilterTypeName, getOrderByTypeName, getScalarFields, getPrimaryKeyInfo, ucFirst, } from './utils';
+import { getTableNames, getAllRowsQueryName, getSingleRowQueryName, getCreateMutationName, getUpdateMutationName, getDeleteMutationName, getFilterTypeName, getConditionTypeName, getOrderByTypeName, getScalarFields, getPrimaryKeyInfo, ucFirst, } from './utils';
 // ============================================================================
 // Field selection builders
 // ============================================================================
@@ -39,22 +39,39 @@ export function buildListQueryAST(config) {
     const { table } = config;
     const queryName = getAllRowsQueryName(table);
     const filterType = getFilterTypeName(table);
+    const conditionType = getConditionTypeName(table);
     const orderByType = getOrderByTypeName(table);
     const scalarFields = 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({
@@ -65,8 +82,12 @@ export 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/esm/cli/codegen/index.js

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