@fibery/expression-utils 9.2.1 → 9.4.0

package/lib/paramsPlaceholders.js

@@ -1,232 +0,0 @@
-var _ = require('lodash');
-var moment = require('moment');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
-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";
-const tomorrowDateParamPlaceholder = "$tomorrow-date";
-const yesterdayDateParamPlaceholder = "$yesterday-date";
-const weekAgoDateParamPlaceholder = "$week-ago-date";
-const weekFromNowDateParamPlaceholder = "$week-from-now-date";
-const monthAgoDateParamPlaceholder = "$month-ago-date";
-const monthFromNowDateParamPlaceholder = "$month-from-now-date";
-const yearAgoDateParamPlaceholder = "$year-ago-date";
-const yearFromNowDateParamPlaceholder = "$year-from-now-date";
-const todayStartDateTimeParamPlaceholder = "$today-date-time-start";
-const todayEndDateTimeParamPlaceholder = "$today-date-time-end";
-const tomorrowStartDateTimeParamPlaceholder = "$tomorrow-date-time-start";
-const tomorrowEndDateTimeParamPlaceholder = "$tomorrow-date-time-end";
-const yesterdayStartDateTimeParamPlaceholder = "$yesterday-date-time-start";
-const yesterdayEndDateTimeParamPlaceholder = "$yesterday-date-time-end";
-const weekAgoStartDateTimeParamPlaceholder = "$week-ago-date-time-start";
-const weekAgoEndDateTimeParamPlaceholder = "$week-ago-date-time-end";
-const weekFromNowStartDateTimeParamPlaceholder = "$week-from-now-date-time-start";
-const weekFromNowEndDateTimeParamPlaceholder = "$week-from-now-date-time-end";
-const monthAgoStartDateTimeParamPlaceholder = "$month-ago-date-time-start";
-const monthAgoEndDateTimeParamPlaceholder = "$month-ago-date-time-end";
-const monthFromNowStartDateTimeParamPlaceholder = "$month-from-now-date-time-start";
-const monthFromNowEndDateTimeParamPlaceholder = "$month-from-now-date-time-end";
-const yearAgoStartDateTimeParamPlaceholder = "$year-ago-date-time-start";
-const yearAgoEndDateTimeParamPlaceholder = "$year-ago-date-time-end";
-const yearFromNowStartDateTimeParamPlaceholder = "$year-from-now-date-time-start";
-const yearFromNowEndDateTimeParamPlaceholder = "$year-from-now-date-time-end";
-const paramsPlaceholdersLookup = {
-  [todayDateParamPlaceholder]: () => serializeDate(moment__default["default"]()),
-  [formulaTodayDateParamPlaceholder]: () => serializeDate(moment__default["default"]()),
-  [formulaNowDateTimeParamPlaceholder]: () => serializeDateTime(moment__default["default"]()),
-  [tomorrowDateParamPlaceholder]: () => serializeDate(moment__default["default"]().add(1, "days")),
-  [yesterdayDateParamPlaceholder]: () => serializeDate(moment__default["default"]().subtract(1, "days")),
-  [weekAgoDateParamPlaceholder]: () => serializeDate(moment__default["default"]().subtract(7, "days")),
-  [weekFromNowDateParamPlaceholder]: () => serializeDate(moment__default["default"]().add(7, "days")),
-  [monthAgoDateParamPlaceholder]: () => serializeDate(moment__default["default"]().subtract(1, "months")),
-  [monthFromNowDateParamPlaceholder]: () => serializeDate(moment__default["default"]().add(1, "months")),
-  [yearAgoDateParamPlaceholder]: () => serializeDate(moment__default["default"]().subtract(1, "year")),
-  [yearFromNowDateParamPlaceholder]: () => serializeDate(moment__default["default"]().add(1, "year")),
-  [todayStartDateTimeParamPlaceholder]: () => serializeDateTime(moment__default["default"]().startOf("day")),
-  [todayEndDateTimeParamPlaceholder]: () => serializeDateTime(moment__default["default"]().endOf("day")),
-  [tomorrowStartDateTimeParamPlaceholder]: () => serializeDateTime(moment__default["default"]().add(1, "days").startOf("day")),
-  [tomorrowEndDateTimeParamPlaceholder]: () => serializeDateTime(moment__default["default"]().add(1, "days").endOf("day")),
-  [yesterdayStartDateTimeParamPlaceholder]: () => serializeDateTime(moment__default["default"]().subtract(1, "days").startOf("day")),
-  [yesterdayEndDateTimeParamPlaceholder]: () => serializeDateTime(moment__default["default"]().subtract(1, "days").endOf("day")),
-  [weekAgoStartDateTimeParamPlaceholder]: () => serializeDateTime(moment__default["default"]().subtract(7, "days").startOf("day")),
-  [weekAgoEndDateTimeParamPlaceholder]: () => serializeDateTime(moment__default["default"]().subtract(7, "days").endOf("day")),
-  [weekFromNowStartDateTimeParamPlaceholder]: () => serializeDateTime(moment__default["default"]().add(7, "days").startOf("day")),
-  [weekFromNowEndDateTimeParamPlaceholder]: () => serializeDateTime(moment__default["default"]().add(7, "days").endOf("day")),
-  [monthAgoStartDateTimeParamPlaceholder]: () => serializeDateTime(moment__default["default"]().subtract(1, "months").startOf("day")),
-  [monthAgoEndDateTimeParamPlaceholder]: () => serializeDateTime(moment__default["default"]().subtract(1, "months").endOf("day")),
-  [monthFromNowStartDateTimeParamPlaceholder]: () => serializeDateTime(moment__default["default"]().add(1, "months").startOf("day")),
-  [monthFromNowEndDateTimeParamPlaceholder]: () => serializeDateTime(moment__default["default"]().add(1, "months").endOf("day")),
-  [yearAgoStartDateTimeParamPlaceholder]: () => serializeDateTime(moment__default["default"]().subtract(1, "year").startOf("day")),
-  [yearAgoEndDateTimeParamPlaceholder]: () => serializeDateTime(moment__default["default"]().subtract(1, "year").endOf("day")),
-  [yearFromNowStartDateTimeParamPlaceholder]: () => serializeDateTime(moment__default["default"]().add(1, "year").startOf("day")),
-  [yearFromNowEndDateTimeParamPlaceholder]: () => serializeDateTime(moment__default["default"]().add(1, "year").endOf("day"))
-};
-const dynamicFilterParamPrefix = `$dynamic_`;
-const isDynamicFilterParam = paramValue => paramValue.startsWith(dynamicFilterParamPrefix);
-const getFieldIdFromDynamicParam = paramValue => paramValue.substring(dynamicFilterParamPrefix.length);
-const whereParamPrefix = "$where";
-const mapDynamicParams = (params, onDynamicParam) => {
-  if (!params) {
-    return params;
-  }
-  return Object.fromEntries(Object.entries(params).map(([key, value]) => {
-    if (___default["default"].isArray(value)) {
-      return [key, value.map(v => {
-        return ___default["default"].isString(v) && isDynamicFilterParam(v) ? onDynamicParam(v) : v;
-      })];
-    } else {
-      return [key, ___default["default"].isString(value) && isDynamicFilterParam(value) ? onDynamicParam(value) : value];
-    }
-  }));
-};
-const relativeDatePlaceholderRegex = /\$(?:start-|end-|start-of-day-|end-of-day-)?(\d+)-(second|minute|hour|day|week|month|quarter|year)-(before-now|after-now)-(date-time|date)/;
-const getRelativeDateValue = ({
-  isStartOfInterval,
-  unitForStart,
-  amount,
-  unit,
-  isBeforeNow,
-  isDateTime
-}) => {
-  const result = isBeforeNow ? moment__default["default"]().subtract(amount, unit) : moment__default["default"]().add(amount, unit);
-  if (isStartOfInterval === undefined) {
-    return isDateTime ? serializeDateTime(result) : serializeDate(result);
-  } else {
-    const resultByStartEnd = isStartOfInterval ? result.startOf(unitForStart) : result.endOf(unitForStart);
-    return isDateTime ? serializeDateTime(resultByStartEnd) : serializeDate(resultByStartEnd);
-  }
-};
-const toRelativeDatePlaceholder = ({
-  isStartOfInterval,
-  unitForStart,
-  amount,
-  unit,
-  isBeforeNow,
-  isDateTime
-}) => {
-  return `$${isStartOfInterval === undefined ? "" : isStartOfInterval ? `start-of-${unitForStart}-` : `end-of-${unitForStart}-`}${amount}-${unit}-${isBeforeNow ? "before-now" : "after-now"}-${isDateTime ? "date-time" : "date"}`;
-};
-const parseRelativeDatePlaceholder = placeholder => {
-  if (typeof placeholder === "string") {
-    const relativeDatePlaceholderMatch = placeholder.match(relativeDatePlaceholderRegex);
-    if (relativeDatePlaceholderMatch) {
-      const fullMatch = relativeDatePlaceholderMatch[0];
-      const isStartOfInterval = fullMatch.startsWith("$start") ? true : fullMatch.startsWith("$end") ? false : undefined;
-      let unit = relativeDatePlaceholderMatch[2];
-      return {
-        isStartOfInterval,
-        unitForStart:
-        // Usually the "start" unit is the same as the unit for relative date calculation.
-        // e.g. when we calculate the date "1 week ago", we want the beginning of the previous week.
-        // But sometimes they are different. We have hardcoded "day" for now, but this can be extended to any unit.
-        fullMatch.startsWith("$start-of-day") || fullMatch.startsWith("$end-of-day") ? "day" : isStartOfInterval !== undefined ? unit : undefined,
-        amount: Number.parseInt(relativeDatePlaceholderMatch[1]),
-        unit,
-        isBeforeNow: relativeDatePlaceholderMatch[3] === "before-now",
-        isDateTime: relativeDatePlaceholderMatch[4] === "date-time"
-      };
-    }
-  }
-  return null;
-};
-const replacePlaceholdersInParams = params => params && ___default["default"].mapValues(params, (value, key) => {
-  const replaceFn = paramsPlaceholdersLookup[key];
-  if (replaceFn) {
-    return replaceFn();
-  }
-  const relativeDateInfo = parseRelativeDatePlaceholder(key);
-  if (relativeDateInfo) {
-    return getRelativeDateValue(relativeDateInfo);
-  }
-  return value;
-});
-const dateToDateTimeIntervalLookup = {
-  [todayDateParamPlaceholder]: {
-    start: todayStartDateTimeParamPlaceholder,
-    end: todayEndDateTimeParamPlaceholder
-  },
-  [tomorrowDateParamPlaceholder]: {
-    start: tomorrowStartDateTimeParamPlaceholder,
-    end: tomorrowEndDateTimeParamPlaceholder
-  },
-  [yesterdayDateParamPlaceholder]: {
-    start: yesterdayStartDateTimeParamPlaceholder,
-    end: yesterdayEndDateTimeParamPlaceholder
-  },
-  [weekAgoDateParamPlaceholder]: {
-    start: weekAgoStartDateTimeParamPlaceholder,
-    end: weekAgoEndDateTimeParamPlaceholder
-  },
-  [weekFromNowDateParamPlaceholder]: {
-    start: weekFromNowStartDateTimeParamPlaceholder,
-    end: weekFromNowEndDateTimeParamPlaceholder
-  },
-  [monthAgoDateParamPlaceholder]: {
-    start: monthAgoStartDateTimeParamPlaceholder,
-    end: monthAgoEndDateTimeParamPlaceholder
-  },
-  [monthFromNowDateParamPlaceholder]: {
-    start: monthFromNowStartDateTimeParamPlaceholder,
-    end: monthFromNowEndDateTimeParamPlaceholder
-  },
-  [yearAgoDateParamPlaceholder]: {
-    start: yearAgoStartDateTimeParamPlaceholder,
-    end: yearAgoEndDateTimeParamPlaceholder
-  },
-  [yearFromNowDateParamPlaceholder]: {
-    start: yearFromNowStartDateTimeParamPlaceholder,
-    end: yearFromNowEndDateTimeParamPlaceholder
-  }
-};
-
-exports.dateToDateTimeIntervalLookup = dateToDateTimeIntervalLookup;
-exports.dynamicFilterParamPrefix = dynamicFilterParamPrefix;
-exports.formulaNowDateTimeParamPlaceholder = formulaNowDateTimeParamPlaceholder;
-exports.formulaTodayDateParamPlaceholder = formulaTodayDateParamPlaceholder;
-exports.getFieldIdFromDynamicParam = getFieldIdFromDynamicParam;
-exports.getRelativeDateValue = getRelativeDateValue;
-exports.isDynamicFilterParam = isDynamicFilterParam;
-exports.mapDynamicParams = mapDynamicParams;
-exports.monthAgoDateParamPlaceholder = monthAgoDateParamPlaceholder;
-exports.monthAgoEndDateTimeParamPlaceholder = monthAgoEndDateTimeParamPlaceholder;
-exports.monthAgoStartDateTimeParamPlaceholder = monthAgoStartDateTimeParamPlaceholder;
-exports.monthFromNowDateParamPlaceholder = monthFromNowDateParamPlaceholder;
-exports.monthFromNowEndDateTimeParamPlaceholder = monthFromNowEndDateTimeParamPlaceholder;
-exports.monthFromNowStartDateTimeParamPlaceholder = monthFromNowStartDateTimeParamPlaceholder;
-exports.paramsPlaceholdersLookup = paramsPlaceholdersLookup;
-exports.parseRelativeDatePlaceholder = parseRelativeDatePlaceholder;
-exports.replacePlaceholdersInParams = replacePlaceholdersInParams;
-exports.toRelativeDatePlaceholder = toRelativeDatePlaceholder;
-exports.todayDateParamPlaceholder = todayDateParamPlaceholder;
-exports.todayEndDateTimeParamPlaceholder = todayEndDateTimeParamPlaceholder;
-exports.todayStartDateTimeParamPlaceholder = todayStartDateTimeParamPlaceholder;
-exports.tomorrowDateParamPlaceholder = tomorrowDateParamPlaceholder;
-exports.tomorrowEndDateTimeParamPlaceholder = tomorrowEndDateTimeParamPlaceholder;
-exports.tomorrowStartDateTimeParamPlaceholder = tomorrowStartDateTimeParamPlaceholder;
-exports.weekAgoDateParamPlaceholder = weekAgoDateParamPlaceholder;
-exports.weekAgoEndDateTimeParamPlaceholder = weekAgoEndDateTimeParamPlaceholder;
-exports.weekAgoStartDateTimeParamPlaceholder = weekAgoStartDateTimeParamPlaceholder;
-exports.weekFromNowDateParamPlaceholder = weekFromNowDateParamPlaceholder;
-exports.weekFromNowEndDateTimeParamPlaceholder = weekFromNowEndDateTimeParamPlaceholder;
-exports.weekFromNowStartDateTimeParamPlaceholder = weekFromNowStartDateTimeParamPlaceholder;
-exports.whereParamPrefix = whereParamPrefix;
-exports.yearAgoDateParamPlaceholder = yearAgoDateParamPlaceholder;
-exports.yearAgoEndDateTimeParamPlaceholder = yearAgoEndDateTimeParamPlaceholder;
-exports.yearAgoStartDateTimeParamPlaceholder = yearAgoStartDateTimeParamPlaceholder;
-exports.yearFromNowDateParamPlaceholder = yearFromNowDateParamPlaceholder;
-exports.yearFromNowEndDateTimeParamPlaceholder = yearFromNowEndDateTimeParamPlaceholder;
-exports.yearFromNowStartDateTimeParamPlaceholder = yearFromNowStartDateTimeParamPlaceholder;
-exports.yesterdayDateParamPlaceholder = yesterdayDateParamPlaceholder;
-exports.yesterdayEndDateTimeParamPlaceholder = yesterdayEndDateTimeParamPlaceholder;
-exports.yesterdayStartDateTimeParamPlaceholder = yesterdayStartDateTimeParamPlaceholder;

