@zenstackhq/orm 3.5.4 → 3.5.6

package/dist/index.d.cts

@@ -1431,7 +1431,7 @@ type JsonFilter<AllowedKinds extends FilterKind = FilterKind> = ('Equality' exte
     array_ends_with?: JsonValue;
 } : {});
 type TypedJsonFilter<Schema extends SchemaDef, TypeDefName extends GetTypeDefs<Schema>, Array extends boolean, Optional extends boolean, AllowedKinds extends FilterKind> = XOR<JsonFilter<AllowedKinds>, TypedJsonTypedFilter<Schema, TypeDefName, Array, Optional, AllowedKinds>>;
-type TypedJsonTypedFilter<Schema extends SchemaDef, TypeDefName extends GetTypeDefs<Schema>, Array extends boolean, Optional extends boolean, AllowedKinds extends FilterKind> = 'Json' extends AllowedKinds ? (Array extends true ? ArrayTypedJsonFilter<Schema, TypeDefName, AllowedKinds> : NonArrayTypedJsonFilter<Schema, TypeDefName, AllowedKinds>) | (Optional extends true ? null : never) : {};
+type TypedJsonTypedFilter<Schema extends SchemaDef, TypeDefName extends GetTypeDefs<Schema>, Array extends boolean, Optional extends boolean, AllowedKinds extends FilterKind> = 'Json' extends AllowedKinds ? (Array extends true ? ArrayTypedJsonFilter<Schema, TypeDefName, AllowedKinds> : NonArrayTypedJsonFilter<Schema, TypeDefName, AllowedKinds>) | (Optional extends true ? null | JsonNullValues : never) : {};
 type ArrayTypedJsonFilter<Schema extends SchemaDef, TypeDefName extends GetTypeDefs<Schema>, AllowedKinds extends FilterKind> = {
     some?: TypedJsonFieldsFilter<Schema, TypeDefName, AllowedKinds>;
     every?: TypedJsonFieldsFilter<Schema, TypeDefName, AllowedKinds>;
@@ -1610,8 +1610,9 @@ type CreateScalarPayload<Schema extends SchemaDef, Model extends GetModels<Schem
 type ScalarCreatePayload<Schema extends SchemaDef, Model extends GetModels<Schema>, Field extends ScalarFields<Schema, Model, false>> = ScalarFieldMutationPayload<Schema, Model, Field> | (FieldIsArray<Schema, Model, Field> extends true ? {
     set?: MapModelFieldType<Schema, Model, Field>;
 } : never);
-type ScalarFieldMutationPayload<Schema extends SchemaDef, Model extends GetModels<Schema>, Field extends GetModelFields<Schema, Model>> = IsJsonField<Schema, Model, Field> extends true ? ModelFieldIsOptional<Schema, Model, Field> extends true ? JsonValue | JsonNull | DbNull : JsonValue | JsonNull : MapModelFieldType<Schema, Model, Field>;
+type ScalarFieldMutationPayload<Schema extends SchemaDef, Model extends GetModels<Schema>, Field extends GetModelFields<Schema, Model>> = IsJsonField<Schema, Model, Field> extends true ? ModelFieldIsOptional<Schema, Model, Field> extends true ? JsonValue | JsonNull | DbNull : JsonValue | JsonNull : IsTypedJsonField<Schema, Model, Field> extends true ? ModelFieldIsOptional<Schema, Model, Field> extends true ? MapModelFieldType<Schema, Model, Field> | JsonNull | DbNull : MapModelFieldType<Schema, Model, Field> : MapModelFieldType<Schema, Model, Field>;
 type IsJsonField<Schema extends SchemaDef, Model extends GetModels<Schema>, Field extends GetModelFields<Schema, Model>> = GetModelFieldType<Schema, Model, Field> extends 'Json' ? true : false;
+type IsTypedJsonField<Schema extends SchemaDef, Model extends GetModels<Schema>, Field extends GetModelFields<Schema, Model>> = GetModelFieldType<Schema, Model, Field> extends GetTypeDefs<Schema> ? true : false;
 type CreateFKPayload<Schema extends SchemaDef, Model extends GetModels<Schema>> = OptionalWrap<Schema, Model, {
     [Key in ForeignKeyFields<Schema, Model>]: MapModelFieldType<Schema, Model, Key>;
 }>;
@@ -3013,6 +3014,7 @@ declare class ZodSchemaFactory<Schema extends SchemaDef, Options extends ClientO
     private makeTypeDefSchema;
     makeWhereSchema(model: string, unique: boolean, withoutRelationFields?: boolean, withAggregations?: boolean, options?: CreateSchemaOptions): ZodType;
     private makeTypedJsonFilterSchema;
+    private makeNullableTypedJsonMutationSchema;
     private isTypeDefType;
     private makeEnumFilterSchema;
     private makeArrayFilterSchema;

package/dist/index.d.ts

@@ -1431,7 +1431,7 @@ type JsonFilter<AllowedKinds extends FilterKind = FilterKind> = ('Equality' exte
     array_ends_with?: JsonValue;
 } : {});
 type TypedJsonFilter<Schema extends SchemaDef, TypeDefName extends GetTypeDefs<Schema>, Array extends boolean, Optional extends boolean, AllowedKinds extends FilterKind> = XOR<JsonFilter<AllowedKinds>, TypedJsonTypedFilter<Schema, TypeDefName, Array, Optional, AllowedKinds>>;
