@beabee/beabee-common 1.7.0 → 1.7.2

package/dist/cjs/search/index.js

@@ -1,5 +1,4 @@
 "use strict";
-// *** Definitions for rules ***
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -14,8 +13,14 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
 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);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertFiltersToRuleGroup = exports.convertRuleGroupToFilters = exports.validateRuleGroup = exports.validateRule = exports.isRuleGroup = exports.operatorsByType = exports.nullableOperators = exports.ruleOperators = void 0;
+const isValid_1 = __importDefault(require("date-fns/isValid"));
+const parseISO_1 = __importDefault(require("date-fns/parseISO"));
+// *** Definitions for rules ***
 exports.ruleOperators = [
     "equal",
     "not_equal",
@@ -34,8 +39,10 @@ exports.ruleOperators = [
     "is_empty",
     "is_not_empty",
 ];
-const equal = { args: 1 };
-const equalityOperators = { equal, not_equal: { args: 1 } };
+const equalityOperators = {
+    equal: { args: 1 },
+    not_equal: { args: 1 },
+};
 const numericOperators = {
     ...equalityOperators,
     between: { args: 2 },
@@ -49,6 +56,7 @@ const arrayOperators = {
     contains: { args: 1 },
     not_contains: { args: 1 },
 };
+// Special operator can be applied across all fields if they are nullable
 exports.nullableOperators = {
     is_empty: { args: 0 },
     is_not_empty: { args: 0 },
@@ -64,11 +72,13 @@ exports.operatorsByType = {
     },
     date: numericOperators,
     number: numericOperators,
-    boolean: { equal },
+    boolean: { equal: equalityOperators.equal },
     array: arrayOperators,
     enum: equalityOperators,
     contact: equalityOperators,
 };
+// More general type to allow mapping while maintaining full type above
+const operatorsByTypeMap = exports.operatorsByType;
 // *** Helper methods ***
 function isRuleGroup(ruleOrGroup) {
     return "condition" in ruleOrGroup;
@@ -79,12 +89,22 @@ function validateRule(filters, rule) {
     if (!filter) {
         return false; // Invalid field
     }
-    const operator = exports.operatorsByType[filter.type][rule.operator];
-    if (!operator) {
-        return false; // Invalid operator
+    if (rule.operator in exports.nullableOperators) {
+        if (!filter.nullable && filter.type !== "text") {
+            return false; // Field cannot be empty (text can always be empty)
+        }
+        if (rule.value.length !== 0) {
+            return false; // Should have no args
+        }
     }
-    if (operator.args !== rule.value.length) {
-        return false; // Invalid number of args
+    else {
+        const operator = operatorsByTypeMap[filter.type][rule.operator];
+        if (!operator) {
+            return false; // Invalid operator
+        }
+        if (operator.args !== rule.value.length) {
+            return false; // Invalid number of args
+        }
     }
     const expectedType = filter.type === "boolean" || filter.type === "number"
         ? filter.type
@@ -93,7 +113,7 @@ function validateRule(filters, rule) {
         return false; // Invalid value type
     }
     if (filter.type === "date" &&
-        rule.value.some((v) => isNaN(+new Date(v)))) {
+        rule.value.some((v) => (0, isValid_1.default)((0, parseISO_1.default)(v)))) {
         return false; // Invalid date
     }
     return {

package/dist/esm/search/index.js

@@ -1,3 +1,5 @@
+import isValid from "date-fns/isValid";
+import parseISO from "date-fns/parseISO";
 // *** Definitions for rules ***
 export const ruleOperators = [
     "equal",
@@ -17,8 +19,10 @@ export const ruleOperators = [
     "is_empty",
     "is_not_empty",
 ];
-const equal = { args: 1 };
-const equalityOperators = { equal, not_equal: { args: 1 } };
+const equalityOperators = {
+    equal: { args: 1 },
+    not_equal: { args: 1 },
+};
 const numericOperators = {
     ...equalityOperators,
     between: { args: 2 },
@@ -32,6 +36,7 @@ const arrayOperators = {
     contains: { args: 1 },
     not_contains: { args: 1 },
 };
+// Special operator can be applied across all fields if they are nullable
 export const nullableOperators = {
     is_empty: { args: 0 },
     is_not_empty: { args: 0 },
@@ -47,11 +52,13 @@ export const operatorsByType = {
     },
     date: numericOperators,
     number: numericOperators,
-    boolean: { equal },
+    boolean: { equal: equalityOperators.equal },
     array: arrayOperators,
     enum: equalityOperators,
     contact: equalityOperators,
 };
+// More general type to allow mapping while maintaining full type above
+const operatorsByTypeMap = operatorsByType;
 // *** Helper methods ***
 export function isRuleGroup(ruleOrGroup) {
     return "condition" in ruleOrGroup;
@@ -61,12 +68,22 @@ export function validateRule(filters, rule) {
     if (!filter) {
         return false; // Invalid field
     }
-    const operator = operatorsByType[filter.type][rule.operator];
-    if (!operator) {
-        return false; // Invalid operator
+    if (rule.operator in nullableOperators) {
+        if (!filter.nullable && filter.type !== "text") {
+            return false; // Field cannot be empty (text can always be empty)
+        }
+        if (rule.value.length !== 0) {
+            return false; // Should have no args
+        }
     }
-    if (operator.args !== rule.value.length) {
-        return false; // Invalid number of args
+    else {
+        const operator = operatorsByTypeMap[filter.type][rule.operator];
+        if (!operator) {
+            return false; // Invalid operator
+        }
+        if (operator.args !== rule.value.length) {
+            return false; // Invalid number of args
+        }
     }
     const expectedType = filter.type === "boolean" || filter.type === "number"
         ? filter.type
@@ -75,7 +92,7 @@ export function validateRule(filters, rule) {
         return false; // Invalid value type
     }
     if (filter.type === "date" &&
-        rule.value.some((v) => isNaN(+new Date(v)))) {
+        rule.value.some((v) => isValid(parseISO(v)))) {
         return false; // Invalid date
     }
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beabee/beabee-common",
-  "version": "1.7.0",
+  "version": "1.7.2",
   "description": "",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
@@ -28,5 +28,8 @@
     "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
     "typescript": "^4.8.4"
+  },
+  "dependencies": {
+    "date-fns": "^2.29.3"
   }
 }