@beabee/beabee-common 1.10.6 → 1.10.8

package/dist/cjs/utils/rules.js

@@ -31,9 +31,11 @@ function validateRule(filters, rule) {
     if (expectedArgs !== rule.value.length) {
         throw new error_1.InvalidRule(rule, `Invalid operator argument count: ${rule.operator} needs ${expectedArgs}, ${rule.value.length} given`);
     }
-    const expectedType = filter.type === "boolean" || filter.type === "number"
-        ? filter.type
-        : "string";
+    const expectedType = filter.type === "custom"
+        ? typeof rule.value[0]
+        : filter.type === "boolean" || filter.type === "number"
+            ? filter.type
+            : "string";
     if (rule.value.some((v) => typeof v !== expectedType)) {
         throw new error_1.InvalidRule(rule, `Invalid operator argument type: ${rule.operator} needs ${expectedType}, ${rule.value.map((v) => typeof v)} given`);
     }
@@ -41,6 +43,10 @@ function validateRule(filters, rule) {
         rule.value.some((v) => !(0, date_1.isValidDate)(v))) {
         throw new error_1.InvalidRule(rule, `Invalid operator argument: date type needs valid absolute or relative date, ${rule.value} given`);
     }
+    if ((filter.type === "enum" || filter.type === "array") &&
+        rule.value.some((v) => filter.options?.indexOf(v) === -1)) {
+        throw new error_1.InvalidRule(rule, `Invalid operator argument: ${filter.type} type expected ${filter.options}, ${rule.value} given`);
+    }
     return {
         field: fieldName,
         param: fieldParam,

package/dist/esm/utils/rules.js

@@ -27,9 +27,11 @@ export function validateRule(filters, rule) {
     if (expectedArgs !== rule.value.length) {
         throw new InvalidRule(rule, `Invalid operator argument count: ${rule.operator} needs ${expectedArgs}, ${rule.value.length} given`);
     }
-    const expectedType = filter.type === "boolean" || filter.type === "number"
-        ? filter.type
-        : "string";
+    const expectedType = filter.type === "custom"
+        ? typeof rule.value[0]
+        : filter.type === "boolean" || filter.type === "number"
+            ? filter.type
+            : "string";
     if (rule.value.some((v) => typeof v !== expectedType)) {
         throw new InvalidRule(rule, `Invalid operator argument type: ${rule.operator} needs ${expectedType}, ${rule.value.map((v) => typeof v)} given`);
     }
@@ -37,6 +39,10 @@ export function validateRule(filters, rule) {
         rule.value.some((v) => !isValidDate(v))) {
         throw new InvalidRule(rule, `Invalid operator argument: date type needs valid absolute or relative date, ${rule.value} given`);
     }
+    if ((filter.type === "enum" || filter.type === "array") &&
+        rule.value.some((v) => filter.options?.indexOf(v) === -1)) {
+        throw new InvalidRule(rule, `Invalid operator argument: ${filter.type} type expected ${filter.options}, ${rule.value} given`);
+    }
     return {
         field: fieldName,
         param: fieldParam,

package/dist/types/search/index.d.ts

@@ -31,14 +31,18 @@ interface BaseFilterArgs {
     type: FilterType;
     nullable?: boolean;
 }
+export interface ArrayFilterArgs<T extends readonly string[] = readonly string[]> extends BaseFilterArgs {
+    type: "array";
+    options?: T;
+}
 export interface EnumFilterArgs<T extends readonly string[] = readonly string[]> extends BaseFilterArgs {
     type: "enum";
     options: T;
 }
 export interface OtherFilterArgs extends BaseFilterArgs {
-    type: Exclude<FilterType, "enum">;
+    type: Exclude<FilterType, "array" | "enum">;
 }
-export type FilterArgs = EnumFilterArgs | OtherFilterArgs;
+export type FilterArgs = ArrayFilterArgs | EnumFilterArgs | OtherFilterArgs;
 export type Filters<T extends string = string> = Record<T, FilterArgs>;
 export interface RuleOperatorParams {
     args: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beabee/beabee-common",
-  "version": "1.10.6",
+  "version": "1.10.8",
   "description": "",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",