-type TypedJsonTypedFilter<Schema extends SchemaDef, TypeDefName extends GetTypeDefs<Schema>, Array extends boolean, Optional extends boolean, AllowedKinds extends FilterKind> = 'Json' extends AllowedKinds ? (Array extends true ? ArrayTypedJsonFilter<Schema, TypeDefName, AllowedKinds> : NonArrayTypedJsonFilter<Schema, TypeDefName, AllowedKinds>) | (Optional extends true ? null : never) : {};
+type TypedJsonTypedFilter<Schema extends SchemaDef, TypeDefName extends GetTypeDefs<Schema>, Array extends boolean, Optional extends boolean, AllowedKinds extends FilterKind> = 'Json' extends AllowedKinds ? (Array extends true ? ArrayTypedJsonFilter<Schema, TypeDefName, AllowedKinds> : NonArrayTypedJsonFilter<Schema, TypeDefName, AllowedKinds>) | (Optional extends true ? null | JsonNullValues : never) : {};
 type ArrayTypedJsonFilter<Schema extends SchemaDef, TypeDefName extends GetTypeDefs<Schema>, AllowedKinds extends FilterKind> = {
     some?: TypedJsonFieldsFilter<Schema, TypeDefName, AllowedKinds>;
     every?: TypedJsonFieldsFilter<Schema, TypeDefName, AllowedKinds>;
@@ -1610,8 +1610,9 @@ type CreateScalarPayload<Schema extends SchemaDef, Model extends GetModels<Schem
 type ScalarCreatePayload<Schema extends SchemaDef, Model extends GetModels<Schema>, Field extends ScalarFields<Schema, Model, false>> = ScalarFieldMutationPayload<Schema, Model, Field> | (FieldIsArray<Schema, Model, Field> extends true ? {
     set?: MapModelFieldType<Schema, Model, Field>;
 } : never);
-type ScalarFieldMutationPayload<Schema extends SchemaDef, Model extends GetModels<Schema>, Field extends GetModelFields<Schema, Model>> = IsJsonField<Schema, Model, Field> extends true ? ModelFieldIsOptional<Schema, Model, Field> extends true ? JsonValue | JsonNull | DbNull : JsonValue | JsonNull : MapModelFieldType<Schema, Model, Field>;
+type ScalarFieldMutationPayload<Schema extends SchemaDef, Model extends GetModels<Schema>, Field extends GetModelFields<Schema, Model>> = IsJsonField<Schema, Model, Field> extends true ? ModelFieldIsOptional<Schema, Model, Field> extends true ? JsonValue | JsonNull | DbNull : JsonValue | JsonNull : IsTypedJsonField<Schema, Model, Field> extends true ? ModelFieldIsOptional<Schema, Model, Field> extends true ? MapModelFieldType<Schema, Model, Field> | JsonNull | DbNull : MapModelFieldType<Schema, Model, Field> : MapModelFieldType<Schema, Model, Field>;
 type IsJsonField<Schema extends SchemaDef, Model extends GetModels<Schema>, Field extends GetModelFields<Schema, Model>> = GetModelFieldType<Schema, Model, Field> extends 'Json' ? true : false;
+type IsTypedJsonField<Schema extends SchemaDef, Model extends GetModels<Schema>, Field extends GetModelFields<Schema, Model>> = GetModelFieldType<Schema, Model, Field> extends GetTypeDefs<Schema> ? true : false;
 type CreateFKPayload<Schema extends SchemaDef, Model extends GetModels<Schema>> = OptionalWrap<Schema, Model, {
     [Key in ForeignKeyFields<Schema, Model>]: MapModelFieldType<Schema, Model, Key>;
 }>;
@@ -3013,6 +3014,7 @@ declare class ZodSchemaFactory<Schema extends SchemaDef, Options extends ClientO
     private makeTypeDefSchema;
     makeWhereSchema(model: string, unique: boolean, withoutRelationFields?: boolean, withAggregations?: boolean, options?: CreateSchemaOptions): ZodType;
     private makeTypedJsonFilterSchema;
+    private makeNullableTypedJsonMutationSchema;
     private isTypeDefType;
     private makeEnumFilterSchema;
     private makeArrayFilterSchema;

package/dist/index.js

@@ -787,17 +787,32 @@ var BaseCrudDialect = class {
       take = -take;
     }
     result = this.buildSkipTake(result, skip, take);
-    result = this.buildOrderBy(result, model, modelAlias, args.orderBy, negateOrderBy, take);
+    let distinctFields = [];
     if ("distinct" in args && args.distinct) {
-      const distinct = ensureArray(args.distinct);
+      distinctFields = ensureArray(args.distinct);
       if (this.supportsDistinctOn) {
-        result = result.distinctOn(distinct.map((f) => this.eb.ref(`${modelAlias}.${f}`)));
+        result = result.distinctOn(distinctFields.map((f) => this.eb.ref(`${modelAlias}.${f}`)));
       } else {
         throw createNotSupportedError(`"distinct" is not supported by "${this.schema.provider.type}" provider`);
       }
     }
+    let effectiveOrderBy = args.orderBy;
+    if (distinctFields.length > 0 && this.supportsDistinctOn) {
+      const existingOrderBy = enumerate(args.orderBy).filter((o) => Object.keys(o).length > 0);
+      const alreadySatisfied = distinctFields.every((f, i) => i < existingOrderBy.length && Object.keys(existingOrderBy[i])[0] === f);
+      if (existingOrderBy.length > 0 && !alreadySatisfied) {
+        const prependedOrderBy = distinctFields.map((f) => ({
+          [f]: "asc"
+        }));
+        effectiveOrderBy = [
+          ...prependedOrderBy,
+          ...existingOrderBy
+        ];
+      }
+    }
+    result = this.buildOrderBy(result, model, modelAlias, effectiveOrderBy, negateOrderBy, take);
     if (args.cursor) {
-      result = this.buildCursorFilter(model, result, args.cursor, args.orderBy, negateOrderBy, modelAlias);
+      result = this.buildCursorFilter(model, result, args.cursor, effectiveOrderBy, negateOrderBy, modelAlias);
     }
     return result;
   }
