@zenstackhq/runtime 3.0.0-alpha.10 → 3.0.0-alpha.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/dist/{contract-BiU0iYAh.d.cts → contract-BEAyf7Es.d.cts} +60 -41
  2. package/dist/{contract-BiU0iYAh.d.ts → contract-BEAyf7Es.d.ts} +60 -41
  3. package/dist/index.cjs +20 -17
  4. package/dist/index.cjs.map +1 -1
  5. package/dist/index.d.cts +2 -2
  6. package/dist/index.d.ts +2 -2
  7. package/dist/index.js +20 -17
  8. package/dist/index.js.map +1 -1
  9. package/dist/plugins/policy.d.cts +1 -1
  10. package/dist/plugins/policy.d.ts +1 -1
  11. package/package.json +7 -7
package/dist/{contract-BiU0iYAh.d.cts → contract-BEAyf7Es.d.cts} RENAMED
@@ -4,8 +4,24 @@ import { Generated, Kysely, ExpressionBuilder, OperandExpression, SqlBool, Selec
4
4
 
5
5
  type Optional<T extends object, K extends keyof T = keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
6
6
  type NullableIf<T, Condition extends boolean> = Condition extends true ? T | null : T;
7
+ type _Preserve = Date | Function | Decimal | Uint8Array | JsonObject | JsonValue;
8
+ type _Depth = [never, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
9
+ type Simplify<T, D extends number = 6> = D extends 0 ? T : T extends object ? T extends _Preserve ? T : {
10
+ [K in keyof T]: Simplify<T[K], _Depth[D]>;
11
+ } & {} : T;
7
12
  type WrapType<T, Optional = false, Array = false> = Optional extends true ? T | null : Array extends true ? T[] : T;
8
- type MapBaseType$1<T> = T extends 'String' ? string : T extends 'Boolean' ? boolean : T extends 'Int' | 'Float' ? number : T extends 'BigInt' ? bigint : T extends 'Decimal' ? Decimal : T extends 'DateTime' ? Date : T extends 'Json' ? JsonValue : unknown;
13
+ type TypeMap = {
14
+ String: string;
15
+ Boolean: boolean;
16
+ Int: number;
17
+ Float: number;
18
+ BigInt: bigint;
19
+ Decimal: Decimal;
20
+ DateTime: Date;
21
+ Bytes: Uint8Array;
22
+ Json: JsonValue;
23
+ };
24
+ type MapBaseType$1<T extends string> = T extends keyof TypeMap ? TypeMap[T] : unknown;
9
25
  type JsonValue = string | number | boolean | null | JsonObject | JsonArray;
10
26
  type JsonObject = {
11
27
  [key: string]: JsonValue;
@@ -47,7 +63,7 @@ type DefaultModelResult<Schema extends SchemaDef, Model extends GetModels<Schema
47
63
  [Key in NonRelationFields<Schema, Model> as Key extends keyof Omit ? Omit[Key] extends true ? never : Key : Key]: MapFieldType<Schema, Model, Key>;
48
64
  }, Optional, Array>;
49
65
  type ModelSelectResult<Schema extends SchemaDef, Model extends GetModels<Schema>, Select, Omit> = {
50
- [Key in keyof Select as Select[Key] extends false | undefined ? never : Key extends keyof Omit ? Omit[Key] extends true ? never : Key : Key extends '_count' ? Select[Key] extends SelectCount<Schema, Model> ? Key : never : Key]: Key extends '_count' ? SelectCountResult<Schema, Model, Select[Key]> : Key extends NonRelationFields<Schema, Model> ? MapFieldType<Schema, Model, Key> : Key extends RelationFields<Schema, Model> ? Select[Key] extends FindArgs<Schema, RelationFieldType<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>> ? ModelResult<Schema, RelationFieldType<Schema, Model, Key>, Select[Key], FieldIsOptional<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>> : DefaultModelResult<Schema, RelationFieldType<Schema, Model, Key>, Omit, FieldIsOptional<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>> : never;
66
+ [Key in keyof Select as Select[Key] extends false | undefined ? never : Key extends keyof Omit ? Omit[Key] extends true ? never : Key : Key extends '_count' ? Select[Key] extends SelectCount<Schema, Model> ? Key : never : Key]: Key extends '_count' ? SelectCountResult<Schema, Model, Select[Key]> : Key extends NonRelationFields<Schema, Model> ? MapFieldType<Schema, Model, Key> : Key extends RelationFields<Schema, Model> ? Select[Key] extends FindArgs<Schema, RelationFieldType<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>> ? 'select' extends keyof Select[Key] ? ModelResult<Schema, RelationFieldType<Schema, Model, Key>, Pick<Select[Key], 'select'>, FieldIsOptional<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>> : ModelResult<Schema, RelationFieldType<Schema, Model, Key>, Pick<Select[Key], 'include' | 'omit'>, FieldIsOptional<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>> : DefaultModelResult<Schema, RelationFieldType<Schema, Model, Key>, Omit, FieldIsOptional<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>> : never;
51
67
  };
52
68
  type SelectCountResult<Schema extends SchemaDef, Model extends GetModels<Schema>, C> = C extends true ? {
53
69
  [Key in RelationFields<Schema, Model> as FieldIsArray<Schema, Model, Key> extends true ? Key : never]: number;
@@ -67,6 +83,7 @@ type ModelResult<Schema extends SchemaDef, Model extends GetModels<Schema>, Args
67
83
  } : Args extends {
68
84
  omit: infer O;
69
85
  } ? DefaultModelResult<Schema, Model, O> : DefaultModelResult<Schema, Model>, Optional, Array>;
86
+ 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>>;
70
87
  type BatchResult = {
71
88
  count: number;
72
89
  };
@@ -92,7 +109,7 @@ type ArrayFilter<T extends string> = {
92
109
  hasSome?: MapBaseType$1<T>[];
93
110
  isEmpty?: boolean;
94
111
  };
95
- type PrimitiveFilter<T extends string, Nullable extends boolean> = T extends 'String' ? StringFilter<Nullable> : T extends 'Int' | 'Float' | 'Decimal' | 'BigInt' ? NumberFilter<T, Nullable> : T extends 'Boolean' ? BooleanFilter<Nullable> : T extends 'DateTime' ? DateTimeFilter<Nullable> : T extends 'Json' ? 'Not implemented yet' : never;
112
+ type PrimitiveFilter<T extends string, Nullable extends boolean> = T extends 'String' ? StringFilter<Nullable> : T extends 'Int' | 'Float' | 'Decimal' | 'BigInt' ? NumberFilter<T, Nullable> : T extends 'Boolean' ? BooleanFilter<Nullable> : T extends 'DateTime' ? DateTimeFilter<Nullable> : T extends 'Bytes' ? BytesFilter<Nullable> : T extends 'Json' ? 'Not implemented yet' : never;
96
113
  type CommonPrimitiveFilter<DataType, T extends BuiltinType, Nullable extends boolean> = {
97
114
  equals?: NullableIf<DataType, Nullable>;
98
115
  in?: DataType[];
@@ -145,13 +162,13 @@ type WhereUniqueInput<Schema extends SchemaDef, Model extends GetModels<Schema>>
145
162
  [Key1 in keyof GetModel<Schema, Model>['uniqueFields'][Key]]: GetModel<Schema, Model>['uniqueFields'][Key][Key1] extends Pick<FieldDef, 'type'> ? MapFieldDefType<Schema, GetModel<Schema, Model>['uniqueFields'][Key][Key1]> : never;
146
163
  };
147
164
  } & WhereInput<Schema, Model>, Extract<keyof GetModel<Schema, Model>['uniqueFields'], string>>;
148
- type OmitFields<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
165
+ type OmitInput<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
149
166
  [Key in NonRelationFields<Schema, Model>]?: true;
150
167
  };
