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

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();
@@ -502,7 +503,7 @@ declare class InputValidator<Schema extends SchemaDef> {
     private get providerSupportsCaseSensitivity();
     /**
      * Gets the effective set of allowed FilterKind values for a specific model and field.
-     * Respects the precedence: field-level > model-level $all > global $all.
+     * Respects the precedence: model[field] > model.$all > $all[field] > $all.$all.
      */
     private getEffectiveFilterKinds;
     /**
@@ -829,7 +830,7 @@ type SlicingOptions<Schema extends SchemaDef> = {
      * Model slicing options.
      */
     models?: {
-        [Model in GetModels<Schema>]?: ModelSlicingOptions<Schema, Model>;
+        [Model in GetModels<Schema> as Uncapitalize<Model>]?: ModelSlicingOptions<Schema, Model>;
     } & {
         /**
          * Slicing options that apply to all models. Model-specific options will override these general
@@ -994,9 +995,9 @@ type GetSlicedModels<Schema extends SchemaDef, Options extends QueryOptions<Sche
 type GetSlicedOperations<Schema extends SchemaDef, Model extends GetModels<Schema>, Options extends QueryOptions<Schema>> = Options['slicing'] extends infer Slicing ? Slicing extends SlicingOptions<Schema> ? GetIncludedOperations<Slicing, Model> extends infer IO ? GetExcludedOperations<Slicing, Model> extends infer EO ? IO extends '_none_' ? never : IsNever<IO> extends false ? Exclude<IO, EO> : Exclude<AllCrudOperations, EO> : AllCrudOperations : AllCrudOperations : AllCrudOperations : AllCrudOperations;
 type GetIncludedOperations<Slicing extends SlicingOptions<any>, Model extends string> = 'models' extends keyof Slicing ? Slicing extends {
     models: infer Config;
-} ? Model extends keyof Config ? 'includedOperations' extends keyof Config[Model] ? Config[Model] extends {
+} ? Uncapitalize<Model> extends keyof Config ? 'includedOperations' extends keyof Config[Uncapitalize<Model>] ? Config[Uncapitalize<Model>] extends {
     includedOperations: readonly [];
-} ? '_none_' : Config[Model] extends {
+} ? '_none_' : Config[Uncapitalize<Model>] extends {
     includedOperations: readonly (infer IO)[];
 } ? IO : never : GetAllIncludedOperations<Slicing> : GetAllIncludedOperations<Slicing> : AllCrudOperations : AllCrudOperations;
 type GetAllIncludedOperations<Slicing extends SlicingOptions<any>> = 'models' extends keyof Slicing ? Slicing extends {
@@ -1008,7 +1009,7 @@ type GetAllIncludedOperations<Slicing extends SlicingOptions<any>> = 'models' ex
 } ? IO : AllCrudOperations : AllCrudOperations : AllCrudOperations : AllCrudOperations;
 type GetExcludedOperations<Slicing extends SlicingOptions<any>, Model extends string> = 'models' extends keyof Slicing ? Slicing extends {
     models: infer Config;
-} ? Model extends keyof Config ? Config[Model] extends {
+} ? Uncapitalize<Model> extends keyof Config ? Config[Uncapitalize<Model>] extends {
     excludedOperations: readonly (infer EO)[];
 } ? EO : GetAllExcludedOperations<Slicing> : GetAllExcludedOperations<Slicing> : never : never;
 type GetAllExcludedOperations<Slicing extends SlicingOptions<any>> = 'models' extends keyof Slicing ? Slicing extends {
@@ -1035,7 +1036,7 @@ type GetIncludedFilterKindsFromModelConfig<ModelConfig, Field extends string> =
 } ? IFK : never : GetAllFieldsIncludedFilterKinds<FieldsConfig> : GetAllFieldsIncludedFilterKinds<FieldsConfig> : never : never;
 type GetFieldIncludedFilterKinds<S extends SlicingOptions<any>, Model extends string, Field extends string> = S extends {
     models?: infer Config;
-} ? Model extends keyof Config ? GetIncludedFilterKindsFromModelConfig<Config[Model], Field> : '$all' extends keyof Config ? GetIncludedFilterKindsFromModelConfig<Config['$all'], Field> : never : never;
+} ? Uncapitalize<Model> extends keyof Config ? GetIncludedFilterKindsFromModelConfig<Config[Uncapitalize<Model>], Field> : '$all' extends keyof Config ? GetIncludedFilterKindsFromModelConfig<Config['$all'], Field> : never : never;
 type GetAllFieldsIncludedFilterKinds<FieldsConfig> = '$all' extends keyof FieldsConfig ? FieldsConfig['$all'] extends {
     includedFilterKinds: readonly [];
 } ? '_none_' : FieldsConfig['$all'] extends {
@@ -1046,7 +1047,7 @@ type GetExcludedFilterKindsFromModelConfig<ModelConfig, Field extends string> =
 } ? EFK : GetAllFieldsExcludedFilterKinds<FieldsConfig> : GetAllFieldsExcludedFilterKinds<FieldsConfig> : never : never;
 type GetFieldExcludedFilterKinds<S extends SlicingOptions<any>, Model extends string, Field extends string> = S extends {
     models?: infer Config;
-} ? Model extends keyof Config ? GetExcludedFilterKindsFromModelConfig<Config[Model], Field> : '$all' extends keyof Config ? GetExcludedFilterKindsFromModelConfig<Config['$all'], Field> : never : never;
+} ? Uncapitalize<Model> extends keyof Config ? GetExcludedFilterKindsFromModelConfig<Config[Uncapitalize<Model>], Field> : '$all' extends keyof Config ? GetExcludedFilterKindsFromModelConfig<Config['$all'], Field> : never : never;
 type GetAllFieldsExcludedFilterKinds<FieldsConfig> = '$all' extends keyof FieldsConfig ? FieldsConfig['$all'] extends {
     excludedFilterKinds: readonly (infer EFK)[];
 } ? EFK : never : never;

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();
@@ -502,7 +503,7 @@ declare class InputValidator<Schema extends SchemaDef> {
     private get providerSupportsCaseSensitivity();
     /**
      * Gets the effective set of allowed FilterKind values for a specific model and field.
-     * Respects the precedence: field-level > model-level $all > global $all.
+     * Respects the precedence: model[field] > model.$all > $all[field] > $all.$all.
      */
     private getEffectiveFilterKinds;
     /**
@@ -829,7 +830,7 @@ type SlicingOptions<Schema extends SchemaDef> = {
      * Model slicing options.
      */
     models?: {
-        [Model in GetModels<Schema>]?: ModelSlicingOptions<Schema, Model>;
+        [Model in GetModels<Schema> as Uncapitalize<Model>]?: ModelSlicingOptions<Schema, Model>;
     } & {
         /**
          * Slicing options that apply to all models. Model-specific options will override these general
@@ -994,9 +995,9 @@ type GetSlicedModels<Schema extends SchemaDef, Options extends QueryOptions<Sche
 type GetSlicedOperations<Schema extends SchemaDef, Model extends GetModels<Schema>, Options extends QueryOptions<Schema>> = Options['slicing'] extends infer Slicing ? Slicing extends SlicingOptions<Schema> ? GetIncludedOperations<Slicing, Model> extends infer IO ? GetExcludedOperations<Slicing, Model> extends infer EO ? IO extends '_none_' ? never : IsNever<IO> extends false ? Exclude<IO, EO> : Exclude<AllCrudOperations, EO> : AllCrudOperations : AllCrudOperations : AllCrudOperations : AllCrudOperations;
 type GetIncludedOperations<Slicing extends SlicingOptions<any>, Model extends string> = 'models' extends keyof Slicing ? Slicing extends {
     models: infer Config;
-} ? Model extends keyof Config ? 'includedOperations' extends keyof Config[Model] ? Config[Model] extends {
+} ? Uncapitalize<Model> extends keyof Config ? 'includedOperations' extends keyof Config[Uncapitalize<Model>] ? Config[Uncapitalize<Model>] extends {
     includedOperations: readonly [];
-} ? '_none_' : Config[Model] extends {
+} ? '_none_' : Config[Uncapitalize<Model>] extends {
     includedOperations: readonly (infer IO)[];
 } ? IO : never : GetAllIncludedOperations<Slicing> : GetAllIncludedOperations<Slicing> : AllCrudOperations : AllCrudOperations;
 type GetAllIncludedOperations<Slicing extends SlicingOptions<any>> = 'models' extends keyof Slicing ? Slicing extends {
@@ -1008,7 +1009,7 @@ type GetAllIncludedOperations<Slicing extends SlicingOptions<any>> = 'models' ex
 } ? IO : AllCrudOperations : AllCrudOperations : AllCrudOperations : AllCrudOperations;
 type GetExcludedOperations<Slicing extends SlicingOptions<any>, Model extends string> = 'models' extends keyof Slicing ? Slicing extends {
     models: infer Config;
-} ? Model extends keyof Config ? Config[Model] extends {
+} ? Uncapitalize<Model> extends keyof Config ? Config[Uncapitalize<Model>] extends {
     excludedOperations: readonly (infer EO)[];
 } ? EO : GetAllExcludedOperations<Slicing> : GetAllExcludedOperations<Slicing> : never : never;
 type GetAllExcludedOperations<Slicing extends SlicingOptions<any>> = 'models' extends keyof Slicing ? Slicing extends {
@@ -1035,7 +1036,7 @@ type GetIncludedFilterKindsFromModelConfig<ModelConfig, Field extends string> =
 } ? IFK : never : GetAllFieldsIncludedFilterKinds<FieldsConfig> : GetAllFieldsIncludedFilterKinds<FieldsConfig> : never : never;
 type GetFieldIncludedFilterKinds<S extends SlicingOptions<any>, Model extends string, Field extends string> = S extends {
     models?: infer Config;
-} ? Model extends keyof Config ? GetIncludedFilterKindsFromModelConfig<Config[Model], Field> : '$all' extends keyof Config ? GetIncludedFilterKindsFromModelConfig<Config['$all'], Field> : never : never;
+} ? Uncapitalize<Model> extends keyof Config ? GetIncludedFilterKindsFromModelConfig<Config[Uncapitalize<Model>], Field> : '$all' extends keyof Config ? GetIncludedFilterKindsFromModelConfig<Config['$all'], Field> : never : never;
 type GetAllFieldsIncludedFilterKinds<FieldsConfig> = '$all' extends keyof FieldsConfig ? FieldsConfig['$all'] extends {
     includedFilterKinds: readonly [];
 } ? '_none_' : FieldsConfig['$all'] extends {
@@ -1046,7 +1047,7 @@ type GetExcludedFilterKindsFromModelConfig<ModelConfig, Field extends string> =
 } ? EFK : GetAllFieldsExcludedFilterKinds<FieldsConfig> : GetAllFieldsExcludedFilterKinds<FieldsConfig> : never : never;
 type GetFieldExcludedFilterKinds<S extends SlicingOptions<any>, Model extends string, Field extends string> = S extends {
     models?: infer Config;
-} ? Model extends keyof Config ? GetExcludedFilterKindsFromModelConfig<Config[Model], Field> : '$all' extends keyof Config ? GetExcludedFilterKindsFromModelConfig<Config['$all'], Field> : never : never;
+} ? Uncapitalize<Model> extends keyof Config ? GetExcludedFilterKindsFromModelConfig<Config[Uncapitalize<Model>], Field> : '$all' extends keyof Config ? GetExcludedFilterKindsFromModelConfig<Config['$all'], Field> : never : never;
 type GetAllFieldsExcludedFilterKinds<FieldsConfig> = '$all' extends keyof FieldsConfig ? FieldsConfig['$all'] extends {
     excludedFilterKinds: readonly (infer EFK)[];
 } ? EFK : never : never;

package/dist/index.js

@@ -18,7 +18,7 @@ var __copyProps = (to, from, except, desc) => {
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 
 // src/client/client-impl.ts
-import { invariant as invariant14 } from "@zenstackhq/common-helpers";
+import { invariant as invariant14, lowerCaseFirst as lowerCaseFirst3 } from "@zenstackhq/common-helpers";
 import { CompiledQuery, DefaultConnectionProvider, DefaultQueryExecutor as DefaultQueryExecutor2, Kysely, Log, sql as sql8, Transaction } from "kysely";
 
 // src/client/crud/operations/aggregate.ts
@@ -4591,7 +4591,7 @@ var UpdateOperationHandler = class extends BaseOperationHandler {
 };
 
 // src/client/crud/validator/index.ts
-import { enumerate as enumerate3, invariant as invariant9 } from "@zenstackhq/common-helpers";
+import { enumerate as enumerate3, invariant as invariant9, lowerCaseFirst } from "@zenstackhq/common-helpers";
 import Decimal5 from "decimal.js";
 import { match as match14, P as P3 } from "ts-pattern";
 import { z as z2, ZodType } from "zod";
@@ -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);
@@ -6384,7 +6387,7 @@ var InputValidator = class {
   }
   /**
    * Gets the effective set of allowed FilterKind values for a specific model and field.
-   * Respects the precedence: field-level > model-level $all > global $all.
+   * Respects the precedence: model[field] > model.$all > $all[field] > $all.$all.
    */
   getEffectiveFilterKinds(model, field) {
     if (!model) {
@@ -6394,21 +6397,27 @@ var InputValidator = class {
     if (!slicing?.models) {
       return void 0;
     }
-    const modelConfig = slicing.models[model];
+    const modelsRecord = slicing.models;
+    const modelConfig = modelsRecord[lowerCaseFirst(model)];
     if (modelConfig?.fields) {
       const fieldConfig = modelConfig.fields[field];
       if (fieldConfig) {
         return this.computeFilterKinds(fieldConfig.includedFilterKinds, fieldConfig.excludedFilterKinds);
       }
-      const allFieldsConfig = modelConfig.fields.$all;
+      const allFieldsConfig = modelConfig.fields["$all"];
       if (allFieldsConfig) {
         return this.computeFilterKinds(allFieldsConfig.includedFilterKinds, allFieldsConfig.excludedFilterKinds);
       }
     }
-    const allModelsConfig = slicing.models.$all;
+    const allModelsConfig = modelsRecord["$all"];
     if (allModelsConfig?.fields) {
-      if (allModelsConfig.fields.$all) {
-        return this.computeFilterKinds(allModelsConfig.fields.$all.includedFilterKinds, allModelsConfig.fields.$all.excludedFilterKinds);
+      const allModelsFieldConfig = allModelsConfig.fields[field];
+      if (allModelsFieldConfig) {
+        return this.computeFilterKinds(allModelsFieldConfig.includedFilterKinds, allModelsFieldConfig.excludedFilterKinds);
+      }
+      const allModelsAllFieldsConfig = allModelsConfig.fields["$all"];
+      if (allModelsAllFieldsConfig) {
+        return this.computeFilterKinds(allModelsAllFieldsConfig.includedFilterKinds, allModelsAllFieldsConfig.excludedFilterKinds);
       }
     }
     return void 0;
@@ -6419,21 +6428,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 +6452,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)
@@ -8141,7 +8147,7 @@ __export(functions_exports, {
   search: () => search,
   startsWith: () => startsWith
 });
-import { invariant as invariant12, lowerCaseFirst, upperCaseFirst } from "@zenstackhq/common-helpers";
+import { invariant as invariant12, lowerCaseFirst as lowerCaseFirst2, upperCaseFirst } from "@zenstackhq/common-helpers";
 import { sql as sql6, ValueNode as ValueNode3 } from "kysely";
 import { match as match16 } from "ts-pattern";
 var contains = /* @__PURE__ */ __name((eb, args, context) => textMatch(eb, args, context, "contains"), "contains");
@@ -8252,7 +8258,7 @@ var currentOperation = /* @__PURE__ */ __name((_eb, args, { operation }) => {
 function processCasing(casing, result, model) {
   const opNode = casing.toOperationNode();
   invariant12(ValueNode3.is(opNode) && typeof opNode.value === "string", '"casting" parameter must be a string value');
-  result = match16(opNode.value).with("original", () => model).with("upper", () => result.toUpperCase()).with("lower", () => result.toLowerCase()).with("capitalize", () => upperCaseFirst(result)).with("uncapitalize", () => lowerCaseFirst(result)).otherwise(() => {
+  result = match16(opNode.value).with("original", () => model).with("upper", () => result.toUpperCase()).with("lower", () => result.toLowerCase()).with("capitalize", () => upperCaseFirst(result)).with("uncapitalize", () => lowerCaseFirst2(result)).otherwise(() => {
     throw new Error(`Invalid casing value: ${opNode.value}. Must be "original", "upper", "lower", "capitalize", or "uncapitalize".`);
   });
   return result;
@@ -9208,7 +9214,7 @@ function createModelCrudHandler(client, model, inputValidator, resultProcessor)
   };
   const slicing = client.$options.slicing;
   if (slicing?.models) {
-    const modelSlicing = slicing.models[model];
+    const modelSlicing = slicing.models[lowerCaseFirst3(model)];
     const allSlicing = slicing.models.$all;
     const includedOperations = modelSlicing?.includedOperations ?? allSlicing?.includedOperations;
     const excludedOperations = modelSlicing?.excludedOperations ?? allSlicing?.excludedOperations;