@fibery/expression-utils 6.0.1 → 8.0.0

package/lib/expression-utils.js

@@ -262,7 +262,7 @@ const collectFieldExpressions = (memo, expression) => {
         }
       }
     }
-  } else if (isFieldExpression(expression)) {
+  } else if (isFieldExpression(expression) || isMultiFieldExpression(expression)) {
     memo.push(expression);
   } else if (expression["q/from"] && isFieldExpression(expression["q/from"])) {
     const innerMemo = [];
@@ -275,6 +275,12 @@ const collectFieldExpressions = (memo, expression) => {
     throw new NotImplementedError(expression, "expression");
   }
 };
+
+/** @deprecated
+ * This method checks few expression forms, that we do not generate on frontend anymore(field-access shortcut, direct value as parameter).
+ * I'm afraid to replace it with implementation based on visitor everywhere, as visitors don't allow such expression forms and I don't want to extend visitor with those forms.
+ * If you need this method in new places, consider implementing same logic on visitors and use it.
+ **/
 const extractFieldExpressions = expression => {
   const memo = [];
   collectFieldExpressions(memo, expression);
@@ -287,7 +293,6 @@ const createExpressionVisitor = visitor => {
     visitFunctionCallExpression: ([fnName, ...args]) => [fnName, ...args.map(x => visitorWithDefault.visitExpression(x))],
     visitFromRootFieldExpression: ([fromRootKeyword, ...rest]) => [fromRootKeyword, ...rest.map(x => visitorWithDefault.visitExpression(x))],
     visitFieldExpression: expression => expression,
-    visitMultiFieldExpression: expression => expression,
     visitOrderByExpression: orderByExpression => orderByExpression.map(x => {
       const [fieldExpression, orderDir] = x;
       const fieldExpressionNew = visitorWithDefault.visitExpression(fieldExpression);
@@ -325,10 +330,8 @@ const createExpressionVisitor = visitor => {
         return visitorWithDefault.visitFromRootFieldExpression(expression, visitorDefault);
       } else if (isFunctionCallExpression(expression)) {
         return visitorWithDefault.visitFunctionCallExpression(expression, visitorDefault);
-      } else if (isFieldExpression(expression)) {
+      } else if (isFieldExpression(expression) || isMultiFieldExpression(expression)) {
         return visitorWithDefault.visitFieldExpression(expression, visitorDefault);
-      } else if (isMultiFieldExpression(expression)) {
-        return visitorWithDefault.visitMultiFieldExpression(expression, visitorDefault);
       } else if (isQueryExpression(expression)) {
         return visitorWithDefault.visitQueryExpression(expression, visitorDefault);
       } else {
@@ -360,6 +363,7 @@ var utils = {
   isBinaryExpression: isBinaryExpression,
   isNaryExpression: isNaryExpression,
   isVariableExpression: isVariableExpression,
+  isMultiFieldAccess: isMultiFieldAccess,
   isMultiFieldExpression: isMultiFieldExpression,
   isFieldExpression: isFieldExpression,
   isQueryExpression: isQueryExpression,
@@ -384,7 +388,24 @@ const visitFieldExpressionForReplaceIdsWithNamesVisitor = ({
   currentTypeObject,
   fieldExpressionInNamesTerms
 }, fieldId) => {
-  if (currentTypeObject && currentTypeObject.fieldObjectsById.hasOwnProperty(fieldId)) {
+  if (currentTypeObject && isMultiFieldAccess(fieldId) && currentTypeObject.fieldObjectsById.hasOwnProperty(fieldId[0])) {
+    var _fieldObject$multiRel;
+    const typeId = fieldId[1];
+    const fieldObject = currentTypeObject.fieldObjectsById[fieldId[0]];
+    const nextTypeObject = (_fieldObject$multiRel = fieldObject.multiRelatedFieldObjects.find(f => f.holderTypeObject.id === typeId)) == null ? void 0 : _fieldObject$multiRel.holderTypeObject;
+    if (!nextTypeObject) {
+      return onFieldNotFound({
+        currentTypeObject,
+        fieldExpressionInNamesTerms,
+        fieldId: fieldId,
+        expression
+      });
+    }
+    return {
+      currentTypeObject: nextTypeObject,
+      fieldExpressionInNamesTerms: [...fieldExpressionInNamesTerms, [fieldObject.name, nextTypeObject.name]]
+    };
+  } else if (currentTypeObject && currentTypeObject.fieldObjectsById.hasOwnProperty(fieldId)) {
     const fieldObject = currentTypeObject.fieldObjectsById[fieldId];
     return {
       currentTypeObject: fieldObject.typeObject,
@@ -459,7 +480,24 @@ const visitFieldExpressionForReplaceNamesWithIdsVisitor = ({
   currentTypeObject,
   fieldExpressionInIdsTerms
 }, field) => {
-  if (currentTypeObject && currentTypeObject.fieldObjectsByName.hasOwnProperty(field)) {
+  if (currentTypeObject && isMultiFieldAccess(field) && currentTypeObject.fieldObjectsByName.hasOwnProperty(field[0])) {
+    var _fieldObject$multiRel2;
+    const type = field[1];
+    const fieldObject = currentTypeObject.fieldObjectsByName[field[0]];
+    const nextTypeObject = (_fieldObject$multiRel2 = fieldObject.multiRelatedFieldObjects.find(f => f.holderType === type)) == null ? void 0 : _fieldObject$multiRel2.holderTypeObject;
+    if (!nextTypeObject) {
+      return onFieldNotFound({
+        currentTypeObject,
+        fieldExpressionInIdsTerms,
+        field,
+        expression
+      });
+    }
+    return {
+      currentTypeObject: nextTypeObject,
+      fieldExpressionInIdsTerms: [...fieldExpressionInIdsTerms, [fieldObject.id, nextTypeObject.id]]
+    };
+  } else if (currentTypeObject && currentTypeObject.fieldObjectsByName.hasOwnProperty(field)) {
     const fieldObject = currentTypeObject.fieldObjectsByName[field];
     return {
       currentTypeObject: fieldObject.typeObject,
@@ -531,7 +569,22 @@ const deleteExpressionsWithNotFoundFieldsVisitor = typeObject => {
       }
     },
     visitFieldExpression: expression => {
-      const fieldTypeObject = expression.reduce((holderTypeObject, field) => holderTypeObject && holderTypeObject.fieldObjectsByName.hasOwnProperty(field) ? holderTypeObject.fieldObjectsByName[field].typeObject : null, typeObject);
+      const fieldTypeObject = expression.reduce((holderTypeObject, field) => {
+        if (holderTypeObject && isMultiFieldAccess(field) && holderTypeObject.fieldObjectsByName.hasOwnProperty(field[0])) {
+          var _fieldObject$multiRel3;
+          const type = field[1];
+          const fieldObject = holderTypeObject.fieldObjectsByName[field[0]];
+          const nextTypeObject = (_fieldObject$multiRel3 = fieldObject.multiRelatedFieldObjects.find(f => f.holderType === type)) == null ? void 0 : _fieldObject$multiRel3.holderTypeObject;
+          if (!nextTypeObject) {
+            return null;
+          }
+          return nextTypeObject;
+        } else if (holderTypeObject && holderTypeObject.fieldObjectsByName.hasOwnProperty(field)) {
+          return holderTypeObject.fieldObjectsByName[field].typeObject;
+        } else {
+          return null;
+        }
+      }, typeObject);
       return fieldTypeObject && expression;
     },
     visitOrderByExpression: orderByExpression => {
@@ -611,8 +664,22 @@ const getFieldAccessExpressionTypeObject = ({
   const reduced = expression.reduce(({
     currentTypeObject
   }, fieldId, index) => {
-    const fieldObject = currentTypeObject && currentTypeObject.fieldObjects.find(f => f.id === fieldId);
-    if (fieldObject) {
+    if (currentTypeObject && isMultiFieldAccess(fieldId) && currentTypeObject.fieldObjectsById.hasOwnProperty(fieldId[0])) {
+      var _fieldObject$multiRel4;
+      const typeId = fieldId[1];
+      const fieldObject = currentTypeObject.fieldObjectsById[fieldId[0]];
+      const nextTypeObject = (_fieldObject$multiRel4 = fieldObject.multiRelatedFieldObjects.find(f => f.holderTypeObject.id === typeId)) == null ? void 0 : _fieldObject$multiRel4.holderTypeObject;
+      if (!nextTypeObject) {
+        return onFieldNotFound({
+          currentTypeObject,
+          fieldId
+        });
+      }
+      return {
+        currentTypeObject: nextTypeObject
+      };
+    } else if (currentTypeObject && currentTypeObject.fieldObjectsById.hasOwnProperty(fieldId)) {
+      const fieldObject = currentTypeObject.fieldObjectsById[fieldId];
       if (returnRefTypeInsteadOfId && index === expression.length - 1 && fieldObject.isId) {
         return {
           currentTypeObject

package/lib/utils.js

@@ -74,7 +74,7 @@ const collectFieldExpressions = (memo, expression) => {
         }
       }
     }
-  } else if (isFieldExpression(expression)) {
+  } else if (isFieldExpression(expression) || isMultiFieldExpression(expression)) {
     memo.push(expression);
   } else if (expression["q/from"] && isFieldExpression(expression["q/from"])) {
     const innerMemo = [];
@@ -87,6 +87,12 @@ const collectFieldExpressions = (memo, expression) => {
     throw new NotImplementedError(expression, "expression");
   }
 };
+
+/** @deprecated
+ * This method checks few expression forms, that we do not generate on frontend anymore(field-access shortcut, direct value as parameter).
+ * I'm afraid to replace it with implementation based on visitor everywhere, as visitors don't allow such expression forms and I don't want to extend visitor with those forms.
+ * If you need this method in new places, consider implementing same logic on visitors and use it.
+ **/
 const extractFieldExpressions = expression => {
   const memo = [];
   collectFieldExpressions(memo, expression);
@@ -99,7 +105,6 @@ const createExpressionVisitor = visitor => {
     visitFunctionCallExpression: ([fnName, ...args]) => [fnName, ...args.map(x => visitorWithDefault.visitExpression(x))],
     visitFromRootFieldExpression: ([fromRootKeyword, ...rest]) => [fromRootKeyword, ...rest.map(x => visitorWithDefault.visitExpression(x))],
     visitFieldExpression: expression => expression,
-    visitMultiFieldExpression: expression => expression,
     visitOrderByExpression: orderByExpression => orderByExpression.map(x => {
       const [fieldExpression, orderDir] = x;
       const fieldExpressionNew = visitorWithDefault.visitExpression(fieldExpression);
@@ -137,10 +142,8 @@ const createExpressionVisitor = visitor => {
         return visitorWithDefault.visitFromRootFieldExpression(expression, visitorDefault);
       } else if (isFunctionCallExpression(expression)) {
         return visitorWithDefault.visitFunctionCallExpression(expression, visitorDefault);
-      } else if (isFieldExpression(expression)) {
+      } else if (isFieldExpression(expression) || isMultiFieldExpression(expression)) {
         return visitorWithDefault.visitFieldExpression(expression, visitorDefault);
-      } else if (isMultiFieldExpression(expression)) {
-        return visitorWithDefault.visitMultiFieldExpression(expression, visitorDefault);
       } else if (isQueryExpression(expression)) {
         return visitorWithDefault.visitQueryExpression(expression, visitorDefault);
       } else {
@@ -168,6 +171,7 @@ exports.isDateRangeFunctionExpression = isDateRangeFunctionExpression;
 exports.isFieldExpression = isFieldExpression;
 exports.isFromRootFieldExpression = isFromRootFieldExpression;
 exports.isFunctionCallExpression = isFunctionCallExpression;
+exports.isMultiFieldAccess = isMultiFieldAccess;
 exports.isMultiFieldExpression = isMultiFieldExpression;
 exports.isNaryExpression = isNaryExpression;
 exports.isQueryExpression = isQueryExpression;

package/lib/visitors.js

@@ -53,7 +53,6 @@ const createExpressionVisitor = visitor => {
     visitFunctionCallExpression: ([fnName, ...args]) => [fnName, ...args.map(x => visitorWithDefault.visitExpression(x))],
     visitFromRootFieldExpression: ([fromRootKeyword, ...rest]) => [fromRootKeyword, ...rest.map(x => visitorWithDefault.visitExpression(x))],
     visitFieldExpression: expression => expression,
-    visitMultiFieldExpression: expression => expression,
     visitOrderByExpression: orderByExpression => orderByExpression.map(x => {
       const [fieldExpression, orderDir] = x;
       const fieldExpressionNew = visitorWithDefault.visitExpression(fieldExpression);
@@ -91,10 +90,8 @@ const createExpressionVisitor = visitor => {
         return visitorWithDefault.visitFromRootFieldExpression(expression, visitorDefault);
       } else if (isFunctionCallExpression(expression)) {
         return visitorWithDefault.visitFunctionCallExpression(expression, visitorDefault);
-      } else if (isFieldExpression(expression)) {
+      } else if (isFieldExpression(expression) || isMultiFieldExpression(expression)) {
         return visitorWithDefault.visitFieldExpression(expression, visitorDefault);
-      } else if (isMultiFieldExpression(expression)) {
-        return visitorWithDefault.visitMultiFieldExpression(expression, visitorDefault);
       } else if (isQueryExpression(expression)) {
         return visitorWithDefault.visitQueryExpression(expression, visitorDefault);
       } else {
@@ -126,7 +123,24 @@ const visitFieldExpressionForReplaceIdsWithNamesVisitor = ({
   currentTypeObject,
   fieldExpressionInNamesTerms
 }, fieldId) => {
-  if (currentTypeObject && currentTypeObject.fieldObjectsById.hasOwnProperty(fieldId)) {
+  if (currentTypeObject && isMultiFieldAccess(fieldId) && currentTypeObject.fieldObjectsById.hasOwnProperty(fieldId[0])) {
+    var _fieldObject$multiRel;
+    const typeId = fieldId[1];
+    const fieldObject = currentTypeObject.fieldObjectsById[fieldId[0]];
+    const nextTypeObject = (_fieldObject$multiRel = fieldObject.multiRelatedFieldObjects.find(f => f.holderTypeObject.id === typeId)) == null ? void 0 : _fieldObject$multiRel.holderTypeObject;
+    if (!nextTypeObject) {
+      return onFieldNotFound({
+        currentTypeObject,
+        fieldExpressionInNamesTerms,
+        fieldId: fieldId,
+        expression
+      });
+    }
+    return {
+      currentTypeObject: nextTypeObject,
+      fieldExpressionInNamesTerms: [...fieldExpressionInNamesTerms, [fieldObject.name, nextTypeObject.name]]
+    };
+  } else if (currentTypeObject && currentTypeObject.fieldObjectsById.hasOwnProperty(fieldId)) {
     const fieldObject = currentTypeObject.fieldObjectsById[fieldId];
     return {
       currentTypeObject: fieldObject.typeObject,
@@ -201,7 +215,24 @@ const visitFieldExpressionForReplaceNamesWithIdsVisitor = ({
   currentTypeObject,
   fieldExpressionInIdsTerms
 }, field) => {
-  if (currentTypeObject && currentTypeObject.fieldObjectsByName.hasOwnProperty(field)) {
+  if (currentTypeObject && isMultiFieldAccess(field) && currentTypeObject.fieldObjectsByName.hasOwnProperty(field[0])) {
+    var _fieldObject$multiRel2;
+    const type = field[1];
+    const fieldObject = currentTypeObject.fieldObjectsByName[field[0]];
+    const nextTypeObject = (_fieldObject$multiRel2 = fieldObject.multiRelatedFieldObjects.find(f => f.holderType === type)) == null ? void 0 : _fieldObject$multiRel2.holderTypeObject;
+    if (!nextTypeObject) {
+      return onFieldNotFound({
+        currentTypeObject,
+        fieldExpressionInIdsTerms,
+        field,
+        expression
+      });
+    }
+    return {
+      currentTypeObject: nextTypeObject,
+      fieldExpressionInIdsTerms: [...fieldExpressionInIdsTerms, [fieldObject.id, nextTypeObject.id]]
+    };
+  } else if (currentTypeObject && currentTypeObject.fieldObjectsByName.hasOwnProperty(field)) {
     const fieldObject = currentTypeObject.fieldObjectsByName[field];
     return {
       currentTypeObject: fieldObject.typeObject,
@@ -273,7 +304,22 @@ const deleteExpressionsWithNotFoundFieldsVisitor = typeObject => {
       }
     },
     visitFieldExpression: expression => {
-      const fieldTypeObject = expression.reduce((holderTypeObject, field) => holderTypeObject && holderTypeObject.fieldObjectsByName.hasOwnProperty(field) ? holderTypeObject.fieldObjectsByName[field].typeObject : null, typeObject);
+      const fieldTypeObject = expression.reduce((holderTypeObject, field) => {
+        if (holderTypeObject && isMultiFieldAccess(field) && holderTypeObject.fieldObjectsByName.hasOwnProperty(field[0])) {
+          var _fieldObject$multiRel3;
+          const type = field[1];
+          const fieldObject = holderTypeObject.fieldObjectsByName[field[0]];
+          const nextTypeObject = (_fieldObject$multiRel3 = fieldObject.multiRelatedFieldObjects.find(f => f.holderType === type)) == null ? void 0 : _fieldObject$multiRel3.holderTypeObject;
+          if (!nextTypeObject) {
+            return null;
+          }
+          return nextTypeObject;
+        } else if (holderTypeObject && holderTypeObject.fieldObjectsByName.hasOwnProperty(field)) {
+          return holderTypeObject.fieldObjectsByName[field].typeObject;
+        } else {
+          return null;
+        }
+      }, typeObject);
       return fieldTypeObject && expression;
     },
     visitOrderByExpression: orderByExpression => {
@@ -353,8 +399,22 @@ const getFieldAccessExpressionTypeObject = ({
   const reduced = expression.reduce(({
     currentTypeObject
   }, fieldId, index) => {
-    const fieldObject = currentTypeObject && currentTypeObject.fieldObjects.find(f => f.id === fieldId);
-    if (fieldObject) {
+    if (currentTypeObject && isMultiFieldAccess(fieldId) && currentTypeObject.fieldObjectsById.hasOwnProperty(fieldId[0])) {
+      var _fieldObject$multiRel4;
+      const typeId = fieldId[1];
+      const fieldObject = currentTypeObject.fieldObjectsById[fieldId[0]];
+      const nextTypeObject = (_fieldObject$multiRel4 = fieldObject.multiRelatedFieldObjects.find(f => f.holderTypeObject.id === typeId)) == null ? void 0 : _fieldObject$multiRel4.holderTypeObject;
+      if (!nextTypeObject) {
+        return onFieldNotFound({
+          currentTypeObject,
+          fieldId
+        });
+      }
+      return {
+        currentTypeObject: nextTypeObject
+      };
+    } else if (currentTypeObject && currentTypeObject.fieldObjectsById.hasOwnProperty(fieldId)) {
+      const fieldObject = currentTypeObject.fieldObjectsById[fieldId];
       if (returnRefTypeInsteadOfId && index === expression.length - 1 && fieldObject.isId) {
         return {
           currentTypeObject

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fibery/expression-utils",
-  "version": "6.0.1",
+  "version": "8.0.0",
   "description": "utils for working with fibery api expressions",
   "exports": {
     ".": "./lib/expression-utils.js",
@@ -38,7 +38,7 @@
     "@fibery/eslint-config": "8.5.1"
   },
   "peerDependencies": {
-    "@fibery/schema": "10.0.1"
+    "@fibery/schema": "10.1.0"
   },
   "jest": {
     "testEnvironment": "node",