151
168
  type SelectIncludeOmit<Schema extends SchemaDef, Model extends GetModels<Schema>, AllowCount extends boolean> = {
152
- select?: Select<Schema, Model, AllowCount, boolean>;
153
- include?: Include<Schema, Model>;
154
- omit?: OmitFields<Schema, Model>;
169
+ select?: SelectInput<Schema, Model, AllowCount, boolean>;
170
+ include?: IncludeInput<Schema, Model>;
171
+ omit?: OmitInput<Schema, Model>;
155
172
  };
156
173
  type Distinct<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
157
174
  distinct?: OrArray<NonRelationFields<Schema, Model>>;
@@ -159,9 +176,9 @@ type Distinct<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
159
176
  type Cursor<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
160
177
  cursor?: WhereUniqueInput<Schema, Model>;
161
178
  };
162
- type Select<Schema extends SchemaDef, Model extends GetModels<Schema>, AllowCount extends boolean, AllowRelation extends boolean = true> = {
179
+ type SelectInput<Schema extends SchemaDef, Model extends GetModels<Schema>, AllowCount extends boolean = true, AllowRelation extends boolean = true> = {
163
180
  [Key in NonRelationFields<Schema, Model>]?: true;
164
- } & (AllowRelation extends true ? Include<Schema, Model> : {}) & // relation fields
181
+ } & (AllowRelation extends true ? IncludeInput<Schema, Model> : {}) & // relation fields
165
182
  (AllowCount extends true ? {
166
183
  _count?: SelectCount<Schema, Model>;
167
184
  } : {});
@@ -172,7 +189,7 @@ type SelectCount<Schema extends SchemaDef, Model extends GetModels<Schema>> = tr
172
189
  };
173
190
  };
174
191
  };
175
- type Include<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
192
+ type IncludeInput<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
176
193
  [Key in RelationFields<Schema, Model>]?: boolean | FindArgs<Schema, RelationFieldType<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>, FieldIsArray<Schema, Model, Key> extends true ? true : FieldIsOptional<Schema, Model, Key> extends true ? true : false>;
177
194
  };
178
195
  type Subset<T, U> = {
@@ -213,19 +230,21 @@ type FindArgs<Schema extends SchemaDef, Model extends GetModels<Schema>, Collect
213
230
  } : {}) & (AllowFilter extends true ? {
214
231
  where?: WhereInput<Schema, Model>;
215
232
  } : {}) & SelectIncludeOmit<Schema, Model, Collection> & Distinct<Schema, Model> & Cursor<Schema, Model>;
233
+ type FindManyArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = FindArgs<Schema, Model, true>;
234
+ type FindFirstArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = FindArgs<Schema, Model, false>;
216
235
  type FindUniqueArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
217
236
  where?: WhereUniqueInput<Schema, Model>;
218
237
  } & SelectIncludeOmit<Schema, Model, true>;
219
238
  type CreateArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
220
239
  data: CreateInput<Schema, Model>;
221
- select?: Select<Schema, Model, true>;
222
- include?: Include<Schema, Model>;
223
- omit?: OmitFields<Schema, Model>;
240
+ select?: SelectInput<Schema, Model, true>;
241
+ include?: IncludeInput<Schema, Model>;
242
+ omit?: OmitInput<Schema, Model>;
224
243
  };
225
244
  type CreateManyArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = CreateManyInput<Schema, Model>;
226
245
  type CreateManyAndReturnArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = CreateManyInput<Schema, Model> & {
227
- select?: Select<Schema, Model, false, false>;
228
- omit?: OmitFields<Schema, Model>;
246
+ select?: SelectInput<Schema, Model, false, false>;
247
+ omit?: OmitInput<Schema, Model>;
229
248
  };
230
249
  type OptionalWrap<Schema extends SchemaDef, Model extends GetModels<Schema>, T extends object> = Optional<T, keyof T & OptionalFieldsForCreate<Schema, Model>>;
231
250
  type CreateScalarPayload<Schema extends SchemaDef, Model extends GetModels<Schema>> = OptionalWrap<Schema, Model, {
@@ -265,14 +284,14 @@ type NestedCreateManyInput<Schema extends SchemaDef, Model extends GetModels<Sch
265
284
  type UpdateArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
266
285
  data: UpdateInput<Schema, Model>;
267
286
  where: WhereUniqueInput<Schema, Model>;
268
- select?: Select<Schema, Model, true>;
269
- include?: Include<Schema, Model>;
270
- omit?: OmitFields<Schema, Model>;
287
+ select?: SelectInput<Schema, Model, true>;
288
+ include?: IncludeInput<Schema, Model>;
289
+ omit?: OmitInput<Schema, Model>;
271
290
  };
272
291
  type UpdateManyArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = UpdateManyPayload<Schema, Model>;
273
292
  type UpdateManyAndReturnArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = UpdateManyPayload<Schema, Model> & {
274
- select?: Select<Schema, Model, false, false>;
275
- omit?: OmitFields<Schema, Model>;
293
+ select?: SelectInput<Schema, Model, false, false>;
294
+ omit?: OmitInput<Schema, Model>;
276
295
  };
