@constructive-io/graphql-codegen 4.12.2 → 4.13.1

package/core/codegen/orm/input-types-generator.js

@@ -1062,9 +1062,9 @@ function buildTableCrudTypeNames(tables) {
 /**
  * Generate custom input type statements from TypeRegistry
  */
-function generateCustomInputTypes(typeRegistry, usedInputTypes, tableCrudTypes, comments = true) {
+function generateCustomInputTypes(typeRegistry, usedInputTypes, tableCrudTypes, comments = true, alreadyGeneratedTypes) {
     const statements = [];
-    const generatedTypes = new Set();
+    const generatedTypes = new Set(alreadyGeneratedTypes ?? []);
     const typesToGenerate = new Set(Array.from(usedInputTypes));
     // Filter out types we've already generated (exact matches for table CRUD types only)
     if (tableCrudTypes) {
@@ -1334,7 +1334,8 @@ function collectConditionExtraInputTypes(tables, typeRegistry) {
 /**
  * Generate comprehensive input-types.ts file using Babel AST
  */
-function generateInputTypesFile(typeRegistry, usedInputTypes, tables, usedPayloadTypes, comments = true) {
+function generateInputTypesFile(typeRegistry, usedInputTypes, tables, usedPayloadTypes, comments = true, options) {
+    const conditionEnabled = options?.condition !== false;
     const statements = [];
     const tablesList = tables ?? [];
     const hasTables = tablesList.length > 0;
@@ -1361,7 +1362,9 @@ function generateInputTypesFile(typeRegistry, usedInputTypes, tables, usedPayloa
         // 4b. Table condition types (simple equality filter)
         // Pass typeRegistry to merge plugin-injected condition fields
         // (e.g., vectorEmbedding from VectorSearchPlugin)
-        statements.push(...generateTableConditionTypes(tablesList, typeRegistry));
+        if (conditionEnabled) {
+            statements.push(...generateTableConditionTypes(tablesList, typeRegistry));
+        }
         // 5. OrderBy types
         // Pass typeRegistry to merge plugin-injected orderBy values
         // (e.g., EMBEDDING_DISTANCE_ASC/DESC from VectorSearchPlugin)
@@ -1375,14 +1378,19 @@ function generateInputTypesFile(typeRegistry, usedInputTypes, tables, usedPayloa
     // 7. Custom input types from TypeRegistry
     // Also include any extra types referenced by plugin-injected condition fields
     const mergedUsedInputTypes = new Set(usedInputTypes);
-    if (hasTables) {
+    if (hasTables && conditionEnabled) {
         const conditionExtraTypes = collectConditionExtraInputTypes(tablesList, typeRegistry);
         for (const typeName of conditionExtraTypes) {
             mergedUsedInputTypes.add(typeName);
         }
     }
     const tableCrudTypes = tables ? buildTableCrudTypeNames(tables) : undefined;
-    statements.push(...generateCustomInputTypes(typeRegistry, mergedUsedInputTypes, tableCrudTypes, comments));
+    // Pass customScalarTypes + enumTypes as already-generated to avoid duplicate declarations
+    const alreadyGenerated = new Set([
+        ...customScalarTypes,
+        ...enumTypes,
+    ]);
+    statements.push(...generateCustomInputTypes(typeRegistry, mergedUsedInputTypes, tableCrudTypes, comments, alreadyGenerated));
     // 8. Payload/return types for custom operations
     if (usedPayloadTypes && usedPayloadTypes.size > 0) {
         const alreadyGeneratedTypes = new Set();

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

@@ -5,5 +5,9 @@ export interface GeneratedModelFile {
     modelName: string;
     tableName: string;
 }
-export declare function generateModelFile(table: CleanTable, _useSharedTypes: boolean): GeneratedModelFile;
-export declare function generateAllModelFiles(tables: CleanTable[], useSharedTypes: boolean): GeneratedModelFile[];
+export declare function generateModelFile(table: CleanTable, _useSharedTypes: boolean, options?: {
+    condition?: boolean;
+}): GeneratedModelFile;
+export declare function generateAllModelFiles(tables: CleanTable[], useSharedTypes: boolean, options?: {
+    condition?: boolean;
+}): GeneratedModelFile[];

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

@@ -102,7 +102,8 @@ function strictSelectGuard(selectTypeName) {
         t.tsTypeReference(t.identifier(selectTypeName)),
     ]));
 }
-function generateModelFile(table, _useSharedTypes) {
+function generateModelFile(table, _useSharedTypes, options) {
+    const conditionEnabled = options?.condition !== false;
     const { typeName, singularName, pluralName } = (0, utils_1.getTableNames)(table);
     const modelName = `${typeName}Model`;
     const baseFileName = (0, utils_1.lcFirst)(typeName);
@@ -111,7 +112,7 @@ function generateModelFile(table, _useSharedTypes) {
     const selectTypeName = `${typeName}Select`;
     const relationTypeName = `${typeName}WithRelations`;
     const whereTypeName = (0, utils_1.getFilterTypeName)(table);
-    const conditionTypeName = `${typeName}Condition`;
+    const conditionTypeName = conditionEnabled ? `${typeName}Condition` : undefined;
     const orderByTypeName = (0, utils_1.getOrderByTypeName)(table);
     const createInputTypeName = `Create${typeName}Input`;
     const updateInputTypeName = `Update${typeName}Input`;
@@ -146,17 +147,18 @@ function generateModelFile(table, _useSharedTypes) {
         'InferSelectResult',
         'StrictSelect',
     ], true));
-    statements.push(createImportDeclaration('../input-types', [
+    const inputTypeImports = [
         typeName,
         relationTypeName,
         selectTypeName,
         whereTypeName,
-        conditionTypeName,
+        ...(conditionTypeName ? [conditionTypeName] : []),
         orderByTypeName,
         createInputTypeName,
         updateInputTypeName,
         patchTypeName,
-    ], true));
+    ];
+    statements.push(createImportDeclaration('../input-types', inputTypeImports, true));
     statements.push(createImportDeclaration('../input-types', ['connectionFieldsMap']));
     const classBody = [];
     // Constructor
@@ -170,12 +172,15 @@ function generateModelFile(table, _useSharedTypes) {
     const pkTsType = () => tsTypeFromPrimitive(pkField.tsType);
     // ── findMany ───────────────────────────────────────────────────────────
     {
-        const argsType = (sel) => t.tsTypeReference(t.identifier('FindManyArgs'), t.tsTypeParameterInstantiation([
-            sel,
-            t.tsTypeReference(t.identifier(whereTypeName)),
-            t.tsTypeReference(t.identifier(conditionTypeName)),
-            t.tsTypeReference(t.identifier(orderByTypeName)),
-        ]));
+        const findManyTypeArgs = [
+            (sel) => sel,
+            () => t.tsTypeReference(t.identifier(whereTypeName)),
+            ...(conditionTypeName
+                ? [() => t.tsTypeReference(t.identifier(conditionTypeName))]
+                : []),
+            () => t.tsTypeReference(t.identifier(orderByTypeName)),
+        ];
+        const argsType = (sel) => t.tsTypeReference(t.identifier('FindManyArgs'), t.tsTypeParameterInstantiation(findManyTypeArgs.map(fn => fn(sel))));
         const retType = (sel) => t.tsTypeAnnotation(t.tsTypeReference(t.identifier('QueryBuilder'), t.tsTypeParameterInstantiation([
             t.tsTypeLiteral([
                 t.tsPropertySignature(t.identifier(pluralQueryName), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('ConnectionResult'), t.tsTypeParameterInstantiation([
@@ -193,37 +198,47 @@ function generateModelFile(table, _useSharedTypes) {
             strictSelectGuard(selectTypeName),
         ]));
         const selectExpr = t.memberExpression(t.identifier('args'), t.identifier('select'));
+        const findManyObjProps = [
+            t.objectProperty(t.identifier('where'), t.optionalMemberExpression(t.identifier('args'), t.identifier('where'), false, true)),
+            ...(conditionTypeName
+                ? [
+                    t.objectProperty(t.identifier('condition'), t.optionalMemberExpression(t.identifier('args'), t.identifier('condition'), false, true)),
+                ]
+                : []),
+            t.objectProperty(t.identifier('orderBy'), t.tsAsExpression(t.optionalMemberExpression(t.identifier('args'), t.identifier('orderBy'), false, true), t.tsUnionType([
+                t.tsArrayType(t.tsStringKeyword()),
+                t.tsUndefinedKeyword(),
+            ]))),
+            t.objectProperty(t.identifier('first'), t.optionalMemberExpression(t.identifier('args'), t.identifier('first'), false, true)),
+            t.objectProperty(t.identifier('last'), t.optionalMemberExpression(t.identifier('args'), t.identifier('last'), false, true)),
+            t.objectProperty(t.identifier('after'), t.optionalMemberExpression(t.identifier('args'), t.identifier('after'), false, true)),
+            t.objectProperty(t.identifier('before'), t.optionalMemberExpression(t.identifier('args'), t.identifier('before'), false, true)),
+            t.objectProperty(t.identifier('offset'), t.optionalMemberExpression(t.identifier('args'), t.identifier('offset'), false, true)),
+        ];
         const bodyArgs = [
             t.stringLiteral(typeName),
             t.stringLiteral(pluralQueryName),
             selectExpr,
-            t.objectExpression([
-                t.objectProperty(t.identifier('where'), t.optionalMemberExpression(t.identifier('args'), t.identifier('where'), false, true)),
-                t.objectProperty(t.identifier('condition'), t.optionalMemberExpression(t.identifier('args'), t.identifier('condition'), false, true)),
-                t.objectProperty(t.identifier('orderBy'), t.tsAsExpression(t.optionalMemberExpression(t.identifier('args'), t.identifier('orderBy'), false, true), t.tsUnionType([
-                    t.tsArrayType(t.tsStringKeyword()),
-                    t.tsUndefinedKeyword(),
-                ]))),
-                t.objectProperty(t.identifier('first'), t.optionalMemberExpression(t.identifier('args'), t.identifier('first'), false, true)),
-                t.objectProperty(t.identifier('last'), t.optionalMemberExpression(t.identifier('args'), t.identifier('last'), false, true)),
-                t.objectProperty(t.identifier('after'), t.optionalMemberExpression(t.identifier('args'), t.identifier('after'), false, true)),
-                t.objectProperty(t.identifier('before'), t.optionalMemberExpression(t.identifier('args'), t.identifier('before'), false, true)),
-                t.objectProperty(t.identifier('offset'), t.optionalMemberExpression(t.identifier('args'), t.identifier('offset'), false, true)),
-            ]),
+            t.objectExpression(findManyObjProps),
             t.stringLiteral(whereTypeName),
             t.stringLiteral(orderByTypeName),
             t.identifier('connectionFieldsMap'),
-            t.stringLiteral(conditionTypeName),
+            ...(conditionTypeName
+                ? [t.stringLiteral(conditionTypeName)]
+                : []),
         ];
         classBody.push(createClassMethod('findMany', createTypeParam(selectTypeName), [implParam], retType(sRef()), buildMethodBody('buildFindManyDocument', bodyArgs, 'query', typeName, pluralQueryName)));
     }
     // ── findFirst ──────────────────────────────────────────────────────────
     {
-        const argsType = (sel) => t.tsTypeReference(t.identifier('FindFirstArgs'), t.tsTypeParameterInstantiation([
-            sel,
-            t.tsTypeReference(t.identifier(whereTypeName)),
-            t.tsTypeReference(t.identifier(conditionTypeName)),
-        ]));
+        const findFirstTypeArgs = [
+            (sel) => sel,
+            () => t.tsTypeReference(t.identifier(whereTypeName)),
+            ...(conditionTypeName
+                ? [() => t.tsTypeReference(t.identifier(conditionTypeName))]
+                : []),
+        ];
+        const argsType = (sel) => t.tsTypeReference(t.identifier('FindFirstArgs'), t.tsTypeParameterInstantiation(findFirstTypeArgs.map(fn => fn(sel))));
         const retType = (sel) => t.tsTypeAnnotation(t.tsTypeReference(t.identifier('QueryBuilder'), t.tsTypeParameterInstantiation([
             t.tsTypeLiteral([
                 t.tsPropertySignature(t.identifier(pluralQueryName), t.tsTypeAnnotation(t.tsTypeLiteral([
@@ -241,17 +256,24 @@ function generateModelFile(table, _useSharedTypes) {
             strictSelectGuard(selectTypeName),
         ]));
         const selectExpr = t.memberExpression(t.identifier('args'), t.identifier('select'));
+        const findFirstObjProps = [
+            t.objectProperty(t.identifier('where'), t.optionalMemberExpression(t.identifier('args'), t.identifier('where'), false, true)),
+            ...(conditionTypeName
+                ? [
+                    t.objectProperty(t.identifier('condition'), t.optionalMemberExpression(t.identifier('args'), t.identifier('condition'), false, true)),
+                ]
+                : []),
+        ];
         const bodyArgs = [
             t.stringLiteral(typeName),
             t.stringLiteral(pluralQueryName),
             selectExpr,
-            t.objectExpression([
-                t.objectProperty(t.identifier('where'), t.optionalMemberExpression(t.identifier('args'), t.identifier('where'), false, true)),
-                t.objectProperty(t.identifier('condition'), t.optionalMemberExpression(t.identifier('args'), t.identifier('condition'), false, true)),
-            ]),
+            t.objectExpression(findFirstObjProps),
             t.stringLiteral(whereTypeName),
             t.identifier('connectionFieldsMap'),
-            t.stringLiteral(conditionTypeName),
+            ...(conditionTypeName
+                ? [t.stringLiteral(conditionTypeName)]
+                : []),
         ];
         classBody.push(createClassMethod('findFirst', createTypeParam(selectTypeName), [implParam], retType(sRef()), buildMethodBody('buildFindFirstDocument', bodyArgs, 'query', typeName, pluralQueryName)));
     }
@@ -455,6 +477,6 @@ function generateModelFile(table, _useSharedTypes) {
         tableName: table.name,
     };
 }
-function generateAllModelFiles(tables, useSharedTypes) {
-    return tables.map((table) => generateModelFile(table, useSharedTypes));
+function generateAllModelFiles(tables, useSharedTypes, options) {
+    return tables.map((table) => generateModelFile(table, useSharedTypes, options));
 }

package/core/codegen/templates/query-builder.ts

@@ -201,7 +201,7 @@ export function buildSelections(
 // Document Builders
 // ============================================================================
 
-export function buildFindManyDocument<TSelect, TWhere, TCondition>(
+export function buildFindManyDocument<TSelect, TWhere, TCondition = never>(
   operationName: string,
   queryField: string,
   select: TSelect,
@@ -320,7 +320,7 @@ export function buildFindManyDocument<TSelect, TWhere, TCondition>(
   return { document: print(document), variables };
 }
 
-export function buildFindFirstDocument<TSelect, TWhere, TCondition>(
+export function buildFindFirstDocument<TSelect, TWhere, TCondition = never>(
   operationName: string,
   queryField: string,
   select: TSelect,

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

@@ -21,7 +21,7 @@ export interface PageInfo {
   endCursor?: string | null;
 }
 
-export interface FindManyArgs<TSelect, TWhere, TCondition, TOrderBy> {
+export interface FindManyArgs<TSelect, TWhere, TCondition = never, TOrderBy = never> {
   select?: TSelect;
   where?: TWhere;
   condition?: TCondition;
@@ -33,7 +33,7 @@ export interface FindManyArgs<TSelect, TWhere, TCondition, TOrderBy> {
   offset?: number;
 }
 
-export interface FindFirstArgs<TSelect, TWhere, TCondition> {
+export interface FindFirstArgs<TSelect, TWhere, TCondition = never> {
   select?: TSelect;
   where?: TWhere;
   condition?: TCondition;

package/esm/core/codegen/cli/command-map-generator.d.ts

@@ -6,6 +6,7 @@ export interface MultiTargetCommandMapInput {
     builtinNames: {
         auth: string;
         context: string;
+        config: string;
     };
     targets: Array<{
         name: string;

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

@@ -186,6 +186,9 @@ export function generateMultiTargetCommandMap(input) {
     const authImportName = `${builtinNames.auth}Cmd`;
     commandEntries.push({ kebab: builtinNames.auth, importName: authImportName });
     statements.push(createImportDeclaration(`./commands/${builtinNames.auth}`, authImportName));
+    const configImportName = `${builtinNames.config}Cmd`;
+    commandEntries.push({ kebab: builtinNames.config, importName: configImportName });
+    statements.push(createImportDeclaration(`./commands/${builtinNames.config}`, configImportName));
     for (const target of targets) {
         for (const table of target.tables) {
             const { singularName } = getTableNames(table);
@@ -222,6 +225,7 @@ export function generateMultiTargetCommandMap(input) {
         'Commands:',
         `  ${builtinNames.context.padEnd(20)} Manage API contexts`,
         `  ${builtinNames.auth.padEnd(20)} Manage authentication`,
+        `  ${builtinNames.config.padEnd(20)} Manage config key-value store`,
     ];
     for (const target of targets) {
         usageLines.push('');

package/esm/core/codegen/cli/config-command-generator.d.ts

@@ -0,0 +1,11 @@
+import type { GeneratedFile } from './executor-generator';
+/**
+ * Generate the config command file (get/set/list/delete for per-context vars).
+ *
+ * Usage:
+ *   <tool> config get <key>
+ *   <tool> config set <key> <value>
+ *   <tool> config list
+ *   <tool> config delete <key>
+ */
+export declare function generateConfigCommand(toolName: string, commandName: string): GeneratedFile;