@constructive-io/graphql-codegen 2.24.0 → 2.26.0

package/esm/cli/codegen/orm/custom-ops-generator.js

@@ -122,9 +122,14 @@ function buildOperationMethod(op, operationType) {
     const optionsParam = t.identifier('options');
     optionsParam.optional = true;
     if (selectTypeName) {
+        // Use DeepExact<S, SelectType> to enforce strict field validation
+        // This catches invalid fields even when mixed with valid ones
         optionsParam.typeAnnotation = t.tsTypeAnnotation(t.tsTypeLiteral([
             (() => {
-                const prop = t.tsPropertySignature(t.identifier('select'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('S'))));
+                const prop = t.tsPropertySignature(t.identifier('select'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('DeepExact'), t.tsTypeParameterInstantiation([
+                    t.tsTypeReference(t.identifier('S')),
+                    t.tsTypeReference(t.identifier(selectTypeName)),
+                ]))));
                 prop.optional = true;
                 return prop;
             })(),
@@ -192,7 +197,7 @@ export function generateCustomQueryOpsFile(operations) {
     // Add imports
     statements.push(createImportDeclaration('../client', ['OrmClient']));
     statements.push(createImportDeclaration('../query-builder', ['QueryBuilder', 'buildCustomDocument']));
-    statements.push(createImportDeclaration('../select-types', ['InferSelectResult'], true));
+    statements.push(createImportDeclaration('../select-types', ['InferSelectResult', 'DeepExact'], true));
     if (allTypeImports.length > 0) {
         statements.push(createImportDeclaration('../input-types', allTypeImports, true));
     }
@@ -230,7 +235,7 @@ export function generateCustomMutationOpsFile(operations) {
     // Add imports
     statements.push(createImportDeclaration('../client', ['OrmClient']));
     statements.push(createImportDeclaration('../query-builder', ['QueryBuilder', 'buildCustomDocument']));
-    statements.push(createImportDeclaration('../select-types', ['InferSelectResult'], true));
+    statements.push(createImportDeclaration('../select-types', ['InferSelectResult', 'DeepExact'], true));
     if (allTypeImports.length > 0) {
         statements.push(createImportDeclaration('../input-types', allTypeImports, true));
     }

package/esm/cli/codegen/orm/input-types-generator.js

@@ -193,6 +193,22 @@ const SCALAR_FILTER_CONFIGS = [
         operators: ['equality', 'distinct', 'inArray', 'comparison', 'inet'],
     },
     { name: 'FullTextFilter', tsType: 'string', operators: ['fulltext'] },
+    // List filters (for array fields like string[], int[], uuid[])
+    {
+        name: 'StringListFilter',
+        tsType: 'string[]',
+        operators: ['equality', 'distinct', 'comparison', 'listArray'],
+    },
+    {
+        name: 'IntListFilter',
+        tsType: 'number[]',
+        operators: ['equality', 'distinct', 'comparison', 'listArray'],
+    },
+    {
+        name: 'UUIDListFilter',
+        tsType: 'string[]',
+        operators: ['equality', 'distinct', 'comparison', 'listArray'],
+    },
 ];
 /**
  * Build filter properties based on operator sets
@@ -232,6 +248,12 @@ function buildScalarFilterProperties(config) {
     if (operators.includes('fulltext')) {
         props.push({ name: 'matches', type: 'string', optional: true });
     }
+    // List/Array operators (contains, overlaps, anyEqualTo, etc.)
+    if (operators.includes('listArray')) {
+        // Extract base type from array type (e.g., 'string[]' -> 'string')
+        const baseType = tsType.replace('[]', '');
+        props.push({ name: 'contains', type: tsType, optional: true }, { name: 'containedBy', type: tsType, optional: true }, { name: 'overlaps', type: tsType, optional: true }, { name: 'anyEqualTo', type: baseType, optional: true }, { name: 'anyNotEqualTo', type: baseType, optional: true }, { name: 'anyLessThan', type: baseType, optional: true }, { name: 'anyLessThanOrEqualTo', type: baseType, optional: true }, { name: 'anyGreaterThan', type: baseType, optional: true }, { name: 'anyGreaterThanOrEqualTo', type: baseType, optional: true });
+    }
     return props;
 }
 /**

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

@@ -63,7 +63,7 @@ export function generateModelFile(table, _useSharedTypes) {
     ]));
     statements.push(createImportDeclaration('../select-types', [
         'ConnectionResult', 'FindManyArgs', 'FindFirstArgs', 'CreateArgs',
-        'UpdateArgs', 'DeleteArgs', 'InferSelectResult',
+        'UpdateArgs', 'DeleteArgs', 'InferSelectResult', 'DeepExact',
     ], true));
     statements.push(createImportDeclaration('../input-types', [
         typeName, relationTypeName, selectTypeName, whereTypeName, orderByTypeName,
@@ -77,10 +77,14 @@ export function generateModelFile(table, _useSharedTypes) {
     paramProp.accessibility = 'private';
     classBody.push(t.classMethod('constructor', t.identifier('constructor'), [paramProp], t.blockStatement([])));
     // findMany method
+    // Use DeepExact<S, SelectType> to enforce strict field validation
     const findManyParam = t.identifier('args');
     findManyParam.optional = true;
     findManyParam.typeAnnotation = t.tsTypeAnnotation(t.tsTypeReference(t.identifier('FindManyArgs'), t.tsTypeParameterInstantiation([
-        t.tsTypeReference(t.identifier('S')),
+        t.tsTypeReference(t.identifier('DeepExact'), t.tsTypeParameterInstantiation([
+            t.tsTypeReference(t.identifier('S')),
+            t.tsTypeReference(t.identifier(selectTypeName)),
+        ])),
         t.tsTypeReference(t.identifier(whereTypeName)),
         t.tsTypeReference(t.identifier(orderByTypeName)),
     ])));
@@ -115,7 +119,10 @@ export function generateModelFile(table, _useSharedTypes) {
     const findFirstParam = t.identifier('args');
     findFirstParam.optional = true;
     findFirstParam.typeAnnotation = t.tsTypeAnnotation(t.tsTypeReference(t.identifier('FindFirstArgs'), t.tsTypeParameterInstantiation([
-        t.tsTypeReference(t.identifier('S')),
+        t.tsTypeReference(t.identifier('DeepExact'), t.tsTypeParameterInstantiation([
+            t.tsTypeReference(t.identifier('S')),
+            t.tsTypeReference(t.identifier(selectTypeName)),
+        ])),
         t.tsTypeReference(t.identifier(whereTypeName)),
     ])));
     const findFirstReturnType = t.tsTypeAnnotation(t.tsTypeReference(t.identifier('QueryBuilder'), t.tsTypeParameterInstantiation([
@@ -141,7 +148,10 @@ export function generateModelFile(table, _useSharedTypes) {
     // create method
     const createParam = t.identifier('args');
     createParam.typeAnnotation = t.tsTypeAnnotation(t.tsTypeReference(t.identifier('CreateArgs'), t.tsTypeParameterInstantiation([
-        t.tsTypeReference(t.identifier('S')),
+        t.tsTypeReference(t.identifier('DeepExact'), t.tsTypeParameterInstantiation([
+            t.tsTypeReference(t.identifier('S')),
+            t.tsTypeReference(t.identifier(selectTypeName)),
+        ])),
         t.tsIndexedAccessType(t.tsTypeReference(t.identifier(createInputTypeName)), t.tsLiteralType(t.stringLiteral(singularName))),
     ])));
     const createReturnType = t.tsTypeAnnotation(t.tsTypeReference(t.identifier('QueryBuilder'), t.tsTypeParameterInstantiation([
@@ -167,7 +177,10 @@ export function generateModelFile(table, _useSharedTypes) {
     if (updateMutationName) {
         const updateParam = t.identifier('args');
         updateParam.typeAnnotation = t.tsTypeAnnotation(t.tsTypeReference(t.identifier('UpdateArgs'), t.tsTypeParameterInstantiation([
-            t.tsTypeReference(t.identifier('S')),
+            t.tsTypeReference(t.identifier('DeepExact'), t.tsTypeParameterInstantiation([
+                t.tsTypeReference(t.identifier('S')),
+                t.tsTypeReference(t.identifier(selectTypeName)),
+            ])),
             t.tsTypeLiteral([t.tsPropertySignature(t.identifier('id'), t.tsTypeAnnotation(t.tsStringKeyword()))]),
             t.tsTypeReference(t.identifier(patchTypeName)),
         ])));

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

@@ -44,6 +44,39 @@ export interface NestedSelectConfig {
     filter?: Record<string, unknown>;
     orderBy?: string[];
 }
+/**
+ * Recursively validates select objects, rejecting unknown keys.
+ *
+ * This type ensures that users can only select fields that actually exist
+ * in the GraphQL schema. It returns `never` if any excess keys are found
+ * at any nesting level, causing a TypeScript compile error.
+ *
+ * Why this is needed:
+ * TypeScript's excess property checking has a quirk where it only catches
+ * invalid fields when they are the ONLY fields. When mixed with valid fields
+ * (e.g., `{ id: true, invalidField: true }`), the structural typing allows
+ * the excess property through. This type explicitly checks for and rejects
+ * such cases.
+ *
+ * @example
+ * // This will cause a type error because 'invalid' doesn't exist:
+ * type Result = DeepExact<{ id: true, invalid: true }, { id?: boolean }>;
+ * // Result = never (causes assignment error)
+ *
+ * @example
+ * // This works because all fields are valid:
+ * type Result = DeepExact<{ id: true }, { id?: boolean; name?: boolean }>;
+ * // Result = { id: true }
+ */
+export type DeepExact<T, Shape> = T extends Shape ? Exclude<keyof T, keyof Shape> extends never ? {
+    [K in keyof T]: K extends keyof Shape ? T[K] extends {
+        select: infer NS;
+    } ? Shape[K] extends {
+        select?: infer ShapeNS;
+    } ? {
+        select: DeepExact<NS, NonNullable<ShapeNS>>;
+    } : T[K] : T[K] : never;
+} : never : never;
 /**
  * Infers the result type from a select configuration
  *

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

@@ -17,5 +17,5 @@ export interface QueryGeneratorOptions {
     hasRelationships?: boolean;
 }
 export declare function generateListQueryHook(table: CleanTable, options?: QueryGeneratorOptions): GeneratedQueryFile;
-export declare function generateSingleQueryHook(table: CleanTable, options?: QueryGeneratorOptions): GeneratedQueryFile;
+export declare function generateSingleQueryHook(table: CleanTable, options?: QueryGeneratorOptions): GeneratedQueryFile | null;
 export declare function generateAllQueryHooks(tables: CleanTable[], options?: QueryGeneratorOptions): GeneratedQueryFile[];

package/esm/cli/codegen/queries.js

@@ -1,7 +1,7 @@
 import * as t from '@babel/types';
-import { generateCode, addJSDocComment, typedParam } from './babel-ast';
+import { generateCode, addJSDocComment, typedParam, createTypedCallExpression } from './babel-ast';
 import { buildListQueryAST, buildSingleQueryAST, printGraphQL, } from './gql-ast';
-import { getTableNames, getListQueryHookName, getSingleQueryHookName, getListQueryFileName, getSingleQueryFileName, getAllRowsQueryName, getSingleRowQueryName, getFilterTypeName, getOrderByTypeName, getScalarFields, getScalarFilterType, getPrimaryKeyInfo, toScreamingSnake, ucFirst, lcFirst, getGeneratedFileHeader, } from './utils';
+import { getTableNames, getListQueryHookName, getSingleQueryHookName, getListQueryFileName, getSingleQueryFileName, getAllRowsQueryName, getSingleRowQueryName, getFilterTypeName, getConditionTypeName, getOrderByTypeName, getScalarFields, getScalarFilterType, getPrimaryKeyInfo, hasValidPrimaryKey, fieldTypeToTs, toScreamingSnake, ucFirst, lcFirst, getGeneratedFileHeader, } from './utils';
 function createUnionType(values) {
     return t.tsUnionType(values.map((v) => t.tsLiteralType(t.stringLiteral(v))));
 }
@@ -34,6 +34,7 @@ export function generateListQueryHook(table, options = {}) {
     const hookName = getListQueryHookName(table);
     const queryName = getAllRowsQueryName(table);
     const filterTypeName = getFilterTypeName(table);
+    const conditionTypeName = getConditionTypeName(table);
     const orderByTypeName = getOrderByTypeName(table);
     const scalarFields = getScalarFields(table);
     const keysName = `${lcFirst(typeName)}Keys`;
@@ -98,6 +99,59 @@ export function generateListQueryHook(table, options = {}) {
     })
         .filter((f) => f !== null);
     statements.push(createFilterInterfaceDeclaration(filterTypeName, fieldFilters, false));
+    // Generate Condition interface (simple equality filter with scalar types)
+    // Track non-primitive types (enums) that need to be imported
+    const enumTypesUsed = new Set();
+    const conditionProperties = scalarFields.map((field) => {
+        const tsType = fieldTypeToTs(field.type);
+        const isPrimitive = tsType === 'string' ||
+            tsType === 'number' ||
+            tsType === 'boolean' ||
+            tsType === 'unknown' ||
+            tsType.endsWith('[]');
+        let typeAnnotation;
+        if (field.type.isArray) {
+            const baseType = tsType.replace('[]', '');
+            const isBasePrimitive = baseType === 'string' ||
+                baseType === 'number' ||
+                baseType === 'boolean' ||
+                baseType === 'unknown';
+            if (!isBasePrimitive) {
+                enumTypesUsed.add(baseType);
+            }
+            typeAnnotation = t.tsArrayType(baseType === 'string'
+                ? t.tsStringKeyword()
+                : baseType === 'number'
+                    ? t.tsNumberKeyword()
+                    : baseType === 'boolean'
+                        ? t.tsBooleanKeyword()
+                        : t.tsTypeReference(t.identifier(baseType)));
+        }
+        else {
+            if (!isPrimitive) {
+                enumTypesUsed.add(tsType);
+            }
+            typeAnnotation =
+                tsType === 'string'
+                    ? t.tsStringKeyword()
+                    : tsType === 'number'
+                        ? t.tsNumberKeyword()
+                        : tsType === 'boolean'
+                            ? t.tsBooleanKeyword()
+                            : t.tsTypeReference(t.identifier(tsType));
+        }
+        const prop = t.tsPropertySignature(t.identifier(field.name), t.tsTypeAnnotation(typeAnnotation));
+        prop.optional = true;
+        return prop;
+    });
+    // Add import for enum types if any are used
+    if (enumTypesUsed.size > 0) {
+        const schemaTypesImport = t.importDeclaration(Array.from(enumTypesUsed).map((et) => t.importSpecifier(t.identifier(et), t.identifier(et))), t.stringLiteral('../schema-types'));
+        schemaTypesImport.importKind = 'type';
+        statements.push(schemaTypesImport);
+    }
+    const conditionInterface = t.tsInterfaceDeclaration(t.identifier(conditionTypeName), null, null, t.tsInterfaceBody(conditionProperties));
+    statements.push(conditionInterface);
     const orderByValues = [
         ...scalarFields.flatMap((f) => [
             `${toScreamingSnake(f.name)}_ASC`,
@@ -115,16 +169,36 @@ export function generateListQueryHook(table, options = {}) {
             p.optional = true;
             return p;
         })(),
+        (() => {
+            const p = t.tsPropertySignature(t.identifier('last'), t.tsTypeAnnotation(t.tsNumberKeyword()));
+            p.optional = true;
+            return p;
+        })(),
         (() => {
             const p = t.tsPropertySignature(t.identifier('offset'), t.tsTypeAnnotation(t.tsNumberKeyword()));
             p.optional = true;
             return p;
         })(),
+        (() => {
+            const p = t.tsPropertySignature(t.identifier('before'), t.tsTypeAnnotation(t.tsStringKeyword()));
+            p.optional = true;
+            return p;
+        })(),
+        (() => {
+            const p = t.tsPropertySignature(t.identifier('after'), t.tsTypeAnnotation(t.tsStringKeyword()));
+            p.optional = true;
+            return p;
+        })(),
         (() => {
             const p = t.tsPropertySignature(t.identifier('filter'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(filterTypeName))));
             p.optional = true;
             return p;
         })(),
+        (() => {
+            const p = t.tsPropertySignature(t.identifier('condition'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(conditionTypeName))));
+            p.optional = true;
+            return p;
+        })(),
         (() => {
             const p = t.tsPropertySignature(t.identifier('orderBy'), t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier(orderByTypeName)))));
             p.optional = true;
@@ -184,9 +258,9 @@ export function generateListQueryHook(table, options = {}) {
             hookBodyStatements.push(t.returnStatement(t.callExpression(t.identifier('useQuery'), [
                 t.objectExpression([
                     t.objectProperty(t.identifier('queryKey'), t.callExpression(t.memberExpression(t.identifier(keysName), t.identifier('list')), [t.identifier('variables'), t.identifier('scope')])),
-                    t.objectProperty(t.identifier('queryFn'), t.arrowFunctionExpression([], t.callExpression(t.identifier('execute'), [
-                        t.identifier(`${queryName}QueryDocument`),
-                        t.identifier('variables'),
+                    t.objectProperty(t.identifier('queryFn'), t.arrowFunctionExpression([], createTypedCallExpression(t.identifier('execute'), [t.identifier(`${queryName}QueryDocument`), t.identifier('variables')], [
+                        t.tsTypeReference(t.identifier(`${ucFirst(pluralName)}QueryResult`)),
+                        t.tsTypeReference(t.identifier(`${ucFirst(pluralName)}QueryVariables`)),
                     ]))),
                     t.spreadElement(t.identifier('queryOptions')),
                 ]),
@@ -196,9 +270,9 @@ export function generateListQueryHook(table, options = {}) {
             hookBodyStatements.push(t.returnStatement(t.callExpression(t.identifier('useQuery'), [
                 t.objectExpression([
                     t.objectProperty(t.identifier('queryKey'), t.callExpression(t.memberExpression(t.identifier(keysName), t.identifier('list')), [t.identifier('variables')])),
-                    t.objectProperty(t.identifier('queryFn'), t.arrowFunctionExpression([], t.callExpression(t.identifier('execute'), [
-                        t.identifier(`${queryName}QueryDocument`),
-                        t.identifier('variables'),
+                    t.objectProperty(t.identifier('queryFn'), t.arrowFunctionExpression([], createTypedCallExpression(t.identifier('execute'), [t.identifier(`${queryName}QueryDocument`), t.identifier('variables')], [
+                        t.tsTypeReference(t.identifier(`${ucFirst(pluralName)}QueryResult`)),
+                        t.tsTypeReference(t.identifier(`${ucFirst(pluralName)}QueryVariables`)),
                     ]))),
                     t.spreadElement(t.identifier('options')),
                 ]),
@@ -210,9 +284,9 @@ export function generateListQueryHook(table, options = {}) {
                     t.objectProperty(t.identifier('queryKey'), t.callExpression(t.identifier(`${queryName}QueryKey`), [
                         t.identifier('variables'),
                     ])),
-                    t.objectProperty(t.identifier('queryFn'), t.arrowFunctionExpression([], t.callExpression(t.identifier('execute'), [
-                        t.identifier(`${queryName}QueryDocument`),
-                        t.identifier('variables'),
+                    t.objectProperty(t.identifier('queryFn'), t.arrowFunctionExpression([], createTypedCallExpression(t.identifier('execute'), [t.identifier(`${queryName}QueryDocument`), t.identifier('variables')], [
+                        t.tsTypeReference(t.identifier(`${ucFirst(pluralName)}QueryResult`)),
+                        t.tsTypeReference(t.identifier(`${ucFirst(pluralName)}QueryVariables`)),
                     ]))),
                     t.spreadElement(t.identifier('options')),
                 ]),
@@ -260,10 +334,9 @@ export function generateListQueryHook(table, options = {}) {
         statements.push(hookExport);
     }
     const fetchFuncBody = t.blockStatement([
-        t.returnStatement(t.callExpression(t.identifier('execute'), [
-            t.identifier(`${queryName}QueryDocument`),
-            t.identifier('variables'),
-            t.identifier('options'),
+        t.returnStatement(createTypedCallExpression(t.identifier('execute'), [t.identifier(`${queryName}QueryDocument`), t.identifier('variables'), t.identifier('options')], [
+            t.tsTypeReference(t.identifier(`${ucFirst(pluralName)}QueryResult`)),
+            t.tsTypeReference(t.identifier(`${ucFirst(pluralName)}QueryVariables`)),
         ])),
     ]);
     const fetchFunc = t.functionDeclaration(t.identifier(`fetch${ucFirst(pluralName)}Query`), [
@@ -314,10 +387,9 @@ export function generateListQueryHook(table, options = {}) {
             t.expressionStatement(t.awaitExpression(t.callExpression(t.memberExpression(t.identifier('queryClient'), t.identifier('prefetchQuery')), [
                 t.objectExpression([
                     t.objectProperty(t.identifier('queryKey'), prefetchQueryKeyExpr),
-                    t.objectProperty(t.identifier('queryFn'), t.arrowFunctionExpression([], t.callExpression(t.identifier('execute'), [
-                        t.identifier(`${queryName}QueryDocument`),
-                        t.identifier('variables'),
-                        t.identifier('options'),
+                    t.objectProperty(t.identifier('queryFn'), t.arrowFunctionExpression([], createTypedCallExpression(t.identifier('execute'), [t.identifier(`${queryName}QueryDocument`), t.identifier('variables'), t.identifier('options')], [
+                        t.tsTypeReference(t.identifier(`${ucFirst(pluralName)}QueryResult`)),
+                        t.tsTypeReference(t.identifier(`${ucFirst(pluralName)}QueryVariables`)),
                     ]))),
                 ]),
             ]))),
@@ -347,6 +419,10 @@ export function generateListQueryHook(table, options = {}) {
     };
 }
 export function generateSingleQueryHook(table, options = {}) {
+    // Skip tables with composite keys - they are handled as custom queries
+    if (!hasValidPrimaryKey(table)) {
+        return null;
+    }
     const { reactQueryEnabled = true, useCentralizedKeys = true, hasRelationships = false, } = options;
     const { typeName, singularName } = getTableNames(table);
     const hookName = getSingleQueryHookName(table);
@@ -454,9 +530,9 @@ export function generateSingleQueryHook(table, options = {}) {
                         t.memberExpression(t.identifier('variables'), t.identifier(pkName)),
                         t.identifier('scope'),
                     ])),
-                    t.objectProperty(t.identifier('queryFn'), t.arrowFunctionExpression([], t.callExpression(t.identifier('execute'), [
-                        t.identifier(`${queryName}QueryDocument`),
-                        t.identifier('variables'),
+                    t.objectProperty(t.identifier('queryFn'), t.arrowFunctionExpression([], createTypedCallExpression(t.identifier('execute'), [t.identifier(`${queryName}QueryDocument`), t.identifier('variables')], [
+                        t.tsTypeReference(t.identifier(`${ucFirst(singularName)}QueryResult`)),
+                        t.tsTypeReference(t.identifier(`${ucFirst(singularName)}QueryVariables`)),
                     ]))),
                     t.spreadElement(t.identifier('queryOptions')),
                 ]),
@@ -468,9 +544,9 @@ export function generateSingleQueryHook(table, options = {}) {
                     t.objectProperty(t.identifier('queryKey'), t.callExpression(t.memberExpression(t.identifier(keysName), t.identifier('detail')), [
                         t.memberExpression(t.identifier('variables'), t.identifier(pkName)),
                     ])),
-                    t.objectProperty(t.identifier('queryFn'), t.arrowFunctionExpression([], t.callExpression(t.identifier('execute'), [
-                        t.identifier(`${queryName}QueryDocument`),
-                        t.identifier('variables'),
+                    t.objectProperty(t.identifier('queryFn'), t.arrowFunctionExpression([], createTypedCallExpression(t.identifier('execute'), [t.identifier(`${queryName}QueryDocument`), t.identifier('variables')], [
+                        t.tsTypeReference(t.identifier(`${ucFirst(singularName)}QueryResult`)),
+                        t.tsTypeReference(t.identifier(`${ucFirst(singularName)}QueryVariables`)),
                     ]))),
                     t.spreadElement(t.identifier('options')),
                 ]),
@@ -482,9 +558,9 @@ export function generateSingleQueryHook(table, options = {}) {
                     t.objectProperty(t.identifier('queryKey'), t.callExpression(t.identifier(`${queryName}QueryKey`), [
                         t.memberExpression(t.identifier('variables'), t.identifier(pkName)),
                     ])),
-                    t.objectProperty(t.identifier('queryFn'), t.arrowFunctionExpression([], t.callExpression(t.identifier('execute'), [
-                        t.identifier(`${queryName}QueryDocument`),
-                        t.identifier('variables'),
+                    t.objectProperty(t.identifier('queryFn'), t.arrowFunctionExpression([], createTypedCallExpression(t.identifier('execute'), [t.identifier(`${queryName}QueryDocument`), t.identifier('variables')], [
+                        t.tsTypeReference(t.identifier(`${ucFirst(singularName)}QueryResult`)),
+                        t.tsTypeReference(t.identifier(`${ucFirst(singularName)}QueryVariables`)),
                     ]))),
                     t.spreadElement(t.identifier('options')),
                 ]),
@@ -528,10 +604,9 @@ export function generateSingleQueryHook(table, options = {}) {
         statements.push(hookExport);
     }
     const fetchFuncBody = t.blockStatement([
-        t.returnStatement(t.callExpression(t.identifier('execute'), [
-            t.identifier(`${queryName}QueryDocument`),
-            t.identifier('variables'),
-            t.identifier('options'),
+        t.returnStatement(createTypedCallExpression(t.identifier('execute'), [t.identifier(`${queryName}QueryDocument`), t.identifier('variables'), t.identifier('options')], [
+            t.tsTypeReference(t.identifier(`${ucFirst(singularName)}QueryResult`)),
+            t.tsTypeReference(t.identifier(`${ucFirst(singularName)}QueryVariables`)),
         ])),
     ]);
     const fetchFunc = t.functionDeclaration(t.identifier(`fetch${ucFirst(singularName)}Query`), [
@@ -578,10 +653,9 @@ export function generateSingleQueryHook(table, options = {}) {
             t.expressionStatement(t.awaitExpression(t.callExpression(t.memberExpression(t.identifier('queryClient'), t.identifier('prefetchQuery')), [
                 t.objectExpression([
                     t.objectProperty(t.identifier('queryKey'), prefetchQueryKeyExpr),
-                    t.objectProperty(t.identifier('queryFn'), t.arrowFunctionExpression([], t.callExpression(t.identifier('execute'), [
-                        t.identifier(`${queryName}QueryDocument`),
-                        t.identifier('variables'),
-                        t.identifier('options'),
+                    t.objectProperty(t.identifier('queryFn'), t.arrowFunctionExpression([], createTypedCallExpression(t.identifier('execute'), [t.identifier(`${queryName}QueryDocument`), t.identifier('variables'), t.identifier('options')], [
+                        t.tsTypeReference(t.identifier(`${ucFirst(singularName)}QueryResult`)),
+                        t.tsTypeReference(t.identifier(`${ucFirst(singularName)}QueryVariables`)),
                     ]))),
                 ]),
             ]))),
@@ -614,7 +688,10 @@ export function generateAllQueryHooks(tables, options = {}) {
     const files = [];
     for (const table of tables) {
         files.push(generateListQueryHook(table, options));
-        files.push(generateSingleQueryHook(table, options));
+        const singleHook = generateSingleQueryHook(table, options);
+        if (singleHook) {
+            files.push(singleHook);
+        }
     }
     return files;
 }

package/esm/cli/codegen/utils.d.ts

@@ -171,6 +171,12 @@ export declare function getPrimaryKeyInfo(table: CleanTable): PrimaryKeyField[];
  * Get primary key field names (convenience wrapper)
  */
 export declare function getPrimaryKeyFields(table: CleanTable): string[];
+/**
+ * Check if table has a valid single-field primary key
+ * Used to determine if a single query hook can be generated
+ * Tables with composite keys return false (handled as custom queries)
+ */
+export declare function hasValidPrimaryKey(table: CleanTable): boolean;
 /**
  * Generate query key prefix for a table
  * e.g., "cars" for list queries, "car" for detail queries

package/esm/cli/codegen/utils.js

@@ -291,6 +291,24 @@ export function getPrimaryKeyInfo(table) {
 export function getPrimaryKeyFields(table) {
     return getPrimaryKeyInfo(table).map((pk) => pk.name);
 }
+/**
+ * Check if table has a valid single-field primary key
+ * Used to determine if a single query hook can be generated
+ * Tables with composite keys return false (handled as custom queries)
+ */
+export function hasValidPrimaryKey(table) {
+    // Check for explicit primary key constraint with single field
+    const pk = table.constraints?.primaryKey?.[0];
+    if (pk && pk.fields.length === 1) {
+        return true;
+    }
+    // Check for 'id' field as fallback
+    const idField = table.fields.find((f) => f.name.toLowerCase() === 'id');
+    if (idField) {
+        return true;
+    }
+    return false;
+}
 // ============================================================================
 // Query key generation
 // ============================================================================

package/esm/cli/commands/generate-orm.d.ts

@@ -9,6 +9,8 @@
 export interface GenerateOrmOptions {
     /** Path to config file */
     config?: string;
+    /** Named target in a multi-target config */
+    target?: string;
     /** GraphQL endpoint URL (overrides config) */
     endpoint?: string;
     /** Path to GraphQL schema file (.graphql) */
@@ -24,9 +26,21 @@ export interface GenerateOrmOptions {
     /** Skip custom operations (only generate table CRUD) */
     skipCustomOperations?: boolean;
 }
+export interface GenerateOrmTargetResult {
+    name: string;
+    output: string;
+    success: boolean;
+    message: string;
+    tables?: string[];
+    customQueries?: string[];
+    customMutations?: string[];
+    filesWritten?: string[];
+    errors?: string[];
+}
 export interface GenerateOrmResult {
     success: boolean;
     message: string;
+    targets?: GenerateOrmTargetResult[];
     tables?: string[];
     customQueries?: string[];
     customMutations?: string[];