Skip to content

feat(codegen): wire condition arg through ORM query builder for findMany/findFirst #795

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 5 commits into from
Mar 12, 2026
Merged

feat(codegen): wire condition arg through ORM query builder for findMany/findFirst #795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3c4a91a
fix(codegen): include plugin-injected fields in condition and orderBy…
pyramation Mar 12, 2026
0ffda8e
fix(codegen): resolve transitive enum types referenced by input fields
pyramation Mar 12, 2026
7aa49cb
fix(codegen): add VectorFilter scalar filter type for pgvector fields
pyramation Mar 12, 2026
1588296
feat(codegen): wire condition arg through ORM query builder for findM…
pyramation Mar 12, 2026
c9b992e
docs: add comments explaining why VectorFilter exists for pgvector co…
pyramation Mar 12, 2026
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
6 changes: 4 additions & 2 deletions graphql/codegen/src/__tests__/codegen/__snapshots__/client-generator.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,9 +276,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;
Expand All @@ -287,9 +288,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> {
Expand Down
49 changes: 49 additions & 0 deletions graphql/codegen/src/__tests__/codegen/__snapshots__/input-types-generator.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,13 @@ export interface InternetAddressFilter {
export interface FullTextFilter {
matches?: string;
}
export interface VectorFilter {
isNull?: boolean;
equalTo?: number[];
notEqualTo?: number[];
distinctFrom?: number[];
notDistinctFrom?: number[];
}
export interface StringListFilter {
isNull?: boolean;
equalTo?: string[];
Expand Down Expand Up @@ -648,6 +655,13 @@ export interface InternetAddressFilter {
export interface FullTextFilter {
matches?: string;
}
export interface VectorFilter {
isNull?: boolean;
equalTo?: number[];
notEqualTo?: number[];
distinctFrom?: number[];
notDistinctFrom?: number[];
}
export interface StringListFilter {
isNull?: boolean;
equalTo?: string[];
Expand Down Expand Up @@ -966,6 +980,13 @@ export interface InternetAddressFilter {
export interface FullTextFilter {
matches?: string;
}
export interface VectorFilter {
isNull?: boolean;
equalTo?: number[];
notEqualTo?: number[];
distinctFrom?: number[];
notDistinctFrom?: number[];
}
export interface StringListFilter {
isNull?: boolean;
equalTo?: string[];
Expand Down Expand Up @@ -1296,6 +1317,13 @@ export interface InternetAddressFilter {
export interface FullTextFilter {
matches?: string;
}
export interface VectorFilter {
isNull?: boolean;
equalTo?: number[];
notEqualTo?: number[];
distinctFrom?: number[];
notDistinctFrom?: number[];
}
export interface StringListFilter {
isNull?: boolean;
equalTo?: string[];
Expand Down Expand Up @@ -1631,6 +1659,13 @@ export interface InternetAddressFilter {
export interface FullTextFilter {
matches?: string;
}
export interface VectorFilter {
isNull?: boolean;
equalTo?: number[];
notEqualTo?: number[];
distinctFrom?: number[];
notDistinctFrom?: number[];
}
export interface StringListFilter {
isNull?: boolean;
equalTo?: string[];
Expand Down Expand Up @@ -2022,6 +2057,13 @@ export interface InternetAddressFilter {
export interface FullTextFilter {
matches?: string;
}
export interface VectorFilter {
isNull?: boolean;
equalTo?: number[];
notEqualTo?: number[];
distinctFrom?: number[];
notDistinctFrom?: number[];
}
export interface StringListFilter {
isNull?: boolean;
equalTo?: string[];
Expand Down Expand Up @@ -2409,6 +2451,13 @@ export interface InternetAddressFilter {
export interface FullTextFilter {
matches?: string;
}
export interface VectorFilter {
isNull?: boolean;
equalTo?: number[];
notEqualTo?: number[];
distinctFrom?: number[];
notDistinctFrom?: number[];
}
export interface StringListFilter {
isNull?: boolean;
equalTo?: string[];
Expand Down
42 changes: 24 additions & 18 deletions graphql/codegen/src/__tests__/codegen/__snapshots__/model-generator.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ exports[`model-generator generates model with all CRUD methods 1`] = `
import { OrmClient } from "../client";
import { QueryBuilder, buildFindManyDocument, buildFindFirstDocument, buildFindOneDocument, buildCreateDocument, buildUpdateByPkDocument, buildDeleteByPkDocument } from "../query-builder";
import type { ConnectionResult, FindManyArgs, FindFirstArgs, CreateArgs, UpdateArgs, DeleteArgs, InferSelectResult, StrictSelect } from "../select-types";
import type { User, UserWithRelations, UserSelect, UserFilter, UsersOrderBy, CreateUserInput, UpdateUserInput, UserPatch } from "../input-types";
import type { User, UserWithRelations, UserSelect, UserFilter, UserCondition, UsersOrderBy, CreateUserInput, UpdateUserInput, UserPatch } from "../input-types";
import { connectionFieldsMap } from "../input-types";
export class UserModel {
constructor(private client: OrmClient) {}
findMany<S extends UserSelect>(args: FindManyArgs<S, UserFilter, UsersOrderBy> & {
findMany<S extends UserSelect>(args: FindManyArgs<S, UserFilter, UserCondition, UsersOrderBy> & {
select: S;
} & StrictSelect<S, UserSelect>): QueryBuilder<{
users: ConnectionResult<InferSelectResult<UserWithRelations, S>>;
Expand All @@ -23,13 +23,14 @@ export class UserModel {
variables
} = buildFindManyDocument("User", "users", args.select, {
where: args?.where,
condition: args?.condition,
orderBy: args?.orderBy as string[] | undefined,
first: args?.first,
last: args?.last,
after: args?.after,
before: args?.before,
offset: args?.offset
}, "UserFilter", "UsersOrderBy", connectionFieldsMap);
}, "UserFilter", "UsersOrderBy", connectionFieldsMap, "UserCondition");
return new QueryBuilder({
client: this.client,
operation: "query",
Expand All @@ -39,7 +40,7 @@ export class UserModel {
variables
});
}
findFirst<S extends UserSelect>(args: FindFirstArgs<S, UserFilter> & {
findFirst<S extends UserSelect>(args: FindFirstArgs<S, UserFilter, UserCondition> & {
select: S;
} & StrictSelect<S, UserSelect>): QueryBuilder<{
users: {
Expand All @@ -50,8 +51,9 @@ export class UserModel {
document,
variables
} = buildFindFirstDocument("User", "users", args.select, {
where: args?.where
}, "UserFilter", connectionFieldsMap);
where: args?.where,
condition: args?.condition
}, "UserFilter", connectionFieldsMap, "UserCondition");
return new QueryBuilder({
client: this.client,
operation: "query",
Expand Down Expand Up @@ -156,11 +158,11 @@ exports[`model-generator generates model without update/delete when not availabl
import { OrmClient } from "../client";
import { QueryBuilder, buildFindManyDocument, buildFindFirstDocument, buildFindOneDocument, buildCreateDocument, buildUpdateByPkDocument, buildDeleteByPkDocument } from "../query-builder";
import type { ConnectionResult, FindManyArgs, FindFirstArgs, CreateArgs, UpdateArgs, DeleteArgs, InferSelectResult, StrictSelect } from "../select-types";
import type { AuditLog, AuditLogWithRelations, AuditLogSelect, AuditLogFilter, AuditLogsOrderBy, CreateAuditLogInput, UpdateAuditLogInput, AuditLogPatch } from "../input-types";
import type { AuditLog, AuditLogWithRelations, AuditLogSelect, AuditLogFilter, AuditLogCondition, AuditLogsOrderBy, CreateAuditLogInput, UpdateAuditLogInput, AuditLogPatch } from "../input-types";
import { connectionFieldsMap } from "../input-types";
export class AuditLogModel {
constructor(private client: OrmClient) {}
findMany<S extends AuditLogSelect>(args: FindManyArgs<S, AuditLogFilter, AuditLogsOrderBy> & {
findMany<S extends AuditLogSelect>(args: FindManyArgs<S, AuditLogFilter, AuditLogCondition, AuditLogsOrderBy> & {
select: S;
} & StrictSelect<S, AuditLogSelect>): QueryBuilder<{
auditLogs: ConnectionResult<InferSelectResult<AuditLogWithRelations, S>>;
Expand All @@ -170,13 +172,14 @@ export class AuditLogModel {
variables
} = buildFindManyDocument("AuditLog", "auditLogs", args.select, {
where: args?.where,
condition: args?.condition,
orderBy: args?.orderBy as string[] | undefined,
first: args?.first,
last: args?.last,
after: args?.after,
before: args?.before,
offset: args?.offset
}, "AuditLogFilter", "AuditLogsOrderBy", connectionFieldsMap);
}, "AuditLogFilter", "AuditLogsOrderBy", connectionFieldsMap, "AuditLogCondition");
return new QueryBuilder({
client: this.client,
operation: "query",
Expand All @@ -186,7 +189,7 @@ export class AuditLogModel {
variables
});
}
findFirst<S extends AuditLogSelect>(args: FindFirstArgs<S, AuditLogFilter> & {
findFirst<S extends AuditLogSelect>(args: FindFirstArgs<S, AuditLogFilter, AuditLogCondition> & {
select: S;
} & StrictSelect<S, AuditLogSelect>): QueryBuilder<{
auditLogs: {
Expand All @@ -197,8 +200,9 @@ export class AuditLogModel {
document,
variables
} = buildFindFirstDocument("AuditLog", "auditLogs", args.select, {
where: args?.where
}, "AuditLogFilter", connectionFieldsMap);
where: args?.where,
condition: args?.condition
}, "AuditLogFilter", connectionFieldsMap, "AuditLogCondition");
return new QueryBuilder({
client: this.client,
operation: "query",
Expand Down Expand Up @@ -259,11 +263,11 @@ exports[`model-generator handles custom query/mutation names 1`] = `
import { OrmClient } from "../client";
import { QueryBuilder, buildFindManyDocument, buildFindFirstDocument, buildFindOneDocument, buildCreateDocument, buildUpdateByPkDocument, buildDeleteByPkDocument } from "../query-builder";
import type { ConnectionResult, FindManyArgs, FindFirstArgs, CreateArgs, UpdateArgs, DeleteArgs, InferSelectResult, StrictSelect } from "../select-types";
import type { Organization, OrganizationWithRelations, OrganizationSelect, OrganizationFilter, OrganizationsOrderBy, CreateOrganizationInput, UpdateOrganizationInput, OrganizationPatch } from "../input-types";
import type { Organization, OrganizationWithRelations, OrganizationSelect, OrganizationFilter, OrganizationCondition, OrganizationsOrderBy, CreateOrganizationInput, UpdateOrganizationInput, OrganizationPatch } from "../input-types";
import { connectionFieldsMap } from "../input-types";
export class OrganizationModel {
constructor(private client: OrmClient) {}
findMany<S extends OrganizationSelect>(args: FindManyArgs<S, OrganizationFilter, OrganizationsOrderBy> & {
findMany<S extends OrganizationSelect>(args: FindManyArgs<S, OrganizationFilter, OrganizationCondition, OrganizationsOrderBy> & {
select: S;
} & StrictSelect<S, OrganizationSelect>): QueryBuilder<{
allOrganizations: ConnectionResult<InferSelectResult<OrganizationWithRelations, S>>;
Expand All @@ -273,13 +277,14 @@ export class OrganizationModel {
variables
} = buildFindManyDocument("Organization", "allOrganizations", args.select, {
where: args?.where,
condition: args?.condition,
orderBy: args?.orderBy as string[] | undefined,
first: args?.first,
last: args?.last,
after: args?.after,
before: args?.before,
offset: args?.offset
}, "OrganizationFilter", "OrganizationsOrderBy", connectionFieldsMap);
}, "OrganizationFilter", "OrganizationsOrderBy", connectionFieldsMap, "OrganizationCondition");
return new QueryBuilder({
client: this.client,
operation: "query",
Expand All @@ -289,7 +294,7 @@ export class OrganizationModel {
variables
});
}
findFirst<S extends OrganizationSelect>(args: FindFirstArgs<S, OrganizationFilter> & {
findFirst<S extends OrganizationSelect>(args: FindFirstArgs<S, OrganizationFilter, OrganizationCondition> & {
select: S;
} & StrictSelect<S, OrganizationSelect>): QueryBuilder<{
allOrganizations: {
Expand All @@ -300,8 +305,9 @@ export class OrganizationModel {
document,
variables
} = buildFindFirstDocument("Organization", "allOrganizations", args.select, {
where: args?.where
}, "OrganizationFilter", connectionFieldsMap);
where: args?.where,
condition: args?.condition
}, "OrganizationFilter", connectionFieldsMap, "OrganizationCondition");
return new QueryBuilder({
client: this.client,
operation: "query",
Expand Down
4 changes: 2 additions & 2 deletions graphql/codegen/src/__tests__/codegen/__snapshots__/react-query-hooks.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2138,7 +2138,7 @@ exports[`Schema Types Generator generateSchemaTypesFile generates schema types f
* DO NOT EDIT - changes will be overwritten
*/

import type { BigFloatFilter, BigIntFilter, BitStringFilter, BooleanFilter, DateFilter, DatetimeFilter, FloatFilter, FullTextFilter, IntFilter, IntListFilter, InternetAddressFilter, JSONFilter, StringFilter, StringListFilter, UUIDFilter, UUIDListFilter } from "./types";
import type { BigFloatFilter, BigIntFilter, BitStringFilter, BooleanFilter, DateFilter, DatetimeFilter, FloatFilter, FullTextFilter, IntFilter, IntListFilter, InternetAddressFilter, JSONFilter, StringFilter, StringListFilter, UUIDFilter, UUIDListFilter, VectorFilter } from "./types";
export type UserRole = "ADMIN" | "USER" | "GUEST";
export interface RegisterInput {
email: string;
Expand All @@ -2165,7 +2165,7 @@ exports[`Schema Types Generator generateSchemaTypesFile generates schema types f
* DO NOT EDIT - changes will be overwritten
*/

import type { User, BigFloatFilter, BigIntFilter, BitStringFilter, BooleanFilter, DateFilter, DatetimeFilter, FloatFilter, FullTextFilter, IntFilter, IntListFilter, InternetAddressFilter, JSONFilter, StringFilter, StringListFilter, UUIDFilter, UUIDListFilter } from "./types";
import type { User, BigFloatFilter, BigIntFilter, BitStringFilter, BooleanFilter, DateFilter, DatetimeFilter, FloatFilter, FullTextFilter, IntFilter, IntListFilter, InternetAddressFilter, JSONFilter, StringFilter, StringListFilter, UUIDFilter, UUIDListFilter, VectorFilter } from "./types";
export type UserRole = "ADMIN" | "USER" | "GUEST";
export interface RegisterInput {
email: string;
Expand Down
10 changes: 5 additions & 5 deletions graphql/codegen/src/__tests__/codegen/__snapshots__/schema-types-generator.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ exports[`schema-types-generator generates enum types as string unions 1`] = `
* DO NOT EDIT - changes will be overwritten
*/

import type { BigFloatFilter, BigIntFilter, BitStringFilter, BooleanFilter, DateFilter, DatetimeFilter, FloatFilter, FullTextFilter, IntFilter, IntListFilter, InternetAddressFilter, JSONFilter, StringFilter, StringListFilter, UUIDFilter, UUIDListFilter } from "./types";
import type { BigFloatFilter, BigIntFilter, BitStringFilter, BooleanFilter, DateFilter, DatetimeFilter, FloatFilter, FullTextFilter, IntFilter, IntListFilter, InternetAddressFilter, JSONFilter, StringFilter, StringListFilter, UUIDFilter, UUIDListFilter, VectorFilter } from "./types";
export type Status = "ACTIVE" | "INACTIVE" | "PENDING";
export type Priority = "LOW" | "MEDIUM" | "HIGH";"
`;
Expand All @@ -19,7 +19,7 @@ exports[`schema-types-generator generates input object types as interfaces 1`] =
* DO NOT EDIT - changes will be overwritten
*/

import type { BigFloatFilter, BigIntFilter, BitStringFilter, BooleanFilter, DateFilter, DatetimeFilter, FloatFilter, FullTextFilter, IntFilter, IntListFilter, InternetAddressFilter, JSONFilter, StringFilter, StringListFilter, UUIDFilter, UUIDListFilter } from "./types";
import type { BigFloatFilter, BigIntFilter, BitStringFilter, BooleanFilter, DateFilter, DatetimeFilter, FloatFilter, FullTextFilter, IntFilter, IntListFilter, InternetAddressFilter, JSONFilter, StringFilter, StringListFilter, UUIDFilter, UUIDListFilter, VectorFilter } from "./types";
export interface CreateUserInput {
email: string;
name?: string;
Expand All @@ -38,7 +38,7 @@ exports[`schema-types-generator generates payload types from mutation return typ
* DO NOT EDIT - changes will be overwritten
*/

import type { User, BigFloatFilter, BigIntFilter, BitStringFilter, BooleanFilter, DateFilter, DatetimeFilter, FloatFilter, FullTextFilter, IntFilter, IntListFilter, InternetAddressFilter, JSONFilter, StringFilter, StringListFilter, UUIDFilter, UUIDListFilter } from "./types";
import type { User, BigFloatFilter, BigIntFilter, BitStringFilter, BooleanFilter, DateFilter, DatetimeFilter, FloatFilter, FullTextFilter, IntFilter, IntListFilter, InternetAddressFilter, JSONFilter, StringFilter, StringListFilter, UUIDFilter, UUIDListFilter, VectorFilter } from "./types";
export interface LoginPayload {
token: string;
refreshToken?: string | null;
Expand All @@ -53,7 +53,7 @@ exports[`schema-types-generator generates union types 1`] = `
* DO NOT EDIT - changes will be overwritten
*/

import type { BigFloatFilter, BigIntFilter, BitStringFilter, BooleanFilter, DateFilter, DatetimeFilter, FloatFilter, FullTextFilter, IntFilter, IntListFilter, InternetAddressFilter, JSONFilter, StringFilter, StringListFilter, UUIDFilter, UUIDListFilter } from "./types";
import type { BigFloatFilter, BigIntFilter, BitStringFilter, BooleanFilter, DateFilter, DatetimeFilter, FloatFilter, FullTextFilter, IntFilter, IntListFilter, InternetAddressFilter, JSONFilter, StringFilter, StringListFilter, UUIDFilter, UUIDListFilter, VectorFilter } from "./types";
export type SearchResult = User | Post | Comment;"
`;

Expand All @@ -64,6 +64,6 @@ exports[`schema-types-generator skips table types and standard scalars 1`] = `
* DO NOT EDIT - changes will be overwritten
*/

import type { BigFloatFilter, BigIntFilter, BitStringFilter, BooleanFilter, DateFilter, DatetimeFilter, FloatFilter, FullTextFilter, IntFilter, IntListFilter, InternetAddressFilter, JSONFilter, StringFilter, StringListFilter, UUIDFilter, UUIDListFilter } from "./types";
import type { BigFloatFilter, BigIntFilter, BitStringFilter, BooleanFilter, DateFilter, DatetimeFilter, FloatFilter, FullTextFilter, IntFilter, IntListFilter, InternetAddressFilter, JSONFilter, StringFilter, StringListFilter, UUIDFilter, UUIDListFilter, VectorFilter } from "./types";
export type CustomEnum = "VALUE_A" | "VALUE_B";"
`;
Loading
Loading