package/lib/utils.js

@@ -1,223 +0,0 @@
-var trace = require('@fibery/helpers/utils/trace');
-var _ = require('lodash');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
-
-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 => {
-  trace.assert(Array.isArray(expression), "expression must be array", {
-    expression
-  });
-  trace.assert(expression.length > 0, "empty expression does not make any sense");
-};
-const textTypes = ["fibery/text", "fibery/email", "fibery/url", "fibery/emoji"];
-const dateTypes = ["fibery/date", "fibery/date-time"];
-const dateRangeTypes = ["fibery/date-range", "fibery/date-time-range"];
-const convertableDateTypes = ["fibery/date", "fibery/date-range"];
-const numberTypes = ["fibery/int", "fibery/decimal"];
-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]
-// [=, $true, $false]
-// [=, $my-id, ["fibery/id"]]
-const binaryOperations = new Set(["=", "!=", "<", ">", "<=", ">=", "in",
-//asc: obsolete,use q/in
-"q/contains", "q/not-contains", "+", "-", "q/+", "q/-", "*", "/", "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 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]);
-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 && logicalOperators.has(expression[0]);
-const isVariableExpression = expression => ___default["default"].isString(expression) && expression.startsWith("$");
-const isMultiFieldAccess = expression => ___default["default"].isArray(expression) && expression.length === 2 && !isFunctionCallExpression(expression) && expression.every(x => ___default["default"].isString(x));
-const isMultiFieldExpression = expression => Array.isArray(expression) && !isFunctionCallExpression(expression) && expression.some(x => isMultiFieldAccess(x)) && expression.every(x => !isVariableExpression(x) && !binaryOperations.has(x) && (___default["default"].isString(x) || isMultiFieldAccess(x)));
-const isFieldExpression = expression => Array.isArray(expression) && !isFunctionCallExpression(expression) && expression.every(x => !isVariableExpression(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
-    return fromExpression === null || isFieldExpression(fromExpression) || isFromRootFieldExpression(fromExpression) || isMultiFieldExpression(fromExpression);
-  }
-  return false;
-};
-const collectFieldExpressions = (memo, expression) => {
-  if (isVariableExpression(expression)) ; else if (isFunctionCallExpression(expression)) {
-    for (const part of expression.slice(1)) {
-      if (isVariableExpression(part) || part === null) ; else {
-        if (___default["default"].isString(part)) {
-          // field path shortcut
-          memo.push([part]);
-        } else {
-          collectFieldExpressions(memo, part);
-        }
-      }
-    }
-  } else if (isFieldExpression(expression) || isMultiFieldExpression(expression)) {
-    memo.push(expression);
-  } else if (expression["q/from"] && isFieldExpression(expression["q/from"])) {
-    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]);
-    }
-  } else {
-    throw new NotImplementedError(expression, "expression");
-  }
-};
-const getFieldObjectsByFieldExpression = ({
-  typeObject,
-  expression
-}) => {
-  assertIsValidExpression(expression);
-  const fieldObjects = [];
-  let currentTypeObject = typeObject;
-  for (const fieldOrMultiFieldAccess of expression) {
-    if (isMultiFieldAccess(fieldOrMultiFieldAccess)) {
-      const [multiField, type] = fieldOrMultiFieldAccess;
-      const fieldObject = currentTypeObject.fieldObjectsByName[multiField];
-      fieldObjects.push(fieldObject);
-      const foundField = fieldObject.multiRelatedFieldObjects.find(f => f.holderType === type);
-      trace.assert(foundField, "incorrect expression for multi-field");
-      currentTypeObject = foundField.holderTypeObject;
-    } else {
-      const fieldObject = currentTypeObject.fieldObjectsByName[fieldOrMultiFieldAccess];
-      fieldObjects.push(fieldObject);
-      currentTypeObject = fieldObject.typeObject;
-    }
-  }
-  return fieldObjects;
-};
-const getFieldObjectByFieldExpression = (x // TODO: review types. using type assertion now to avoid rewriting half of app
-) => ___default["default"].last(getFieldObjectsByFieldExpression(x));
-const getFieldObjects = (expression, typeObject) => {
-  const fieldExpression = extractFieldExpressions(expression)[0];
-  return getFieldObjectsByFieldExpression({
-    typeObject,
-    expression: fieldExpression
-  });
-};
-
-/** @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);
-  return ___default["default"].uniqBy(memo, x => x.join(","));
-};
-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;
-      const fieldExpressionNew = visitorWithDefault.visitExpression(fieldExpression);
-      return [fieldExpressionNew, orderDir];
-    }),
-    visitQueryExpression: subQueryExpression => {
-      const {
-        "q/from": fromExpression,
-        "q/select": selectExpression,
-        "q/where": whereExpression,
-        "q/order-by": orderByExpression
-      } = subQueryExpression;
-      return {
-        ...subQueryExpression,
-        ...(fromExpression ? {
-          "q/from": visitorWithDefault.visitFieldExpression(fromExpression)
-        } : null),
-        ...(selectExpression ? {
-          "q/select": ___default["default"].isPlainObject(selectExpression) ? ___default["default"].mapValues(selectExpression, val => visitorWithDefault.visitExpression(val)) : visitorWithDefault.visitExpression(selectExpression)
-        } : null),
-        ...(whereExpression ? {
-          "q/where": visitorWithDefault.visitExpression(whereExpression)
-        } : null),
-        ...(orderByExpression ? {
-          "q/order-by": visitorWithDefault.visitOrderByExpression(orderByExpression)
-        } : null)
-      };
-    },
-    visitExpression: expression => {
-      if (expression === null) {
-        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) || isMultiFieldExpression(expression)) {
-        return visitorWithDefault.visitFieldExpression(expression, visitorDefault);
-      } else if (isQueryExpression(expression)) {
-        return visitorWithDefault.visitQueryExpression(expression, visitorDefault);
-      } else {
-        throw new NotImplementedError(expression, "expression");
-      }
-    }
-  };
-  visitorWithDefault = {
-    ...visitorDefault,
-    ...visitor
-  };
-  return visitorWithDefault;
-};
-
-exports.assertIsValidExpression = assertIsValidExpression;
-exports.convertableDateTypes = convertableDateTypes;
-exports.createExpressionVisitor = createExpressionVisitor;
-exports.dateRangeFunctions = dateRangeFunctions;
-exports.dateRangeTypes = dateRangeTypes;
-exports.dateTypes = dateTypes;
-exports.extractFieldExpressions = extractFieldExpressions;
-exports.firstLastFunctions = firstLastFunctions;
-exports.fromRootKeyword = fromRootKeyword;
-exports.getFieldObjectByFieldExpression = getFieldObjectByFieldExpression;
-exports.getFieldObjects = getFieldObjects;
-exports.getFieldObjectsByFieldExpression = getFieldObjectsByFieldExpression;
-exports.isAccessFunctionExpression = isAccessFunctionExpression;
-exports.isBinaryExpression = isBinaryExpression;
-exports.isCollectionFunctionExpression = isCollectionFunctionExpression;
-exports.isDateRangeFunctionExpression = isDateRangeFunctionExpression;
-exports.isFieldExpression = isFieldExpression;
-exports.isFromRootFieldExpression = isFromRootFieldExpression;
-exports.isFunctionCallExpression = isFunctionCallExpression;
-exports.isMultiFieldAccess = isMultiFieldAccess;
-exports.isMultiFieldExpression = isMultiFieldExpression;
-exports.isNaryExpression = isNaryExpression;
-exports.isQueryExpression = isQueryExpression;
-exports.isVariableExpression = isVariableExpression;
-exports.logicalOperators = logicalOperators;
-exports.mathOperators = mathOperators;
-exports.numberTypes = numberTypes;
-exports.relationalOperators = relationalOperators;
-exports.textTypes = textTypes;