@constructive-io/graphql-codegen 4.1.3 → 4.3.0

package/core/codegen/cli/custom-command-generator.js

@@ -79,30 +79,46 @@ function unwrapType(ref) {
     return ref;
 }
 /**
- * Build a select object expression from return-type fields.
- * If the return type has known fields, generates { field1: true, field2: true, ... }.
- * Falls back to { clientMutationId: true } for mutations without known fields.
+ * Check if the return type (after unwrapping) is an OBJECT type.
  */
-function buildSelectObject(returnType, isMutation) {
+function hasObjectReturnType(returnType) {
+    const base = unwrapType(returnType);
+    return base.kind === 'OBJECT';
+}
+/**
+ * Build a default select string from the return type's top-level scalar fields.
+ * For OBJECT return types with known fields, generates a comma-separated list
+ * of all top-level field names (e.g. 'clientMutationId,result').
+ * Falls back to 'clientMutationId' for mutations without known fields.
+ */
+function buildDefaultSelectString(returnType, isMutation) {
     const base = unwrapType(returnType);
     if (base.fields && base.fields.length > 0) {
-        return t.objectExpression(base.fields.map((f) => t.objectProperty(t.identifier(f.name), t.booleanLiteral(true))));
+        return base.fields.map((f) => f.name).join(',');
     }
-    // Fallback: all PostGraphile mutation payloads have clientMutationId
     if (isMutation) {
-        return t.objectExpression([
-            t.objectProperty(t.identifier('clientMutationId'), t.booleanLiteral(true)),
-        ]);
+        return 'clientMutationId';
     }
-    return t.objectExpression([]);
+    return '';
 }
-function buildOrmCustomCall(opKind, opName, argsExpr, selectExpr) {
-    return t.callExpression(t.memberExpression(t.callExpression(t.memberExpression(t.memberExpression(t.identifier('client'), t.identifier(opKind)), t.identifier(opName)), [
-        argsExpr,
-        t.objectExpression([
+function buildOrmCustomCall(opKind, opName, argsExpr, selectExpr, hasArgs = true) {
+    const callArgs = [];
+    if (hasArgs) {
+        // Operation has arguments: pass args as first param, select as second
+        callArgs.push(argsExpr);
+        if (selectExpr) {
+            callArgs.push(t.objectExpression([
+                t.objectProperty(t.identifier('select'), selectExpr),
+            ]));
+        }
+    }
+    else if (selectExpr) {
+        // No arguments: pass { select } as the only param (ORM signature)
+        callArgs.push(t.objectExpression([
             t.objectProperty(t.identifier('select'), selectExpr),
-        ]),
-    ]), t.identifier('execute')), []);
+        ]));
+    }
+    return t.callExpression(t.memberExpression(t.callExpression(t.memberExpression(t.memberExpression(t.identifier('client'), t.identifier(opKind)), t.identifier(opName)), callArgs), t.identifier('execute')), []);
 }
 function generateCustomCommand(op, options) {
     const commandName = (0, komoji_1.toKebabCase)(op.name);
@@ -118,13 +134,23 @@ function generateCustomCommand(op, options) {
         const base = unwrapType(arg.type);
         return base.kind === 'INPUT_OBJECT';
     });
+    // Check if return type is OBJECT (needs --select flag)
+    const isObjectReturn = hasObjectReturnType(op.returnType);
     const utilsPath = options?.executorImportPath
         ? options.executorImportPath.replace(/\/executor$/, '/utils')
         : '../utils';
     statements.push(createImportDeclaration('inquirerer', ['CLIOptions', 'Inquirerer']));
     statements.push(createImportDeclaration(executorPath, imports));
+    // Build the list of utils imports needed
+    const utilsImports = [];
     if (hasInputObjectArg) {
-        statements.push(createImportDeclaration(utilsPath, ['parseMutationInput']));
+        utilsImports.push('parseMutationInput');
+    }
+    if (isObjectReturn) {
+        utilsImports.push('buildSelectFromPaths');
+    }
+    if (utilsImports.length > 0) {
+        statements.push(createImportDeclaration(utilsPath, utilsImports));
     }
     const questionsArray = op.args.length > 0
         ? (0, arg_mapper_1.buildQuestionsArray)(op.args)
@@ -168,9 +194,22 @@ function generateCustomCommand(op, options) {
             ? t.identifier('parsedAnswers')
             : t.identifier('answers'))
         : t.objectExpression([]);
-    const selectExpr = buildSelectObject(op.returnType, op.kind === 'mutation');
+    // For OBJECT return types, generate runtime select from --select flag
+    // For scalar return types, no select is needed
+    let selectExpr;
+    if (isObjectReturn) {
+        const defaultSelect = buildDefaultSelectString(op.returnType, op.kind === 'mutation');
+        // Generate: const selectFields = buildSelectFromPaths(argv.select ?? 'defaultFields')
+        bodyStatements.push(t.variableDeclaration('const', [
+            t.variableDeclarator(t.identifier('selectFields'), t.callExpression(t.identifier('buildSelectFromPaths'), [
+                t.logicalExpression('??', t.memberExpression(t.identifier('argv'), t.identifier('select')), t.stringLiteral(defaultSelect)),
+            ])),
+        ]));
+        selectExpr = t.identifier('selectFields');
+    }
+    const hasArgs = op.args.length > 0;
     bodyStatements.push(t.variableDeclaration('const', [
-        t.variableDeclarator(t.identifier('result'), t.awaitExpression(buildOrmCustomCall(opKind, op.name, argsExpr, selectExpr))),
+        t.variableDeclarator(t.identifier('result'), t.awaitExpression(buildOrmCustomCall(opKind, op.name, argsExpr, selectExpr, hasArgs))),
     ]));
     if (options?.saveToken) {
         bodyStatements.push(t.ifStatement(t.logicalExpression('&&', t.memberExpression(t.identifier('argv'), t.identifier('saveToken')), t.identifier('result')), t.blockStatement([

package/core/codegen/cli/executor-generator.d.ts

@@ -7,5 +7,9 @@ export interface MultiTargetExecutorInput {
     endpoint: string;
     ormImportPath: string;
 }
-export declare function generateExecutorFile(toolName: string): GeneratedFile;
-export declare function generateMultiTargetExecutorFile(toolName: string, targets: MultiTargetExecutorInput[]): GeneratedFile;
+export interface ExecutorOptions {
+    /** Enable NodeHttpAdapter for *.localhost subdomain routing */
+    nodeHttpAdapter?: boolean;
+}
+export declare function generateExecutorFile(toolName: string, options?: ExecutorOptions): GeneratedFile;
+export declare function generateMultiTargetExecutorFile(toolName: string, targets: MultiTargetExecutorInput[], options?: ExecutorOptions): GeneratedFile;

package/core/codegen/cli/executor-generator.js

@@ -44,8 +44,12 @@ function createImportDeclaration(moduleSpecifier, namedImports, typeOnly = false
     decl.importKind = typeOnly ? 'type' : 'value';
     return decl;
 }
-function generateExecutorFile(toolName) {
+function generateExecutorFile(toolName, options) {
     const statements = [];
+    // Import NodeHttpAdapter for *.localhost subdomain routing
+    if (options?.nodeHttpAdapter) {
+        statements.push(createImportDeclaration('./node-fetch', ['NodeHttpAdapter']));
+    }
     statements.push(createImportDeclaration('appstash', ['createConfigStore']));
     statements.push(createImportDeclaration('../orm', ['createClient']));
     statements.push(t.variableDeclaration('const', [
@@ -98,12 +102,26 @@ function generateExecutorFile(toolName) {
                 ]))),
             ])),
         ])),
-        t.returnStatement(t.callExpression(t.identifier('createClient'), [
-            t.objectExpression([
-                t.objectProperty(t.identifier('endpoint'), t.memberExpression(t.identifier('ctx'), t.identifier('endpoint'))),
-                t.objectProperty(t.identifier('headers'), t.identifier('headers')),
+        // Build createClient config — use NodeHttpAdapter for *.localhost endpoints
+        ...(options?.nodeHttpAdapter
+            ? [
+                t.returnStatement(t.callExpression(t.identifier('createClient'), [
+                    t.objectExpression([
+                        t.objectProperty(t.identifier('adapter'), t.newExpression(t.identifier('NodeHttpAdapter'), [
+                            t.memberExpression(t.identifier('ctx'), t.identifier('endpoint')),
+                            t.identifier('headers'),
+                        ])),
+                    ]),
+                ])),
+            ]
+            : [
+                t.returnStatement(t.callExpression(t.identifier('createClient'), [
+                    t.objectExpression([
+                        t.objectProperty(t.identifier('endpoint'), t.memberExpression(t.identifier('ctx'), t.identifier('endpoint'))),
+                        t.objectProperty(t.identifier('headers'), t.identifier('headers')),
+                    ]),
+                ])),
             ]),
-        ])),
     ]);
     const getClientFunc = t.functionDeclaration(t.identifier('getClient'), [contextNameParam], getClientBody);
     statements.push(t.exportNamedDeclaration(getClientFunc));
@@ -114,8 +132,12 @@ function generateExecutorFile(toolName) {
         content: header + '\n' + code,
     };
 }
-function generateMultiTargetExecutorFile(toolName, targets) {
+function generateMultiTargetExecutorFile(toolName, targets, options) {
     const statements = [];
+    // Import NodeHttpAdapter for *.localhost subdomain routing
+    if (options?.nodeHttpAdapter) {
+        statements.push(createImportDeclaration('./node-fetch', ['NodeHttpAdapter']));
+    }
     statements.push(createImportDeclaration('appstash', ['createConfigStore']));
     for (const target of targets) {
         const aliasName = `create${target.name[0].toUpperCase()}${target.name.slice(1)}Client`;
@@ -199,12 +221,26 @@ function generateMultiTargetExecutorFile(toolName, targets) {
         ]), t.blockStatement([
             t.expressionStatement(t.assignmentExpression('=', t.identifier('endpoint'), t.logicalExpression('||', t.memberExpression(t.identifier('defaultEndpoints'), t.identifier('targetName'), true), t.stringLiteral('')))),
         ])),
-        t.returnStatement(t.callExpression(t.identifier('createFn'), [
-            t.objectExpression([
-                t.objectProperty(t.identifier('endpoint'), t.identifier('endpoint')),
-                t.objectProperty(t.identifier('headers'), t.identifier('headers')),
+        // Build createClient config — use NodeHttpAdapter for *.localhost endpoints
+        ...(options?.nodeHttpAdapter
+            ? [
+                t.returnStatement(t.callExpression(t.identifier('createFn'), [
+                    t.objectExpression([
+                        t.objectProperty(t.identifier('adapter'), t.newExpression(t.identifier('NodeHttpAdapter'), [
+                            t.identifier('endpoint'),
+                            t.identifier('headers'),
+                        ])),
+                    ]),
+                ])),
+            ]
+            : [
+                t.returnStatement(t.callExpression(t.identifier('createFn'), [
+                    t.objectExpression([
+                        t.objectProperty(t.identifier('endpoint'), t.identifier('endpoint')),
+                        t.objectProperty(t.identifier('headers'), t.identifier('headers')),
+                    ]),
+                ])),
             ]),
-        ])),
     ]);
     const getClientFunc = t.functionDeclaration(t.identifier('getClient'), [targetNameParam, contextNameParam], getClientBody);
     statements.push(t.exportNamedDeclaration(getClientFunc));

package/core/codegen/cli/index.d.ts

@@ -1,5 +1,5 @@
 import type { BuiltinNames, GraphQLSDKConfigTarget } from '../../../types/config';
-import type { CleanOperation, CleanTable } from '../../../types/schema';
+import type { CleanOperation, CleanTable, TypeRegistry } from '../../../types/schema';
 import type { GeneratedFile } from './executor-generator';
 export interface GenerateCliOptions {
     tables: CleanTable[];
@@ -8,6 +8,8 @@ export interface GenerateCliOptions {
         mutations: CleanOperation[];
     };
     config: GraphQLSDKConfigTarget;
+    /** TypeRegistry from introspection, used to check field defaults */
+    typeRegistry?: TypeRegistry;
 }
 export interface GenerateCliResult {
     files: GeneratedFile[];
@@ -30,11 +32,15 @@ export interface MultiTargetCliTarget {
         mutations: CleanOperation[];
     };
     isAuthTarget?: boolean;
+    /** TypeRegistry from introspection, used to check field defaults */
+    typeRegistry?: TypeRegistry;
 }
 export interface GenerateMultiTargetCliOptions {
     toolName: string;
     builtinNames?: BuiltinNames;
     targets: MultiTargetCliTarget[];
+    /** Enable NodeHttpAdapter for *.localhost subdomain routing */
+    nodeHttpAdapter?: boolean;
 }
 export declare function resolveBuiltinNames(targetNames: string[], userOverrides?: BuiltinNames): {
     auth: string;

package/core/codegen/cli/index.js

@@ -17,16 +17,26 @@ function generateCli(options) {
     const toolName = typeof cliConfig === 'object' && cliConfig.toolName
         ? cliConfig.toolName
         : 'app';
-    const executorFile = (0, executor_generator_1.generateExecutorFile)(toolName);
+    // Use top-level nodeHttpAdapter from config (auto-enabled for CLI by generate.ts)
+    const useNodeHttpAdapter = !!config.nodeHttpAdapter;
+    const executorFile = (0, executor_generator_1.generateExecutorFile)(toolName, {
+        nodeHttpAdapter: useNodeHttpAdapter,
+    });
     files.push(executorFile);
     const utilsFile = (0, utils_generator_1.generateUtilsFile)();
     files.push(utilsFile);
+    // Generate node HTTP adapter if configured (for *.localhost subdomain routing)
+    if (useNodeHttpAdapter) {
+        files.push((0, utils_generator_1.generateNodeFetchFile)());
+    }
     const contextFile = (0, infra_generator_1.generateContextCommand)(toolName);
     files.push(contextFile);
     const authFile = (0, infra_generator_1.generateAuthCommand)(toolName);
     files.push(authFile);
     for (const table of tables) {
-        const tableFile = (0, table_command_generator_1.generateTableCommand)(table);
+        const tableFile = (0, table_command_generator_1.generateTableCommand)(table, {
+            typeRegistry: options.typeRegistry,
+        });
         files.push(tableFile);
     }
     const allCustomOps = [
@@ -71,10 +81,16 @@ function generateMultiTargetCli(options) {
         endpoint: t.endpoint,
         ormImportPath: t.ormImportPath,
     }));
-    const executorFile = (0, executor_generator_1.generateMultiTargetExecutorFile)(toolName, executorInputs);
+    const executorFile = (0, executor_generator_1.generateMultiTargetExecutorFile)(toolName, executorInputs, {
+        nodeHttpAdapter: !!options.nodeHttpAdapter,
+    });
     files.push(executorFile);
     const utilsFile = (0, utils_generator_1.generateUtilsFile)();
     files.push(utilsFile);
+    // Generate node HTTP adapter if configured (for *.localhost subdomain routing)
+    if (options.nodeHttpAdapter) {
+        files.push((0, utils_generator_1.generateNodeFetchFile)());
+    }
     const contextFile = (0, infra_generator_1.generateMultiTargetContextCommand)(toolName, builtinNames.context, targets.map((t) => ({ name: t.name, endpoint: t.endpoint })));
     files.push(contextFile);
     const authFile = (0, infra_generator_1.generateAuthCommandWithName)(toolName, builtinNames.auth);
@@ -92,6 +108,7 @@ function generateMultiTargetCli(options) {
             const tableFile = (0, table_command_generator_1.generateTableCommand)(table, {
                 targetName: target.name,
                 executorImportPath: '../../executor',
+                typeRegistry: target.typeRegistry,
             });
             files.push(tableFile);
         }

package/core/codegen/cli/table-command-generator.d.ts

@@ -1,7 +1,9 @@
-import type { CleanTable } from '../../../types/schema';
+import type { CleanTable, TypeRegistry } from '../../../types/schema';
 import type { GeneratedFile } from './executor-generator';
 export interface TableCommandOptions {
     targetName?: string;
     executorImportPath?: string;
+    /** TypeRegistry from introspection, used to check field defaults */
+    typeRegistry?: TypeRegistry;
 }
 export declare function generateTableCommand(table: CleanTable, options?: TableCommandOptions): GeneratedFile;

package/core/codegen/cli/table-command-generator.js

@@ -38,6 +38,7 @@ const t = __importStar(require("@babel/types"));
 const komoji_1 = require("komoji");
 const babel_ast_1 = require("../babel-ast");
 const utils_1 = require("../utils");
+const utils_2 = require("../utils");
 function createImportDeclaration(moduleSpecifier, namedImports, typeOnly = false) {
     const specifiers = namedImports.map((name) => t.importSpecifier(t.identifier(name), t.identifier(name)));
     const decl = t.importDeclaration(specifiers, t.stringLiteral(moduleSpecifier));
@@ -183,7 +184,46 @@ function buildGetHandler(table, targetName) {
         t.tryStatement(t.blockStatement(tryBody), buildErrorCatch('Record not found.')),
     ]), false, true);
 }
-function buildMutationHandler(table, operation, targetName) {
+/**
+ * Get the set of field names that have defaults in the create input type.
+ * Looks up the CreateXInput -> inner input type (e.g. DatabaseInput) in the
+ * TypeRegistry and checks each field's defaultValue from introspection.
+ */
+function getFieldsWithDefaults(table, typeRegistry) {
+    const fieldsWithDefaults = new Set();
+    if (!typeRegistry)
+        return fieldsWithDefaults;
+    // Look up the CreateXInput type (e.g. CreateDatabaseInput)
+    const createInputTypeName = (0, utils_2.getCreateInputTypeName)(table);
+    const createInputType = typeRegistry.get(createInputTypeName);
+    if (!createInputType?.inputFields)
+        return fieldsWithDefaults;
+    // The CreateXInput has an inner field (e.g. "database" of type DatabaseInput)
+    // Find the inner input type that contains the actual field definitions
+    for (const inputField of createInputType.inputFields) {
+        // The inner field's type name is the actual input type (e.g. DatabaseInput)
+        const innerTypeName = inputField.type.name
+            || inputField.type.ofType?.name
+            || inputField.type.ofType?.ofType?.name;
+        if (!innerTypeName)
+            continue;
+        const innerType = typeRegistry.get(innerTypeName);
+        if (!innerType?.inputFields)
+            continue;
+        // Check each field in the inner input type for defaultValue
+        for (const field of innerType.inputFields) {
+            if (field.defaultValue !== undefined) {
+                fieldsWithDefaults.add(field.name);
+            }
+            // Also check if the field is NOT wrapped in NON_NULL (nullable = has default or is optional)
+            if (field.type.kind !== 'NON_NULL') {
+                fieldsWithDefaults.add(field.name);
+            }
+        }
+    }
+    return fieldsWithDefaults;
+}
+function buildMutationHandler(table, operation, targetName, typeRegistry) {
     const { singularName } = (0, utils_1.getTableNames)(table);
     const pkFields = (0, utils_1.getPrimaryKeyInfo)(table);
     const pk = pkFields[0];
@@ -191,6 +231,8 @@ function buildMutationHandler(table, operation, targetName) {
         f.name !== 'nodeId' &&
         f.name !== 'createdAt' &&
         f.name !== 'updatedAt');
+    // Get fields that have defaults from introspection (for create operations)
+    const fieldsWithDefaults = getFieldsWithDefaults(table, typeRegistry);
     const questions = [];
     if (operation === 'update' || operation === 'delete') {
         questions.push(t.objectExpression([
@@ -202,11 +244,14 @@ function buildMutationHandler(table, operation, targetName) {
     }
     if (operation !== 'delete') {
         for (const field of editableFields) {
+            // For create: field is required only if it has no default value
+            // For update: all fields are optional (user only updates what they want)
+            const isRequired = operation === 'create' && !fieldsWithDefaults.has(field.name);
             questions.push(t.objectExpression([
                 t.objectProperty(t.identifier('type'), t.stringLiteral('text')),
                 t.objectProperty(t.identifier('name'), t.stringLiteral(field.name)),
                 t.objectProperty(t.identifier('message'), t.stringLiteral(field.name)),
-                t.objectProperty(t.identifier('required'), t.booleanLiteral(operation === 'create')),
+                t.objectProperty(t.identifier('required'), t.booleanLiteral(isRequired)),
             ]));
         }
     }
@@ -365,9 +410,9 @@ function generateTableCommand(table, options) {
     const tn = options?.targetName;
     statements.push(buildListHandler(table, tn));
     statements.push(buildGetHandler(table, tn));
-    statements.push(buildMutationHandler(table, 'create', tn));
-    statements.push(buildMutationHandler(table, 'update', tn));
-    statements.push(buildMutationHandler(table, 'delete', tn));
+    statements.push(buildMutationHandler(table, 'create', tn, options?.typeRegistry));
+    statements.push(buildMutationHandler(table, 'update', tn, options?.typeRegistry));
+    statements.push(buildMutationHandler(table, 'delete', tn, options?.typeRegistry));
     const header = (0, utils_1.getGeneratedFileHeader)(`CLI commands for ${table.name}`);
     const code = (0, babel_ast_1.generateCode)(statements);
     return {

package/core/codegen/cli/utils-generator.d.ts

@@ -8,3 +8,11 @@ import type { GeneratedFile } from './executor-generator';
  * and mutation input parsing.
  */
 export declare function generateUtilsFile(): GeneratedFile;
+/**
+ * Generate a node-fetch.ts file with NodeHttpAdapter for CLI.
+ *
+ * Provides a GraphQLAdapter implementation using node:http/node:https
+ * instead of the Fetch API. This cleanly handles *.localhost subdomain
+ * routing (DNS resolution + Host header) without any global patching.
+ */
+export declare function generateNodeFetchFile(): GeneratedFile;

package/core/codegen/cli/utils-generator.js

@@ -34,6 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateUtilsFile = generateUtilsFile;
+exports.generateNodeFetchFile = generateNodeFetchFile;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const utils_1 = require("../utils");
@@ -76,3 +77,16 @@ function generateUtilsFile() {
         content: readTemplateFile('cli-utils.ts', 'CLI utility functions for type coercion and input handling'),
     };
 }
+/**
+ * Generate a node-fetch.ts file with NodeHttpAdapter for CLI.
+ *
+ * Provides a GraphQLAdapter implementation using node:http/node:https
+ * instead of the Fetch API. This cleanly handles *.localhost subdomain
+ * routing (DNS resolution + Host header) without any global patching.
+ */
+function generateNodeFetchFile() {
+    return {
+        fileName: 'node-fetch.ts',
+        content: readTemplateFile('node-fetch.ts', 'Node HTTP adapter for localhost subdomain routing'),
+    };
+}

package/core/codegen/orm/client-generator.d.ts

@@ -25,4 +25,6 @@ export declare function generateSelectTypesFile(): GeneratedClientFile;
 /**
  * Generate the main index.ts with createClient factory
  */
-export declare function generateCreateClientFile(tables: CleanTable[], hasCustomQueries: boolean, hasCustomMutations: boolean): GeneratedClientFile;
+export declare function generateCreateClientFile(tables: CleanTable[], hasCustomQueries: boolean, hasCustomMutations: boolean, options?: {
+    nodeHttpAdapter?: boolean;
+}): GeneratedClientFile;

package/core/codegen/orm/client-generator.js

@@ -114,7 +114,7 @@ function createImportDeclaration(moduleSpecifier, namedImports, typeOnly = false
 /**
  * Generate the main index.ts with createClient factory
  */
-function generateCreateClientFile(tables, hasCustomQueries, hasCustomMutations) {
+function generateCreateClientFile(tables, hasCustomQueries, hasCustomMutations, options) {
     const statements = [];
     // Add imports
     // Import OrmClient (value) and OrmClientConfig (type) separately
@@ -156,6 +156,12 @@ function generateCreateClientFile(tables, hasCustomQueries, hasCustomMutations)
     statements.push(t.exportAllDeclaration(t.stringLiteral('./select-types')));
     // Re-export all models
     statements.push(t.exportAllDeclaration(t.stringLiteral('./models')));
+    // Re-export NodeHttpAdapter when enabled (for use in any Node.js application)
+    if (options?.nodeHttpAdapter) {
+        statements.push(t.exportNamedDeclaration(null, [
+            t.exportSpecifier(t.identifier('NodeHttpAdapter'), t.identifier('NodeHttpAdapter')),
+        ], t.stringLiteral('./node-fetch')));
+    }
     // Re-export custom operations
     if (hasCustomQueries) {
         statements.push(t.exportNamedDeclaration(null, [

package/core/codegen/orm/index.js

@@ -91,7 +91,7 @@ function generateOrm(options) {
     const typesBarrel = (0, barrel_1.generateTypesBarrel)(useSharedTypes);
     files.push({ path: typesBarrel.fileName, content: typesBarrel.content });
     // 7. Generate main index.ts with createClient
-    const indexFile = (0, client_generator_1.generateCreateClientFile)(tables, hasCustomQueries, hasCustomMutations);
+    const indexFile = (0, client_generator_1.generateCreateClientFile)(tables, hasCustomQueries, hasCustomMutations, { nodeHttpAdapter: !!options.config.nodeHttpAdapter });
     files.push({ path: indexFile.fileName, content: indexFile.content });
     return {
         files,

package/core/codegen/templates/cli-utils.ts

@@ -3,13 +3,15 @@
  *
  * This is the RUNTIME code that gets copied to generated output.
  * Provides helpers for CLI commands: type coercion (string CLI args -> proper
- * GraphQL types), field filtering (strip extra minimist fields), and
- * mutation input parsing.
+ * GraphQL types), field filtering (strip extra minimist fields),
+ * mutation input parsing, and select field parsing.
  *
  * NOTE: This file is read at codegen time and written to output.
  * Any changes here will affect all generated CLI utils.
  */
 
+import objectPath from 'nested-obj';
+
 export type FieldType =
   | 'string'
   | 'boolean'
@@ -142,3 +144,58 @@ export function parseMutationInput(
   }
   return answers;
 }
+
+/**
+ * Build a select object from a comma-separated list of dot-notation paths.
+ * Uses `nested-obj` to parse paths like 'clientMutationId,result.accessToken,result.userId'
+ * into the nested structure expected by the ORM:
+ *
+ *   { clientMutationId: true, result: { select: { accessToken: true, userId: true } } }
+ *
+ * Paths without dots set the key to `true` (scalar select).
+ * Paths with dots create nested `{ select: { ... } }` wrappers, matching the
+ * ORM's expected structure for OBJECT sub-fields (e.g. `SignUpPayloadSelect.result`).
+ *
+ * @param paths - Comma-separated dot-notation field paths (e.g. 'clientMutationId,result.accessToken')
+ * @returns The nested select object for the ORM
+ */
+export function buildSelectFromPaths(
+  paths: string,
+): Record<string, unknown> {
+  const result: Record<string, unknown> = {};
+  const trimmedPaths = paths
+    .split(',')
+    .map((p) => p.trim())
+    .filter((p) => p.length > 0);
+
+  for (const path of trimmedPaths) {
+    if (!path.includes('.')) {
+      // Simple scalar field: clientMutationId -> { clientMutationId: true }
+      result[path] = true;
+    } else {
+      // Nested path: result.accessToken -> { result: { select: { accessToken: true } } }
+      // Convert dot-notation to ORM's { select: { ... } } nesting pattern
+      const parts = path.split('.');
+      let current = result;
+      for (let i = 0; i < parts.length; i++) {
+        const part = parts[i];
+        if (i === parts.length - 1) {
+          // Leaf node: set to true
+          objectPath.set(current, part, true);
+        } else {
+          // Intermediate node: ensure { select: { ... } } wrapper exists
+          if (!current[part] || typeof current[part] !== 'object') {
+            current[part] = { select: {} };
+          }
+          const wrapper = current[part] as Record<string, unknown>;
+          if (!wrapper.select || typeof wrapper.select !== 'object') {
+            wrapper.select = {};
+          }
+          current = wrapper.select as Record<string, unknown>;
+        }
+      }
+    }
+  }
+
+  return result;
+}