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

package/dist/index.cjs

@@ -6432,7 +6432,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) {
@@ -6442,21 +6442,27 @@ var InputValidator = class {
     if (!slicing?.models) {
       return void 0;
     }
-    const modelConfig = slicing.models[model];
+    const modelsRecord = slicing.models;
+    const modelConfig = modelsRecord[(0, import_common_helpers9.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;
@@ -9253,7 +9259,7 @@ function createModelCrudHandler(client, model, inputValidator, resultProcessor)
   };
   const slicing = client.$options.slicing;
   if (slicing?.models) {
-    const modelSlicing = slicing.models[model];
+    const modelSlicing = slicing.models[(0, import_common_helpers14.lowerCaseFirst)(model)];
     const allSlicing = slicing.models.$all;
     const includedOperations = modelSlicing?.includedOperations ?? allSlicing?.includedOperations;
     const excludedOperations = modelSlicing?.excludedOperations ?? allSlicing?.excludedOperations;