@aeriajs/common 0.0.104 → 0.0.106

package/dist/evaluateCondition.js

@@ -2,6 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.evaluateCondition = void 0;
 const arraysIntersect_js_1 = require("./arraysIntersect.js");
+const isCondition = (subject) => {
+    if (!subject || typeof subject !== 'object') {
+        return false;
+    }
+    return ('and' in subject
+        || 'or' in subject
+        || 'not' in subject
+        || ('operator' in subject && 'term1' in subject));
+};
 const equalOrContains = (term1, term2) => {
     if (Array.isArray(term1) && Array.isArray(term2)) {
         return (0, arraysIntersect_js_1.arraysIntersect)(term1, term2);
@@ -13,34 +22,38 @@ const equalOrContains = (term1, term2) => {
         return term2.includes(term1);
     }
 };
-const evaluatesToTrue = (subject, condition) => {
-    if ('term1' in condition) {
+const evaluateExpression = (subject, expression) => {
+    if (!isCondition(expression)) {
+        return expression;
+    }
+    if ('term1' in expression) {
         if (!subject || typeof subject !== 'object') {
             return false;
         }
-        const term1 = subject[condition.term1];
-        if (condition.operator === 'truthy') {
+        const term1 = subject[expression.term1];
+        if (expression.operator === 'truthy') {
             return !!term1;
         }
-        const { operator, term2 } = condition;
+        const { operator, term2 } = expression;
+        const right = evaluateExpression(subject, term2);
         switch (operator) {
-            case 'equal': return term1 === term2;
-            case 'in': return !!equalOrContains(term1, term2);
-            case 'gt': return term1 > Number(term2);
-            case 'lt': return term1 < Number(term2);
-            case 'gte': return term1 >= Number(term2);
-            case 'lte': return term1 <= Number(term2);
-            case 'regex': return new RegExp(term2).test(term1);
+            case 'equal': return term1 === right;
+            case 'in': return !!equalOrContains(term1, right);
+            case 'gt': return term1 > Number(right);
+            case 'lt': return term1 < Number(right);
+            case 'gte': return term1 >= Number(right);
+            case 'lte': return term1 <= Number(right);
+            case 'regex': return new RegExp(right).test(term1);
         }
     }
-    if ('and' in condition) {
-        return condition.and.every((condition) => evaluatesToTrue(subject, condition));
+    if ('and' in expression) {
+        return expression.and.every((expression) => evaluateExpression(subject, expression));
     }
-    if ('or' in condition) {
-        return condition.or.some((condition) => evaluatesToTrue(subject, condition));
+    if ('or' in expression) {
+        return expression.or.some((expression) => evaluateExpression(subject, expression));
     }
-    if ('not' in condition) {
-        return !evaluatesToTrue(subject, condition.not);
+    if ('not' in expression) {
+        return !evaluateExpression(subject, expression.not);
     }
     return false;
 };
@@ -49,7 +62,7 @@ const evaluateCondition = (subject, condition) => {
         satisfied: false,
         else: null,
     };
-    const satisfied = result.satisfied = evaluatesToTrue(subject, condition);
+    const satisfied = result.satisfied = !!evaluateExpression(subject, condition);
     if (!satisfied && 'else' in condition) {
         result.else = condition.else;
     }

package/dist/evaluateCondition.mjs

@@ -1,5 +1,11 @@
 "use strict";
 import { arraysIntersect } from "./arraysIntersect.mjs";
+const isCondition = (subject) => {
+  if (!subject || typeof subject !== "object") {
+    return false;
+  }
+  return "and" in subject || "or" in subject || "not" in subject || "operator" in subject && "term1" in subject;
+};
 const equalOrContains = (term1, term2) => {
   if (Array.isArray(term1) && Array.isArray(term2)) {
     return arraysIntersect(term1, term2);
@@ -11,41 +17,45 @@ const equalOrContains = (term1, term2) => {
     return term2.includes(term1);
   }
 };
-const evaluatesToTrue = (subject, condition) => {
-  if ("term1" in condition) {
+const evaluateExpression = (subject, expression) => {
+  if (!isCondition(expression)) {
+    return expression;
+  }
+  if ("term1" in expression) {
     if (!subject || typeof subject !== "object") {
       return false;
     }
-    const term1 = subject[condition.term1];
-    if (condition.operator === "truthy") {
+    const term1 = subject[expression.term1];
+    if (expression.operator === "truthy") {
       return !!term1;
     }
-    const { operator, term2 } = condition;
+    const { operator, term2 } = expression;
+    const right = evaluateExpression(subject, term2);
     switch (operator) {
       case "equal":
-        return term1 === term2;
+        return term1 === right;
       case "in":
-        return !!equalOrContains(term1, term2);
+        return !!equalOrContains(term1, right);
       case "gt":
-        return term1 > Number(term2);
+        return term1 > Number(right);
       case "lt":
-        return term1 < Number(term2);
+        return term1 < Number(right);
       case "gte":
-        return term1 >= Number(term2);
+        return term1 >= Number(right);
       case "lte":
-        return term1 <= Number(term2);
+        return term1 <= Number(right);
       case "regex":
-        return new RegExp(term2).test(term1);
+        return new RegExp(right).test(term1);
     }
   }
-  if ("and" in condition) {
-    return condition.and.every((condition2) => evaluatesToTrue(subject, condition2));
+  if ("and" in expression) {
+    return expression.and.every((expression2) => evaluateExpression(subject, expression2));
   }
-  if ("or" in condition) {
-    return condition.or.some((condition2) => evaluatesToTrue(subject, condition2));
+  if ("or" in expression) {
+    return expression.or.some((expression2) => evaluateExpression(subject, expression2));
   }
-  if ("not" in condition) {
-    return !evaluatesToTrue(subject, condition.not);
+  if ("not" in expression) {
+    return !evaluateExpression(subject, expression.not);
   }
   return false;
 };
@@ -54,7 +64,7 @@ export const evaluateCondition = (subject, condition) => {
     satisfied: false,
     else: null
   };
-  const satisfied = result.satisfied = evaluatesToTrue(subject, condition);
+  const satisfied = result.satisfied = !!evaluateExpression(subject, condition);
   if (!satisfied && "else" in condition) {
     result.else = condition.else;
   }

package/dist/index.d.ts

@@ -12,7 +12,6 @@ export * from './getReferenceProperty.js';
 export * from './getValueFromPath.js';
 export * from './http.js';
 export * from './isGranted.js';
-export * from './isObjectId.js';
 export * from './isReference.js';
 export * from './isRequired.js';
 export * from './pipe.js';

package/dist/index.js

@@ -28,7 +28,6 @@ __exportStar(require("./getReferenceProperty.js"), exports);
 __exportStar(require("./getValueFromPath.js"), exports);
 __exportStar(require("./http.js"), exports);
 __exportStar(require("./isGranted.js"), exports);
-__exportStar(require("./isObjectId.js"), exports);
 __exportStar(require("./isReference.js"), exports);
 __exportStar(require("./isRequired.js"), exports);
 __exportStar(require("./pipe.js"), exports);

package/dist/index.mjs

@@ -13,7 +13,6 @@ export * from "./getReferenceProperty.mjs";
 export * from "./getValueFromPath.mjs";
 export * from "./http.mjs";
 export * from "./isGranted.mjs";
-export * from "./isObjectId.mjs";
 export * from "./isReference.mjs";
 export * from "./isRequired.mjs";
 export * from "./pipe.mjs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/common",
-  "version": "0.0.104",
+  "version": "0.0.106",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -31,11 +31,11 @@
     "bson": "^6.5.0"
   },
   "peerDependencies": {
-    "@aeriajs/types": "^0.0.87",
+    "@aeriajs/types": "^0.0.89",
     "bson": "^6.5.0"
   },
   "scripts": {
-    "test": "echo skipping",
+    "test": "vitest run",
     "lint": "eslint src",
     "lint:fix": "eslint src --fix",
     "build": "pnpm build:cjs && pnpm build:esm",

package/dist/isObjectId.d.ts

@@ -1,2 +0,0 @@
-import type { ObjectId } from 'mongodb';
-export declare const isObjectId: (value: unknown) => value is ObjectId;

package/dist/isObjectId.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isObjectId = void 0;
-const isObjectId = (value) => {
-    // we use this comparation instead of `value instanceof ObjectId` because
-    // the latter is prone to errors when `mongodb` dependency is duplicated
-    // -- when ./node_modules/mongodb and ../node_modules/mongodb are both
-    // present and the bundler doesn't handle this correctly
-    return !!(value
-        && typeof value === 'object'
-        && '_bsontype' in value
-        && value._bsontype === 'ObjectId');
-};
-exports.isObjectId = isObjectId;

package/dist/isObjectId.mjs

@@ -1,4 +0,0 @@
-"use strict";
-export const isObjectId = (value) => {
-  return !!(value && typeof value === "object" && "_bsontype" in value && value._bsontype === "ObjectId");
-};