@fibery/views 17.0.1 → 17.0.3

package/lib/views.js

@@ -1,6 +1,7 @@
 var immutableUpdate = require('immutability-helper');
 var _ = require('lodash');
-var expressionUtils = require('@fibery/expression-utils');
+var utils = require('@fibery/expression-utils/src/utils');
+var visitors = require('@fibery/expression-utils/src/visitors');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -10,11 +11,6 @@ var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
 // Return this symbol from a visitor callback to remove the node from the
 // output. Not supported in all places, add support as needed.
 const REMOVE = Symbol("remove");
-const {
-  deleteExpressionsWithNotFoundFieldsVisitor,
-  replaceIdsWithNamesVisitor: replaceIdsWithNamesVisitor$1,
-  replaceNamesWithIdsVisitor: replaceNamesWithIdsVisitor$1
-} = expressionUtils.visitors;
 function visitDeleteExpressionInFilterGroup(filter, visitExpression) {
   if (filter.kind !== "group") {
     return null;
@@ -57,10 +53,10 @@ const deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression = (schema, quer
     return ___default["default"].pickBy({
       ...queryExpression,
       ...(whereExpression ? {
-        "q/where": deleteExpressionsWithNotFoundFieldsVisitor(typeObject).visitExpression(whereExpression)
+        "q/where": visitors.deleteExpressionsWithNotFoundFieldsVisitor(typeObject).visitExpression(whereExpression)
       } : null),
       ...(orderByExpression ? {
-        "q/order-by": deleteExpressionsWithNotFoundFieldsVisitor(typeObject).visitOrderByExpression(orderByExpression)
+        "q/order-by": visitors.deleteExpressionsWithNotFoundFieldsVisitor(typeObject).visitOrderByExpression(orderByExpression)
       } : null)
     });
   }
@@ -69,14 +65,14 @@ const deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression = (schema, quer
 const replaceNamesWithIdsInExpression = (schema, fromType, expression) => {
   if (schema.typeObjectsByName.hasOwnProperty(fromType)) {
     const typeObject = schema.typeObjectsByName[fromType];
-    return replaceNamesWithIdsVisitor$1(typeObject).visitExpression(expression);
+    return visitors.replaceNamesWithIdsVisitor(typeObject).visitExpression(expression);
   }
   return expression;
 };
 const replaceIdsWithNamesInExpression = (schema, fromTypeId, expression) => {
   if (schema.typeObjectsById.hasOwnProperty(fromTypeId)) {
     const typeObject = schema.typeObjectsById[fromTypeId];
-    return replaceIdsWithNamesVisitor$1(typeObject).visitExpression(expression);
+    return visitors.replaceIdsWithNamesVisitor(typeObject).visitExpression(expression);
   }
   return expression;
 };
@@ -112,10 +108,10 @@ const replaceIdsWithNamesInQueryExpression = (schema, queryExpression) => {
         "q/from": typeObject.name
       },
       ...(whereExpression ? {
-        "q/where": replaceIdsWithNamesVisitor$1(typeObject).visitExpression(whereExpression)
+        "q/where": visitors.replaceIdsWithNamesVisitor(typeObject).visitExpression(whereExpression)
       } : null),
       ...(orderByExpression ? {
-        "q/order-by": replaceIdsWithNamesVisitor$1(typeObject).visitOrderByExpression(orderByExpression)
+        "q/order-by": visitors.replaceIdsWithNamesVisitor(typeObject).visitOrderByExpression(orderByExpression)
       } : null)
     };
   }
@@ -144,14 +140,14 @@ function visitFilterGroup(filter, visitExpression, type) {
 const replaceIdsWithNamesInFilter = (schema, fromType, filter) => {
   if (schema.typeObjectsById.hasOwnProperty(fromType)) {
     const typeObject = schema.typeObjectsById[fromType];
-    return filter ? visitFilterGroup(filter, expression => replaceIdsWithNamesVisitor$1(typeObject).visitExpression(expression)) : null;
+    return filter ? visitFilterGroup(filter, expression => visitors.replaceIdsWithNamesVisitor(typeObject).visitExpression(expression)) : null;
   }
   return filter;
 };
 const replaceNamesWithIdsInFilter = (schema, fromType, filter) => {
   if (schema.typeObjectsByName.hasOwnProperty(fromType)) {
     const typeObject = schema.typeObjectsByName[fromType];
-    return filter ? visitFilterGroup(filter, expression => replaceNamesWithIdsVisitor$1(typeObject).visitExpression(expression)) : null;
+    return filter ? visitFilterGroup(filter, expression => visitors.replaceNamesWithIdsVisitor(typeObject).visitExpression(expression)) : null;
   }
   return filter;
 };
@@ -169,10 +165,10 @@ const replaceNamesWithIdsInQueryExpression = (schema, queryExpression) => {
         "q/from": typeObject.id
       },
       ...(whereExpression ? {
-        "q/where": replaceNamesWithIdsVisitor$1(typeObject).visitExpression(whereExpression)
+        "q/where": visitors.replaceNamesWithIdsVisitor(typeObject).visitExpression(whereExpression)
       } : null),
       ...(orderByExpression ? {
-        "q/order-by": replaceNamesWithIdsVisitor$1(typeObject).visitOrderByExpression(orderByExpression)
+        "q/order-by": visitors.replaceNamesWithIdsVisitor(typeObject).visitOrderByExpression(orderByExpression)
       } : null)
     };
   }
