@fibery/expression-utils 1.1.10 → 1.1.11

package/lib/expression-utils.js

@@ -73,6 +73,23 @@ 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) {
@@ -151,6 +168,10 @@ var paramsPlaceholders = {
   yearFromNowStartDateTimeParamPlaceholder: yearFromNowStartDateTimeParamPlaceholder,
   yearFromNowEndDateTimeParamPlaceholder: yearFromNowEndDateTimeParamPlaceholder,
   paramsPlaceholdersLookup: paramsPlaceholdersLookup,
+  dynamicFilterParamPrefix: dynamicFilterParamPrefix,
+  isDynamicFilterParam: isDynamicFilterParam,
+  getFieldIdFromDynamicParam: getFieldIdFromDynamicParam,
+  mapDynamicParams: mapDynamicParams,
   replacePlaceholdersInParams: replacePlaceholdersInParams,
   dateToDateTimeIntervalLookup: dateToDateTimeIntervalLookup
 };

package/lib/paramsPlaceholders.js

@@ -72,6 +72,23 @@ 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) {
@@ -119,8 +136,12 @@ 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.10",
+  "version": "1.1.11",
   "description": "utils for working with fibery api expressions",
   "exports": {
     ".": "./lib/expression-utils.js",
@@ -9,6 +9,7 @@
     "./visitors": "./lib/visitors.js",
     "./paramsPlaceholders": "./lib/paramsPlaceholders.js"
   },
+  "types": "./types.d.ts",
   "fiberyDevExports": {
     ".": "./index.js",
     "./contextVariables": "./contextVariables.js",
@@ -18,7 +19,8 @@
   },
   "main": "./lib/expression-utils.js",
   "files": [
-    "/lib"
+    "/lib",
+    "types.d.ts"
   ],
   "private": false,
   "dependencies": {
@@ -59,7 +61,7 @@
     "testURL": "http://localhost"
   },
   "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",
+    "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",

package/types.d.ts

@@ -0,0 +1,70 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
+import {TypeObject} from "@fibery/schema";
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export type $TSFixMe = any;
+
+declare module "@fibery/expression-utils" {
+  export const visitors: {
+    replaceNamesWithIdsVisitor(
+      typeObject: TypeObject,
+      onFieldNotFound?: (input: {
+        currentTypeObject: TypeObject;
+        fieldExpressionInIdsTerms: Array<string>;
+        field: string;
+        expression: Array<string>;
+      }) => $TSFixMe
+    ): $TSFixMe;
+
+    replaceIdsWithNamesVisitor(
+      typeObject: TypeObject,
+      onFieldNotFound?: (input: {
+        currentTypeObject: TypeObject;
+        fieldExpressionInNamesTerms: Array<string>;
+        fieldId: string;
+        expression: Array<string>;
+      }) => $TSFixMe
+    ): $TSFixMe;
+
+    deleteExpressionsWithNotFoundFieldsVisitor(typeObject): $TSFixMe;
+  };
+  export const paramsPlaceholders: {
+    dynamicFilterParamPrefix: string;
+
+    isDynamicFilterParam(paramValue: string): boolean;
+
+    getFieldIdFromDynamicParam(paramValue: string): string;
+
+    mapDynamicParams(
+      params: Record<string, $TSFixMe> | null,
+      onDynamicParam: (value: string) => string
+    ): Record<string, $TSFixMe> | null;
+
+    replacePlaceholdersInParams(
+      params: Record<string, $TSFixMe> | null | undefined
+    ): Record<string, $TSFixMe> | null | undefined;
+
+    paramsPlaceholdersLookup: Record<string, () => string>;
+    tomorrowStartDateTimeParamPlaceholder: string;
+    dateToDateTimeIntervalLookup: Record<string, {start: string; end: string}>;
+
+    monthAgoDateParamPlaceholder: string;
+    monthAgoStartDateTimeParamPlaceholder: string;
+    monthFromNowDateParamPlaceholder: string;
+    monthFromNowEndDateTimeParamPlaceholder: string;
+    todayDateParamPlaceholder: string;
+    todayEndDateTimeParamPlaceholder: string;
+    tomorrowDateParamPlaceholder: string;
+    weekAgoDateParamPlaceholder: string;
+    weekAgoStartDateTimeParamPlaceholder: string;
+    weekFromNowDateParamPlaceholder: string;
+    weekFromNowEndDateTimeParamPlaceholder: string;
+    yesterdayDateParamPlaceholder: string;
+    yesterdayEndDateTimeParamPlaceholder: string;
+    yesterdayStartDateTimeParamPlaceholder: string;
+    yearAgoDateParamPlaceholder: string;
+    yearAgoStartDateTimeParamPlaceholder: string;
+    yearFromNowDateParamPlaceholder: string;
+    yearFromNowEndDateTimeParamPlaceholder: string;
+  };
+}