@beabee/beabee-common 1.4.1 → 1.5.1

package/dist/cjs/search/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertFiltersToRules = exports.convertRulesToFilters = exports.operationParams = exports.nullableOperators = exports.operators = void 0;
+exports.convertFiltersToRules = exports.convertRulesToFilters = exports.validateRuleGroup = exports.validateRule = exports.isRuleGroup = exports.operatorsByType = exports.nullableOperators = exports.operators = void 0;
 exports.operators = [
     "equal",
     "not_equal",
@@ -52,7 +52,7 @@ exports.nullableOperators = {
     is_empty: { args: 0 },
     is_not_empty: { args: 0 },
 };
-exports.operationParams = {
+exports.operatorsByType = {
     text: {
         ...equalityOperators,
         ...arrayOperators,
@@ -68,6 +68,37 @@ exports.operationParams = {
     enum: equalityOperators,
     contact: equalityOperators,
 };
+function isRuleGroup(ruleOrGroup) {
+    return "condition" in ruleOrGroup;
+}
+exports.isRuleGroup = isRuleGroup;
+function validateRule(filters, rule) {
+    const filter = filters[rule.field];
+    if (!filter) {
+        return false; // Invalid field
+    }
+    const operator = exports.operatorsByType[filter.type][rule.operator];
+    if (!operator) {
+        return false; // Invalid operator
+    }
+    if (operator.args !== rule.value.length) {
+        return false; // Invalid number of args
+    }
+    return true;
+}
+exports.validateRule = validateRule;
+function validateRuleGroup(filters, ruleGroup) {
+    for (const rule of ruleGroup.rules) {
+        const valid = isRuleGroup(rule)
+            ? validateRuleGroup(filters, rule)
+            : validateRule(filters, rule);
+        if (!valid) {
+            return false;
+        }
+    }
+    return true;
+}
+exports.validateRuleGroup = validateRuleGroup;
 function convertRulesToFilters(rules) {
     if (!rules) {
         return null;
@@ -77,7 +108,7 @@ function convertRulesToFilters(rules) {
     return rulesWithoutGroups.map((rule) => ({
         id: rule.field,
         operator: rule.operator,
-        values: Array.isArray(rule.value) ? [...rule.value] : [rule.value],
+        values: [...rule.value],
     }));
 }
 exports.convertRulesToFilters = convertRulesToFilters;

package/dist/esm/search/index.js

@@ -35,7 +35,7 @@ export const nullableOperators = {
     is_empty: { args: 0 },
     is_not_empty: { args: 0 },
 };
-export const operationParams = {
+export const operatorsByType = {
     text: {
         ...equalityOperators,
         ...arrayOperators,
@@ -51,6 +51,34 @@ export const operationParams = {
     enum: equalityOperators,
     contact: equalityOperators,
 };
+export function isRuleGroup(ruleOrGroup) {
+    return "condition" in ruleOrGroup;
+}
+export function validateRule(filters, rule) {
+    const filter = filters[rule.field];
+    if (!filter) {
+        return false; // Invalid field
+    }
+    const operator = operatorsByType[filter.type][rule.operator];
+    if (!operator) {
+        return false; // Invalid operator
+    }
+    if (operator.args !== rule.value.length) {
+        return false; // Invalid number of args
+    }
+    return true;
+}
+export function validateRuleGroup(filters, ruleGroup) {
+    for (const rule of ruleGroup.rules) {
+        const valid = isRuleGroup(rule)
+            ? validateRuleGroup(filters, rule)
+            : validateRule(filters, rule);
+        if (!valid) {
+            return false;
+        }
+    }
+    return true;
+}
 export function convertRulesToFilters(rules) {
     if (!rules) {
         return null;
@@ -60,7 +88,7 @@ export function convertRulesToFilters(rules) {
     return rulesWithoutGroups.map((rule) => ({
         id: rule.field,
         operator: rule.operator,
-        values: Array.isArray(rule.value) ? [...rule.value] : [rule.value],
+        values: [...rule.value],
     }));
 }
 export function convertFiltersToRules(matchType, filters) {

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

@@ -4,7 +4,7 @@ export declare type GetPaginatedQueryRuleValue = string | number | boolean;
 export interface GetPaginatedQueryRule<T> {
     field: T;
     operator: GetPaginatedQueryRuleOperator;
-    value: GetPaginatedQueryRuleValue | GetPaginatedQueryRuleValue[];
+    value: GetPaginatedQueryRuleValue[];
 }
 export interface GetPaginatedQueryRuleGroup<T> {
     condition: "AND" | "OR";
@@ -31,7 +31,7 @@ export declare const nullableOperators: {
         args: number;
     };
 };
-export declare const operationParams: Record<FilterType, Partial<Record<FilterOperator, FilterOperatorParams>>>;
+export declare const operatorsByType: Record<FilterType, Partial<Record<FilterOperator, FilterOperatorParams>>>;
 interface BaseFilterArgs {
     type: FilterType;
     nullable?: boolean;
@@ -50,6 +50,9 @@ export interface Filter {
     operator: FilterOperator;
     values: FilterValue[];
 }
+export declare function isRuleGroup<T>(ruleOrGroup: GetPaginatedQueryRule<T> | GetPaginatedQueryRuleGroup<T>): ruleOrGroup is GetPaginatedQueryRuleGroup<T>;
+export declare function validateRule<Field extends string>(filters: Filters<Field>, rule: GetPaginatedQueryRule<string>): rule is GetPaginatedQueryRule<Field>;
+export declare function validateRuleGroup<Field extends string>(filters: Filters<Field>, ruleGroup: GetPaginatedQueryRuleGroup<string>): ruleGroup is GetPaginatedQueryRuleGroup<Field>;
 export declare function convertRulesToFilters(rules: GetPaginatedQuery<string>["rules"]): Filter[] | null;
 export declare function convertFiltersToRules(matchType: "all" | "any", filters: Filter[]): GetPaginatedQuery<string>["rules"];
 export * from "./callouts";

package/package.json

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