@constructive-io/graphql-codegen 4.1.1 → 4.1.3

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

@@ -69,8 +69,40 @@ function buildErrorCatch(errorMessage) {
         t.expressionStatement(t.callExpression(t.memberExpression(t.identifier('process'), t.identifier('exit')), [t.numericLiteral(1)])),
     ]));
 }
-function buildOrmCustomCall(opKind, opName, argsExpr) {
-    return t.callExpression(t.memberExpression(t.callExpression(t.memberExpression(t.memberExpression(t.identifier('client'), t.identifier(opKind)), t.identifier(opName)), [argsExpr]), t.identifier('execute')), []);
+/**
+ * Unwrap NON_NULL / LIST wrappers to get the underlying named type.
+ */
+function unwrapType(ref) {
+    if ((ref.kind === 'NON_NULL' || ref.kind === 'LIST') && ref.ofType) {
+        return unwrapType(ref.ofType);
+    }
+    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.
+ */
+function buildSelectObject(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))));
+    }
+    // Fallback: all PostGraphile mutation payloads have clientMutationId
+    if (isMutation) {
+        return t.objectExpression([
+            t.objectProperty(t.identifier('clientMutationId'), t.booleanLiteral(true)),
+        ]);
+    }
+    return t.objectExpression([]);
+}
+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([
+            t.objectProperty(t.identifier('select'), selectExpr),
+        ]),
+    ]), t.identifier('execute')), []);
 }
 function generateCustomCommand(op, options) {
     const commandName = (0, komoji_1.toKebabCase)(op.name);
@@ -81,8 +113,19 @@ function generateCustomCommand(op, options) {
     if (options?.saveToken) {
         imports.push('getStore');
     }
+    // Check if any argument is an INPUT_OBJECT (i.e. takes JSON input like { input: SomeInput })
+    const hasInputObjectArg = op.args.some((arg) => {
+        const base = unwrapType(arg.type);
+        return base.kind === 'INPUT_OBJECT';
+    });
+    const utilsPath = options?.executorImportPath
+        ? options.executorImportPath.replace(/\/executor$/, '/utils')
+        : '../utils';
     statements.push(createImportDeclaration('inquirerer', ['CLIOptions', 'Inquirerer']));
     statements.push(createImportDeclaration(executorPath, imports));
+    if (hasInputObjectArg) {
+        statements.push(createImportDeclaration(utilsPath, ['parseMutationInput']));
+    }
     const questionsArray = op.args.length > 0
         ? (0, arg_mapper_1.buildQuestionsArray)(op.args)
         : t.arrayExpression([]);
@@ -111,11 +154,23 @@ function generateCustomCommand(op, options) {
     bodyStatements.push(t.variableDeclaration('const', [
         t.variableDeclarator(t.identifier('client'), t.callExpression(t.identifier('getClient'), getClientArgs)),
     ]));
+    // For mutations with INPUT_OBJECT args (like `input: SignUpInput`),
+    // parse JSON strings from CLI into proper objects
+    if (hasInputObjectArg && op.args.length > 0) {
+        bodyStatements.push(t.variableDeclaration('const', [
+            t.variableDeclarator(t.identifier('parsedAnswers'), t.callExpression(t.identifier('parseMutationInput'), [
+                t.identifier('answers'),
+            ])),
+        ]));
+    }
     const argsExpr = op.args.length > 0
-        ? t.identifier('answers')
+        ? (hasInputObjectArg
+            ? t.identifier('parsedAnswers')
+            : t.identifier('answers'))
         : t.objectExpression([]);
+    const selectExpr = buildSelectObject(op.returnType, op.kind === 'mutation');
     bodyStatements.push(t.variableDeclaration('const', [
-        t.variableDeclarator(t.identifier('result'), t.awaitExpression(buildOrmCustomCall(opKind, op.name, argsExpr))),
+        t.variableDeclarator(t.identifier('result'), t.awaitExpression(buildOrmCustomCall(opKind, op.name, argsExpr, selectExpr))),
     ]));
     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/index.d.ts

@@ -50,4 +50,5 @@ export { generateReadme, generateAgentsDocs, getCliMcpTools, generateSkills, gen
 export type { MultiTargetDocsInput } from './docs-generator';
 export { resolveDocsConfig } from '../docs-utils';
 export type { GeneratedDocFile, McpTool } from '../docs-utils';
+export { generateUtilsFile } from './utils-generator';
 export type { GeneratedFile, MultiTargetExecutorInput } from './executor-generator';

package/core/codegen/cli/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveDocsConfig = exports.generateMultiTargetSkills = exports.getMultiTargetCliMcpTools = exports.generateMultiTargetAgentsDocs = exports.generateMultiTargetReadme = exports.generateSkills = exports.getCliMcpTools = exports.generateAgentsDocs = exports.generateReadme = exports.generateAuthCommandWithName = exports.generateMultiTargetContextCommand = exports.generateAuthCommand = exports.generateContextCommand = exports.generateMultiTargetCommandMap = exports.generateCommandMap = exports.generateCustomCommand = exports.generateTableCommand = exports.generateMultiTargetExecutorFile = exports.generateExecutorFile = void 0;
+exports.generateUtilsFile = exports.resolveDocsConfig = exports.generateMultiTargetSkills = exports.getMultiTargetCliMcpTools = exports.generateMultiTargetAgentsDocs = exports.generateMultiTargetReadme = exports.generateSkills = exports.getCliMcpTools = exports.generateAgentsDocs = exports.generateReadme = exports.generateAuthCommandWithName = exports.generateMultiTargetContextCommand = exports.generateAuthCommand = exports.generateContextCommand = exports.generateMultiTargetCommandMap = exports.generateCommandMap = exports.generateCustomCommand = exports.generateTableCommand = exports.generateMultiTargetExecutorFile = exports.generateExecutorFile = void 0;
 exports.generateCli = generateCli;
 exports.resolveBuiltinNames = resolveBuiltinNames;
 exports.generateMultiTargetCli = generateMultiTargetCli;
@@ -9,6 +9,7 @@ const custom_command_generator_1 = require("./custom-command-generator");
 const executor_generator_1 = require("./executor-generator");
 const infra_generator_1 = require("./infra-generator");
 const table_command_generator_1 = require("./table-command-generator");
+const utils_generator_1 = require("./utils-generator");
 function generateCli(options) {
     const { tables, customOperations, config } = options;
     const files = [];
@@ -18,6 +19,8 @@ function generateCli(options) {
         : 'app';
     const executorFile = (0, executor_generator_1.generateExecutorFile)(toolName);
     files.push(executorFile);
+    const utilsFile = (0, utils_generator_1.generateUtilsFile)();
+    files.push(utilsFile);
     const contextFile = (0, infra_generator_1.generateContextCommand)(toolName);
     files.push(contextFile);
     const authFile = (0, infra_generator_1.generateAuthCommand)(toolName);
@@ -42,7 +45,7 @@ function generateCli(options) {
             tables: tables.length,
             customQueries: customOperations?.queries.length ?? 0,
             customMutations: customOperations?.mutations.length ?? 0,
-            infraFiles: 3,
+            infraFiles: 4,
             totalFiles: files.length,
         },
     };
@@ -70,6 +73,8 @@ function generateMultiTargetCli(options) {
     }));
     const executorFile = (0, executor_generator_1.generateMultiTargetExecutorFile)(toolName, executorInputs);
     files.push(executorFile);
+    const utilsFile = (0, utils_generator_1.generateUtilsFile)();
+    files.push(utilsFile);
     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);
@@ -120,7 +125,7 @@ function generateMultiTargetCli(options) {
             tables: totalTables,
             customQueries: totalQueries,
             customMutations: totalMutations,
-            infraFiles: 3,
+            infraFiles: 4,
             totalFiles: files.length,
         },
     };
@@ -151,3 +156,5 @@ Object.defineProperty(exports, "getMultiTargetCliMcpTools", { enumerable: true,
 Object.defineProperty(exports, "generateMultiTargetSkills", { enumerable: true, get: function () { return docs_generator_1.generateMultiTargetSkills; } });
 var docs_utils_1 = require("../docs-utils");
 Object.defineProperty(exports, "resolveDocsConfig", { enumerable: true, get: function () { return docs_utils_1.resolveDocsConfig; } });
+var utils_generator_2 = require("./utils-generator");
+Object.defineProperty(exports, "generateUtilsFile", { enumerable: true, get: function () { return utils_generator_2.generateUtilsFile; } });

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

@@ -695,7 +695,7 @@ function buildSetTokenHandler() {
         t.expressionStatement(t.callExpression(t.memberExpression(t.identifier('store'), t.identifier('setCredentials')), [
             t.memberExpression(t.identifier('current'), t.identifier('name')),
             t.objectExpression([
-                t.objectProperty(t.identifier('token'), t.callExpression(t.memberExpression(t.callExpression(t.memberExpression(t.identifier('String'), t.identifier('call')), [
+                t.objectProperty(t.identifier('token'), t.callExpression(t.memberExpression(t.callExpression(t.identifier('String'), [
                     t.logicalExpression('||', t.identifier('tokenValue'), t.stringLiteral('')),
                 ]), t.identifier('trim')), [])),
             ]),

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

@@ -44,6 +44,40 @@ function createImportDeclaration(moduleSpecifier, namedImports, typeOnly = false
     decl.importKind = typeOnly ? 'type' : 'value';
     return decl;
 }
+/**
+ * Build a field schema object that maps field names to their GraphQL types.
+ * This is used at runtime for type coercion (string CLI args → proper types).
+ * e.g., { name: 'string', isActive: 'boolean', position: 'int', status: 'enum' }
+ */
+function buildFieldSchemaObject(table) {
+    const fields = (0, utils_1.getScalarFields)(table);
+    return t.objectExpression(fields.map((f) => {
+        const gqlType = f.type.gqlType.replace(/!/g, '');
+        let schemaType;
+        switch (gqlType) {
+            case 'Boolean':
+                schemaType = 'boolean';
+                break;
+            case 'Int':
+            case 'BigInt':
+                schemaType = 'int';
+                break;
+            case 'Float':
+                schemaType = 'float';
+                break;
+            case 'JSON':
+            case 'GeoJSON':
+                schemaType = 'json';
+                break;
+            case 'UUID':
+                schemaType = 'uuid';
+                break;
+            default:
+                schemaType = 'string';
+        }
+        return t.objectProperty(t.identifier(f.name), t.stringLiteral(schemaType));
+    }));
+}
 function buildSelectObject(table) {
     const fields = (0, utils_1.getScalarFields)(table);
     return t.objectExpression(fields.map((f) => t.objectProperty(t.identifier(f.name), t.booleanLiteral(true))));
@@ -183,36 +217,52 @@ function buildMutationHandler(table, operation, targetName) {
         : buildSelectObject(table);
     let ormArgs;
     if (operation === 'create') {
-        const dataProps = editableFields.map((f) => t.objectProperty(t.identifier(f.name), t.memberExpression(t.identifier('answers'), t.identifier(f.name)), false, true));
+        const dataProps = editableFields.map((f) => t.objectProperty(t.identifier(f.name), t.memberExpression(t.identifier('cleanedData'), t.identifier(f.name)), false, true));
         ormArgs = t.objectExpression([
             t.objectProperty(t.identifier('data'), t.objectExpression(dataProps)),
             t.objectProperty(t.identifier('select'), selectObj),
         ]);
     }
     else if (operation === 'update') {
-        const dataProps = editableFields.map((f) => t.objectProperty(t.identifier(f.name), t.memberExpression(t.identifier('answers'), t.identifier(f.name)), false, true));
+        const dataProps = editableFields.map((f) => t.objectProperty(t.identifier(f.name), t.memberExpression(t.identifier('cleanedData'), t.identifier(f.name)), false, true));
         ormArgs = t.objectExpression([
-            t.objectProperty(t.identifier(pk.name), t.memberExpression(t.identifier('answers'), t.identifier(pk.name))),
+            t.objectProperty(t.identifier('where'), t.objectExpression([
+                t.objectProperty(t.identifier(pk.name), t.tsAsExpression(t.memberExpression(t.identifier('answers'), t.identifier(pk.name)), t.tsStringKeyword())),
+            ])),
             t.objectProperty(t.identifier('data'), t.objectExpression(dataProps)),
             t.objectProperty(t.identifier('select'), selectObj),
         ]);
     }
     else {
         ormArgs = t.objectExpression([
-            t.objectProperty(t.identifier(pk.name), t.memberExpression(t.identifier('answers'), t.identifier(pk.name))),
+            t.objectProperty(t.identifier('where'), t.objectExpression([
+                t.objectProperty(t.identifier(pk.name), t.tsAsExpression(t.memberExpression(t.identifier('answers'), t.identifier(pk.name)), t.tsStringKeyword())),
+            ])),
             t.objectProperty(t.identifier('select'), selectObj),
         ]);
     }
     const tryBody = [
         t.variableDeclaration('const', [
-            t.variableDeclarator(t.identifier('answers'), t.awaitExpression(t.callExpression(t.memberExpression(t.identifier('prompter'), t.identifier('prompt')), [t.identifier('argv'), t.arrayExpression(questions)]))),
+            t.variableDeclarator(t.identifier('rawAnswers'), t.awaitExpression(t.callExpression(t.memberExpression(t.identifier('prompter'), t.identifier('prompt')), [t.identifier('argv'), t.arrayExpression(questions)]))),
         ]),
-        buildGetClientStatement(targetName),
         t.variableDeclaration('const', [
-            t.variableDeclarator(t.identifier('result'), t.awaitExpression(buildOrmCall(singularName, operation, ormArgs))),
+            t.variableDeclarator(t.identifier('answers'), t.callExpression(t.identifier('coerceAnswers'), [
+                t.identifier('rawAnswers'),
+                t.identifier('fieldSchema'),
+            ])),
         ]),
-        buildJsonLog(t.identifier('result')),
     ];
+    if (operation !== 'delete') {
+        tryBody.push(t.variableDeclaration('const', [
+            t.variableDeclarator(t.identifier('cleanedData'), t.callExpression(t.identifier('stripUndefined'), [
+                t.identifier('answers'),
+                t.identifier('fieldSchema'),
+            ])),
+        ]));
+    }
+    tryBody.push(buildGetClientStatement(targetName), t.variableDeclaration('const', [
+        t.variableDeclarator(t.identifier('result'), t.awaitExpression(buildOrmCall(singularName, operation, ormArgs))),
+    ]), buildJsonLog(t.identifier('result')));
     const argvParam = t.identifier('argv');
     argvParam.typeAnnotation = buildArgvType();
     const prompterParam = t.identifier('prompter');
@@ -233,6 +283,12 @@ function generateTableCommand(table, options) {
         'extractFirst',
     ]));
     statements.push(createImportDeclaration(executorPath, ['getClient']));
+    const utilsPath = options?.targetName ? '../../utils' : '../utils';
+    statements.push(createImportDeclaration(utilsPath, ['coerceAnswers', 'stripUndefined']));
+    // Generate field schema for type coercion
+    statements.push(t.variableDeclaration('const', [
+        t.variableDeclarator(t.identifier('fieldSchema'), buildFieldSchemaObject(table)),
+    ]));
     const subcommands = ['list', 'get', 'create', 'update', 'delete'];
     const usageLines = [
         '',

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

@@ -0,0 +1,10 @@
+import type { GeneratedFile } from './executor-generator';
+/**
+ * Generate a utils.ts file with runtime helpers for CLI commands.
+ * Reads from the templates directory (cli-utils.ts) for proper type checking.
+ *
+ * Includes type coercion (string CLI args -> proper GraphQL types),
+ * field filtering (strip extra minimist fields like _ and tty),
+ * and mutation input parsing.
+ */
+export declare function generateUtilsFile(): GeneratedFile;

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

@@ -0,0 +1,78 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateUtilsFile = generateUtilsFile;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const utils_1 = require("../utils");
+/**
+ * Find the cli-utils template file path.
+ * Templates are at ../templates/ relative to this file in both src/ and dist/.
+ */
+function findTemplateFile(templateName) {
+    const templatePath = path.join(__dirname, '../templates', templateName);
+    if (fs.existsSync(templatePath)) {
+        return templatePath;
+    }
+    throw new Error(`Could not find template file: ${templateName}. ` +
+        `Searched in: ${templatePath}`);
+}
+/**
+ * Read a template file and replace the header with generated file header.
+ * Follows the same pattern as ORM client-generator.ts readTemplateFile().
+ */
+function readTemplateFile(templateName, description) {
+    const templatePath = findTemplateFile(templateName);
+    let content = fs.readFileSync(templatePath, 'utf-8');
+    // Replace the source file header comment with the generated file header
+    // Match the header pattern used in template files
+    const headerPattern = /\/\*\*[\s\S]*?\* NOTE: This file is read at codegen time and written to output\.[\s\S]*?\*\/\n*/;
+    content = content.replace(headerPattern, (0, utils_1.getGeneratedFileHeader)(description) + '\n');
+    return content;
+}
+/**
+ * Generate a utils.ts file with runtime helpers for CLI commands.
+ * Reads from the templates directory (cli-utils.ts) for proper type checking.
+ *
+ * Includes type coercion (string CLI args -> proper GraphQL types),
+ * field filtering (strip extra minimist fields like _ and tty),
+ * and mutation input parsing.
+ */
+function generateUtilsFile() {
+    return {
+        fileName: 'utils.ts',
+        content: readTemplateFile('cli-utils.ts', 'CLI utility functions for type coercion and input handling'),
+    };
+}

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

@@ -0,0 +1,144 @@
+/**
+ * CLI utility functions for type coercion and input handling
+ *
+ * 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.
+ *
+ * NOTE: This file is read at codegen time and written to output.
+ * Any changes here will affect all generated CLI utils.
+ */
+
+export type FieldType =
+  | 'string'
+  | 'boolean'
+  | 'int'
+  | 'float'
+  | 'json'
+  | 'uuid'
+  | 'enum';
+
+export interface FieldSchema {
+  [fieldName: string]: FieldType;
+}
+
+/**
+ * Coerce CLI string arguments to their proper GraphQL types based on a field schema.
+ * CLI args always arrive as strings from minimist, but GraphQL expects
+ * Boolean, Int, Float, JSON, etc.
+ */
+export function coerceAnswers(
+  answers: Record<string, unknown>,
+  schema: FieldSchema,
+): Record<string, unknown> {
+  const result: Record<string, unknown> = { ...answers };
+
+  for (const [key, value] of Object.entries(result)) {
+    const fieldType = schema[key];
+    if (!fieldType || value === undefined || value === null) continue;
+
+    const strValue = String(value);
+
+    // Empty strings become undefined for non-string types
+    if (strValue === '' && fieldType !== 'string') {
+      result[key] = undefined;
+      continue;
+    }
+
+    switch (fieldType) {
+      case 'boolean':
+        if (typeof value === 'boolean') break;
+        result[key] =
+          strValue === 'true' || strValue === '1' || strValue === 'yes';
+        break;
+      case 'int':
+        if (typeof value === 'number') break;
+        {
+          const parsed = parseInt(strValue, 10);
+          result[key] = isNaN(parsed) ? undefined : parsed;
+        }
+        break;
+      case 'float':
+        if (typeof value === 'number') break;
+        {
+          const parsed = parseFloat(strValue);
+          result[key] = isNaN(parsed) ? undefined : parsed;
+        }
+        break;
+      case 'json':
+        if (typeof value === 'object') break;
+        if (strValue === '') {
+          result[key] = undefined;
+        } else {
+          try {
+            result[key] = JSON.parse(strValue);
+          } catch {
+            result[key] = undefined;
+          }
+        }
+        break;
+      case 'uuid':
+        // Empty UUIDs become undefined
+        if (strValue === '') {
+          result[key] = undefined;
+        }
+        break;
+      case 'enum':
+        // Enums stay as strings but empty ones become undefined
+        if (strValue === '') {
+          result[key] = undefined;
+        }
+        break;
+      default:
+        // String type: empty strings also become undefined to avoid
+        // sending empty strings for optional fields
+        if (strValue === '') {
+          result[key] = undefined;
+        }
+        break;
+    }
+  }
+
+  return result;
+}
+
+/**
+ * Strip undefined values and filter to only schema-defined keys.
+ * This removes extra fields injected by minimist (like _, tty, etc.)
+ * and any fields that were coerced to undefined.
+ */
+export function stripUndefined(
+  obj: Record<string, unknown>,
+  schema?: FieldSchema,
+): Record<string, unknown> {
+  const result: Record<string, unknown> = {};
+  const allowedKeys = schema ? new Set(Object.keys(schema)) : null;
+
+  for (const [key, value] of Object.entries(obj)) {
+    if (value === undefined) continue;
+    if (allowedKeys && !allowedKeys.has(key)) continue;
+    result[key] = value;
+  }
+
+  return result;
+}
+
+/**
+ * Parse mutation input from CLI.
+ * Custom mutation commands receive an `input` field as a JSON string
+ * from the CLI prompt. This parses it into a proper object.
+ */
+export function parseMutationInput(
+  answers: Record<string, unknown>,
+): Record<string, unknown> {
+  if (typeof answers.input === 'string') {
+    try {
+      const parsed = JSON.parse(answers.input);
+      return { ...answers, input: parsed };
+    } catch {
+      return answers;
+    }
+  }
+  return answers;
+}

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

@@ -33,8 +33,40 @@ function buildErrorCatch(errorMessage) {
         t.expressionStatement(t.callExpression(t.memberExpression(t.identifier('process'), t.identifier('exit')), [t.numericLiteral(1)])),
     ]));
 }
-function buildOrmCustomCall(opKind, opName, argsExpr) {
-    return t.callExpression(t.memberExpression(t.callExpression(t.memberExpression(t.memberExpression(t.identifier('client'), t.identifier(opKind)), t.identifier(opName)), [argsExpr]), t.identifier('execute')), []);
+/**
+ * Unwrap NON_NULL / LIST wrappers to get the underlying named type.
+ */
+function unwrapType(ref) {
+    if ((ref.kind === 'NON_NULL' || ref.kind === 'LIST') && ref.ofType) {
+        return unwrapType(ref.ofType);
+    }
+    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.
+ */
+function buildSelectObject(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))));
+    }
+    // Fallback: all PostGraphile mutation payloads have clientMutationId
+    if (isMutation) {
+        return t.objectExpression([
+            t.objectProperty(t.identifier('clientMutationId'), t.booleanLiteral(true)),
+        ]);
+    }
+    return t.objectExpression([]);
+}
+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([
+            t.objectProperty(t.identifier('select'), selectExpr),
+        ]),
+    ]), t.identifier('execute')), []);
 }
 export function generateCustomCommand(op, options) {
     const commandName = toKebabCase(op.name);
@@ -45,8 +77,19 @@ export function generateCustomCommand(op, options) {
     if (options?.saveToken) {
         imports.push('getStore');
     }
+    // Check if any argument is an INPUT_OBJECT (i.e. takes JSON input like { input: SomeInput })
+    const hasInputObjectArg = op.args.some((arg) => {
+        const base = unwrapType(arg.type);
+        return base.kind === 'INPUT_OBJECT';
+    });
+    const utilsPath = options?.executorImportPath
+        ? options.executorImportPath.replace(/\/executor$/, '/utils')
+        : '../utils';
     statements.push(createImportDeclaration('inquirerer', ['CLIOptions', 'Inquirerer']));
     statements.push(createImportDeclaration(executorPath, imports));
+    if (hasInputObjectArg) {
+        statements.push(createImportDeclaration(utilsPath, ['parseMutationInput']));
+    }
     const questionsArray = op.args.length > 0
         ? buildQuestionsArray(op.args)
         : t.arrayExpression([]);
@@ -75,11 +118,23 @@ export function generateCustomCommand(op, options) {
     bodyStatements.push(t.variableDeclaration('const', [
         t.variableDeclarator(t.identifier('client'), t.callExpression(t.identifier('getClient'), getClientArgs)),
     ]));
+    // For mutations with INPUT_OBJECT args (like `input: SignUpInput`),
+    // parse JSON strings from CLI into proper objects
+    if (hasInputObjectArg && op.args.length > 0) {
+        bodyStatements.push(t.variableDeclaration('const', [
+            t.variableDeclarator(t.identifier('parsedAnswers'), t.callExpression(t.identifier('parseMutationInput'), [
+                t.identifier('answers'),
+            ])),
+        ]));
+    }
     const argsExpr = op.args.length > 0
-        ? t.identifier('answers')
+        ? (hasInputObjectArg
+            ? t.identifier('parsedAnswers')
+            : t.identifier('answers'))
         : t.objectExpression([]);
+    const selectExpr = buildSelectObject(op.returnType, op.kind === 'mutation');
     bodyStatements.push(t.variableDeclaration('const', [
-        t.variableDeclarator(t.identifier('result'), t.awaitExpression(buildOrmCustomCall(opKind, op.name, argsExpr))),
+        t.variableDeclarator(t.identifier('result'), t.awaitExpression(buildOrmCustomCall(opKind, op.name, argsExpr, selectExpr))),
     ]));
     if (options?.saveToken) {
         bodyStatements.push(t.ifStatement(t.logicalExpression('&&', t.memberExpression(t.identifier('argv'), t.identifier('saveToken')), t.identifier('result')), t.blockStatement([

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

@@ -50,4 +50,5 @@ export { generateReadme, generateAgentsDocs, getCliMcpTools, generateSkills, gen
 export type { MultiTargetDocsInput } from './docs-generator';
 export { resolveDocsConfig } from '../docs-utils';
 export type { GeneratedDocFile, McpTool } from '../docs-utils';
+export { generateUtilsFile } from './utils-generator';
 export type { GeneratedFile, MultiTargetExecutorInput } from './executor-generator';

package/esm/core/codegen/cli/index.js

@@ -3,6 +3,7 @@ import { generateCustomCommand } from './custom-command-generator';
 import { generateExecutorFile, generateMultiTargetExecutorFile } from './executor-generator';
 import { generateAuthCommand, generateAuthCommandWithName, generateContextCommand, generateMultiTargetContextCommand, } from './infra-generator';
 import { generateTableCommand } from './table-command-generator';
+import { generateUtilsFile } from './utils-generator';
 export function generateCli(options) {
     const { tables, customOperations, config } = options;
     const files = [];
@@ -12,6 +13,8 @@ export function generateCli(options) {
         : 'app';
     const executorFile = generateExecutorFile(toolName);
     files.push(executorFile);
+    const utilsFile = generateUtilsFile();
+    files.push(utilsFile);
     const contextFile = generateContextCommand(toolName);
     files.push(contextFile);
     const authFile = generateAuthCommand(toolName);
@@ -36,7 +39,7 @@ export function generateCli(options) {
             tables: tables.length,
             customQueries: customOperations?.queries.length ?? 0,
             customMutations: customOperations?.mutations.length ?? 0,
-            infraFiles: 3,
+            infraFiles: 4,
             totalFiles: files.length,
         },
     };
@@ -64,6 +67,8 @@ export function generateMultiTargetCli(options) {
     }));
     const executorFile = generateMultiTargetExecutorFile(toolName, executorInputs);
     files.push(executorFile);
+    const utilsFile = generateUtilsFile();
+    files.push(utilsFile);
     const contextFile = generateMultiTargetContextCommand(toolName, builtinNames.context, targets.map((t) => ({ name: t.name, endpoint: t.endpoint })));
     files.push(contextFile);
     const authFile = generateAuthCommandWithName(toolName, builtinNames.auth);
@@ -114,7 +119,7 @@ export function generateMultiTargetCli(options) {
             tables: totalTables,
             customQueries: totalQueries,
             customMutations: totalMutations,
-            infraFiles: 3,
+            infraFiles: 4,
             totalFiles: files.length,
         },
     };
@@ -126,3 +131,4 @@ export { generateCommandMap, generateMultiTargetCommandMap } from './command-map
 export { generateContextCommand, generateAuthCommand, generateMultiTargetContextCommand, generateAuthCommandWithName, } from './infra-generator';
 export { generateReadme, generateAgentsDocs, getCliMcpTools, generateSkills, generateMultiTargetReadme, generateMultiTargetAgentsDocs, getMultiTargetCliMcpTools, generateMultiTargetSkills, } from './docs-generator';
 export { resolveDocsConfig } from '../docs-utils';
+export { generateUtilsFile } from './utils-generator';

package/esm/core/codegen/cli/infra-generator.js

@@ -656,7 +656,7 @@ function buildSetTokenHandler() {
         t.expressionStatement(t.callExpression(t.memberExpression(t.identifier('store'), t.identifier('setCredentials')), [
             t.memberExpression(t.identifier('current'), t.identifier('name')),
             t.objectExpression([
-                t.objectProperty(t.identifier('token'), t.callExpression(t.memberExpression(t.callExpression(t.memberExpression(t.identifier('String'), t.identifier('call')), [
+                t.objectProperty(t.identifier('token'), t.callExpression(t.memberExpression(t.callExpression(t.identifier('String'), [
                     t.logicalExpression('||', t.identifier('tokenValue'), t.stringLiteral('')),
                 ]), t.identifier('trim')), [])),
             ]),

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

@@ -8,6 +8,40 @@ function createImportDeclaration(moduleSpecifier, namedImports, typeOnly = false
     decl.importKind = typeOnly ? 'type' : 'value';
     return decl;
 }
+/**
+ * Build a field schema object that maps field names to their GraphQL types.
+ * This is used at runtime for type coercion (string CLI args → proper types).
+ * e.g., { name: 'string', isActive: 'boolean', position: 'int', status: 'enum' }
+ */
+function buildFieldSchemaObject(table) {
+    const fields = getScalarFields(table);
+    return t.objectExpression(fields.map((f) => {
+        const gqlType = f.type.gqlType.replace(/!/g, '');
+        let schemaType;
+        switch (gqlType) {
+            case 'Boolean':
+                schemaType = 'boolean';
+                break;
+            case 'Int':
+            case 'BigInt':
+                schemaType = 'int';
+                break;
+            case 'Float':
+                schemaType = 'float';
+                break;
+            case 'JSON':
+            case 'GeoJSON':
+                schemaType = 'json';
+                break;
+            case 'UUID':
+                schemaType = 'uuid';
+                break;
+            default:
+                schemaType = 'string';
+        }
+        return t.objectProperty(t.identifier(f.name), t.stringLiteral(schemaType));
+    }));
+}
 function buildSelectObject(table) {
     const fields = getScalarFields(table);
     return t.objectExpression(fields.map((f) => t.objectProperty(t.identifier(f.name), t.booleanLiteral(true))));
@@ -147,36 +181,52 @@ function buildMutationHandler(table, operation, targetName) {
         : buildSelectObject(table);
     let ormArgs;
     if (operation === 'create') {
-        const dataProps = editableFields.map((f) => t.objectProperty(t.identifier(f.name), t.memberExpression(t.identifier('answers'), t.identifier(f.name)), false, true));
+        const dataProps = editableFields.map((f) => t.objectProperty(t.identifier(f.name), t.memberExpression(t.identifier('cleanedData'), t.identifier(f.name)), false, true));
         ormArgs = t.objectExpression([
             t.objectProperty(t.identifier('data'), t.objectExpression(dataProps)),
             t.objectProperty(t.identifier('select'), selectObj),
         ]);
     }
     else if (operation === 'update') {
-        const dataProps = editableFields.map((f) => t.objectProperty(t.identifier(f.name), t.memberExpression(t.identifier('answers'), t.identifier(f.name)), false, true));
+        const dataProps = editableFields.map((f) => t.objectProperty(t.identifier(f.name), t.memberExpression(t.identifier('cleanedData'), t.identifier(f.name)), false, true));
         ormArgs = t.objectExpression([
-            t.objectProperty(t.identifier(pk.name), t.memberExpression(t.identifier('answers'), t.identifier(pk.name))),
+            t.objectProperty(t.identifier('where'), t.objectExpression([
+                t.objectProperty(t.identifier(pk.name), t.tsAsExpression(t.memberExpression(t.identifier('answers'), t.identifier(pk.name)), t.tsStringKeyword())),
+            ])),
             t.objectProperty(t.identifier('data'), t.objectExpression(dataProps)),
             t.objectProperty(t.identifier('select'), selectObj),
         ]);
     }
     else {
         ormArgs = t.objectExpression([
-            t.objectProperty(t.identifier(pk.name), t.memberExpression(t.identifier('answers'), t.identifier(pk.name))),
+            t.objectProperty(t.identifier('where'), t.objectExpression([
+                t.objectProperty(t.identifier(pk.name), t.tsAsExpression(t.memberExpression(t.identifier('answers'), t.identifier(pk.name)), t.tsStringKeyword())),
+            ])),
             t.objectProperty(t.identifier('select'), selectObj),
         ]);
     }
     const tryBody = [
         t.variableDeclaration('const', [
-            t.variableDeclarator(t.identifier('answers'), t.awaitExpression(t.callExpression(t.memberExpression(t.identifier('prompter'), t.identifier('prompt')), [t.identifier('argv'), t.arrayExpression(questions)]))),
+            t.variableDeclarator(t.identifier('rawAnswers'), t.awaitExpression(t.callExpression(t.memberExpression(t.identifier('prompter'), t.identifier('prompt')), [t.identifier('argv'), t.arrayExpression(questions)]))),
         ]),
-        buildGetClientStatement(targetName),
         t.variableDeclaration('const', [
-            t.variableDeclarator(t.identifier('result'), t.awaitExpression(buildOrmCall(singularName, operation, ormArgs))),
+            t.variableDeclarator(t.identifier('answers'), t.callExpression(t.identifier('coerceAnswers'), [
+                t.identifier('rawAnswers'),
+                t.identifier('fieldSchema'),
+            ])),
         ]),
-        buildJsonLog(t.identifier('result')),
     ];
+    if (operation !== 'delete') {
+        tryBody.push(t.variableDeclaration('const', [
+            t.variableDeclarator(t.identifier('cleanedData'), t.callExpression(t.identifier('stripUndefined'), [
+                t.identifier('answers'),
+                t.identifier('fieldSchema'),
+            ])),
+        ]));
+    }
+    tryBody.push(buildGetClientStatement(targetName), t.variableDeclaration('const', [
+        t.variableDeclarator(t.identifier('result'), t.awaitExpression(buildOrmCall(singularName, operation, ormArgs))),
+    ]), buildJsonLog(t.identifier('result')));
     const argvParam = t.identifier('argv');
     argvParam.typeAnnotation = buildArgvType();
     const prompterParam = t.identifier('prompter');
@@ -197,6 +247,12 @@ export function generateTableCommand(table, options) {
         'extractFirst',
     ]));
     statements.push(createImportDeclaration(executorPath, ['getClient']));
+    const utilsPath = options?.targetName ? '../../utils' : '../utils';
+    statements.push(createImportDeclaration(utilsPath, ['coerceAnswers', 'stripUndefined']));
+    // Generate field schema for type coercion
+    statements.push(t.variableDeclaration('const', [
+        t.variableDeclarator(t.identifier('fieldSchema'), buildFieldSchemaObject(table)),
+    ]));
     const subcommands = ['list', 'get', 'create', 'update', 'delete'];
     const usageLines = [
         '',

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

@@ -0,0 +1,10 @@
+import type { GeneratedFile } from './executor-generator';
+/**
+ * Generate a utils.ts file with runtime helpers for CLI commands.
+ * Reads from the templates directory (cli-utils.ts) for proper type checking.
+ *
+ * Includes type coercion (string CLI args -> proper GraphQL types),
+ * field filtering (strip extra minimist fields like _ and tty),
+ * and mutation input parsing.
+ */
+export declare function generateUtilsFile(): GeneratedFile;

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

@@ -0,0 +1,42 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import { getGeneratedFileHeader } from '../utils';
+/**
+ * Find the cli-utils template file path.
+ * Templates are at ../templates/ relative to this file in both src/ and dist/.
+ */
+function findTemplateFile(templateName) {
+    const templatePath = path.join(__dirname, '../templates', templateName);
+    if (fs.existsSync(templatePath)) {
+        return templatePath;
+    }
+    throw new Error(`Could not find template file: ${templateName}. ` +
+        `Searched in: ${templatePath}`);
+}
+/**
+ * Read a template file and replace the header with generated file header.
+ * Follows the same pattern as ORM client-generator.ts readTemplateFile().
+ */
+function readTemplateFile(templateName, description) {
+    const templatePath = findTemplateFile(templateName);
+    let content = fs.readFileSync(templatePath, 'utf-8');
+    // Replace the source file header comment with the generated file header
+    // Match the header pattern used in template files
+    const headerPattern = /\/\*\*[\s\S]*?\* NOTE: This file is read at codegen time and written to output\.[\s\S]*?\*\/\n*/;
+    content = content.replace(headerPattern, getGeneratedFileHeader(description) + '\n');
+    return content;
+}
+/**
+ * Generate a utils.ts file with runtime helpers for CLI commands.
+ * Reads from the templates directory (cli-utils.ts) for proper type checking.
+ *
+ * Includes type coercion (string CLI args -> proper GraphQL types),
+ * field filtering (strip extra minimist fields like _ and tty),
+ * and mutation input parsing.
+ */
+export function generateUtilsFile() {
+    return {
+        fileName: 'utils.ts',
+        content: readTemplateFile('cli-utils.ts', 'CLI utility functions for type coercion and input handling'),
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/graphql-codegen",
-  "version": "4.1.1",
+  "version": "4.1.3",
   "description": "GraphQL SDK generator for Constructive databases with React Query hooks",
   "keywords": [
     "graphql",
@@ -100,5 +100,5 @@
     "tsx": "^4.21.0",
     "typescript": "^5.9.3"
   },
-  "gitHead": "921594a77964d3467261c70fed1d529eddabb549"
+  "gitHead": "f80e2e5e112cab91eac53e61c5b257f4ac88efb2"
 }