@fibery/expression-utils 9.0.1 → 9.0.3

package/index.js

@@ -0,0 +1,6 @@
+import * as paramsPlaceholders from "./paramsPlaceholders";
+import * as utils from "./utils";
+import * as visitors from "./visitors";
+import * as contextVariables from "./contextVariables";
+
+export {utils, visitors, paramsPlaceholders, contextVariables};

package/lib/expression-utils.js

@@ -371,6 +371,131 @@ var utils = {
   createExpressionVisitor: createExpressionVisitor
 };
 
+const visitFieldExpression = ({
+  expression: fieldExpression,
+  typeObject: initialTypeObject,
+  onField,
+  onFieldNotFound
+}) => fieldExpression.reduce(({
+  typeObject,
+  expression
+}, fieldAccess) => {
+  if (typeObject && isMultiFieldAccess(fieldAccess) && typeObject.fieldObjectsById.hasOwnProperty(fieldAccess[0])) {
+    var _fieldObject$multiRel;
+    const typeId = fieldAccess[1];
+    const fieldObject = typeObject.fieldObjectsById[fieldAccess[0]];
+    const nextTypeObject = (_fieldObject$multiRel = fieldObject.multiRelatedFieldObjects.find(f => f.holderTypeObject.id === typeId)) == null ? void 0 : _fieldObject$multiRel.holderTypeObject;
+    if (!nextTypeObject) {
+      const notFoundResult = onFieldNotFound({
+        currentTypeObject: typeObject,
+        expression: fieldExpression,
+        fieldAccess
+      });
+      return notFoundResult ? {
+        typeObject: notFoundResult.typeObject,
+        expression: [...expression, notFoundResult.fieldAccess]
+      } : {
+        typeObject,
+        expression
+      };
+    }
+    const onFieldResult = onField({
+      fieldAccess,
+      fieldObject,
+      typeObject: nextTypeObject
+    });
+    return onFieldResult ? {
+      typeObject: onFieldResult.typeObject,
+      expression: [...expression, onFieldResult.fieldAccess]
+    } : {
+      typeObject,
+      expression
+    };
+  } else if (typeObject && typeObject.fieldObjectsById.hasOwnProperty(fieldAccess)) {
+    const fieldObject = typeObject.fieldObjectsById[fieldAccess];
+    const onFieldResult = onField({
+      fieldAccess,
+      fieldObject,
+      typeObject: fieldObject.typeObject
+    });
+    return onFieldResult ? {
+      typeObject: onFieldResult.typeObject,
+      expression: [...expression, onFieldResult.fieldAccess]
+    } : {
+      typeObject,
+      expression
+    };
+  } else {
+    const notFoundResult = onFieldNotFound({
+      currentTypeObject: typeObject,
+      expression: fieldExpression,
+      fieldAccess
+    });
+    return notFoundResult ? {
+      typeObject: notFoundResult.typeObject,
+      expression: [...expression, notFoundResult.fieldAccess]
+    } : {
+      typeObject,
+      expression
+    };
+  }
+}, {
+  typeObject: initialTypeObject,
+  expression: []
+});
+const defaultOnFieldNotFound = () => undefined;
+const defaultOnField = () => undefined;
+const fieldAccessVisitorTypeAware = ({
+  typeObject,
+  onField = defaultOnField,
+  onFieldNotFound = defaultOnFieldNotFound
+}) => {
+  const visitor = createExpressionVisitor({
+    visitFieldExpression: expression => visitFieldExpression({
+      typeObject,
+      expression,
+      onField,
+      onFieldNotFound
+    }).expression,
+    visitQueryExpression: subQueryExpression => {
+      const {
+        "q/from": fromExpression,
+        "q/select": selectExpression,
+        "q/where": whereExpression,
+        "q/order-by": orderByExpression
+      } = subQueryExpression;
+      const fromVisitResult = visitFieldExpression({
+        typeObject,
+        expression: fromExpression,
+        onField,
+        onFieldNotFound
+      });
+      if (fromVisitResult != null && fromVisitResult.typeObject) {
+        const subQueryVisitor = fieldAccessVisitorTypeAware({
+          typeObject: fromVisitResult == null ? void 0 : fromVisitResult.typeObject,
+          onField,
+          onFieldNotFound
+        });
+        return {
+          ...subQueryExpression,
+          ...{
+            "q/from": fromVisitResult.expression,
+            "q/select": ___default["default"].isPlainObject(selectExpression) ? ___default["default"].mapValues(selectExpression, val => subQueryVisitor.visitExpression(val)) : subQueryVisitor.visitExpression(selectExpression)
+          },
+          ...(whereExpression ? {
+            "q/where": subQueryVisitor.visitExpression(whereExpression)
+          } : null),
+          ...(orderByExpression ? {
+            "q/order-by": subQueryVisitor.visitOrderByExpression(orderByExpression)
+          } : null)
+        };
+      }
+      return subQueryExpression;
+    }
+  });
+  return visitor;
+};
+
 const defaultIdsWithNamesOnFieldNotFound = ({
   fieldExpressionInNamesTerms,
   fieldId
@@ -423,13 +548,9 @@ const visitFieldExpressionForReplaceIdsWithNamesVisitor = ({
   currentTypeObject: typeObject,
   fieldExpressionInNamesTerms: []
 });
-const replaceIdsWithNamesVisitor = (typeObject, onFieldNotFound = defaultIdsWithNamesOnFieldNotFound) => {
+const fieldExpressionVisitor = (typeObject, visitFieldExpression, replacedExpressionKey = "replacedExpression") => {
   const visitor = createExpressionVisitor({
-    visitFieldExpression: expression => visitFieldExpressionForReplaceIdsWithNamesVisitor({
-      expression,
-      typeObject,
-      onFieldNotFound
-    }).fieldExpressionInNamesTerms,
+    visitFieldExpression: expression => visitFieldExpression(typeObject, expression)[replacedExpressionKey],
     visitQueryExpression: subQueryExpression => {
       const {
         "q/from": fromExpression,
@@ -437,13 +558,9 @@ const replaceIdsWithNamesVisitor = (typeObject, onFieldNotFound = defaultIdsWith
         "q/where": whereExpression,
         "q/order-by": orderByExpression
       } = subQueryExpression;
-      const subQueryTypeObject = visitFieldExpressionForReplaceIdsWithNamesVisitor({
-        expression: fromExpression,
-        onFieldNotFound,
-        typeObject
-      }).currentTypeObject;
+      const subQueryTypeObject = visitFieldExpression(typeObject, fromExpression).currentTypeObject;
       if (subQueryTypeObject) {
-        const subQueryVisitor = replaceIdsWithNamesVisitor(subQueryTypeObject, onFieldNotFound);
+        const subQueryVisitor = fieldExpressionVisitor(subQueryTypeObject, visitFieldExpression, replacedExpressionKey);
         return {
           ...subQueryExpression,
           ...{
@@ -463,6 +580,13 @@ const replaceIdsWithNamesVisitor = (typeObject, onFieldNotFound = defaultIdsWith
   });
   return visitor;
 };
+const replaceIdsWithNamesVisitor = (typeObject, onFieldNotFound = defaultIdsWithNamesOnFieldNotFound) => {
+  return fieldExpressionVisitor(typeObject, (typeObject, expression) => visitFieldExpressionForReplaceIdsWithNamesVisitor({
+    expression,
+    typeObject,
+    onFieldNotFound
+  }), "fieldExpressionInNamesTerms");
+};
 const defaultNamesWithIdsOnFieldNotFound = ({
   fieldExpressionInIdsTerms,
   field
@@ -474,8 +598,8 @@ const defaultNamesWithIdsOnFieldNotFound = ({
 };
 const visitFieldExpressionForReplaceNamesWithIdsVisitor = ({
   expression,
-  onFieldNotFound,
-  typeObject
+  typeObject,
+  onFieldNotFound
 }) => expression.reduce(({
   currentTypeObject,
   fieldExpressionInIdsTerms
@@ -516,44 +640,11 @@ const visitFieldExpressionForReplaceNamesWithIdsVisitor = ({
   fieldExpressionInIdsTerms: []
 });
 const replaceNamesWithIdsVisitor = (typeObject, onFieldNotFound = defaultNamesWithIdsOnFieldNotFound) => {
-  const visitor = createExpressionVisitor({
-    visitFieldExpression: expression => visitFieldExpressionForReplaceNamesWithIdsVisitor({
-      expression,
-      onFieldNotFound,
-      typeObject
-    }).fieldExpressionInIdsTerms,
-    visitQueryExpression: subQueryExpression => {
-      const {
-        "q/from": fromExpression,
-        "q/select": selectExpression,
-        "q/where": whereExpression,
-        "q/order-by": orderByExpression
-      } = subQueryExpression;
-      const subQueryTypeObject = visitFieldExpressionForReplaceNamesWithIdsVisitor({
-        expression: fromExpression,
-        onFieldNotFound,
-        typeObject
-      }).currentTypeObject;
-      if (subQueryTypeObject) {
-        const subQueryVisitor = replaceNamesWithIdsVisitor(subQueryTypeObject, onFieldNotFound);
-        return {
-          ...subQueryExpression,
-          ...{
-            "q/from": visitor.visitFieldExpression(fromExpression),
-            "q/select": ___default["default"].isPlainObject(selectExpression) ? ___default["default"].mapValues(selectExpression, val => subQueryVisitor.visitExpression(val)) : subQueryVisitor.visitExpression(selectExpression)
-          },
-          ...(whereExpression ? {
-            "q/where": subQueryVisitor.visitExpression(whereExpression)
-          } : null),
-          ...(orderByExpression ? {
-            "q/order-by": subQueryVisitor.visitOrderByExpression(orderByExpression)
-          } : null)
-        };
-      }
-      return subQueryExpression;
-    }
-  });
-  return visitor;
+  return fieldExpressionVisitor(typeObject, (typeObject, expression) => visitFieldExpressionForReplaceNamesWithIdsVisitor({
+    expression,
+    typeObject,
+    onFieldNotFound
+  }), "fieldExpressionInIdsTerms");
 };
 const deleteExpressionsWithNotFoundFieldsVisitor = typeObject => {
   const visitor = createExpressionVisitor({
@@ -810,7 +901,8 @@ var visitors = {
   deleteExpressionsWithNotFoundFieldsVisitor: deleteExpressionsWithNotFoundFieldsVisitor,
   expressionContainsAggregation: expressionContainsAggregation,
   UNKNOWN_EXPRESSION_TYPE: UNKNOWN_EXPRESSION_TYPE,
-  getExpressionType: getExpressionType
+  getExpressionType: getExpressionType,
+  fieldAccessVisitorTypeAware: fieldAccessVisitorTypeAware
 };
 
 const getEntityQueryVariables = schema => {

package/lib/visitors.js

@@ -106,6 +106,131 @@ const createExpressionVisitor = visitor => {
   return visitorWithDefault;
 };
 
+const visitFieldExpression = ({
+  expression: fieldExpression,
+  typeObject: initialTypeObject,
+  onField,
+  onFieldNotFound
+}) => fieldExpression.reduce(({
+  typeObject,
+  expression
+}, fieldAccess) => {
+  if (typeObject && isMultiFieldAccess(fieldAccess) && typeObject.fieldObjectsById.hasOwnProperty(fieldAccess[0])) {
+    var _fieldObject$multiRel;
+    const typeId = fieldAccess[1];
+    const fieldObject = typeObject.fieldObjectsById[fieldAccess[0]];
+    const nextTypeObject = (_fieldObject$multiRel = fieldObject.multiRelatedFieldObjects.find(f => f.holderTypeObject.id === typeId)) == null ? void 0 : _fieldObject$multiRel.holderTypeObject;
+    if (!nextTypeObject) {
+      const notFoundResult = onFieldNotFound({
+        currentTypeObject: typeObject,
+        expression: fieldExpression,
+        fieldAccess
+      });
+      return notFoundResult ? {
+        typeObject: notFoundResult.typeObject,
+        expression: [...expression, notFoundResult.fieldAccess]
+      } : {
+        typeObject,
+        expression
+      };
+    }
+    const onFieldResult = onField({
+      fieldAccess,
+      fieldObject,
+      typeObject: nextTypeObject
+    });
+    return onFieldResult ? {
+      typeObject: onFieldResult.typeObject,
+      expression: [...expression, onFieldResult.fieldAccess]
+    } : {
+      typeObject,
+      expression
+    };
+  } else if (typeObject && typeObject.fieldObjectsById.hasOwnProperty(fieldAccess)) {
+    const fieldObject = typeObject.fieldObjectsById[fieldAccess];
+    const onFieldResult = onField({
+      fieldAccess,
+      fieldObject,
+      typeObject: fieldObject.typeObject
+    });
+    return onFieldResult ? {
+      typeObject: onFieldResult.typeObject,
+      expression: [...expression, onFieldResult.fieldAccess]
+    } : {
+      typeObject,
+      expression
+    };
+  } else {
+    const notFoundResult = onFieldNotFound({
+      currentTypeObject: typeObject,
+      expression: fieldExpression,
+      fieldAccess
+    });
+    return notFoundResult ? {
+      typeObject: notFoundResult.typeObject,
+      expression: [...expression, notFoundResult.fieldAccess]
+    } : {
+      typeObject,
+      expression
+    };
+  }
+}, {
+  typeObject: initialTypeObject,
+  expression: []
+});
+const defaultOnFieldNotFound = () => undefined;
+const defaultOnField = () => undefined;
+const fieldAccessVisitorTypeAware = ({
+  typeObject,
+  onField = defaultOnField,
+  onFieldNotFound = defaultOnFieldNotFound
+}) => {
+  const visitor = createExpressionVisitor({
+    visitFieldExpression: expression => visitFieldExpression({
+      typeObject,
+      expression,
+      onField,
+      onFieldNotFound
+    }).expression,
+    visitQueryExpression: subQueryExpression => {
+      const {
+        "q/from": fromExpression,
+        "q/select": selectExpression,
+        "q/where": whereExpression,
+        "q/order-by": orderByExpression
+      } = subQueryExpression;
+      const fromVisitResult = visitFieldExpression({
+        typeObject,
+        expression: fromExpression,
+        onField,
+        onFieldNotFound
+      });
+      if (fromVisitResult != null && fromVisitResult.typeObject) {
+        const subQueryVisitor = fieldAccessVisitorTypeAware({
+          typeObject: fromVisitResult == null ? void 0 : fromVisitResult.typeObject,
+          onField,
+          onFieldNotFound
+        });
+        return {
+          ...subQueryExpression,
+          ...{
+            "q/from": fromVisitResult.expression,
+            "q/select": ___default["default"].isPlainObject(selectExpression) ? ___default["default"].mapValues(selectExpression, val => subQueryVisitor.visitExpression(val)) : subQueryVisitor.visitExpression(selectExpression)
+          },
+          ...(whereExpression ? {
+            "q/where": subQueryVisitor.visitExpression(whereExpression)
+          } : null),
+          ...(orderByExpression ? {
+            "q/order-by": subQueryVisitor.visitOrderByExpression(orderByExpression)
+          } : null)
+        };
+      }
+      return subQueryExpression;
+    }
+  });
+  return visitor;
+};
+
 const defaultIdsWithNamesOnFieldNotFound = ({
   fieldExpressionInNamesTerms,
   fieldId
@@ -158,13 +283,9 @@ const visitFieldExpressionForReplaceIdsWithNamesVisitor = ({
   currentTypeObject: typeObject,
   fieldExpressionInNamesTerms: []
 });
-const replaceIdsWithNamesVisitor = (typeObject, onFieldNotFound = defaultIdsWithNamesOnFieldNotFound) => {
+const fieldExpressionVisitor = (typeObject, visitFieldExpression, replacedExpressionKey = "replacedExpression") => {
   const visitor = createExpressionVisitor({
-    visitFieldExpression: expression => visitFieldExpressionForReplaceIdsWithNamesVisitor({
-      expression,
-      typeObject,
-      onFieldNotFound
-    }).fieldExpressionInNamesTerms,
+    visitFieldExpression: expression => visitFieldExpression(typeObject, expression)[replacedExpressionKey],
     visitQueryExpression: subQueryExpression => {
       const {
         "q/from": fromExpression,
@@ -172,13 +293,9 @@ const replaceIdsWithNamesVisitor = (typeObject, onFieldNotFound = defaultIdsWith
         "q/where": whereExpression,
         "q/order-by": orderByExpression
       } = subQueryExpression;
-      const subQueryTypeObject = visitFieldExpressionForReplaceIdsWithNamesVisitor({
-        expression: fromExpression,
-        onFieldNotFound,
-        typeObject
-      }).currentTypeObject;
+      const subQueryTypeObject = visitFieldExpression(typeObject, fromExpression).currentTypeObject;
       if (subQueryTypeObject) {
-        const subQueryVisitor = replaceIdsWithNamesVisitor(subQueryTypeObject, onFieldNotFound);
+        const subQueryVisitor = fieldExpressionVisitor(subQueryTypeObject, visitFieldExpression, replacedExpressionKey);
         return {
           ...subQueryExpression,
           ...{
@@ -198,6 +315,13 @@ const replaceIdsWithNamesVisitor = (typeObject, onFieldNotFound = defaultIdsWith
   });
   return visitor;
 };
+const replaceIdsWithNamesVisitor = (typeObject, onFieldNotFound = defaultIdsWithNamesOnFieldNotFound) => {
+  return fieldExpressionVisitor(typeObject, (typeObject, expression) => visitFieldExpressionForReplaceIdsWithNamesVisitor({
+    expression,
+    typeObject,
+    onFieldNotFound
+  }), "fieldExpressionInNamesTerms");
+};
 const defaultNamesWithIdsOnFieldNotFound = ({
   fieldExpressionInIdsTerms,
   field
@@ -209,8 +333,8 @@ const defaultNamesWithIdsOnFieldNotFound = ({
 };
 const visitFieldExpressionForReplaceNamesWithIdsVisitor = ({
   expression,
-  onFieldNotFound,
-  typeObject
+  typeObject,
+  onFieldNotFound
 }) => expression.reduce(({
   currentTypeObject,
   fieldExpressionInIdsTerms
@@ -251,44 +375,11 @@ const visitFieldExpressionForReplaceNamesWithIdsVisitor = ({
   fieldExpressionInIdsTerms: []
 });
 const replaceNamesWithIdsVisitor = (typeObject, onFieldNotFound = defaultNamesWithIdsOnFieldNotFound) => {
-  const visitor = createExpressionVisitor({
-    visitFieldExpression: expression => visitFieldExpressionForReplaceNamesWithIdsVisitor({
-      expression,
-      onFieldNotFound,
-      typeObject
-    }).fieldExpressionInIdsTerms,
-    visitQueryExpression: subQueryExpression => {
-      const {
-        "q/from": fromExpression,
-        "q/select": selectExpression,
-        "q/where": whereExpression,
-        "q/order-by": orderByExpression
-      } = subQueryExpression;
-      const subQueryTypeObject = visitFieldExpressionForReplaceNamesWithIdsVisitor({
-        expression: fromExpression,
-        onFieldNotFound,
-        typeObject
-      }).currentTypeObject;
-      if (subQueryTypeObject) {
-        const subQueryVisitor = replaceNamesWithIdsVisitor(subQueryTypeObject, onFieldNotFound);
-        return {
-          ...subQueryExpression,
-          ...{
-            "q/from": visitor.visitFieldExpression(fromExpression),
-            "q/select": ___default["default"].isPlainObject(selectExpression) ? ___default["default"].mapValues(selectExpression, val => subQueryVisitor.visitExpression(val)) : subQueryVisitor.visitExpression(selectExpression)
-          },
-          ...(whereExpression ? {
-            "q/where": subQueryVisitor.visitExpression(whereExpression)
-          } : null),
-          ...(orderByExpression ? {
-            "q/order-by": subQueryVisitor.visitOrderByExpression(orderByExpression)
-          } : null)
-        };
-      }
-      return subQueryExpression;
-    }
-  });
-  return visitor;
+  return fieldExpressionVisitor(typeObject, (typeObject, expression) => visitFieldExpressionForReplaceNamesWithIdsVisitor({
+    expression,
+    typeObject,
+    onFieldNotFound
+  }), "fieldExpressionInIdsTerms");
 };
 const deleteExpressionsWithNotFoundFieldsVisitor = typeObject => {
   const visitor = createExpressionVisitor({
@@ -541,6 +632,7 @@ const getExpressionType = ({
 exports.UNKNOWN_EXPRESSION_TYPE = UNKNOWN_EXPRESSION_TYPE;
 exports.deleteExpressionsWithNotFoundFieldsVisitor = deleteExpressionsWithNotFoundFieldsVisitor;
 exports.expressionContainsAggregation = expressionContainsAggregation;
+exports.fieldAccessVisitorTypeAware = fieldAccessVisitorTypeAware;
 exports.getExpressionType = getExpressionType;
 exports.replaceIdsWithNamesVisitor = replaceIdsWithNamesVisitor;
 exports.replaceNamesWithIdsVisitor = replaceNamesWithIdsVisitor;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fibery/expression-utils",
-  "version": "9.0.1",
+  "version": "9.0.3",
   "description": "utils for working with fibery api expressions",
   "exports": {
     ".": "./lib/expression-utils.js",
@@ -34,8 +34,8 @@
     "jest": "27.5.1",
     "jest-junit": "13.0.0",
     "microbundle": "0.15.1",
-    "@fibery/eslint-config": "8.6.0",
-    "@fibery/babel-preset": "7.4.0"
+    "@fibery/babel-preset": "7.4.0",
+    "@fibery/eslint-config": "8.6.0"
   },
   "peerDependencies": {
     "@fibery/schema": "10.2.1"

package/types.d.ts

@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
-import {Schema, TypeObject} from "@fibery/schema";
+import {Schema, TypeObject, FieldObject} from "@fibery/schema";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type $TSFixMe = any;
@@ -37,9 +37,24 @@ declare module "@fibery/expression-utils" {
       expression: $TSFixMe;
       typeObject: TypeObject;
       functionsMeta: Record<string, $TSFixMe>;
-      onFieldNotFound?: (input: {currentTypeObject: TypeObject; fieldId: string}) => {currentTypeObject: TypeObject};
+      onFieldNotFound?: (input: {currentTypeObject: TypeObject; fieldId: string}) => {
+        currentTypeObject: TypeObject;
+      };
       returnRefTypeInsteadOfId?: boolean;
     });
+    fieldAccessVisitorTypeAware: (input: {
+      typeObject: TypeObject;
+      onField?: (onField: {
+        fieldAccess: string | [string, string];
+        fieldObject: FieldObject;
+        typeObject: TypeObject;
+      }) => {typeObject: TypeObject; fieldAccess: string | [string, string]} | null;
+      onFieldNotFound?: (onFieldNotFound: {
+        fieldAccess: string | [string, string];
+        currentTypeObject: TypeObject;
+        expression: $TSFixMe;
+      }) => {typeObject: TypeObject; fieldAccess: string | [string, string]} | null;
+    }) => $TSFixMe;
   };
   export const utils: {
     createExpressionVisitor: (visitor: $TSFixMe) => {visitExpression: (expression: $TSFixMe) => $TSFixMe};