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

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import Decimal from 'decimal.js';
 import * as _zenstackhq_schema from '@zenstackhq/schema';
-import { SchemaDef, GetModels, ScalarFields, ForeignKeyFields, GetModelFields, FieldHasDefault, GetModelFieldType, ModelFieldIsOptional, GetModelField, NonRelationFields, RelationFields, FieldIsArray, RelationFieldType, FieldIsRelation, GetModel, FieldDef, GetEnums, GetEnum, GetTypeDefs, GetTypeDefFields, GetTypeDefField, TypeDefFieldIsOptional, BuiltinType, IsDelegateModel, GetModelDiscriminator, GetSubModels, FieldIsDelegateDiscriminator, FieldType, RelationInfo, FieldIsDelegateRelation, ModelDef, DataSourceProviderType, ProcedureDef, Expression as Expression$1, LiteralExpression, ArrayExpression, FieldExpression, MemberExpression, BinaryExpression, UnaryExpression, CallExpression, ThisExpression, NullExpression } from '@zenstackhq/schema';
+import { SchemaDef, GetModels, ScalarFields, ForeignKeyFields, GetModelFields, FieldHasDefault, GetModelFieldType, ModelFieldIsOptional, GetModelField, RelationFields, FieldIsArray, NonRelationFields, FieldDef, GetEnums, GetEnum, GetTypeDefs, GetTypeDefFields, GetTypeDefField, TypeDefFieldIsOptional, RelationFieldType, FieldIsRelation, GetModel, BuiltinType, IsDelegateModel, GetModelDiscriminator, GetSubModels, FieldIsDelegateDiscriminator, FieldType, RelationInfo, FieldIsDelegateRelation, ModelDef, DataSourceProviderType, ProcedureDef, Expression as Expression$1, LiteralExpression, ArrayExpression, FieldExpression, MemberExpression, BinaryExpression, UnaryExpression, CallExpression, ThisExpression, NullExpression } from '@zenstackhq/schema';
 import * as kysely from 'kysely';
 import { OperationNodeVisitor, OperationNode, SelectQueryNode, SelectionNode, ColumnNode, AliasNode, TableNode, FromNode, ReferenceNode, AndNode, OrNode, ValueListNode, ParensNode, JoinNode, RawNode, WhereNode, InsertQueryNode, DeleteQueryNode, ReturningNode, CreateTableNode, AddColumnNode, ColumnDefinitionNode, DropTableNode, OrderByNode, OrderByItemNode, GroupByNode, GroupByItemNode, UpdateQueryNode, ColumnUpdateNode, LimitNode, OffsetNode, OnConflictNode, OnDuplicateKeyNode, CheckConstraintNode, DataTypeNode, SelectAllNode, IdentifierNode, SchemableIdentifierNode, ValueNode, PrimitiveValueListNode, OperatorNode, CreateIndexNode, DropIndexNode, ListNode, PrimaryKeyConstraintNode, UniqueConstraintNode, ReferencesNode, WithNode, CommonTableExpressionNode, CommonTableExpressionNameNode, HavingNode, CreateSchemaNode, DropSchemaNode, AlterTableNode, DropColumnNode, RenameColumnNode, AlterColumnNode, ModifyColumnNode, AddConstraintNode, DropConstraintNode, ForeignKeyConstraintNode, CreateViewNode, DropViewNode, GeneratedNode, DefaultValueNode, OnNode, ValuesNode, SelectModifierNode, CreateTypeNode, DropTypeNode, ExplainNode, DefaultInsertValueNode, AggregateFunctionNode, OverNode, PartitionByNode, PartitionByItemNode, SetOperationNode, BinaryOperationNode, UnaryOperationNode, UsingNode, FunctionNode, CaseNode, WhenNode, JSONReferenceNode, JSONPathNode, JSONPathLegNode, JSONOperatorChainNode, TupleNode, MergeQueryNode, MatchedNode, AddIndexNode, CastNode, FetchNode, TopNode, OutputNode, RenameConstraintNode, RefreshMaterializedViewNode, OrActionNode, CollateNode, Kysely, Generated, ExpressionBuilder, OperandExpression, SqlBool, SelectQueryBuilder, Expression, ExpressionWrapper, QueryId, RootOperationNode, QueryResult, UnknownRow, Dialect, KyselyConfig } from 'kysely';
 
@@ -120,6 +120,7 @@ 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;
@@ -200,7 +201,7 @@ type SelectCountResult<Schema extends SchemaDef, Model extends GetModels<Schema>
 } ? {
     [Key in keyof S]: number;
 } : never;
