@constructive-io/graphql-codegen 4.8.1 → 4.12.2

package/core/codegen/templates/select-types.ts

@@ -21,9 +21,10 @@ export interface PageInfo {
   endCursor?: string | null;
 }
 
-export interface FindManyArgs<TSelect, TWhere, TOrderBy> {
+export interface FindManyArgs<TSelect, TWhere, TCondition, TOrderBy> {
   select?: TSelect;
   where?: TWhere;
+  condition?: TCondition;
   orderBy?: TOrderBy[];
   first?: number;
   last?: number;
@@ -32,9 +33,10 @@ export interface FindManyArgs<TSelect, TWhere, TOrderBy> {
   offset?: number;
 }
 
-export interface FindFirstArgs<TSelect, TWhere> {
+export interface FindFirstArgs<TSelect, TWhere, TCondition> {
   select?: TSelect;
   where?: TWhere;
+  condition?: TCondition;
 }
 
 export interface CreateArgs<TSelect, TData> {

package/core/generate.js

@@ -316,18 +316,18 @@ async function generate(options = {}, internalOptions) {
             ? config.cli.toolName
             : 'app';
         if (docsConfig.readme) {
-            const readme = (0, docs_generator_1.generateReadme)(tables, allCustomOps, toolName);
+            const readme = (0, docs_generator_1.generateReadme)(tables, allCustomOps, toolName, customOperations.typeRegistry);
             filesToWrite.push({ path: node_path_1.default.posix.join('cli', readme.fileName), content: readme.content });
         }
         if (docsConfig.agents) {
-            const agents = (0, docs_generator_1.generateAgentsDocs)(tables, allCustomOps, toolName);
+            const agents = (0, docs_generator_1.generateAgentsDocs)(tables, allCustomOps, toolName, customOperations.typeRegistry);
             filesToWrite.push({ path: node_path_1.default.posix.join('cli', agents.fileName), content: agents.content });
         }
         if (docsConfig.mcp) {
-            allMcpTools.push(...(0, docs_generator_1.getCliMcpTools)(tables, allCustomOps, toolName));
+            allMcpTools.push(...(0, docs_generator_1.getCliMcpTools)(tables, allCustomOps, toolName, customOperations.typeRegistry));
         }
         if (docsConfig.skills) {
-            for (const skill of (0, docs_generator_1.generateSkills)(tables, allCustomOps, toolName, targetName)) {
+            for (const skill of (0, docs_generator_1.generateSkills)(tables, allCustomOps, toolName, targetName, customOperations.typeRegistry)) {
                 skillsToWrite.push({ path: skill.fileName, content: skill.content });
             }
         }
@@ -616,9 +616,19 @@ async function generateMulti(options) {
             const docsConfig = (0, docs_utils_1.resolveDocsConfig)(firstTargetDocsConfig);
             const { resolveBuiltinNames } = await Promise.resolve().then(() => __importStar(require('./codegen/cli')));
             const builtinNames = resolveBuiltinNames(cliTargets.map((t) => t.name), cliConfig.builtinNames);
+            // Merge all target type registries into a combined registry for docs generation
+            const combinedRegistry = new Map();
+            for (const t of cliTargets) {
+                if (t.typeRegistry) {
+                    for (const [key, value] of t.typeRegistry) {
+                        combinedRegistry.set(key, value);
+                    }
+                }
+            }
             const docsInput = {
                 toolName,
                 builtinNames,
+                registry: combinedRegistry.size > 0 ? combinedRegistry : undefined,
                 targets: cliTargets.map((t) => ({
                     name: t.name,
                     endpoint: t.endpoint,

package/esm/core/codegen/cli/arg-mapper.d.ts

@@ -1,4 +1,4 @@
 import * as t from '@babel/types';
 import type { CleanArgument } from '../../../types/schema';
-export declare function buildQuestionObject(arg: CleanArgument): t.ObjectExpression;
+export declare function buildQuestionObject(arg: CleanArgument, namePrefix?: string): t.ObjectExpression;
 export declare function buildQuestionsArray(args: CleanArgument[]): t.ArrayExpression;

package/esm/core/codegen/cli/arg-mapper.js

@@ -11,35 +11,37 @@ function resolveBaseType(typeRef) {
     }
     return typeRef;
 }
-export function buildQuestionObject(arg) {
+export function buildQuestionObject(arg, namePrefix) {
     const { inner, required } = unwrapNonNull(arg.type);
     const base = resolveBaseType(arg.type);
     const props = [];
+    const questionName = namePrefix ? `${namePrefix}.${arg.name}` : arg.name;
     if (base.kind === 'ENUM' && base.enumValues && base.enumValues.length > 0) {
         props.push(t.objectProperty(t.identifier('type'), t.stringLiteral('autocomplete')));
-        props.push(t.objectProperty(t.identifier('name'), t.stringLiteral(arg.name)));
-        props.push(t.objectProperty(t.identifier('message'), t.stringLiteral(arg.description || arg.name)));
+        props.push(t.objectProperty(t.identifier('name'), t.stringLiteral(questionName)));
+        props.push(t.objectProperty(t.identifier('message'), t.stringLiteral(arg.description || questionName)));
         props.push(t.objectProperty(t.identifier('options'), t.arrayExpression(base.enumValues.map((v) => t.stringLiteral(v)))));
     }
     else if (base.kind === 'SCALAR' && base.name === 'Boolean') {
         props.push(t.objectProperty(t.identifier('type'), t.stringLiteral('confirm')));
-        props.push(t.objectProperty(t.identifier('name'), t.stringLiteral(arg.name)));
-        props.push(t.objectProperty(t.identifier('message'), t.stringLiteral(arg.description || arg.name)));
+        props.push(t.objectProperty(t.identifier('name'), t.stringLiteral(questionName)));
+        props.push(t.objectProperty(t.identifier('message'), t.stringLiteral(arg.description || questionName)));
         props.push(t.objectProperty(t.identifier('default'), t.booleanLiteral(false)));
     }
     else if (base.kind === 'SCALAR' &&
         (base.name === 'Int' || base.name === 'Float')) {
         props.push(t.objectProperty(t.identifier('type'), t.stringLiteral('text')));
-        props.push(t.objectProperty(t.identifier('name'), t.stringLiteral(arg.name)));
-        props.push(t.objectProperty(t.identifier('message'), t.stringLiteral(arg.description || `${arg.name} (number)`)));
+        props.push(t.objectProperty(t.identifier('name'), t.stringLiteral(questionName)));
+        props.push(t.objectProperty(t.identifier('message'), t.stringLiteral(arg.description || `${questionName} (number)`)));
     }
     else if (inner.kind === 'INPUT_OBJECT' && inner.inputFields) {
+        // INPUT_OBJECT fields are flattened in buildQuestionsArray with dot-notation
         return buildInputObjectQuestion(arg.name, inner, required);
     }
     else {
         props.push(t.objectProperty(t.identifier('type'), t.stringLiteral('text')));
-        props.push(t.objectProperty(t.identifier('name'), t.stringLiteral(arg.name)));
-        props.push(t.objectProperty(t.identifier('message'), t.stringLiteral(arg.description || arg.name)));
+        props.push(t.objectProperty(t.identifier('name'), t.stringLiteral(questionName)));
+        props.push(t.objectProperty(t.identifier('message'), t.stringLiteral(arg.description || questionName)));
     }
     if (required) {
         props.push(t.objectProperty(t.identifier('required'), t.booleanLiteral(true)));
@@ -63,13 +65,15 @@ export function buildQuestionsArray(args) {
         const base = resolveBaseType(arg.type);
         const { inner } = unwrapNonNull(arg.type);
         if (inner.kind === 'INPUT_OBJECT' && inner.inputFields) {
+            // Flatten INPUT_OBJECT fields with dot-notation: e.g. input.email, input.password
             for (const field of inner.inputFields) {
-                questions.push(buildQuestionObject(field));
+                questions.push(buildQuestionObject(field, arg.name));
             }
         }
         else if (base.kind === 'INPUT_OBJECT' && base.inputFields) {
+            // Same for NON_NULL-wrapped INPUT_OBJECT
             for (const field of base.inputFields) {
-                questions.push(buildQuestionObject(field));
+                questions.push(buildQuestionObject(field, arg.name));
             }
         }
         else {

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

@@ -119,7 +119,7 @@ export function generateCustomCommand(op, options) {
     // Build the list of utils imports needed
     const utilsImports = [];
     if (hasInputObjectArg) {
-        utilsImports.push('parseMutationInput');
+        utilsImports.push('unflattenDotNotation');
     }
     if (isObjectReturn) {
         utilsImports.push('buildSelectFromPaths');
@@ -168,10 +168,11 @@ export function generateCustomCommand(op, options) {
         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
+    // reconstruct nested objects from dot-notation CLI answers.
+    // e.g. { 'input.email': 'foo', 'input.password': 'bar' } → { input: { email: 'foo', password: 'bar' } }
     if (hasInputObjectArg && op.args.length > 0) {
         bodyStatements.push(t.variableDeclaration('const', [
-            t.variableDeclarator(t.identifier('parsedAnswers'), t.callExpression(t.identifier('parseMutationInput'), [
+            t.variableDeclarator(t.identifier('parsedAnswers'), t.callExpression(t.identifier('unflattenDotNotation'), [
                 t.identifier('answers'),
             ])),
         ]));

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

@@ -1,17 +1,18 @@
-import type { CleanTable, CleanOperation } from '../../../types/schema';
+import type { CleanTable, CleanOperation, TypeRegistry } from '../../../types/schema';
 import type { GeneratedDocFile, McpTool } from '../docs-utils';
 export { resolveDocsConfig } from '../docs-utils';
 export type { GeneratedDocFile, McpTool } from '../docs-utils';
-export declare function generateReadme(tables: CleanTable[], customOperations: CleanOperation[], toolName: string): GeneratedDocFile;
-export declare function generateAgentsDocs(tables: CleanTable[], customOperations: CleanOperation[], toolName: string): GeneratedDocFile;
-export declare function getCliMcpTools(tables: CleanTable[], customOperations: CleanOperation[], toolName: string): McpTool[];
-export declare function generateSkills(tables: CleanTable[], customOperations: CleanOperation[], toolName: string, targetName: string): GeneratedDocFile[];
+export declare function generateReadme(tables: CleanTable[], customOperations: CleanOperation[], toolName: string, registry?: TypeRegistry): GeneratedDocFile;
+export declare function generateAgentsDocs(tables: CleanTable[], customOperations: CleanOperation[], toolName: string, registry?: TypeRegistry): GeneratedDocFile;
+export declare function getCliMcpTools(tables: CleanTable[], customOperations: CleanOperation[], toolName: string, registry?: TypeRegistry): McpTool[];
+export declare function generateSkills(tables: CleanTable[], customOperations: CleanOperation[], toolName: string, targetName: string, registry?: TypeRegistry): GeneratedDocFile[];
 export interface MultiTargetDocsInput {
     toolName: string;
     builtinNames: {
         auth: string;
         context: string;
     };
+    registry?: TypeRegistry;
     targets: Array<{
         name: string;
         endpoint: string;