277
296
  type UpdateManyPayload<Schema extends SchemaDef, Model extends GetModels<Schema>, Without extends string = never> = {
278
297
  data: OrArray<UpdateScalarInput<Schema, Model, Without>>;
@@ -283,9 +302,9 @@ type UpsertArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
283
302
  create: CreateInput<Schema, Model>;
284
303
  update: UpdateInput<Schema, Model>;
285
304
  where: WhereUniqueInput<Schema, Model>;
286
- select?: Select<Schema, Model, true>;
287
- include?: Include<Schema, Model>;
288
- omit?: OmitFields<Schema, Model>;
305
+ select?: SelectInput<Schema, Model, true>;
306
+ include?: IncludeInput<Schema, Model>;
307
+ omit?: OmitInput<Schema, Model>;
289
308
  };
290
309
  type UpdateScalarInput<Schema extends SchemaDef, Model extends GetModels<Schema>, Without extends string = never> = Omit<{
291
310
  [Key in NonRelationFields<Schema, Model>]?: ScalarUpdatePayload<Schema, Model, Key>;
@@ -330,9 +349,9 @@ type ToOneRelationUpdateInput<Schema extends SchemaDef, Model extends GetModels<
330
349
  } : {});
331
350
  type DeleteArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
332
351
  where: WhereUniqueInput<Schema, Model>;
333
- select?: Select<Schema, Model, true>;
334
- include?: Include<Schema, Model>;
335
- omit?: OmitFields<Schema, Model>;
352
+ select?: SelectInput<Schema, Model, true>;
353
+ include?: IncludeInput<Schema, Model>;
354
+ omit?: OmitInput<Schema, Model>;
336
355
  };
337
356
  type DeleteManyArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
338
357
  where?: WhereInput<Schema, Model>;
@@ -951,35 +970,35 @@ interface ModelOperations<Schema extends SchemaDef, Model extends GetModels<Sche
951
970
  * }); // result: `{ _count: { posts: number } }`
952
971
  * ```
953
972
  */
954
- findMany<T extends FindArgs<Schema, Model, true>>(args?: SelectSubset<T, FindArgs<Schema, Model, true>>): ZenStackPromise<Schema, ModelResult<Schema, Model, T>[]>;
973
+ findMany<T extends FindArgs<Schema, Model, true>>(args?: SelectSubset<T, FindArgs<Schema, Model, true>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>[]>;
955
974
  /**
956
975
  * Returns a uniquely identified entity.
957
976
  * @param args - query args
958
977
  * @returns a single entity or null if not found
959
978
  * @see {@link findMany}
960
979
  */
961
- findUnique<T extends FindUniqueArgs<Schema, Model>>(args?: SelectSubset<T, FindUniqueArgs<Schema, Model>>): ZenStackPromise<Schema, ModelResult<Schema, Model, T> | null>;
980
+ findUnique<T extends FindUniqueArgs<Schema, Model>>(args?: SelectSubset<T, FindUniqueArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>> | null>;
962
981
  /**
963
982
  * Returns a uniquely identified entity or throws `NotFoundError` if not found.
964
983
  * @param args - query args
965
984
  * @returns a single entity
966
985
  * @see {@link findMany}
967
986
  */
968
- findUniqueOrThrow<T extends FindUniqueArgs<Schema, Model>>(args?: SelectSubset<T, FindUniqueArgs<Schema, Model>>): ZenStackPromise<Schema, ModelResult<Schema, Model, T>>;
987
+ findUniqueOrThrow<T extends FindUniqueArgs<Schema, Model>>(args?: SelectSubset<T, FindUniqueArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>>;
969
988
  /**
970
989
  * Returns the first entity.
971
990
  * @param args - query args
972
991
  * @returns a single entity or null if not found
973
992
  * @see {@link findMany}
974
993
  */
975
- findFirst<T extends FindArgs<Schema, Model, true>>(args?: SelectSubset<T, FindArgs<Schema, Model, true>>): ZenStackPromise<Schema, ModelResult<Schema, Model, T> | null>;
994
+ findFirst<T extends FindArgs<Schema, Model, true>>(args?: SelectSubset<T, FindArgs<Schema, Model, true>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>> | null>;
976
995
  /**
977
996
  * Returns the first entity or throws `NotFoundError` if not found.
978
997
  * @param args - query args
979
998
  * @returns a single entity
980
999
  * @see {@link findMany}
981
1000
  */
982
- findFirstOrThrow<T extends FindArgs<Schema, Model, true>>(args?: SelectSubset<T, FindArgs<Schema, Model, true>>): ZenStackPromise<Schema, ModelResult<Schema, Model, T>>;
1001
+ findFirstOrThrow<T extends FindArgs<Schema, Model, true>>(args?: SelectSubset<T, FindArgs<Schema, Model, true>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>>;
983
1002
  /**
984
1003
  * Creates a new entity.
985
1004
  * @param args - create args
@@ -1032,7 +1051,7 @@ interface ModelOperations<Schema extends SchemaDef, Model extends GetModels<Sche
1032
1051
  * });
1033
1052
  * ```
1034
1053
  */
