@fibery/views 1.1.14 → 1.1.16

package/lib/views.js

@@ -9,20 +9,17 @@ var immutableUpdate__default = /*#__PURE__*/_interopDefaultLegacy(immutableUpdat
 var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
 
 function _extends() {
-  _extends = Object.assign || function (target) {
+  _extends = Object.assign ? Object.assign.bind() : function (target) {
     for (var i = 1; i < arguments.length; i++) {
       var source = arguments[i];
-
       for (var key in source) {
         if (Object.prototype.hasOwnProperty.call(source, key)) {
           target[key] = source[key];
         }
       }
     }
-
     return target;
   };
-
   return _extends.apply(this, arguments);
 }
 
@@ -30,86 +27,69 @@ const getFieldType = (schema, fromType, field) => {
   if (!schema.typeObjectsByName.hasOwnProperty(fromType) || !schema.typeObjectsByName[fromType].fieldObjectsByName.hasOwnProperty(field)) {
     return null;
   }
-
   return schema.typeObjectsByName[fromType].fieldObjectsByName[field].type;
 };
-
 const getFieldMeta = (schema, fromType, field) => {
   if (!schema.typeObjectsByName.hasOwnProperty(fromType) || !schema.typeObjectsByName[fromType].fieldObjectsByName.hasOwnProperty(field)) {
     return null;
   }
-
   return schema.typeObjectsByName[fromType].fieldObjectsByName[field].rawMeta;
 };
-
 const getUnitTypeForTextField = fieldMeta => {
   switch (fieldMeta["ui/type"]) {
     case "email":
       return "email";
-
     case "url":
       return "url";
-
     case "phone":
       return "phone";
-
     default:
       return "text";
   }
 };
-
 const fixViewUnit = (schema, fromType, unit) => {
   const {
     type,
     expression
   } = unit;
-
   if (type === "date") {
     const [field] = expression;
-
     if (getFieldType(schema, fromType, field) === "fibery/date-time") {
       return _extends({}, unit, {
         type: "date-time"
       });
     }
   }
-
   if (type === "date-range") {
     const [field] = expression;
-
     if (getFieldType(schema, fromType, field) === "fibery/date-time-range") {
       return _extends({}, unit, {
         type: "date-time-range"
       });
     }
   }
-
   if (type === "text") {
     const [field] = expression;
     const fieldType = getFieldType(schema, fromType, field);
-
     if (fieldType === "fibery/email") {
       return _extends({}, unit, {
         type: "email"
       });
     }
   }
-
   if (["text", "email", "phone", "url"].includes(type)) {
     const [field] = expression;
-
     if (getFieldType(schema, fromType, field) === "fibery/text") {
       return _extends({}, unit, {
         type: getUnitTypeForTextField(getFieldMeta(schema, fromType, field))
       });
     }
   }
-
   return unit;
 };
 
+// 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 deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression = (schema, queryExpression) => {
   const {
@@ -117,7 +97,6 @@ const deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression = (schema, quer
     "q/where": whereExpression,
     "q/order-by": orderByExpression
   } = queryExpression;
-
   if (schema.typeObjectsByName.hasOwnProperty(fromExpression)) {
     const typeObject = schema.typeObjectsByName[fromExpression];
     return ___default["default"].pickBy(_extends({}, queryExpression, whereExpression ? {
@@ -126,7 +105,6 @@ const deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression = (schema, quer
       "q/order-by": visitors.deleteExpressionsWithNotFoundFieldsVisitor(typeObject).visitOrderByExpression(orderByExpression)
     } : null));
   }
-
   return null;
 };
 const replaceNamesWithIdsInExpression = (schema, fromType, expression) => {
@@ -134,7 +112,6 @@ const replaceNamesWithIdsInExpression = (schema, fromType, expression) => {
     const typeObject = schema.typeObjectsByName[fromType];
     return visitors.replaceNamesWithIdsVisitor(typeObject).visitExpression(expression);
   }
-
   return expression;
 };
 const replaceIdsWithNamesInExpression = (schema, fromTypeId, expression) => {
@@ -142,20 +119,17 @@ const replaceIdsWithNamesInExpression = (schema, fromTypeId, expression) => {
     const typeObject = schema.typeObjectsById[fromTypeId];
     return visitors.replaceIdsWithNamesVisitor(typeObject).visitExpression(expression);
   }
-
   return expression;
 };
 const visitViewUnit = (fromType, unit, visitor) => {
   const {
     expression
   } = unit;
-
   if (expression) {
     return _extends({}, unit, {
       expression: visitor.visitExpression(fromType, expression)
     });
   }
-
   return unit;
 };
 const visitContextExpression = (fromType, contextExpression, visitor) => {
@@ -168,7 +142,6 @@ const replaceIdsWithNamesInQueryExpression = (schema, queryExpression) => {
     "q/where": whereExpression,
     "q/order-by": orderByExpression
   } = queryExpression;
-
   if (schema.typeObjectsById.hasOwnProperty(fromExpression)) {
     const typeObject = schema.typeObjectsById[fromExpression];
     return _extends({}, queryExpression, {
@@ -179,7 +152,6 @@ const replaceIdsWithNamesInQueryExpression = (schema, queryExpression) => {
       "q/order-by": visitors.replaceIdsWithNamesVisitor(typeObject).visitOrderByExpression(orderByExpression)
     } : null);
   }
-
   return queryExpression;
 };
 const replaceNamesWithIdsInQueryExpression = (schema, queryExpression) => {
@@ -188,7 +160,6 @@ const replaceNamesWithIdsInQueryExpression = (schema, queryExpression) => {
     "q/where": whereExpression,
     "q/order-by": orderByExpression
   } = queryExpression;
-
   if (schema.typeObjectsByName.hasOwnProperty(fromExpression)) {
     const typeObject = schema.typeObjectsByName[fromExpression];
     return _extends({}, queryExpression, {
@@ -199,7 +170,6 @@ const replaceNamesWithIdsInQueryExpression = (schema, queryExpression) => {
       "q/order-by": visitors.replaceNamesWithIdsVisitor(typeObject).visitOrderByExpression(orderByExpression)
     } : null);
   }
-
   return queryExpression;
 };
 const deleteExpressionWithNotFoundFieldsOrTypesInExpression = (schema, fromType, expression) => {
@@ -207,7 +177,6 @@ const deleteExpressionWithNotFoundFieldsOrTypesInExpression = (schema, fromType,
     const typeObject = schema.typeObjectsByName[fromType];
     return visitors.deleteExpressionsWithNotFoundFieldsVisitor(typeObject).visitExpression(expression);
   }
-
   return null;
 };
 const resetContextExpressionIfBroken = (schema, fromType, expression, defaultExpression) => deleteExpressionWithNotFoundFieldsOrTypesInExpression(schema, fromType, expression) || defaultExpression;
@@ -218,7 +187,6 @@ const isUnitExpressionValid = unit => {
     } = unit;
     return expression !== null;
   }
-
   return true;
 };
 
@@ -227,20 +195,16 @@ const visitQueryExpressionHolder = (queryHolder, visitor) => {
     const {
       query
     } = queryHolder;
-
     if (query) {
       const queryNew = visitor.visitQueryExpression(query);
       return queryNew ? _extends({}, queryHolder, {
         query: queryNew
       }) : null;
     }
-
     return queryHolder;
   }
-
   return queryHolder;
 };
-
 const visitAxisUnits = (axis, fromType, visitor) => {
   return fromType ? immutableUpdate__default["default"](axis, {
     contextExpression: {
@@ -251,20 +215,15 @@ const visitAxisUnits = (axis, fromType, visitor) => {
     }
   }) : axis;
 };
-
 const visitAxis$1 = (axis, visitor) => {
   if (axis && axis.hasOwnProperty("query")) {
     const fromType = ___default["default"].get(axis, ["query", "q/from"]);
-
     const axisWithVisitedQuery = visitQueryExpressionHolder(axis, visitor);
-
     if (axisWithVisitedQuery) {
       return visitAxisUnits(axisWithVisitedQuery, fromType, visitor);
     }
-
     return axisWithVisitedQuery;
   }
-
   if (axis && axis.hasOwnProperty("enums")) {
     const axisNew = immutableUpdate__default["default"](axis, {
       enums: {
@@ -276,24 +235,18 @@ const visitAxis$1 = (axis, visitor) => {
     } = axisNew;
     return enums ? axisNew : null;
   }
-
   return axis;
 };
-
+const isAxisFieldExpression = expression => utils.isFieldExpression(expression) && expression.length === 1;
 const ensureAxisAndItemExpressionInvariant$1 = view => {
   const actions = [];
-
   const x = ___default["default"].get(view, ["fibery/meta", "x"]);
-
   const y = ___default["default"].get(view, ["fibery/meta", "y"]);
-
   const items = ___default["default"].get(view, ["fibery/meta", "items"]);
-
   if (x === null) {
     const resetActions = items.map(item => () => item.xExpression = null);
     actions.push(...resetActions);
   }
-
   if (x !== null && ___default["default"].some(items, ({
     xExpression
   }) => xExpression === null)) {
@@ -301,12 +254,10 @@ const ensureAxisAndItemExpressionInvariant$1 = view => {
     actions.push(...resetActions);
     actions.push(() => ___default["default"].set(view, ["fibery/meta", "x"], null));
   }
-
   if (y === null) {
     const resetActions = items.map(item => () => item.yExpression = null);
     actions.push(...resetActions);
   }
-
   if (y !== null && ___default["default"].some(items, ({
     yExpression
   }) => yExpression === null)) {
@@ -314,36 +265,30 @@ const ensureAxisAndItemExpressionInvariant$1 = view => {
     actions.push(...resetActions);
     actions.push(() => ___default["default"].set(view, ["fibery/meta", "y"], null));
   }
-
   if (x !== null && ___default["default"].isEmpty(items)) {
     actions.push(() => ___default["default"].set(view, ["fibery/meta", "x"], null));
   }
-
   if (y !== null && ___default["default"].isEmpty(items)) {
     actions.push(() => ___default["default"].set(view, ["fibery/meta", "y"], null));
   }
-
   if (x !== null && ___default["default"].some(items, ({
     xExpression
-  }) => !utils.isAxisFieldExpression(xExpression))) {
+  }) => !isAxisFieldExpression(xExpression))) {
     const resetActions = items.map(item => () => item.xExpression = null);
     actions.push(...resetActions);
     actions.push(() => ___default["default"].set(view, ["fibery/meta", "x"], null));
   }
-
   if (y !== null && ___default["default"].some(items, ({
     yExpression
-  }) => !utils.isAxisFieldExpression(yExpression))) {
+  }) => !isAxisFieldExpression(yExpression))) {
     const resetActions = items.map(item => () => item.yExpression = null);
     actions.push(...resetActions);
     actions.push(() => ___default["default"].set(view, ["fibery/meta", "y"], null));
   }
-
   actions.forEach(action => action());
   return view;
 };
-
-const visitView$4 = (view, visitor) => immutableUpdate__default["default"](view, {
+const visitView$5 = (view, visitor) => immutableUpdate__default["default"](view, {
   "fibery/meta": {
     x: {
       $apply: x => visitAxis$1(x, visitor)
@@ -354,8 +299,10 @@ const visitView$4 = (view, visitor) => immutableUpdate__default["default"](view,
     items: {
       $apply: items => items.map(item => {
         const fromType = ___default["default"].get(item, ["query", "q/from"]);
-
         return fromType ? immutableUpdate__default["default"](item, {
+          coverExpression: {
+            $apply: coverExpression => coverExpression ? visitor.visitExpression(fromType, coverExpression) : coverExpression
+          },
           xExpression: {
             $apply: xExpression => xExpression ? visitor.visitExpression(fromType, xExpression) : xExpression
           },
@@ -388,7 +335,6 @@ const visitView$4 = (view, visitor) => immutableUpdate__default["default"](view,
     }
   }
 });
-
 const replaceNamesWithIdsViewVisitor = schema => {
   const visitor = {
     visitQueryExpression: queryExpression => replaceNamesWithIdsInQueryExpression(schema, queryExpression),
@@ -396,21 +342,17 @@ const replaceNamesWithIdsViewVisitor = schema => {
     visitEnums: enums => ___default["default"].entries(enums).reduce((result, [type, queryHolder]) => {
       if (schema.typeObjectsByName.hasOwnProperty(type)) {
         const typeObject = schema.typeObjectsByName[type];
-
         const fromType = ___default["default"].get(queryHolder, ["query", "q/from"]);
-
         const axisWithVisitedQuery = visitQueryExpressionHolder(queryHolder, visitor);
         result[typeObject.id] = visitAxisUnits(axisWithVisitedQuery, fromType, visitor);
       } else {
         result[type] = queryHolder;
       }
-
       return result;
     }, {})
   };
   return visitor;
 };
-
 const replaceIdsWithNamesViewVisitor = schema => {
   const visitor = {
     visitQueryExpression: queryExpression => replaceIdsWithNamesInQueryExpression(schema, queryExpression),
@@ -418,21 +360,17 @@ const replaceIdsWithNamesViewVisitor = schema => {
     visitEnums: enums => ___default["default"].entries(enums).reduce((result, [typeId, queryHolder]) => {
       if (schema.typeObjectsById.hasOwnProperty(typeId)) {
         const typeObject = schema.typeObjectsById[typeId];
-
         const fromType = ___default["default"].get(queryHolder, ["query", "q/from"]);
-
         const axisWithVisitedQuery = visitQueryExpressionHolder(queryHolder, visitor);
         result[typeObject.name] = visitAxisUnits(axisWithVisitedQuery, fromType, visitor);
       } else {
         result[typeId] = queryHolder;
       }
-
       return result;
     }, {})
   };
   return visitor;
 };
-
 const deleteExpressionWithNotFoundFieldsOrTypesViewVisitor = schema => {
   const visitor = {
     visitQueryExpression: queryExpression => deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression(schema, queryExpression),
@@ -442,23 +380,18 @@ const deleteExpressionWithNotFoundFieldsOrTypesViewVisitor = schema => {
         if (schema.typeObjectsByName.hasOwnProperty(type)) {
           const typeObject = schema.typeObjectsByName[type];
           const queryHolderResult = visitQueryExpressionHolder(queryHolder, visitor);
-
           if (queryHolderResult) {
             result[typeObject.name] = queryHolderResult;
           }
-
           return result;
         }
-
         return result;
       }, {});
-
       return ___default["default"].isEmpty(enumsNew) ? null : enumsNew;
     }
   };
   return visitor;
 };
-
 const fixUserSelectedUnitsViewVisitor = schema => {
   return {
     visitQueryExpression: queryExpression => queryExpression,
@@ -467,24 +400,23 @@ const fixUserSelectedUnitsViewVisitor = schema => {
     visitViewUnit: (fromType, unit) => fixViewUnit(schema, fromType, unit)
   };
 };
-
-const replaceIdsWithNamesInBoardView = (schema, view) => visitView$4(view, replaceIdsWithNamesViewVisitor(schema));
-const replaceNamesWithIdsInBoardView = (schema, view) => visitView$4(view, replaceNamesWithIdsViewVisitor(schema));
+const replaceIdsWithNamesInBoardView = (schema, view) => visitView$5(view, replaceIdsWithNamesViewVisitor(schema));
+const replaceNamesWithIdsInBoardView = (schema, view) => visitView$5(view, replaceNamesWithIdsViewVisitor(schema));
 const deleteExpressionWithNotFoundOrInvalidFieldsOrTypesInBoardView = (schema, view, ensureAxisInvariant = true) => {
-  const viewNew = visitView$4(view, deleteExpressionWithNotFoundFieldsOrTypesViewVisitor(schema));
+  const viewNew = visitView$5(view, deleteExpressionWithNotFoundFieldsOrTypesViewVisitor(schema));
   return ensureAxisInvariant ? ensureAxisAndItemExpressionInvariant$1(viewNew) : viewNew;
 };
 const fixUserSelectedUnitsInBoardView = (schema, view) => {
-  return visitView$4(view, fixUserSelectedUnitsViewVisitor(schema));
+  return visitView$5(view, fixUserSelectedUnitsViewVisitor(schema));
 };
-const fixContextExpressionWithBrokenPath$6 = (schema, view, defaultContextExpression) => visitView$4(view, {
+const fixContextExpressionWithBrokenPath$7 = (schema, view, defaultContextExpression) => visitView$5(view, {
   visitQueryExpression: query => query,
   visitExpression: (fromType, expression) => expression,
   visitEnums: enums => enums,
   visitContextExpression: (fromType, expression) => resetContextExpressionIfBroken(schema, fromType, expression, defaultContextExpression)
 });
-const collectGarbage$6 = view => {
-  return visitView$4(view, {
+const collectGarbage$7 = view => {
+  return visitView$5(view, {
     visitQueryExpression: queryExpression => queryExpression,
     visitExpression: (fromType, expression) => expression,
     visitEnums: enums => enums,
@@ -492,12 +424,11 @@ const collectGarbage$6 = view => {
   });
 };
 
-const visitView$3 = (view, visitor) => immutableUpdate__default["default"](view, {
+const visitView$4 = (view, visitor) => immutableUpdate__default["default"](view, {
   "fibery/meta": {
     items: {
       $apply: items => items.map(item => {
         const fromType = ___default["default"].get(item, ["query", "q/from"]);
-
         return fromType ? immutableUpdate__default["default"](item, {
           startExpression: {
             $apply: startExpression => startExpression ? visitor.visitExpression(fromType, startExpression) : startExpression
@@ -531,49 +462,47 @@ const visitView$3 = (view, visitor) => immutableUpdate__default["default"](view,
     }
   }
 });
-
 const replaceNamesWithIdsInCalendarView = (schema, view) => {
-  return visitView$3(view, {
+  return visitView$4(view, {
     visitExpression: (fromType, expression) => replaceNamesWithIdsInExpression(schema, fromType, expression),
     visitQueryExpression: query => replaceNamesWithIdsInQueryExpression(schema, query)
   });
 };
 const replaceIdsWithNamesInCalendarView = (schema, view) => {
-  return visitView$3(view, {
+  return visitView$4(view, {
     visitExpression: (fromType, expression) => replaceIdsWithNamesInExpression(schema, fromType, expression),
     visitQueryExpression: query => replaceIdsWithNamesInQueryExpression(schema, query)
   });
 };
-const deleteExpressionWithNotFoundFieldsOrTypesInCalendarView = (schema, view) => visitView$3(view, {
+const deleteExpressionWithNotFoundFieldsOrTypesInCalendarView = (schema, view) => visitView$4(view, {
   visitQueryExpression: queryExpression => deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression(schema, queryExpression),
   visitExpression: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInExpression(schema, fromType, expression)
 });
 const fixUserSelectedUnitsInCalendarView = (schema, view) => {
-  return visitView$3(view, {
+  return visitView$4(view, {
     visitExpression: (fromType, expression) => expression,
     visitQueryExpression: query => query,
     visitViewUnit: (fromType, unit) => fixViewUnit(schema, fromType, unit)
   });
 };
-const fixContextExpressionWithBrokenPath$5 = (schema, view, defaultContextExpression) => visitView$3(view, {
+const fixContextExpressionWithBrokenPath$6 = (schema, view, defaultContextExpression) => visitView$4(view, {
   visitQueryExpression: query => query,
   visitExpression: (fromType, expression) => expression,
   visitContextExpression: (fromType, expression) => resetContextExpressionIfBroken(schema, fromType, expression, defaultContextExpression)
 });
-const collectGarbage$5 = view => {
-  return visitView$3(view, {
+const collectGarbage$6 = view => {
+  return visitView$4(view, {
     visitExpression: (fromType, expression) => expression,
     visitQueryExpression: query => query,
     visitViewUnit: (fromType, unit) => unit.checked ? unit : REMOVE
   });
 };
 
-const visitView$2 = (view, visitor) => immutableUpdate__default["default"](view, {
+const visitView$3 = (view, visitor) => immutableUpdate__default["default"](view, {
   "fibery/meta": {
     items: {
       $apply: items => items.map(item => {
         const fromType = ___default["default"].get(item, ["query", "q/from"]);
-
         return fromType ? immutableUpdate__default["default"](item, {
           postExpression: {
             $apply: postExpression => postExpression ? visitor.visitExpression(fromType, postExpression) : postExpression
@@ -604,37 +533,36 @@ const visitView$2 = (view, visitor) => immutableUpdate__default["default"](view,
     }
   }
 });
-
 const replaceNamesWithIdsInFeedView = (schema, view) => {
-  return visitView$2(view, {
+  return visitView$3(view, {
     visitExpression: (fromType, expression) => replaceNamesWithIdsInExpression(schema, fromType, expression),
     visitQueryExpression: query => replaceNamesWithIdsInQueryExpression(schema, query)
   });
 };
 const replaceIdsWithNamesInFeedView = (schema, view) => {
-  return visitView$2(view, {
+  return visitView$3(view, {
     visitExpression: (fromType, expression) => replaceIdsWithNamesInExpression(schema, fromType, expression),
     visitQueryExpression: query => replaceIdsWithNamesInQueryExpression(schema, query)
   });
 };
-const deleteExpressionWithNotFoundFieldsOrTypesInFeedView = (schema, view) => visitView$2(view, {
+const deleteExpressionWithNotFoundFieldsOrTypesInFeedView = (schema, view) => visitView$3(view, {
   visitQueryExpression: queryExpression => deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression(schema, queryExpression),
   visitExpression: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInExpression(schema, fromType, expression)
 });
 const fixUserSelectedUnitsInFeedView = (schema, view) => {
-  return visitView$2(view, {
+  return visitView$3(view, {
     visitExpression: (fromType, expression) => expression,
     visitQueryExpression: query => query,
     visitViewUnit: (fromType, unit) => fixViewUnit(schema, fromType, unit)
   });
 };
-const fixContextExpressionWithBrokenPath$4 = (schema, view, defaultContextExpression) => visitView$2(view, {
+const fixContextExpressionWithBrokenPath$5 = (schema, view, defaultContextExpression) => visitView$3(view, {
   visitQueryExpression: query => query,
   visitExpression: (fromType, expression) => expression,
   visitContextExpression: (fromType, expression) => resetContextExpressionIfBroken(schema, fromType, expression, defaultContextExpression)
 });
-const collectGarbage$4 = view => {
-  return visitView$2(view, {
+const collectGarbage$5 = view => {
+  return visitView$3(view, {
     visitExpression: (fromType, expression) => expression,
     visitQueryExpression: query => query,
     visitViewUnit: (fromType, unit) => unit.checked ? unit : REMOVE
@@ -643,7 +571,6 @@ const collectGarbage$4 = view => {
 
 const replaceNamesWithIdsInFormView = (schema, view) => {
   var _view$fiberyMeta, _view$fiberyMeta2;
-
   const typeId = (_view$fiberyMeta = view["fibery/meta"]) == null ? void 0 : _view$fiberyMeta.typeId;
   const typeObject = schema.typeObjectsByName.hasOwnProperty(typeId) ? schema.typeObjectsByName[typeId] : null;
   const fields = (_view$fiberyMeta2 = view["fibery/meta"]) == null ? void 0 : _view$fiberyMeta2.fields;
@@ -651,7 +578,6 @@ const replaceNamesWithIdsInFormView = (schema, view) => {
     if (!(typeObject != null && typeObject.fieldObjectsByName.hasOwnProperty(field.id))) {
       return field;
     }
-
     return _extends({}, field, {
       id: typeObject.fieldObjectsByName[field.id].id
     });
@@ -665,7 +591,6 @@ const replaceNamesWithIdsInFormView = (schema, view) => {
 };
 const replaceIdsWithNamesInFormView = (schema, view) => {
   var _view$fiberyMeta3, _view$fiberyMeta4;
-
   const typeId = (_view$fiberyMeta3 = view["fibery/meta"]) == null ? void 0 : _view$fiberyMeta3.typeId;
   const typeObject = schema.typeObjectsById.hasOwnProperty(typeId) ? schema.typeObjectsById[typeId] : null;
   const fields = (_view$fiberyMeta4 = view["fibery/meta"]) == null ? void 0 : _view$fiberyMeta4.fields;
@@ -673,7 +598,6 @@ const replaceIdsWithNamesInFormView = (schema, view) => {
     if (!(typeObject != null && typeObject.fieldObjectsById.hasOwnProperty(field.id))) {
       return field;
     }
-
     return _extends({}, field, {
       id: typeObject.fieldObjectsById[field.id].name
     });
@@ -687,7 +611,6 @@ const replaceIdsWithNamesInFormView = (schema, view) => {
 };
 const deleteExpressionWithNotFoundFieldsOrTypesInFormView = (schema, view) => {
   var _view$fiberyMeta5, _view$fiberyMeta6;
-
   // we expect view in names terms here.
   const typeName = (_view$fiberyMeta5 = view["fibery/meta"]) == null ? void 0 : _view$fiberyMeta5.typeId;
   const typeObject = schema.typeObjectsByName.hasOwnProperty(typeName) ? schema.typeObjectsByName[typeName] : null;
@@ -701,19 +624,88 @@ const deleteExpressionWithNotFoundFieldsOrTypesInFormView = (schema, view) => {
   });
 };
 
+const visitView$2 = (view, visitor) => immutableUpdate__default["default"](view, {
+  "fibery/meta": {
+    items: {
+      $apply: items => items.map(item => {
+        const fromType = ___default["default"].get(item, ["query", "q/from"]);
+        return fromType ? immutableUpdate__default["default"](item, {
+          locationExpression: {
+            $apply: startExpression => startExpression ? visitor.visitExpression(fromType, startExpression) : startExpression
+          },
+          contextExpression: {
+            $apply: contextExpression => visitContextExpression(fromType, contextExpression, visitor)
+          },
+          query: {
+            $apply: query => query ? visitor.visitQueryExpression(query) : null
+          },
+          units: {
+            $apply: units => units ? units.map(unit => visitViewUnit(fromType, unit, visitor)).filter(unit => isUnitExpressionValid(unit)).map(unit => visitor.visitViewUnit ? visitor.visitViewUnit(fromType, unit) : unit) : undefined
+          },
+          colorCoding: {
+            $apply: colorCodings => {
+              return colorCodings && colorCodings.map(colorCoding => _extends({}, colorCoding, {
+                expression: visitor.visitExpression(fromType, colorCoding.expression)
+              })).filter(colorCoding => colorCoding.expression !== null);
+            }
+          }
+        }) : item;
+      }).filter(item => {
+        const {
+          query
+        } = item;
+        return query ? item : null;
+      })
+    }
+  }
+});
+const replaceNamesWithIdsInMapView = (schema, view) => {
+  return visitView$2(view, {
+    visitQueryExpression: query => replaceNamesWithIdsInQueryExpression(schema, query),
+    visitExpression: (fromType, expression) => replaceNamesWithIdsInExpression(schema, fromType, expression)
+  });
+};
+const replaceIdsWithNamesInMapView = (schema, view) => {
+  return visitView$2(view, {
+    visitQueryExpression: query => replaceIdsWithNamesInQueryExpression(schema, query),
+    visitExpression: (fromType, expression) => replaceIdsWithNamesInExpression(schema, fromType, expression)
+  });
+};
+const deleteExpressionWithNotFoundFieldsOrTypesInMapView = (schema, view) => visitView$2(view, {
+  visitQueryExpression: queryExpression => deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression(schema, queryExpression),
+  visitExpression: (fromType, expression) => deleteExpressionWithNotFoundFieldsOrTypesInExpression(schema, fromType, expression)
+});
+const fixUserSelectedUnitsInMapView = (schema, view) => {
+  return visitView$2(view, {
+    visitQueryExpression: query => query,
+    visitExpression: (fromType, expression) => expression,
+    visitViewUnit: (fromType, unit) => fixViewUnit(schema, fromType, unit)
+  });
+};
+const fixContextExpressionWithBrokenPath$4 = (schema, view, defaultContextExpression) => visitView$2(view, {
+  visitExpression: (fromType, expression) => expression,
+  visitQueryExpression: query => query,
+  visitContextExpression: (fromType, expression) => resetContextExpressionIfBroken(schema, fromType, expression, defaultContextExpression)
+});
+const collectGarbage$4 = view => {
+  return visitView$2(view, {
+    visitQueryExpression: query => query,
+    visitExpression: (fromType, expression) => expression,
+    visitViewUnit: (fromType, unit) => unit.checked ? unit : REMOVE
+  });
+};
+
 const visitSmartFolder = (smartFolder, visitor) => immutableUpdate__default["default"](smartFolder, {
   "fibery/meta": {
     items: {
-      $apply: items => {
+      $apply: (items = []) => {
         const isOldSmartFolder = !items.every(item => item.hasOwnProperty("groupBy"));
         const removedItemsIndexes = items.map((item, index) => visitor.visitQueryExpression(item.query) ? null : index).filter(value => value !== null);
         return items.map((item, index) => {
           if (isOldSmartFolder) {
             return item;
           }
-
           const fromType = ___default["default"].get(item, ["query", "q/from"]);
-
           return fromType ? immutableUpdate__default["default"](item, {
             groupBy: {
               $apply: groupBy => {
@@ -724,7 +716,6 @@ const visitSmartFolder = (smartFolder, visitor) => immutableUpdate__default["def
           }) : item;
         }).map(item => {
           const fromType = ___default["default"].get(item, ["query", "q/from"]);
-
           return fromType ? immutableUpdate__default["default"](item, {
             query: {
               $apply: query => {
@@ -756,17 +747,14 @@ const visitSmartFolder = (smartFolder, visitor) => immutableUpdate__default["def
     }
   }
 });
-
 const deleteExpressionWithNotFoundFieldsOrTypesInGroupByExpression = (schema, groupByExpression, fromType, removedItems) => {
   if (!groupByExpression) {
     return null;
   }
-
   const [[index, {
     expression
   }]] = Object.entries(groupByExpression);
   const visitedExpression = deleteExpressionWithNotFoundFieldsOrTypesInExpression(schema, fromType, expression);
-
   if (visitedExpression) {
     return {
       [`${parseInt(index) - removedItems}`]: {
@@ -774,19 +762,15 @@ const deleteExpressionWithNotFoundFieldsOrTypesInGroupByExpression = (schema, gr
       }
     };
   }
-
   return null;
 };
-
 const replaceIdsWithNamesInGroupByExpression = (schema, groupByExpression, fromType) => {
   if (!groupByExpression) {
     return null;
   }
-
   const [[index, {
     expression
   }]] = Object.entries(groupByExpression);
-
   if (schema.typeObjectsById.hasOwnProperty(fromType)) {
     const typeObject = schema.typeObjectsById[fromType];
     return {
@@ -795,18 +779,15 @@ const replaceIdsWithNamesInGroupByExpression = (schema, groupByExpression, fromT
       }
     };
   }
-
   return groupByExpression;
 };
 const replaceNamesWithIdsInGroupByExpression = (schema, groupByExpression, fromType) => {
   if (!groupByExpression) {
     return null;
   }
-
   const [[index, {
     expression
   }]] = Object.entries(groupByExpression);
-
   if (schema.typeObjectsByName.hasOwnProperty(fromType)) {
     const typeObject = schema.typeObjectsByName[fromType];
     return {
@@ -815,7 +796,6 @@ const replaceNamesWithIdsInGroupByExpression = (schema, groupByExpression, fromT
       }
     };
   }
-
   return groupByExpression;
 };
 const replaceNamesWithIdsInSmartFolder = (schema, smartFolder) => visitSmartFolder(smartFolder, {
@@ -861,7 +841,6 @@ const visitView$1 = (view, visitor) => immutableUpdate__default["default"](view,
     items: {
       $apply: items => items.map(item => {
         const fromType = ___default["default"].get(item, ["query", "q/from"]);
-
         return fromType ? immutableUpdate__default["default"](item, {
           query: {
             $apply: query => query ? visitor.visitQueryExpression(query) : null
@@ -889,7 +868,6 @@ const visitView$1 = (view, visitor) => immutableUpdate__default["default"](view,
     }
   }
 });
-
 const replaceNamesWithIdsInTableView = (schema, view) => visitView$1(view, {
   visitExpression: (fromType, expression) => replaceNamesWithIdsInExpression(schema, fromType, expression),
   visitQueryExpression: query => replaceNamesWithIdsInQueryExpression(schema, query)
@@ -924,29 +902,22 @@ const visitAxis = (axis, visitor) => {
   if (!axis) {
     return axis;
   }
-
   const fromType = ___default["default"].get(axis, ["query", "q/from"]);
-
   const firstOrNull = x => ___default["default"].first(x) || null;
-
   const axisResult = _extends({}, axis, {
     query: axis.query && visitor.visitQueryExpression(axis.query),
     contextExpression: visitContextExpression(fromType, axis.contextExpression, visitor),
     units: axis.units && axis.units.map(unit => visitViewUnit(fromType, unit, visitor)).filter(unit => isUnitExpressionValid(unit)),
     groupByExpression: axis.groupByExpression && firstOrNull(visitor.visitExpression(fromType, [axis.groupByExpression]))
   });
-
   if (!axisResult.query) {
     return null;
   }
-
   if (!axisResult.units) {
     delete axisResult.units;
   }
-
   return axisResult;
 };
-
 const visitView = (view, visitor) => immutableUpdate__default["default"](view, {
   "fibery/meta": {
     y: {
@@ -955,7 +926,6 @@ const visitView = (view, visitor) => immutableUpdate__default["default"](view, {
     items: {
       $apply: items => items.map(item => {
         const fromType = ___default["default"].get(item, ["query", "q/from"]);
-
         return fromType ? immutableUpdate__default["default"](item, {
           yExpression: {
             $apply: yExpression => yExpression ? visitor.visitExpression(fromType, yExpression) : yExpression
@@ -995,16 +965,17 @@ const visitView = (view, visitor) => immutableUpdate__default["default"](view, {
         if (!milestones) {
           return milestones;
         }
-
         return milestones.map(item => {
           const fromType = ___default["default"].get(item, ["query", "q/from"]);
-
           return fromType ? immutableUpdate__default["default"](item, {
             dateExpression: {
               $apply: startExpression => startExpression ? visitor.visitExpression(fromType, startExpression) : startExpression
             },
             query: {
               $apply: query => query ? visitor.visitQueryExpression(query) : null
+            },
+            contextExpression: {
+              $apply: contextExpression => visitContextExpression(fromType, contextExpression, visitor)
             }
           }) : item;
         }).filter(item => {
@@ -1017,7 +988,6 @@ const visitView = (view, visitor) => immutableUpdate__default["default"](view, {
     }
   }
 });
-
 const replaceNamesWithIdsInTimelineView = (schema, view) => {
   return visitView(view, {
     visitQueryExpression: query => replaceNamesWithIdsInQueryExpression(schema, query),
@@ -1030,27 +1000,19 @@ const replaceIdsWithNamesInTimelineView = (schema, view) => {
     visitExpression: (fromType, expression) => replaceIdsWithNamesInExpression(schema, fromType, expression)
   });
 };
-
 const ensureAxisAndItemExpressionInvariant = view => {
   const actions = [];
-
   const y = ___default["default"].get(view, ["fibery/meta", "y"]);
-
   const yQuery = ___default["default"].get(view, ["fibery/meta", "y", "query"]);
-
   const yGroupByExpression = ___default["default"].get(view, ["fibery/meta", "y", "groupByExpression"]);
-
   const items = ___default["default"].get(view, ["fibery/meta", "items"]);
-
   if (yQuery === null && yGroupByExpression !== null) {
     actions.push(() => ___default["default"].set(view, ["fibery/meta", "y", "groupByExpression"], null));
   }
-
   if (y === null) {
     const resetActions = items.map(item => () => item.yExpression = null);
     actions.push(...resetActions);
   }
-
   if (y !== null && ___default["default"].some(items, ({
     yExpression
   }) => yExpression === null)) {
@@ -1058,15 +1020,12 @@ const ensureAxisAndItemExpressionInvariant = view => {
     actions.push(...resetActions);
     actions.push(() => ___default["default"].set(view, ["fibery/meta", "y"], null));
   }
-
   if (y !== null && ___default["default"].isEmpty(items)) {
     actions.push(() => ___default["default"].set(view, ["fibery/meta", "y"], null));
   }
-
   actions.forEach(action => action());
   return view;
 };
-
 const deleteExpressionWithNotFoundFieldsOrTypesInTimelineView = (schema, view, ensureAxisInvariant = true) => {
   const viewNew = visitView(view, {
     visitQueryExpression: queryExpression => deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression(schema, queryExpression),
@@ -1098,25 +1057,22 @@ const deleteExpressionWithNotFoundFieldsOrTypesInView = (schema, view, ensureAxi
   switch (view["fibery/type"]) {
     case "board":
       return deleteExpressionWithNotFoundOrInvalidFieldsOrTypesInBoardView(schema, view, ensureAxisInvariant);
-
     case "list":
       return deleteExpressionWithNotFoundFieldsOrTypesInSmartFolder(schema, view);
-
+    case "grid":
+      return deleteExpressionWithNotFoundFieldsOrTypesInSmartFolder(schema, view);
     case "timeline":
       return deleteExpressionWithNotFoundFieldsOrTypesInTimelineView(schema, view, ensureAxisInvariant);
-
     case "calendar":
       return deleteExpressionWithNotFoundFieldsOrTypesInCalendarView(schema, view);
-
     case "table":
       return deleteExpressionWithNotFoundFieldsOrTypesInTableView(schema, view);
-
     case "feed":
       return deleteExpressionWithNotFoundFieldsOrTypesInFeedView(schema, view);
-
     case "form":
       return deleteExpressionWithNotFoundFieldsOrTypesInFormView(schema, view);
-
+    case "map":
+      return deleteExpressionWithNotFoundFieldsOrTypesInMapView(schema, view);
     default:
       return view;
   }
@@ -1125,22 +1081,20 @@ const fixUserSelectedUnits = (schema, view) => {
   switch (view["fibery/type"]) {
     case "board":
       return fixUserSelectedUnitsInBoardView(schema, view);
-
     case "list":
       return fixUserSelectedUnitsInSmartFolder(schema, view);
-
+    case "grid":
+      return fixUserSelectedUnitsInSmartFolder(schema, view);
     case "table":
       return fixUserSelectedUnitsInTableView(schema, view);
-
     case "timeline":
       return fixUserSelectedUnitsInTimelineView(schema, view);
-
     case "calendar":
       return fixUserSelectedUnitsInCalendarView(schema, view);
-
     case "feed":
       return fixUserSelectedUnitsInFeedView(schema, view);
-
+    case "map":
+      return fixUserSelectedUnitsInMapView(schema, view);
     default:
       return view;
   }
@@ -1148,66 +1102,59 @@ const fixUserSelectedUnits = (schema, view) => {
 const fixContextExpressionWithBrokenPath = (schema, view, defaultContextExpression) => {
   switch (view["fibery/type"]) {
     case "board":
-      return fixContextExpressionWithBrokenPath$6(schema, view, defaultContextExpression);
-
+      return fixContextExpressionWithBrokenPath$7(schema, view, defaultContextExpression);
     case "list":
       return fixContextExpressionWithBrokenPath$3(schema, view, defaultContextExpression);
-
+    case "grid":
+      return fixContextExpressionWithBrokenPath$3(schema, view, defaultContextExpression);
     case "table":
       return fixContextExpressionWithBrokenPath$2(schema, view, defaultContextExpression);
-
     case "timeline":
       return fixContextExpressionWithBrokenPath$1(schema, view, defaultContextExpression);
-
     case "calendar":
-      return fixContextExpressionWithBrokenPath$5(schema, view, defaultContextExpression);
-
+      return fixContextExpressionWithBrokenPath$6(schema, view, defaultContextExpression);
     case "feed":
+      return fixContextExpressionWithBrokenPath$5(schema, view, defaultContextExpression);
+    case "map":
       return fixContextExpressionWithBrokenPath$4(schema, view, defaultContextExpression);
-
     default:
       return view;
   }
 };
+
 /**
  * Removes garbage from view's meta to reduce the size.
  */
-
 const collectGarbage = (schema, view) => {
   const deleteRemoved = x => {
     if (Array.isArray(x)) {
       return x.map(deleteRemoved).filter(y => y !== REMOVE);
     }
-
     if (typeof x === "object" && x !== null) {
       let tmp = Object.entries(x);
       tmp = tmp.map(e => [e[0], deleteRemoved(e[1])]);
       tmp = tmp.filter(e => e[1] !== REMOVE);
       return Object.fromEntries(tmp);
     }
-
     return x;
   };
-
   switch (view["fibery/type"]) {
     case "board":
-      return deleteRemoved(collectGarbage$6(view));
-
+      return deleteRemoved(collectGarbage$7(view));
     case "list":
       return deleteRemoved(collectGarbage$3(view));
-
+    case "grid":
+      return deleteRemoved(collectGarbage$3(view));
     case "table":
       return deleteRemoved(collectGarbage$2(view));
-
     case "timeline":
       return deleteRemoved(collectGarbage$1(view));
-
     case "calendar":
-      return deleteRemoved(collectGarbage$5(view));
-
+      return deleteRemoved(collectGarbage$6(view));
     case "feed":
+      return deleteRemoved(collectGarbage$5(view));
+    case "map":
       return deleteRemoved(collectGarbage$4(view));
-
     default:
       return view;
   }
@@ -1216,25 +1163,22 @@ const replaceNamesWithIdsInView = (schema, view) => {
   switch (view["fibery/type"]) {
     case "board":
       return replaceNamesWithIdsInBoardView(schema, view);
-
     case "list":
       return replaceNamesWithIdsInSmartFolder(schema, view);
-
+    case "grid":
+      return replaceNamesWithIdsInSmartFolder(schema, view);
     case "table":
       return replaceNamesWithIdsInTableView(schema, view);
-
     case "timeline":
       return replaceNamesWithIdsInTimelineView(schema, view);
-
     case "calendar":
       return replaceNamesWithIdsInCalendarView(schema, view);
-
     case "feed":
       return replaceNamesWithIdsInFeedView(schema, view);
-
     case "form":
       return replaceNamesWithIdsInFormView(schema, view);
-
+    case "map":
+      return replaceNamesWithIdsInMapView(schema, view);
     default:
       return view;
   }
@@ -1243,25 +1187,22 @@ const replaceIdsWithNamesInView = (schema, view) => {
   switch (view["fibery/type"]) {
     case "board":
       return replaceIdsWithNamesInBoardView(schema, view);
-
     case "list":
       return replaceIdsWithNamesInSmartFolder(schema, view);
-
+    case "grid":
+      return replaceIdsWithNamesInSmartFolder(schema, view);
     case "table":
       return replaceIdsWithNamesInTableView(schema, view);
-
     case "timeline":
       return replaceIdsWithNamesInTimelineView(schema, view);
-
     case "calendar":
       return replaceIdsWithNamesInCalendarView(schema, view);
-
     case "feed":
       return replaceIdsWithNamesInFeedView(schema, view);
-
     case "form":
       return replaceIdsWithNamesInFormView(schema, view);
-
+    case "map":
+      return replaceIdsWithNamesInMapView(schema, view);
     default:
       return view;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fibery/views",
-  "version": "1.1.14",
+  "version": "1.1.16",
   "description": "Operations on view objects",
   "license": "UNLICENSED",
   "author": "Fibery",
@@ -10,13 +10,16 @@
     "/lib"
   ],
   "private": false,
-  "dependencies": {},
   "devDependencies": {
-    "@babel/core": "7.15.0",
+    "@babel/core": "7.20.5",
     "@fibery/babel-preset": "7.2.0",
-    "@fibery/eslint-config": "8.2.0",
+    "@fibery/eslint-config": "workspace:*",
+    "@fibery/expression-utils": "workspace:*",
+    "@fibery/schema": "workspace:*",
+    "immutability-helper": "2.4.0",
     "jest": "27.5.1",
     "jest-junit": "13.0.0",
+    "lodash": "4.17.21",
     "microbundle": "0.15.0"
   },
   "peerDependencies": {
@@ -28,7 +31,8 @@
   "scripts": {
     "build": "rm -rf lib && microbundle 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",
+    "test:ci": "yarn test --reporters=default --reporters=jest-junit",
+    "test:coverage": "yarn test --coverage --coverageDirectory=${JEST_COVERAGE_RESULT_DIR:-$(pwd)}/coverage/view  --reporters=default --reporters=jest-junit",
     "lint": "eslint ."
   },
   "jest": {