@constructive-io/graphql-codegen 4.21.0 → 4.21.2

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

@@ -1365,18 +1365,15 @@ function collectFilterExtraInputTypes(tables, typeRegistry) {
             !filterType.inputFields) {
             continue;
         }
-        const tableFieldNames = new Set(table.fields
-            .filter((f) => !(0, utils_1.isRelationField)(f.name, table))
-            .map((f) => f.name));
         for (const field of filterType.inputFields) {
-            // Skip standard column-derived fields and logical operators
-            if (tableFieldNames.has(field.name))
-                continue;
+            // Skip logical operators (and/or/not reference the table's own filter type)
             if (['and', 'or', 'not'].includes(field.name))
                 continue;
-            // Collect the base type name of this extra field
+            // Collect any filter type that isn't already generated as a base scalar filter
+            // This catches both plugin-injected fields (bm25Body, tsvTsv) AND regular columns
+            // whose custom scalar types have their own filter types (e.g., ConstructiveInternalTypeEmailFilter)
             const baseName = (0, type_resolver_1.getTypeBaseName)(field.type);
-            if (baseName && !scalars_1.SCALAR_NAMES.has(baseName)) {
+            if (baseName && !scalars_1.SCALAR_NAMES.has(baseName) && !scalars_1.BASE_FILTER_TYPE_NAMES.has(baseName)) {
                 extraTypes.add(baseName);
             }
         }

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

@@ -13,7 +13,7 @@
 import * as t from '@babel/types';
 import { pluralize } from 'inflekt';
 import { addJSDocComment, addLineComment, generateCode } from '../babel-ast';
-import { SCALAR_NAMES, scalarToFilterType, scalarToTsType } from '../scalars';
+import { BASE_FILTER_TYPE_NAMES, SCALAR_NAMES, scalarToFilterType, scalarToTsType } from '../scalars';
 import { getTypeBaseName } from '../type-resolver';
 import { getCreateInputTypeName, getConditionTypeName, getFilterTypeName, getGeneratedFileHeader, getOrderByTypeName, getPatchTypeName, getPrimaryKeyInfo, getTableNames, isRelationField, lcFirst, stripSmartComments, } from '../utils';
 // ============================================================================
@@ -1327,18 +1327,15 @@ function collectFilterExtraInputTypes(tables, typeRegistry) {
             !filterType.inputFields) {
             continue;
         }
-        const tableFieldNames = new Set(table.fields
-            .filter((f) => !isRelationField(f.name, table))
-            .map((f) => f.name));
         for (const field of filterType.inputFields) {
-            // Skip standard column-derived fields and logical operators
-            if (tableFieldNames.has(field.name))
-                continue;
+            // Skip logical operators (and/or/not reference the table's own filter type)
             if (['and', 'or', 'not'].includes(field.name))
                 continue;
-            // Collect the base type name of this extra field
+            // Collect any filter type that isn't already generated as a base scalar filter
+            // This catches both plugin-injected fields (bm25Body, tsvTsv) AND regular columns
+            // whose custom scalar types have their own filter types (e.g., ConstructiveInternalTypeEmailFilter)
             const baseName = getTypeBaseName(field.type);
-            if (baseName && !SCALAR_NAMES.has(baseName)) {
+            if (baseName && !SCALAR_NAMES.has(baseName) && !BASE_FILTER_TYPE_NAMES.has(baseName)) {
                 extraTypes.add(baseName);
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/graphql-codegen",
-  "version": "4.21.0",
+  "version": "4.21.2",
   "description": "GraphQL SDK generator for Constructive databases with React Query hooks",
   "keywords": [
     "graphql",
@@ -56,15 +56,15 @@
     "@0no-co/graphql.web": "^1.1.2",
     "@babel/generator": "^7.29.1",
     "@babel/types": "^7.29.0",
-    "@constructive-io/graphql-query": "^3.9.0",
+    "@constructive-io/graphql-query": "^3.9.1",
     "@constructive-io/graphql-types": "^3.3.4",
     "@inquirerer/utils": "^3.3.4",
-    "@pgpmjs/core": "^6.8.1",
+    "@pgpmjs/core": "^6.8.2",
     "ajv": "^8.18.0",
     "deepmerge": "^4.3.1",
     "find-and-require-package-json": "^0.9.1",
     "gql-ast": "^3.3.3",
-    "graphile-schema": "^1.8.1",
+    "graphile-schema": "^1.8.2",
     "graphql": "16.13.0",
     "inflekt": "^0.3.3",
     "inquirerer": "^4.7.0",
@@ -73,8 +73,8 @@
     "oxfmt": "^0.40.0",
     "pg-cache": "^3.3.4",
     "pg-env": "^1.7.3",
-    "pgsql-client": "^3.5.9",
-    "pgsql-seed": "^2.5.9",
+    "pgsql-client": "^3.5.10",
+    "pgsql-seed": "^2.5.10",
     "undici": "^7.24.3"
   },
   "peerDependencies": {
@@ -101,5 +101,5 @@
     "tsx": "^4.21.0",
     "typescript": "^5.9.3"
   },
-  "gitHead": "7b5d57e1d1aa274a2914cec3240a902d2b1020c6"
+  "gitHead": "bfc62d3bf8b8374dea67536cfea9d16cbe0575ac"
 }