@fibery/expression-utils 1.1.18 → 1.1.20

package/lib/expression-utils.js

@@ -90,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 = {
@@ -639,12 +654,15 @@ const getExpressionTypeInternal = ({
         typeObject,
         functionsMeta,
         onFieldNotFound,
-        returnRefTypeInsteadOfId: firstLastFunctions.has(fnName) ? returnRefTypeInsteadOfId : false
+        returnRefTypeInsteadOfId: firstLastFunctions.has(fnName) || fnName === "q/if" ? returnRefTypeInsteadOfId : false
       }));
       if (firstLastFunctions.has(fnName)) {
         //assuming q/first has one argument and result type equals arg type.
         //we need this trick to support 'returnRefTypeInsteadOfId' behavior for q/first and q/last.
         result = argTypes[0];
+      } else if (fnName === "q/if") {
+        //we need this trick to support 'returnRefTypeInsteadOfId' behavior for q/if.
+        result = argTypes[1];
       } else {
         const overload = fnMeta.overloads.find(o => o["arg-types"].every((argType, index) => argTypes[index] === UNKNOWN_EXPRESSION_TYPE || argTypes[index] === argType));
         if (!overload) {

package/lib/paramsPlaceholders.js

@@ -89,11 +89,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 = {

package/lib/visitors.js

@@ -383,12 +383,15 @@ const getExpressionTypeInternal = ({
         typeObject,
         functionsMeta,
         onFieldNotFound,
-        returnRefTypeInsteadOfId: firstLastFunctions.has(fnName) ? returnRefTypeInsteadOfId : false
+        returnRefTypeInsteadOfId: firstLastFunctions.has(fnName) || fnName === "q/if" ? returnRefTypeInsteadOfId : false
       }));
       if (firstLastFunctions.has(fnName)) {
         //assuming q/first has one argument and result type equals arg type.
         //we need this trick to support 'returnRefTypeInsteadOfId' behavior for q/first and q/last.
         result = argTypes[0];
+      } else if (fnName === "q/if") {
+        //we need this trick to support 'returnRefTypeInsteadOfId' behavior for q/if.
+        result = argTypes[1];
       } else {
         const overload = fnMeta.overloads.find(o => o["arg-types"].every((argType, index) => argTypes[index] === UNKNOWN_EXPRESSION_TYPE || argTypes[index] === argType));
         if (!overload) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fibery/expression-utils",
-  "version": "1.1.18",
+  "version": "1.1.20",
   "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.1.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/eslint-config": "8.3.0",
+    "@fibery/babel-preset": "7.2.0"
   },
   "peerDependencies": {
-    "@fibery/schema": "^8.1.11"
+    "@fibery/schema": "^8.1.13"
   },
   "jest": {
     "testEnvironment": "node",