@fibery/expression-utils 9.0.6 → 9.1.1

package/lib/expression-utils.js

@@ -91,25 +91,60 @@ 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 relativeDatePlaceholderRegex = /\$(?:start-|end-|start-of-day-|end-of-day-)?(\d+)-(second|minute|hour|day|week|month|quarter|year)-(before-now|after-now)-(date-time|date)/;
+const getRelativeDateValue = ({
+  isStartOfInterval,
+  unitForStart,
+  amount,
+  unit,
+  isBeforeNow,
+  isDateTime
+}) => {
+  const result = isBeforeNow ? moment__default["default"]().subtract(amount, unit) : moment__default["default"]().add(amount, unit);
+  if (isStartOfInterval === undefined) {
+    return isDateTime ? serializeDateTime(result) : serializeDate(result);
+  } else {
+    const resultByStartEnd = isStartOfInterval ? result.startOf(unitForStart) : result.endOf(unitForStart);
+    return isDateTime ? serializeDateTime(resultByStartEnd) : serializeDate(resultByStartEnd);
+  }
+};
+const toRelativeDatePlaceholder = ({
+  isStartOfInterval,
+  unitForStart,
+  amount,
+  unit,
+  isBeforeNow,
+  isDateTime
+}) => {
+  return `$${isStartOfInterval === undefined ? "" : isStartOfInterval ? `start-of-${unitForStart}-` : `end-of-${unitForStart}-`}${amount}-${unit}-${isBeforeNow ? "before-now" : "after-now"}-${isDateTime ? "date-time" : "date"}`;
+};
+const parseRelativeDatePlaceholder = placeholder => {
+  if (typeof placeholder === "string") {
+    const relativeDatePlaceholderMatch = placeholder.match(relativeDatePlaceholderRegex);
+    if (relativeDatePlaceholderMatch) {
+      const fullMatch = relativeDatePlaceholderMatch[0];
+      const isStartOfInterval = fullMatch.startsWith("$start") ? true : fullMatch.startsWith("$end") ? false : undefined;
+      let unit = relativeDatePlaceholderMatch[2];
+      return {
+        isStartOfInterval,
+        unitForStart: fullMatch.startsWith("$start-of-day") || fullMatch.startsWith("$end-of-day") ? "day" : isStartOfInterval !== undefined ? unit : undefined,
+        amount: Number.parseInt(relativeDatePlaceholderMatch[1]),
+        unit,
+        isBeforeNow: relativeDatePlaceholderMatch[3] === "before-now",
+        isDateTime: relativeDatePlaceholderMatch[4] === "date-time"
+      };
+    }
+  }
+  return null;
 };
 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);
+  const relativeDateInfo = parseRelativeDatePlaceholder(key);
+  if (relativeDateInfo) {
+    return getRelativeDateValue(relativeDateInfo);
   }
   return value;
 });
@@ -189,6 +224,9 @@ var paramsPlaceholders = {
   getFieldIdFromDynamicParam: getFieldIdFromDynamicParam,
   whereParamPrefix: whereParamPrefix,
   mapDynamicParams: mapDynamicParams,
+  getRelativeDateValue: getRelativeDateValue,
+  toRelativeDatePlaceholder: toRelativeDatePlaceholder,
+  parseRelativeDatePlaceholder: parseRelativeDatePlaceholder,
   replacePlaceholdersInParams: replacePlaceholdersInParams,
   dateToDateTimeIntervalLookup: dateToDateTimeIntervalLookup
 };