1035
- create<T extends CreateArgs<Schema, Model>>(args: SelectSubset<T, CreateArgs<Schema, Model>>): ZenStackPromise<Schema, ModelResult<Schema, Model, T>>;
1054
+ create<T extends CreateArgs<Schema, Model>>(args: SelectSubset<T, CreateArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>>;
1036
1055
  /**
1037
1056
  * Creates multiple entities. Only scalar fields are allowed.
1038
1057
  * @param args - create args
@@ -1077,7 +1096,7 @@ interface ModelOperations<Schema extends SchemaDef, Model extends GetModels<Sche
1077
1096
  * });
1078
1097
  * ```
1079
1098
  */
1080
- createManyAndReturn<T extends CreateManyAndReturnArgs<Schema, Model>>(args?: SelectSubset<T, CreateManyAndReturnArgs<Schema, Model>>): ZenStackPromise<Schema, ModelResult<Schema, Model, T>[]>;
1099
+ createManyAndReturn<T extends CreateManyAndReturnArgs<Schema, Model>>(args?: SelectSubset<T, CreateManyAndReturnArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>[]>;
1081
1100
  /**
1082
1101
  * Updates a uniquely identified entity.
1083
1102
  * @param args - update args. See {@link findMany} for how to control
@@ -1195,7 +1214,7 @@ interface ModelOperations<Schema extends SchemaDef, Model extends GetModels<Sche
1195
1214
  * });
1196
1215
  * ```
1197
1216
  */
1198
- update<T extends UpdateArgs<Schema, Model>>(args: SelectSubset<T, UpdateArgs<Schema, Model>>): ZenStackPromise<Schema, ModelResult<Schema, Model, T>>;
1217
+ update<T extends UpdateArgs<Schema, Model>>(args: SelectSubset<T, UpdateArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>>;
1199
1218
  /**
1200
1219
  * Updates multiple entities.
1201
1220
  * @param args - update args. Only scalar fields are allowed for data.
@@ -1239,7 +1258,7 @@ interface ModelOperations<Schema extends SchemaDef, Model extends GetModels<Sche
1239
1258
  * });
1240
1259
  * ```
1241
1260
  */
1242
- updateManyAndReturn<T extends UpdateManyAndReturnArgs<Schema, Model>>(args: Subset<T, UpdateManyAndReturnArgs<Schema, Model>>): ZenStackPromise<Schema, ModelResult<Schema, Model, T>[]>;
1261
+ updateManyAndReturn<T extends UpdateManyAndReturnArgs<Schema, Model>>(args: Subset<T, UpdateManyAndReturnArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>[]>;
1243
1262
  /**
1244
1263
  * Creates or updates an entity.
1245
1264
  * @param args - upsert args
@@ -1260,7 +1279,7 @@ interface ModelOperations<Schema extends SchemaDef, Model extends GetModels<Sche
1260
1279
  * });
1261
1280
  * ```
1262
1281
  */
1263
- upsert<T extends UpsertArgs<Schema, Model>>(args: SelectSubset<T, UpsertArgs<Schema, Model>>): ZenStackPromise<Schema, ModelResult<Schema, Model, T>>;
1282
+ upsert<T extends UpsertArgs<Schema, Model>>(args: SelectSubset<T, UpsertArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>>;
1264
1283
  /**
1265
1284
  * Deletes a uniquely identifiable entity.
1266
1285
  * @param args - delete args
@@ -1280,7 +1299,7 @@ interface ModelOperations<Schema extends SchemaDef, Model extends GetModels<Sche
1280
1299
  * }); // result: `{ id: string; email: string }`
1281
1300
  * ```
1282
1301
  */
1283
- delete<T extends DeleteArgs<Schema, Model>>(args: SelectSubset<T, DeleteArgs<Schema, Model>>): ZenStackPromise<Schema, ModelResult<Schema, Model>>;
1302
+ delete<T extends DeleteArgs<Schema, Model>>(args: SelectSubset<T, DeleteArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model>>>;
1284
1303
  /**
1285
1304
  * Deletes multiple entities.
1286
1305
  * @param args - delete args
@@ -1319,7 +1338,7 @@ interface ModelOperations<Schema extends SchemaDef, Model extends GetModels<Sche
1319
1338
  * select: { _all: true, email: true }
1320
1339
  * }); // result: `{ _all: number, email: number }`
1321
1340
  */
1322
- count<T extends CountArgs<Schema, Model>>(args?: Subset<T, CountArgs<Schema, Model>>): ZenStackPromise<Schema, CountResult<Schema, Model, T>>;
1341
+ count<T extends CountArgs<Schema, Model>>(args?: Subset<T, CountArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<CountResult<Schema, Model, T>>>;
1323
1342
  /**
1324
1343
  * Aggregates rows.
1325
1344
  * @param args - aggregation args
@@ -1337,7 +1356,7 @@ interface ModelOperations<Schema extends SchemaDef, Model extends GetModels<Sche
1337
1356
  * _max: { age: true }
1338
1357
  * }); // result: `{ _count: number, _avg: { age: number }, ... }`
1339
1358
  */
1340
- aggregate<T extends AggregateArgs<Schema, Model>>(args: Subset<T, AggregateArgs<Schema, Model>>): ZenStackPromise<Schema, AggregateResult<Schema, Model, T>>;
1359
+ aggregate<T extends AggregateArgs<Schema, Model>>(args: Subset<T, AggregateArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<AggregateResult<Schema, Model, T>>>;
1341
1360
  /**
1342
1361
  * Groups rows by columns.
1343
1362
  * @param args - groupBy args
@@ -1370,7 +1389,7 @@ interface ModelOperations<Schema extends SchemaDef, Model extends GetModels<Sche
1370
1389
  * having: { country: 'US' }
1371
1390
  * });
1372
1391
  */
1373
- groupBy<T extends GroupByArgs<Schema, Model>>(args: Subset<T, GroupByArgs<Schema, Model>>): ZenStackPromise<Schema, GroupByResult<Schema, Model, T>>;
1392
+ groupBy<T extends GroupByArgs<Schema, Model>>(args: Subset<T, GroupByArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<GroupByResult<Schema, Model, T>>>;
1374
1393
  }
1375
1394
 
1376
- export { type UpdateRelationInput as A, type BatchResult as B, type ClientConstructor as C, type DateTimeFilter as D, type UpdateInput as E, type FindArgs as F, type DeleteArgs as G, type DeleteManyArgs as H, type CountArgs as I, type CountAggregateInput as J, type CountResult as K, type AggregateArgs as L, type ModelResult as M, type NumberFilter as N, type OrderBy as O, type AggregateResult as P, type GroupByArgs as Q, type GroupByResult as R, type StringFilter as S, type ToKysely as T, type UpdateArgs as U, type RuntimePlugin as V, type WhereInput as W, type OnKyselyQueryArgs as X, type ClientContract as a, type ClientOptions as b, type CommonPrimitiveFilter as c, definePlugin as d, type BytesFilter as e, type BooleanFilter as f, type SortOrder as g, type NullsOrder as h, type WhereUniqueInput as i, type SelectIncludeOmit as j, type Subset as k, type SelectSubset as l, type MapFieldType as m, type OptionalFieldsForCreate as n, type OppositeRelationFields as o, type OppositeRelationAndFK as p, type FindUniqueArgs as q, type CreateArgs as r, type CreateManyArgs as s, type CreateManyAndReturnArgs as t, type CreateManyInput as u, type CreateInput as v, type UpdateManyArgs as w, type UpdateManyAndReturnArgs as x, type UpsertArgs as y, type UpdateScalarInput as z };
1395
+ export { type DeleteManyArgs as A, type BatchResult as B, type ClientConstructor as C, type DateTimeFilter as D, type CountArgs as E, type FindArgs as F, type CountResult as G, type AggregateArgs as H, type IncludeInput as I, type JsonArray as J, type AggregateResult as K, type GroupByArgs as L, type ModelResult as M, type NumberFilter as N, type OrderBy as O, type GroupByResult as P, type OnKyselyQueryArgs as Q, type RuntimePlugin as R, type SimplifiedModelResult as S, type ToKysely as T, type UpdateArgs as U, type WhereInput as W, type JsonObject as a, type JsonValue as b, type ClientContract as c, type ClientOptions as d, definePlugin as e, type StringFilter as f, type BytesFilter as g, type BooleanFilter as h, type SortOrder as i, type NullsOrder as j, type WhereUniqueInput as k, type OmitInput as l, type SelectIncludeOmit as m, type SelectInput as n, type Subset as o, type SelectSubset as p, type FindManyArgs as q, type FindFirstArgs as r, type FindUniqueArgs as s, type CreateArgs as t, type CreateManyArgs as u, type CreateManyAndReturnArgs as v, type UpdateManyArgs as w, type UpdateManyAndReturnArgs as x, type UpsertArgs as y, type DeleteArgs as z };
package/dist/{contract-BiU0iYAh.d.ts → contract-BEAyf7Es.d.ts} RENAMED
@@ -4,8 +4,24 @@ import { Generated, Kysely, ExpressionBuilder, OperandExpression, SqlBool, Selec
4
4
 
5
5
  type Optional<T extends object, K extends keyof T = keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
6
6
  type NullableIf<T, Condition extends boolean> = Condition extends true ? T | null : T;
7
+ type _Preserve = Date | Function | Decimal | Uint8Array | JsonObject | JsonValue;
8
+ type _Depth = [never, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
9
+ type Simplify<T, D extends number = 6> = D extends 0 ? T : T extends object ? T extends _Preserve ? T : {
10
+ [K in keyof T]: Simplify<T[K], _Depth[D]>;
11
+ } & {} : T;
7
12
  type WrapType<T, Optional = false, Array = false> = Optional extends true ? T | null : Array extends true ? T[] : T;
8
- type MapBaseType$1<T> = T extends 'String' ? string : T extends 'Boolean' ? boolean : T extends 'Int' | 'Float' ? number : T extends 'BigInt' ? bigint : T extends 'Decimal' ? Decimal : T extends 'DateTime' ? Date : T extends 'Json' ? JsonValue : unknown;
13
+ type TypeMap = {
14
+ String: string;
15
+ Boolean: boolean;
16
+ Int: number;
17
+ Float: number;
18
+ BigInt: bigint;
19
+ Decimal: Decimal;
20
+ DateTime: Date;
21
+ Bytes: Uint8Array;
22
+ Json: JsonValue;
23
+ };
24
+ type MapBaseType$1<T extends string> = T extends keyof TypeMap ? TypeMap[T] : unknown;
9
25
  type JsonValue = string | number | boolean | null | JsonObject | JsonArray;
10
26
  type JsonObject = {
11
27
  [key: string]: JsonValue;
@@ -47,7 +63,7 @@ type DefaultModelResult<Schema extends SchemaDef, Model extends GetModels<Schema
47
63
  [Key in NonRelationFields<Schema, Model> as Key extends keyof Omit ? Omit[Key] extends true ? never : Key : Key]: MapFieldType<Schema, Model, Key>;
48
64
  }, Optional, Array>;
49
65
  type ModelSelectResult<Schema extends SchemaDef, Model extends GetModels<Schema>, Select, Omit> = {
50
- [Key in keyof Select as Select[Key] extends false | undefined ? never : Key extends keyof Omit ? Omit[Key] extends true ? never : Key : Key extends '_count' ? Select[Key] extends SelectCount<Schema, Model> ? Key : never : Key]: Key extends '_count' ? SelectCountResult<Schema, Model, Select[Key]> : Key extends NonRelationFields<Schema, Model> ? MapFieldType<Schema, Model, Key> : Key extends RelationFields<Schema, Model> ? Select[Key] extends FindArgs<Schema, RelationFieldType<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>> ? ModelResult<Schema, RelationFieldType<Schema, Model, Key>, Select[Key], FieldIsOptional<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>> : DefaultModelResult<Schema, RelationFieldType<Schema, Model, Key>, Omit, FieldIsOptional<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>> : never;
66
+ [Key in keyof Select as Select[Key] extends false | undefined ? never : Key extends keyof Omit ? Omit[Key] extends true ? never : Key : Key extends '_count' ? Select[Key] extends SelectCount<Schema, Model> ? Key : never : Key]: Key extends '_count' ? SelectCountResult<Schema, Model, Select[Key]> : Key extends NonRelationFields<Schema, Model> ? MapFieldType<Schema, Model, Key> : Key extends RelationFields<Schema, Model> ? Select[Key] extends FindArgs<Schema, RelationFieldType<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>> ? 'select' extends keyof Select[Key] ? ModelResult<Schema, RelationFieldType<Schema, Model, Key>, Pick<Select[Key], 'select'>, FieldIsOptional<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>> : ModelResult<Schema, RelationFieldType<Schema, Model, Key>, Pick<Select[Key], 'include' | 'omit'>, FieldIsOptional<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>> : DefaultModelResult<Schema, RelationFieldType<Schema, Model, Key>, Omit, FieldIsOptional<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>> : never;
51
67
  };
52
68
  type SelectCountResult<Schema extends SchemaDef, Model extends GetModels<Schema>, C> = C extends true ? {
53
69
  [Key in RelationFields<Schema, Model> as FieldIsArray<Schema, Model, Key> extends true ? Key : never]: number;
@@ -67,6 +83,7 @@ type ModelResult<Schema extends SchemaDef, Model extends GetModels<Schema>, Args
67
83
  } : Args extends {
68
84
  omit: infer O;
69
85
  } ? DefaultModelResult<Schema, Model, O> : DefaultModelResult<Schema, Model>, Optional, Array>;
86
+ 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>>;
70
87
  type BatchResult = {
71
88
  count: number;
72
89
  };
@@ -92,7 +109,7 @@ type ArrayFilter<T extends string> = {
92
109
  hasSome?: MapBaseType$1<T>[];
93
110
  isEmpty?: boolean;
94
111
  };
95
- type PrimitiveFilter<T extends string, Nullable extends boolean> = T extends 'String' ? StringFilter<Nullable> : T extends 'Int' | 'Float' | 'Decimal' | 'BigInt' ? NumberFilter<T, Nullable> : T extends 'Boolean' ? BooleanFilter<Nullable> : T extends 'DateTime' ? DateTimeFilter<Nullable> : T extends 'Json' ? 'Not implemented yet' : never;
112
+ type PrimitiveFilter<T extends string, Nullable extends boolean> = T extends 'String' ? StringFilter<Nullable> : T extends 'Int' | 'Float' | 'Decimal' | 'BigInt' ? NumberFilter<T, Nullable> : T extends 'Boolean' ? BooleanFilter<Nullable> : T extends 'DateTime' ? DateTimeFilter<Nullable> : T extends 'Bytes' ? BytesFilter<Nullable> : T extends 'Json' ? 'Not implemented yet' : never;
96
113
  type CommonPrimitiveFilter<DataType, T extends BuiltinType, Nullable extends boolean> = {
97
114
  equals?: NullableIf<DataType, Nullable>;
98
115
  in?: DataType[];
@@ -145,13 +162,13 @@ type WhereUniqueInput<Schema extends SchemaDef, Model extends GetModels<Schema>>
145
162
  [Key1 in keyof GetModel<Schema, Model>['uniqueFields'][Key]]: GetModel<Schema, Model>['uniqueFields'][Key][Key1] extends Pick<FieldDef, 'type'> ? MapFieldDefType<Schema, GetModel<Schema, Model>['uniqueFields'][Key][Key1]> : never;
146
163
  };
147
164
  } & WhereInput<Schema, Model>, Extract<keyof GetModel<Schema, Model>['uniqueFields'], string>>;
148
- type OmitFields<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
165
+ type OmitInput<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
149
166
  [Key in NonRelationFields<Schema, Model>]?: true;
150
167
  };
151
168
  type SelectIncludeOmit<Schema extends SchemaDef, Model extends GetModels<Schema>, AllowCount extends boolean> = {
152
- select?: Select<Schema, Model, AllowCount, boolean>;
153
- include?: Include<Schema, Model>;
154
- omit?: OmitFields<Schema, Model>;
169
+ select?: SelectInput<Schema, Model, AllowCount, boolean>;
170
+ include?: IncludeInput<Schema, Model>;
171
+ omit?: OmitInput<Schema, Model>;
155
172
  };
156
173
  type Distinct<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
157
174
  distinct?: OrArray<NonRelationFields<Schema, Model>>;
@@ -159,9 +176,9 @@ type Distinct<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
159
176
  type Cursor<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
160
177
  cursor?: WhereUniqueInput<Schema, Model>;
161
178
  };
162
- type Select<Schema extends SchemaDef, Model extends GetModels<Schema>, AllowCount extends boolean, AllowRelation extends boolean = true> = {
179
+ type SelectInput<Schema extends SchemaDef, Model extends GetModels<Schema>, AllowCount extends boolean = true, AllowRelation extends boolean = true> = {
163
180
  [Key in NonRelationFields<Schema, Model>]?: true;
164
- } & (AllowRelation extends true ? Include<Schema, Model> : {}) & // relation fields
181
+ } & (AllowRelation extends true ? IncludeInput<Schema, Model> : {}) & // relation fields
165
182
  (AllowCount extends true ? {
166
183
  _count?: SelectCount<Schema, Model>;
167
184
  } : {});
@@ -172,7 +189,7 @@ type SelectCount<Schema extends SchemaDef, Model extends GetModels<Schema>> = tr
172
189
  };
173
190
  };
174
191
  };
175
- type Include<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
192
+ type IncludeInput<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
176
193
  [Key in RelationFields<Schema, Model>]?: boolean | FindArgs<Schema, RelationFieldType<Schema, Model, Key>, FieldIsArray<Schema, Model, Key>, FieldIsArray<Schema, Model, Key> extends true ? true : FieldIsOptional<Schema, Model, Key> extends true ? true : false>;
177
194
  };
178
195
  type Subset<T, U> = {
@@ -213,19 +230,21 @@ type FindArgs<Schema extends SchemaDef, Model extends GetModels<Schema>, Collect
213
230
  } : {}) & (AllowFilter extends true ? {
214
231
  where?: WhereInput<Schema, Model>;
215
232
  } : {}) & SelectIncludeOmit<Schema, Model, Collection> & Distinct<Schema, Model> & Cursor<Schema, Model>;
233
+ type FindManyArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = FindArgs<Schema, Model, true>;
234
+ type FindFirstArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = FindArgs<Schema, Model, false>;
216
235
  type FindUniqueArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
217
236
  where?: WhereUniqueInput<Schema, Model>;
218
237
  } & SelectIncludeOmit<Schema, Model, true>;
219
238
  type CreateArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
220
239
  data: CreateInput<Schema, Model>;
221
- select?: Select<Schema, Model, true>;
222
- include?: Include<Schema, Model>;
223
- omit?: OmitFields<Schema, Model>;
240
+ select?: SelectInput<Schema, Model, true>;
241
+ include?: IncludeInput<Schema, Model>;
242
+ omit?: OmitInput<Schema, Model>;
224
243
  };
