@zenstackhq/orm 3.4.0-beta.2 → 3.4.0-beta.3

package/dist/index.d.cts

@@ -409,6 +409,7 @@ type toKyselyFieldType<Schema extends SchemaDef, Model extends GetModels<Schema>
 declare class InputValidator<Schema extends SchemaDef> {
     private readonly client;
     private readonly schemaCache;
+    private readonly allFilterKinds;
     constructor(client: ClientContract<Schema>);
     private get schema();
     private get options();

package/dist/index.d.ts

@@ -409,6 +409,7 @@ type toKyselyFieldType<Schema extends SchemaDef, Model extends GetModels<Schema>
 declare class InputValidator<Schema extends SchemaDef> {
     private readonly client;
     private readonly schemaCache;
+    private readonly allFilterKinds;
     constructor(client: ClientContract<Schema>);
     private get schema();
     private get options();

package/dist/index.js

@@ -5017,6 +5017,9 @@ var InputValidator = class {
   }
   client;
   schemaCache = /* @__PURE__ */ new Map();
+  allFilterKinds = [
+    ...new Set(Object.values(FILTER_PROPERTY_TO_KIND))
+  ];
   constructor(client) {
     this.client = client;
   }
@@ -5301,7 +5304,7 @@ var InputValidator = class {
           continue;
         }
         const allowedFilterKinds = this.getEffectiveFilterKinds(model, field);
-        if (allowedFilterKinds && !allowedFilterKinds.has("Relation")) {
+        if (allowedFilterKinds && !allowedFilterKinds.includes("Relation")) {
           fieldSchema = z2.never();
         } else {
           fieldSchema = z2.lazy(() => this.makeWhereSchema(fieldDef.type, false).optional());
@@ -5523,7 +5526,7 @@ var InputValidator = class {
   }
   makeJsonFilterSchema(contextModel, field, optional) {
     const allowedFilterKinds = this.getEffectiveFilterKinds(contextModel, field);
-    if (allowedFilterKinds && !allowedFilterKinds.has("Json")) {
+    if (allowedFilterKinds && !allowedFilterKinds.includes("Json")) {
       return z2.never();
     }
     const valueSchema = this.makeJsonValueSchema(optional, true);
@@ -6419,21 +6422,18 @@ var InputValidator = class {
   computeFilterKinds(included, excluded) {
     let result;
     if (included !== void 0) {
-      result = new Set(included);
+      result = [
+        ...included
+      ];
     }
     if (excluded !== void 0) {
       if (!result) {
-        result = /* @__PURE__ */ new Set([
-          "Equality",
-          "Range",
-          "Like",
-          "Json",
-          "List",
-          "Relation"
-        ]);
+        result = [
+          ...this.allFilterKinds
+        ];
       }
       for (const kind of excluded) {
-        result.delete(kind);
+        result = result.filter((k) => k !== kind);
       }
     }
     return result;
@@ -6446,17 +6446,17 @@ var InputValidator = class {
       return operators;
     }
     return Object.fromEntries(Object.entries(operators).filter(([key, _]) => {
-      return !(key in FILTER_PROPERTY_TO_KIND) || allowedKinds.has(FILTER_PROPERTY_TO_KIND[key]);
+      return !(key in FILTER_PROPERTY_TO_KIND) || allowedKinds.includes(FILTER_PROPERTY_TO_KIND[key]);
     }));
   }
   createUnionFilterSchema(valueSchema, optional, components, allowedFilterKinds) {
     if (Object.keys(components).length === 0) {
-      if (!allowedFilterKinds || allowedFilterKinds.has("Equality")) {
+      if (!allowedFilterKinds || allowedFilterKinds.includes("Equality")) {
         return this.nullableIf(valueSchema, optional);
       }
       return z2.never();
     }
-    if (!allowedFilterKinds || allowedFilterKinds.has("Equality")) {
+    if (!allowedFilterKinds || allowedFilterKinds.includes("Equality")) {
       return z2.union([
         this.nullableIf(valueSchema, optional),
         z2.strictObject(components)