@fibery/expression-utils 1.1.11 → 1.1.12

package/lib/paramsPlaceholders.d.ts

@@ -0,0 +1,99 @@
+export const dateToDateTimeIntervalLookup: {
+    "$today-date": {
+        start: string;
+        end: string;
+    };
+    "$tomorrow-date": {
+        start: string;
+        end: string;
+    };
+    "$yesterday-date": {
+        start: string;
+        end: string;
+    };
+    "$week-ago-date": {
+        start: string;
+        end: string;
+    };
+    "$week-from-now-date": {
+        start: string;
+        end: string;
+    };
+    "$month-ago-date": {
+        start: string;
+        end: string;
+    };
+    "$month-from-now-date": {
+        start: string;
+        end: string;
+    };
+    "$year-ago-date": {
+        start: string;
+        end: string;
+    };
+    "$year-from-now-date": {
+        start: string;
+        end: string;
+    };
+};
+export const formulaNowDateTimeParamPlaceholder: "$formula-now-date-time-placeholder";
+export const formulaTodayDateParamPlaceholder: "$formula-today-date-placeholder";
+export const monthAgoDateParamPlaceholder: "$month-ago-date";
+export const monthAgoEndDateTimeParamPlaceholder: "$month-ago-date-time-end";
+export const monthAgoStartDateTimeParamPlaceholder: "$month-ago-date-time-start";
+export const monthFromNowDateParamPlaceholder: "$month-from-now-date";
+export const monthFromNowEndDateTimeParamPlaceholder: "$month-from-now-date-time-end";
+export const monthFromNowStartDateTimeParamPlaceholder: "$month-from-now-date-time-start";
+export const paramsPlaceholdersLookup: {
+    "$today-date": () => any;
+    "$formula-today-date-placeholder": () => any;
+    "$formula-now-date-time-placeholder": () => any;
+    "$tomorrow-date": () => any;
+    "$yesterday-date": () => any;
+    "$week-ago-date": () => any;
+    "$week-from-now-date": () => any;
+    "$month-ago-date": () => any;
+    "$month-from-now-date": () => any;
+    "$year-ago-date": () => any;
+    "$year-from-now-date": () => any;
+    "$today-date-time-start": () => any;
+    "$today-date-time-end": () => any;
+    "$tomorrow-date-time-start": () => any;
+    "$tomorrow-date-time-end": () => any;
+    "$yesterday-date-time-start": () => any;
+    "$yesterday-date-time-end": () => any;
+    "$week-ago-date-time-start": () => any;
+    "$week-ago-date-time-end": () => any;
+    "$week-from-now-date-time-start": () => any;
+    "$week-from-now-date-time-end": () => any;
+    "$month-ago-date-time-start": () => any;
+    "$month-ago-date-time-end": () => any;
+    "$month-from-now-date-time-start": () => any;
+    "$month-from-now-date-time-end": () => any;
+    "$year-ago-date-time-start": () => any;
+    "$year-ago-date-time-end": () => any;
+    "$year-from-now-date-time-start": () => any;
+    "$year-from-now-date-time-end": () => any;
+};
+export function replacePlaceholdersInParams(params: any): any;
+export const todayDateParamPlaceholder: "$today-date";
+export const todayEndDateTimeParamPlaceholder: "$today-date-time-end";
+export const todayStartDateTimeParamPlaceholder: "$today-date-time-start";
+export const tomorrowDateParamPlaceholder: "$tomorrow-date";
+export const tomorrowEndDateTimeParamPlaceholder: "$tomorrow-date-time-end";
+export const tomorrowStartDateTimeParamPlaceholder: "$tomorrow-date-time-start";
+export const weekAgoDateParamPlaceholder: "$week-ago-date";
+export const weekAgoEndDateTimeParamPlaceholder: "$week-ago-date-time-end";
+export const weekAgoStartDateTimeParamPlaceholder: "$week-ago-date-time-start";
+export const weekFromNowDateParamPlaceholder: "$week-from-now-date";
+export const weekFromNowEndDateTimeParamPlaceholder: "$week-from-now-date-time-end";
+export const weekFromNowStartDateTimeParamPlaceholder: "$week-from-now-date-time-start";
+export const yearAgoDateParamPlaceholder: "$year-ago-date";
+export const yearAgoEndDateTimeParamPlaceholder: "$year-ago-date-time-end";
+export const yearAgoStartDateTimeParamPlaceholder: "$year-ago-date-time-start";
+export const yearFromNowDateParamPlaceholder: "$year-from-now-date";
+export const yearFromNowEndDateTimeParamPlaceholder: "$year-from-now-date-time-end";
+export const yearFromNowStartDateTimeParamPlaceholder: "$year-from-now-date-time-start";
+export const yesterdayDateParamPlaceholder: "$yesterday-date";
+export const yesterdayEndDateTimeParamPlaceholder: "$yesterday-date-time-end";
+export const yesterdayStartDateTimeParamPlaceholder: "$yesterday-date-time-start";

package/lib/paramsPlaceholders.js