225
244
  type CreateManyArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = CreateManyInput<Schema, Model>;
226
245
  type CreateManyAndReturnArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = CreateManyInput<Schema, Model> & {
227
- select?: Select<Schema, Model, false, false>;
228
- omit?: OmitFields<Schema, Model>;
246
+ select?: SelectInput<Schema, Model, false, false>;
247
+ omit?: OmitInput<Schema, Model>;
229
248
  };
230
249
  type OptionalWrap<Schema extends SchemaDef, Model extends GetModels<Schema>, T extends object> = Optional<T, keyof T & OptionalFieldsForCreate<Schema, Model>>;
231
250
  type CreateScalarPayload<Schema extends SchemaDef, Model extends GetModels<Schema>> = OptionalWrap<Schema, Model, {
@@ -265,14 +284,14 @@ type NestedCreateManyInput<Schema extends SchemaDef, Model extends GetModels<Sch
265
284
  type UpdateArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
266
285
  data: UpdateInput<Schema, Model>;
267
286
  where: WhereUniqueInput<Schema, Model>;
268
- select?: Select<Schema, Model, true>;
269
- include?: Include<Schema, Model>;
270
- omit?: OmitFields<Schema, Model>;
287
+ select?: SelectInput<Schema, Model, true>;
288
+ include?: IncludeInput<Schema, Model>;
289
+ omit?: OmitInput<Schema, Model>;
271
290
  };
