Skip to content

Commit 76d56cb

Browse files
pyramationdevin-ai-integration[bot]
pyramation
authored and
devin-ai-integration[bot]
committed
refactor(codegen): flip condition default to false — where/filter is first-class, condition is opt-in
- Change all condition checks from `!== false` to `=== true` (8 locations) - Flip function parameter defaults from `= true` to `= false` - Thread config.codegen.condition through CLI codegen TableCommandOptions - Update tests that explicitly test condition types to pass condition: true - Update snapshots to reflect condition-disabled output
1 parent 2e2cbb1 commit 76d56cb

14 files changed

Lines changed: 67 additions & 148 deletions

‎graphql/codegen/src/__tests__/codegen/__snapshots__/cli-generator.test.ts.snap‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ import { CLIOptions, Inquirerer, extractFirst } from "inquirerer";
697697
import { getClient } from "../executor";
698698
import { coerceAnswers, parseFindFirstArgs, parseFindManyArgs, stripUndefined } from "../utils";
699699
import type { FieldSchema } from "../utils";
700-
import type { CreateCarInput, CarPatch, CarSelect, CarFilter, CarCondition, CarsOrderBy } from "../../orm/input-types";
700+
import type { CreateCarInput, CarPatch, CarSelect, CarFilter, CarsOrderBy } from "../../orm/input-types";
701701
import type { FindManyArgs, FindFirstArgs } from "../../orm/select-types";
702702
const fieldSchema: FieldSchema = {
703703
id: "uuid",
@@ -757,7 +757,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
757757
isElectric: true,
758758
createdAt: true
759759
};
760-
const findManyArgs = parseFindManyArgs<FindManyArgs<CarSelect, CarFilter, CarCondition, CarsOrderBy>>(argv, defaultSelect);
760+
const findManyArgs = parseFindManyArgs<FindManyArgs<CarSelect, CarFilter, never, CarsOrderBy>>(argv, defaultSelect);
761761
const client = getClient();
762762
const result = await client.car.findMany(findManyArgs).execute();
763763
console.log(JSON.stringify(result, null, 2));
@@ -779,7 +779,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
779779
isElectric: true,
780780
createdAt: true
781781
};
782-
const findFirstArgs = parseFindFirstArgs<FindFirstArgs<CarSelect, CarFilter, CarCondition>>(argv, defaultSelect);
782+
const findFirstArgs = parseFindFirstArgs<FindFirstArgs<CarSelect, CarFilter, never>>(argv, defaultSelect);
783783
const client = getClient();
784784
const result = await client.car.findFirst(findFirstArgs).execute();
785785
console.log(JSON.stringify(result, null, 2));
@@ -1161,7 +1161,7 @@ import { CLIOptions, Inquirerer, extractFirst } from "inquirerer";
11611161
import { getClient } from "../executor";
11621162
import { coerceAnswers, parseFindFirstArgs, parseFindManyArgs, stripUndefined } from "../utils";
11631163
import type { FieldSchema } from "../utils";
1164-
import type { CreateDriverInput, DriverPatch, DriverSelect, DriverFilter, DriverCondition, DriversOrderBy } from "../../orm/input-types";
1164+
import type { CreateDriverInput, DriverPatch, DriverSelect, DriverFilter, DriversOrderBy } from "../../orm/input-types";
11651165
import type { FindManyArgs, FindFirstArgs } from "../../orm/select-types";
11661166
const fieldSchema: FieldSchema = {
11671167
id: "uuid",
@@ -1215,7 +1215,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
12151215
name: true,
12161216
licenseNumber: true
12171217
};
1218-
const findManyArgs = parseFindManyArgs<FindManyArgs<DriverSelect, DriverFilter, DriverCondition, DriversOrderBy>>(argv, defaultSelect);
1218+
const findManyArgs = parseFindManyArgs<FindManyArgs<DriverSelect, DriverFilter, never, DriversOrderBy>>(argv, defaultSelect);
12191219
const client = getClient();
12201220
const result = await client.driver.findMany(findManyArgs).execute();
12211221
console.log(JSON.stringify(result, null, 2));
@@ -1234,7 +1234,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
12341234
name: true,
12351235
licenseNumber: true
12361236
};
1237-
const findFirstArgs = parseFindFirstArgs<FindFirstArgs<DriverSelect, DriverFilter, DriverCondition>>(argv, defaultSelect);
1237+
const findFirstArgs = parseFindFirstArgs<FindFirstArgs<DriverSelect, DriverFilter, never>>(argv, defaultSelect);
12381238
const client = getClient();
12391239
const result = await client.driver.findFirst(findFirstArgs).execute();
12401240
console.log(JSON.stringify(result, null, 2));
@@ -3193,7 +3193,7 @@ import { CLIOptions, Inquirerer, extractFirst } from "inquirerer";
31933193
import { getClient } from "../../executor";
31943194
import { coerceAnswers, parseFindFirstArgs, parseFindManyArgs, stripUndefined } from "../../utils";
31953195
import type { FieldSchema } from "../../utils";
3196-
import type { CreateUserInput, UserPatch, UserSelect, UserFilter, UserCondition, UsersOrderBy } from "../../../orm/input-types";
3196+
import type { CreateUserInput, UserPatch, UserSelect, UserFilter, UsersOrderBy } from "../../../orm/input-types";
31973197
import type { FindManyArgs, FindFirstArgs } from "../../../orm/select-types";
31983198
const fieldSchema: FieldSchema = {
31993199
id: "uuid",
@@ -3247,7 +3247,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
32473247
email: true,
32483248
name: true
32493249
};
3250-
const findManyArgs = parseFindManyArgs<FindManyArgs<UserSelect, UserFilter, UserCondition, UsersOrderBy>>(argv, defaultSelect);
3250+
const findManyArgs = parseFindManyArgs<FindManyArgs<UserSelect, UserFilter, never, UsersOrderBy>>(argv, defaultSelect);
32513251
const client = getClient("auth");
32523252
const result = await client.user.findMany(findManyArgs).execute();
32533253
console.log(JSON.stringify(result, null, 2));
@@ -3266,7 +3266,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
32663266
email: true,
32673267
name: true
32683268
};
3269-
const findFirstArgs = parseFindFirstArgs<FindFirstArgs<UserSelect, UserFilter, UserCondition>>(argv, defaultSelect);
3269+
const findFirstArgs = parseFindFirstArgs<FindFirstArgs<UserSelect, UserFilter, never>>(argv, defaultSelect);
32703270
const client = getClient("auth");
32713271
const result = await client.user.findFirst(findFirstArgs).execute();
32723272
console.log(JSON.stringify(result, null, 2));
@@ -3423,7 +3423,7 @@ import { CLIOptions, Inquirerer, extractFirst } from "inquirerer";
34233423
import { getClient } from "../../executor";
34243424
import { coerceAnswers, parseFindFirstArgs, parseFindManyArgs, stripUndefined } from "../../utils";
34253425
import type { FieldSchema } from "../../utils";
3426-
import type { CreateMemberInput, MemberPatch, MemberSelect, MemberFilter, MemberCondition, MembersOrderBy } from "../../../orm/input-types";
3426+
import type { CreateMemberInput, MemberPatch, MemberSelect, MemberFilter, MembersOrderBy } from "../../../orm/input-types";
34273427
import type { FindManyArgs, FindFirstArgs } from "../../../orm/select-types";
34283428
const fieldSchema: FieldSchema = {
34293429
id: "uuid",
@@ -3475,7 +3475,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
34753475
id: true,
34763476
role: true
34773477
};
3478-
const findManyArgs = parseFindManyArgs<FindManyArgs<MemberSelect, MemberFilter, MemberCondition, MembersOrderBy>>(argv, defaultSelect);
3478+
const findManyArgs = parseFindManyArgs<FindManyArgs<MemberSelect, MemberFilter, never, MembersOrderBy>>(argv, defaultSelect);
34793479
const client = getClient("members");
34803480
const result = await client.member.findMany(findManyArgs).execute();
34813481
console.log(JSON.stringify(result, null, 2));
@@ -3493,7 +3493,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
34933493
id: true,
34943494
role: true
34953495
};
3496-
const findFirstArgs = parseFindFirstArgs<FindFirstArgs<MemberSelect, MemberFilter, MemberCondition>>(argv, defaultSelect);
3496+
const findFirstArgs = parseFindFirstArgs<FindFirstArgs<MemberSelect, MemberFilter, never>>(argv, defaultSelect);
34973497
const client = getClient("members");
34983498
const result = await client.member.findFirst(findFirstArgs).execute();
34993499
console.log(JSON.stringify(result, null, 2));
@@ -3635,7 +3635,7 @@ import { CLIOptions, Inquirerer, extractFirst } from "inquirerer";
36353635
import { getClient } from "../../executor";
36363636
import { coerceAnswers, parseFindFirstArgs, parseFindManyArgs, stripUndefined } from "../../utils";
36373637
import type { FieldSchema } from "../../utils";
3638-
import type { CreateCarInput, CarPatch, CarSelect, CarFilter, CarCondition, CarsOrderBy } from "../../../orm/input-types";
3638+
import type { CreateCarInput, CarPatch, CarSelect, CarFilter, CarsOrderBy } from "../../../orm/input-types";
36393639
import type { FindManyArgs, FindFirstArgs } from "../../../orm/select-types";
36403640
const fieldSchema: FieldSchema = {
36413641
id: "uuid",
@@ -3695,7 +3695,7 @@ async function handleList(argv: Partial<Record<string, unknown>>, _prompter: Inq
36953695
isElectric: true,
36963696
createdAt: true
36973697
};
3698-
const findManyArgs = parseFindManyArgs<FindManyArgs<CarSelect, CarFilter, CarCondition, CarsOrderBy>>(argv, defaultSelect);
3698+
const findManyArgs = parseFindManyArgs<FindManyArgs<CarSelect, CarFilter, never, CarsOrderBy>>(argv, defaultSelect);
36993699
const client = getClient("app");
37003700
const result = await client.car.findMany(findManyArgs).execute();
37013701
console.log(JSON.stringify(result, null, 2));
@@ -3717,7 +3717,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
37173717
isElectric: true,
37183718
createdAt: true
37193719
};
3720-
const findFirstArgs = parseFindFirstArgs<FindFirstArgs<CarSelect, CarFilter, CarCondition>>(argv, defaultSelect);
3720+
const findFirstArgs = parseFindFirstArgs<FindFirstArgs<CarSelect, CarFilter, never>>(argv, defaultSelect);
37213721
const client = getClient("app");
37223722
const result = await client.car.findFirst(findFirstArgs).execute();
37233723
console.log(JSON.stringify(result, null, 2));

