@beabee/beabee-common 1.10.9 → 1.10.11

package/dist/cjs/data/callouts.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/cjs/data/index.js

@@ -1,4 +1,18 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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.RoleTypes = exports.PaymentStatus = exports.PaymentMethod = exports.NewsletterStatus = exports.MembershipStatus = exports.ItemStatus = exports.ContributionType = exports.ContributionPeriod = void 0;
 var ContributionPeriod;
@@ -50,3 +64,4 @@ var PaymentStatus;
     PaymentStatus["Cancelled"] = "cancelled";
 })(PaymentStatus = exports.PaymentStatus || (exports.PaymentStatus = {}));
 exports.RoleTypes = ["member", "admin", "superadmin"];
+__exportStar(require("./callouts"), exports);

package/dist/cjs/index.js

@@ -17,5 +17,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./search"), exports);
 __exportStar(require("./data"), exports);
 __exportStar(require("./error"), exports);
+__exportStar(require("./utils/callouts"), exports);
 __exportStar(require("./utils/date"), exports);
 __exportStar(require("./utils/rules"), exports);

package/dist/cjs/search/callouts.js

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

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/callouts.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertComponentsToFilters = exports.flattenComponents = void 0;
+function flattenComponents(components) {
+    return components.flatMap((component) => [
+        component,
+        ...flattenComponents(component.components || []),
+    ]);
+}
+exports.flattenComponents = flattenComponents;
+function convertValuesToOptions(values) {
+    return values.map(({ value, label }) => value);
+}
+function convertComponentToFilter(component) {
+    const baseItem = {
+        // label: component.label || component.key,
+        nullable: true,
+    };
+    switch (component.type) {
+        case "checkbox":
+            return { ...baseItem, type: "boolean", nullable: false };
+        case "number":
+            return { ...baseItem, type: "number" };
+        case "select":
+            return {
+                ...baseItem,
+                type: "enum",
+                options: convertValuesToOptions(component.data.values),
+            };
+        case "selectboxes":
+        case "radio":
+            return {
+                ...baseItem,
+                type: component.type === "radio" ? "enum" : "array",
+                options: convertValuesToOptions(component.values),
+            };
+        default:
+            return { ...baseItem, type: "text" };
+    }
+}
+function convertComponentsToFilters(components) {
+    const items = components.map((c) => {
+        return [`answers.${c.key}`, convertComponentToFilter(c)];
+    });
+    return Object.fromEntries(items);
+}
+exports.convertComponentsToFilters = convertComponentsToFilters;

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,12 @@ 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 === "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`);
     }
@@ -48,8 +48,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/data/callouts.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/data/index.js

@@ -47,3 +47,4 @@ export var PaymentStatus;
     PaymentStatus["Cancelled"] = "cancelled";
 })(PaymentStatus || (PaymentStatus = {}));
 export const RoleTypes = ["member", "admin", "superadmin"];
+export * from "./callouts";

package/dist/esm/index.js

@@ -1,5 +1,6 @@
 export * from "./search";
 export * from "./data";
 export * from "./error";
+export * from "./utils/callouts";
 export * from "./utils/date";
 export * from "./utils/rules";

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/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/callouts.js

@@ -0,0 +1,42 @@
+export function flattenComponents(components) {
+    return components.flatMap((component) => [
+        component,
+        ...flattenComponents(component.components || []),
+    ]);
+}
+function convertValuesToOptions(values) {
+    return values.map(({ value, label }) => value);
+}
+function convertComponentToFilter(component) {
+    const baseItem = {
+        // label: component.label || component.key,
+        nullable: true,
+    };
+    switch (component.type) {
+        case "checkbox":
+            return { ...baseItem, type: "boolean", nullable: false };
+        case "number":
+            return { ...baseItem, type: "number" };
+        case "select":
+            return {
+                ...baseItem,
+                type: "enum",
+                options: convertValuesToOptions(component.data.values),
+            };
+        case "selectboxes":
+        case "radio":
+            return {
+                ...baseItem,
+                type: component.type === "radio" ? "enum" : "array",
+                options: convertValuesToOptions(component.values),
+            };
+        default:
+            return { ...baseItem, type: "text" };
+    }
+}
+export function convertComponentsToFilters(components) {
+    const items = components.map((c) => {
+        return [`answers.${c.key}`, convertComponentToFilter(c)];
+    });
+    return Object.fromEntries(items);
+}

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,12 @@ 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 === "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`);
     }
@@ -44,8 +44,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/data/callouts.d.ts

@@ -0,0 +1,31 @@
+interface BaseCalloutComponentSchema {
+    key: string;
+    label?: string;
+    input?: boolean;
+    components?: CalloutComponentSchema[];
+    [key: string]: unknown;
+}
+interface OtherCalloutComponentSchema extends BaseCalloutComponentSchema {
+    type: "button" | "checkbox" | "number" | "password" | "textfield" | "textarea";
+}
+interface SelectCalloutComponentSchema extends BaseCalloutComponentSchema {
+    type: "select";
+    data: {
+        values: {
+            label: string;
+            value: string;
+        }[];
+    };
+}
+interface RadioCalloutComponentSchema extends BaseCalloutComponentSchema {
+    type: "radio" | "selectboxes";
+    values: {
+        label: string;
+        value: string;
+    }[];
+}
+export type CalloutComponentSchema = SelectCalloutComponentSchema | RadioCalloutComponentSchema | OtherCalloutComponentSchema;
+export interface CalloutFormSchema {
+    components: CalloutComponentSchema[];
+}
+export {};

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

@@ -41,3 +41,4 @@ export declare enum PaymentStatus {
 }
 export declare const RoleTypes: readonly ["member", "admin", "superadmin"];
 export type RoleType = (typeof RoleTypes)[number];
+export * from "./callouts";

package/dist/types/index.d.ts

@@ -1,5 +1,6 @@
 export * from "./search";
 export * from "./data";
 export * from "./error";
+export * from "./utils/callouts";
 export * from "./utils/date";
 export * from "./utils/rules";

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/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/dist/types/utils/callouts.d.ts

@@ -0,0 +1,4 @@
+import { CalloutComponentSchema } from "../data/callouts";
+import { Filters } from "../search";
+export declare function flattenComponents(components: CalloutComponentSchema[]): CalloutComponentSchema[];
+export declare function convertComponentsToFilters(components: CalloutComponentSchema[]): Filters;

package/package.json

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