272
291
  type UpdateManyArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = UpdateManyPayload<Schema, Model>;
273
292
  type UpdateManyAndReturnArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = UpdateManyPayload<Schema, Model> & {
274
- select?: Select<Schema, Model, false, false>;
275
- omit?: OmitFields<Schema, Model>;
293
+ select?: SelectInput<Schema, Model, false, false>;
294
+ omit?: OmitInput<Schema, Model>;
276
295
  };
277
296
  type UpdateManyPayload<Schema extends SchemaDef, Model extends GetModels<Schema>, Without extends string = never> = {
278
297
  data: OrArray<UpdateScalarInput<Schema, Model, Without>>;
@@ -283,9 +302,9 @@ type UpsertArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
283
302
  create: CreateInput<Schema, Model>;
284
303
  update: UpdateInput<Schema, Model>;
285
304
  where: WhereUniqueInput<Schema, Model>;
286
- select?: Select<Schema, Model, true>;
287
- include?: Include<Schema, Model>;
288
- omit?: OmitFields<Schema, Model>;
305
+ select?: SelectInput<Schema, Model, true>;
306
+ include?: IncludeInput<Schema, Model>;
307
+ omit?: OmitInput<Schema, Model>;
289
308
  };
290
309
  type UpdateScalarInput<Schema extends SchemaDef, Model extends GetModels<Schema>, Without extends string = never> = Omit<{
291
310
  [Key in NonRelationFields<Schema, Model>]?: ScalarUpdatePayload<Schema, Model, Key>;
@@ -330,9 +349,9 @@ type ToOneRelationUpdateInput<Schema extends SchemaDef, Model extends GetModels<
330
349
  } : {});
