Skip to content

Commit 7b1a778

Browse files
committed
fix(orm): select/include nullability
1 parent f74b6ee commit 7b1a778

File tree

1 file changed

+6
-30
lines changed

1 file changed

+6
-30
lines changed

packages/orm/src/client/crud-types.ts

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -698,10 +698,7 @@ export type CreateArgs<
698698
> = SimplifyIf<
699699
{
700700
data: CreateInput<Schema, Model>;
701-
select?: SelectInput<Schema, Model>;
702-
include?: IncludeInput<Schema, Model>;
703-
omit?: OmitInput<Schema, Model>;
704-
},
701+
} & SelectIncludeOmit<Schema, Model, true>,
705702
Simplify
706703
>;
707704

@@ -715,13 +712,7 @@ export type CreateManyAndReturnArgs<
715712
Schema extends SchemaDef,
716713
Model extends GetModels<Schema>,
717714
Simplify extends boolean = false,
718-
> = SimplifyIf<
719-
CreateManyInput<Schema, Model> & {
720-
select?: SelectInput<Schema, Model, false, false>;
721-
omit?: OmitInput<Schema, Model>;
722-
},
723-
Simplify
724-
>;
715+
> = SimplifyIf<CreateManyInput<Schema, Model> & Omit<SelectIncludeOmit<Schema, Model, false>, 'include'>, Simplify>;
725716

726717
type OptionalWrap<Schema extends SchemaDef, Model extends GetModels<Schema>, T extends object> = Optional<
727718
T,
@@ -855,10 +846,7 @@ export type UpdateArgs<
855846
{
856847
data: UpdateInput<Schema, Model>;
857848
where: WhereUniqueInput<Schema, Model>;
858-
select?: SelectInput<Schema, Model>;
859-
include?: IncludeInput<Schema, Model>;
860-
omit?: OmitInput<Schema, Model>;
861-
},
849+
} & SelectIncludeOmit<Schema, Model, true>,
862850
Simplify
863851
>;
864852

@@ -872,13 +860,7 @@ export type UpdateManyAndReturnArgs<
872860
Schema extends SchemaDef,
873861
Model extends GetModels<Schema>,
874862
Simplify extends boolean = false,
875-
> = SimplifyIf<
876-
UpdateManyPayload<Schema, Model> & {
877-
select?: SelectInput<Schema, Model, false, false>;
878-
omit?: OmitInput<Schema, Model>;
879-
},
880-
Simplify
881-
>;
863+
> = SimplifyIf<UpdateManyPayload<Schema, Model> & Omit<SelectIncludeOmit<Schema, Model, false>, 'include'>, Simplify>;
882864

883865
type UpdateManyPayload<Schema extends SchemaDef, Model extends GetModels<Schema>, Without extends string = never> = {
884866
data: OrArray<UpdateScalarInput<Schema, Model, Without>>;
@@ -895,10 +877,7 @@ export type UpsertArgs<
895877
create: CreateInput<Schema, Model>;
896878
update: UpdateInput<Schema, Model>;
897879
where: WhereUniqueInput<Schema, Model>;
898-
select?: SelectInput<Schema, Model>;
899-
include?: IncludeInput<Schema, Model>;
900-
omit?: OmitInput<Schema, Model>;
901-
},
880+
} & SelectIncludeOmit<Schema, Model, true>,
902881
Simplify
903882
>;
904883

@@ -1019,10 +998,7 @@ export type DeleteArgs<
1019998
> = SimplifyIf<
1020999
{
10211000
where: WhereUniqueInput<Schema, Model>;
1022-
select?: SelectInput<Schema, Model>;
1023-
include?: IncludeInput<Schema, Model>;
1024-
omit?: OmitInput<Schema, Model>;
1025-
},
1001+
} & SelectIncludeOmit<Schema, Model, true>,
10261002
Simplify
10271003
>;
10281004

0 commit comments

Comments
 (0)