@fibery/views 15.0.0 → 16.0.0

package/lib/views.js

@@ -1,7 +1,7 @@
 var immutableUpdate = require('immutability-helper');
 var _ = require('lodash');
-var utils = require('@fibery/expression-utils/utils');
-var visitors = require('@fibery/expression-utils/visitors');
+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 }; }
 
@@ -1338,6 +1338,7 @@ const visitView = (view, visitor) => immutableUpdate__default["default"](view, {
         const removedItemsIndexes = items.map((item, index) => visitor.visitQueryExpression(item.query) ? null : index).filter(value => value !== null);
         return items.map(item => {
           const fromType = ___default["default"].get(item, ["query", "q/from"]);
+          const hasGroupingExpression = ___default["default"].has(item, ["groupingExpression"]);
           return fromType ? immutableUpdate__default["default"](item, {
             yExpression: {
               $apply: yExpression => yExpression ? visitor.visitExpression(fromType, yExpression) : yExpression
@@ -1388,7 +1389,19 @@ const visitView = (view, visitor) => immutableUpdate__default["default"](view, {
                 const removedItemsBeforeTargetLengths = groupByIndexes.map(groupByIndex => removedItemsIndexes.filter(n => n < groupByIndex).length);
                 return visitor.visitGroupByExpression(groupBy, fromType, removedItemsBeforeTargetLengths);
               }
-            }
+            },
+            ...(hasGroupingExpression ? {
+              groupingExpression: {
+                $apply: groupingExpression => {
+                  if (!groupingExpression) {
+                    return null;
+                  }
+                  const groupingExpressionIndexes = Object.keys(groupingExpression).map(key => parseInt(key));
+                  const removedItemsBeforeTargetLengths = groupingExpressionIndexes.map(groupByIndex => removedItemsIndexes.filter(n => n < groupByIndex).length);
+                  return visitor.visitGroupByExpression(groupingExpression, fromType, removedItemsBeforeTargetLengths);
+                }
+              }
+            } : undefined)
           }) : item;
         }).filter(item => {
           const {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fibery/views",
-  "version": "15.0.0",
+  "version": "16.0.0",
   "description": "Operations on view objects",
   "license": "UNLICENSED",
   "author": "Fibery",
@@ -18,13 +18,13 @@
     "jest-junit": "13.0.0",
     "lodash": "4.17.21",
     "microbundle": "0.15.1",
-    "@fibery/eslint-config": "8.6.1",
     "@fibery/babel-preset": "7.4.0",
-    "@fibery/expression-utils": "9.3.0",
+    "@fibery/eslint-config": "8.6.1",
+    "@fibery/expression-utils": "9.4.0",
     "@fibery/schema": "10.2.8"
   },
   "peerDependencies": {
-    "@fibery/expression-utils": "^9.3.0",
+    "@fibery/expression-utils": "^9.4.0",
     "@fibery/schema": "^10.2.8",
     "immutability-helper": "^2.4.0",
     "lodash": "^4.17.21"