‎graphql/codegen/src/__tests__/codegen/__snapshots__/input-types-generator.test.ts.snap‎

Lines changed: 0 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -373,31 +373,6 @@ export interface CommentFilter {
373373
or?: CommentFilter[];
374374
not?: CommentFilter;
375375
}
376-
// ============ Table Condition Types ============
377-
export interface UserCondition {
378-
id?: string | null;
379-
email?: string | null;
380-
name?: string | null;
381-
age?: number | null;
382-
isActive?: boolean | null;
383-
createdAt?: string | null;
384-
metadata?: unknown | null;
385-
}
386-
export interface PostCondition {
387-
id?: string | null;
388-
title?: string | null;
389-
content?: string | null;
390-
authorId?: string | null;
391-
publishedAt?: string | null;
392-
tags?: string | null;
393-
}
394-
export interface CommentCondition {
395-
id?: string | null;
396-
body?: string | null;
397-
postId?: string | null;
398-
authorId?: string | null;
399-
createdAt?: string | null;
400-
}
401376
// ============ OrderBy Types ============
402377
export type UsersOrderBy = "PRIMARY_KEY_ASC" | "PRIMARY_KEY_DESC" | "NATURAL" | "ID_ASC" | "ID_DESC" | "EMAIL_ASC" | "EMAIL_DESC" | "NAME_ASC" | "NAME_DESC" | "AGE_ASC" | "AGE_DESC" | "IS_ACTIVE_ASC" | "IS_ACTIVE_DESC" | "CREATED_AT_ASC" | "CREATED_AT_DESC" | "METADATA_ASC" | "METADATA_DESC";
403378
export type PostsOrderBy = "PRIMARY_KEY_ASC" | "PRIMARY_KEY_DESC" | "NATURAL" | "ID_ASC" | "ID_DESC" | "TITLE_ASC" | "TITLE_DESC" | "CONTENT_ASC" | "CONTENT_DESC" | "AUTHOR_ID_ASC" | "AUTHOR_ID_DESC" | "PUBLISHED_AT_ASC" | "PUBLISHED_AT_DESC" | "TAGS_ASC" | "TAGS_DESC";
@@ -771,16 +746,6 @@ export interface UserFilter {
771746
or?: UserFilter[];
772747
not?: UserFilter;
773748
}
774-
// ============ Table Condition Types ============
775-
export interface UserCondition {
776-
id?: string | null;
777-
email?: string | null;
778-
name?: string | null;
779-
age?: number | null;
780-
isActive?: boolean | null;
781-
createdAt?: string | null;
782-
metadata?: unknown | null;
783-
}
784749
// ============ OrderBy Types ============
785750
export type UsersOrderBy = "PRIMARY_KEY_ASC" | "PRIMARY_KEY_DESC" | "NATURAL" | "ID_ASC" | "ID_DESC" | "EMAIL_ASC" | "EMAIL_DESC" | "NAME_ASC" | "NAME_DESC" | "AGE_ASC" | "AGE_DESC" | "IS_ACTIVE_ASC" | "IS_ACTIVE_DESC" | "CREATED_AT_ASC" | "CREATED_AT_DESC" | "METADATA_ASC" | "METADATA_DESC";
786751
// ============ CRUD Input Types ============
@@ -1096,16 +1061,6 @@ export interface UserFilter {
10961061
or?: UserFilter[];
10971062
not?: UserFilter;
10981063
}
1099-
// ============ Table Condition Types ============
1100-
export interface UserCondition {
1101-
id?: string | null;
1102-
email?: string | null;
1103-
name?: string | null;
1104-
age?: number | null;
1105-
isActive?: boolean | null;
1106-
createdAt?: string | null;
1107-
metadata?: unknown | null;
1108-
}
11091064
// ============ OrderBy Types ============
11101065
export type UsersOrderBy = "PRIMARY_KEY_ASC" | "PRIMARY_KEY_DESC" | "NATURAL" | "ID_ASC" | "ID_DESC" | "EMAIL_ASC" | "EMAIL_DESC" | "NAME_ASC" | "NAME_DESC" | "AGE_ASC" | "AGE_DESC" | "IS_ACTIVE_ASC" | "IS_ACTIVE_DESC" | "CREATED_AT_ASC" | "CREATED_AT_DESC" | "METADATA_ASC" | "METADATA_DESC";
11111066
// ============ CRUD Input Types ============
@@ -1433,16 +1388,6 @@ export interface UserFilter {
14331388
or?: UserFilter[];
14341389
not?: UserFilter;
14351390
}
1436-
// ============ Table Condition Types ============
1437-
export interface UserCondition {
1438-
id?: string | null;
1439-
email?: string | null;
1440-
name?: string | null;
1441-
age?: number | null;
1442-
isActive?: boolean | null;
1443-
createdAt?: string | null;
1444-
metadata?: unknown | null;
1445-
}
14461391
// ============ OrderBy Types ============
14471392
export type UsersOrderBy = "PRIMARY_KEY_ASC" | "PRIMARY_KEY_DESC" | "NATURAL" | "ID_ASC" | "ID_DESC" | "EMAIL_ASC" | "EMAIL_DESC" | "NAME_ASC" | "NAME_DESC" | "AGE_ASC" | "AGE_DESC" | "IS_ACTIVE_ASC" | "IS_ACTIVE_DESC" | "CREATED_AT_ASC" | "CREATED_AT_DESC" | "METADATA_ASC" | "METADATA_DESC";
14481393
// ============ CRUD Input Types ============
@@ -1815,22 +1760,6 @@ export interface ProfileFilter {
18151760
or?: ProfileFilter[];
18161761
not?: ProfileFilter;
18171762
}
1818-
// ============ Table Condition Types ============
1819-
export interface UserCondition {
1820-
id?: string | null;
1821-
email?: string | null;
1822-
name?: string | null;
1823-
age?: number | null;
1824-
isActive?: boolean | null;
1825-
createdAt?: string | null;
1826-
metadata?: unknown | null;
1827-
}
1828-
export interface ProfileCondition {
1829-
id?: string | null;
1830-
bio?: string | null;
1831-
userId?: string | null;
1832-
avatarUrl?: string | null;
1833-
}
18341763
// ============ OrderBy Types ============
18351764
export type UsersOrderBy = "PRIMARY_KEY_ASC" | "PRIMARY_KEY_DESC" | "NATURAL" | "ID_ASC" | "ID_DESC" | "EMAIL_ASC" | "EMAIL_DESC" | "NAME_ASC" | "NAME_DESC" | "AGE_ASC" | "AGE_DESC" | "IS_ACTIVE_ASC" | "IS_ACTIVE_DESC" | "CREATED_AT_ASC" | "CREATED_AT_DESC" | "METADATA_ASC" | "METADATA_DESC";
18361765
export type ProfilesOrderBy = "PRIMARY_KEY_ASC" | "PRIMARY_KEY_DESC" | "NATURAL" | "ID_ASC" | "ID_DESC" | "BIO_ASC" | "BIO_DESC" | "USER_ID_ASC" | "USER_ID_DESC" | "AVATAR_URL_ASC" | "AVATAR_URL_DESC";
@@ -2210,20 +2139,6 @@ export interface CategoryFilter {
22102139
or?: CategoryFilter[];
22112140
not?: CategoryFilter;
22122141
}
2213-
// ============ Table Condition Types ============
2214-
export interface PostCondition {
2215-
id?: string | null;
2216-
title?: string | null;
2217-
content?: string | null;
2218-
authorId?: string | null;
2219-
publishedAt?: string | null;
2220-
tags?: string | null;
2221-
}
2222-
export interface CategoryCondition {
2223-
id?: string | null;
2224-
name?: string | null;
2225-
slug?: string | null;
2226-
}
22272142
// ============ OrderBy Types ============
22282143
export type PostsOrderBy = "PRIMARY_KEY_ASC" | "PRIMARY_KEY_DESC" | "NATURAL" | "ID_ASC" | "ID_DESC" | "TITLE_ASC" | "TITLE_DESC" | "CONTENT_ASC" | "CONTENT_DESC" | "AUTHOR_ID_ASC" | "AUTHOR_ID_DESC" | "PUBLISHED_AT_ASC" | "PUBLISHED_AT_DESC" | "TAGS_ASC" | "TAGS_DESC";
22292144
export type CategoriesOrderBy = "PRIMARY_KEY_ASC" | "PRIMARY_KEY_DESC" | "NATURAL" | "ID_ASC" | "ID_DESC" | "NAME_ASC" | "NAME_DESC" | "SLUG_ASC" | "SLUG_DESC";

0 commit comments

Comments
 (0)