@constructive-io/graphql-codegen 4.12.2 → 4.13.0

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

@@ -1024,9 +1024,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) {
@@ -1296,7 +1296,8 @@ function collectConditionExtraInputTypes(tables, typeRegistry) {
 /**
  * Generate comprehensive input-types.ts file using Babel AST
  */
-export function generateInputTypesFile(typeRegistry, usedInputTypes, tables, usedPayloadTypes, comments = true) {
+export function generateInputTypesFile(typeRegistry, usedInputTypes, tables, usedPayloadTypes, comments = true, options) {
+    const conditionEnabled = options?.condition !== false;
     const statements = [];
     const tablesList = tables ?? [];
     const hasTables = tablesList.length > 0;
@@ -1323,7 +1324,9 @@ export function generateInputTypesFile(typeRegistry, usedInputTypes, tables, use
         // 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)
@@ -1337,14 +1340,19 @@ export function generateInputTypesFile(typeRegistry, usedInputTypes, tables, use
     // 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/esm/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/esm/core/codegen/orm/model-generator.js

@@ -65,7 +65,8 @@ function strictSelectGuard(selectTypeName) {
         t.tsTypeReference(t.identifier(selectTypeName)),
     ]));
 }
-export function generateModelFile(table, _useSharedTypes) {
+export function generateModelFile(table, _useSharedTypes, options) {
+    const conditionEnabled = options?.condition !== false;
     const { typeName, singularName, pluralName } = getTableNames(table);
     const modelName = `${typeName}Model`;
     const baseFileName = lcFirst(typeName);
@@ -74,7 +75,7 @@ export function generateModelFile(table, _useSharedTypes) {
     const selectTypeName = `${typeName}Select`;
     const relationTypeName = `${typeName}WithRelations`;
     const whereTypeName = getFilterTypeName(table);
-    const conditionTypeName = `${typeName}Condition`;
+    const conditionTypeName = conditionEnabled ? `${typeName}Condition` : undefined;
     const orderByTypeName = getOrderByTypeName(table);
     const createInputTypeName = `Create${typeName}Input`;
     const updateInputTypeName = `Update${typeName}Input`;
@@ -109,17 +110,18 @@ export 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
@@ -133,12 +135,15 @@ export 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([
@@ -156,37 +161,47 @@ export 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([
@@ -204,17 +219,24 @@ export 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)));
     }
@@ -418,6 +440,6 @@ export function generateModelFile(table, _useSharedTypes) {
         tableName: table.name,
     };
 }
-export function generateAllModelFiles(tables, useSharedTypes) {
-    return tables.map((table) => generateModelFile(table, useSharedTypes));
+export function generateAllModelFiles(tables, useSharedTypes, options) {
+    return tables.map((table) => generateModelFile(table, useSharedTypes, options));
 }

package/esm/types/config.d.ts

@@ -153,6 +153,7 @@ export interface DocsConfig {
 export interface BuiltinNames {
     auth?: string;
     context?: string;
+    config?: string;
 }
 /**
  * CLI generation configuration
@@ -285,6 +286,14 @@ export interface GraphQLSDKConfigTarget {
          * @default true
          */
         comments?: boolean;
+        /**
+         * Generate condition types and condition arguments on findMany/findFirst.
+         * PostGraphile's native `condition` argument provides simple equality filtering.
+         * Set to `true` to include condition types and arguments in generated code.
+         * Set to `false` to omit them (e.g., when using connection-filter's `filter` argument exclusively).
+         * @default false
+         */
+        condition?: boolean;
     };
     /**
      * Whether to generate ORM client

package/esm/types/config.js

@@ -61,6 +61,7 @@ export const DEFAULT_CONFIG = {
     codegen: {
         skipQueryField: true,
         comments: true,
+        condition: false,
     },
     orm: false,
     reactQuery: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/graphql-codegen",
-  "version": "4.12.2",
+  "version": "4.13.0",
   "description": "GraphQL SDK generator for Constructive databases with React Query hooks",
   "keywords": [
     "graphql",
@@ -56,7 +56,7 @@
     "@0no-co/graphql.web": "^1.1.2",
     "@babel/generator": "^7.29.1",
     "@babel/types": "^7.29.0",
-    "@constructive-io/graphql-query": "^3.5.2",
+    "@constructive-io/graphql-query": "^3.5.3",
     "@constructive-io/graphql-types": "^3.3.2",
     "@inquirerer/utils": "^3.3.1",
     "@pgpmjs/core": "^6.6.2",
@@ -64,7 +64,7 @@
     "deepmerge": "^4.3.1",
     "find-and-require-package-json": "^0.9.1",
     "gql-ast": "^3.3.2",
-    "graphile-schema": "^1.5.2",
+    "graphile-schema": "^1.5.3",
     "graphql": "^16.13.0",
     "inflekt": "^0.3.3",
     "inquirerer": "^4.5.2",
@@ -101,5 +101,5 @@
     "tsx": "^4.21.0",
     "typescript": "^5.9.3"
   },
-  "gitHead": "4fd2c9be786ad9ae2213453276a69723435d5315"
+  "gitHead": "67218366027bc6370e07a1b96d8bf25adba18f42"
 }

package/types/config.d.ts

@@ -153,6 +153,7 @@ export interface DocsConfig {
 export interface BuiltinNames {
     auth?: string;
     context?: string;
+    config?: string;
 }
 /**
  * CLI generation configuration
@@ -285,6 +286,14 @@ export interface GraphQLSDKConfigTarget {
          * @default true
          */
         comments?: boolean;
+        /**
+         * Generate condition types and condition arguments on findMany/findFirst.
+         * PostGraphile's native `condition` argument provides simple equality filtering.
+         * Set to `true` to include condition types and arguments in generated code.
+         * Set to `false` to omit them (e.g., when using connection-filter's `filter` argument exclusively).
+         * @default false
+         */
+        condition?: boolean;
     };
     /**
      * Whether to generate ORM client

package/types/config.js

@@ -70,6 +70,7 @@ exports.DEFAULT_CONFIG = {
     codegen: {
         skipQueryField: true,
         comments: true,
+        condition: false,
     },
     orm: false,
     reactQuery: false,