@@ -9,9 +9,11 @@ var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
 const serializeDate = momentDate => {
   return momentDate.format("YYYY-MM-DD");
 };
+
 const serializeDateTime = momentDate => {
   return momentDate.toISOString();
 };
+
 const formulaTodayDateParamPlaceholder = "$formula-today-date-placeholder";
 const formulaNowDateTimeParamPlaceholder = "$formula-now-date-time-placeholder";
 const todayDateParamPlaceholder = "$today-date";
@@ -72,28 +74,13 @@ const paramsPlaceholdersLookup = {
   [yearFromNowStartDateTimeParamPlaceholder]: () => serializeDateTime(moment__default["default"]().add(1, "year").startOf("day")),
   [yearFromNowEndDateTimeParamPlaceholder]: () => serializeDateTime(moment__default["default"]().add(1, "year").endOf("day"))
 };
-const dynamicFilterParamPrefix = `$dynamic_`;
-const isDynamicFilterParam = paramValue => paramValue.startsWith(dynamicFilterParamPrefix);
-const getFieldIdFromDynamicParam = paramValue => paramValue.substring(dynamicFilterParamPrefix.length);
-const mapDynamicParams = (params, onDynamicParam) => {
-  if (!params) {
-    return params;
-  }
-  return Object.fromEntries(Object.entries(params).map(([key, value]) => {
-    if (___default["default"].isArray(value)) {
-      return [key, value.map(v => {
-        return ___default["default"].isString(v) && isDynamicFilterParam(v) ? onDynamicParam(v) : v;
-      })];
-    } else {
-      return [key, ___default["default"].isString(value) && isDynamicFilterParam(value) ? onDynamicParam(value) : value];
-    }
-  }));
-};
 const replacePlaceholdersInParams = params => params && ___default["default"].mapValues(params, (value, key) => {
   const replaceFn = paramsPlaceholdersLookup[key];
+
   if (replaceFn) {
     return replaceFn();
   }
+
   return value;
 });
 const dateToDateTimeIntervalLookup = {
@@ -136,12 +123,8 @@ const dateToDateTimeIntervalLookup = {
 };
 
 exports.dateToDateTimeIntervalLookup = dateToDateTimeIntervalLookup;
-exports.dynamicFilterParamPrefix = dynamicFilterParamPrefix;
 exports.formulaNowDateTimeParamPlaceholder = formulaNowDateTimeParamPlaceholder;
 exports.formulaTodayDateParamPlaceholder = formulaTodayDateParamPlaceholder;
-exports.getFieldIdFromDynamicParam = getFieldIdFromDynamicParam;
-exports.isDynamicFilterParam = isDynamicFilterParam;
-exports.mapDynamicParams = mapDynamicParams;
 exports.monthAgoDateParamPlaceholder = monthAgoDateParamPlaceholder;
 exports.monthAgoEndDateTimeParamPlaceholder = monthAgoEndDateTimeParamPlaceholder;
 exports.monthAgoStartDateTimeParamPlaceholder = monthAgoStartDateTimeParamPlaceholder;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fibery/expression-utils",
-  "version": "1.1.11",
+  "version": "1.1.12",
   "description": "utils for working with fibery api expressions",
   "exports": {
     ".": "./lib/expression-utils.js",
@@ -24,20 +24,20 @@
   ],
   "private": false,
   "dependencies": {
-    "@fibery/helpers": "1.0.2",
     "lodash": "4.17.21",
-    "moment": "2.29.4"
+    "moment": "2.29.4",
+    "@fibery/helpers": "1.0.3"
   },
   "devDependencies": {
     "@babel/core": "7.20.5",
-    "@fibery/babel-preset": "7.2.0",
-    "@fibery/eslint-config": "8.3.0",
     "jest": "27.5.1",
     "jest-junit": "13.0.0",
-    "microbundle": "0.15.0"
+    "microbundle": "0.15.0",
+    "@fibery/babel-preset": "7.2.0",
+    "@fibery/eslint-config": "8.3.0"
   },
   "peerDependencies": {
-    "@fibery/schema": "^8.1.0"
+    "@fibery/schema": "^8.1.11"
   },
   "jest": {
     "testEnvironment": "node",

package/lib/contextVariables.js

@@ -1,20 +0,0 @@
-var _ = require('lodash');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
-
-const getEntityQueryVariables = schema => {
-  const grouped = ___default["default"].groupBy(schema.typeObjects.filter(x => x.isDomain), typeObject => typeObject.pluralTitle);
-  return ___default["default"].flatten(Object.values(grouped).map(group => {
-    return group.map(typeObject => ({
-      typeObject,
-      id: `entityQuery_${typeObject.id}`,
-      title: group.length > 1 ? `${typeObject.pluralTitle} (${typeObject.nameParts.namespace})` : typeObject.pluralTitle,
-      isCollection: true,
-      description: `All Entities from "${typeObject.title}" Database`
-    }));
-  }));
-};
-
-exports.getEntityQueryVariables = getEntityQueryVariables;