@@ -181,7 +177,7 @@ const replaceNamesWithIdsInQueryExpression = (schema, queryExpression) => {
 const deleteExpressionWithNotFoundFieldsOrTypesInExpression = (schema, fromType, expression) => {
   if (schema.typeObjectsByName.hasOwnProperty(fromType)) {
     const typeObject = schema.typeObjectsByName[fromType];
-    return deleteExpressionsWithNotFoundFieldsVisitor(typeObject).visitExpression(expression);
+    return visitors.deleteExpressionsWithNotFoundFieldsVisitor(typeObject).visitExpression(expression);
   }
   return null;
 };
@@ -393,9 +389,6 @@ const enableHideWhenEmptyForCheckedEditableUnit = unit => {
   return unit;
 };
 
-const {
-  isFieldExpression
-} = expressionUtils.utils;
 const visitQueryExpressionHolder = (queryHolder, visitor) => {
   if (queryHolder) {
     const {
@@ -460,7 +453,7 @@ const visitAxis$1 = (axis, visitor) => {
   }
   return axis;
 };
-const isAxisFieldExpression = expression => isFieldExpression(expression) && expression.length === 1;
+const isAxisFieldExpression = expression => utils.isFieldExpression(expression) && expression.length === 1;
 const ensureAxisAndItemExpressionInvariant$1 = view => {
   const actions = [];
   const x = ___default["default"].get(view, ["fibery/meta", "x"]);
@@ -1061,10 +1054,6 @@ const enableHideWhenEmptyForCheckedUnits$1 = view => {
   });
 };
 
-const {
-  replaceIdsWithNamesVisitor,
-  replaceNamesWithIdsVisitor
-} = expressionUtils.visitors;
 const visitSmartFolder = (smartFolder, visitor) => immutableUpdate__default["default"](smartFolder, {
   "fibery/meta": {
     items: {
@@ -1197,7 +1186,7 @@ const replaceIdsWithNamesInGroupByExpression = (schema, groupByExpression, fromT
     if (schema.typeObjectsById.hasOwnProperty(fromType)) {
       const typeObject = schema.typeObjectsById[fromType];
       return [index, {
-        expression: replaceIdsWithNamesVisitor(typeObject).visitExpression(expression)
+        expression: visitors.replaceIdsWithNamesVisitor(typeObject).visitExpression(expression)
       }];
     } else {
       return [index, {
@@ -1216,7 +1205,7 @@ const replaceNamesWithIdsInGroupByExpression = (schema, groupByExpression, fromT
     if (schema.typeObjectsByName.hasOwnProperty(fromType)) {
       const typeObject = schema.typeObjectsByName[fromType];
       return [index, {
-        expression: replaceNamesWithIdsVisitor(typeObject).visitExpression(expression)
+        expression: visitors.replaceNamesWithIdsVisitor(typeObject).visitExpression(expression)
       }];
     } else {
       return [index, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fibery/views",
-  "version": "17.0.1",
+  "version": "17.0.3",
   "description": "Operations on view objects",
   "license": "UNLICENSED",
   "author": "Fibery",
@@ -19,12 +19,12 @@
     "lodash": "4.17.21",
     "microbundle": "0.15.1",
     "@fibery/babel-preset": "7.4.0",
-    "@fibery/expression-utils": "9.5.1",
-    "@fibery/eslint-config": "8.6.1",
-    "@fibery/schema": "10.2.8"
+    "@fibery/schema": "10.2.8",
+    "@fibery/expression-utils": "9.5.3",
+    "@fibery/eslint-config": "8.6.1"
   },
   "peerDependencies": {
-    "@fibery/expression-utils": "^9.5.1",
+    "@fibery/expression-utils": "^9.5.3",
     "@fibery/schema": "^10.2.8",
     "immutability-helper": "^2.4.0",
     "lodash": "^4.17.21"