@constructive-io/graphql-codegen 4.1.2 → 4.2.0

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

@@ -69,8 +69,46 @@ 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;
+}
+/**
+ * Check if the return type (after unwrapping) is an OBJECT type.
+ */
+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 base.fields.map((f) => f.name).join(',');
+    }
+    if (isMutation) {
+        return 'clientMutationId';
+    }
+    return '';
+}
+function buildOrmCustomCall(opKind, opName, argsExpr, selectExpr) {
+    const callArgs = [argsExpr];
+    if (selectExpr) {
+        callArgs.push(t.objectExpression([
+            t.objectProperty(t.identifier('select'), selectExpr),
+        ]));
+    }
+    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);
@@ -81,8 +119,29 @@ 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';
+    });
+    // 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) {
+        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)
         : t.arrayExpression([]);
@@ -111,11 +170,35 @@ 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([]);
+    // 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');
+    }
     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/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;
+}

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

@@ -33,8 +33,46 @@ 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;
+}
+/**
+ * Check if the return type (after unwrapping) is an OBJECT type.
+ */
+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 base.fields.map((f) => f.name).join(',');
+    }
+    if (isMutation) {
+        return 'clientMutationId';
+    }
+    return '';
+}
+function buildOrmCustomCall(opKind, opName, argsExpr, selectExpr) {
+    const callArgs = [argsExpr];
+    if (selectExpr) {
+        callArgs.push(t.objectExpression([
+            t.objectProperty(t.identifier('select'), selectExpr),
+        ]));
+    }
+    return t.callExpression(t.memberExpression(t.callExpression(t.memberExpression(t.memberExpression(t.identifier('client'), t.identifier(opKind)), t.identifier(opName)), callArgs), t.identifier('execute')), []);
 }
 export function generateCustomCommand(op, options) {
     const commandName = toKebabCase(op.name);
@@ -45,8 +83,29 @@ 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';
+    });
+    // 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) {
+        utilsImports.push('parseMutationInput');
+    }
+    if (isObjectReturn) {
+        utilsImports.push('buildSelectFromPaths');
+    }
+    if (utilsImports.length > 0) {
+        statements.push(createImportDeclaration(utilsPath, utilsImports));
+    }
     const questionsArray = op.args.length > 0
         ? buildQuestionsArray(op.args)
         : t.arrayExpression([]);
@@ -75,11 +134,35 @@ 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([]);
+    // 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');
+    }
     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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/graphql-codegen",
-  "version": "4.1.2",
+  "version": "4.2.0",
   "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": "f6fa9972bcbf6ffaa6340c514462e7a6d0cb4426"
+  "gitHead": "b4e199d40e7495f25bafb6e8d318e731bd19b32c"
 }