@fibery/expression-utils 1.1.7 → 1.1.8

package/lib/contextVariables.js

@@ -6,7 +6,6 @@ var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
 
 const getEntityQueryVariables = schema => {
   const grouped = ___default["default"].groupBy(schema.typeObjects.filter(x => x.isDomain), typeObject => typeObject.pluralTitle);
-
   return ___default["default"].flatten(Object.values(grouped).map(group => {
     return group.map(typeObject => ({
       typeObject,

package/lib/expression-utils.js

@@ -10,11 +10,9 @@ var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
 const serializeDate = momentDate => {
   return momentDate.format("YYYY-MM-DD");
 };
-
 const serializeDateTime = momentDate => {
   return momentDate.toISOString();
 };
-
 const formulaTodayDateParamPlaceholder = "$formula-today-date-placeholder";
 const formulaNowDateTimeParamPlaceholder = "$formula-now-date-time-placeholder";
 const todayDateParamPlaceholder = "$today-date";
@@ -77,11 +75,9 @@ const paramsPlaceholdersLookup = {
 };
 const replacePlaceholdersInParams = params => params && ___default["default"].mapValues(params, (value, key) => {
   const replaceFn = paramsPlaceholdersLookup[key];
-
   if (replaceFn) {
     return replaceFn();
   }
-
   return value;
 });
 const dateToDateTimeIntervalLookup = {
@@ -160,20 +156,17 @@ var paramsPlaceholders = {
 };
 
 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);
 }
 
@@ -181,15 +174,12 @@ const stringify = x => {
   if (x === undefined) {
     return "undefined";
   }
-
   return JSON.stringify(x);
 };
-
 class NotImplementedError extends Error {
   constructor(value, itemType = undefined) {
     super([`"${stringify(value)}"`, itemType, "is not implemented"].filter(x => x !== undefined).join(" "));
   }
-
 }
 
 const assertIsValidExpression = expression => {
@@ -200,55 +190,56 @@ const assertIsValidExpression = expression => {
 };
 const dateRangeFunctions = new Set(["q/start", "q/end"]);
 const firstLastFunctions = new Set(["q/first", "q/last"]);
-const collectionOps = new Set(["q/count", "q/count-distinct", "q/sum", "q/min", "q/max", "q/avg", "q/join", "q/first", "q/last"]); // [op, left, right]
+const collectionOps = new Set(["q/count", "q/count-distinsct", "q/sum", "q/min", "q/max", "q/avg", "q/join", "q/first", "q/last"]);
+// [op, left, right]
 // [=, $true, $false]
 // [=, $my-id, ["fibery/id"]]
+const binaryOperations = new Set(["=", "!=", "<", ">", "<=", ">=", "in",
+//asc: obsolete,use q/in
+"q/contains", "q/not-contains", "+", "-", "*", "/", "and", "or",
+//asc: obsolete. use q/and, q/or
+"q/and", "q/or", "q/in", "q/not-in"]);
 
-const binaryOperations = new Set(["=", "!=", "<", ">", "<=", ">=", "in", //asc: obsolete,use q/in
-"q/contains", "q/not-contains", "+", "-", "*", "/", "and", "or", //asc: obsolete. use q/and, q/or
-"q/and", "q/or", "q/in", "q/not-in"]); // TODO: get rid of this. Use visitors everywhere
-
+// TODO: get rid of this. Use visitors everywhere
 const naryOperations = new Set(["and", "or", "q/and", "q/or"]);
 const logicalOperators = new Set(["and", "or", "q/and", "q/or"]);
 const relationalOperators = new Set(["=", "!=", "<", ">", "<=", ">="]);
 const mathOperators = new Set(["+", "-", "*", "/", "q/+", "q/-", "q/concat"]);
 const isFunctionCallExpression = expression => expression.length > 1 && ___default["default"].isString(expression[0]) && (expression[0].startsWith("q/") || ["=", "!=", "<", ">", "<=", ">=", "+", "-", "*", "/", "in", "and", "or", "not-in"].includes(expression[0]));
+const fromRootKeyword = "q/from-root";
+const isFromRootFieldExpression = expression => ___default["default"].isArray(expression) && expression[0] === fromRootKeyword;
 const isDateRangeFunctionExpression = expression => (expression.length === 2 || expression.length === 3) && dateRangeFunctions.has(expression[0]) && isFieldExpression(expression[1]);
-const isCollectionFunctionExpression = expression => //expression has length 3 in case of q/join
-(expression.length === 2 || expression.length === 3) && collectionOps.has(expression[0]) && isFieldExpression(expression[1]);
+const isCollectionFunctionExpression = expression =>
+//expression has length 3 in case of q/join
+(expression.length === 2 || expression.length === 3) && collectionOps.has(expression[0]);
 const isAccessFunctionExpression = expresion => expresion.length === 2 && expresion[0] === "q/access?" && isFieldExpression(expresion[1]);
 const isBinaryExpression = expression => expression.length === 3 && binaryOperations.has(expression[0]);
 const isNaryExpression = expression => expression.length > 1 && naryOperations.has(expression[0]);
 const isVariableExpression = expression => ___default["default"].isString(expression) && expression.startsWith("$");
 const isFieldExpression = expression => Array.isArray(expression) && expression.every(x => !isVariableExpression(x) && !binaryOperations.has(x) && ___default["default"].isString(x));
-const isAxisFieldExpression = expression => isFieldExpression(expression) && expression.length === 1;
 const isQueryExpression = expression => {
   if (___default["default"].isObject(expression) && "q/from" in expression) {
-    const fromExpression = expression["q/from"]; //asc: fromExpression === null for denormalizeSelect for reference collection case
-
+    const fromExpression = expression["q/from"];
+    //asc: fromExpression === null for denormalizeSelect for reference collection case
     return fromExpression === null || isFieldExpression(fromExpression);
   }
-
   return false;
-}; // [q/count, [..., collection]]
+};
+// [q/count, [..., collection]]
 // [q/start, [..., range]]
 // [q/end, [..., range]]
 // [q/access?, [..., field-expr]]
-
 const isFunctionExpression = expression => {
   if (!Array.isArray(expression)) {
     return false;
   }
-
   if (isFieldExpression(expression)) {
     return false;
   } else if (isDateRangeFunctionExpression(expression) || isCollectionFunctionExpression(expression) || isAccessFunctionExpression(expression)) {
     return true;
   }
-
   throw new Error("invalid expression:" + JSON.stringify(expression));
 };
-
 const collectFieldExpressions = (memo, expression) => {
   if (isVariableExpression(expression)) ; else if (isFunctionCallExpression(expression)) {
     for (const part of expression.slice(1)) {
@@ -267,7 +258,6 @@ const collectFieldExpressions = (memo, expression) => {
     const innerMemo = [];
     expression["q/select"] && collectFieldExpressions(innerMemo, expression["q/select"]);
     expression["q/where"] && collectFieldExpressions(innerMemo, expression["q/where"]);
-
     for (const fieldExpression of innerMemo) {
       memo.push([...expression["q/from"], ...fieldExpression]);
     }
@@ -275,7 +265,6 @@ const collectFieldExpressions = (memo, expression) => {
     throw new NotImplementedError(expression, "expression");
   }
 };
-
 const extractFieldExpressions = expression => {
   const memo = [];
   collectFieldExpressions(memo, expression);
@@ -286,6 +275,7 @@ const createExpressionVisitor = visitor => {
   const visitorDefault = {
     visitVariableExpression: expression => expression,
     visitFunctionCallExpression: ([fnName, ...args]) => [fnName, ...args.map(x => visitorWithDefault.visitExpression(x))],
+    visitFromRootFieldExpression: ([fromRootKeyword, ...rest]) => [fromRootKeyword, ...rest.map(x => visitorWithDefault.visitExpression(x))],
     visitFieldExpression: expression => expression,
     visitOrderByExpression: orderByExpression => orderByExpression.map(x => {
       const [fieldExpression, orderDir] = x;
@@ -314,6 +304,8 @@ const createExpressionVisitor = visitor => {
         throw new NotImplementedError(expression, "expression");
       } else if (isVariableExpression(expression)) {
         return visitorWithDefault.visitVariableExpression(expression, visitorDefault);
+      } else if (isFromRootFieldExpression(expression)) {
+        return visitorWithDefault.visitFromRootFieldExpression(expression, visitorDefault);
       } else if (isFunctionCallExpression(expression)) {
         return visitorWithDefault.visitFunctionCallExpression(expression, visitorDefault);
       } else if (isFieldExpression(expression)) {
@@ -338,6 +330,8 @@ var utils = {
   relationalOperators: relationalOperators,
   mathOperators: mathOperators,
   isFunctionCallExpression: isFunctionCallExpression,
+  fromRootKeyword: fromRootKeyword,
+  isFromRootFieldExpression: isFromRootFieldExpression,
   isDateRangeFunctionExpression: isDateRangeFunctionExpression,
   isCollectionFunctionExpression: isCollectionFunctionExpression,
   isAccessFunctionExpression: isAccessFunctionExpression,
@@ -345,7 +339,6 @@ var utils = {
   isNaryExpression: isNaryExpression,
   isVariableExpression: isVariableExpression,
   isFieldExpression: isFieldExpression,
-  isAxisFieldExpression: isAxisFieldExpression,
   isQueryExpression: isQueryExpression,
   isFunctionExpression: isFunctionExpression,
   extractFieldExpressions: extractFieldExpressions,
@@ -361,7 +354,6 @@ const defaultIdsWithNamesOnFieldNotFound = ({
     fieldExpressionInNamesTerms: [...fieldExpressionInNamesTerms, fieldId]
   };
 };
-
 const visitFieldExpressionForReplaceIdsWithNamesVisitor = ({
   expression,
   typeObject,
@@ -388,7 +380,6 @@ const visitFieldExpressionForReplaceIdsWithNamesVisitor = ({
   currentTypeObject: typeObject,
   fieldExpressionInNamesTerms: []
 });
-
 const replaceIdsWithNamesVisitor = (typeObject, onFieldNotFound = defaultIdsWithNamesOnFieldNotFound) => {
   const visitor = createExpressionVisitor({
     visitFieldExpression: expression => visitFieldExpressionForReplaceIdsWithNamesVisitor({
@@ -408,7 +399,6 @@ const replaceIdsWithNamesVisitor = (typeObject, onFieldNotFound = defaultIdsWith
         onFieldNotFound,
         typeObject
       }).currentTypeObject;
-
       if (subQueryTypeObject) {
         const subQueryVisitor = replaceIdsWithNamesVisitor(subQueryTypeObject, onFieldNotFound);
         return _extends({}, subQueryExpression, {
@@ -420,13 +410,11 @@ const replaceIdsWithNamesVisitor = (typeObject, onFieldNotFound = defaultIdsWith
           "q/order-by": subQueryVisitor.visitOrderByExpression(orderByExpression)
         } : null);
       }
-
       return subQueryExpression;
     }
   });
   return visitor;
 };
-
 const defaultNamesWithIdsOnFieldNotFound = ({
   fieldExpressionInIdsTerms,
   field
@@ -436,7 +424,6 @@ const defaultNamesWithIdsOnFieldNotFound = ({
     fieldExpressionInIdsTerms: [...fieldExpressionInIdsTerms, field]
   };
 };
-
 const visitFieldExpressionForReplaceNamesWithIdsVisitor = ({
   expression,
   onFieldNotFound,
@@ -463,7 +450,6 @@ const visitFieldExpressionForReplaceNamesWithIdsVisitor = ({
   currentTypeObject: typeObject,
   fieldExpressionInIdsTerms: []
 });
-
 const replaceNamesWithIdsVisitor = (typeObject, onFieldNotFound = defaultNamesWithIdsOnFieldNotFound) => {
   const visitor = createExpressionVisitor({
     visitFieldExpression: expression => visitFieldExpressionForReplaceNamesWithIdsVisitor({
@@ -483,7 +469,6 @@ const replaceNamesWithIdsVisitor = (typeObject, onFieldNotFound = defaultNamesWi
         onFieldNotFound,
         typeObject
       }).currentTypeObject;
-
       if (subQueryTypeObject) {
         const subQueryVisitor = replaceNamesWithIdsVisitor(subQueryTypeObject, onFieldNotFound);
         return _extends({}, subQueryExpression, {
@@ -495,7 +480,6 @@ const replaceNamesWithIdsVisitor = (typeObject, onFieldNotFound = defaultNamesWi
           "q/order-by": subQueryVisitor.visitOrderByExpression(orderByExpression)
         } : null);
       }
-
       return subQueryExpression;
     }
   });
@@ -505,12 +489,10 @@ const deleteExpressionsWithNotFoundFieldsVisitor = typeObject => {
   const visitor = createExpressionVisitor({
     visitFunctionCallExpression: ([fnName, ...args]) => {
       const argsNew = args.map(x => visitor.visitExpression(x)).filter(Boolean);
-
       if (logicalOperators.has(fnName)) {
         if (argsNew.length > 0) {
           return argsNew.length === 1 ? argsNew[0] : [fnName, ...argsNew];
         }
-
         return null;
       } else {
         return argsNew.length === args.length ? [fnName, ...argsNew] : null;
@@ -536,10 +518,8 @@ const deleteExpressionsWithNotFoundFieldsVisitor = typeObject => {
         "q/order-by": orderByExpression
       } = subQueryExpression;
       const subQueryTypeObject = fromExpression.reduce((typeObject, field) => typeObject && typeObject.fieldObjectsByName.hasOwnProperty(field) ? typeObject.fieldObjectsByName[field].typeObject : null, typeObject);
-
       if (subQueryTypeObject) {
         const subQueryVisitor = deleteExpressionsWithNotFoundFieldsVisitor(subQueryTypeObject);
-
         const subQueryExpressionNew = ___default["default"].pickBy(_extends({}, subQueryExpression, {
           "q/from": visitor.visitFieldExpression(fromExpression),
           "q/select": subQueryVisitor.visitExpression(selectExpression)
@@ -548,7 +528,6 @@ const deleteExpressionsWithNotFoundFieldsVisitor = typeObject => {
         } : null, orderByExpression ? {
           "q/order-by": subQueryVisitor.visitOrderByExpression(orderByExpression)
         } : null));
-
         const {
           "q/select": selectExpressionNew
         } = subQueryExpressionNew;
@@ -567,22 +546,26 @@ const expressionContainsAggregation = expression => {
       const {
         "q/select": selectExpression
       } = queryExpression;
-
       if (isCollectionFunctionExpression(selectExpression)) {
         result = true;
       }
+    },
+    visitFunctionCallExpression: (expression, visitorDefault) => {
+      if (firstLastFunctions.has(expression[0])) {
+        result = true;
+      } else {
+        visitorDefault.visitFunctionCallExpression(expression);
+      }
     }
   });
   visitor.visitExpression(expression);
   return result;
 };
-
 const defaultGetExpressionTypeOnFieldNotFound = () => {
   return {
     currentTypeObject: null
   };
 };
-
 const getFieldAccessExpressionTypeObject = ({
   expression,
   typeObject,
@@ -593,14 +576,12 @@ const getFieldAccessExpressionTypeObject = ({
     currentTypeObject
   }, fieldId, index) => {
     const fieldObject = currentTypeObject && currentTypeObject.fieldObjects.find(f => f.id === fieldId);
-
     if (fieldObject) {
       if (returnRefTypeInsteadOfId && index === expression.length - 1 && fieldObject.isId) {
         return {
           currentTypeObject
         };
       }
-
       return {
         currentTypeObject: fieldObject.typeObject
       };
@@ -615,9 +596,7 @@ const getFieldAccessExpressionTypeObject = ({
   });
   return reduced.currentTypeObject;
 };
-
 const UNKNOWN_EXPRESSION_TYPE = "unknown";
-
 const getExpressionTypeInternal = ({
   expression,
   typeObject,
@@ -632,11 +611,9 @@ const getExpressionTypeInternal = ({
     },
     visitFunctionCallExpression: function ([fnName, ...args]) {
       const fnMeta = functionsMeta[fnName];
-
       if (!fnMeta) {
         throw new Error(`Function meta for "${fnName}" was not provided`);
       }
-
       const argTypes = args.map(arg => getExpressionTypeInternal({
         expression: arg,
         typeObject,
@@ -645,11 +622,9 @@ const getExpressionTypeInternal = ({
         returnRefTypeInsteadOfId: false
       }));
       const overload = fnMeta.overloads.find(o => o["arg-types"].every((argType, index) => argTypes[index] === UNKNOWN_EXPRESSION_TYPE || argTypes[index] === argType));
-
       if (!overload) {
         throw new Error(`No overload with args ${argTypes.join(",")} found for "${fnName}" in meta`);
       }
-
       result = overload["result-type"];
     },
     visitQueryExpression: expression => {
@@ -663,16 +638,13 @@ const getExpressionTypeInternal = ({
         onFieldNotFound,
         returnRefTypeInsteadOfId
       });
-
       if (!fromTypeObject) {
         result = null;
       }
-
       if (___default["default"].isPlainObject(selectExpression)) {
         if (Object.values(selectExpression).length !== 1) {
           throw new Error(`Cannot determine type of query expression ${JSON.stringify(expression)}`);
         }
-
         result = getExpressionTypeInternal({
           expression: Object.values(selectExpression)[0],
           typeObject: fromTypeObject,
@@ -690,7 +662,6 @@ const getExpressionTypeInternal = ({
         });
       }
     },
-
     visitFieldExpression(expression) {
       const fieldAccessExpressionTypeObject = getFieldAccessExpressionTypeObject({
         expression,
@@ -700,12 +671,10 @@ const getExpressionTypeInternal = ({
       });
       result = fieldAccessExpressionTypeObject && fieldAccessExpressionTypeObject.name;
     }
-
   });
   visitor.visitExpression(expression);
   return result;
 };
-
 const getExpressionType = ({
   expression,
   typeObject,
@@ -734,7 +703,6 @@ var visitors = {
 
 const getEntityQueryVariables = schema => {
   const grouped = ___default["default"].groupBy(schema.typeObjects.filter(x => x.isDomain), typeObject => typeObject.pluralTitle);
-
   return ___default["default"].flatten(Object.values(grouped).map(group => {
     return group.map(typeObject => ({
       typeObject,

package/lib/paramsPlaceholders.js

@@ -9,11 +9,9 @@ var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
 const serializeDate = momentDate => {
   return momentDate.format("YYYY-MM-DD");
 };
-
 const serializeDateTime = momentDate => {
   return momentDate.toISOString();
 };
-
 const formulaTodayDateParamPlaceholder = "$formula-today-date-placeholder";
 const formulaNowDateTimeParamPlaceholder = "$formula-now-date-time-placeholder";
 const todayDateParamPlaceholder = "$today-date";
@@ -76,11 +74,9 @@ const paramsPlaceholdersLookup = {
 };
 const replacePlaceholdersInParams = params => params && ___default["default"].mapValues(params, (value, key) => {
   const replaceFn = paramsPlaceholdersLookup[key];
-
   if (replaceFn) {
     return replaceFn();
   }
-
   return value;
 });
 const dateToDateTimeIntervalLookup = {

package/lib/utils.js

@@ -6,20 +6,17 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 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);
 }
 
@@ -27,15 +24,12 @@ const stringify = x => {
   if (x === undefined) {
     return "undefined";
   }
-
   return JSON.stringify(x);
 };
-
 class NotImplementedError extends Error {
   constructor(value, itemType = undefined) {
     super([`"${stringify(value)}"`, itemType, "is not implemented"].filter(x => x !== undefined).join(" "));
   }
-
 }
 
 const assertIsValidExpression = expression => {
@@ -46,55 +40,56 @@ const assertIsValidExpression = expression => {
 };
 const dateRangeFunctions = new Set(["q/start", "q/end"]);
 const firstLastFunctions = new Set(["q/first", "q/last"]);
-const collectionOps = new Set(["q/count", "q/count-distinct", "q/sum", "q/min", "q/max", "q/avg", "q/join", "q/first", "q/last"]); // [op, left, right]
+const collectionOps = new Set(["q/count", "q/count-distinsct", "q/sum", "q/min", "q/max", "q/avg", "q/join", "q/first", "q/last"]);
+// [op, left, right]
 // [=, $true, $false]
 // [=, $my-id, ["fibery/id"]]
+const binaryOperations = new Set(["=", "!=", "<", ">", "<=", ">=", "in",
+//asc: obsolete,use q/in
+"q/contains", "q/not-contains", "+", "-", "*", "/", "and", "or",
+//asc: obsolete. use q/and, q/or
+"q/and", "q/or", "q/in", "q/not-in"]);
 
-const binaryOperations = new Set(["=", "!=", "<", ">", "<=", ">=", "in", //asc: obsolete,use q/in
-"q/contains", "q/not-contains", "+", "-", "*", "/", "and", "or", //asc: obsolete. use q/and, q/or
-"q/and", "q/or", "q/in", "q/not-in"]); // TODO: get rid of this. Use visitors everywhere
-
+// TODO: get rid of this. Use visitors everywhere
 const naryOperations = new Set(["and", "or", "q/and", "q/or"]);
 const logicalOperators = new Set(["and", "or", "q/and", "q/or"]);
 const relationalOperators = new Set(["=", "!=", "<", ">", "<=", ">="]);
 const mathOperators = new Set(["+", "-", "*", "/", "q/+", "q/-", "q/concat"]);
 const isFunctionCallExpression = expression => expression.length > 1 && ___default["default"].isString(expression[0]) && (expression[0].startsWith("q/") || ["=", "!=", "<", ">", "<=", ">=", "+", "-", "*", "/", "in", "and", "or", "not-in"].includes(expression[0]));
+const fromRootKeyword = "q/from-root";
+const isFromRootFieldExpression = expression => ___default["default"].isArray(expression) && expression[0] === fromRootKeyword;
 const isDateRangeFunctionExpression = expression => (expression.length === 2 || expression.length === 3) && dateRangeFunctions.has(expression[0]) && isFieldExpression(expression[1]);
-const isCollectionFunctionExpression = expression => //expression has length 3 in case of q/join
-(expression.length === 2 || expression.length === 3) && collectionOps.has(expression[0]) && isFieldExpression(expression[1]);
+const isCollectionFunctionExpression = expression =>
+//expression has length 3 in case of q/join
+(expression.length === 2 || expression.length === 3) && collectionOps.has(expression[0]);
 const isAccessFunctionExpression = expresion => expresion.length === 2 && expresion[0] === "q/access?" && isFieldExpression(expresion[1]);
 const isBinaryExpression = expression => expression.length === 3 && binaryOperations.has(expression[0]);
 const isNaryExpression = expression => expression.length > 1 && naryOperations.has(expression[0]);
 const isVariableExpression = expression => ___default["default"].isString(expression) && expression.startsWith("$");
 const isFieldExpression = expression => Array.isArray(expression) && expression.every(x => !isVariableExpression(x) && !binaryOperations.has(x) && ___default["default"].isString(x));
-const isAxisFieldExpression = expression => isFieldExpression(expression) && expression.length === 1;
 const isQueryExpression = expression => {
   if (___default["default"].isObject(expression) && "q/from" in expression) {
-    const fromExpression = expression["q/from"]; //asc: fromExpression === null for denormalizeSelect for reference collection case
-
+    const fromExpression = expression["q/from"];
+    //asc: fromExpression === null for denormalizeSelect for reference collection case
     return fromExpression === null || isFieldExpression(fromExpression);
   }
-
   return false;
-}; // [q/count, [..., collection]]
+};
+// [q/count, [..., collection]]
 // [q/start, [..., range]]
 // [q/end, [..., range]]
 // [q/access?, [..., field-expr]]
-
 const isFunctionExpression = expression => {
   if (!Array.isArray(expression)) {
     return false;
   }
-
   if (isFieldExpression(expression)) {
     return false;
   } else if (isDateRangeFunctionExpression(expression) || isCollectionFunctionExpression(expression) || isAccessFunctionExpression(expression)) {
     return true;
   }
-
   throw new Error("invalid expression:" + JSON.stringify(expression));
 };
-
 const collectFieldExpressions = (memo, expression) => {
   if (isVariableExpression(expression)) ; else if (isFunctionCallExpression(expression)) {
     for (const part of expression.slice(1)) {
@@ -113,7 +108,6 @@ const collectFieldExpressions = (memo, expression) => {
     const innerMemo = [];
     expression["q/select"] && collectFieldExpressions(innerMemo, expression["q/select"]);
     expression["q/where"] && collectFieldExpressions(innerMemo, expression["q/where"]);
-
     for (const fieldExpression of innerMemo) {
       memo.push([...expression["q/from"], ...fieldExpression]);
     }
@@ -121,7 +115,6 @@ const collectFieldExpressions = (memo, expression) => {
     throw new NotImplementedError(expression, "expression");
   }
 };
-
 const extractFieldExpressions = expression => {
   const memo = [];
   collectFieldExpressions(memo, expression);
@@ -132,6 +125,7 @@ const createExpressionVisitor = visitor => {
   const visitorDefault = {
     visitVariableExpression: expression => expression,
     visitFunctionCallExpression: ([fnName, ...args]) => [fnName, ...args.map(x => visitorWithDefault.visitExpression(x))],
+    visitFromRootFieldExpression: ([fromRootKeyword, ...rest]) => [fromRootKeyword, ...rest.map(x => visitorWithDefault.visitExpression(x))],
     visitFieldExpression: expression => expression,
     visitOrderByExpression: orderByExpression => orderByExpression.map(x => {
       const [fieldExpression, orderDir] = x;
@@ -160,6 +154,8 @@ const createExpressionVisitor = visitor => {
         throw new NotImplementedError(expression, "expression");
       } else if (isVariableExpression(expression)) {
         return visitorWithDefault.visitVariableExpression(expression, visitorDefault);
+      } else if (isFromRootFieldExpression(expression)) {
+        return visitorWithDefault.visitFromRootFieldExpression(expression, visitorDefault);
       } else if (isFunctionCallExpression(expression)) {
         return visitorWithDefault.visitFunctionCallExpression(expression, visitorDefault);
       } else if (isFieldExpression(expression)) {
@@ -180,12 +176,13 @@ exports.createExpressionVisitor = createExpressionVisitor;
 exports.dateRangeFunctions = dateRangeFunctions;
 exports.extractFieldExpressions = extractFieldExpressions;
 exports.firstLastFunctions = firstLastFunctions;
+exports.fromRootKeyword = fromRootKeyword;
 exports.isAccessFunctionExpression = isAccessFunctionExpression;
-exports.isAxisFieldExpression = isAxisFieldExpression;
 exports.isBinaryExpression = isBinaryExpression;
 exports.isCollectionFunctionExpression = isCollectionFunctionExpression;
 exports.isDateRangeFunctionExpression = isDateRangeFunctionExpression;
 exports.isFieldExpression = isFieldExpression;
+exports.isFromRootFieldExpression = isFromRootFieldExpression;
 exports.isFunctionCallExpression = isFunctionCallExpression;
 exports.isFunctionExpression = isFunctionExpression;
 exports.isNaryExpression = isNaryExpression;

package/lib/visitors.js

@@ -6,20 +6,17 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 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);
 }
 
@@ -27,44 +24,47 @@ const stringify = x => {
   if (x === undefined) {
     return "undefined";
   }
-
   return JSON.stringify(x);
 };
-
 class NotImplementedError extends Error {
   constructor(value, itemType = undefined) {
     super([`"${stringify(value)}"`, itemType, "is not implemented"].filter(x => x !== undefined).join(" "));
   }
-
 }
 
-const collectionOps = new Set(["q/count", "q/count-distinct", "q/sum", "q/min", "q/max", "q/avg", "q/join", "q/first", "q/last"]); // [op, left, right]
+const firstLastFunctions = new Set(["q/first", "q/last"]);
+const collectionOps = new Set(["q/count", "q/count-distinsct", "q/sum", "q/min", "q/max", "q/avg", "q/join", "q/first", "q/last"]);
+// [op, left, right]
 // [=, $true, $false]
 // [=, $my-id, ["fibery/id"]]
-
-const binaryOperations = new Set(["=", "!=", "<", ">", "<=", ">=", "in", //asc: obsolete,use q/in
-"q/contains", "q/not-contains", "+", "-", "*", "/", "and", "or", //asc: obsolete. use q/and, q/or
-"q/and", "q/or", "q/in", "q/not-in"]); // TODO: get rid of this. Use visitors everywhere
+const binaryOperations = new Set(["=", "!=", "<", ">", "<=", ">=", "in",
+//asc: obsolete,use q/in
+"q/contains", "q/not-contains", "+", "-", "*", "/", "and", "or",
+//asc: obsolete. use q/and, q/or
+"q/and", "q/or", "q/in", "q/not-in"]);
 const logicalOperators = new Set(["and", "or", "q/and", "q/or"]);
 const isFunctionCallExpression = expression => expression.length > 1 && ___default["default"].isString(expression[0]) && (expression[0].startsWith("q/") || ["=", "!=", "<", ">", "<=", ">=", "+", "-", "*", "/", "in", "and", "or", "not-in"].includes(expression[0]));
-const isCollectionFunctionExpression = expression => //expression has length 3 in case of q/join
-(expression.length === 2 || expression.length === 3) && collectionOps.has(expression[0]) && isFieldExpression(expression[1]);
+const fromRootKeyword = "q/from-root";
+const isFromRootFieldExpression = expression => ___default["default"].isArray(expression) && expression[0] === fromRootKeyword;
+const isCollectionFunctionExpression = expression =>
+//expression has length 3 in case of q/join
+(expression.length === 2 || expression.length === 3) && collectionOps.has(expression[0]);
 const isVariableExpression = expression => ___default["default"].isString(expression) && expression.startsWith("$");
 const isFieldExpression = expression => Array.isArray(expression) && expression.every(x => !isVariableExpression(x) && !binaryOperations.has(x) && ___default["default"].isString(x));
 const isQueryExpression = expression => {
   if (___default["default"].isObject(expression) && "q/from" in expression) {
-    const fromExpression = expression["q/from"]; //asc: fromExpression === null for denormalizeSelect for reference collection case
-
+    const fromExpression = expression["q/from"];
+    //asc: fromExpression === null for denormalizeSelect for reference collection case
     return fromExpression === null || isFieldExpression(fromExpression);
   }
-
   return false;
-}; // [q/count, [..., collection]]
+};
 const createExpressionVisitor = visitor => {
   let visitorWithDefault = null;
   const visitorDefault = {
     visitVariableExpression: expression => expression,
     visitFunctionCallExpression: ([fnName, ...args]) => [fnName, ...args.map(x => visitorWithDefault.visitExpression(x))],
+    visitFromRootFieldExpression: ([fromRootKeyword, ...rest]) => [fromRootKeyword, ...rest.map(x => visitorWithDefault.visitExpression(x))],
     visitFieldExpression: expression => expression,
     visitOrderByExpression: orderByExpression => orderByExpression.map(x => {
       const [fieldExpression, orderDir] = x;
@@ -93,6 +93,8 @@ const createExpressionVisitor = visitor => {
         throw new NotImplementedError(expression, "expression");
       } else if (isVariableExpression(expression)) {
         return visitorWithDefault.visitVariableExpression(expression, visitorDefault);
+      } else if (isFromRootFieldExpression(expression)) {
+        return visitorWithDefault.visitFromRootFieldExpression(expression, visitorDefault);
       } else if (isFunctionCallExpression(expression)) {
         return visitorWithDefault.visitFunctionCallExpression(expression, visitorDefault);
       } else if (isFieldExpression(expression)) {
@@ -117,7 +119,6 @@ const defaultIdsWithNamesOnFieldNotFound = ({
     fieldExpressionInNamesTerms: [...fieldExpressionInNamesTerms, fieldId]
   };
 };
-
 const visitFieldExpressionForReplaceIdsWithNamesVisitor = ({
   expression,
   typeObject,
@@ -144,7 +145,6 @@ const visitFieldExpressionForReplaceIdsWithNamesVisitor = ({
   currentTypeObject: typeObject,
   fieldExpressionInNamesTerms: []
 });
-
 const replaceIdsWithNamesVisitor = (typeObject, onFieldNotFound = defaultIdsWithNamesOnFieldNotFound) => {
   const visitor = createExpressionVisitor({
     visitFieldExpression: expression => visitFieldExpressionForReplaceIdsWithNamesVisitor({
@@ -164,7 +164,6 @@ const replaceIdsWithNamesVisitor = (typeObject, onFieldNotFound = defaultIdsWith
         onFieldNotFound,
         typeObject
       }).currentTypeObject;
-
       if (subQueryTypeObject) {
         const subQueryVisitor = replaceIdsWithNamesVisitor(subQueryTypeObject, onFieldNotFound);
         return _extends({}, subQueryExpression, {
@@ -176,13 +175,11 @@ const replaceIdsWithNamesVisitor = (typeObject, onFieldNotFound = defaultIdsWith
           "q/order-by": subQueryVisitor.visitOrderByExpression(orderByExpression)
         } : null);
       }
-
       return subQueryExpression;
     }
   });
   return visitor;
 };
-
 const defaultNamesWithIdsOnFieldNotFound = ({
   fieldExpressionInIdsTerms,
   field
@@ -192,7 +189,6 @@ const defaultNamesWithIdsOnFieldNotFound = ({
     fieldExpressionInIdsTerms: [...fieldExpressionInIdsTerms, field]
   };
 };
-
 const visitFieldExpressionForReplaceNamesWithIdsVisitor = ({
   expression,
   onFieldNotFound,
@@ -219,7 +215,6 @@ const visitFieldExpressionForReplaceNamesWithIdsVisitor = ({
   currentTypeObject: typeObject,
   fieldExpressionInIdsTerms: []
 });
-
 const replaceNamesWithIdsVisitor = (typeObject, onFieldNotFound = defaultNamesWithIdsOnFieldNotFound) => {
   const visitor = createExpressionVisitor({
     visitFieldExpression: expression => visitFieldExpressionForReplaceNamesWithIdsVisitor({
@@ -239,7 +234,6 @@ const replaceNamesWithIdsVisitor = (typeObject, onFieldNotFound = defaultNamesWi
         onFieldNotFound,
         typeObject
       }).currentTypeObject;
-
       if (subQueryTypeObject) {
         const subQueryVisitor = replaceNamesWithIdsVisitor(subQueryTypeObject, onFieldNotFound);
         return _extends({}, subQueryExpression, {
@@ -251,7 +245,6 @@ const replaceNamesWithIdsVisitor = (typeObject, onFieldNotFound = defaultNamesWi
           "q/order-by": subQueryVisitor.visitOrderByExpression(orderByExpression)
         } : null);
       }
-
       return subQueryExpression;
     }
   });
@@ -261,12 +254,10 @@ const deleteExpressionsWithNotFoundFieldsVisitor = typeObject => {
   const visitor = createExpressionVisitor({
     visitFunctionCallExpression: ([fnName, ...args]) => {
       const argsNew = args.map(x => visitor.visitExpression(x)).filter(Boolean);
-
       if (logicalOperators.has(fnName)) {
         if (argsNew.length > 0) {
           return argsNew.length === 1 ? argsNew[0] : [fnName, ...argsNew];
         }
-
         return null;
       } else {
         return argsNew.length === args.length ? [fnName, ...argsNew] : null;
@@ -292,10 +283,8 @@ const deleteExpressionsWithNotFoundFieldsVisitor = typeObject => {
         "q/order-by": orderByExpression
       } = subQueryExpression;
       const subQueryTypeObject = fromExpression.reduce((typeObject, field) => typeObject && typeObject.fieldObjectsByName.hasOwnProperty(field) ? typeObject.fieldObjectsByName[field].typeObject : null, typeObject);
-
       if (subQueryTypeObject) {
         const subQueryVisitor = deleteExpressionsWithNotFoundFieldsVisitor(subQueryTypeObject);
-
         const subQueryExpressionNew = ___default["default"].pickBy(_extends({}, subQueryExpression, {
           "q/from": visitor.visitFieldExpression(fromExpression),
           "q/select": subQueryVisitor.visitExpression(selectExpression)
@@ -304,7 +293,6 @@ const deleteExpressionsWithNotFoundFieldsVisitor = typeObject => {
         } : null, orderByExpression ? {
           "q/order-by": subQueryVisitor.visitOrderByExpression(orderByExpression)
         } : null));
-
         const {
           "q/select": selectExpressionNew
         } = subQueryExpressionNew;
@@ -323,22 +311,26 @@ const expressionContainsAggregation = expression => {
       const {
         "q/select": selectExpression
       } = queryExpression;
-
       if (isCollectionFunctionExpression(selectExpression)) {
         result = true;
       }
+    },
+    visitFunctionCallExpression: (expression, visitorDefault) => {
+      if (firstLastFunctions.has(expression[0])) {
+        result = true;
+      } else {
+        visitorDefault.visitFunctionCallExpression(expression);
+      }
     }
   });
   visitor.visitExpression(expression);
   return result;
 };
-
 const defaultGetExpressionTypeOnFieldNotFound = () => {
   return {
     currentTypeObject: null
   };
 };
-
 const getFieldAccessExpressionTypeObject = ({
   expression,
   typeObject,
@@ -349,14 +341,12 @@ const getFieldAccessExpressionTypeObject = ({
     currentTypeObject
   }, fieldId, index) => {
     const fieldObject = currentTypeObject && currentTypeObject.fieldObjects.find(f => f.id === fieldId);
-
     if (fieldObject) {
       if (returnRefTypeInsteadOfId && index === expression.length - 1 && fieldObject.isId) {
         return {
           currentTypeObject
         };
       }
-
       return {
         currentTypeObject: fieldObject.typeObject
       };
@@ -371,9 +361,7 @@ const getFieldAccessExpressionTypeObject = ({
   });
   return reduced.currentTypeObject;
 };
-
 const UNKNOWN_EXPRESSION_TYPE = "unknown";
-
 const getExpressionTypeInternal = ({
   expression,
   typeObject,
@@ -388,11 +376,9 @@ const getExpressionTypeInternal = ({
     },
     visitFunctionCallExpression: function ([fnName, ...args]) {
       const fnMeta = functionsMeta[fnName];
-
       if (!fnMeta) {
         throw new Error(`Function meta for "${fnName}" was not provided`);
       }
-
       const argTypes = args.map(arg => getExpressionTypeInternal({
         expression: arg,
         typeObject,
@@ -401,11 +387,9 @@ const getExpressionTypeInternal = ({
         returnRefTypeInsteadOfId: false
       }));
       const overload = fnMeta.overloads.find(o => o["arg-types"].every((argType, index) => argTypes[index] === UNKNOWN_EXPRESSION_TYPE || argTypes[index] === argType));
-
       if (!overload) {
         throw new Error(`No overload with args ${argTypes.join(",")} found for "${fnName}" in meta`);
       }
-
       result = overload["result-type"];
     },
     visitQueryExpression: expression => {
@@ -419,16 +403,13 @@ const getExpressionTypeInternal = ({
         onFieldNotFound,
         returnRefTypeInsteadOfId
       });
-
       if (!fromTypeObject) {
         result = null;
       }
-
       if (___default["default"].isPlainObject(selectExpression)) {
         if (Object.values(selectExpression).length !== 1) {
           throw new Error(`Cannot determine type of query expression ${JSON.stringify(expression)}`);
         }
-
         result = getExpressionTypeInternal({
           expression: Object.values(selectExpression)[0],
           typeObject: fromTypeObject,
@@ -446,7 +427,6 @@ const getExpressionTypeInternal = ({
         });
       }
     },
-
     visitFieldExpression(expression) {
       const fieldAccessExpressionTypeObject = getFieldAccessExpressionTypeObject({
         expression,
@@ -456,12 +436,10 @@ const getExpressionTypeInternal = ({
       });
       result = fieldAccessExpressionTypeObject && fieldAccessExpressionTypeObject.name;
     }
-
   });
   visitor.visitExpression(expression);
   return result;
 };
-
 const getExpressionType = ({
   expression,
   typeObject,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fibery/expression-utils",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "description": "utils for working with fibery api expressions",
   "exports": {
     ".": "./lib/expression-utils.js",
@@ -22,27 +22,26 @@
   ],
   "private": false,
   "dependencies": {
+    "@fibery/helpers": "1.0.2",
     "lodash": "4.17.21",
-    "moment": "2.20.1",
-    "@fibery/helpers": "1.0.2"
+    "moment": "2.20.1"
   },
   "devDependencies": {
-    "@babel/core": "7.15.0",
-    "babel-jest": "27.5.1",
-    "babel-loader": "8.2.5",
+    "@babel/core": "7.20.5",
     "@fibery/babel-preset": "7.2.0",
-    "@fibery/eslint-config": "8.1.0",
+    "@fibery/eslint-config": "8.2.0",
     "jest": "27.5.1",
     "jest-junit": "13.0.0",
     "microbundle": "0.15.0"
   },
   "peerDependencies": {
-    "@fibery/schema": "^8.0.6"
+    "@fibery/schema": "^8.1.0"
   },
   "scripts": {
     "build": "rm -rf lib && microbundle paramsPlaceholders.js utils.js visitors.js contextVariables.js 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/expression-utils --reporters=default --reporters=jest-junit",
     "lint": "eslint ."
   },
   "jest": {