@zenstackhq/orm 3.0.0-beta.22 → 3.0.0-beta.23

package/dist/index.d.ts

@@ -120,7 +120,6 @@ type _Depth = [never, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
 type Simplify<T, D extends number = 6> = D extends 0 ? T : T extends object ? T extends _Preserve ? T : {
     [K in keyof T]: Simplify<T[K], _Depth[D]>;
 } & {} : T;
-type SimplifyIf<T, Condition extends boolean> = Condition extends true ? Simplify<T> : T;
 type WrapType<T, Optional = false, Array = false> = Array extends true ? Optional extends true ? T[] | null : T[] : Optional extends true ? T | null : T;
 type TypeMap = {
     String: string;
@@ -222,7 +221,7 @@ type BatchResult = {
     count: number;
 };
 type WhereInput<Schema extends SchemaDef, Model extends GetModels<Schema>, ScalarOnly extends boolean = false, WithAggregations extends boolean = false> = {
-    [Key in GetModelFields<Schema, Model> as ScalarOnly extends true ? Key extends RelationFields<Schema, Model> ? never : Key : Key]?: Key extends RelationFields<Schema, Model> ? RelationFilter<Schema, Model, Key> : FieldIsArray<Schema, Model, Key> extends true ? ArrayFilter<Schema, GetModelFieldType<Schema, Model, Key>> : GetModelFieldType<Schema, Model, Key> extends GetEnums<Schema> ? EnumFilter<Schema, GetModelFieldType<Schema, Model, Key>, ModelFieldIsOptional<Schema, Model, Key>, WithAggregations> : PrimitiveFilter<Schema, GetModelFieldType<Schema, Model, Key>, ModelFieldIsOptional<Schema, Model, Key>, WithAggregations>;
+    [Key in GetModelFields<Schema, Model> as ScalarOnly extends true ? Key extends RelationFields<Schema, Model> ? never : Key : Key]?: Key extends RelationFields<Schema, Model> ? RelationFilter<Schema, Model, Key> : FieldIsArray<Schema, Model, Key> extends true ? ArrayFilter<Schema, GetModelFieldType<Schema, Model, Key>> : GetModelFieldType<Schema, Model, Key> extends GetEnums<Schema> ? EnumFilter<Schema, GetModelFieldType<Schema, Model, Key>, ModelFieldIsOptional<Schema, Model, Key>, WithAggregations> : PrimitiveFilter<GetModelFieldType<Schema, Model, Key>, ModelFieldIsOptional<Schema, Model, Key>, WithAggregations>;
 } & {
     $expr?: (eb: ExpressionBuilder<ToKyselySchema<Schema>, Model>) => OperandExpression<SqlBool>;
 } & {
@@ -236,7 +235,7 @@ type EnumFilter<Schema extends SchemaDef, T extends GetEnums<Schema>, Nullable e
     notIn?: (keyof GetEnum<Schema, T>)[];
     not?: EnumFilter<Schema, T, Nullable, WithAggregations>;
 } & (WithAggregations extends true ? {
-    _count?: NumberFilter<Schema, 'Int', false, false>;
+    _count?: NumberFilter<'Int', false, false>;
     _min?: EnumFilter<Schema, T, false, false>;
     _max?: EnumFilter<Schema, T, false, false>;
 } : {}));
@@ -248,8 +247,8 @@ type ArrayFilter<Schema extends SchemaDef, T extends string> = {
     isEmpty?: boolean;
 };
 type MapScalarType<Schema extends SchemaDef, T extends string> = T extends GetEnums<Schema> ? keyof GetEnum<Schema, T> : MapBaseType$1<T>;
-type PrimitiveFilter<Schema extends SchemaDef, T extends string, Nullable extends boolean, WithAggregations extends boolean> = T extends 'String' ? StringFilter<Schema, Nullable, WithAggregations> : T extends 'Int' | 'Float' | 'Decimal' | 'BigInt' ? NumberFilter<Schema, T, Nullable, WithAggregations> : T extends 'Boolean' ? BooleanFilter<Schema, Nullable, WithAggregations> : T extends 'DateTime' ? DateTimeFilter<Schema, Nullable, WithAggregations> : T extends 'Bytes' ? BytesFilter<Schema, Nullable, WithAggregations> : T extends 'Json' ? 'Not implemented yet' : never;
-type CommonPrimitiveFilter<Schema extends SchemaDef, DataType, T extends BuiltinType, Nullable extends boolean, WithAggregations extends boolean> = {
+type PrimitiveFilter<T extends string, Nullable extends boolean, WithAggregations extends boolean> = T extends 'String' ? StringFilter<Nullable, WithAggregations> : T extends 'Int' | 'Float' | 'Decimal' | 'BigInt' ? NumberFilter<T, Nullable, WithAggregations> : T extends 'Boolean' ? BooleanFilter<Nullable, WithAggregations> : T extends 'DateTime' ? DateTimeFilter<Nullable, WithAggregations> : T extends 'Bytes' ? BytesFilter<Nullable, WithAggregations> : T extends 'Json' ? 'Not implemented yet' : never;
+type CommonPrimitiveFilter<DataType, T extends BuiltinType, Nullable extends boolean, WithAggregations extends boolean> = {
     equals?: NullableIf<DataType, Nullable>;
     in?: DataType[];
     notIn?: DataType[];
@@ -257,48 +256,50 @@ type CommonPrimitiveFilter<Schema extends SchemaDef, DataType, T extends Builtin
     lte?: DataType;
     gt?: DataType;
     gte?: DataType;
-    not?: PrimitiveFilter<Schema, T, Nullable, WithAggregations>;
+    not?: PrimitiveFilter<T, Nullable, WithAggregations>;
 };
-type StringFilter<Schema extends SchemaDef, Nullable extends boolean, WithAggregations extends boolean> = NullableIf<string, Nullable> | (CommonPrimitiveFilter<Schema, string, 'String', Nullable, WithAggregations> & {
+type StringFilter<Nullable extends boolean, WithAggregations extends boolean> = NullableIf<string, Nullable> | (CommonPrimitiveFilter<string, 'String', Nullable, WithAggregations> & {
     contains?: string;
     startsWith?: string;
     endsWith?: string;
-} & (WithAggregations extends true ? {
-    _count?: NumberFilter<Schema, 'Int', false, false>;
-    _min?: StringFilter<Schema, false, false>;
-    _max?: StringFilter<Schema, false, false>;
-} : {}) & (ProviderSupportsCaseSensitivity<Schema> extends true ? {
+    /**
+     * Not effective for "sqlite" provider
+     */
     mode?: 'default' | 'insensitive';
+} & (WithAggregations extends true ? {
+    _count?: NumberFilter<'Int', false, false>;
+    _min?: StringFilter<false, false>;
+    _max?: StringFilter<false, false>;
 } : {}));
-type NumberFilter<Schema extends SchemaDef, T extends 'Int' | 'Float' | 'Decimal' | 'BigInt', Nullable extends boolean, WithAggregations extends boolean> = NullableIf<number | bigint, Nullable> | (CommonPrimitiveFilter<Schema, number, T, Nullable, WithAggregations> & (WithAggregations extends true ? {
-    _count?: NumberFilter<Schema, 'Int', false, false>;
-    _avg?: NumberFilter<Schema, T, false, false>;
-    _sum?: NumberFilter<Schema, T, false, false>;
-    _min?: NumberFilter<Schema, T, false, false>;
-    _max?: NumberFilter<Schema, T, false, false>;
+type NumberFilter<T extends 'Int' | 'Float' | 'Decimal' | 'BigInt', Nullable extends boolean, WithAggregations extends boolean> = NullableIf<number | bigint, Nullable> | (CommonPrimitiveFilter<number, T, Nullable, WithAggregations> & (WithAggregations extends true ? {
+    _count?: NumberFilter<'Int', false, false>;
+    _avg?: NumberFilter<T, false, false>;
+    _sum?: NumberFilter<T, false, false>;
+    _min?: NumberFilter<T, false, false>;
+    _max?: NumberFilter<T, false, false>;
 } : {}));
-type DateTimeFilter<Schema extends SchemaDef, Nullable extends boolean, WithAggregations extends boolean> = NullableIf<Date | string, Nullable> | (CommonPrimitiveFilter<Schema, Date | string, 'DateTime', Nullable, WithAggregations> & (WithAggregations extends true ? {
-    _count?: NumberFilter<Schema, 'Int', false, false>;
-    _min?: DateTimeFilter<Schema, false, false>;
-    _max?: DateTimeFilter<Schema, false, false>;
+type DateTimeFilter<Nullable extends boolean, WithAggregations extends boolean> = NullableIf<Date | string, Nullable> | (CommonPrimitiveFilter<Date | string, 'DateTime', Nullable, WithAggregations> & (WithAggregations extends true ? {
+    _count?: NumberFilter<'Int', false, false>;
+    _min?: DateTimeFilter<false, false>;
+    _max?: DateTimeFilter<false, false>;
 } : {}));
-type BytesFilter<Schema extends SchemaDef, Nullable extends boolean, WithAggregations extends boolean> = NullableIf<Uint8Array | Buffer, Nullable> | ({
+type BytesFilter<Nullable extends boolean, WithAggregations extends boolean> = NullableIf<Uint8Array | Buffer, Nullable> | ({
     equals?: NullableIf<Uint8Array, Nullable>;
     in?: Uint8Array[];
     notIn?: Uint8Array[];
-    not?: BytesFilter<Schema, Nullable, WithAggregations>;
+    not?: BytesFilter<Nullable, WithAggregations>;
 } & (WithAggregations extends true ? {
-    _count?: NumberFilter<Schema, 'Int', false, false>;
-    _min?: BytesFilter<Schema, false, false>;
-    _max?: BytesFilter<Schema, false, false>;
+    _count?: NumberFilter<'Int', false, false>;
+    _min?: BytesFilter<false, false>;
+    _max?: BytesFilter<false, false>;
 } : {}));
-type BooleanFilter<Schema extends SchemaDef, Nullable extends boolean, WithAggregations extends boolean> = NullableIf<boolean, Nullable> | ({
+type BooleanFilter<Nullable extends boolean, WithAggregations extends boolean> = NullableIf<boolean, Nullable> | ({
     equals?: NullableIf<boolean, Nullable>;
-    not?: BooleanFilter<Schema, Nullable, WithAggregations>;
+    not?: BooleanFilter<Nullable, WithAggregations>;
 } & (WithAggregations extends true ? {
-    _count?: NumberFilter<Schema, 'Int', false, false>;
-    _min?: BooleanFilter<Schema, false, false>;
-    _max?: BooleanFilter<Schema, false, false>;
+    _count?: NumberFilter<'Int', false, false>;
+    _min?: BooleanFilter<false, false>;
+    _max?: BooleanFilter<false, false>;
 } : {}));
 type SortOrder = 'asc' | 'desc';
 type NullsOrder = 'first' | 'last';
@@ -327,10 +328,10 @@ type WhereUniqueInput<Schema extends SchemaDef, Model extends GetModels<Schema>>
 type OmitInput<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
     [Key in NonRelationFields<Schema, Model>]?: boolean;
 };
-type SelectIncludeOmit<Schema extends SchemaDef, Model extends GetModels<Schema>, AllowCount extends boolean> = {
-    select?: SelectInput<Schema, Model, AllowCount, boolean>;
-    include?: IncludeInput<Schema, Model, AllowCount>;
-    omit?: OmitInput<Schema, Model>;
+type SelectIncludeOmit<Schema extends SchemaDef, Model extends GetModels<Schema>, AllowCount extends boolean, AllowRelation extends boolean = true> = {
+    select?: SelectInput<Schema, Model, AllowCount, AllowRelation> | null;
+    include?: IncludeInput<Schema, Model, AllowCount> | null;
+    omit?: OmitInput<Schema, Model> | null;
 };
 type SelectInput<Schema extends SchemaDef, Model extends GetModels<Schema>, AllowCount extends boolean = true, AllowRelation extends boolean = true> = {
     [Key in NonRelationFields<Schema, Model>]?: boolean;
@@ -391,22 +392,16 @@ type SortAndTakeArgs<Schema extends SchemaDef, Model extends GetModels<Schema>>
 type FindArgs<Schema extends SchemaDef, Model extends GetModels<Schema>, Collection extends boolean, AllowFilter extends boolean = true> = ProviderSupportsDistinct<Schema> extends true ? (Collection extends true ? SortAndTakeArgs<Schema, Model> & {
     distinct?: OrArray<NonRelationFields<Schema, Model>>;
 } : {}) & (AllowFilter extends true ? FilterArgs<Schema, Model> : {}) & SelectIncludeOmit<Schema, Model, Collection> : (Collection extends true ? SortAndTakeArgs<Schema, Model> : {}) & (AllowFilter extends true ? FilterArgs<Schema, Model> : {}) & SelectIncludeOmit<Schema, Model, Collection>;
-type FindManyArgs<Schema extends SchemaDef, Model extends GetModels<Schema>, Simplify extends boolean = false> = SimplifyIf<FindArgs<Schema, Model, true>, Simplify>;
-type FindFirstArgs<Schema extends SchemaDef, Model extends GetModels<Schema>, Simplify extends boolean = false> = SimplifyIf<FindArgs<Schema, Model, true>, Simplify>;
-type FindUniqueArgs<Schema extends SchemaDef, Model extends GetModels<Schema>, Simplify extends boolean = false> = SimplifyIf<{
-    where?: WhereUniqueInput<Schema, Model>;
-} & SelectIncludeOmit<Schema, Model, true>, Simplify>;
-type CreateArgs<Schema extends SchemaDef, Model extends GetModels<Schema>, Simplify extends boolean = false> = SimplifyIf<{
+type FindManyArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = FindArgs<Schema, Model, true>;
+type FindFirstArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = FindArgs<Schema, Model, true>;
+type FindUniqueArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
+    where: WhereUniqueInput<Schema, Model>;
+} & SelectIncludeOmit<Schema, Model, true>;
+type CreateArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
     data: CreateInput<Schema, Model>;
-    select?: SelectInput<Schema, Model>;
-    include?: IncludeInput<Schema, Model>;
-    omit?: OmitInput<Schema, Model>;
-}, Simplify>;
-type CreateManyArgs<Schema extends SchemaDef, Model extends GetModels<Schema>, Simplify extends boolean = false> = SimplifyIf<CreateManyInput<Schema, Model>, Simplify>;
-type CreateManyAndReturnArgs<Schema extends SchemaDef, Model extends GetModels<Schema>, Simplify extends boolean = false> = SimplifyIf<CreateManyInput<Schema, Model> & {
-    select?: SelectInput<Schema, Model, false, false>;
-    omit?: OmitInput<Schema, Model>;
-}, Simplify>;
+} & SelectIncludeOmit<Schema, Model, true>;
+type CreateManyArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = CreateManyInput<Schema, Model>;
+type CreateManyAndReturnArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = CreateManyInput<Schema, Model> & Omit<SelectIncludeOmit<Schema, Model, false, false>, 'include'>;
 type OptionalWrap<Schema extends SchemaDef, Model extends GetModels<Schema>, T extends object> = Optional<T, keyof T & OptionalFieldsForCreate<Schema, Model>>;
 type CreateScalarPayload<Schema extends SchemaDef, Model extends GetModels<Schema>> = OptionalWrap<Schema, Model, {
     [Key in ScalarFields<Schema, Model, false> as FieldIsDelegateDiscriminator<Schema, Model, Key> extends true ? never : Key]: ScalarCreatePayload<Schema, Model, Key>;
@@ -442,31 +437,22 @@ type CreateManyInput<Schema extends SchemaDef, Model extends GetModels<Schema>,
 type CreateInput<Schema extends SchemaDef, Model extends GetModels<Schema>, Without extends string = never> = XOR<Omit<CreateWithFKInput<Schema, Model>, Without>, Omit<CreateWithRelationInput<Schema, Model>, Without>>;
 type NestedCreateInput<Schema extends SchemaDef, Model extends GetModels<Schema>, Field extends RelationFields<Schema, Model>> = OrArray<CreateInput<Schema, RelationFieldType<Schema, Model, Field>, OppositeRelationAndFK<Schema, Model, Field>>, FieldIsArray<Schema, Model, Field>>;
 type NestedCreateManyInput<Schema extends SchemaDef, Model extends GetModels<Schema>, Field extends RelationFields<Schema, Model>> = CreateManyInput<Schema, RelationFieldType<Schema, Model, Field>, OppositeRelationAndFK<Schema, Model, Field>>;
-type UpdateArgs<Schema extends SchemaDef, Model extends GetModels<Schema>, Simplify extends boolean = false> = SimplifyIf<{
+type UpdateArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
     data: UpdateInput<Schema, Model>;
     where: WhereUniqueInput<Schema, Model>;
-    select?: SelectInput<Schema, Model>;
-    include?: IncludeInput<Schema, Model>;
-    omit?: OmitInput<Schema, Model>;
-}, Simplify>;
-type UpdateManyArgs<Schema extends SchemaDef, Model extends GetModels<Schema>, Simplify extends boolean = false> = SimplifyIf<UpdateManyPayload<Schema, Model>, Simplify>;
-type UpdateManyAndReturnArgs<Schema extends SchemaDef, Model extends GetModels<Schema>, Simplify extends boolean = false> = SimplifyIf<UpdateManyPayload<Schema, Model> & {
-    select?: SelectInput<Schema, Model, false, false>;
-    omit?: OmitInput<Schema, Model>;
-}, Simplify>;
+} & SelectIncludeOmit<Schema, Model, true>;
+type UpdateManyArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = UpdateManyPayload<Schema, Model>;
+type UpdateManyAndReturnArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = UpdateManyPayload<Schema, Model> & Omit<SelectIncludeOmit<Schema, Model, false, false>, 'include'>;
 type UpdateManyPayload<Schema extends SchemaDef, Model extends GetModels<Schema>, Without extends string = never> = {
     data: OrArray<UpdateScalarInput<Schema, Model, Without>>;
     where?: WhereInput<Schema, Model>;
     limit?: number;
 };
-type UpsertArgs<Schema extends SchemaDef, Model extends GetModels<Schema>, Simplify extends boolean = false> = SimplifyIf<{
+type UpsertArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
     create: CreateInput<Schema, Model>;
     update: UpdateInput<Schema, Model>;
     where: WhereUniqueInput<Schema, Model>;
-    select?: SelectInput<Schema, Model>;
-    include?: IncludeInput<Schema, Model>;
-    omit?: OmitInput<Schema, Model>;
-}, Simplify>;
+} & SelectIncludeOmit<Schema, Model, true>;
 type UpdateScalarInput<Schema extends SchemaDef, Model extends GetModels<Schema>, Without extends string = never> = Omit<{
     [Key in NonRelationFields<Schema, Model> as FieldIsDelegateDiscriminator<Schema, Model, Key> extends true ? never : Key]?: ScalarUpdatePayload<Schema, Model, Key>;
 }, Without>;
@@ -508,19 +494,16 @@ type ToOneRelationUpdateInput<Schema extends SchemaDef, Model extends GetModels<
     disconnect?: DisconnectInput<Schema, Model, Field>;
     delete?: NestedDeleteInput<Schema, Model, Field>;
 } : {}), FieldIsDelegateRelation<Schema, Model, Field> extends true ? 'create' | 'connectOrCreate' | 'upsert' : never>;
-type DeleteArgs<Schema extends SchemaDef, Model extends GetModels<Schema>, Simplify extends boolean = false> = SimplifyIf<{
+type DeleteArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
     where: WhereUniqueInput<Schema, Model>;
-    select?: SelectInput<Schema, Model>;
-    include?: IncludeInput<Schema, Model>;
-    omit?: OmitInput<Schema, Model>;
-}, Simplify>;
-type DeleteManyArgs<Schema extends SchemaDef, Model extends GetModels<Schema>, Simplify extends boolean = false> = SimplifyIf<{
+} & SelectIncludeOmit<Schema, Model, true>;
+type DeleteManyArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
     where?: WhereInput<Schema, Model>;
     limit?: number;
-}, Simplify>;
-type CountArgs<Schema extends SchemaDef, Model extends GetModels<Schema>, Simplify extends boolean = false> = SimplifyIf<Omit<FindArgs<Schema, Model, true>, 'select' | 'include' | 'distinct' | 'omit'> & {
+};
+type CountArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = Omit<FindArgs<Schema, Model, true>, 'select' | 'include' | 'distinct' | 'omit'> & {
     select?: CountAggregateInput<Schema, Model> | true;
-}, Simplify>;
+};
 type CountAggregateInput<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
     [Key in NonRelationFields<Schema, Model>]?: true;
 } & {
@@ -531,7 +514,7 @@ type CountResult<Schema extends SchemaDef, _Model extends GetModels<Schema>, Arg
 } ? S extends true ? number : {
     [Key in keyof S]: number;
 } : number;
-type AggregateArgs<Schema extends SchemaDef, Model extends GetModels<Schema>, Simplify extends boolean = false> = SimplifyIf<{
+type AggregateArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
     where?: WhereInput<Schema, Model>;
     skip?: number;
     take?: number;
@@ -543,7 +526,7 @@ type AggregateArgs<Schema extends SchemaDef, Model extends GetModels<Schema>, Si
 } & (NumericFields<Schema, Model> extends never ? {} : {
     _avg?: SumAvgInput<Schema, Model, true>;
     _sum?: SumAvgInput<Schema, Model, true>;
-}), Simplify>;
+});
 type NumericFields<Schema extends SchemaDef, Model extends GetModels<Schema>> = keyof {
     [Key in GetModelFields<Schema, Model> as GetModelFieldType<Schema, Model, Key> extends 'Int' | 'Float' | 'BigInt' | 'Decimal' ? FieldIsArray<Schema, Model, Key> extends true ? never : Key : never]: GetModelField<Schema, Model, Key>;
 };
@@ -578,7 +561,7 @@ type AggCommonOutput<Input> = Input extends true ? number : Input extends {} ? {
     [Key in keyof Input]: number;
 } : never;
 type GroupByHaving<Schema extends SchemaDef, Model extends GetModels<Schema>> = Omit<WhereInput<Schema, Model, true, true>, '$expr'>;
-type GroupByArgs<Schema extends SchemaDef, Model extends GetModels<Schema>, Simplify extends boolean = false> = SimplifyIf<{
+type GroupByArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
     where?: WhereInput<Schema, Model>;
     orderBy?: OrArray<OrderBy<Schema, Model, false, true>>;
     by: NonRelationFields<Schema, Model> | NonEmptyArray<NonRelationFields<Schema, Model>>;
@@ -591,7 +574,7 @@ type GroupByArgs<Schema extends SchemaDef, Model extends GetModels<Schema>, Simp
 } & (NumericFields<Schema, Model> extends never ? {} : {
     _avg?: SumAvgInput<Schema, Model, true>;
     _sum?: SumAvgInput<Schema, Model, true>;
-}), Simplify>;
+});
 type GroupByResult<Schema extends SchemaDef, Model extends GetModels<Schema>, Args extends {
     by: unknown;
 }> = Array<{
@@ -644,7 +627,6 @@ type NonOwnedRelationFields<Schema extends SchemaDef, Model extends GetModels<Sc
 type HasToManyRelations<Schema extends SchemaDef, Model extends GetModels<Schema>> = keyof {
     [Key in RelationFields<Schema, Model> as FieldIsArray<Schema, Model, Key> extends true ? Key : never]: true;
 } extends never ? false : true;
-type ProviderSupportsCaseSensitivity<Schema extends SchemaDef> = Schema['provider']['type'] extends 'postgresql' ? true : false;
 type ProviderSupportsDistinct<Schema extends SchemaDef> = Schema['provider']['type'] extends 'postgresql' ? true : false;
 
 declare abstract class BaseCrudDialect<Schema extends SchemaDef> {
@@ -675,7 +657,7 @@ declare abstract class BaseCrudDialect<Schema extends SchemaDef> {
     private buildBytesFilter;
     private buildEnumFilter;
     buildOrderBy(query: SelectQueryBuilder<any, any, any>, model: string, modelAlias: string, orderBy: OrArray<OrderBy<Schema, GetModels<Schema>, boolean, boolean>> | undefined, negated: boolean): SelectQueryBuilder<any, any, any>;
-    buildSelectAllFields(model: string, query: SelectQueryBuilder<any, any, any>, omit: Record<string, boolean | undefined> | undefined, modelAlias: string): SelectQueryBuilder<any, any, any>;
+    buildSelectAllFields(model: string, query: SelectQueryBuilder<any, any, any>, omit: Record<string, boolean | undefined> | undefined | null, modelAlias: string): SelectQueryBuilder<any, any, any>;
     protected buildModelSelect(model: GetModels<Schema>, subQueryAlias: string, payload: true | FindArgs<Schema, GetModels<Schema>, true>, selectAllFields: boolean): SelectQueryBuilder<any, any, {}>;
     buildSelectField(query: SelectQueryBuilder<any, any, any>, model: string, modelAlias: string, field: string): SelectQueryBuilder<any, any, any>;
     buildDelegateJoin(thisModel: string, thisModelAlias: string, otherModelAlias: string, query: SelectQueryBuilder<any, any, any>): SelectQueryBuilder<any, any, any>;
@@ -1225,35 +1207,35 @@ type AllModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema
      * }); // result: `{ _count: { posts: number } }`
      * ```
      */
-    findMany<T extends FindManyArgs<Schema, Model, true>>(args?: SelectSubset<T, FindManyArgs<Schema, Model>>): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, T>[]>;
+    findMany<T extends FindManyArgs<Schema, Model>>(args?: SelectSubset<T, FindManyArgs<Schema, Model>>): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, T>[]>;
     /**
      * Returns a uniquely identified entity.
      * @param args - query args
      * @returns a single entity or null if not found
      * @see {@link findMany}
      */
-    findUnique<T extends FindUniqueArgs<Schema, Model, true>>(args: SelectSubset<T, FindUniqueArgs<Schema, Model>>): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, T> | null>;
+    findUnique<T extends FindUniqueArgs<Schema, Model>>(args: SelectSubset<T, FindUniqueArgs<Schema, Model>>): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, T> | null>;
     /**
      * Returns a uniquely identified entity or throws `NotFoundError` if not found.
      * @param args - query args
      * @returns a single entity
      * @see {@link findMany}
      */
-    findUniqueOrThrow<T extends FindUniqueArgs<Schema, Model, true>>(args: SelectSubset<T, FindUniqueArgs<Schema, Model>>): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, T>>;
+    findUniqueOrThrow<T extends FindUniqueArgs<Schema, Model>>(args: SelectSubset<T, FindUniqueArgs<Schema, Model>>): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, T>>;
     /**
      * Returns the first entity.
      * @param args - query args
      * @returns a single entity or null if not found
      * @see {@link findMany}
      */
-    findFirst<T extends FindFirstArgs<Schema, Model, true>>(args?: SelectSubset<T, FindFirstArgs<Schema, Model>>): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, T> | null>;
+    findFirst<T extends FindFirstArgs<Schema, Model>>(args?: SelectSubset<T, FindFirstArgs<Schema, Model>>): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, T> | null>;
     /**
      * Returns the first entity or throws `NotFoundError` if not found.
      * @param args - query args
      * @returns a single entity
      * @see {@link findMany}
      */
-    findFirstOrThrow<T extends FindFirstArgs<Schema, Model, true>>(args?: SelectSubset<T, FindFirstArgs<Schema, Model>>): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, T>>;
+    findFirstOrThrow<T extends FindFirstArgs<Schema, Model>>(args?: SelectSubset<T, FindFirstArgs<Schema, Model>>): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, T>>;
     /**
      * Creates a new entity.
      * @param args - create args
@@ -1306,7 +1288,7 @@ type AllModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema
      * });
      * ```
      */
-    create<T extends CreateArgs<Schema, Model, true>>(args: SelectSubset<T, CreateArgs<Schema, Model>>): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, T>>;
+    create<T extends CreateArgs<Schema, Model>>(args: SelectSubset<T, CreateArgs<Schema, Model>>): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, T>>;
     /**
      * Creates multiple entities. Only scalar fields are allowed.
      * @param args - create args
@@ -1332,7 +1314,7 @@ type AllModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema
      * });
      * ```
      */
-    createMany<T extends CreateManyArgs<Schema, Model, true>>(args?: SelectSubset<T, CreateManyArgs<Schema, Model>>): ZenStackPromise<Schema, BatchResult>;
+    createMany<T extends CreateManyArgs<Schema, Model>>(args?: SelectSubset<T, CreateManyArgs<Schema, Model>>): ZenStackPromise<Schema, BatchResult>;
     /**
      * Creates multiple entities and returns them.
      * @param args - create args. See {@link createMany} for input. Use
@@ -1351,7 +1333,7 @@ type AllModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema
      * });
      * ```
      */
-    createManyAndReturn<T extends CreateManyAndReturnArgs<Schema, Model, true>>(args?: SelectSubset<T, CreateManyAndReturnArgs<Schema, Model>>): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, T>[]>;
+    createManyAndReturn<T extends CreateManyAndReturnArgs<Schema, Model>>(args?: SelectSubset<T, CreateManyAndReturnArgs<Schema, Model>>): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, T>[]>;
     /**
      * Updates a uniquely identified entity.
      * @param args - update args. See {@link findMany} for how to control
@@ -1469,7 +1451,7 @@ type AllModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema
      * });
      * ```
      */
-    update<T extends UpdateArgs<Schema, Model, true>>(args: SelectSubset<T, UpdateArgs<Schema, Model>>): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, T>>;
+    update<T extends UpdateArgs<Schema, Model>>(args: SelectSubset<T, UpdateArgs<Schema, Model>>): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, T>>;
     /**
      * Updates multiple entities.
      * @param args - update args. Only scalar fields are allowed for data.
@@ -1490,7 +1472,7 @@ type AllModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema
      *     limit: 10
      * });
      */
-    updateMany<T extends UpdateManyArgs<Schema, Model, true>>(args: Subset<T, UpdateManyArgs<Schema, Model>>): ZenStackPromise<Schema, BatchResult>;
+    updateMany<T extends UpdateManyArgs<Schema, Model>>(args: Subset<T, UpdateManyArgs<Schema, Model>>): ZenStackPromise<Schema, BatchResult>;
     /**
      * Updates multiple entities and returns them.
      * @param args - update args. Only scalar fields are allowed for data.
@@ -1513,7 +1495,7 @@ type AllModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema
      * });
      * ```
      */
-    updateManyAndReturn<T extends UpdateManyAndReturnArgs<Schema, Model, true>>(args: Subset<T, UpdateManyAndReturnArgs<Schema, Model>>): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, T>[]>;
+    updateManyAndReturn<T extends UpdateManyAndReturnArgs<Schema, Model>>(args: Subset<T, UpdateManyAndReturnArgs<Schema, Model>>): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, T>[]>;
     /**
      * Creates or updates an entity.
      * @param args - upsert args
@@ -1534,7 +1516,7 @@ type AllModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema
      * });
      * ```
      */
-    upsert<T extends UpsertArgs<Schema, Model, true>>(args: SelectSubset<T, UpsertArgs<Schema, Model>>): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, T>>;
+    upsert<T extends UpsertArgs<Schema, Model>>(args: SelectSubset<T, UpsertArgs<Schema, Model>>): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, T>>;
     /**
      * Deletes a uniquely identifiable entity.
      * @param args - delete args
@@ -1554,7 +1536,7 @@ type AllModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema
      * }); // result: `{ id: string; email: string }`
      * ```
      */
-    delete<T extends DeleteArgs<Schema, Model, true>>(args: SelectSubset<T, DeleteArgs<Schema, Model>>): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, T>>;
+    delete<T extends DeleteArgs<Schema, Model>>(args: SelectSubset<T, DeleteArgs<Schema, Model>>): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, T>>;
     /**
      * Deletes multiple entities.
      * @param args - delete args
@@ -1574,7 +1556,7 @@ type AllModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema
      * });
      * ```
      */
-    deleteMany<T extends DeleteManyArgs<Schema, Model, true>>(args?: Subset<T, DeleteManyArgs<Schema, Model>>): ZenStackPromise<Schema, BatchResult>;
+    deleteMany<T extends DeleteManyArgs<Schema, Model>>(args?: Subset<T, DeleteManyArgs<Schema, Model>>): ZenStackPromise<Schema, BatchResult>;
     /**
      * Counts rows or field values.
      * @param args - count args
@@ -1593,7 +1575,7 @@ type AllModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema
      *     select: { _all: true, email: true }
      * }); // result: `{ _all: number, email: number }`
      */
-    count<T extends CountArgs<Schema, Model, true>>(args?: Subset<T, CountArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<CountResult<Schema, Model, T>>>;
+    count<T extends CountArgs<Schema, Model>>(args?: Subset<T, CountArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<CountResult<Schema, Model, T>>>;
     /**
      * Aggregates rows.
      * @param args - aggregation args
@@ -1611,7 +1593,7 @@ type AllModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema
      *     _max: { age: true }
      * }); // result: `{ _count: number, _avg: { age: number }, ... }`
      */
-    aggregate<T extends AggregateArgs<Schema, Model, true>>(args: Subset<T, AggregateArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<AggregateResult<Schema, Model, T>>>;
+    aggregate<T extends AggregateArgs<Schema, Model>>(args: Subset<T, AggregateArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<AggregateResult<Schema, Model, T>>>;
     /**
      * Groups rows by columns.
      * @param args - groupBy args
@@ -1645,7 +1627,7 @@ type AllModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema
      *     having: { country: 'US', age: { _avg: { gte: 18 } } }
      * });
      */
-    groupBy<T extends GroupByArgs<Schema, Model, true>>(args: Subset<T, GroupByArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<GroupByResult<Schema, Model, T>>>;
+    groupBy<T extends GroupByArgs<Schema, Model>>(args: Subset<T, GroupByArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<GroupByResult<Schema, Model, T>>>;
 };
 type OperationsIneligibleForDelegateModels = 'create' | 'createMany' | 'createManyAndReturn' | 'upsert';
 type ModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema>> = Omit<AllModelOperations<Schema, Model>, IsDelegateModel<Schema, Model> extends true ? OperationsIneligibleForDelegateModels : never>;

package/dist/index.js

@@ -4061,9 +4061,9 @@ var InputValidator = class {
     } else {
       fields["where"] = where.optional();
     }
-    fields["select"] = this.makeSelectSchema(model).optional();
-    fields["include"] = this.makeIncludeSchema(model).optional();
-    fields["omit"] = this.makeOmitSchema(model).optional();
+    fields["select"] = this.makeSelectSchema(model).optional().nullable();
+    fields["include"] = this.makeIncludeSchema(model).optional().nullable();
+    fields["omit"] = this.makeOmitSchema(model).optional().nullable();
     if (!options.unique) {
       fields["skip"] = this.makeSkipSchema().optional();
       if (options.findOne) {
@@ -4437,9 +4437,9 @@ var InputValidator = class {
         // to-many relations and optional to-one relations are filterable
         where: z2.lazy(() => this.makeWhereSchema(fieldDef.type, false)).optional()
       } : {},
-      select: z2.lazy(() => this.makeSelectSchema(fieldDef.type)).optional(),
-      include: z2.lazy(() => this.makeIncludeSchema(fieldDef.type)).optional(),
-      omit: z2.lazy(() => this.makeOmitSchema(fieldDef.type)).optional(),
+      select: z2.lazy(() => this.makeSelectSchema(fieldDef.type)).optional().nullable(),
+      include: z2.lazy(() => this.makeIncludeSchema(fieldDef.type)).optional().nullable(),
+      omit: z2.lazy(() => this.makeOmitSchema(fieldDef.type)).optional().nullable(),
       ...fieldDef.array ? {
         // to-many relations can be ordered, skipped, taken, and cursor-located
         orderBy: z2.lazy(() => this.orArray(this.makeOrderBySchema(fieldDef.type, true, false), true)).optional(),
@@ -4548,9 +4548,9 @@ var InputValidator = class {
     const dataSchema = this.makeCreateDataSchema(model, false);
     let schema = z2.strictObject({
       data: dataSchema,
-      select: this.makeSelectSchema(model).optional(),
-      include: this.makeIncludeSchema(model).optional(),
-      omit: this.makeOmitSchema(model).optional()
+      select: this.makeSelectSchema(model).optional().nullable(),
+      include: this.makeIncludeSchema(model).optional().nullable(),
+      omit: this.makeOmitSchema(model).optional().nullable()
     });
     schema = this.refineForSelectIncludeMutuallyExclusive(schema);
     schema = this.refineForSelectOmitMutuallyExclusive(schema);
@@ -4562,8 +4562,8 @@ var InputValidator = class {
   makeCreateManyAndReturnSchema(model) {
     const base = this.makeCreateManyDataSchema(model, []);
     const result = base.extend({
-      select: this.makeSelectSchema(model).optional(),
-      omit: this.makeOmitSchema(model).optional()
+      select: this.makeSelectSchema(model).optional().nullable(),
+      omit: this.makeOmitSchema(model).optional().nullable()
     });
     return this.refineForSelectOmitMutuallyExclusive(result).optional();
   }
@@ -4753,9 +4753,9 @@ var InputValidator = class {
     let schema = z2.strictObject({
       where: this.makeWhereSchema(model, true),
       data: this.makeUpdateDataSchema(model),
-      select: this.makeSelectSchema(model).optional(),
-      include: this.makeIncludeSchema(model).optional(),
-      omit: this.makeOmitSchema(model).optional()
+      select: this.makeSelectSchema(model).optional().nullable(),
+      include: this.makeIncludeSchema(model).optional().nullable(),
+      omit: this.makeOmitSchema(model).optional().nullable()
     });
     schema = this.refineForSelectIncludeMutuallyExclusive(schema);
     schema = this.refineForSelectOmitMutuallyExclusive(schema);
@@ -4771,8 +4771,8 @@ var InputValidator = class {
   makeUpdateManyAndReturnSchema(model) {
     const base = this.makeUpdateManySchema(model);
     let schema = base.extend({
-      select: this.makeSelectSchema(model).optional(),
-      omit: this.makeOmitSchema(model).optional()
+      select: this.makeSelectSchema(model).optional().nullable(),
+      omit: this.makeOmitSchema(model).optional().nullable()
     });
     schema = this.refineForSelectOmitMutuallyExclusive(schema);
     return schema;
@@ -4782,9 +4782,9 @@ var InputValidator = class {
       where: this.makeWhereSchema(model, true),
       create: this.makeCreateDataSchema(model, false),
       update: this.makeUpdateDataSchema(model),
-      select: this.makeSelectSchema(model).optional(),
-      include: this.makeIncludeSchema(model).optional(),
-      omit: this.makeOmitSchema(model).optional()
+      select: this.makeSelectSchema(model).optional().nullable(),
+      include: this.makeIncludeSchema(model).optional().nullable(),
+      omit: this.makeOmitSchema(model).optional().nullable()
     });
     schema = this.refineForSelectIncludeMutuallyExclusive(schema);
     schema = this.refineForSelectOmitMutuallyExclusive(schema);
@@ -4874,8 +4874,8 @@ var InputValidator = class {
   makeDeleteSchema(model) {
     let schema = z2.strictObject({
       where: this.makeWhereSchema(model, true),
-      select: this.makeSelectSchema(model).optional(),
-      include: this.makeIncludeSchema(model).optional()
+      select: this.makeSelectSchema(model).optional().nullable(),
+      include: this.makeIncludeSchema(model).optional().nullable()
     });
     schema = this.refineForSelectIncludeMutuallyExclusive(schema);
     schema = this.refineForSelectOmitMutuallyExclusive(schema);
@@ -5265,7 +5265,9 @@ var QueryNameMapper = class extends OperationNodeTransformer {
       return super.transformSelectQuery(node);
     }
     const processedFroms = node.from.froms.map((from) => this.processSelectTable(from));
-    const processedJoins = (node.joins ?? []).map((join) => this.processSelectTable(join.table));
+    const processedJoins = this.withScopes([
+      ...processedFroms.map(({ scope }) => scope)
+    ], () => (node.joins ?? []).map((join) => this.processSelectTable(join.table)));
     const scopes = [
       ...processedFroms.map(({ scope }) => scope),
       ...processedJoins.map(({ scope }) => scope)