-type ModelResult<Schema extends SchemaDef, Model extends GetModels<Schema>, Args extends SelectIncludeOmit<Schema, Model, boolean> = {}, Optional = false, Array = false> = WrapType<Args extends {
+type ModelResult<Schema extends SchemaDef, Model extends GetModels<Schema>, Args = {}, Optional = false, Array = false> = WrapType<Args extends {
     select: infer S;
     omit?: infer O;
 } ? ModelSelectResult<Schema, Model, S, O> : Args extends {
@@ -211,7 +212,7 @@ type ModelResult<Schema extends SchemaDef, Model extends GetModels<Schema>, Args
 } : Args extends {
     omit: infer O;
 } ? DefaultModelResult<Schema, Model, O> : DefaultModelResult<Schema, Model>, Optional, Array>;
-type SimplifiedModelResult<Schema extends SchemaDef, Model extends GetModels<Schema>, Args extends SelectIncludeOmit<Schema, Model, boolean> = {}, Optional = false, Array = false> = Simplify<ModelResult<Schema, Model, Args, Optional, Array>>;
+type SimplifiedModelResult<Schema extends SchemaDef, Model extends GetModels<Schema>, Args = {}, Optional = false, Array = false> = Simplify<ModelResult<Schema, Model, Args, Optional, Array>>;
 type TypeDefResult<Schema extends SchemaDef, TypeDef extends GetTypeDefs<Schema>> = Optional<{
     [Key in GetTypeDefFields<Schema, TypeDef>]: MapTypeDefFieldType<Schema, TypeDef, Key>;
 }, keyof {
@@ -390,29 +391,29 @@ 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>> = FindArgs<Schema, Model, true>;
-type FindFirstArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = FindArgs<Schema, Model, false>;
-type FindUniqueArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
+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>;
-type CreateArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
+} & SelectIncludeOmit<Schema, Model, true>, Simplify>;
+type CreateArgs<Schema extends SchemaDef, Model extends GetModels<Schema>, Simplify extends boolean = false> = SimplifyIf<{
     data: CreateInput<Schema, Model>;
     select?: SelectInput<Schema, Model>;
     include?: IncludeInput<Schema, Model>;
     omit?: OmitInput<Schema, Model>;
-};
-type CreateManyArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = CreateManyInput<Schema, Model>;
-type CreateManyAndReturnArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = CreateManyInput<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>;
 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>;
 }>;
-type ScalarCreatePayload<Schema extends SchemaDef, Model extends GetModels<Schema>, Field extends ScalarFields<Schema, Model, false>> = MapModelFieldType<Schema, Model, Field> | (FieldIsArray<Schema, Model, Field> extends true ? {
+type ScalarCreatePayload<Schema extends SchemaDef, Model extends GetModels<Schema>, Field extends ScalarFields<Schema, Model, false>> = Simplify<MapModelFieldType<Schema, Model, Field> | (FieldIsArray<Schema, Model, Field> extends true ? {
     set?: MapModelFieldType<Schema, Model, Field>;
-} : never);
+} : never)>;
 type CreateFKPayload<Schema extends SchemaDef, Model extends GetModels<Schema>> = OptionalWrap<Schema, Model, {
     [Key in ForeignKeyFields<Schema, Model>]: MapModelFieldType<Schema, Model, Key>;
 }>;
