Skip to content

Commit 48770ac

Browse files
authored
Merge pull request #1154 from constructive-io/fix/remove-findmany-never-default
fix(types): remove = never default from FindManyArgs TOrderBy param
2 parents 0b23c8c + effbe42 commit 48770ac

16 files changed

Lines changed: 17 additions & 19 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ export interface PageInfo {
386386
endCursor?: string | null;
387387
}
388388
389-
export interface FindManyArgs<TSelect, TWhere, TOrderBy = never> {
389+
export interface FindManyArgs<TSelect, TWhere, TOrderBy> {
390390
select?: TSelect;
391391
where?: TWhere;
392392
orderBy?: TOrderBy[];

graphql/codegen/src/__tests__/codegen/react-query-hooks.test.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -337,10 +337,8 @@ describe('Query Hook Generators', () => {
337337
});
338338

339339
describe('Regression: FindManyArgs TCondition type arg', () => {
340-
// Bug: queries.ts passed 3 type args to FindManyArgs (TSelect, TWhere, TOrderBy),
341-
// but the template defines 4 params: FindManyArgs<TSelect, TWhere, TCondition = never, TOrderBy = never>.
342-
// This caused TOrderBy to land in the TCondition slot, defaulting TOrderBy to `never`
343-
// and breaking all hook orderBy params.
340+
// Regression guard: queries.ts passes 3 type args to FindManyArgs (TSelect, TWhere, TOrderBy).
341+
// A prior bug had 4 params with defaults, causing TOrderBy to land in the wrong slot.
344342

345343
it('does not include Condition type in generated hooks', () => {
346344
const result = generateListQueryHook(simpleUserTable, {

graphql/codegen/src/core/codegen/templates/select-types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export interface PageInfo {
2121
endCursor?: string | null;
2222
}
2323

24-
export interface FindManyArgs<TSelect, TWhere, TOrderBy = never> {
24+
export interface FindManyArgs<TSelect, TWhere, TOrderBy> {
2525
select?: TSelect;
2626
where?: TWhere;
2727
orderBy?: TOrderBy[];

sdk/constructive-cli/src/admin/orm/select-types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export interface PageInfo {
1616
endCursor?: string | null;
1717
}
1818

19-
export interface FindManyArgs<TSelect, TWhere, TOrderBy = never> {
19+
export interface FindManyArgs<TSelect, TWhere, TOrderBy> {
2020
select?: TSelect;
2121
where?: TWhere;
2222
orderBy?: TOrderBy[];

sdk/constructive-cli/src/auth/orm/select-types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export interface PageInfo {
1616
endCursor?: string | null;
1717
}
1818

19-
export interface FindManyArgs<TSelect, TWhere, TOrderBy = never> {
19+
export interface FindManyArgs<TSelect, TWhere, TOrderBy> {
2020
select?: TSelect;
2121
where?: TWhere;
2222
orderBy?: TOrderBy[];

sdk/constructive-cli/src/objects/orm/select-types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export interface PageInfo {
1616
endCursor?: string | null;
1717
}
1818

19-
export interface FindManyArgs<TSelect, TWhere, TOrderBy = never> {
19+
export interface FindManyArgs<TSelect, TWhere, TOrderBy> {
2020
select?: TSelect;
2121
where?: TWhere;
2222
orderBy?: TOrderBy[];

sdk/constructive-cli/src/public/orm/select-types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export interface PageInfo {
1616
endCursor?: string | null;
1717
}
1818

19-
export interface FindManyArgs<TSelect, TWhere, TOrderBy = never> {
19+
export interface FindManyArgs<TSelect, TWhere, TOrderBy> {
2020
select?: TSelect;
2121
where?: TWhere;
2222
orderBy?: TOrderBy[];

sdk/constructive-react/src/admin/orm/select-types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export interface PageInfo {
1616
endCursor?: string | null;
1717
}
1818

19-
export interface FindManyArgs<TSelect, TWhere, TOrderBy = never> {
19+
export interface FindManyArgs<TSelect, TWhere, TOrderBy> {
2020
select?: TSelect;
2121
where?: TWhere;
2222
orderBy?: TOrderBy[];

sdk/constructive-react/src/auth/orm/select-types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export interface PageInfo {
1616
endCursor?: string | null;
1717
}
1818

19-
export interface FindManyArgs<TSelect, TWhere, TOrderBy = never> {
19+
export interface FindManyArgs<TSelect, TWhere, TOrderBy> {
2020
select?: TSelect;
2121
where?: TWhere;
2222
orderBy?: TOrderBy[];

sdk/constructive-react/src/objects/orm/select-types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export interface PageInfo {
1616
endCursor?: string | null;
1717
}
1818

19-
export interface FindManyArgs<TSelect, TWhere, TOrderBy = never> {
19+
export interface FindManyArgs<TSelect, TWhere, TOrderBy> {
2020
select?: TSelect;
2121
where?: TWhere;
2222
orderBy?: TOrderBy[];

0 commit comments

Comments
 (0)