@@ -1050,6 +1065,9 @@ var BaseCrudDialect = class {
       return this.buildEnumFilter(fieldRef, fieldDef, payload);
     }
     if (isTypeDef(this.schema, fieldDef.type)) {
+      if (payload instanceof DbNullClass || payload instanceof JsonNullClass || payload instanceof AnyNullClass) {
+        return this.buildJsonValueFilterClause(fieldRef, payload);
+      }
       return this.buildJsonFilter(fieldRef, payload, fieldDef);
     }
     return match2(fieldDef.type).with("String", () => this.buildStringFilter(fieldRef, payload)).with(P.union("Int", "Float", "Decimal", "BigInt"), (type) => this.buildNumberFilter(fieldRef, type, payload)).with("Boolean", () => this.buildBooleanFilter(fieldRef, payload)).with("DateTime", () => this.buildDateTimeFilter(fieldRef, payload)).with("Bytes", () => this.buildBytesFilter(fieldRef, payload)).with("Json", () => this.buildJsonFilter(fieldRef, payload, fieldDef)).with("Unsupported", () => {
@@ -1527,12 +1545,13 @@ var BaseCrudDialect = class {
       const fieldDef = requireField(this.schema, model, field);
       const fieldModel = fieldDef.type;
       let fieldCountQuery;
+      const subQueryAlias = tmpAlias(`${parentAlias}$_${field}$count`);
       const m2m = getManyToManyRelation(this.schema, model, field);
       if (m2m) {
-        fieldCountQuery = this.buildModelSelect(fieldModel, fieldModel, value, false).innerJoin(m2m.joinTable, (join) => join.onRef(`${m2m.joinTable}.${m2m.otherFkName}`, "=", `${fieldModel}.${m2m.otherPKName}`).onRef(`${m2m.joinTable}.${m2m.parentFkName}`, "=", `${parentAlias}.${m2m.parentPKName}`)).select(eb.fn.countAll().as(`_count$${field}`));
+        fieldCountQuery = this.buildModelSelect(fieldModel, subQueryAlias, value, false).innerJoin(m2m.joinTable, (join) => join.onRef(`${m2m.joinTable}.${m2m.otherFkName}`, "=", `${subQueryAlias}.${m2m.otherPKName}`).onRef(`${m2m.joinTable}.${m2m.parentFkName}`, "=", `${parentAlias}.${m2m.parentPKName}`)).select(eb.fn.countAll().as(`_count$${field}`));
       } else {
-        fieldCountQuery = this.buildModelSelect(fieldModel, fieldModel, value, false).select(eb.fn.countAll().as(`_count$${field}`));
-        const joinPairs = buildJoinPairs(this.schema, model, parentAlias, field, fieldModel);
+        fieldCountQuery = this.buildModelSelect(fieldModel, subQueryAlias, value, false).select(eb.fn.countAll().as(`_count$${field}`));
+        const joinPairs = buildJoinPairs(this.schema, model, parentAlias, field, subQueryAlias);
         for (const [left, right] of joinPairs) {
           fieldCountQuery = fieldCountQuery.whereRef(left, "=", right);
         }
@@ -2285,10 +2304,20 @@ var PostgresCrudDialect = class _PostgresCrudDialect extends LateralJoinDialectB
     return query;
   }
   buildJsonObject(value) {
-    return this.eb.fn("jsonb_build_object", Object.entries(value).flatMap(([key, value2]) => [
-      sql3.lit(key),
-      value2
-    ]));
+    const entries = Object.entries(value);
+    const MAX_PAIRS = 50;
+    const buildChunk = /* @__PURE__ */ __name((chunk) => this.eb.fn("jsonb_build_object", chunk.flatMap(([k, v]) => [
+      sql3.lit(k),
+      v
+    ])), "buildChunk");
+    if (entries.length <= MAX_PAIRS) {
+      return buildChunk(entries);
+    }
+    const chunks = [];
+    for (let i = 0; i < entries.length; i += MAX_PAIRS) {
+      chunks.push(buildChunk(entries.slice(i, i + MAX_PAIRS)));
+    }
+    return chunks.reduce((acc, chunk) => sql3`${acc} || ${chunk}`);
   }
   castInt(expression) {
     return this.eb.cast(expression, "integer");
@@ -5381,9 +5410,28 @@ var ZodSchemaFactory = class {
     candidates.push(this.makeJsonFilterSchema(contextModel, field, optional));
     if (optional) {
       candidates.push(z.null());
+      candidates.push(z.instanceof(DbNullClass));
+      candidates.push(z.instanceof(JsonNullClass));
+      candidates.push(z.instanceof(AnyNullClass));
     }
     return z.union(candidates);
   }
+  // For optional typed JSON fields, allow DbNull, JsonNull, and null.
+  // z.union doesn't work here because `z.any()` (returned by `makeScalarSchema`)
+  // always wins, so we create a wrapper superRefine instead.
+  // The caller must pass the already-built fieldSchema so that array/list
+  // mutation shapes (set, push, etc.) are preserved.
+  makeNullableTypedJsonMutationSchema(fieldSchema) {
+    return z.any().superRefine((value, ctx) => {
+      if (value instanceof DbNullClass || value instanceof JsonNullClass || value === null || value === void 0) {
+        return;
+      }
+      const parseResult = fieldSchema.safeParse(value);
+      if (!parseResult.success) {
+        parseResult.error.issues.forEach((issue) => ctx.addIssue(issue));
+      }
+    }).optional();
+  }
   isTypeDefType(type) {
     return this.schema.typeDefs && type in this.schema.typeDefs;
   }
@@ -5722,6 +5770,9 @@ var ZodSchemaFactory = class {
       z.literal("asc"),
       z.literal("desc")
     ]);
+    const refineAtMostOneKey = /* @__PURE__ */ __name((s) => s.refine((v) => Object.keys(v).length <= 1, {
+      message: "Each orderBy element must have at most one key"
+    }), "refineAtMostOneKey");
     const nextOpts = this.nextOptions(options);
     for (const [field, fieldDef] of this.getModelFields(model)) {
       if (fieldDef.relation) {
@@ -5729,9 +5780,9 @@ var ZodSchemaFactory = class {
           fields[field] = z.lazy(() => {
             let relationOrderBy = this.makeOrderBySchema(fieldDef.type, withRelation, WithAggregation, nextOpts);
             if (fieldDef.array) {
-              relationOrderBy = relationOrderBy.extend({
+              relationOrderBy = refineAtMostOneKey(relationOrderBy.safeExtend({
                 _count: sort
-              });
+              }));
             }
             return relationOrderBy.optional();
           });
@@ -5765,7 +5816,7 @@ var ZodSchemaFactory = class {
         fields[agg] = z.lazy(() => this.makeOrderBySchema(model, true, false, options).optional());
       }
     }
-    return z.strictObject(fields);
+    return refineAtMostOneKey(z.strictObject(fields));
   }
   makeDistinctSchema(model) {
     const nonRelationFields = this.getModelFields(model).filter(([, def]) => !def.relation).map(([name]) => name);
@@ -5875,6 +5926,8 @@ var ZodSchemaFactory = class {
               fieldSchema,
               z.instanceof(DbNullClass)
             ]);
+          } else if (this.isTypeDefType(fieldDef.type)) {
+            fieldSchema = this.makeNullableTypedJsonMutationSchema(fieldSchema);
           } else {
             fieldSchema = fieldSchema.nullable();
           }
@@ -6111,6 +6164,8 @@ var ZodSchemaFactory = class {
               fieldSchema,
               z.instanceof(DbNullClass)
             ]);
+          } else if (this.isTypeDefType(fieldDef.type)) {
+            fieldSchema = this.makeNullableTypedJsonMutationSchema(fieldSchema);
           } else {
             fieldSchema = fieldSchema.nullable();
           }