@beabee/beabee-common 1.10.10 → 1.10.12

package/dist/cjs/search/callouts.js

@@ -42,8 +42,4 @@ exports.calloutResponseFilters = {
     updatedAt: {
         type: "date",
     },
-    answers: {
-        type: "custom",
-        nullable: true,
-    },
 };

package/dist/cjs/search/contacts.js

@@ -46,6 +46,7 @@ exports.contactFilters = {
             data_1.NewsletterStatus.Subscribed,
             data_1.NewsletterStatus.Unsubscribed,
             data_1.NewsletterStatus.Cleaned,
+            data_1.NewsletterStatus.Pending,
             data_1.NewsletterStatus.None,
         ],
     },

package/dist/cjs/search/index.js

@@ -70,12 +70,12 @@ exports.operatorsByType = {
     array: arrayOperators,
     enum: equalityOperators,
     contact: equalityOperators,
-    custom: {
-        ...equalityOperators,
-        ...arrayOperators,
-        ...stringOperators,
-        ...numericOperators,
-    },
+    // custom: {
+    //   ...equalityOperators,
+    //   ...arrayOperators,
+    //   ...stringOperators,
+    //   ...numericOperators,
+    // },
 };
 // More general type to allow mapping while maintaining full type above
 exports.operatorsByTypeMap = exports.operatorsByType;

package/dist/cjs/utils/rules.js

@@ -9,8 +9,7 @@ function isRuleGroup(ruleOrGroup) {
 }
 exports.isRuleGroup = isRuleGroup;
 function validateRule(filters, rule) {
-    const [fieldName, fieldParam] = rule.field.split(".", 2);
-    const filter = filters[fieldName];
+    const filter = filters[rule.field];
     if (!filter) {
         throw new error_1.InvalidRule(rule, `Invalid field: ${rule.field}`);
     }
@@ -31,11 +30,9 @@ 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 === "custom"
-        ? typeof rule.value[0]
-        : filter.type === "boolean" || filter.type === "number"
-            ? filter.type
-            : "string";
+    const expectedType = 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`);
     }
@@ -48,8 +45,8 @@ function validateRule(filters, rule) {
         throw new error_1.InvalidRule(rule, `Invalid operator argument: ${filter.type} type expected ${filter.options}, ${rule.value} given`);
     }
     return {
-        field: fieldName,
-        param: fieldParam,
+        field: rule.field,
+        // param: fieldParam,
         type: filter.type,
         operator: rule.operator,
         value: rule.value,

package/dist/esm/search/callouts.js

@@ -39,8 +39,4 @@ export const calloutResponseFilters = {
     updatedAt: {
         type: "date",
     },
-    answers: {
-        type: "custom",
-        nullable: true,
-    },
 };

package/dist/esm/search/contacts.js

@@ -43,6 +43,7 @@ export const contactFilters = {
             NewsletterStatus.Subscribed,
             NewsletterStatus.Unsubscribed,
             NewsletterStatus.Cleaned,
+            NewsletterStatus.Pending,
             NewsletterStatus.None,
         ],
     },

package/dist/esm/search/index.js

@@ -53,12 +53,12 @@ export const operatorsByType = {
     array: arrayOperators,
     enum: equalityOperators,
     contact: equalityOperators,
-    custom: {
-        ...equalityOperators,
-        ...arrayOperators,
-        ...stringOperators,
-        ...numericOperators,
-    },
+    // custom: {
+    //   ...equalityOperators,
+    //   ...arrayOperators,
+    //   ...stringOperators,
+    //   ...numericOperators,
+    // },
 };
 // More general type to allow mapping while maintaining full type above
 export const operatorsByTypeMap = operatorsByType;

package/dist/esm/utils/rules.js

@@ -5,8 +5,7 @@ export function isRuleGroup(ruleOrGroup) {
     return "condition" in ruleOrGroup;
 }
 export function validateRule(filters, rule) {
-    const [fieldName, fieldParam] = rule.field.split(".", 2);
-    const filter = filters[fieldName];
+    const filter = filters[rule.field];
     if (!filter) {
         throw new InvalidRule(rule, `Invalid field: ${rule.field}`);
     }
@@ -27,11 +26,9 @@ 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 === "custom"
-        ? typeof rule.value[0]
-        : filter.type === "boolean" || filter.type === "number"
-            ? filter.type
-            : "string";
+    const expectedType = 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`);
     }
@@ -44,8 +41,8 @@ export function validateRule(filters, rule) {
         throw new InvalidRule(rule, `Invalid operator argument: ${filter.type} type expected ${filter.options}, ${rule.value} given`);
     }
     return {
-        field: fieldName,
-        param: fieldParam,
+        field: rule.field,
+        // param: fieldParam,
         type: filter.type,
         operator: rule.operator,
         value: rule.value,

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

@@ -35,9 +35,5 @@ export declare const calloutResponseFilters: {
     readonly updatedAt: {
         readonly type: "date";
     };
-    readonly answers: {
-        readonly type: "custom";
-        readonly nullable: true;
-    };
 };
 export type CalloutResponseFilterName = keyof typeof calloutResponseFilters;

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

@@ -34,7 +34,7 @@ export declare const contactFilters: {
     };
     readonly newsletterStatus: {
         readonly type: "enum";
-        readonly options: readonly [NewsletterStatus.Subscribed, NewsletterStatus.Unsubscribed, NewsletterStatus.Cleaned, NewsletterStatus.None];
+        readonly options: readonly [NewsletterStatus.Subscribed, NewsletterStatus.Unsubscribed, NewsletterStatus.Cleaned, NewsletterStatus.Pending, NewsletterStatus.None];
     };
     readonly activePermission: {
         readonly type: "enum";

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

@@ -14,7 +14,6 @@ export type ValidatedRuleValue<T extends FilterType> = T extends "number" ? numb
 interface BaseValidatedRule<T extends FilterType, F extends string> {
     type: T;
     field: F;
-    param: string | undefined;
     operator: keyof (typeof operatorsByType)[T];
     value: ValidatedRuleValue<T>[];
 }
@@ -26,7 +25,7 @@ export interface ValidatedRuleGroup<Field extends string> {
     condition: "AND" | "OR";
     rules: (ValidatedRuleGroup<Field> | ValidatedRule<Field>)[];
 }
-export type FilterType = "text" | "date" | "number" | "boolean" | "array" | "enum" | "contact" | "custom";
+export type FilterType = "text" | "date" | "number" | "boolean" | "array" | "enum" | "contact";
 interface BaseFilterArgs {
     type: FilterType;
     nullable?: boolean;
@@ -164,50 +163,6 @@ export declare const operatorsByType: {
             args: number;
         };
     };
-    readonly custom: {
-        readonly between: {
-            args: number;
-        };
-        readonly not_between: {
-            args: number;
-        };
-        readonly less: {
-            args: number;
-        };
-        readonly greater: {
-            args: number;
-        };
-        readonly less_or_equal: {
-            args: number;
-        };
-        readonly greater_or_equal: {
-            args: number;
-        };
-        readonly equal: {
-            args: number;
-        };
-        readonly not_equal: {
-            args: number;
-        };
-        readonly begins_with: {
-            args: number;
-        };
-        readonly ends_with: {
-            args: number;
-        };
-        readonly not_begins_with: {
-            args: number;
-        };
-        readonly not_ends_with: {
-            args: number;
-        };
-        readonly contains: {
-            args: number;
-        };
-        readonly not_contains: {
-            args: number;
-        };
-    };
 };
 export declare const operatorsByTypeMap: OperatorsByType;
 export interface Paginated<T> {

package/package.json

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