@fibery/expression-utils 1.1.19 → 2.0.0

package/index.js

@@ -0,0 +1,6 @@
+import * as paramsPlaceholders from "./paramsPlaceholders";
+import * as utils from "./utils";
+import * as visitors from "./visitors";
+import * as contextVariables from "./contextVariables";
+
+export {utils, visitors, paramsPlaceholders, contextVariables};

package/lib/expression-utils.js

@@ -76,6 +76,7 @@ const paramsPlaceholdersLookup = {
 const dynamicFilterParamPrefix = `$dynamic_`;
 const isDynamicFilterParam = paramValue => paramValue.startsWith(dynamicFilterParamPrefix);
 const getFieldIdFromDynamicParam = paramValue => paramValue.substring(dynamicFilterParamPrefix.length);
+const whereParamPrefix = "$where";
 const mapDynamicParams = (params, onDynamicParam) => {
   if (!params) {
     return params;
@@ -90,11 +91,26 @@ const mapDynamicParams = (params, onDynamicParam) => {
     }
   }));
 };
+const relativeDatePlaceholderRegex = /(\$start|\$end)-(\d+)-(second|minute|hour|day|week|month|quarter|year)-(before-now|after-now)-(date-time|date)/;
+const getRelativeDateValue = relativeDatePlaceholderMatch => {
+  const startEnd = relativeDatePlaceholderMatch[1];
+  const amount = Number.parseInt(relativeDatePlaceholderMatch[2]);
+  const unit = relativeDatePlaceholderMatch[3];
+  const beforeAfter = relativeDatePlaceholderMatch[4];
+  const type = relativeDatePlaceholderMatch[5];
+  const result = beforeAfter === "before-now" ? moment__default["default"]().subtract(amount, unit) : moment__default["default"]().add(amount, unit);
+  const resultByStartEnd = startEnd === "$start" ? result.startOf(unit) : result.endOf(unit);
+  return type === "date" ? serializeDate(resultByStartEnd) : serializeDateTime(resultByStartEnd);
+};
 const replacePlaceholdersInParams = params => params && ___default["default"].mapValues(params, (value, key) => {
   const replaceFn = paramsPlaceholdersLookup[key];
   if (replaceFn) {
     return replaceFn();
   }
+  const relativeDatePlaceholderMatch = key.match(relativeDatePlaceholderRegex);
+  if (relativeDatePlaceholderMatch) {
+    return getRelativeDateValue(relativeDatePlaceholderMatch);
+  }
   return value;
 });
 const dateToDateTimeIntervalLookup = {
@@ -171,6 +187,7 @@ var paramsPlaceholders = {
   dynamicFilterParamPrefix: dynamicFilterParamPrefix,
   isDynamicFilterParam: isDynamicFilterParam,
   getFieldIdFromDynamicParam: getFieldIdFromDynamicParam,
+  whereParamPrefix: whereParamPrefix,
   mapDynamicParams: mapDynamicParams,
   replacePlaceholdersInParams: replacePlaceholdersInParams,
   dateToDateTimeIntervalLookup: dateToDateTimeIntervalLookup

package/lib/paramsPlaceholders.js

@@ -75,6 +75,7 @@ const paramsPlaceholdersLookup = {
 const dynamicFilterParamPrefix = `$dynamic_`;
 const isDynamicFilterParam = paramValue => paramValue.startsWith(dynamicFilterParamPrefix);
 const getFieldIdFromDynamicParam = paramValue => paramValue.substring(dynamicFilterParamPrefix.length);
+const whereParamPrefix = "$where";
 const mapDynamicParams = (params, onDynamicParam) => {
   if (!params) {
     return params;
@@ -89,11 +90,26 @@ const mapDynamicParams = (params, onDynamicParam) => {
     }
   }));
 };
+const relativeDatePlaceholderRegex = /(\$start|\$end)-(\d+)-(second|minute|hour|day|week|month|quarter|year)-(before-now|after-now)-(date-time|date)/;
+const getRelativeDateValue = relativeDatePlaceholderMatch => {
+  const startEnd = relativeDatePlaceholderMatch[1];
+  const amount = Number.parseInt(relativeDatePlaceholderMatch[2]);
+  const unit = relativeDatePlaceholderMatch[3];
+  const beforeAfter = relativeDatePlaceholderMatch[4];
+  const type = relativeDatePlaceholderMatch[5];
+  const result = beforeAfter === "before-now" ? moment__default["default"]().subtract(amount, unit) : moment__default["default"]().add(amount, unit);
+  const resultByStartEnd = startEnd === "$start" ? result.startOf(unit) : result.endOf(unit);
+  return type === "date" ? serializeDate(resultByStartEnd) : serializeDateTime(resultByStartEnd);
+};
 const replacePlaceholdersInParams = params => params && ___default["default"].mapValues(params, (value, key) => {
   const replaceFn = paramsPlaceholdersLookup[key];
   if (replaceFn) {
     return replaceFn();
   }
+  const relativeDatePlaceholderMatch = key.match(relativeDatePlaceholderRegex);
+  if (relativeDatePlaceholderMatch) {
+    return getRelativeDateValue(relativeDatePlaceholderMatch);
+  }
   return value;
 });
 const dateToDateTimeIntervalLookup = {
@@ -162,6 +178,7 @@ exports.weekAgoStartDateTimeParamPlaceholder = weekAgoStartDateTimeParamPlacehol
 exports.weekFromNowDateParamPlaceholder = weekFromNowDateParamPlaceholder;
 exports.weekFromNowEndDateTimeParamPlaceholder = weekFromNowEndDateTimeParamPlaceholder;
 exports.weekFromNowStartDateTimeParamPlaceholder = weekFromNowStartDateTimeParamPlaceholder;
+exports.whereParamPrefix = whereParamPrefix;
 exports.yearAgoDateParamPlaceholder = yearAgoDateParamPlaceholder;
 exports.yearAgoEndDateTimeParamPlaceholder = yearAgoEndDateTimeParamPlaceholder;
 exports.yearAgoStartDateTimeParamPlaceholder = yearAgoStartDateTimeParamPlaceholder;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fibery/expression-utils",
-  "version": "1.1.19",
+  "version": "2.0.0",
   "description": "utils for working with fibery api expressions",
   "exports": {
     ".": "./lib/expression-utils.js",
@@ -26,18 +26,18 @@
   "dependencies": {
     "lodash": "4.17.21",
     "moment": "2.29.4",
-    "@fibery/helpers": "1.0.4"
+    "@fibery/helpers": "1.2.0"
   },
   "devDependencies": {
     "@babel/core": "7.20.5",
     "jest": "27.5.1",
     "jest-junit": "13.0.0",
     "microbundle": "0.15.0",
-    "@fibery/babel-preset": "7.2.0",
-    "@fibery/eslint-config": "8.3.0"
+    "@fibery/babel-preset": "7.3.0",
+    "@fibery/eslint-config": "8.4.0"
   },
   "peerDependencies": {
-    "@fibery/schema": "^8.1.11"
+    "@fibery/schema": "^8.2.0"
   },
   "jest": {
     "testEnvironment": "node",
@@ -63,8 +63,8 @@
   "scripts": {
     "build": "rm -rf lib && microbundle paramsPlaceholders.js utils.js visitors.js contextVariables.js index.js -o lib -f cjs  --no-compress --target node --sourcemap false --generateTypes false",
     "test": "node scripts/test.js",
-    "test:ci": "yarn test --reporters=default --reporters=jest-junit",
-    "test:coverage": "yarn test --coverage --coverageDirectory=${JEST_COVERAGE_RESULT_DIR:-$(pwd)}/coverage/expression-utils --reporters=default --reporters=jest-junit",
+    "test:ci": "pnpm run test --reporters=default --reporters=jest-junit",
+    "test:coverage": "pnpm run test --coverage --coverageDirectory=${JEST_COVERAGE_RESULT_DIR:-$(pwd)}/coverage/expression-utils --reporters=default --reporters=jest-junit",
     "lint": "eslint ."
   }
 }