@fibery/views 10.6.0 → 10.6.1

package/lib/views.js

@@ -126,6 +126,63 @@ const isUnitExpressionValid = unit => {
   }
   return true;
 };
+const getFieldObjectsById = (smartFolder, schema) => {
+  const types = smartFolder["fibery/meta"].items.map(item => item.query["q/from"]);
+  return types.reduce((acc, type) => {
+    if (!(type in schema.typeObjectsById)) {
+      return acc;
+    }
+    const fieldObjects = schema.typeObjectsById[type].fieldObjectsById;
+    return {
+      ...acc,
+      ...fieldObjects
+    };
+  }, {});
+};
+const replaceIdsWithNamesInUnitGroupKey = (unitGroupKey, fieldObjectsById) => {
+  const keyParts = unitGroupKey.split("|");
+  return keyParts.map(keyPart => {
+    const [unitType, ...rest] = keyPart.split("_");
+    if (unitType === "user-button") {
+      return keyPart;
+    }
+    const fieldId = rest.join("_");
+    if (!fieldId) {
+      return keyPart;
+    }
+    const fieldObject = fieldObjectsById[fieldId];
+    if (!fieldObject) {
+      return keyPart;
+    }
+    return `${unitType}_${fieldObject.holderType}:${fieldObject.name}`;
+  }).filter(Boolean).join("|");
+};
+const replaceNamesWithIdsInUnitGroupKey = (unitGroupKey, schema) => {
+  const keyParts = unitGroupKey.split("|");
+  return keyParts.map(keyPart => {
+    const [unitType, ...rest] = keyPart.split("_");
+    if (unitType === "user-button") {
+      return keyPart;
+    }
+    const name = rest.join("_");
+    if (!name) {
+      return keyPart;
+    }
+    const [type, field] = name.split(":");
+    if (!field) {
+      return keyPart;
+    }
+    if (!(type in schema.typeObjectsByName)) {
+      return keyPart;
+    }
+    const typeObject = schema.typeObjectsByName[type];
+    if (!(field in typeObject.fieldObjectsByName)) {
+      return keyPart;
+    }
+    const fieldObject = typeObject.fieldObjectsByName[field];
+    return `${unitType}_${fieldObject.id}`;
+  }).filter(Boolean).join("|");
+};
 
 const getField = (schema, fromType, field) => Object.hasOwn(schema.typeObjectsByName, fromType) && Object.hasOwn(schema.typeObjectsByName[fromType].fieldObjectsByName, field) ? schema.typeObjectsByName[fromType].fieldObjectsByName[field] : undefined;
 const getFieldType = (schema, fromType, field) => {
@@ -1012,66 +1069,13 @@ const replaceNamesWithIdsInSmartFolder = (schema, smartFolder) => visitSmartFold
   visitQueryExpression: query => replaceNamesWithIdsInQueryExpression(schema, query),
   visitGroupByExpression: (groupBy, fromType) => replaceNamesWithIdsInGroupByExpression(schema, groupBy, fromType, Object.keys(groupBy).map(() => 0)),
   visitExpression: (fromType, expression) => replaceNamesWithIdsInExpression(schema, fromType, expression),
-  visitUnitGroupKey: unitGroupKey => {
-    const keyParts = unitGroupKey.split("|");
-    return keyParts.map(keyPart => {
-      const [unitType, ...rest] = keyPart.split("_");
-      if (unitType === "user-button") {
-        return keyPart;
-      }
-      const name = rest.join("_");
-      if (!name) {
-        return keyPart;
-      }
-      const [type, field] = name.split(":");
-      if (!field) {
-        return keyPart;
-      }
-      if (!(type in schema.typeObjectsByName)) {
-        return keyPart;
-      }
-      const typeObject = schema.typeObjectsByName[type];
-      if (!(field in typeObject.fieldObjectsByName)) {
-        return keyPart;
-      }
-      const fieldObject = typeObject.fieldObjectsByName[field];
-      return `${unitType}_${fieldObject.id}`;
-    }).filter(Boolean).join("|");
-  }
+  visitUnitGroupKey: unitGroupKey => replaceNamesWithIdsInUnitGroupKey(unitGroupKey, schema)
 });
 const replaceIdsWithNamesInSmartFolder = (schema, smartFolder) => visitSmartFolder(smartFolder, {
   visitQueryExpression: query => replaceIdsWithNamesInQueryExpression(schema, query),
   visitGroupByExpression: (groupBy, fromType) => replaceIdsWithNamesInGroupByExpression(schema, groupBy, fromType, Object.keys(groupBy).map(() => 0)),
   visitExpression: (fromType, expression) => replaceIdsWithNamesInExpression(schema, fromType, expression),
-  visitUnitGroupKey: unitGroupKey => {
-    const types = smartFolder["fibery/meta"].items.map(item => item.query["q/from"]);
-    const fieldObjectsById = types.reduce((acc, type) => {
-      if (!(type in schema.typeObjectsById)) {
-        return acc;
-      }
-      const fieldObjects = schema.typeObjectsById[type].fieldObjectsById;
-      return {
-        ...acc,
-        ...fieldObjects
-      };
-    }, {});
-    const keyParts = unitGroupKey.split("|");
-    return keyParts.map(keyPart => {
-      const [unitType, ...rest] = keyPart.split("_");
-      if (unitType === "user-button") {
-        return keyPart;
-      }
-      const fieldId = rest.join("_");
-      if (!fieldId) {
-        return keyPart;
-      }
-      const fieldObject = fieldObjectsById[fieldId];
-      if (!fieldObject) {
-        return keyPart;
-      }
-      return `${unitType}_${fieldObject.holderType}:${fieldObject.name}`;
-    }).filter(Boolean).join("|");
-  }
+  visitUnitGroupKey: unitGroupKey => replaceIdsWithNamesInUnitGroupKey(unitGroupKey, getFieldObjectsById(smartFolder, schema))
 });
 const deleteExpressionWithNotFoundFieldsOrTypesInSmartFolder = (schema, smartFolder) => visitSmartFolder(smartFolder, {
   visitQueryExpression: query => deleteExpressionWithNotFoundFieldsOrTypesInQueryExpression(schema, query),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fibery/views",
-  "version": "10.6.0",
+  "version": "10.6.1",
   "description": "Operations on view objects",
   "license": "UNLICENSED",
   "author": "Fibery",
@@ -19,9 +19,9 @@
     "lodash": "4.17.21",
     "microbundle": "0.15.1",
     "@fibery/babel-preset": "7.4.0",
+    "@fibery/expression-utils": "9.0.5",
     "@fibery/eslint-config": "8.6.0",
-    "@fibery/schema": "10.2.1",
-    "@fibery/expression-utils": "9.0.5"
+    "@fibery/schema": "10.2.1"
   },
   "peerDependencies": {
     "@fibery/expression-utils": "^9.0.5",