@constructive-io/graphql-codegen 3.2.0 → 3.3.0

package/esm/core/codegen/queries.js

@@ -1,322 +1,106 @@
+/**
+ * Query hook generators - delegates to ORM model methods (Babel AST-based)
+ *
+ * Output structure:
+ * queries/
+ *   useCarsQuery.ts    - List query hook -> ORM findMany
+ *   useCarQuery.ts     - Single item query hook -> ORM findOne
+ */
 import * as t from '@babel/types';
-import { generateCode, addJSDocComment, typedParam, createTypedCallExpression } from './babel-ast';
-import { buildListQueryAST, buildSingleQueryAST, printGraphQL, } from './gql-ast';
-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))));
-}
-function createFilterInterfaceDeclaration(name, fieldFilters, isExported = true) {
-    const properties = [];
-    for (const filter of fieldFilters) {
-        const prop = t.tsPropertySignature(t.identifier(filter.fieldName), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(filter.filterType))));
-        prop.optional = true;
-        properties.push(prop);
-    }
-    const andProp = t.tsPropertySignature(t.identifier('and'), t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier(name)))));
-    andProp.optional = true;
-    properties.push(andProp);
-    const orProp = t.tsPropertySignature(t.identifier('or'), t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier(name)))));
-    orProp.optional = true;
-    properties.push(orProp);
-    const notProp = t.tsPropertySignature(t.identifier('not'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(name))));
-    notProp.optional = true;
-    properties.push(notProp);
-    const body = t.tsInterfaceBody(properties);
-    const interfaceDecl = t.tsInterfaceDeclaration(t.identifier(name), null, null, body);
-    if (isExported) {
-        return t.exportNamedDeclaration(interfaceDecl);
-    }
-    return interfaceDecl;
-}
+import { asConst } from './babel-ast';
+import { addJSDocComment, buildFindManyCallExpr, buildFindOneCallExpr, buildListSelectionArgsCall, buildSelectionArgsCall, callExpr, createFunctionParam, createImportDeclaration, createSAndTDataTypeParams, createSTypeParam, createTypeReExport, destructureParamsWithSelection, destructureParamsWithSelectionAndScope, exportAsyncDeclareFunction, exportAsyncFunction, exportDeclareFunction, exportFunction, generateHookFileCode, listQueryResultType, listSelectionConfigType, objectProp, omitType, returnUseQuery, scopeTypeLiteral, selectionConfigType, singleQueryResultType, spreadObj, sRef, typeRef, useQueryOptionsImplType, voidStatement, withFieldsListSelectionType, withFieldsSelectionType, } from './hooks-ast';
+import { getAllRowsQueryName, getFilterTypeName, getListQueryFileName, getListQueryHookName, getOrderByTypeName, getPrimaryKeyInfo, getSingleQueryFileName, getSingleQueryHookName, getSingleRowQueryName, getTableNames, hasValidPrimaryKey, lcFirst, ucFirst, } from './utils';
 export function generateListQueryHook(table, options = {}) {
     const { reactQueryEnabled = true, useCentralizedKeys = true, hasRelationships = false, } = options;
-    const { typeName, pluralName } = getTableNames(table);
+    const { typeName, pluralName, singularName } = getTableNames(table);
     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`;
     const scopeTypeName = `${typeName}Scope`;
-    const queryAST = buildListQueryAST({ table });
-    const queryDocument = printGraphQL(queryAST);
+    const selectTypeName = `${typeName}Select`;
+    const relationTypeName = `${typeName}WithRelations`;
+    const listResultTypeAST = (sel) => listQueryResultType(queryName, relationTypeName, sel);
     const statements = [];
-    const filterTypesUsed = new Set();
-    for (const field of scalarFields) {
-        const filterType = getScalarFilterType(field.type.gqlType, field.type.isArray);
-        if (filterType) {
-            filterTypesUsed.add(filterType);
-        }
-    }
+    // Imports
     if (reactQueryEnabled) {
-        const reactQueryImport = t.importDeclaration([t.importSpecifier(t.identifier('useQuery'), t.identifier('useQuery'))], t.stringLiteral('@tanstack/react-query'));
-        statements.push(reactQueryImport);
-        const reactQueryTypeImport = t.importDeclaration([
-            t.importSpecifier(t.identifier('UseQueryOptions'), t.identifier('UseQueryOptions')),
-            t.importSpecifier(t.identifier('QueryClient'), t.identifier('QueryClient')),
-        ], t.stringLiteral('@tanstack/react-query'));
-        reactQueryTypeImport.importKind = 'type';
-        statements.push(reactQueryTypeImport);
+        statements.push(createImportDeclaration('@tanstack/react-query', ['useQuery']));
+        statements.push(createImportDeclaration('@tanstack/react-query', ['UseQueryOptions', 'UseQueryResult', 'QueryClient'], true));
     }
-    const clientImport = t.importDeclaration([t.importSpecifier(t.identifier('execute'), t.identifier('execute'))], t.stringLiteral('../client'));
-    statements.push(clientImport);
-    const clientTypeImport = t.importDeclaration([
-        t.importSpecifier(t.identifier('ExecuteOptions'), t.identifier('ExecuteOptions')),
-    ], t.stringLiteral('../client'));
-    clientTypeImport.importKind = 'type';
-    statements.push(clientTypeImport);
-    const typesImport = t.importDeclaration([
-        t.importSpecifier(t.identifier(typeName), t.identifier(typeName)),
-        ...Array.from(filterTypesUsed).map((ft) => t.importSpecifier(t.identifier(ft), t.identifier(ft))),
-    ], t.stringLiteral('../types'));
-    typesImport.importKind = 'type';
-    statements.push(typesImport);
+    statements.push(createImportDeclaration('../client', ['getClient']));
+    statements.push(createImportDeclaration('../selection', ['buildListSelectionArgs']));
+    statements.push(createImportDeclaration('../selection', ['ListSelectionConfig'], true));
     if (useCentralizedKeys) {
-        const queryKeyImport = t.importDeclaration([t.importSpecifier(t.identifier(keysName), t.identifier(keysName))], t.stringLiteral('../query-keys'));
-        statements.push(queryKeyImport);
+        statements.push(createImportDeclaration('../query-keys', [keysName]));
         if (hasRelationships) {
-            const scopeTypeImport = t.importDeclaration([
-                t.importSpecifier(t.identifier(scopeTypeName), t.identifier(scopeTypeName)),
-            ], t.stringLiteral('../query-keys'));
-            scopeTypeImport.importKind = 'type';
-            statements.push(scopeTypeImport);
+            statements.push(createImportDeclaration('../query-keys', [scopeTypeName], true));
         }
     }
-    const reExportDecl = t.exportNamedDeclaration(null, [t.exportSpecifier(t.identifier(typeName), t.identifier(typeName))], t.stringLiteral('../types'));
-    reExportDecl.exportKind = 'type';
-    statements.push(reExportDecl);
-    const queryDocConst = t.variableDeclaration('const', [
-        t.variableDeclarator(t.identifier(`${queryName}QueryDocument`), t.templateLiteral([
-            t.templateElement({ raw: '\n' + queryDocument, cooked: '\n' + queryDocument }, true),
-        ], [])),
-    ]);
-    statements.push(t.exportNamedDeclaration(queryDocConst));
-    const fieldFilters = scalarFields
-        .map((field) => {
-        const filterType = getScalarFilterType(field.type.gqlType, field.type.isArray);
-        return filterType ? { fieldName: field.name, filterType } : null;
-    })
-        .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`,
-            `${toScreamingSnake(f.name)}_DESC`,
-        ]),
-        'NATURAL',
-        'PRIMARY_KEY_ASC',
-        'PRIMARY_KEY_DESC',
-    ];
-    const orderByTypeAlias = t.tsTypeAliasDeclaration(t.identifier(orderByTypeName), null, createUnionType(orderByValues));
-    statements.push(orderByTypeAlias);
-    const variablesInterfaceBody = t.tsInterfaceBody([
-        (() => {
-            const p = t.tsPropertySignature(t.identifier('first'), t.tsTypeAnnotation(t.tsNumberKeyword()));
-            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;
-            return p;
-        })(),
-    ]);
-    const variablesInterface = t.tsInterfaceDeclaration(t.identifier(`${ucFirst(pluralName)}QueryVariables`), null, null, variablesInterfaceBody);
-    statements.push(t.exportNamedDeclaration(variablesInterface));
-    const pageInfoType = t.tsTypeLiteral([
-        t.tsPropertySignature(t.identifier('hasNextPage'), t.tsTypeAnnotation(t.tsBooleanKeyword())),
-        t.tsPropertySignature(t.identifier('hasPreviousPage'), t.tsTypeAnnotation(t.tsBooleanKeyword())),
-        t.tsPropertySignature(t.identifier('startCursor'), t.tsTypeAnnotation(t.tsUnionType([t.tsStringKeyword(), t.tsNullKeyword()]))),
-        t.tsPropertySignature(t.identifier('endCursor'), t.tsTypeAnnotation(t.tsUnionType([t.tsStringKeyword(), t.tsNullKeyword()]))),
-    ]);
-    const resultType = t.tsTypeLiteral([
-        t.tsPropertySignature(t.identifier('totalCount'), t.tsTypeAnnotation(t.tsNumberKeyword())),
-        t.tsPropertySignature(t.identifier('nodes'), t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier(typeName))))),
-        t.tsPropertySignature(t.identifier('pageInfo'), t.tsTypeAnnotation(pageInfoType)),
-    ]);
-    const resultInterfaceBody = t.tsInterfaceBody([
-        t.tsPropertySignature(t.identifier(queryName), t.tsTypeAnnotation(resultType)),
-    ]);
-    const resultInterface = t.tsInterfaceDeclaration(t.identifier(`${ucFirst(pluralName)}QueryResult`), null, null, resultInterfaceBody);
-    statements.push(t.exportNamedDeclaration(resultInterface));
+    statements.push(createImportDeclaration('../../orm/input-types', [selectTypeName, relationTypeName, filterTypeName, orderByTypeName], true));
+    statements.push(createImportDeclaration('../../orm/select-types', ['FindManyArgs', 'InferSelectResult', 'ConnectionResult', 'StrictSelect'], true));
+    // Re-exports
+    statements.push(createTypeReExport([selectTypeName, relationTypeName, filterTypeName, orderByTypeName], '../../orm/input-types'));
+    // Query key
     if (useCentralizedKeys) {
-        const queryKeyConst = t.variableDeclaration('const', [
+        const keyDecl = t.exportNamedDeclaration(t.variableDeclaration('const', [
             t.variableDeclarator(t.identifier(`${queryName}QueryKey`), t.memberExpression(t.identifier(keysName), t.identifier('list'))),
-        ]);
-        const queryKeyExport = t.exportNamedDeclaration(queryKeyConst);
-        addJSDocComment(queryKeyExport, [
+        ]));
+        addJSDocComment(keyDecl, [
             'Query key factory - re-exported from query-keys.ts',
         ]);
-        statements.push(queryKeyExport);
+        statements.push(keyDecl);
     }
     else {
-        const queryKeyArrow = t.arrowFunctionExpression([
-            typedParam('variables', t.tsTypeReference(t.identifier(`${ucFirst(pluralName)}QueryVariables`)), true),
-        ], t.tsAsExpression(t.arrayExpression([
+        const keyFn = t.arrowFunctionExpression([
+            createFunctionParam('variables', typeRef('FindManyArgs', [
+                t.tsUnknownKeyword(),
+                typeRef(filterTypeName),
+                typeRef(orderByTypeName),
+            ]), true),
+        ], asConst(t.arrayExpression([
             t.stringLiteral(typeName.toLowerCase()),
             t.stringLiteral('list'),
             t.identifier('variables'),
-        ]), t.tsTypeReference(t.identifier('const'))));
-        const queryKeyConst = t.variableDeclaration('const', [
-            t.variableDeclarator(t.identifier(`${queryName}QueryKey`), queryKeyArrow),
-        ]);
-        statements.push(t.exportNamedDeclaration(queryKeyConst));
+        ])));
+        statements.push(t.exportNamedDeclaration(t.variableDeclaration('const', [
+            t.variableDeclarator(t.identifier(`${queryName}QueryKey`), keyFn),
+        ])));
     }
-    if (reactQueryEnabled) {
-        const hookBodyStatements = [];
-        if (hasRelationships && useCentralizedKeys) {
-            hookBodyStatements.push(t.variableDeclaration('const', [
-                t.variableDeclarator(t.objectPattern([
-                    t.objectProperty(t.identifier('scope'), t.identifier('scope'), false, true),
-                    t.restElement(t.identifier('queryOptions')),
-                ]), t.logicalExpression('??', t.identifier('options'), t.objectExpression([]))),
-            ]));
-            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([], 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')),
-                ]),
-            ])));
-        }
-        else if (useCentralizedKeys) {
-            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([], 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')),
-                ]),
-            ])));
-        }
-        else {
-            hookBodyStatements.push(t.returnStatement(t.callExpression(t.identifier('useQuery'), [
-                t.objectExpression([
-                    t.objectProperty(t.identifier('queryKey'), t.callExpression(t.identifier(`${queryName}QueryKey`), [
-                        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')),
-                ]),
-            ])));
+    // Helper for query key call
+    const buildListQueryKey = (argsExpr, scopeExpr) => {
+        if (useCentralizedKeys) {
+            const args = [argsExpr];
+            if (scopeExpr)
+                args.push(scopeExpr);
+            return callExpr(t.memberExpression(t.identifier(keysName), t.identifier('list')), args);
         }
-        const hookParams = [
-            typedParam('variables', t.tsTypeReference(t.identifier(`${ucFirst(pluralName)}QueryVariables`)), true),
-        ];
-        let optionsTypeStr;
+        return callExpr(t.identifier(`${queryName}QueryKey`), [argsExpr]);
+    };
+    // Helper for findMany queryFn
+    const buildFindManyFn = () => t.arrowFunctionExpression([], buildFindManyCallExpr(singularName, 'args'));
+    // Options type builder with optional scope
+    const buildOptionsType = (queryDataType, dataType) => {
+        const base = omitType(typeRef('UseQueryOptions', [queryDataType, typeRef('Error'), dataType]), ['queryKey', 'queryFn']);
         if (hasRelationships && useCentralizedKeys) {
-            optionsTypeStr = `Omit<UseQueryOptions<${ucFirst(pluralName)}QueryResult, Error>, 'queryKey' | 'queryFn'> & { scope?: ${scopeTypeName} }`;
+            return t.tsIntersectionType([base, scopeTypeLiteral(scopeTypeName)]);
         }
-        else {
-            optionsTypeStr = `Omit<UseQueryOptions<${ucFirst(pluralName)}QueryResult, Error>, 'queryKey' | 'queryFn'>`;
-        }
-        const optionsParam = t.identifier('options');
-        optionsParam.optional = true;
-        optionsParam.typeAnnotation = t.tsTypeAnnotation(t.tsTypeReference(t.identifier(optionsTypeStr)));
-        hookParams.push(optionsParam);
-        const hookFunc = t.functionDeclaration(t.identifier(hookName), hookParams, t.blockStatement(hookBodyStatements));
-        const hookExport = t.exportNamedDeclaration(hookFunc);
+        return base;
+    };
+    // Hook
+    if (reactQueryEnabled) {
         const docLines = [
             `Query hook for fetching ${typeName} list`,
             '',
             '@example',
             '```tsx',
             `const { data, isLoading } = ${hookName}({`,
-            '  first: 10,',
-            '  filter: { name: { equalTo: "example" } },',
-            "  orderBy: ['CREATED_AT_DESC'],",
+            '  selection: {',
+            '    fields: { id: true, name: true },',
+            '    where: { name: { equalTo: "example" } },',
+            "    orderBy: ['CREATED_AT_DESC'],",
+            '    first: 10,',
+            '  },',
             '});',
             '```',
         ];
@@ -324,364 +108,381 @@ export function generateListQueryHook(table, options = {}) {
             docLines.push('');
             docLines.push('@example With scope for hierarchical cache invalidation');
             docLines.push('```tsx');
-            docLines.push(`const { data } = ${hookName}(`);
-            docLines.push('  { first: 10 },');
-            docLines.push("  { scope: { parentId: 'parent-id' } }");
-            docLines.push(');');
+            docLines.push(`const { data } = ${hookName}({`);
+            docLines.push('  selection: { fields: { id: true }, first: 10 },');
+            docLines.push("  scope: { parentId: 'parent-id' },");
+            docLines.push('});');
             docLines.push('```');
         }
-        addJSDocComment(hookExport, docLines);
-        statements.push(hookExport);
-    }
-    const fetchFuncBody = t.blockStatement([
-        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`), [
-        typedParam('variables', t.tsTypeReference(t.identifier(`${ucFirst(pluralName)}QueryVariables`)), true),
-        typedParam('options', t.tsTypeReference(t.identifier('ExecuteOptions')), true),
-    ], fetchFuncBody);
-    fetchFunc.async = true;
-    fetchFunc.returnType = t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Promise'), t.tsTypeParameterInstantiation([
-        t.tsTypeReference(t.identifier(`${ucFirst(pluralName)}QueryResult`)),
-    ])));
-    const fetchExport = t.exportNamedDeclaration(fetchFunc);
-    addJSDocComment(fetchExport, [
-        `Fetch ${typeName} list without React hooks`,
-        '',
-        '@example',
-        '```ts',
-        '// Direct fetch',
-        `const data = await fetch${ucFirst(pluralName)}Query({ first: 10 });`,
-        '',
-        '// With QueryClient',
-        'const data = await queryClient.fetchQuery({',
-        `  queryKey: ${queryName}QueryKey(variables),`,
-        `  queryFn: () => fetch${ucFirst(pluralName)}Query(variables),`,
-        '});',
-        '```',
-    ]);
-    statements.push(fetchExport);
-    if (reactQueryEnabled) {
-        const prefetchParams = [
-            typedParam('queryClient', t.tsTypeReference(t.identifier('QueryClient'))),
-            typedParam('variables', t.tsTypeReference(t.identifier(`${ucFirst(pluralName)}QueryVariables`)), true),
-        ];
-        if (hasRelationships && useCentralizedKeys) {
-            prefetchParams.push(typedParam('scope', t.tsTypeReference(t.identifier(scopeTypeName)), true));
-        }
-        prefetchParams.push(typedParam('options', t.tsTypeReference(t.identifier('ExecuteOptions')), true));
-        let prefetchQueryKeyExpr;
+        // Overload 1: with fields
+        const o1ParamType = t.tsIntersectionType([
+            t.tsTypeLiteral([
+                t.tsPropertySignature(t.identifier('selection'), t.tsTypeAnnotation(withFieldsListSelectionType(sRef(), selectTypeName, filterTypeName, orderByTypeName))),
+            ]),
+            buildOptionsType(listResultTypeAST(sRef()), typeRef('TData')),
+        ]);
+        const o1 = exportDeclareFunction(hookName, createSAndTDataTypeParams(selectTypeName, listResultTypeAST(sRef())), [createFunctionParam('params', o1ParamType)], typeRef('UseQueryResult', [typeRef('TData')]));
+        addJSDocComment(o1, docLines);
+        statements.push(o1);
+        // Implementation
+        const implSelProp = t.tsPropertySignature(t.identifier('selection'), t.tsTypeAnnotation(listSelectionConfigType(typeRef(selectTypeName), filterTypeName, orderByTypeName)));
+        const implOptionsType = (() => {
+            const base = useQueryOptionsImplType();
+            if (hasRelationships && useCentralizedKeys) {
+                return t.tsIntersectionType([base, scopeTypeLiteral(scopeTypeName)]);
+            }
+            return base;
+        })();
+        const implParamType = t.tsIntersectionType([
+            t.tsTypeLiteral([implSelProp]),
+            implOptionsType,
+        ]);
+        const body = [];
+        body.push(buildListSelectionArgsCall(selectTypeName, filterTypeName, orderByTypeName));
         if (hasRelationships && useCentralizedKeys) {
-            prefetchQueryKeyExpr = t.callExpression(t.memberExpression(t.identifier(keysName), t.identifier('list')), [t.identifier('variables'), t.identifier('scope')]);
-        }
-        else if (useCentralizedKeys) {
-            prefetchQueryKeyExpr = t.callExpression(t.memberExpression(t.identifier(keysName), t.identifier('list')), [t.identifier('variables')]);
+            body.push(destructureParamsWithSelectionAndScope('queryOptions'));
+            body.push(voidStatement('_selection'));
+            body.push(returnUseQuery(buildListQueryKey(t.identifier('args'), t.identifier('scope')), buildFindManyFn(), [spreadObj(t.identifier('queryOptions'))]));
         }
         else {
-            prefetchQueryKeyExpr = t.callExpression(t.identifier(`${queryName}QueryKey`), [t.identifier('variables')]);
+            body.push(destructureParamsWithSelection('queryOptions'));
+            body.push(voidStatement('_selection'));
+            body.push(returnUseQuery(buildListQueryKey(t.identifier('args')), buildFindManyFn(), [spreadObj(t.identifier('queryOptions'))]));
         }
-        const prefetchFuncBody = t.blockStatement([
-            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([], 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`)),
-                    ]))),
-                ]),
-            ]))),
+        statements.push(exportFunction(hookName, null, [createFunctionParam('params', implParamType)], body));
+    }
+    // Fetch function
+    const fetchFnName = `fetch${ucFirst(pluralName)}Query`;
+    {
+        // Overload 1: with fields
+        const f1ParamType = t.tsTypeLiteral([
+            t.tsPropertySignature(t.identifier('selection'), t.tsTypeAnnotation(withFieldsListSelectionType(sRef(), selectTypeName, filterTypeName, orderByTypeName))),
+        ]);
+        const f1Decl = exportAsyncDeclareFunction(fetchFnName, createSTypeParam(selectTypeName), [createFunctionParam('params', f1ParamType)], typeRef('Promise', [listResultTypeAST(sRef())]));
+        addJSDocComment(f1Decl, [
+            `Fetch ${typeName} list without React hooks`,
+            '',
+            '@example',
+            '```ts',
+            `const data = await ${fetchFnName}({`,
+            '  selection: {',
+            '    fields: { id: true },',
+            '    first: 10,',
+            '  },',
+            '});',
+            '```',
+        ]);
+        statements.push(f1Decl);
+        // Implementation
+        const fImplParamType = t.tsTypeLiteral([
+            t.tsPropertySignature(t.identifier('selection'), t.tsTypeAnnotation(listSelectionConfigType(typeRef(selectTypeName), filterTypeName, orderByTypeName))),
         ]);
-        const prefetchFunc = t.functionDeclaration(t.identifier(`prefetch${ucFirst(pluralName)}Query`), prefetchParams, prefetchFuncBody);
-        prefetchFunc.async = true;
-        prefetchFunc.returnType = t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Promise'), t.tsTypeParameterInstantiation([t.tsVoidKeyword()])));
-        const prefetchExport = t.exportNamedDeclaration(prefetchFunc);
-        addJSDocComment(prefetchExport, [
+        const fBody = [];
+        fBody.push(buildListSelectionArgsCall(selectTypeName, filterTypeName, orderByTypeName));
+        fBody.push(t.returnStatement(buildFindManyCallExpr(singularName, 'args')));
+        statements.push(exportAsyncFunction(fetchFnName, null, [createFunctionParam('params', fImplParamType)], fBody));
+    }
+    // Prefetch function
+    if (reactQueryEnabled) {
+        const prefetchFnName = `prefetch${ucFirst(pluralName)}Query`;
+        // Overload 1: with fields
+        const p1Params = [
+            t.tsPropertySignature(t.identifier('selection'), t.tsTypeAnnotation(withFieldsListSelectionType(sRef(), selectTypeName, filterTypeName, orderByTypeName))),
+        ];
+        const p1ParamType = hasRelationships && useCentralizedKeys
+            ? t.tsIntersectionType([
+                t.tsTypeLiteral(p1Params),
+                scopeTypeLiteral(scopeTypeName),
+            ])
+            : t.tsTypeLiteral(p1Params);
+        const p1Decl = exportAsyncDeclareFunction(prefetchFnName, createSTypeParam(selectTypeName), [
+            createFunctionParam('queryClient', typeRef('QueryClient')),
+            createFunctionParam('params', p1ParamType),
+        ], typeRef('Promise', [t.tsVoidKeyword()]));
+        addJSDocComment(p1Decl, [
             `Prefetch ${typeName} list for SSR or cache warming`,
             '',
             '@example',
             '```ts',
-            `await prefetch${ucFirst(pluralName)}Query(queryClient, { first: 10 });`,
+            `await ${prefetchFnName}(queryClient, { selection: { fields: { id: true }, first: 10 } });`,
             '```',
         ]);
-        statements.push(prefetchExport);
+        statements.push(p1Decl);
+        // Implementation
+        const pImplParamType = hasRelationships && useCentralizedKeys
+            ? t.tsIntersectionType([
+                t.tsTypeLiteral([
+                    t.tsPropertySignature(t.identifier('selection'), t.tsTypeAnnotation(listSelectionConfigType(typeRef(selectTypeName), filterTypeName, orderByTypeName))),
+                ]),
+                scopeTypeLiteral(scopeTypeName),
+            ])
+            : t.tsTypeLiteral([
+                t.tsPropertySignature(t.identifier('selection'), t.tsTypeAnnotation(listSelectionConfigType(typeRef(selectTypeName), filterTypeName, orderByTypeName))),
+            ]);
+        const pBody = [];
+        pBody.push(buildListSelectionArgsCall(selectTypeName, filterTypeName, orderByTypeName));
+        const queryKeyExpr = hasRelationships && useCentralizedKeys
+            ? buildListQueryKey(t.identifier('args'), t.optionalMemberExpression(t.identifier('params'), t.identifier('scope'), false, true))
+            : buildListQueryKey(t.identifier('args'));
+        const prefetchCall = callExpr(t.memberExpression(t.identifier('queryClient'), t.identifier('prefetchQuery')), [
+            t.objectExpression([
+                objectProp('queryKey', queryKeyExpr),
+                objectProp('queryFn', buildFindManyFn()),
+            ]),
+        ]);
+        pBody.push(t.expressionStatement(t.awaitExpression(prefetchCall)));
+        statements.push(exportAsyncFunction(prefetchFnName, null, [
+            createFunctionParam('queryClient', typeRef('QueryClient')),
+            createFunctionParam('params', pImplParamType),
+        ], pBody, typeRef('Promise', [t.tsVoidKeyword()])));
     }
-    const code = generateCode(statements);
     const headerText = reactQueryEnabled
         ? `List query hook for ${typeName}`
         : `List query functions for ${typeName}`;
-    const content = getGeneratedFileHeader(headerText) + '\n\n' + code;
     return {
         fileName: getListQueryFileName(table),
-        content,
+        content: generateHookFileCode(headerText, statements),
     };
 }
 export function generateSingleQueryHook(table, options = {}) {
-    // Skip tables with composite keys - they are handled as custom queries
-    if (!hasValidPrimaryKey(table)) {
+    if (!hasValidPrimaryKey(table))
         return null;
-    }
     const { reactQueryEnabled = true, useCentralizedKeys = true, hasRelationships = false, } = options;
     const { typeName, singularName } = getTableNames(table);
     const hookName = getSingleQueryHookName(table);
     const queryName = getSingleRowQueryName(table);
     const keysName = `${lcFirst(typeName)}Keys`;
     const scopeTypeName = `${typeName}Scope`;
+    const selectTypeName = `${typeName}Select`;
+    const relationTypeName = `${typeName}WithRelations`;
     const pkFields = getPrimaryKeyInfo(table);
     const pkField = pkFields[0];
-    const pkName = pkField.name;
-    const pkTsType = pkField.tsType;
-    const queryAST = buildSingleQueryAST({ table });
-    const queryDocument = printGraphQL(queryAST);
+    const pkFieldName = pkField?.name ?? 'id';
+    const pkFieldTsType = pkField?.tsType ?? 'string';
+    const pkTsType = pkFieldTsType === 'string' ? t.tsStringKeyword() : t.tsNumberKeyword();
+    const singleResultTypeAST = (sel) => singleQueryResultType(queryName, relationTypeName, sel);
     const statements = [];
+    // Imports
     if (reactQueryEnabled) {
-        const reactQueryImport = t.importDeclaration([t.importSpecifier(t.identifier('useQuery'), t.identifier('useQuery'))], t.stringLiteral('@tanstack/react-query'));
-        statements.push(reactQueryImport);
-        const reactQueryTypeImport = t.importDeclaration([
-            t.importSpecifier(t.identifier('UseQueryOptions'), t.identifier('UseQueryOptions')),
-            t.importSpecifier(t.identifier('QueryClient'), t.identifier('QueryClient')),
-        ], t.stringLiteral('@tanstack/react-query'));
-        reactQueryTypeImport.importKind = 'type';
-        statements.push(reactQueryTypeImport);
+        statements.push(createImportDeclaration('@tanstack/react-query', ['useQuery']));
+        statements.push(createImportDeclaration('@tanstack/react-query', ['UseQueryOptions', 'UseQueryResult', 'QueryClient'], true));
     }
-    const clientImport = t.importDeclaration([t.importSpecifier(t.identifier('execute'), t.identifier('execute'))], t.stringLiteral('../client'));
-    statements.push(clientImport);
-    const clientTypeImport = t.importDeclaration([
-        t.importSpecifier(t.identifier('ExecuteOptions'), t.identifier('ExecuteOptions')),
-    ], t.stringLiteral('../client'));
-    clientTypeImport.importKind = 'type';
-    statements.push(clientTypeImport);
-    const typesImport = t.importDeclaration([t.importSpecifier(t.identifier(typeName), t.identifier(typeName))], t.stringLiteral('../types'));
-    typesImport.importKind = 'type';
-    statements.push(typesImport);
+    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);
+        statements.push(createImportDeclaration('../query-keys', [keysName]));
         if (hasRelationships) {
-            const scopeTypeImport = t.importDeclaration([
-                t.importSpecifier(t.identifier(scopeTypeName), t.identifier(scopeTypeName)),
-            ], t.stringLiteral('../query-keys'));
-            scopeTypeImport.importKind = 'type';
-            statements.push(scopeTypeImport);
+            statements.push(createImportDeclaration('../query-keys', [scopeTypeName], true));
         }
     }
-    const reExportDecl = t.exportNamedDeclaration(null, [t.exportSpecifier(t.identifier(typeName), t.identifier(typeName))], t.stringLiteral('../types'));
-    reExportDecl.exportKind = 'type';
-    statements.push(reExportDecl);
-    const queryDocConst = t.variableDeclaration('const', [
-        t.variableDeclarator(t.identifier(`${queryName}QueryDocument`), t.templateLiteral([
-            t.templateElement({ raw: '\n' + queryDocument, cooked: '\n' + queryDocument }, true),
-        ], [])),
-    ]);
-    statements.push(t.exportNamedDeclaration(queryDocConst));
-    const pkTypeAnnotation = pkTsType === 'string'
-        ? t.tsStringKeyword()
-        : pkTsType === 'number'
-            ? t.tsNumberKeyword()
-            : t.tsTypeReference(t.identifier(pkTsType));
-    const variablesInterfaceBody = t.tsInterfaceBody([
-        t.tsPropertySignature(t.identifier(pkName), t.tsTypeAnnotation(pkTypeAnnotation)),
-    ]);
-    const variablesInterface = t.tsInterfaceDeclaration(t.identifier(`${ucFirst(singularName)}QueryVariables`), null, null, variablesInterfaceBody);
-    statements.push(t.exportNamedDeclaration(variablesInterface));
-    const resultInterfaceBody = t.tsInterfaceBody([
-        t.tsPropertySignature(t.identifier(queryName), t.tsTypeAnnotation(t.tsUnionType([
-            t.tsTypeReference(t.identifier(typeName)),
-            t.tsNullKeyword(),
-        ]))),
-    ]);
-    const resultInterface = t.tsInterfaceDeclaration(t.identifier(`${ucFirst(singularName)}QueryResult`), null, null, resultInterfaceBody);
-    statements.push(t.exportNamedDeclaration(resultInterface));
+    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'));
+    // Query key
     if (useCentralizedKeys) {
-        const queryKeyConst = t.variableDeclaration('const', [
+        const keyDecl = t.exportNamedDeclaration(t.variableDeclaration('const', [
             t.variableDeclarator(t.identifier(`${queryName}QueryKey`), t.memberExpression(t.identifier(keysName), t.identifier('detail'))),
-        ]);
-        const queryKeyExport = t.exportNamedDeclaration(queryKeyConst);
-        addJSDocComment(queryKeyExport, [
+        ]));
+        addJSDocComment(keyDecl, [
             'Query key factory - re-exported from query-keys.ts',
         ]);
-        statements.push(queryKeyExport);
+        statements.push(keyDecl);
     }
     else {
-        const queryKeyArrow = t.arrowFunctionExpression([typedParam(pkName, pkTypeAnnotation)], t.tsAsExpression(t.arrayExpression([
+        const keyFn = t.arrowFunctionExpression([createFunctionParam('id', pkTsType)], asConst(t.arrayExpression([
             t.stringLiteral(typeName.toLowerCase()),
             t.stringLiteral('detail'),
-            t.identifier(pkName),
-        ]), t.tsTypeReference(t.identifier('const'))));
-        const queryKeyConst = t.variableDeclaration('const', [
-            t.variableDeclarator(t.identifier(`${queryName}QueryKey`), queryKeyArrow),
-        ]);
-        statements.push(t.exportNamedDeclaration(queryKeyConst));
+            t.identifier('id'),
+        ])));
+        statements.push(t.exportNamedDeclaration(t.variableDeclaration('const', [
+            t.variableDeclarator(t.identifier(`${queryName}QueryKey`), keyFn),
+        ])));
     }
-    if (reactQueryEnabled) {
-        const hookBodyStatements = [];
-        if (hasRelationships && useCentralizedKeys) {
-            hookBodyStatements.push(t.variableDeclaration('const', [
-                t.variableDeclarator(t.objectPattern([
-                    t.objectProperty(t.identifier('scope'), t.identifier('scope'), false, true),
-                    t.restElement(t.identifier('queryOptions')),
-                ]), t.logicalExpression('??', t.identifier('options'), t.objectExpression([]))),
-            ]));
-            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('detail')), [
-                        t.memberExpression(t.identifier('variables'), t.identifier(pkName)),
-                        t.identifier('scope'),
-                    ])),
-                    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')),
-                ]),
-            ])));
+    // Helper for query key call
+    const buildDetailQueryKey = (pkExpr, scopeExpr) => {
+        if (useCentralizedKeys) {
+            const args = [pkExpr];
+            if (scopeExpr)
+                args.push(scopeExpr);
+            return callExpr(t.memberExpression(t.identifier(keysName), t.identifier('detail')), args);
         }
-        else if (useCentralizedKeys) {
-            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('detail')), [
-                        t.memberExpression(t.identifier('variables'), t.identifier(pkName)),
-                    ])),
-                    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')),
-                ]),
-            ])));
-        }
-        else {
-            hookBodyStatements.push(t.returnStatement(t.callExpression(t.identifier('useQuery'), [
-                t.objectExpression([
-                    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([], 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')),
-                ]),
-            ])));
-        }
-        const hookParams = [
-            typedParam('variables', t.tsTypeReference(t.identifier(`${ucFirst(singularName)}QueryVariables`))),
-        ];
-        let optionsTypeStr;
+        return callExpr(t.identifier(`${queryName}QueryKey`), [pkExpr]);
+    };
+    // Helper for findOne queryFn
+    const buildFindOneFn = () => t.arrowFunctionExpression([], buildFindOneCallExpr(singularName, pkFieldName, 'args'));
+    // Options type builder with optional scope
+    const buildSingleOptionsType = (queryDataType, dataType) => {
+        const base = omitType(typeRef('UseQueryOptions', [queryDataType, typeRef('Error'), dataType]), ['queryKey', 'queryFn']);
         if (hasRelationships && useCentralizedKeys) {
-            optionsTypeStr = `Omit<UseQueryOptions<${ucFirst(singularName)}QueryResult, Error>, 'queryKey' | 'queryFn'> & { scope?: ${scopeTypeName} }`;
-        }
-        else {
-            optionsTypeStr = `Omit<UseQueryOptions<${ucFirst(singularName)}QueryResult, Error>, 'queryKey' | 'queryFn'>`;
+            return t.tsIntersectionType([base, scopeTypeLiteral(scopeTypeName)]);
         }
-        const optionsParam = t.identifier('options');
-        optionsParam.optional = true;
-        optionsParam.typeAnnotation = t.tsTypeAnnotation(t.tsTypeReference(t.identifier(optionsTypeStr)));
-        hookParams.push(optionsParam);
-        const hookFunc = t.functionDeclaration(t.identifier(hookName), hookParams, t.blockStatement(hookBodyStatements));
-        const hookExport = t.exportNamedDeclaration(hookFunc);
+        return base;
+    };
+    // Hook
+    if (reactQueryEnabled) {
         const docLines = [
             `Query hook for fetching a single ${typeName}`,
             '',
             '@example',
             '```tsx',
-            `const { data, isLoading } = ${hookName}({ ${pkName}: 'some-id' });`,
+            `const { data, isLoading } = ${hookName}({`,
+            `  ${pkFieldName}: 'some-id',`,
+            '  selection: { fields: { id: true, name: true } },',
+            '});',
             '```',
         ];
         if (hasRelationships && useCentralizedKeys) {
             docLines.push('');
             docLines.push('@example With scope for hierarchical cache invalidation');
             docLines.push('```tsx');
-            docLines.push(`const { data } = ${hookName}(`);
-            docLines.push(`  { ${pkName}: 'some-id' },`);
-            docLines.push("  { scope: { parentId: 'parent-id' } }");
-            docLines.push(');');
+            docLines.push(`const { data } = ${hookName}({`);
+            docLines.push(`  ${pkFieldName}: 'some-id',`);
+            docLines.push('  selection: { fields: { id: true } },');
+            docLines.push("  scope: { parentId: 'parent-id' },");
+            docLines.push('});');
             docLines.push('```');
         }
-        addJSDocComment(hookExport, docLines);
-        statements.push(hookExport);
-    }
-    const fetchFuncBody = t.blockStatement([
-        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`), [
-        typedParam('variables', t.tsTypeReference(t.identifier(`${ucFirst(singularName)}QueryVariables`))),
-        typedParam('options', t.tsTypeReference(t.identifier('ExecuteOptions')), true),
-    ], fetchFuncBody);
-    fetchFunc.async = true;
-    fetchFunc.returnType = t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Promise'), t.tsTypeParameterInstantiation([
-        t.tsTypeReference(t.identifier(`${ucFirst(singularName)}QueryResult`)),
-    ])));
-    const fetchExport = t.exportNamedDeclaration(fetchFunc);
-    addJSDocComment(fetchExport, [
-        `Fetch a single ${typeName} without React hooks`,
-        '',
-        '@example',
-        '```ts',
-        `const data = await fetch${ucFirst(singularName)}Query({ ${pkName}: 'some-id' });`,
-        '```',
-    ]);
-    statements.push(fetchExport);
-    if (reactQueryEnabled) {
-        const prefetchParams = [
-            typedParam('queryClient', t.tsTypeReference(t.identifier('QueryClient'))),
-            typedParam('variables', t.tsTypeReference(t.identifier(`${ucFirst(singularName)}QueryVariables`))),
+        // Overload 1: with fields
+        const o1Props = [
+            t.tsPropertySignature(t.identifier(pkFieldName), t.tsTypeAnnotation(pkTsType)),
+            t.tsPropertySignature(t.identifier('selection'), t.tsTypeAnnotation(withFieldsSelectionType(sRef(), selectTypeName))),
         ];
+        const o1ParamType = t.tsIntersectionType([
+            t.tsTypeLiteral(o1Props),
+            buildSingleOptionsType(singleResultTypeAST(sRef()), typeRef('TData')),
+        ]);
+        const o1 = exportDeclareFunction(hookName, createSAndTDataTypeParams(selectTypeName, singleResultTypeAST(sRef())), [createFunctionParam('params', o1ParamType)], typeRef('UseQueryResult', [typeRef('TData')]));
+        addJSDocComment(o1, docLines);
+        statements.push(o1);
+        // Implementation
+        const implProps = [
+            t.tsPropertySignature(t.identifier(pkFieldName), t.tsTypeAnnotation(pkTsType)),
+            t.tsPropertySignature(t.identifier('selection'), t.tsTypeAnnotation(selectionConfigType(typeRef(selectTypeName)))),
+        ];
+        const implOptionsType = (() => {
+            const base = useQueryOptionsImplType();
+            if (hasRelationships && useCentralizedKeys) {
+                return t.tsIntersectionType([base, scopeTypeLiteral(scopeTypeName)]);
+            }
+            return base;
+        })();
+        const implParamType = t.tsIntersectionType([
+            t.tsTypeLiteral(implProps),
+            implOptionsType,
+        ]);
+        const body = [];
+        body.push(buildSelectionArgsCall(selectTypeName));
+        const pkMemberExpr = t.memberExpression(t.identifier('params'), t.identifier(pkFieldName));
         if (hasRelationships && useCentralizedKeys) {
-            prefetchParams.push(typedParam('scope', t.tsTypeReference(t.identifier(scopeTypeName)), true));
-        }
-        prefetchParams.push(typedParam('options', t.tsTypeReference(t.identifier('ExecuteOptions')), true));
-        let prefetchQueryKeyExpr;
-        if (hasRelationships && useCentralizedKeys) {
-            prefetchQueryKeyExpr = t.callExpression(t.memberExpression(t.identifier(keysName), t.identifier('detail')), [
-                t.memberExpression(t.identifier('variables'), t.identifier(pkName)),
-                t.identifier('scope'),
-            ]);
-        }
-        else if (useCentralizedKeys) {
-            prefetchQueryKeyExpr = t.callExpression(t.memberExpression(t.identifier(keysName), t.identifier('detail')), [t.memberExpression(t.identifier('variables'), t.identifier(pkName))]);
+            body.push(destructureParamsWithSelectionAndScope('queryOptions'));
+            body.push(voidStatement('_selection'));
+            body.push(returnUseQuery(buildDetailQueryKey(pkMemberExpr, t.identifier('scope')), buildFindOneFn(), [spreadObj(t.identifier('queryOptions'))]));
         }
         else {
-            prefetchQueryKeyExpr = t.callExpression(t.identifier(`${queryName}QueryKey`), [t.memberExpression(t.identifier('variables'), t.identifier(pkName))]);
+            body.push(destructureParamsWithSelection('queryOptions'));
+            body.push(voidStatement('_selection'));
+            body.push(returnUseQuery(buildDetailQueryKey(pkMemberExpr), buildFindOneFn(), [
+                spreadObj(t.identifier('queryOptions')),
+            ]));
         }
-        const prefetchFuncBody = t.blockStatement([
-            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([], 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`)),
-                    ]))),
-                ]),
-            ]))),
+        statements.push(exportFunction(hookName, null, [createFunctionParam('params', implParamType)], body));
+    }
+    // Fetch function
+    const fetchFnName = `fetch${ucFirst(singularName)}Query`;
+    {
+        // Overload 1: with fields
+        const f1Props = [
+            t.tsPropertySignature(t.identifier(pkFieldName), t.tsTypeAnnotation(pkTsType)),
+            t.tsPropertySignature(t.identifier('selection'), t.tsTypeAnnotation(withFieldsSelectionType(sRef(), selectTypeName))),
+        ];
+        const f1Decl = exportAsyncDeclareFunction(fetchFnName, createSTypeParam(selectTypeName), [createFunctionParam('params', t.tsTypeLiteral(f1Props))], typeRef('Promise', [singleResultTypeAST(sRef())]));
+        addJSDocComment(f1Decl, [
+            `Fetch a single ${typeName} without React hooks`,
+            '',
+            '@example',
+            '```ts',
+            `const data = await ${fetchFnName}({`,
+            `  ${pkFieldName}: 'some-id',`,
+            '  selection: { fields: { id: true } },',
+            '});',
+            '```',
         ]);
-        const prefetchFunc = t.functionDeclaration(t.identifier(`prefetch${ucFirst(singularName)}Query`), prefetchParams, prefetchFuncBody);
-        prefetchFunc.async = true;
-        prefetchFunc.returnType = t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Promise'), t.tsTypeParameterInstantiation([t.tsVoidKeyword()])));
-        const prefetchExport = t.exportNamedDeclaration(prefetchFunc);
-        addJSDocComment(prefetchExport, [
+        statements.push(f1Decl);
+        // Implementation
+        const fBody = [];
+        fBody.push(buildSelectionArgsCall(selectTypeName));
+        fBody.push(t.returnStatement(buildFindOneCallExpr(singularName, pkFieldName, 'args')));
+        const fImplProps = [
+            t.tsPropertySignature(t.identifier(pkFieldName), t.tsTypeAnnotation(pkTsType)),
+            t.tsPropertySignature(t.identifier('selection'), t.tsTypeAnnotation(selectionConfigType(typeRef(selectTypeName)))),
+        ];
+        statements.push(exportAsyncFunction(fetchFnName, null, [createFunctionParam('params', t.tsTypeLiteral(fImplProps))], fBody));
+    }
+    // Prefetch function
+    if (reactQueryEnabled) {
+        const prefetchFnName = `prefetch${ucFirst(singularName)}Query`;
+        // Overload 1: with fields
+        const p1Props = [
+            t.tsPropertySignature(t.identifier(pkFieldName), t.tsTypeAnnotation(pkTsType)),
+            t.tsPropertySignature(t.identifier('selection'), t.tsTypeAnnotation(withFieldsSelectionType(sRef(), selectTypeName))),
+        ];
+        const p1ParamType = hasRelationships && useCentralizedKeys
+            ? t.tsIntersectionType([
+                t.tsTypeLiteral(p1Props),
+                scopeTypeLiteral(scopeTypeName),
+            ])
+            : t.tsTypeLiteral(p1Props);
+        const p1Decl = exportAsyncDeclareFunction(prefetchFnName, createSTypeParam(selectTypeName), [
+            createFunctionParam('queryClient', typeRef('QueryClient')),
+            createFunctionParam('params', p1ParamType),
+        ], typeRef('Promise', [t.tsVoidKeyword()]));
+        addJSDocComment(p1Decl, [
             `Prefetch a single ${typeName} for SSR or cache warming`,
             '',
             '@example',
             '```ts',
-            `await prefetch${ucFirst(singularName)}Query(queryClient, { ${pkName}: 'some-id' });`,
+            `await ${prefetchFnName}(queryClient, { ${pkFieldName}: 'some-id', selection: { fields: { id: true } } });`,
             '```',
         ]);
-        statements.push(prefetchExport);
+        statements.push(p1Decl);
+        // Implementation
+        const pImplParamType = hasRelationships && useCentralizedKeys
+            ? t.tsIntersectionType([
+                t.tsTypeLiteral([
+                    t.tsPropertySignature(t.identifier(pkFieldName), t.tsTypeAnnotation(pkTsType)),
+                    t.tsPropertySignature(t.identifier('selection'), t.tsTypeAnnotation(selectionConfigType(typeRef(selectTypeName)))),
+                ]),
+                scopeTypeLiteral(scopeTypeName),
+            ])
+            : t.tsTypeLiteral([
+                t.tsPropertySignature(t.identifier(pkFieldName), t.tsTypeAnnotation(pkTsType)),
+                t.tsPropertySignature(t.identifier('selection'), t.tsTypeAnnotation(selectionConfigType(typeRef(selectTypeName)))),
+            ]);
+        const pBody = [];
+        pBody.push(buildSelectionArgsCall(selectTypeName));
+        const queryKeyExpr = hasRelationships && useCentralizedKeys
+            ? buildDetailQueryKey(t.memberExpression(t.identifier('params'), t.identifier(pkFieldName)), t.optionalMemberExpression(t.identifier('params'), t.identifier('scope'), false, true))
+            : buildDetailQueryKey(t.memberExpression(t.identifier('params'), t.identifier(pkFieldName)));
+        const prefetchCall = callExpr(t.memberExpression(t.identifier('queryClient'), t.identifier('prefetchQuery')), [
+            t.objectExpression([
+                objectProp('queryKey', queryKeyExpr),
+                objectProp('queryFn', buildFindOneFn()),
+            ]),
+        ]);
+        pBody.push(t.expressionStatement(t.awaitExpression(prefetchCall)));
+        statements.push(exportAsyncFunction(prefetchFnName, null, [
+            createFunctionParam('queryClient', typeRef('QueryClient')),
+            createFunctionParam('params', pImplParamType),
+        ], pBody, typeRef('Promise', [t.tsVoidKeyword()])));
     }
-    const code = generateCode(statements);
     const headerText = reactQueryEnabled
         ? `Single item query hook for ${typeName}`
         : `Single item query functions for ${typeName}`;
-    const content = getGeneratedFileHeader(headerText) + '\n\n' + code;
     return {
         fileName: getSingleQueryFileName(table),
-        content,
+        content: generateHookFileCode(headerText, statements),
     };
 }
 export function generateAllQueryHooks(tables, options = {}) {