@fibery/expression-utils 1.1.4 → 1.1.5

package/lib/contextVariables.js

@@ -12,7 +12,8 @@ const getEntityQueryVariables = schema => {
       typeObject,
       id: `entityQuery_${typeObject.id}`,
       title: group.length > 1 ? `${typeObject.pluralTitle} (${typeObject.nameParts.namespace})` : typeObject.pluralTitle,
-      isCollection: true
+      isCollection: true,
+      description: `All Entities from "${typeObject.title}" Database`
     }));
   }));
 };

package/lib/expression-utils.js

@@ -1,12 +1,11 @@
 var _ = require('lodash');
 var moment = require('moment');
-var util = require('util');
+var trace = require('@fibery/helpers/utils/trace');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
 var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
-var util__default = /*#__PURE__*/_interopDefaultLegacy(util);
 
 const serializeDate = momentDate => {
   return momentDate.format("YYYY-MM-DD");
@@ -178,41 +177,6 @@ function _extends() {
   return _extends.apply(this, arguments);
 }
 
-const formatWithCustomInspectParams = function (args) {
-  const transformedArgs = args.map(value => {
-    if (typeof value === "object") {
-      return {
-        [util__default["default"].inspect.custom || "inspect"](recurseTimes, ctx) {
-          return util__default["default"].inspect(value, _extends({}, ctx, {
-            showHidden: false,
-            depth: null,
-            maxArrayLength: null
-          }));
-        }
-
-      };
-    } else if (typeof value === "string") {
-      return {
-        [util__default["default"].inspect.custom || "inspect"](recurseTimes, ctx) {
-          return value;
-        }
-
-      };
-    } else {
-      return value;
-    }
-  });
-  return util__default["default"].format(...transformedArgs);
-};
-function assert(condition, ...args) {
-  if (!condition) {
-    const message = args.length > 0 ? formatWithCustomInspectParams(args) : `Assertion failed with no details`;
-    throw new Error(message);
-  }
-}
-
-[console.error.bind(console)];
-
 const stringify = x => {
   if (x === undefined) {
     return "undefined";
@@ -229,10 +193,10 @@ class NotImplementedError extends Error {
 }
 
 const assertIsValidExpression = expression => {
-  assert(Array.isArray(expression), "expression must be array", {
+  trace.assert(Array.isArray(expression), "expression must be array", {
     expression
   });
-  assert(expression.length > 0, "empty expression does not make any sense");
+  trace.assert(expression.length > 0, "empty expression does not make any sense");
 };
 const dateRangeFunctions = new Set(["q/start", "q/end"]);
 const firstLastFunctions = new Set(["q/first", "q/last"]);
@@ -249,7 +213,7 @@ const logicalOperators = new Set(["and", "or", "q/and", "q/or"]);
 const relationalOperators = new Set(["=", "!=", "<", ">", "<=", ">="]);
 const mathOperators = new Set(["+", "-", "*", "/", "q/+", "q/-", "q/concat"]);
 const isFunctionCallExpression = expression => expression.length > 1 && ___default["default"].isString(expression[0]) && (expression[0].startsWith("q/") || ["=", "!=", "<", ">", "<=", ">=", "+", "-", "*", "/", "in", "and", "or", "not-in"].includes(expression[0]));
-const isDateRangeFunctionExpression = expression => expression.length === 2 && dateRangeFunctions.has(expression[0]) && isFieldExpression(expression[1]);
+const isDateRangeFunctionExpression = expression => (expression.length === 2 || expression.length === 3) && dateRangeFunctions.has(expression[0]) && isFieldExpression(expression[1]);
 const isCollectionFunctionExpression = expression => //expression has length 3 in case of q/join
 (expression.length === 2 || expression.length === 3) && collectionOps.has(expression[0]) && isFieldExpression(expression[1]);
 const isAccessFunctionExpression = expresion => expresion.length === 2 && expresion[0] === "q/access?" && isFieldExpression(expresion[1]);
@@ -286,7 +250,7 @@ const isFunctionExpression = expression => {
 };
 
 const collectFieldExpressions = (memo, expression) => {
-  if (isVariableExpression(expression)) ; else if (isBinaryExpression(expression) || isNaryExpression(expression)) {
+  if (isVariableExpression(expression)) ; else if (isFunctionCallExpression(expression)) {
     for (const part of expression.slice(1)) {
       if (isVariableExpression(part) || part === null) ; else {
         if (___default["default"].isString(part)) {
@@ -299,8 +263,6 @@ const collectFieldExpressions = (memo, expression) => {
     }
   } else if (isFieldExpression(expression)) {
     memo.push(expression);
-  } else if (isDateRangeFunctionExpression(expression) || isCollectionFunctionExpression(expression)) {
-    collectFieldExpressions(memo, expression[1]);
   } else if (expression["q/from"] && isFieldExpression(expression["q/from"])) {
     const innerMemo = [];
     expression["q/select"] && collectFieldExpressions(innerMemo, expression["q/select"]);
@@ -523,7 +485,7 @@ const replaceNamesWithIdsVisitor = (typeObject, onFieldNotFound = defaultNamesWi
       }).currentTypeObject;
 
       if (subQueryTypeObject) {
-        const subQueryVisitor = replaceNamesWithIdsVisitor(subQueryTypeObject);
+        const subQueryVisitor = replaceNamesWithIdsVisitor(subQueryTypeObject, onFieldNotFound);
         return _extends({}, subQueryExpression, {
           "q/from": visitor.visitFieldExpression(fromExpression),
           "q/select": ___default["default"].isPlainObject(selectExpression) ? ___default["default"].mapValues(selectExpression, val => subQueryVisitor.visitExpression(val)) : subQueryVisitor.visitExpression(selectExpression)
@@ -778,7 +740,8 @@ const getEntityQueryVariables = schema => {
       typeObject,
       id: `entityQuery_${typeObject.id}`,
       title: group.length > 1 ? `${typeObject.pluralTitle} (${typeObject.nameParts.namespace})` : typeObject.pluralTitle,
-      isCollection: true
+      isCollection: true,
+      description: `All Entities from "${typeObject.title}" Database`
     }));
   }));
 };

package/lib/utils.js

@@ -1,9 +1,8 @@
-var util = require('util');
+var trace = require('@fibery/helpers/utils/trace');
 var _ = require('lodash');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var util__default = /*#__PURE__*/_interopDefaultLegacy(util);
 var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
 
 function _extends() {
@@ -24,41 +23,6 @@ function _extends() {
   return _extends.apply(this, arguments);
 }
 
-const formatWithCustomInspectParams = function (args) {
-  const transformedArgs = args.map(value => {
-    if (typeof value === "object") {
-      return {
-        [util__default["default"].inspect.custom || "inspect"](recurseTimes, ctx) {
-          return util__default["default"].inspect(value, _extends({}, ctx, {
-            showHidden: false,
-            depth: null,
-            maxArrayLength: null
-          }));
-        }
-
-      };
-    } else if (typeof value === "string") {
-      return {
-        [util__default["default"].inspect.custom || "inspect"](recurseTimes, ctx) {
-          return value;
-        }
-
-      };
-    } else {
-      return value;
-    }
-  });
-  return util__default["default"].format(...transformedArgs);
-};
-function assert(condition, ...args) {
-  if (!condition) {
-    const message = args.length > 0 ? formatWithCustomInspectParams(args) : `Assertion failed with no details`;
-    throw new Error(message);
-  }
-}
-
-[console.error.bind(console)];
-
 const stringify = x => {
   if (x === undefined) {
     return "undefined";
@@ -75,10 +39,10 @@ class NotImplementedError extends Error {
 }
 
 const assertIsValidExpression = expression => {
-  assert(Array.isArray(expression), "expression must be array", {
+  trace.assert(Array.isArray(expression), "expression must be array", {
     expression
   });
-  assert(expression.length > 0, "empty expression does not make any sense");
+  trace.assert(expression.length > 0, "empty expression does not make any sense");
 };
 const dateRangeFunctions = new Set(["q/start", "q/end"]);
 const firstLastFunctions = new Set(["q/first", "q/last"]);
@@ -95,7 +59,7 @@ const logicalOperators = new Set(["and", "or", "q/and", "q/or"]);
 const relationalOperators = new Set(["=", "!=", "<", ">", "<=", ">="]);
 const mathOperators = new Set(["+", "-", "*", "/", "q/+", "q/-", "q/concat"]);
 const isFunctionCallExpression = expression => expression.length > 1 && ___default["default"].isString(expression[0]) && (expression[0].startsWith("q/") || ["=", "!=", "<", ">", "<=", ">=", "+", "-", "*", "/", "in", "and", "or", "not-in"].includes(expression[0]));
-const isDateRangeFunctionExpression = expression => expression.length === 2 && dateRangeFunctions.has(expression[0]) && isFieldExpression(expression[1]);
+const isDateRangeFunctionExpression = expression => (expression.length === 2 || expression.length === 3) && dateRangeFunctions.has(expression[0]) && isFieldExpression(expression[1]);
 const isCollectionFunctionExpression = expression => //expression has length 3 in case of q/join
 (expression.length === 2 || expression.length === 3) && collectionOps.has(expression[0]) && isFieldExpression(expression[1]);
 const isAccessFunctionExpression = expresion => expresion.length === 2 && expresion[0] === "q/access?" && isFieldExpression(expresion[1]);
@@ -132,7 +96,7 @@ const isFunctionExpression = expression => {
 };
 
 const collectFieldExpressions = (memo, expression) => {
-  if (isVariableExpression(expression)) ; else if (isBinaryExpression(expression) || isNaryExpression(expression)) {
+  if (isVariableExpression(expression)) ; else if (isFunctionCallExpression(expression)) {
     for (const part of expression.slice(1)) {
       if (isVariableExpression(part) || part === null) ; else {
         if (___default["default"].isString(part)) {
@@ -145,8 +109,6 @@ const collectFieldExpressions = (memo, expression) => {
     }
   } else if (isFieldExpression(expression)) {
     memo.push(expression);
-  } else if (isDateRangeFunctionExpression(expression) || isCollectionFunctionExpression(expression)) {
-    collectFieldExpressions(memo, expression[1]);
   } else if (expression["q/from"] && isFieldExpression(expression["q/from"])) {
     const innerMemo = [];
     expression["q/select"] && collectFieldExpressions(innerMemo, expression["q/select"]);

package/lib/visitors.js

@@ -1,5 +1,5 @@
 var _ = require('lodash');
-require('util');
+require('@fibery/helpers/utils/trace');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -23,8 +23,6 @@ function _extends() {
   return _extends.apply(this, arguments);
 }
 
-[console.error.bind(console)];
-
 const stringify = x => {
   if (x === undefined) {
     return "undefined";
@@ -243,7 +241,7 @@ const replaceNamesWithIdsVisitor = (typeObject, onFieldNotFound = defaultNamesWi
       }).currentTypeObject;
 
       if (subQueryTypeObject) {
-        const subQueryVisitor = replaceNamesWithIdsVisitor(subQueryTypeObject);
+        const subQueryVisitor = replaceNamesWithIdsVisitor(subQueryTypeObject, onFieldNotFound);
         return _extends({}, subQueryExpression, {
           "q/from": visitor.visitFieldExpression(fromExpression),
           "q/select": ___default["default"].isPlainObject(selectExpression) ? ___default["default"].mapValues(selectExpression, val => subQueryVisitor.visitExpression(val)) : subQueryVisitor.visitExpression(selectExpression)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fibery/expression-utils",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "utils for working with fibery api expressions",
   "exports": {
     ".": "./lib/expression-utils.js",
@@ -22,33 +22,47 @@
   ],
   "private": false,
   "dependencies": {
-    "lodash": "^4.17.21",
-    "moment": "^2.20.1"
+    "lodash": "4.17.21",
+    "moment": "2.20.1",
+    "@fibery/helpers": "1.0.0"
   },
   "devDependencies": {
     "@babel/core": "7.15.0",
-    "babel-jest": "27.0.6",
-    "babel-loader": "8.2.2",
-    "babel-preset-fibery": "7.2.0",
-    "eslint-config-fibery": "7.0.0",
-    "jest": "27.0.6",
-    "microbundle": "0.14.1"
+    "babel-jest": "27.5.1",
+    "babel-loader": "8.2.5",
+    "@fibery/babel-preset": "7.2.0",
+    "@fibery/eslint-config": "8.1.0",
+    "jest": "27.5.1",
+    "jest-junit": "13.0.0",
+    "microbundle": "0.15.0"
   },
   "peerDependencies": {
-    "fibery-schema": "7.x"
+    "@fibery/schema": "^8.0.6"
   },
   "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",
     "test": "node scripts/test.js",
+    "test:ci": "yarn test --coverage --reporters=default --reporters=jest-junit",
     "lint": "eslint ."
   },
   "jest": {
     "testEnvironment": "node",
+    "coveragePathIgnorePatterns": [
+      "/node_modules/"
+    ],
+    "collectCoverageFrom": [
+      "src/**/*.{js,jsx,ts,tsx}",
+      "!src/**/*.d.ts"
+    ],
+    "coverageReporters": [
+      "text",
+      "cobertura"
+    ],
     "testPathIgnorePatterns": [
       "<rootDir>[/\\\\](build|docs|node_modules|scripts)[/\\\\]"
     ],
     "transform": {
-      "^.+\\.jsx?$": "../fibery-ui/config/jest/babel.js"
+      "^.+\\.(js|jsx|ts|tsx)$": "../../fibery-ui/config/jest/babel.js"
     },
     "testURL": "http://localhost"
   }