331
350
  type DeleteArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
332
351
  where: WhereUniqueInput<Schema, Model>;
333
- select?: Select<Schema, Model, true>;
334
- include?: Include<Schema, Model>;
335
- omit?: OmitFields<Schema, Model>;
352
+ select?: SelectInput<Schema, Model, true>;
353
+ include?: IncludeInput<Schema, Model>;
354
+ omit?: OmitInput<Schema, Model>;
336
355
  };
337
356
  type DeleteManyArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
338
357
  where?: WhereInput<Schema, Model>;
@@ -951,35 +970,35 @@ interface ModelOperations<Schema extends SchemaDef, Model extends GetModels<Sche
951
970
  * }); // result: `{ _count: { posts: number } }`
952
971
  * ```
953
972
  */
954
- findMany<T extends FindArgs<Schema, Model, true>>(args?: SelectSubset<T, FindArgs<Schema, Model, true>>): ZenStackPromise<Schema, ModelResult<Schema, Model, T>[]>;
973
+ findMany<T extends FindArgs<Schema, Model, true>>(args?: SelectSubset<T, FindArgs<Schema, Model, true>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>[]>;
955
974
  /**
956
975
  * Returns a uniquely identified entity.
957
976
  * @param args - query args
958
977
  * @returns a single entity or null if not found
959
978
  * @see {@link findMany}
960
979
  */
961
- findUnique<T extends FindUniqueArgs<Schema, Model>>(args?: SelectSubset<T, FindUniqueArgs<Schema, Model>>): ZenStackPromise<Schema, ModelResult<Schema, Model, T> | null>;
980
+ findUnique<T extends FindUniqueArgs<Schema, Model>>(args?: SelectSubset<T, FindUniqueArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>> | null>;
962
981
  /**
963
982
  * Returns a uniquely identified entity or throws `NotFoundError` if not found.
964
983
  * @param args - query args
965
984
  * @returns a single entity
966
985
  * @see {@link findMany}
967
986
  */
968
- findUniqueOrThrow<T extends FindUniqueArgs<Schema, Model>>(args?: SelectSubset<T, FindUniqueArgs<Schema, Model>>): ZenStackPromise<Schema, ModelResult<Schema, Model, T>>;
987
+ findUniqueOrThrow<T extends FindUniqueArgs<Schema, Model>>(args?: SelectSubset<T, FindUniqueArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>>;
969
988
  /**
970
989
  * Returns the first entity.
971
990
  * @param args - query args
972
991
  * @returns a single entity or null if not found
973
992
  * @see {@link findMany}
974
993
  */
975
- findFirst<T extends FindArgs<Schema, Model, true>>(args?: SelectSubset<T, FindArgs<Schema, Model, true>>): ZenStackPromise<Schema, ModelResult<Schema, Model, T> | null>;
994
+ findFirst<T extends FindArgs<Schema, Model, true>>(args?: SelectSubset<T, FindArgs<Schema, Model, true>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>> | null>;
976
995
  /**
977
996
  * Returns the first entity or throws `NotFoundError` if not found.
978
997
  * @param args - query args
979
998
  * @returns a single entity
980
999
  * @see {@link findMany}
981
1000
  */
982
- findFirstOrThrow<T extends FindArgs<Schema, Model, true>>(args?: SelectSubset<T, FindArgs<Schema, Model, true>>): ZenStackPromise<Schema, ModelResult<Schema, Model, T>>;
1001
+ findFirstOrThrow<T extends FindArgs<Schema, Model, true>>(args?: SelectSubset<T, FindArgs<Schema, Model, true>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>>;
983
1002
  /**
984
1003
  * Creates a new entity.
985
1004
  * @param args - create args
@@ -1032,7 +1051,7 @@ interface ModelOperations<Schema extends SchemaDef, Model extends GetModels<Sche
1032
1051
  * });
1033
1052
  * ```
1034
1053
  */
