@beabee/beabee-common 1.8.4 → 1.9.1

package/dist/cjs/search/contacts.js

@@ -15,6 +15,9 @@ exports.contactFilters = {
     joined: {
         type: "date",
     },
+    lastSeen: {
+        type: "date",
+    },
     contributionCancelled: {
         type: "date",
     },

package/dist/cjs/search/index.js

@@ -34,7 +34,6 @@ exports.ruleOperators = [
     "is_empty",
     "is_not_empty",
 ];
-// *** Operator definitions ***
 const equalityOperators = {
     equal: { args: 1 },
     not_equal: { args: 1 },

package/dist/cjs/utils/rules.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertFiltersToRuleGroup = exports.convertRuleGroupToFilters = exports.validateRuleGroup = exports.validateRule = exports.isRuleGroup = void 0;
+exports.validateRuleGroup = exports.validateRule = exports.isRuleGroup = void 0;
 const error_1 = require("../error");
 const search_1 = require("../search");
 const date_1 = require("./date");
@@ -61,27 +61,3 @@ function validateRuleGroup(filters, ruleGroup) {
     return validatedRuleGroup;
 }
 exports.validateRuleGroup = validateRuleGroup;
-function convertRuleGroupToFilters(ruleGroup) {
-    if (!ruleGroup) {
-        return null;
-    }
-    // TODO: how to handle groups?
-    const rulesWithoutGroups = ruleGroup.rules.filter((rule) => !isRuleGroup(rule));
-    return rulesWithoutGroups.map((rule) => ({
-        id: rule.field,
-        operator: rule.operator,
-        values: [...rule.value],
-    }));
-}
-exports.convertRuleGroupToFilters = convertRuleGroupToFilters;
-function convertFiltersToRuleGroup(matchType, filters) {
-    return {
-        condition: matchType === "all" ? "AND" : "OR",
-        rules: filters.map((filter) => ({
-            field: filter.id,
-            operator: filter.operator,
-            value: filter.values,
-        })),
-    };
-}
-exports.convertFiltersToRuleGroup = convertFiltersToRuleGroup;

package/dist/esm/search/contacts.js

@@ -12,6 +12,9 @@ export const contactFilters = {
     joined: {
         type: "date",
     },
+    lastSeen: {
+        type: "date",
+    },
     contributionCancelled: {
         type: "date",
     },

package/dist/esm/search/index.js

@@ -17,7 +17,6 @@ export const ruleOperators = [
     "is_empty",
     "is_not_empty",
 ];
-// *** Operator definitions ***
 const equalityOperators = {
     equal: { args: 1 },
     not_equal: { args: 1 },

package/dist/esm/utils/rules.js

@@ -55,25 +55,3 @@ export function validateRuleGroup(filters, ruleGroup) {
     }
     return validatedRuleGroup;
 }
-export function convertRuleGroupToFilters(ruleGroup) {
-    if (!ruleGroup) {
-        return null;
-    }
-    // TODO: how to handle groups?
-    const rulesWithoutGroups = ruleGroup.rules.filter((rule) => !isRuleGroup(rule));
-    return rulesWithoutGroups.map((rule) => ({
-        id: rule.field,
-        operator: rule.operator,
-        values: [...rule.value],
-    }));
-}
-export function convertFiltersToRuleGroup(matchType, filters) {
-    return {
-        condition: matchType === "all" ? "AND" : "OR",
-        rules: filters.map((filter) => ({
-            field: filter.id,
-            operator: filter.operator,
-            value: filter.values,
-        })),
-    };
-}

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

@@ -12,6 +12,9 @@ export declare const contactFilters: {
     readonly joined: {
         readonly type: "date";
     };
+    readonly lastSeen: {
+        readonly type: "date";
+    };
     readonly contributionCancelled: {
         readonly type: "date";
     };

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

@@ -26,9 +26,6 @@ export interface ValidatedRuleGroup<Field extends string> {
     rules: (ValidatedRuleGroup<Field> | ValidatedRule<Field>)[];
 }
 export declare type FilterType = "text" | "date" | "number" | "boolean" | "array" | "enum" | "contact";
-export interface FilterOperatorParams {
-    args: number;
-}
 interface BaseFilterArgs {
     type: FilterType;
     nullable?: boolean;
@@ -42,12 +39,8 @@ export interface OtherFilterArgs extends BaseFilterArgs {
 }
 export declare type FilterArgs = EnumFilterArgs | OtherFilterArgs;
 export declare type Filters<T extends string = string> = Record<T, FilterArgs>;
-export declare type FilterValue = RuleValue;
-export declare type FilterOperator = RuleOperator;
-export interface Filter {
-    id: string;
-    operator: FilterOperator;
-    values: FilterValue[];
+export interface RuleOperatorParams {
+    args: number;
 }
 export declare const nullableOperators: {
     is_empty: {
@@ -166,7 +159,7 @@ export declare const operatorsByType: {
         };
     };
 };
-export declare const operatorsByTypeMap: Record<FilterType, Partial<Record<FilterOperator, FilterOperatorParams>>>;
+export declare const operatorsByTypeMap: Record<FilterType, Partial<Record<RuleOperator, RuleOperatorParams>>>;
 export interface Paginated<T> {
     items: T[];
     offset: number;

package/dist/types/utils/rules.d.ts

@@ -1,6 +1,4 @@
-import { Filter, Filters, Rule, RuleGroup, ValidatedRule, ValidatedRuleGroup } from "../search";
+import { Filters, Rule, RuleGroup, ValidatedRule, ValidatedRuleGroup } from "../search";
 export declare function isRuleGroup(ruleOrGroup: Rule | RuleGroup): ruleOrGroup is RuleGroup;
 export declare function validateRule<Field extends string>(filters: Filters<Field>, rule: Rule): ValidatedRule<Field>;
 export declare function validateRuleGroup<Field extends string>(filters: Filters<Field>, ruleGroup: RuleGroup): ValidatedRuleGroup<Field>;
-export declare function convertRuleGroupToFilters(ruleGroup?: RuleGroup): Filter[] | null;
-export declare function convertFiltersToRuleGroup(matchType: "all" | "any", filters: Filter[]): RuleGroup;

package/package.json

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