@fibery/expression-utils 1.1.10 → 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";
@@ -74,9 +76,11 @@ const paramsPlaceholdersLookup = {
 };
 const replacePlaceholdersInParams = params => params && ___default["default"].mapValues(params, (value, key) => {
   const replaceFn = paramsPlaceholdersLookup[key];
+
   if (replaceFn) {
     return replaceFn();
   }
+
   return value;
 });
 const dateToDateTimeIntervalLookup = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fibery/expression-utils",
-  "version": "1.1.10",
+  "version": "1.1.12",
   "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,24 +19,25 @@
   },
   "main": "./lib/expression-utils.js",
   "files": [
-    "/lib"
+    "/lib",
+    "types.d.ts"
   ],
   "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",
@@ -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;
+  };
+}

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;