Skip to content

fix: generate TypeScript types for custom scalar filter types (EmailFilter, ImageFilter, UploadFilter) #882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pyramation merged 1 commit into from
Mar 21, 2026
Merged

fix: generate TypeScript types for custom scalar filter types (EmailFilter, ImageFilter, UploadFilter) #882

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions graphql/codegen/src/core/codegen/orm/input-types-generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import type {
TypeRegistry,
} from '../../../types/schema';
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,
Expand Down Expand Up @@ -2016,20 +2016,15 @@ function collectFilterExtraInputTypes(
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);
}
}
Expand Down
Loading