@@ -441,31 +442,31 @@ 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>> = {
+type UpdateArgs<Schema extends SchemaDef, Model extends GetModels<Schema>, Simplify extends boolean = false> = SimplifyIf<{
     data: UpdateInput<Schema, Model>;
     where: WhereUniqueInput<Schema, Model>;
     select?: SelectInput<Schema, Model>;
     include?: IncludeInput<Schema, Model>;
     omit?: OmitInput<Schema, Model>;
-};
-type UpdateManyArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = UpdateManyPayload<Schema, Model>;
-type UpdateManyAndReturnArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = UpdateManyPayload<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>;
 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>> = {
+type UpsertArgs<Schema extends SchemaDef, Model extends GetModels<Schema>, Simplify extends boolean = false> = SimplifyIf<{
     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>;
 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>;
@@ -507,30 +508,30 @@ 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>> = {
+type DeleteArgs<Schema extends SchemaDef, Model extends GetModels<Schema>, Simplify extends boolean = false> = SimplifyIf<{
     where: WhereUniqueInput<Schema, Model>;
     select?: SelectInput<Schema, Model>;
     include?: IncludeInput<Schema, Model>;
     omit?: OmitInput<Schema, Model>;
-};
-type DeleteManyArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
+}, Simplify>;
+type DeleteManyArgs<Schema extends SchemaDef, Model extends GetModels<Schema>, Simplify extends boolean = false> = SimplifyIf<{
     where?: WhereInput<Schema, Model>;
     limit?: number;
-};
-type CountArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = Omit<FindArgs<Schema, Model, true>, 'select' | 'include' | 'distinct' | 'omit'> & {
+}, Simplify>;
+type CountArgs<Schema extends SchemaDef, Model extends GetModels<Schema>, Simplify extends boolean = false> = SimplifyIf<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;
 } & {
     _all?: true;
 };
-type CountResult<Schema extends SchemaDef, Model extends GetModels<Schema>, Args extends CountArgs<Schema, Model>> = Args extends {
+type CountResult<Schema extends SchemaDef, _Model extends GetModels<Schema>, Args> = Args extends {
     select: infer S;
 } ? S extends true ? number : {
     [Key in keyof S]: number;
 } : number;
-type AggregateArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
+type AggregateArgs<Schema extends SchemaDef, Model extends GetModels<Schema>, Simplify extends boolean = false> = SimplifyIf<{
     where?: WhereInput<Schema, Model>;
     skip?: number;
     take?: number;
@@ -542,7 +543,7 @@ type AggregateArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> =
 } & (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>;
 };
@@ -552,7 +553,7 @@ type SumAvgInput<Schema extends SchemaDef, Model extends GetModels<Schema>, Valu
 type MinMaxInput<Schema extends SchemaDef, Model extends GetModels<Schema>, ValueType> = {
     [Key in GetModelFields<Schema, Model> as FieldIsArray<Schema, Model, Key> extends true ? never : FieldIsRelation<Schema, Model, Key> extends true ? never : Key]?: ValueType;
 };
-type AggregateResult<Schema extends SchemaDef, Model extends GetModels<Schema>, Args extends AggregateArgs<Schema, Model>> = (Args extends {
+type AggregateResult<Schema extends SchemaDef, _Model extends GetModels<Schema>, Args> = (Args extends {
     _count: infer Count;
 } ? {
     _count: AggCommonOutput<Count>;
@@ -577,7 +578,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>> = {
+type GroupByArgs<Schema extends SchemaDef, Model extends GetModels<Schema>, Simplify extends boolean = false> = SimplifyIf<{
     where?: WhereInput<Schema, Model>;
     orderBy?: OrArray<OrderBy<Schema, Model, false, true>>;
     by: NonRelationFields<Schema, Model> | NonEmptyArray<NonRelationFields<Schema, Model>>;
@@ -590,8 +591,10 @@ type GroupByArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
 } & (NumericFields<Schema, Model> extends never ? {} : {
     _avg?: SumAvgInput<Schema, Model, true>;
     _sum?: SumAvgInput<Schema, Model, true>;
-});
-type GroupByResult<Schema extends SchemaDef, Model extends GetModels<Schema>, Args extends GroupByArgs<Schema, Model>> = Array<{
+}), Simplify>;
+type GroupByResult<Schema extends SchemaDef, Model extends GetModels<Schema>, Args extends {
+    by: unknown;
+}> = Array<{
     [Key in NonRelationFields<Schema, Model> as Key extends ValueOfPotentialTuple<Args['by']> ? Key : never]: MapModelFieldType<Schema, Model, Key>;
 } & (Args extends {
     _count: infer Count;
@@ -1222,35 +1225,35 @@ type AllModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema
      * }); // result: `{ _count: { posts: number } }`
      * ```
      */
-    findMany<T extends FindArgs<Schema, Model, true>>(args?: SelectSubset<T, FindArgs<Schema, Model, true>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>[]>;
+    findMany<T extends FindManyArgs<Schema, Model, true>>(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>>(args: SelectSubset<T, FindUniqueArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>> | null>;
+    findUnique<T extends FindUniqueArgs<Schema, Model, true>>(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>>(args: SelectSubset<T, FindUniqueArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>>;
+    findUniqueOrThrow<T extends FindUniqueArgs<Schema, Model, true>>(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 FindArgs<Schema, Model, true>>(args?: SelectSubset<T, FindArgs<Schema, Model, true>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>> | null>;
+    findFirst<T extends FindFirstArgs<Schema, Model, true>>(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 FindArgs<Schema, Model, true>>(args?: SelectSubset<T, FindArgs<Schema, Model, true>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>>;
+    findFirstOrThrow<T extends FindFirstArgs<Schema, Model, true>>(args?: SelectSubset<T, FindFirstArgs<Schema, Model>>): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, T>>;
     /**
      * Creates a new entity.
      * @param args - create args
@@ -1303,7 +1306,7 @@ type AllModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema
      * });
      * ```
      */
-    create<T extends CreateArgs<Schema, Model>>(args: SelectSubset<T, CreateArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>>;
+    create<T extends CreateArgs<Schema, Model, true>>(args: SelectSubset<T, CreateArgs<Schema, Model>>): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, T>>;
     /**
      * Creates multiple entities. Only scalar fields are allowed.
      * @param args - create args
@@ -1329,7 +1332,7 @@ type AllModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema
      * });
      * ```
      */
-    createMany<T extends CreateManyArgs<Schema, Model>>(args?: SelectSubset<T, CreateManyArgs<Schema, Model>>): ZenStackPromise<Schema, BatchResult>;
+    createMany<T extends CreateManyArgs<Schema, Model, true>>(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
@@ -1348,7 +1351,7 @@ type AllModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema
      * });
      * ```
      */
-    createManyAndReturn<T extends CreateManyAndReturnArgs<Schema, Model>>(args?: SelectSubset<T, CreateManyAndReturnArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>[]>;
+    createManyAndReturn<T extends CreateManyAndReturnArgs<Schema, Model, true>>(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
@@ -1466,7 +1469,7 @@ type AllModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema
      * });
      * ```
      */
-    update<T extends UpdateArgs<Schema, Model>>(args: SelectSubset<T, UpdateArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>>;
+    update<T extends UpdateArgs<Schema, Model, true>>(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.
@@ -1487,7 +1490,7 @@ type AllModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema
      *     limit: 10
      * });
      */
-    updateMany<T extends UpdateManyArgs<Schema, Model>>(args: Subset<T, UpdateManyArgs<Schema, Model>>): ZenStackPromise<Schema, BatchResult>;
+    updateMany<T extends UpdateManyArgs<Schema, Model, true>>(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.
@@ -1510,7 +1513,7 @@ type AllModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema
      * });
      * ```
      */
-    updateManyAndReturn<T extends UpdateManyAndReturnArgs<Schema, Model>>(args: Subset<T, UpdateManyAndReturnArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>[]>;
+    updateManyAndReturn<T extends UpdateManyAndReturnArgs<Schema, Model, true>>(args: Subset<T, UpdateManyAndReturnArgs<Schema, Model>>): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, T>[]>;
     /**
      * Creates or updates an entity.
      * @param args - upsert args
@@ -1531,7 +1534,7 @@ type AllModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema
      * });
      * ```
      */
-    upsert<T extends UpsertArgs<Schema, Model>>(args: SelectSubset<T, UpsertArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>>;
+    upsert<T extends UpsertArgs<Schema, Model, true>>(args: SelectSubset<T, UpsertArgs<Schema, Model>>): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, T>>;
     /**
      * Deletes a uniquely identifiable entity.
      * @param args - delete args
@@ -1551,7 +1554,7 @@ type AllModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema
      * }); // result: `{ id: string; email: string }`
      * ```
      */
-    delete<T extends DeleteArgs<Schema, Model>>(args: SelectSubset<T, DeleteArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>>;
+    delete<T extends DeleteArgs<Schema, Model, true>>(args: SelectSubset<T, DeleteArgs<Schema, Model>>): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, T>>;
     /**
      * Deletes multiple entities.
      * @param args - delete args
@@ -1571,7 +1574,7 @@ type AllModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema
      * });
      * ```
      */
-    deleteMany<T extends DeleteManyArgs<Schema, Model>>(args?: Subset<T, DeleteManyArgs<Schema, Model>>): ZenStackPromise<Schema, BatchResult>;
+    deleteMany<T extends DeleteManyArgs<Schema, Model, true>>(args?: Subset<T, DeleteManyArgs<Schema, Model>>): ZenStackPromise<Schema, BatchResult>;
     /**
      * Counts rows or field values.
      * @param args - count args
@@ -1590,7 +1593,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>>(args?: Subset<T, CountArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<CountResult<Schema, Model, T>>>;
+    count<T extends CountArgs<Schema, Model, true>>(args?: Subset<T, CountArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<CountResult<Schema, Model, T>>>;
     /**
      * Aggregates rows.
      * @param args - aggregation args
@@ -1608,7 +1611,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>>(args: Subset<T, AggregateArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<AggregateResult<Schema, Model, T>>>;
+    aggregate<T extends AggregateArgs<Schema, Model, true>>(args: Subset<T, AggregateArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<AggregateResult<Schema, Model, T>>>;
     /**
      * Groups rows by columns.
      * @param args - groupBy args
@@ -1642,7 +1645,7 @@ type AllModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema
      *     having: { country: 'US', age: { _avg: { gte: 18 } } }
      * });
      */
-    groupBy<T extends GroupByArgs<Schema, Model>>(args: Subset<T, GroupByArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<GroupByResult<Schema, Model, T>>>;
+    groupBy<T extends GroupByArgs<Schema, Model, true>>(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>;