@@ -832,7 +870,7 @@ const getExpressionTypeInternal = ({
         typeObject,
         functionsMeta,
         onFieldNotFound,
-        returnRefTypeInsteadOfId: firstLastFunctions.has(fnName) || fnName === "q/if" ? returnRefTypeInsteadOfId : false
+        returnRefTypeInsteadOfId: firstLastFunctions.has(fnName) || fnName === "q/if" || fnName === "q/if-null" ? returnRefTypeInsteadOfId : false
       }));
       if (firstLastFunctions.has(fnName)) {
         //assuming q/first has one argument and result type equals arg type.
@@ -841,6 +879,9 @@ const getExpressionTypeInternal = ({
       } else if (fnName === "q/if") {
         //we need this trick to support 'returnRefTypeInsteadOfId' behavior for q/if.
         result = argTypes[1];
+      } else if (fnName === "q/if-null" && argTypes.some(x => !x.isPrimitive)) {
+        //we need this trick to support 'returnRefTypeInsteadOfId' behavior for q/if.
+        result = argTypes[0];
       } else {
         const overload = fnMeta.overloads.find(o => o["arg-types"].every((argType, index) => argTypes[index] === UNKNOWN_EXPRESSION_TYPE || argTypes[index] === argType || ["fibery/email", "fibery/url", "fibery/emoji", "fibery/color"].includes(argTypes[index]) && argType === "fibery/text"));
         if (!overload) {

package/lib/paramsPlaceholders.js

@@ -90,25 +90,60 @@ 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 relativeDatePlaceholderRegex = /\$(?:start-|end-|start-of-day-|end-of-day-)?(\d+)-(second|minute|hour|day|week|month|quarter|year)-(before-now|after-now)-(date-time|date)/;
+const getRelativeDateValue = ({
+  isStartOfInterval,
+  unitForStart,
+  amount,
+  unit,
+  isBeforeNow,
+  isDateTime
+}) => {
+  const result = isBeforeNow ? moment__default["default"]().subtract(amount, unit) : moment__default["default"]().add(amount, unit);
+  if (isStartOfInterval === undefined) {
+    return isDateTime ? serializeDateTime(result) : serializeDate(result);
+  } else {
+    const resultByStartEnd = isStartOfInterval ? result.startOf(unitForStart) : result.endOf(unitForStart);
+    return isDateTime ? serializeDateTime(resultByStartEnd) : serializeDate(resultByStartEnd);
+  }
+};
+const toRelativeDatePlaceholder = ({
+  isStartOfInterval,
+  unitForStart,
+  amount,
+  unit,
+  isBeforeNow,
+  isDateTime
+}) => {
+  return `$${isStartOfInterval === undefined ? "" : isStartOfInterval ? `start-of-${unitForStart}-` : `end-of-${unitForStart}-`}${amount}-${unit}-${isBeforeNow ? "before-now" : "after-now"}-${isDateTime ? "date-time" : "date"}`;
+};
+const parseRelativeDatePlaceholder = placeholder => {
+  if (typeof placeholder === "string") {
+    const relativeDatePlaceholderMatch = placeholder.match(relativeDatePlaceholderRegex);
+    if (relativeDatePlaceholderMatch) {
+      const fullMatch = relativeDatePlaceholderMatch[0];
+      const isStartOfInterval = fullMatch.startsWith("$start") ? true : fullMatch.startsWith("$end") ? false : undefined;
+      let unit = relativeDatePlaceholderMatch[2];
+      return {
+        isStartOfInterval,
+        unitForStart: fullMatch.startsWith("$start-of-day") || fullMatch.startsWith("$end-of-day") ? "day" : isStartOfInterval !== undefined ? unit : undefined,
+        amount: Number.parseInt(relativeDatePlaceholderMatch[1]),
+        unit,
+        isBeforeNow: relativeDatePlaceholderMatch[3] === "before-now",
+        isDateTime: relativeDatePlaceholderMatch[4] === "date-time"
+      };
+    }
+  }
+  return null;
 };
 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);
+  const relativeDateInfo = parseRelativeDatePlaceholder(key);
+  if (relativeDateInfo) {
+    return getRelativeDateValue(relativeDateInfo);
   }
   return value;
 });
@@ -156,6 +191,7 @@ exports.dynamicFilterParamPrefix = dynamicFilterParamPrefix;
 exports.formulaNowDateTimeParamPlaceholder = formulaNowDateTimeParamPlaceholder;
 exports.formulaTodayDateParamPlaceholder = formulaTodayDateParamPlaceholder;
 exports.getFieldIdFromDynamicParam = getFieldIdFromDynamicParam;
+exports.getRelativeDateValue = getRelativeDateValue;
 exports.isDynamicFilterParam = isDynamicFilterParam;
 exports.mapDynamicParams = mapDynamicParams;
 exports.monthAgoDateParamPlaceholder = monthAgoDateParamPlaceholder;
@@ -165,7 +201,9 @@ exports.monthFromNowDateParamPlaceholder = monthFromNowDateParamPlaceholder;
 exports.monthFromNowEndDateTimeParamPlaceholder = monthFromNowEndDateTimeParamPlaceholder;
 exports.monthFromNowStartDateTimeParamPlaceholder = monthFromNowStartDateTimeParamPlaceholder;
 exports.paramsPlaceholdersLookup = paramsPlaceholdersLookup;
+exports.parseRelativeDatePlaceholder = parseRelativeDatePlaceholder;
 exports.replacePlaceholdersInParams = replacePlaceholdersInParams;
+exports.toRelativeDatePlaceholder = toRelativeDatePlaceholder;
 exports.todayDateParamPlaceholder = todayDateParamPlaceholder;
 exports.todayEndDateTimeParamPlaceholder = todayEndDateTimeParamPlaceholder;
 exports.todayStartDateTimeParamPlaceholder = todayStartDateTimeParamPlaceholder;

package/lib/visitors.js

@@ -567,7 +567,7 @@ const getExpressionTypeInternal = ({
         typeObject,
         functionsMeta,
         onFieldNotFound,
-        returnRefTypeInsteadOfId: firstLastFunctions.has(fnName) || fnName === "q/if" ? returnRefTypeInsteadOfId : false
+        returnRefTypeInsteadOfId: firstLastFunctions.has(fnName) || fnName === "q/if" || fnName === "q/if-null" ? returnRefTypeInsteadOfId : false
       }));
       if (firstLastFunctions.has(fnName)) {
         //assuming q/first has one argument and result type equals arg type.
@@ -576,6 +576,9 @@ const getExpressionTypeInternal = ({
       } else if (fnName === "q/if") {
         //we need this trick to support 'returnRefTypeInsteadOfId' behavior for q/if.
         result = argTypes[1];
+      } else if (fnName === "q/if-null" && argTypes.some(x => !x.isPrimitive)) {
+        //we need this trick to support 'returnRefTypeInsteadOfId' behavior for q/if.
+        result = argTypes[0];
       } else {
         const overload = fnMeta.overloads.find(o => o["arg-types"].every((argType, index) => argTypes[index] === UNKNOWN_EXPRESSION_TYPE || argTypes[index] === argType || ["fibery/email", "fibery/url", "fibery/emoji", "fibery/color"].includes(argTypes[index]) && argType === "fibery/text"));
         if (!overload) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fibery/expression-utils",
-  "version": "9.0.6",
+  "version": "9.1.1",
   "description": "utils for working with fibery api expressions",
   "exports": {
     ".": "./lib/expression-utils.js",
@@ -34,8 +34,8 @@
     "jest": "27.5.1",
     "jest-junit": "13.0.0",
     "microbundle": "0.15.1",
-    "@fibery/eslint-config": "8.6.0",
-    "@fibery/babel-preset": "7.4.0"
+    "@fibery/babel-preset": "7.4.0",
+    "@fibery/eslint-config": "8.6.0"
   },
   "peerDependencies": {
     "@fibery/schema": "10.2.2"