1035
- create<T extends CreateArgs<Schema, Model>>(args: SelectSubset<T, CreateArgs<Schema, Model>>): ZenStackPromise<Schema, ModelResult<Schema, Model, T>>;
1054
+ create<T extends CreateArgs<Schema, Model>>(args: SelectSubset<T, CreateArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>>;
1036
1055
  /**
1037
1056
  * Creates multiple entities. Only scalar fields are allowed.
1038
1057
  * @param args - create args
@@ -1077,7 +1096,7 @@ interface ModelOperations<Schema extends SchemaDef, Model extends GetModels<Sche
1077
1096
  * });
1078
1097
  * ```
1079
1098
  */
1080
- createManyAndReturn<T extends CreateManyAndReturnArgs<Schema, Model>>(args?: SelectSubset<T, CreateManyAndReturnArgs<Schema, Model>>): ZenStackPromise<Schema, ModelResult<Schema, Model, T>[]>;
1099
+ createManyAndReturn<T extends CreateManyAndReturnArgs<Schema, Model>>(args?: SelectSubset<T, CreateManyAndReturnArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>[]>;
1081
1100
  /**
1082
1101
  * Updates a uniquely identified entity.
1083
1102
  * @param args - update args. See {@link findMany} for how to control
@@ -1195,7 +1214,7 @@ interface ModelOperations<Schema extends SchemaDef, Model extends GetModels<Sche
1195
1214
  * });
1196
1215
  * ```
1197
1216
  */
1198
- update<T extends UpdateArgs<Schema, Model>>(args: SelectSubset<T, UpdateArgs<Schema, Model>>): ZenStackPromise<Schema, ModelResult<Schema, Model, T>>;
1217
+ update<T extends UpdateArgs<Schema, Model>>(args: SelectSubset<T, UpdateArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>>;
1199
1218
  /**
1200
1219
  * Updates multiple entities.
1201
1220
  * @param args - update args. Only scalar fields are allowed for data.
@@ -1239,7 +1258,7 @@ interface ModelOperations<Schema extends SchemaDef, Model extends GetModels<Sche
1239
1258
  * });
1240
1259
  * ```
1241
1260
  */
1242
- updateManyAndReturn<T extends UpdateManyAndReturnArgs<Schema, Model>>(args: Subset<T, UpdateManyAndReturnArgs<Schema, Model>>): ZenStackPromise<Schema, ModelResult<Schema, Model, T>[]>;
1261
+ updateManyAndReturn<T extends UpdateManyAndReturnArgs<Schema, Model>>(args: Subset<T, UpdateManyAndReturnArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>[]>;
1243
1262
  /**
1244
1263
  * Creates or updates an entity.
1245
1264
  * @param args - upsert args
@@ -1260,7 +1279,7 @@ interface ModelOperations<Schema extends SchemaDef, Model extends GetModels<Sche
1260
1279
  * });
1261
1280
  * ```
1262
1281
  */
1263
- upsert<T extends UpsertArgs<Schema, Model>>(args: SelectSubset<T, UpsertArgs<Schema, Model>>): ZenStackPromise<Schema, ModelResult<Schema, Model, T>>;
1282
+ upsert<T extends UpsertArgs<Schema, Model>>(args: SelectSubset<T, UpsertArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>>;
1264
1283
  /**
1265
1284
  * Deletes a uniquely identifiable entity.
1266
1285
  * @param args - delete args
@@ -1280,7 +1299,7 @@ interface ModelOperations<Schema extends SchemaDef, Model extends GetModels<Sche
1280
1299
  * }); // result: `{ id: string; email: string }`
1281
1300
  * ```
1282
1301
  */
1283
- delete<T extends DeleteArgs<Schema, Model>>(args: SelectSubset<T, DeleteArgs<Schema, Model>>): ZenStackPromise<Schema, ModelResult<Schema, Model>>;
1302
+ delete<T extends DeleteArgs<Schema, Model>>(args: SelectSubset<T, DeleteArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model>>>;
1284
1303
  /**
1285
1304
  * Deletes multiple entities.
1286
1305
  * @param args - delete args
@@ -1319,7 +1338,7 @@ interface ModelOperations<Schema extends SchemaDef, Model extends GetModels<Sche
1319
1338
  * select: { _all: true, email: true }
1320
1339
  * }); // result: `{ _all: number, email: number }`
1321
1340
  */
1322
- count<T extends CountArgs<Schema, Model>>(args?: Subset<T, CountArgs<Schema, Model>>): ZenStackPromise<Schema, CountResult<Schema, Model, T>>;
1341
+ count<T extends CountArgs<Schema, Model>>(args?: Subset<T, CountArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<CountResult<Schema, Model, T>>>;
1323
1342
  /**
1324
1343
  * Aggregates rows.
1325
1344
  * @param args - aggregation args
@@ -1337,7 +1356,7 @@ interface ModelOperations<Schema extends SchemaDef, Model extends GetModels<Sche
1337
1356
  * _max: { age: true }
1338
1357
  * }); // result: `{ _count: number, _avg: { age: number }, ... }`
1339
1358
  */
1340
- aggregate<T extends AggregateArgs<Schema, Model>>(args: Subset<T, AggregateArgs<Schema, Model>>): ZenStackPromise<Schema, AggregateResult<Schema, Model, T>>;
1359
+ aggregate<T extends AggregateArgs<Schema, Model>>(args: Subset<T, AggregateArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<AggregateResult<Schema, Model, T>>>;
1341
1360
  /**
1342
1361
  * Groups rows by columns.
1343
1362
  * @param args - groupBy args
@@ -1370,7 +1389,7 @@ interface ModelOperations<Schema extends SchemaDef, Model extends GetModels<Sche
1370
1389
  * having: { country: 'US' }
1371
1390
  * });
1372
1391
  */
1373
- groupBy<T extends GroupByArgs<Schema, Model>>(args: Subset<T, GroupByArgs<Schema, Model>>): ZenStackPromise<Schema, GroupByResult<Schema, Model, T>>;
1392
+ groupBy<T extends GroupByArgs<Schema, Model>>(args: Subset<T, GroupByArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<GroupByResult<Schema, Model, T>>>;
1374
1393
  }
1375
1394
 
1376
- export { type UpdateRelationInput as A, type BatchResult as B, type ClientConstructor as C, type DateTimeFilter as D, type UpdateInput as E, type FindArgs as F, type DeleteArgs as G, type DeleteManyArgs as H, type CountArgs as I, type CountAggregateInput as J, type CountResult as K, type AggregateArgs as L, type ModelResult as M, type NumberFilter as N, type OrderBy as O, type AggregateResult as P, type GroupByArgs as Q, type GroupByResult as R, type StringFilter as S, type ToKysely as T, type UpdateArgs as U, type RuntimePlugin as V, type WhereInput as W, type OnKyselyQueryArgs as X, type ClientContract as a, type ClientOptions as b, type CommonPrimitiveFilter as c, definePlugin as d, type BytesFilter as e, type BooleanFilter as f, type SortOrder as g, type NullsOrder as h, type WhereUniqueInput as i, type SelectIncludeOmit as j, type Subset as k, type SelectSubset as l, type MapFieldType as m, type OptionalFieldsForCreate as n, type OppositeRelationFields as o, type OppositeRelationAndFK as p, type FindUniqueArgs as q, type CreateArgs as r, type CreateManyArgs as s, type CreateManyAndReturnArgs as t, type CreateManyInput as u, type CreateInput as v, type UpdateManyArgs as w, type UpdateManyAndReturnArgs as x, type UpsertArgs as y, type UpdateScalarInput as z };
1395
+ export { type DeleteManyArgs as A, type BatchResult as B, type ClientConstructor as C, type DateTimeFilter as D, type CountArgs as E, type FindArgs as F, type CountResult as G, type AggregateArgs as H, type IncludeInput as I, type JsonArray as J, type AggregateResult as K, type GroupByArgs as L, type ModelResult as M, type NumberFilter as N, type OrderBy as O, type GroupByResult as P, type OnKyselyQueryArgs as Q, type RuntimePlugin as R, type SimplifiedModelResult as S, type ToKysely as T, type UpdateArgs as U, type WhereInput as W, type JsonObject as a, type JsonValue as b, type ClientContract as c, type ClientOptions as d, definePlugin as e, type StringFilter as f, type BytesFilter as g, type BooleanFilter as h, type SortOrder as i, type NullsOrder as j, type WhereUniqueInput as k, type OmitInput as l, type SelectIncludeOmit as m, type SelectInput as n, type Subset as o, type SelectSubset as p, type FindManyArgs as q, type FindFirstArgs as r, type FindUniqueArgs as s, type CreateArgs as t, type CreateManyArgs as u, type CreateManyAndReturnArgs as v, type UpdateManyArgs as w, type UpdateManyAndReturnArgs as x, type UpsertArgs as y, type DeleteArgs as z };