@react-querybuilder/core 8.20.2 → 8.21.0

package/dist/parseJSONata.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"parseJSONata.mjs","names":[],"sources":["../src/utils/parseJSONata/utils.ts","../src/utils/parseJSONata/parseJSONata.ts"],"sourcesContent":["import type { DefaultCombinatorName, DefaultOperatorName } from '../../types';\nimport type {\n  JSONataAnd,\n  JSONataBinaryNode,\n  JSONataBlock,\n  JSONataBoolean,\n  JSONataContains,\n  JSONataEqual,\n  JSONataExprNode,\n  JSONataGreaterThan,\n  JSONataGreaterThanOrEqual,\n  JSONataIdentifier,\n  JSONataIn,\n  JSONataLessThan,\n  JSONataLessThanOrEqual,\n  JSONataList,\n  JSONataName,\n  JSONataNot,\n  JSONataNotEqual,\n  JSONataNull,\n  JSONataNumber,\n  JSONataOr,\n  JSONataPath,\n  JSONataRegex,\n  JSONataString,\n  JSONataToMillis,\n} from './types';\n\n// oxlint-disable-next-line typescript/no-explicit-any\ntype Any = any;\n\nexport const isJSONataExprNode = (expr: Any): expr is JSONataExprNode => {\n  return expr && typeof expr === 'object' && typeof expr.type === 'string';\n};\nconst isJSONataBinaryNode = (expr: Any): expr is JSONataBinaryNode =>\n  isJSONataExprNode(expr) && expr.type === 'binary';\n\n// Identifiers\nexport const isJSONataPath = (expr: Any): expr is JSONataPath =>\n  isJSONataExprNode(expr) &&\n  expr.type === 'path' &&\n  Array.isArray(expr.steps) &&\n  expr.steps.length > 0 &&\n  isJSONataExprNode(expr.steps[0]);\nexport const isJSONataName = (expr: Any): expr is JSONataName =>\n  isJSONataExprNode(expr) &&\n  expr.type === 'name' &&\n  typeof expr.value === 'string' &&\n  expr.value.length > 0;\nexport const isJSONataIdentifier = (expr: Any): expr is JSONataIdentifier =>\n  isJSONataPath(expr) && expr.steps.every(v => isJSONataName(v));\n\n// Groups\nexport const isJSONataBlock = (expr: Any): expr is JSONataBlock =>\n  isJSONataExprNode(expr) &&\n  expr.type === 'block' &&\n  Array.isArray(expr.expressions) &&\n  expr.expressions.length > 0 &&\n  isJSONataExprNode(expr.expressions[0]);\n\n// Values\nexport const isJSONataString = (expr: Any): expr is JSONataString =>\n  isJSONataExprNode(expr) && expr.type === 'string' && typeof expr.value === 'string';\nexport const isJSONataNumber = (expr: Any): expr is JSONataNumber =>\n  isJSONataExprNode(expr) && expr.type === 'number' && typeof expr.value === 'number';\nexport const isJSONataBoolean = (expr: Any): expr is JSONataBoolean =>\n  isJSONataExprNode(expr) && expr.type === 'value' && typeof expr.value === 'boolean';\nexport const isJSONataNull = (expr: Any): expr is JSONataNull =>\n  isJSONataExprNode(expr) && expr.type === 'value' && expr.value === null;\nexport const isJSONataRegex = (expr: Any): expr is JSONataRegex =>\n  isJSONataExprNode(expr) && expr.type === 'regex' && expr.value instanceof RegExp;\n\n// Combinators\nexport const isJSONataAnd = (expr: Any): expr is JSONataAnd =>\n  isJSONataBinaryNode(expr) && expr.value === 'and';\nexport const isJSONataOr = (expr: Any): expr is JSONataOr =>\n  isJSONataBinaryNode(expr) && expr.value === 'or';\n\n// Operators\nexport const isJSONataEqual = (expr: Any): expr is JSONataEqual =>\n  isJSONataBinaryNode(expr) && expr.value === '=';\nexport const isJSONataNotEqual = (expr: Any): expr is JSONataNotEqual =>\n  isJSONataBinaryNode(expr) && expr.value === '!=';\nexport const isJSONataGreaterThan = (expr: Any): expr is JSONataGreaterThan =>\n  isJSONataBinaryNode(expr) && expr.value === '>';\nexport const isJSONataGreaterThanOrEqual = (expr: Any): expr is JSONataGreaterThanOrEqual =>\n  isJSONataBinaryNode(expr) && expr.value === '>=';\nexport const isJSONataLessThan = (expr: Any): expr is JSONataLessThan =>\n  isJSONataBinaryNode(expr) && expr.value === '<';\nexport const isJSONataLessThanOrEqual = (expr: Any): expr is JSONataLessThanOrEqual =>\n  isJSONataBinaryNode(expr) && expr.value === '<=';\nexport const isJSONataIn = (expr: Any): expr is JSONataIn =>\n  isJSONataBinaryNode(expr) &&\n  expr.value === 'in' &&\n  isJSONataPath(expr.lhs) &&\n  isJSONataList(expr.rhs);\n\n// Functions\nexport const isJSONataNot = (expr: Any): expr is JSONataNot =>\n  isJSONataExprNode(expr) &&\n  expr.type === 'function' &&\n  expr.value === '(' &&\n  Array.isArray(expr.arguments) &&\n  isJSONataExprNode(expr.arguments[0]) &&\n  isJSONataExprNode(expr.procedure) &&\n  expr.procedure.value === 'not' &&\n  expr.procedure.type === 'variable';\nexport const isJSONataContains = (expr: Any): expr is JSONataContains =>\n  isJSONataExprNode(expr) &&\n  expr.type === 'function' &&\n  expr.value === '(' &&\n  Array.isArray(expr.arguments) &&\n  expr.arguments.length >= 2 &&\n  isJSONataExprNode(expr.arguments[0]) &&\n  isJSONataExprNode(expr.procedure) &&\n  expr.procedure.value === 'contains' &&\n  expr.procedure.type === 'variable';\nexport const isJSONataToMillis = (expr: Any): expr is JSONataToMillis =>\n  isJSONataExprNode(expr) &&\n  expr.type === 'function' &&\n  expr.value === '(' &&\n  Array.isArray(expr.arguments) &&\n  expr.arguments.length > 0 &&\n  isJSONataString(expr.arguments[0]) &&\n  isJSONataExprNode(expr.procedure) &&\n  expr.procedure.value === 'toMillis' &&\n  expr.procedure.type === 'variable';\n\n// Miscellaneous\nexport const isJSONataList = (expr: Any): expr is JSONataList =>\n  isJSONataExprNode(expr) &&\n  expr.type === 'unary' &&\n  expr.value === '[' &&\n  Array.isArray(expr.expressions);\nexport const isJSONataPrimitive = (expr: Any): boolean => {\n  return (\n    isJSONataString(expr) ||\n    isJSONataNumber(expr) ||\n    isJSONataBoolean(expr) ||\n    isJSONataNull(expr) ||\n    isJSONataToMillis(expr)\n  );\n};\nexport const isJSONataPrimitiveList = (expr: Any): boolean =>\n  isJSONataList(expr) && expr.expressions.every(v => isJSONataPrimitive(v));\nexport const isJSONataIdentifierList = (expr: Any): boolean =>\n  isJSONataList(expr) && expr.expressions.every(v => isJSONataIdentifier(v));\nexport const isJSONataValidValue = (expr: Any): boolean =>\n  isJSONataPrimitive(expr) ||\n  isJSONataRegex(expr) ||\n  isJSONataIdentifier(expr) ||\n  isJSONataPrimitiveList(expr) ||\n  isJSONataIdentifierList(expr) ||\n  isJSONataToMillis(expr);\nexport const isJSONataComparison = (\n  expr: Any\n): expr is\n  | JSONataEqual\n  | JSONataNotEqual\n  | JSONataGreaterThan\n  | JSONataGreaterThanOrEqual\n  | JSONataLessThan\n  | JSONataLessThanOrEqual =>\n  isJSONataEqual(expr) ||\n  isJSONataNotEqual(expr) ||\n  isJSONataGreaterThan(expr) ||\n  isJSONataGreaterThanOrEqual(expr) ||\n  isJSONataLessThan(expr) ||\n  isJSONataLessThanOrEqual(expr);\n\nexport const getValidValue = (expr: Any): Any => {\n  if (isJSONataToMillis(expr)) {\n    return getValidValue(expr.arguments[0]);\n  } else if (isJSONataIdentifier(expr)) {\n    return getFieldFromPath(expr);\n  } else if (isJSONataPrimitiveList(expr)) {\n    return expr.expressions.map((v: Any) => getValidValue(v));\n  } else if (isJSONataIdentifierList(expr)) {\n    return expr.expressions.map((v: Any) => getFieldFromPath(v));\n  }\n  return expr.value;\n};\n\nexport const getFieldFromPath = (path: JSONataPath): string =>\n  isJSONataIdentifier(path)\n    ? path.steps.map(s => s.value).join('.')\n    : /* v8 ignore next -- @preserve */ '';\n\nexport const normalizeOperator = (\n  opType: DefaultOperatorName,\n  flip?: boolean\n): DefaultOperatorName => {\n  if (flip) {\n    if (opType === '<') return '>';\n    if (opType === '<=') return '>=';\n    if (opType === '>') return '<';\n    if (opType === '>=') return '<=';\n  }\n  return opType;\n};\n\nexport const negatedLikeOperators: Record<\n  Extract<DefaultOperatorName, 'beginsWith' | 'contains' | 'endsWith'>,\n  DefaultOperatorName\n> = {\n  contains: 'doesNotContain',\n  beginsWith: 'doesNotBeginWith',\n  endsWith: 'doesNotEndWith',\n} satisfies Record<\n  Extract<DefaultOperatorName, 'beginsWith' | 'contains' | 'endsWith'>,\n  DefaultOperatorName\n>;\n\nexport const generateFlatAndOrList = (\n  expr: JSONataExprNode\n): (DefaultCombinatorName | JSONataExprNode)[] => {\n  // v8 ignore else\n  if (isJSONataAnd(expr) || isJSONataOr(expr)) {\n    const { lhs, rhs, value: combinator } = expr;\n    if (isJSONataAnd(lhs) || isJSONataOr(lhs)) {\n      return [...generateFlatAndOrList(lhs), combinator, rhs];\n    }\n    return [lhs, combinator, rhs];\n  }\n  // v8 ignore next\n  return [];\n};\n\nexport const generateMixedAndOrList = (\n  expr: JSONataAnd | JSONataOr\n): (JSONataExprNode | DefaultCombinatorName | (JSONataExprNode | 'and')[])[] => {\n  const arr = generateFlatAndOrList(expr);\n  const returnArray: (DefaultCombinatorName | JSONataExprNode | ('and' | JSONataExprNode)[])[] = [];\n  let startIndex = 0;\n  for (let i = 0; i < arr.length; i += 2) {\n    if (arr[i + 1] === 'and') {\n      startIndex = i;\n      let j = 1;\n      while (arr[startIndex + j] === 'and') {\n        i += 2;\n        j += 2;\n      }\n      const tempAndArray = arr.slice(startIndex, i + 1) as ('and' | JSONataExprNode)[];\n      returnArray.push(tempAndArray);\n      i -= 2;\n    } else if (arr[i + 1] === 'or') {\n      if (i === 0 || i === arr.length - 3) {\n        if (i === 0 || arr[i - 1] === 'or') {\n          returnArray.push(arr[i]);\n        }\n        returnArray.push(arr[i + 1]);\n        if (i === arr.length - 3) {\n          returnArray.push(arr[i + 2]);\n        }\n      } else {\n        if (arr[i - 1] === 'and') {\n          returnArray.push(arr[i + 1]);\n        } else {\n          returnArray.push(arr[i], arr[i + 1]);\n        }\n      }\n    }\n  }\n  if (returnArray.length === 1 && Array.isArray(returnArray[0])) {\n    // If length is 1, then the only element is an AND array so just return that\n    return returnArray[0];\n  }\n  return returnArray;\n};\n","import jsonata from 'jsonata';\nimport type { Except } from 'type-fest';\nimport type {\n  DefaultCombinatorName,\n  DefaultOperatorName,\n  DefaultRuleGroupArray,\n  DefaultRuleGroupICArray,\n  DefaultRuleGroupType,\n  DefaultRuleGroupTypeAny,\n  DefaultRuleGroupTypeIC,\n  DefaultRuleType,\n  ValueSource,\n} from '../../types';\nimport type { ParserCommonOptions } from '../../types/import';\nimport { isRuleGroup } from '../isRuleGroup';\nimport { fieldIsValidUtil, getFieldsArray } from '../parserUtils';\nimport { prepareRuleGroup } from '../prepareQueryObjects';\nimport type { JSONataExprNode } from './types';\nimport {\n  generateFlatAndOrList,\n  generateMixedAndOrList,\n  getFieldFromPath,\n  getValidValue,\n  isJSONataAnd,\n  isJSONataBlock,\n  isJSONataComparison,\n  isJSONataContains,\n  isJSONataIdentifier,\n  isJSONataIdentifierList,\n  isJSONataIn,\n  isJSONataNot,\n  isJSONataOr,\n  isJSONataRegex,\n  isJSONataString,\n  isJSONataValidValue,\n  negatedLikeOperators,\n  normalizeOperator,\n} from './utils';\n\n/**\n * Options object for {@link parseJSONata}.\n *\n * Note: `listsAsArrays` is ignored by `parseJSONata`; lists are _always_ arrays.\n */\nexport interface ParseJSONataOptions extends ParserCommonOptions {}\n\n/**\n * Converts a JSONata string expression into a query suitable for the\n * {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props\n * ({@link index!DefaultRuleGroupType DefaultRuleGroupType}).\n */\nfunction parseJSONata(jsonataInput: string): DefaultRuleGroupType;\n/**\n * Converts a JSONata string expression into a query suitable for the\n * {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props\n * ({@link index!DefaultRuleGroupType DefaultRuleGroupType}).\n */\nfunction parseJSONata(\n  jsonataInput: string,\n  options: Except<ParseJSONataOptions, 'independentCombinators'> & {\n    independentCombinators?: false;\n  }\n): DefaultRuleGroupType;\n/**\n * Converts a JSONata string expression into a query suitable for the\n * {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props\n * ({@link index!DefaultRuleGroupTypeIC DefaultRuleGroupTypeIC}).\n */\nfunction parseJSONata(\n  jsonataInput: string,\n  options: Except<ParseJSONataOptions, 'independentCombinators'> & {\n    independentCombinators: true;\n  }\n): DefaultRuleGroupTypeIC;\nfunction parseJSONata(\n  jsonataInput: string,\n  options: ParseJSONataOptions = {}\n): DefaultRuleGroupTypeAny {\n  const { fields, independentCombinators, listsAsArrays: _laa } = options;\n  const ic = !!independentCombinators;\n  const fieldsFlat = getFieldsArray(fields);\n\n  const fieldIsValid = (\n    fieldName: string,\n    operator: DefaultOperatorName,\n    subordinateFieldName?: string\n  ) =>\n    fieldIsValidUtil({\n      fieldName,\n      fieldsFlat,\n      operator,\n      subordinateFieldName,\n      getValueSources: options?.getValueSources,\n    });\n\n  const emptyQuery: DefaultRuleGroupTypeAny = {\n    rules: [],\n    ...(ic ? {} : { combinator: 'and' }),\n  };\n\n  const parseJSONataAST = (\n    expr: JSONataExprNode,\n    processOpts: {\n      groupOnlyIfNecessary?: boolean;\n      forwardNegation?: boolean;\n    } = {}\n  ): DefaultRuleType | DefaultRuleGroupTypeAny | null => {\n    const { forwardNegation: _forwardedNegation, groupOnlyIfNecessary: _g } = processOpts;\n    if (isJSONataBlock(expr)) {\n      if (\n        isJSONataAnd(expr.expressions[0]) ||\n        isJSONataOr(expr.expressions[0]) ||\n        isJSONataBlock(expr.expressions[0])\n      ) {\n        return parseJSONataAST(expr.expressions[0]);\n      }\n      const blockOfExpr = parseJSONataAST(expr.expressions[0]);\n      // v8 ignore else\n      if (blockOfExpr) {\n        return ic\n          ? ({ rules: [blockOfExpr] } as DefaultRuleGroupTypeIC)\n          : ({\n              combinator: 'and',\n              rules: [blockOfExpr],\n            } as DefaultRuleGroupType);\n      }\n    } else if (isJSONataAnd(expr) || isJSONataOr(expr)) {\n      if (ic) {\n        const andOrList = generateFlatAndOrList(expr);\n        const rules = andOrList.map(v => {\n          if (typeof v === 'string') {\n            return v;\n          }\n          return parseJSONataAST(v);\n        });\n        // Bail out completely if any rules in the list were invalid\n        // so as not to return an incorrect and/or sequence\n        if (!rules.every(Boolean)) {\n          return null;\n        }\n\n        // Reduce this group to a single between/notBetween rule if possible\n        if (\n          ((rs: unknown[]): rs is [DefaultRuleType, DefaultCombinatorName, DefaultRuleType] =>\n            rs.length === 3 &&\n            (rs[1] === 'and' || rs[1] === 'or') &&\n            !isRuleGroup(rs[0]) &&\n            !isRuleGroup(rs[2]))(rules) &&\n          rules[0].field === rules[2].field &&\n          (rules[0].valueSource ?? 'value') === (rules[2].valueSource ?? 'value') &&\n          ((rules[1] === 'and' &&\n            ((rules[0].operator === '>=' && rules[2].operator === '<=') ||\n              (rules[0].operator === '<=' && rules[2].operator === '>='))) ||\n            (rules[1] === 'or' &&\n              ((rules[0].operator === '>' && rules[2].operator === '<') ||\n                (rules[0].operator === '<' && rules[2].operator === '>'))))\n        ) {\n          return {\n            field: rules[0].field,\n            operator: rules[1] === 'and' ? 'between' : 'notBetween',\n            value:\n              (rules[1] === 'and' && rules[0].operator === '<=') ||\n              (rules[1] === 'or' && rules[0].operator === '>')\n                ? [rules[2].value, rules[0].value]\n                : [rules[0].value, rules[2].value],\n            ...(rules[0].valueSource ? { valueSource: rules[0].valueSource } : null),\n          };\n        }\n\n        return {\n          rules: rules as DefaultRuleGroupICArray,\n        };\n      }\n      const andOrList = generateMixedAndOrList(expr);\n      const combinator = andOrList[1] as DefaultCombinatorName;\n      const filteredList = andOrList\n        .filter(v => Array.isArray(v) || (!!v && typeof v !== 'string' && 'type' in v))\n        .map(v =>\n          Array.isArray(v) ? v.filter(vf => !!v && typeof vf !== 'string' && 'type' in vf) : v\n        ) as (JSONataExprNode | JSONataExprNode[])[];\n      const rules = filteredList\n        .map((exp): DefaultRuleGroupType | DefaultRuleType | null => {\n          if (Array.isArray(exp)) {\n            return {\n              combinator: 'and',\n              rules: exp.map(e => parseJSONataAST(e)).filter(Boolean) as DefaultRuleGroupArray,\n            };\n          }\n          return parseJSONataAST(exp) as DefaultRuleType | DefaultRuleGroupType | null;\n        })\n        .filter(Boolean) as DefaultRuleGroupArray;\n\n      // Reduce this group to a single between/notBetween rule if possible\n      if (\n        ((rs: unknown[]): rs is [DefaultRuleType, DefaultRuleType] =>\n          rs.length === 2 && !isRuleGroup(rs[0]) && !isRuleGroup(rs[1]))(rules) &&\n        rules[0].field === rules[1].field &&\n        (rules[0].valueSource ?? 'value') === (rules[1].valueSource ?? 'value') &&\n        ((combinator === 'and' &&\n          ((rules[0].operator === '>=' && rules[1].operator === '<=') ||\n            (rules[0].operator === '<=' && rules[1].operator === '>='))) ||\n          (combinator === 'or' &&\n            ((rules[0].operator === '>' && rules[1].operator === '<') ||\n              (rules[0].operator === '<' && rules[1].operator === '>'))))\n      ) {\n        return {\n          field: rules[0].field,\n          operator: combinator === 'and' ? 'between' : 'notBetween',\n          value:\n            (combinator === 'and' && rules[0].operator === '<=') ||\n            (combinator === 'or' && rules[0].operator === '>')\n              ? [rules[1].value, rules[0].value]\n              : [rules[0].value, rules[1].value],\n          ...(rules[0].valueSource ? { valueSource: rules[0].valueSource } : null),\n        };\n      }\n\n      // v8 ignore else\n      if (rules.length > 0) {\n        return { combinator, rules };\n      }\n    } else if (isJSONataNot(expr)) {\n      const negatedExpr = parseJSONataAST(expr.arguments[0]);\n      // v8 ignore else\n      if (negatedExpr) {\n        if (\n          !isRuleGroup(negatedExpr) &&\n          (negatedExpr.operator === 'contains' ||\n            negatedExpr.operator === 'beginsWith' ||\n            negatedExpr.operator === 'endsWith')\n        ) {\n          return {\n            ...negatedExpr,\n            operator: negatedLikeOperators[negatedExpr.operator],\n          };\n        }\n        return ic\n          ? ({ rules: [negatedExpr], not: true } as DefaultRuleGroupTypeIC)\n          : ({\n              combinator: 'and',\n              rules: [negatedExpr],\n              not: true,\n            } as DefaultRuleGroupType);\n      }\n    } else if (isJSONataContains(expr)) {\n      const [arg1, arg2] = expr.arguments;\n      let field: string = '';\n      let regex: string | RegExp = '';\n      let valueSource: ValueSource | undefined = undefined;\n      // v8 ignore else\n      if (isJSONataIdentifier(arg1)) {\n        field = getFieldFromPath(arg1);\n        if (isJSONataIdentifier(arg2)) {\n          regex = getFieldFromPath(arg2);\n          valueSource = 'field';\n        } else {\n          // v8 ignore else\n          if (isJSONataString(arg2) || isJSONataRegex(arg2)) {\n            regex = getValidValue(arg2);\n          }\n        }\n      }\n\n      // v8 ignore else\n      if (\n        valueSource === 'field'\n          ? fieldIsValid(field, 'contains', regex as string)\n          : fieldIsValid(field, 'contains')\n      ) {\n        return {\n          field,\n          operator: 'contains',\n          value: regex,\n          ...(valueSource ? { valueSource } : {}),\n        };\n      }\n    } else if (isJSONataIn(expr)) {\n      const field = getFieldFromPath(expr.lhs);\n      let valueSource: ValueSource | undefined = undefined;\n      if (isJSONataIdentifierList(expr.rhs)) {\n        valueSource = 'field';\n      }\n      if (isJSONataValidValue(expr.rhs)) {\n        // oxlint-disable-next-line typescript/no-explicit-any\n        const value: any[] = getValidValue(expr.rhs);\n        // v8 ignore else\n        if (\n          field &&\n          value.every(v => fieldIsValid(field, 'in', valueSource === 'field' ? v : undefined))\n        ) {\n          return { field, operator: 'in', value, ...(valueSource ? { valueSource } : {}) };\n        }\n      }\n    } else if (isJSONataComparison(expr)) {\n      let field: string | null = null;\n      // oxlint-disable-next-line typescript/no-explicit-any\n      let value: any = undefined;\n      let valueSource: ValueSource | undefined = undefined;\n      let flip = false;\n      const { lhs, rhs } = expr;\n\n      if (isJSONataIdentifier(lhs) && isJSONataValidValue(rhs)) {\n        field = getFieldFromPath(lhs);\n        value = getValidValue(rhs);\n        if (isJSONataIdentifier(rhs)) {\n          valueSource = 'field';\n        }\n      } else {\n        // v8 ignore else\n        if (isJSONataIdentifier(rhs) && isJSONataValidValue(lhs)) {\n          flip = true;\n          field = getFieldFromPath(rhs);\n          value = getValidValue(lhs);\n        }\n      }\n      let operator = normalizeOperator(expr.value, flip);\n      if (value === null && (operator === '=' || operator === '!=')) {\n        operator = operator === '=' ? 'null' : 'notNull';\n      }\n      if (\n        field &&\n        fieldIsValid(field, operator, valueSource === 'field' ? value : undefined) &&\n        value !== undefined\n      ) {\n        return valueSource ? { field, operator, value, valueSource } : { field, operator, value };\n      }\n    }\n    return null;\n  };\n\n  const prepare = options.generateIDs ? prepareRuleGroup : <T>(g: T) => g;\n\n  let jsonataExpr: jsonata.Expression;\n  try {\n    jsonataExpr = jsonata(jsonataInput);\n  } catch {\n    return prepare(emptyQuery);\n  }\n  const jsonataAST = jsonataExpr.ast() as JSONataExprNode;\n\n  const result = parseJSONataAST(jsonataAST);\n  if (result) {\n    if (isRuleGroup(result)) {\n      return prepare(result);\n    }\n    return prepare({ rules: [result], ...(ic ? {} : { combinator: 'and' }) });\n  }\n\n  return prepare(emptyQuery);\n}\n\nexport { parseJSONata };\n"],"mappings":";;;;AA+BA,MAAa,qBAAqB,SAAuC;CACvE,OAAO,QAAQ,OAAO,SAAS,YAAY,OAAO,KAAK,SAAS;AAClE;AACA,MAAM,uBAAuB,SAC3B,kBAAkB,IAAI,KAAK,KAAK,SAAS;AAG3C,MAAa,iBAAiB,SAC5B,kBAAkB,IAAI,KACtB,KAAK,SAAS,UACd,MAAM,QAAQ,KAAK,KAAK,KACxB,KAAK,MAAM,SAAS,KACpB,kBAAkB,KAAK,MAAM,EAAE;AACjC,MAAa,iBAAiB,SAC5B,kBAAkB,IAAI,KACtB,KAAK,SAAS,UACd,OAAO,KAAK,UAAU,YACtB,KAAK,MAAM,SAAS;AACtB,MAAa,uBAAuB,SAClC,cAAc,IAAI,KAAK,KAAK,MAAM,OAAM,MAAK,cAAc,CAAC,CAAC;AAG/D,MAAa,kBAAkB,SAC7B,kBAAkB,IAAI,KACtB,KAAK,SAAS,WACd,MAAM,QAAQ,KAAK,WAAW,KAC9B,KAAK,YAAY,SAAS,KAC1B,kBAAkB,KAAK,YAAY,EAAE;AAGvC,MAAa,mBAAmB,SAC9B,kBAAkB,IAAI,KAAK,KAAK,SAAS,YAAY,OAAO,KAAK,UAAU;AAC7E,MAAa,mBAAmB,SAC9B,kBAAkB,IAAI,KAAK,KAAK,SAAS,YAAY,OAAO,KAAK,UAAU;AAC7E,MAAa,oBAAoB,SAC/B,kBAAkB,IAAI,KAAK,KAAK,SAAS,WAAW,OAAO,KAAK,UAAU;AAC5E,MAAa,iBAAiB,SAC5B,kBAAkB,IAAI,KAAK,KAAK,SAAS,WAAW,KAAK,UAAU;AACrE,MAAa,kBAAkB,SAC7B,kBAAkB,IAAI,KAAK,KAAK,SAAS,WAAW,KAAK,iBAAiB;AAG5E,MAAa,gBAAgB,SAC3B,oBAAoB,IAAI,KAAK,KAAK,UAAU;AAC9C,MAAa,eAAe,SAC1B,oBAAoB,IAAI,KAAK,KAAK,UAAU;AAG9C,MAAa,kBAAkB,SAC7B,oBAAoB,IAAI,KAAK,KAAK,UAAU;AAC9C,MAAa,qBAAqB,SAChC,oBAAoB,IAAI,KAAK,KAAK,UAAU;AAC9C,MAAa,wBAAwB,SACnC,oBAAoB,IAAI,KAAK,KAAK,UAAU;AAC9C,MAAa,+BAA+B,SAC1C,oBAAoB,IAAI,KAAK,KAAK,UAAU;AAC9C,MAAa,qBAAqB,SAChC,oBAAoB,IAAI,KAAK,KAAK,UAAU;AAC9C,MAAa,4BAA4B,SACvC,oBAAoB,IAAI,KAAK,KAAK,UAAU;AAC9C,MAAa,eAAe,SAC1B,oBAAoB,IAAI,KACxB,KAAK,UAAU,QACf,cAAc,KAAK,GAAG,KACtB,cAAc,KAAK,GAAG;AAGxB,MAAa,gBAAgB,SAC3B,kBAAkB,IAAI,KACtB,KAAK,SAAS,cACd,KAAK,UAAU,OACf,MAAM,QAAQ,KAAK,SAAS,KAC5B,kBAAkB,KAAK,UAAU,EAAE,KACnC,kBAAkB,KAAK,SAAS,KAChC,KAAK,UAAU,UAAU,SACzB,KAAK,UAAU,SAAS;AAC1B,MAAa,qBAAqB,SAChC,kBAAkB,IAAI,KACtB,KAAK,SAAS,cACd,KAAK,UAAU,OACf,MAAM,QAAQ,KAAK,SAAS,KAC5B,KAAK,UAAU,UAAU,KACzB,kBAAkB,KAAK,UAAU,EAAE,KACnC,kBAAkB,KAAK,SAAS,KAChC,KAAK,UAAU,UAAU,cACzB,KAAK,UAAU,SAAS;AAC1B,MAAa,qBAAqB,SAChC,kBAAkB,IAAI,KACtB,KAAK,SAAS,cACd,KAAK,UAAU,OACf,MAAM,QAAQ,KAAK,SAAS,KAC5B,KAAK,UAAU,SAAS,KACxB,gBAAgB,KAAK,UAAU,EAAE,KACjC,kBAAkB,KAAK,SAAS,KAChC,KAAK,UAAU,UAAU,cACzB,KAAK,UAAU,SAAS;AAG1B,MAAa,iBAAiB,SAC5B,kBAAkB,IAAI,KACtB,KAAK,SAAS,WACd,KAAK,UAAU,OACf,MAAM,QAAQ,KAAK,WAAW;AAChC,MAAa,sBAAsB,SAAuB;CACxD,OACE,gBAAgB,IAAI,KACpB,gBAAgB,IAAI,KACpB,iBAAiB,IAAI,KACrB,cAAc,IAAI,KAClB,kBAAkB,IAAI;AAE1B;AACA,MAAa,0BAA0B,SACrC,cAAc,IAAI,KAAK,KAAK,YAAY,OAAM,MAAK,mBAAmB,CAAC,CAAC;AAC1E,MAAa,2BAA2B,SACtC,cAAc,IAAI,KAAK,KAAK,YAAY,OAAM,MAAK,oBAAoB,CAAC,CAAC;AAC3E,MAAa,uBAAuB,SAClC,mBAAmB,IAAI,KACvB,eAAe,IAAI,KACnB,oBAAoB,IAAI,KACxB,uBAAuB,IAAI,KAC3B,wBAAwB,IAAI,KAC5B,kBAAkB,IAAI;AACxB,MAAa,uBACX,SAQA,eAAe,IAAI,KACnB,kBAAkB,IAAI,KACtB,qBAAqB,IAAI,KACzB,4BAA4B,IAAI,KAChC,kBAAkB,IAAI,KACtB,yBAAyB,IAAI;AAE/B,MAAa,iBAAiB,SAAmB;CAC/C,IAAI,kBAAkB,IAAI,GACxB,OAAO,cAAc,KAAK,UAAU,EAAE;MACjC,IAAI,oBAAoB,IAAI,GACjC,OAAO,iBAAiB,IAAI;MACvB,IAAI,uBAAuB,IAAI,GACpC,OAAO,KAAK,YAAY,KAAK,MAAW,cAAc,CAAC,CAAC;MACnD,IAAI,wBAAwB,IAAI,GACrC,OAAO,KAAK,YAAY,KAAK,MAAW,iBAAiB,CAAC,CAAC;CAE7D,OAAO,KAAK;AACd;AAEA,MAAa,oBAAoB,SAC/B,oBAAoB,IAAI,IACpB,KAAK,MAAM,KAAI,MAAK,EAAE,KAAK,CAAC,CAAC,KAAK,GAAG,sCACH;AAExC,MAAa,qBACX,QACA,SACwB;CACxB,IAAI,MAAM;EACR,IAAI,WAAW,KAAK,OAAO;EAC3B,IAAI,WAAW,MAAM,OAAO;EAC5B,IAAI,WAAW,KAAK,OAAO;EAC3B,IAAI,WAAW,MAAM,OAAO;CAC9B;CACA,OAAO;AACT;AAEA,MAAa,uBAGT;CACF,UAAU;CACV,YAAY;CACZ,UAAU;AACZ;AAKA,MAAa,yBACX,SACgD;;CAEhD,IAAI,aAAa,IAAI,KAAK,YAAY,IAAI,GAAG;EAC3C,MAAM,EAAE,KAAK,KAAK,OAAO,eAAe;EACxC,IAAI,aAAa,GAAG,KAAK,YAAY,GAAG,GACtC,OAAO;GAAC,GAAG,sBAAsB,GAAG;GAAG;GAAY;EAAG;EAExD,OAAO;GAAC;GAAK;GAAY;EAAG;CAC9B;;CAEA,OAAO,CAAC;AACV;AAEA,MAAa,0BACX,SAC8E;CAC9E,MAAM,MAAM,sBAAsB,IAAI;CACtC,MAAM,cAAyF,CAAC;CAChG,IAAI,aAAa;CACjB,KAAK,IAAI,IAAI,GAAG,IAAI,IAAI,QAAQ,KAAK,GACnC,IAAI,IAAI,IAAI,OAAO,OAAO;EACxB,aAAa;EACb,IAAI,IAAI;EACR,OAAO,IAAI,aAAa,OAAO,OAAO;GACpC,KAAK;GACL,KAAK;EACP;EACA,MAAM,eAAe,IAAI,MAAM,YAAY,IAAI,CAAC;EAChD,YAAY,KAAK,YAAY;EAC7B,KAAK;CACP,OAAO,IAAI,IAAI,IAAI,OAAO,MACxB,IAAI,MAAM,KAAK,MAAM,IAAI,SAAS,GAAG;EACnC,IAAI,MAAM,KAAK,IAAI,IAAI,OAAO,MAC5B,YAAY,KAAK,IAAI,EAAE;EAEzB,YAAY,KAAK,IAAI,IAAI,EAAE;EAC3B,IAAI,MAAM,IAAI,SAAS,GACrB,YAAY,KAAK,IAAI,IAAI,EAAE;CAE/B,OACE,IAAI,IAAI,IAAI,OAAO,OACjB,YAAY,KAAK,IAAI,IAAI,EAAE;MAE3B,YAAY,KAAK,IAAI,IAAI,IAAI,IAAI,EAAE;CAK3C,IAAI,YAAY,WAAW,KAAK,MAAM,QAAQ,YAAY,EAAE,GAE1D,OAAO,YAAY;CAErB,OAAO;AACT;;;AClMA,SAAS,aACP,cACA,UAA+B,CAAC,GACP;CACzB,MAAM,EAAE,QAAQ,wBAAwB,eAAe,SAAS;CAChE,MAAM,KAAK,CAAC,CAAC;CACb,MAAM,aAAa,eAAe,MAAM;CAExC,MAAM,gBACJ,WACA,UACA,yBAEA,iBAAiB;EACf;EACA;EACA;EACA;EACA,iBAAiB,SAAS;CAC5B,CAAC;CAEH,MAAM,aAAsC;EAC1C,OAAO,CAAC;EACR,GAAI,KAAK,CAAC,IAAI,EAAE,YAAY,MAAM;CACpC;CAEA,MAAM,mBACJ,MACA,cAGI,CAAC,MACgD;EACrD,MAAM,EAAE,iBAAiB,oBAAoB,sBAAsB,OAAO;EAC1E,IAAI,eAAe,IAAI,GAAG;GACxB,IACE,aAAa,KAAK,YAAY,EAAE,KAChC,YAAY,KAAK,YAAY,EAAE,KAC/B,eAAe,KAAK,YAAY,EAAE,GAElC,OAAO,gBAAgB,KAAK,YAAY,EAAE;GAE5C,MAAM,cAAc,gBAAgB,KAAK,YAAY,EAAE;;GAEvD,IAAI,aACF,OAAO,KACF,EAAE,OAAO,CAAC,WAAW,EAAE,IACvB;IACC,YAAY;IACZ,OAAO,CAAC,WAAW;GACrB;EAER,OAAO,IAAI,aAAa,IAAI,KAAK,YAAY,IAAI,GAAG;GAClD,IAAI,IAAI;IAEN,MAAM,QADY,sBAAsB,IAClB,CAAC,CAAC,KAAI,MAAK;KAC/B,IAAI,OAAO,MAAM,UACf,OAAO;KAET,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAGD,IAAI,CAAC,MAAM,MAAM,OAAO,GACtB,OAAO;IAIT,MACI,OACA,GAAG,WAAW,MACb,GAAG,OAAO,SAAS,GAAG,OAAO,SAC9B,CAAC,YAAY,GAAG,EAAE,KAClB,CAAC,YAAY,GAAG,EAAE,EAAA,CAAG,KAAK,KAC5B,MAAM,EAAE,CAAC,UAAU,MAAM,EAAE,CAAC,UAC3B,MAAM,EAAE,CAAC,eAAe,cAAc,MAAM,EAAE,CAAC,eAAe,aAC7D,MAAM,OAAO,UACX,MAAM,EAAE,CAAC,aAAa,QAAQ,MAAM,EAAE,CAAC,aAAa,QACnD,MAAM,EAAE,CAAC,aAAa,QAAQ,MAAM,EAAE,CAAC,aAAa,SACtD,MAAM,OAAO,SACV,MAAM,EAAE,CAAC,aAAa,OAAO,MAAM,EAAE,CAAC,aAAa,OAClD,MAAM,EAAE,CAAC,aAAa,OAAO,MAAM,EAAE,CAAC,aAAa,OAE1D,OAAO;KACL,OAAO,MAAM,EAAE,CAAC;KAChB,UAAU,MAAM,OAAO,QAAQ,YAAY;KAC3C,OACG,MAAM,OAAO,SAAS,MAAM,EAAE,CAAC,aAAa,QAC5C,MAAM,OAAO,QAAQ,MAAM,EAAE,CAAC,aAAa,MACxC,CAAC,MAAM,EAAE,CAAC,OAAO,MAAM,EAAE,CAAC,KAAK,IAC/B,CAAC,MAAM,EAAE,CAAC,OAAO,MAAM,EAAE,CAAC,KAAK;KACrC,GAAI,MAAM,EAAE,CAAC,cAAc,EAAE,aAAa,MAAM,EAAE,CAAC,YAAY,IAAI;IACrE;IAGF,OAAO,EACE,MACT;GACF;GACA,MAAM,YAAY,uBAAuB,IAAI;GAC7C,MAAM,aAAa,UAAU;GAM7B,MAAM,QALe,UAClB,QAAO,MAAK,MAAM,QAAQ,CAAC,KAAM,CAAC,CAAC,KAAK,OAAO,MAAM,YAAY,UAAU,CAAE,CAAC,CAC9E,KAAI,MACH,MAAM,QAAQ,CAAC,IAAI,EAAE,QAAO,OAAM,CAAC,CAAC,KAAK,OAAO,OAAO,YAAY,UAAU,EAAE,IAAI,CAE9D,CAAC,CACvB,KAAK,QAAuD;IAC3D,IAAI,MAAM,QAAQ,GAAG,GACnB,OAAO;KACL,YAAY;KACZ,OAAO,IAAI,KAAI,MAAK,gBAAgB,CAAC,CAAC,CAAC,CAAC,OAAO,OAAO;IACxD;IAEF,OAAO,gBAAgB,GAAG;GAC5B,CAAC,CAAC,CACD,OAAO,OAAO;GAGjB,MACI,OACA,GAAG,WAAW,KAAK,CAAC,YAAY,GAAG,EAAE,KAAK,CAAC,YAAY,GAAG,EAAE,EAAA,CAAG,KAAK,KACtE,MAAM,EAAE,CAAC,UAAU,MAAM,EAAE,CAAC,UAC3B,MAAM,EAAE,CAAC,eAAe,cAAc,MAAM,EAAE,CAAC,eAAe,aAC7D,eAAe,UACb,MAAM,EAAE,CAAC,aAAa,QAAQ,MAAM,EAAE,CAAC,aAAa,QACnD,MAAM,EAAE,CAAC,aAAa,QAAQ,MAAM,EAAE,CAAC,aAAa,SACtD,eAAe,SACZ,MAAM,EAAE,CAAC,aAAa,OAAO,MAAM,EAAE,CAAC,aAAa,OAClD,MAAM,EAAE,CAAC,aAAa,OAAO,MAAM,EAAE,CAAC,aAAa,OAE1D,OAAO;IACL,OAAO,MAAM,EAAE,CAAC;IAChB,UAAU,eAAe,QAAQ,YAAY;IAC7C,OACG,eAAe,SAAS,MAAM,EAAE,CAAC,aAAa,QAC9C,eAAe,QAAQ,MAAM,EAAE,CAAC,aAAa,MAC1C,CAAC,MAAM,EAAE,CAAC,OAAO,MAAM,EAAE,CAAC,KAAK,IAC/B,CAAC,MAAM,EAAE,CAAC,OAAO,MAAM,EAAE,CAAC,KAAK;IACrC,GAAI,MAAM,EAAE,CAAC,cAAc,EAAE,aAAa,MAAM,EAAE,CAAC,YAAY,IAAI;GACrE;;GAIF,IAAI,MAAM,SAAS,GACjB,OAAO;IAAE;IAAY;GAAM;EAE/B,OAAO,IAAI,aAAa,IAAI,GAAG;GAC7B,MAAM,cAAc,gBAAgB,KAAK,UAAU,EAAE;;GAErD,IAAI,aAAa;IACf,IACE,CAAC,YAAY,WAAW,MACvB,YAAY,aAAa,cACxB,YAAY,aAAa,gBACzB,YAAY,aAAa,aAE3B,OAAO;KACL,GAAG;KACH,UAAU,qBAAqB,YAAY;IAC7C;IAEF,OAAO,KACF;KAAE,OAAO,CAAC,WAAW;KAAG,KAAK;IAAK,IAClC;KACC,YAAY;KACZ,OAAO,CAAC,WAAW;KACnB,KAAK;IACP;GACN;EACF,OAAO,IAAI,kBAAkB,IAAI,GAAG;GAClC,MAAM,CAAC,MAAM,QAAQ,KAAK;GAC1B,IAAI,QAAgB;GACpB,IAAI,QAAyB;GAC7B,IAAI,cAAuC,KAAA;;GAE3C,IAAI,oBAAoB,IAAI,GAAG;IAC7B,QAAQ,iBAAiB,IAAI;IAC7B,IAAI,oBAAoB,IAAI,GAAG;KAC7B,QAAQ,iBAAiB,IAAI;KAC7B,cAAc;IAChB,OAEE,IAAI,gBAAgB,IAAI,KAAK,eAAe,IAAI,GAC9C,QAAQ,cAAc,IAAI;GAGhC;;GAGA,IACE,gBAAgB,UACZ,aAAa,OAAO,YAAY,KAAe,IAC/C,aAAa,OAAO,UAAU,GAElC,OAAO;IACL;IACA,UAAU;IACV,OAAO;IACP,GAAI,cAAc,EAAE,YAAY,IAAI,CAAC;GACvC;EAEJ,OAAO,IAAI,YAAY,IAAI,GAAG;GAC5B,MAAM,QAAQ,iBAAiB,KAAK,GAAG;GACvC,IAAI,cAAuC,KAAA;GAC3C,IAAI,wBAAwB,KAAK,GAAG,GAClC,cAAc;GAEhB,IAAI,oBAAoB,KAAK,GAAG,GAAG;IAEjC,MAAM,QAAe,cAAc,KAAK,GAAG;;IAE3C,IACE,SACA,MAAM,OAAM,MAAK,aAAa,OAAO,MAAM,gBAAgB,UAAU,IAAI,KAAA,CAAS,CAAC,GAEnF,OAAO;KAAE;KAAO,UAAU;KAAM;KAAO,GAAI,cAAc,EAAE,YAAY,IAAI,CAAC;IAAG;GAEnF;EACF,OAAO,IAAI,oBAAoB,IAAI,GAAG;GACpC,IAAI,QAAuB;GAE3B,IAAI,QAAa,KAAA;GACjB,IAAI,cAAuC,KAAA;GAC3C,IAAI,OAAO;GACX,MAAM,EAAE,KAAK,QAAQ;GAErB,IAAI,oBAAoB,GAAG,KAAK,oBAAoB,GAAG,GAAG;IACxD,QAAQ,iBAAiB,GAAG;IAC5B,QAAQ,cAAc,GAAG;IACzB,IAAI,oBAAoB,GAAG,GACzB,cAAc;GAElB,OAEE,IAAI,oBAAoB,GAAG,KAAK,oBAAoB,GAAG,GAAG;IACxD,OAAO;IACP,QAAQ,iBAAiB,GAAG;IAC5B,QAAQ,cAAc,GAAG;GAC3B;GAEF,IAAI,WAAW,kBAAkB,KAAK,OAAO,IAAI;GACjD,IAAI,UAAU,SAAS,aAAa,OAAO,aAAa,OACtD,WAAW,aAAa,MAAM,SAAS;GAEzC,IACE,SACA,aAAa,OAAO,UAAU,gBAAgB,UAAU,QAAQ,KAAA,CAAS,KACzE,UAAU,KAAA,GAEV,OAAO,cAAc;IAAE;IAAO;IAAU;IAAO;GAAY,IAAI;IAAE;IAAO;IAAU;GAAM;EAE5F;EACA,OAAO;CACT;CAEA,MAAM,UAAU,QAAQ,cAAc,oBAAuB,MAAS;CAEtE,IAAI;CACJ,IAAI;EACF,cAAc,QAAQ,YAAY;CACpC,QAAQ;EACN,OAAO,QAAQ,UAAU;CAC3B;CAGA,MAAM,SAAS,gBAFI,YAAY,IAES,CAAC;CACzC,IAAI,QAAQ;EACV,IAAI,YAAY,MAAM,GACpB,OAAO,QAAQ,MAAM;EAEvB,OAAO,QAAQ;GAAE,OAAO,CAAC,MAAM;GAAG,GAAI,KAAK,CAAC,IAAI,EAAE,YAAY,MAAM;EAAG,CAAC;CAC1E;CAEA,OAAO,QAAQ,UAAU;AAC3B"}
+{"version":3,"file":"parseJSONata.mjs","names":[],"sources":["../src/utils/parseJSONata/utils.ts","../src/utils/parseJSONata/parseJSONata.ts"],"sourcesContent":["import type { DefaultCombinatorName, DefaultOperatorName } from '../../types';\nimport type {\n  JSONataAnd,\n  JSONataBinaryNode,\n  JSONataBlock,\n  JSONataBoolean,\n  JSONataContains,\n  JSONataEqual,\n  JSONataExprNode,\n  JSONataGreaterThan,\n  JSONataGreaterThanOrEqual,\n  JSONataIdentifier,\n  JSONataIn,\n  JSONataLessThan,\n  JSONataLessThanOrEqual,\n  JSONataList,\n  JSONataName,\n  JSONataNot,\n  JSONataNotEqual,\n  JSONataNull,\n  JSONataNumber,\n  JSONataOr,\n  JSONataPath,\n  JSONataRegex,\n  JSONataString,\n  JSONataToMillis,\n} from './types';\n\n// oxlint-disable-next-line typescript/no-explicit-any\ntype Any = any;\n\nexport const isJSONataExprNode = (expr: Any): expr is JSONataExprNode => {\n  return expr && typeof expr === 'object' && typeof expr.type === 'string';\n};\nconst isJSONataBinaryNode = (expr: Any): expr is JSONataBinaryNode =>\n  isJSONataExprNode(expr) && expr.type === 'binary';\n\n// Identifiers\nexport const isJSONataPath = (expr: Any): expr is JSONataPath =>\n  isJSONataExprNode(expr) &&\n  expr.type === 'path' &&\n  Array.isArray(expr.steps) &&\n  expr.steps.length > 0 &&\n  isJSONataExprNode(expr.steps[0]);\nexport const isJSONataName = (expr: Any): expr is JSONataName =>\n  isJSONataExprNode(expr) &&\n  expr.type === 'name' &&\n  typeof expr.value === 'string' &&\n  expr.value.length > 0;\nexport const isJSONataIdentifier = (expr: Any): expr is JSONataIdentifier =>\n  isJSONataPath(expr) && expr.steps.every(v => isJSONataName(v));\n\n// Groups\nexport const isJSONataBlock = (expr: Any): expr is JSONataBlock =>\n  isJSONataExprNode(expr) &&\n  expr.type === 'block' &&\n  Array.isArray(expr.expressions) &&\n  expr.expressions.length > 0 &&\n  isJSONataExprNode(expr.expressions[0]);\n\n// Values\nexport const isJSONataString = (expr: Any): expr is JSONataString =>\n  isJSONataExprNode(expr) && expr.type === 'string' && typeof expr.value === 'string';\nexport const isJSONataNumber = (expr: Any): expr is JSONataNumber =>\n  isJSONataExprNode(expr) && expr.type === 'number' && typeof expr.value === 'number';\nexport const isJSONataBoolean = (expr: Any): expr is JSONataBoolean =>\n  isJSONataExprNode(expr) && expr.type === 'value' && typeof expr.value === 'boolean';\nexport const isJSONataNull = (expr: Any): expr is JSONataNull =>\n  isJSONataExprNode(expr) && expr.type === 'value' && expr.value === null;\nexport const isJSONataRegex = (expr: Any): expr is JSONataRegex =>\n  isJSONataExprNode(expr) && expr.type === 'regex' && expr.value instanceof RegExp;\n\n// Combinators\nexport const isJSONataAnd = (expr: Any): expr is JSONataAnd =>\n  isJSONataBinaryNode(expr) && expr.value === 'and';\nexport const isJSONataOr = (expr: Any): expr is JSONataOr =>\n  isJSONataBinaryNode(expr) && expr.value === 'or';\n\n// Operators\nexport const isJSONataEqual = (expr: Any): expr is JSONataEqual =>\n  isJSONataBinaryNode(expr) && expr.value === '=';\nexport const isJSONataNotEqual = (expr: Any): expr is JSONataNotEqual =>\n  isJSONataBinaryNode(expr) && expr.value === '!=';\nexport const isJSONataGreaterThan = (expr: Any): expr is JSONataGreaterThan =>\n  isJSONataBinaryNode(expr) && expr.value === '>';\nexport const isJSONataGreaterThanOrEqual = (expr: Any): expr is JSONataGreaterThanOrEqual =>\n  isJSONataBinaryNode(expr) && expr.value === '>=';\nexport const isJSONataLessThan = (expr: Any): expr is JSONataLessThan =>\n  isJSONataBinaryNode(expr) && expr.value === '<';\nexport const isJSONataLessThanOrEqual = (expr: Any): expr is JSONataLessThanOrEqual =>\n  isJSONataBinaryNode(expr) && expr.value === '<=';\nexport const isJSONataIn = (expr: Any): expr is JSONataIn =>\n  isJSONataBinaryNode(expr) &&\n  expr.value === 'in' &&\n  isJSONataPath(expr.lhs) &&\n  isJSONataList(expr.rhs);\n\n// Functions\nexport const isJSONataNot = (expr: Any): expr is JSONataNot =>\n  isJSONataExprNode(expr) &&\n  expr.type === 'function' &&\n  expr.value === '(' &&\n  Array.isArray(expr.arguments) &&\n  isJSONataExprNode(expr.arguments[0]) &&\n  isJSONataExprNode(expr.procedure) &&\n  expr.procedure.value === 'not' &&\n  expr.procedure.type === 'variable';\nexport const isJSONataContains = (expr: Any): expr is JSONataContains =>\n  isJSONataExprNode(expr) &&\n  expr.type === 'function' &&\n  expr.value === '(' &&\n  Array.isArray(expr.arguments) &&\n  expr.arguments.length >= 2 &&\n  isJSONataExprNode(expr.arguments[0]) &&\n  isJSONataExprNode(expr.procedure) &&\n  expr.procedure.value === 'contains' &&\n  expr.procedure.type === 'variable';\nexport const isJSONataToMillis = (expr: Any): expr is JSONataToMillis =>\n  isJSONataExprNode(expr) &&\n  expr.type === 'function' &&\n  expr.value === '(' &&\n  Array.isArray(expr.arguments) &&\n  expr.arguments.length > 0 &&\n  isJSONataString(expr.arguments[0]) &&\n  isJSONataExprNode(expr.procedure) &&\n  expr.procedure.value === 'toMillis' &&\n  expr.procedure.type === 'variable';\n\n// Miscellaneous\nexport const isJSONataList = (expr: Any): expr is JSONataList =>\n  isJSONataExprNode(expr) &&\n  expr.type === 'unary' &&\n  expr.value === '[' &&\n  Array.isArray(expr.expressions);\nexport const isJSONataPrimitive = (expr: Any): boolean => {\n  return (\n    isJSONataString(expr) ||\n    isJSONataNumber(expr) ||\n    isJSONataBoolean(expr) ||\n    isJSONataNull(expr) ||\n    isJSONataToMillis(expr)\n  );\n};\nexport const isJSONataPrimitiveList = (expr: Any): boolean =>\n  isJSONataList(expr) && expr.expressions.every(v => isJSONataPrimitive(v));\nexport const isJSONataIdentifierList = (expr: Any): boolean =>\n  isJSONataList(expr) && expr.expressions.every(v => isJSONataIdentifier(v));\nexport const isJSONataValidValue = (expr: Any): boolean =>\n  isJSONataPrimitive(expr) ||\n  isJSONataRegex(expr) ||\n  isJSONataIdentifier(expr) ||\n  isJSONataPrimitiveList(expr) ||\n  isJSONataIdentifierList(expr) ||\n  isJSONataToMillis(expr);\nexport const isJSONataComparison = (\n  expr: Any\n): expr is\n  | JSONataEqual\n  | JSONataNotEqual\n  | JSONataGreaterThan\n  | JSONataGreaterThanOrEqual\n  | JSONataLessThan\n  | JSONataLessThanOrEqual =>\n  isJSONataEqual(expr) ||\n  isJSONataNotEqual(expr) ||\n  isJSONataGreaterThan(expr) ||\n  isJSONataGreaterThanOrEqual(expr) ||\n  isJSONataLessThan(expr) ||\n  isJSONataLessThanOrEqual(expr);\n\n// Arithmetic infix operators eligible as expression operands\nconst jsonataArithmeticOperators = new Set(['+', '-', '*', '/', '%']);\n\n/**\n * A JSONata comparison operand that is a candidate expression subtree: an arithmetic infix node\n * (`+ - * / %`) or a function-call node (excluding the `not`/`contains` predicates handled\n * elsewhere). The expr-supplied `getExpression` handler decides whether it maps to a known\n * function.\n */\nexport const isJSONataExpressionOperand = (expr: Any): expr is JSONataExprNode => {\n  if (!isJSONataExprNode(expr)) return false;\n  // Unwrap parenthesized single-expression blocks (e.g. `(cost * 2)`)\n  if (isJSONataBlock(expr) && expr.expressions.length === 1)\n    return isJSONataExpressionOperand(expr.expressions[0]);\n  if (isJSONataBinaryNode(expr) && jsonataArithmeticOperators.has(expr.value)) return true;\n  return (\n    expr.type === 'function' &&\n    expr.value === '(' &&\n    isJSONataExprNode(expr.procedure) &&\n    expr.procedure.type === 'variable' &&\n    typeof expr.procedure.value === 'string' &&\n    expr.procedure.value !== 'not' &&\n    expr.procedure.value !== 'contains'\n  );\n};\n\nexport const getValidValue = (expr: Any): Any => {\n  if (isJSONataToMillis(expr)) {\n    return getValidValue(expr.arguments[0]);\n  } else if (isJSONataIdentifier(expr)) {\n    return getFieldFromPath(expr);\n  } else if (isJSONataPrimitiveList(expr)) {\n    return expr.expressions.map((v: Any) => getValidValue(v));\n  } else if (isJSONataIdentifierList(expr)) {\n    return expr.expressions.map((v: Any) => getFieldFromPath(v));\n  }\n  return expr.value;\n};\n\nexport const getFieldFromPath = (path: JSONataPath): string =>\n  isJSONataIdentifier(path)\n    ? path.steps.map(s => s.value).join('.')\n    : /* v8 ignore next -- @preserve */ '';\n\nexport const normalizeOperator = (\n  opType: DefaultOperatorName,\n  flip?: boolean\n): DefaultOperatorName => {\n  if (flip) {\n    if (opType === '<') return '>';\n    if (opType === '<=') return '>=';\n    if (opType === '>') return '<';\n    if (opType === '>=') return '<=';\n  }\n  return opType;\n};\n\nexport const negatedLikeOperators: Record<\n  Extract<DefaultOperatorName, 'beginsWith' | 'contains' | 'endsWith'>,\n  DefaultOperatorName\n> = {\n  contains: 'doesNotContain',\n  beginsWith: 'doesNotBeginWith',\n  endsWith: 'doesNotEndWith',\n} satisfies Record<\n  Extract<DefaultOperatorName, 'beginsWith' | 'contains' | 'endsWith'>,\n  DefaultOperatorName\n>;\n\nexport const generateFlatAndOrList = (\n  expr: JSONataExprNode\n): (DefaultCombinatorName | JSONataExprNode)[] => {\n  // v8 ignore else\n  if (isJSONataAnd(expr) || isJSONataOr(expr)) {\n    const { lhs, rhs, value: combinator } = expr;\n    if (isJSONataAnd(lhs) || isJSONataOr(lhs)) {\n      return [...generateFlatAndOrList(lhs), combinator, rhs];\n    }\n    return [lhs, combinator, rhs];\n  }\n  // v8 ignore next\n  return [];\n};\n\nexport const generateMixedAndOrList = (\n  expr: JSONataAnd | JSONataOr\n): (JSONataExprNode | DefaultCombinatorName | (JSONataExprNode | 'and')[])[] => {\n  const arr = generateFlatAndOrList(expr);\n  const returnArray: (DefaultCombinatorName | JSONataExprNode | ('and' | JSONataExprNode)[])[] = [];\n  let startIndex = 0;\n  for (let i = 0; i < arr.length; i += 2) {\n    if (arr[i + 1] === 'and') {\n      startIndex = i;\n      let j = 1;\n      while (arr[startIndex + j] === 'and') {\n        i += 2;\n        j += 2;\n      }\n      const tempAndArray = arr.slice(startIndex, i + 1) as ('and' | JSONataExprNode)[];\n      returnArray.push(tempAndArray);\n      i -= 2;\n    } else if (arr[i + 1] === 'or') {\n      if (i === 0 || i === arr.length - 3) {\n        if (i === 0 || arr[i - 1] === 'or') {\n          returnArray.push(arr[i]);\n        }\n        returnArray.push(arr[i + 1]);\n        if (i === arr.length - 3) {\n          returnArray.push(arr[i + 2]);\n        }\n      } else {\n        if (arr[i - 1] === 'and') {\n          returnArray.push(arr[i + 1]);\n        } else {\n          returnArray.push(arr[i], arr[i + 1]);\n        }\n      }\n    }\n  }\n  if (returnArray.length === 1 && Array.isArray(returnArray[0])) {\n    // If length is 1, then the only element is an AND array so just return that\n    return returnArray[0];\n  }\n  return returnArray;\n};\n","import jsonata from 'jsonata';\nimport type { Except } from 'type-fest';\nimport type {\n  DefaultCombinatorName,\n  DefaultOperatorName,\n  DefaultRuleGroupArray,\n  DefaultRuleGroupICArray,\n  DefaultRuleGroupType,\n  DefaultRuleGroupTypeAny,\n  DefaultRuleGroupTypeIC,\n  DefaultRuleType,\n  ExpressionNode,\n  ValueSource,\n} from '../../types';\nimport type { ParserCommonOptions } from '../../types/import';\nimport { isRuleGroup } from '../isRuleGroup';\nimport { fieldIsValidUtil, getFieldsArray } from '../parserUtils';\nimport { prepareRuleGroup } from '../prepareQueryObjects';\nimport type {\n  JSONataExprNode,\n  JSONataExpressionOperand,\n  ParseJSONataExpressionContext,\n} from './types';\nimport {\n  generateFlatAndOrList,\n  generateMixedAndOrList,\n  getFieldFromPath,\n  getValidValue,\n  isJSONataAnd,\n  isJSONataBlock,\n  isJSONataComparison,\n  isJSONataContains,\n  isJSONataExpressionOperand,\n  isJSONataIdentifier,\n  isJSONataIdentifierList,\n  isJSONataIn,\n  isJSONataNot,\n  isJSONataOr,\n  isJSONataRegex,\n  isJSONataString,\n  isJSONataValidValue,\n  negatedLikeOperators,\n  normalizeOperator,\n} from './utils';\n\n/**\n * Options object for {@link parseJSONata}.\n *\n * Note: `listsAsArrays` is ignored by `parseJSONata`; lists are _always_ arrays.\n */\nexport interface ParseJSONataOptions extends ParserCommonOptions {\n  /**\n   * Handler that converts a JSONata arithmetic/function operand subtree into an\n   * {@link ExpressionNode}. Return `null` to reject (the rule is dropped). Supplied by\n   * `@react-querybuilder/expr` (`expressionParserJSONata`). When omitted, expression\n   * operands are ignored (rule dropped).\n   */\n  getExpression?: (\n    node: JSONataExpressionOperand,\n    ctx: ParseJSONataExpressionContext\n  ) => ExpressionNode | null;\n}\n\n/**\n * Converts a JSONata string expression into a query suitable for the\n * {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props\n * ({@link index!DefaultRuleGroupType DefaultRuleGroupType}).\n */\nfunction parseJSONata(jsonataInput: string): DefaultRuleGroupType;\n/**\n * Converts a JSONata string expression into a query suitable for the\n * {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props\n * ({@link index!DefaultRuleGroupType DefaultRuleGroupType}).\n */\nfunction parseJSONata(\n  jsonataInput: string,\n  options: Except<ParseJSONataOptions, 'independentCombinators'> & {\n    independentCombinators?: false;\n  }\n): DefaultRuleGroupType;\n/**\n * Converts a JSONata string expression into a query suitable for the\n * {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props\n * ({@link index!DefaultRuleGroupTypeIC DefaultRuleGroupTypeIC}).\n */\nfunction parseJSONata(\n  jsonataInput: string,\n  options: Except<ParseJSONataOptions, 'independentCombinators'> & {\n    independentCombinators: true;\n  }\n): DefaultRuleGroupTypeIC;\nfunction parseJSONata(\n  jsonataInput: string,\n  options: ParseJSONataOptions = {}\n): DefaultRuleGroupTypeAny {\n  const { fields, independentCombinators, listsAsArrays: _laa, getExpression } = options;\n  const ic = !!independentCombinators;\n  const fieldsFlat = getFieldsArray(fields);\n\n  const fieldIsValid = (\n    fieldName: string,\n    operator: DefaultOperatorName,\n    subordinateFieldName?: string\n  ) =>\n    fieldIsValidUtil({\n      fieldName,\n      fieldsFlat,\n      operator,\n      subordinateFieldName,\n      getValueSources: options?.getValueSources,\n    });\n\n  const emptyQuery: DefaultRuleGroupTypeAny = {\n    rules: [],\n    ...(ic ? {} : { combinator: 'and' }),\n  };\n\n  const exprCtx: ParseJSONataExpressionContext = {\n    fieldExists: fieldName => fieldsFlat.length === 0 || fieldsFlat.some(f => f.name === fieldName),\n  };\n\n  const parseJSONataAST = (\n    expr: JSONataExprNode,\n    processOpts: {\n      groupOnlyIfNecessary?: boolean;\n      forwardNegation?: boolean;\n    } = {}\n  ): DefaultRuleType | DefaultRuleGroupTypeAny | null => {\n    const { forwardNegation: _forwardedNegation, groupOnlyIfNecessary: _g } = processOpts;\n    if (isJSONataBlock(expr)) {\n      if (\n        isJSONataAnd(expr.expressions[0]) ||\n        isJSONataOr(expr.expressions[0]) ||\n        isJSONataBlock(expr.expressions[0])\n      ) {\n        return parseJSONataAST(expr.expressions[0]);\n      }\n      const blockOfExpr = parseJSONataAST(expr.expressions[0]);\n      // v8 ignore else\n      if (blockOfExpr) {\n        return ic\n          ? ({ rules: [blockOfExpr] } as DefaultRuleGroupTypeIC)\n          : ({\n              combinator: 'and',\n              rules: [blockOfExpr],\n            } as DefaultRuleGroupType);\n      }\n    } else if (isJSONataAnd(expr) || isJSONataOr(expr)) {\n      if (ic) {\n        const andOrList = generateFlatAndOrList(expr);\n        const rules = andOrList.map(v => {\n          if (typeof v === 'string') {\n            return v;\n          }\n          return parseJSONataAST(v);\n        });\n        // Bail out completely if any rules in the list were invalid\n        // so as not to return an incorrect and/or sequence\n        if (!rules.every(Boolean)) {\n          return null;\n        }\n\n        // Reduce this group to a single between/notBetween rule if possible\n        if (\n          ((rs: unknown[]): rs is [DefaultRuleType, DefaultCombinatorName, DefaultRuleType] =>\n            rs.length === 3 &&\n            (rs[1] === 'and' || rs[1] === 'or') &&\n            !isRuleGroup(rs[0]) &&\n            !isRuleGroup(rs[2]))(rules) &&\n          rules[0].field === rules[2].field &&\n          (rules[0].valueSource ?? 'value') === (rules[2].valueSource ?? 'value') &&\n          ((rules[1] === 'and' &&\n            ((rules[0].operator === '>=' && rules[2].operator === '<=') ||\n              (rules[0].operator === '<=' && rules[2].operator === '>='))) ||\n            (rules[1] === 'or' &&\n              ((rules[0].operator === '>' && rules[2].operator === '<') ||\n                (rules[0].operator === '<' && rules[2].operator === '>'))))\n        ) {\n          return {\n            field: rules[0].field,\n            operator: rules[1] === 'and' ? 'between' : 'notBetween',\n            value:\n              (rules[1] === 'and' && rules[0].operator === '<=') ||\n              (rules[1] === 'or' && rules[0].operator === '>')\n                ? [rules[2].value, rules[0].value]\n                : [rules[0].value, rules[2].value],\n            ...(rules[0].valueSource ? { valueSource: rules[0].valueSource } : null),\n          };\n        }\n\n        return {\n          rules: rules as DefaultRuleGroupICArray,\n        };\n      }\n      const andOrList = generateMixedAndOrList(expr);\n      const combinator = andOrList[1] as DefaultCombinatorName;\n      const filteredList = andOrList\n        .filter(v => Array.isArray(v) || (!!v && typeof v !== 'string' && 'type' in v))\n        .map(v =>\n          Array.isArray(v) ? v.filter(vf => !!v && typeof vf !== 'string' && 'type' in vf) : v\n        ) as (JSONataExprNode | JSONataExprNode[])[];\n      const rules = filteredList\n        .map((exp): DefaultRuleGroupType | DefaultRuleType | null => {\n          if (Array.isArray(exp)) {\n            return {\n              combinator: 'and',\n              rules: exp.map(e => parseJSONataAST(e)).filter(Boolean) as DefaultRuleGroupArray,\n            };\n          }\n          return parseJSONataAST(exp) as DefaultRuleType | DefaultRuleGroupType | null;\n        })\n        .filter(Boolean) as DefaultRuleGroupArray;\n\n      // Reduce this group to a single between/notBetween rule if possible\n      if (\n        ((rs: unknown[]): rs is [DefaultRuleType, DefaultRuleType] =>\n          rs.length === 2 && !isRuleGroup(rs[0]) && !isRuleGroup(rs[1]))(rules) &&\n        rules[0].field === rules[1].field &&\n        (rules[0].valueSource ?? 'value') === (rules[1].valueSource ?? 'value') &&\n        ((combinator === 'and' &&\n          ((rules[0].operator === '>=' && rules[1].operator === '<=') ||\n            (rules[0].operator === '<=' && rules[1].operator === '>='))) ||\n          (combinator === 'or' &&\n            ((rules[0].operator === '>' && rules[1].operator === '<') ||\n              (rules[0].operator === '<' && rules[1].operator === '>'))))\n      ) {\n        return {\n          field: rules[0].field,\n          operator: combinator === 'and' ? 'between' : 'notBetween',\n          value:\n            (combinator === 'and' && rules[0].operator === '<=') ||\n            (combinator === 'or' && rules[0].operator === '>')\n              ? [rules[1].value, rules[0].value]\n              : [rules[0].value, rules[1].value],\n          ...(rules[0].valueSource ? { valueSource: rules[0].valueSource } : null),\n        };\n      }\n\n      // v8 ignore else\n      if (rules.length > 0) {\n        return { combinator, rules };\n      }\n    } else if (isJSONataNot(expr)) {\n      const negatedExpr = parseJSONataAST(expr.arguments[0]);\n      // v8 ignore else\n      if (negatedExpr) {\n        if (\n          !isRuleGroup(negatedExpr) &&\n          (negatedExpr.operator === 'contains' ||\n            negatedExpr.operator === 'beginsWith' ||\n            negatedExpr.operator === 'endsWith')\n        ) {\n          return {\n            ...negatedExpr,\n            operator: negatedLikeOperators[negatedExpr.operator],\n          };\n        }\n        return ic\n          ? ({ rules: [negatedExpr], not: true } as DefaultRuleGroupTypeIC)\n          : ({\n              combinator: 'and',\n              rules: [negatedExpr],\n              not: true,\n            } as DefaultRuleGroupType);\n      }\n    } else if (isJSONataContains(expr)) {\n      const [arg1, arg2] = expr.arguments;\n      let field: string = '';\n      let regex: string | RegExp = '';\n      let valueSource: ValueSource | undefined = undefined;\n      // v8 ignore else\n      if (isJSONataIdentifier(arg1)) {\n        field = getFieldFromPath(arg1);\n        if (isJSONataIdentifier(arg2)) {\n          regex = getFieldFromPath(arg2);\n          valueSource = 'field';\n        } else {\n          // v8 ignore else\n          if (isJSONataString(arg2) || isJSONataRegex(arg2)) {\n            regex = getValidValue(arg2);\n          }\n        }\n      }\n\n      // v8 ignore else\n      if (\n        valueSource === 'field'\n          ? fieldIsValid(field, 'contains', regex as string)\n          : fieldIsValid(field, 'contains')\n      ) {\n        return {\n          field,\n          operator: 'contains',\n          value: regex,\n          ...(valueSource ? { valueSource } : {}),\n        };\n      }\n    } else if (isJSONataIn(expr)) {\n      const field = getFieldFromPath(expr.lhs);\n      let valueSource: ValueSource | undefined = undefined;\n      if (isJSONataIdentifierList(expr.rhs)) {\n        valueSource = 'field';\n      }\n      if (isJSONataValidValue(expr.rhs)) {\n        // oxlint-disable-next-line typescript/no-explicit-any\n        const value: any[] = getValidValue(expr.rhs);\n        // v8 ignore else\n        if (\n          field &&\n          value.every(v => fieldIsValid(field, 'in', valueSource === 'field' ? v : undefined))\n        ) {\n          return { field, operator: 'in', value, ...(valueSource ? { valueSource } : {}) };\n        }\n      }\n    } else if (isJSONataComparison(expr)) {\n      let field: string | null = null;\n      // oxlint-disable-next-line typescript/no-explicit-any\n      let value: any = undefined;\n      let valueSource: ValueSource | undefined = undefined;\n      let flip = false;\n      const { lhs, rhs } = expr;\n\n      // Arithmetic/function expression operands (from `@react-querybuilder/expr`)\n      if (getExpression) {\n        const lhsIsExpr = isJSONataExpressionOperand(lhs);\n        const rhsIsExpr = isJSONataExpressionOperand(rhs);\n        if (lhsIsExpr && rhsIsExpr) {\n          // expression <op> expression → both sides on lhs/value\n          const l = getExpression(lhs, exprCtx);\n          const r = getExpression(rhs, exprCtx);\n          if (l && r) {\n            return {\n              field: '',\n              operator: normalizeOperator(expr.value),\n              lhs: l,\n              value: r,\n              valueSource: 'expression',\n            };\n          }\n          return null;\n        } else if (isJSONataIdentifier(lhs) && rhsIsExpr) {\n          // field <op> expression → rhs expression\n          const node = getExpression(rhs, exprCtx);\n          const f = getFieldFromPath(lhs);\n          const op = normalizeOperator(expr.value);\n          if (node && fieldIsValid(f, op)) {\n            return { field: f, operator: op, value: node, valueSource: 'expression' };\n          }\n          return null;\n        } else if (lhsIsExpr && isJSONataIdentifier(rhs)) {\n          // expression <op> field → flip to field <op> expression\n          const node = getExpression(lhs, exprCtx);\n          const f = getFieldFromPath(rhs);\n          const op = normalizeOperator(expr.value, true);\n          if (node && fieldIsValid(f, op)) {\n            return { field: f, operator: op, value: node, valueSource: 'expression' };\n          }\n          return null;\n        } else if (lhsIsExpr && isJSONataValidValue(rhs)) {\n          // expression <op> literal → lhs = expression, literal value\n          const l = getExpression(lhs, exprCtx);\n          if (l) {\n            return {\n              field: '',\n              operator: normalizeOperator(expr.value),\n              lhs: l,\n              value: getValidValue(rhs),\n            };\n          }\n          return null;\n        } else if (isJSONataValidValue(lhs) && rhsIsExpr) {\n          // literal <op> expression → lhs = expression, flip operator\n          const l = getExpression(rhs, exprCtx);\n          if (l) {\n            return {\n              field: '',\n              operator: normalizeOperator(expr.value, true),\n              lhs: l,\n              value: getValidValue(lhs),\n            };\n          }\n          return null;\n        }\n      }\n\n      if (isJSONataIdentifier(lhs) && isJSONataValidValue(rhs)) {\n        field = getFieldFromPath(lhs);\n        value = getValidValue(rhs);\n        if (isJSONataIdentifier(rhs)) {\n          valueSource = 'field';\n        }\n      } else {\n        // v8 ignore else\n        if (isJSONataIdentifier(rhs) && isJSONataValidValue(lhs)) {\n          flip = true;\n          field = getFieldFromPath(rhs);\n          value = getValidValue(lhs);\n        }\n      }\n      let operator = normalizeOperator(expr.value, flip);\n      if (value === null && (operator === '=' || operator === '!=')) {\n        operator = operator === '=' ? 'null' : 'notNull';\n      }\n      if (\n        field &&\n        fieldIsValid(field, operator, valueSource === 'field' ? value : undefined) &&\n        value !== undefined\n      ) {\n        return valueSource ? { field, operator, value, valueSource } : { field, operator, value };\n      }\n    }\n    return null;\n  };\n\n  const prepare = options.generateIDs ? prepareRuleGroup : <T>(g: T) => g;\n\n  let jsonataExpr: jsonata.Expression;\n  try {\n    jsonataExpr = jsonata(jsonataInput);\n  } catch {\n    return prepare(emptyQuery);\n  }\n  const jsonataAST = jsonataExpr.ast() as JSONataExprNode;\n\n  const result = parseJSONataAST(jsonataAST);\n  if (result) {\n    if (isRuleGroup(result)) {\n      return prepare(result);\n    }\n    return prepare({ rules: [result], ...(ic ? {} : { combinator: 'and' }) });\n  }\n\n  return prepare(emptyQuery);\n}\n\nexport { parseJSONata };\n"],"mappings":"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"}

package/dist/parseJsonLogic.d.mts

@@ -1,35 +1,68 @@
-import { E as DefaultRuleGroupType, O as RuleType, S as RuleGroupTypeAny, f as RQBJsonLogic, j as Except, x as DefaultRuleGroupTypeIC } from "./index-DlVg-QXo.mjs";
-import { t as ParserCommonOptions } from "./import-ShTj5IdB.mjs";
-
+import { E as RuleGroupTypeAny, L as Except, N as RuleType, P as ExpressionNode, T as DefaultRuleGroupTypeIC, g as RQBJsonLogicVar, h as RQBJsonLogic, j as DefaultRuleGroupType, n as JsonLogicLessThanOrEqual, r as JsonLogicRulesLogic, t as JsonLogicLessThan } from "./index-BSwFvkeI.mjs";
+import { t as ParserCommonOptions } from "./import-BVdxeIBO.mjs";
+//#region src/utils/parseJsonLogic/types.d.ts
+interface JsonLogicBetweenExclusive extends JsonLogicLessThan {
+  "<": [JsonLogicRulesLogic, JsonLogicRulesLogic, JsonLogicRulesLogic];
+}
+interface JsonLogicBetweenInclusive extends JsonLogicLessThanOrEqual {
+  "<=": [JsonLogicRulesLogic, JsonLogicRulesLogic, JsonLogicRulesLogic];
+}
+/**
+ * A JsonLogic operand subtree that {@link ParseJsonLogicOptions.getExpression} may receive —
+ * an arithmetic/function operation object, a variable reference, or a literal.
+ */
+type JsonLogicExpressionOperand = RQBJsonLogic;
+/** Context passed to {@link ParseJsonLogicOptions.getExpression}. */
+interface ParseJsonLogicExpressionContext {
+  /** Returns `true` if the field is configured (or if no `fields` were supplied). */
+  fieldExists: (fieldName: string) => boolean;
+}
+//#endregion
 //#region src/utils/parseJsonLogic/parseJsonLogic.d.ts
 /**
-* Options object for {@link parseJsonLogic}.
-*/
+ * Options object for {@link parseJsonLogic}.
+ */
 interface ParseJsonLogicOptions extends ParserCommonOptions {
   jsonLogicOperations?: Record<string, (value: any) => RuleType | RuleGroupTypeAny | false>;
+  /**
+   * Handler that converts a JsonLogic arithmetic/function operation object into an
+   * {@link ExpressionNode}. Return `null` to reject (the rule is dropped). Supplied by
+   * `@react-querybuilder/expr` (`expressionParserJsonLogic`). When omitted, expression
+   * operands are ignored (rule dropped).
+   */
+  getExpression?: (node: JsonLogicExpressionOperand, ctx: ParseJsonLogicExpressionContext) => ExpressionNode | null;
 }
 /**
-* Converts a JsonLogic object into a query suitable for the
-* {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props
-* ({@link index!DefaultRuleGroupType DefaultRuleGroupType}).
-*/
+ * Converts a JsonLogic object into a query suitable for the
+ * {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props
+ * ({@link index!DefaultRuleGroupType DefaultRuleGroupType}).
+ */
 declare function parseJsonLogic(rqbJsonLogic: string | RQBJsonLogic): DefaultRuleGroupType;
 /**
-* Converts a JsonLogic object into a query suitable for the
-* {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props
-* ({@link index!DefaultRuleGroupType DefaultRuleGroupType}).
-*/
+ * Converts a JsonLogic object into a query suitable for the
+ * {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props
+ * ({@link index!DefaultRuleGroupType DefaultRuleGroupType}).
+ */
 declare function parseJsonLogic(rqbJsonLogic: string | RQBJsonLogic, options: Except<ParseJsonLogicOptions, "independentCombinators"> & {
   independentCombinators?: false;
 }): DefaultRuleGroupType;
 /**
-* Converts a JsonLogic object into a query suitable for the
-* {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props
-* ({@link index!DefaultRuleGroupTypeIC DefaultRuleGroupTypeIC}).
-*/
+ * Converts a JsonLogic object into a query suitable for the
+ * {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props
+ * ({@link index!DefaultRuleGroupTypeIC DefaultRuleGroupTypeIC}).
+ */
 declare function parseJsonLogic(rqbJsonLogic: string | RQBJsonLogic, options: Except<ParseJsonLogicOptions, "independentCombinators"> & {
   independentCombinators: true;
 }): DefaultRuleGroupTypeIC;
 //#endregion
-export { ParseJsonLogicOptions, parseJsonLogic };
+//#region src/utils/parseJsonLogic/utils.d.ts
+declare const isRQBJsonLogicVar: (logic: unknown) => logic is RQBJsonLogicVar;
+/**
+ * A JsonLogic comparison operand that is a candidate expression subtree: a plain object that
+ * is not a variable reference (i.e. an arithmetic/function operation object). The
+ * expr-supplied `getExpression` handler decides whether it maps to a known function.
+ */
+declare const isJsonLogicExpressionOperand: (logic: unknown) => logic is JsonLogicExpressionOperand;
+//#endregion
+export { JsonLogicBetweenExclusive, JsonLogicBetweenInclusive, JsonLogicExpressionOperand, ParseJsonLogicExpressionContext, ParseJsonLogicOptions, isJsonLogicExpressionOperand, isRQBJsonLogicVar, parseJsonLogic };
 //# sourceMappingURL=parseJsonLogic.d.mts.map

package/dist/parseJsonLogic.d.ts

@@ -1,35 +1,68 @@
-import { E as DefaultRuleGroupType, O as RuleType, S as RuleGroupTypeAny, f as RQBJsonLogic, j as Except, x as DefaultRuleGroupTypeIC } from "./index-DlVg-QXo.js";
-import { t as ParserCommonOptions } from "./import-Qs1-kgv5.js";
-
+import { E as RuleGroupTypeAny, L as Except, N as RuleType, P as ExpressionNode, T as DefaultRuleGroupTypeIC, g as RQBJsonLogicVar, h as RQBJsonLogic, j as DefaultRuleGroupType, n as JsonLogicLessThanOrEqual, r as JsonLogicRulesLogic, t as JsonLogicLessThan } from "./index-BSwFvkeI.js";
+import { t as ParserCommonOptions } from "./import-Ddc3d_8q.js";
+//#region src/utils/parseJsonLogic/types.d.ts
+interface JsonLogicBetweenExclusive extends JsonLogicLessThan {
+  "<": [JsonLogicRulesLogic, JsonLogicRulesLogic, JsonLogicRulesLogic];
+}
+interface JsonLogicBetweenInclusive extends JsonLogicLessThanOrEqual {
+  "<=": [JsonLogicRulesLogic, JsonLogicRulesLogic, JsonLogicRulesLogic];
+}
+/**
+ * A JsonLogic operand subtree that {@link ParseJsonLogicOptions.getExpression} may receive —
+ * an arithmetic/function operation object, a variable reference, or a literal.
+ */
+type JsonLogicExpressionOperand = RQBJsonLogic;
+/** Context passed to {@link ParseJsonLogicOptions.getExpression}. */
+interface ParseJsonLogicExpressionContext {
+  /** Returns `true` if the field is configured (or if no `fields` were supplied). */
+  fieldExists: (fieldName: string) => boolean;
+}
+//#endregion
 //#region src/utils/parseJsonLogic/parseJsonLogic.d.ts
 /**
-* Options object for {@link parseJsonLogic}.
-*/
+ * Options object for {@link parseJsonLogic}.
+ */
 interface ParseJsonLogicOptions extends ParserCommonOptions {
   jsonLogicOperations?: Record<string, (value: any) => RuleType | RuleGroupTypeAny | false>;
+  /**
+   * Handler that converts a JsonLogic arithmetic/function operation object into an
+   * {@link ExpressionNode}. Return `null` to reject (the rule is dropped). Supplied by
+   * `@react-querybuilder/expr` (`expressionParserJsonLogic`). When omitted, expression
+   * operands are ignored (rule dropped).
+   */
+  getExpression?: (node: JsonLogicExpressionOperand, ctx: ParseJsonLogicExpressionContext) => ExpressionNode | null;
 }
 /**
-* Converts a JsonLogic object into a query suitable for the
-* {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props
-* ({@link index!DefaultRuleGroupType DefaultRuleGroupType}).
-*/
+ * Converts a JsonLogic object into a query suitable for the
+ * {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props
+ * ({@link index!DefaultRuleGroupType DefaultRuleGroupType}).
+ */
 declare function parseJsonLogic(rqbJsonLogic: string | RQBJsonLogic): DefaultRuleGroupType;
 /**
-* Converts a JsonLogic object into a query suitable for the
-* {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props
-* ({@link index!DefaultRuleGroupType DefaultRuleGroupType}).
-*/
+ * Converts a JsonLogic object into a query suitable for the
+ * {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props
+ * ({@link index!DefaultRuleGroupType DefaultRuleGroupType}).
+ */
 declare function parseJsonLogic(rqbJsonLogic: string | RQBJsonLogic, options: Except<ParseJsonLogicOptions, "independentCombinators"> & {
   independentCombinators?: false;
 }): DefaultRuleGroupType;
 /**
-* Converts a JsonLogic object into a query suitable for the
-* {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props
-* ({@link index!DefaultRuleGroupTypeIC DefaultRuleGroupTypeIC}).
-*/
+ * Converts a JsonLogic object into a query suitable for the
+ * {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props
+ * ({@link index!DefaultRuleGroupTypeIC DefaultRuleGroupTypeIC}).
+ */
 declare function parseJsonLogic(rqbJsonLogic: string | RQBJsonLogic, options: Except<ParseJsonLogicOptions, "independentCombinators"> & {
   independentCombinators: true;
 }): DefaultRuleGroupTypeIC;
 //#endregion
-export { ParseJsonLogicOptions, parseJsonLogic };
+//#region src/utils/parseJsonLogic/utils.d.ts
+declare const isRQBJsonLogicVar: (logic: unknown) => logic is RQBJsonLogicVar;
+/**
+ * A JsonLogic comparison operand that is a candidate expression subtree: a plain object that
+ * is not a variable reference (i.e. an arithmetic/function operation object). The
+ * expr-supplied `getExpression` handler decides whether it maps to a known function.
+ */
+declare const isJsonLogicExpressionOperand: (logic: unknown) => logic is JsonLogicExpressionOperand;
+//#endregion
+export { JsonLogicBetweenExclusive, JsonLogicBetweenInclusive, JsonLogicExpressionOperand, ParseJsonLogicExpressionContext, ParseJsonLogicOptions, isJsonLogicExpressionOperand, isRQBJsonLogicVar, parseJsonLogic };
 //# sourceMappingURL=parseJsonLogic.d.ts.map

package/dist/parseJsonLogic.js

@@ -1,32 +1,39 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_utils = require("./utils-BpaOtylk.js");
-const require_objectUtils = require("./objectUtils-DBJI82bl.js");
-const require_convertQuery = require("./convertQuery-BJKNgecE.js");
-const require_prepareQueryObjects = require("./prepareQueryObjects-Bni5VgYM.js");
+const require_utils = require("./utils-DEwV7F6B.js");
+const require_isRuleGroup = require("./isRuleGroup-0JNiQgLg.js");
+const require_objectUtils = require("./objectUtils-Cr02aGxb.js");
+const require_convertQuery = require("./convertQuery-Cw76XFIn.js");
+const require_prepareQueryObjects = require("./prepareQueryObjects-C2-kTZvR.js");
 //#region src/utils/parseJsonLogic/utils.ts
-const isJsonLogicVar = (logic) => require_objectUtils.isPojo(logic) && "var" in logic;
+const isJsonLogicVar = (logic) => require_isRuleGroup.isPojo(logic) && "var" in logic;
 const isRQBJsonLogicVar = (logic) => isJsonLogicVar(logic) && typeof logic.var === "string";
-const isJsonLogicEqual = (logic) => require_objectUtils.isPojo(logic) && "==" in logic;
-const isJsonLogicStrictEqual = (logic) => require_objectUtils.isPojo(logic) && "===" in logic;
-const isJsonLogicNotEqual = (logic) => require_objectUtils.isPojo(logic) && "!=" in logic;
-const isJsonLogicStrictNotEqual = (logic) => require_objectUtils.isPojo(logic) && "!==" in logic;
-const isJsonLogicNegation = (logic) => require_objectUtils.isPojo(logic) && "!" in logic;
-const isJsonLogicDoubleNegation = (logic) => require_objectUtils.isPojo(logic) && "!!" in logic;
-const isJsonLogicOr = (logic) => require_objectUtils.isPojo(logic) && "or" in logic;
-const isJsonLogicAnd = (logic) => require_objectUtils.isPojo(logic) && "and" in logic;
-const isJsonLogicGreaterThan = (logic) => require_objectUtils.isPojo(logic) && ">" in logic;
-const isJsonLogicGreaterThanOrEqual = (logic) => require_objectUtils.isPojo(logic) && ">=" in logic;
-const isJsonLogicLessThan = (logic) => require_objectUtils.isPojo(logic) && "<" in logic && logic["<"].length === 2;
-const isJsonLogicLessThanOrEqual = (logic) => require_objectUtils.isPojo(logic) && "<=" in logic && logic["<="].length === 2;
-const isJsonLogicInArray = (logic) => require_objectUtils.isPojo(logic) && "in" in logic && Array.isArray(logic.in[1]);
-const isJsonLogicInString = (logic) => require_objectUtils.isPojo(logic) && "in" in logic && !Array.isArray(logic.in[1]);
-const isJsonLogicAll = (logic) => require_objectUtils.isPojo(logic) && "all" in logic;
-const isJsonLogicNone = (logic) => require_objectUtils.isPojo(logic) && "none" in logic;
-const isJsonLogicSome = (logic) => require_objectUtils.isPojo(logic) && "some" in logic;
-const isJsonLogicBetweenExclusive = (logic) => require_objectUtils.isPojo(logic) && "<" in logic && Array.isArray(logic["<"]) && logic["<"].length === 3;
-const isJsonLogicBetweenInclusive = (logic) => require_objectUtils.isPojo(logic) && "<=" in logic && Array.isArray(logic["<="]) && logic["<="].length === 3;
-const isRQBJsonLogicStartsWith = (logic) => require_objectUtils.isPojo(logic) && "startsWith" in logic;
-const isRQBJsonLogicEndsWith = (logic) => require_objectUtils.isPojo(logic) && "endsWith" in logic;
+const isJsonLogicEqual = (logic) => require_isRuleGroup.isPojo(logic) && "==" in logic;
+const isJsonLogicStrictEqual = (logic) => require_isRuleGroup.isPojo(logic) && "===" in logic;
+const isJsonLogicNotEqual = (logic) => require_isRuleGroup.isPojo(logic) && "!=" in logic;
+const isJsonLogicStrictNotEqual = (logic) => require_isRuleGroup.isPojo(logic) && "!==" in logic;
+const isJsonLogicNegation = (logic) => require_isRuleGroup.isPojo(logic) && "!" in logic;
+const isJsonLogicDoubleNegation = (logic) => require_isRuleGroup.isPojo(logic) && "!!" in logic;
+const isJsonLogicOr = (logic) => require_isRuleGroup.isPojo(logic) && "or" in logic;
+const isJsonLogicAnd = (logic) => require_isRuleGroup.isPojo(logic) && "and" in logic;
+const isJsonLogicGreaterThan = (logic) => require_isRuleGroup.isPojo(logic) && ">" in logic;
+const isJsonLogicGreaterThanOrEqual = (logic) => require_isRuleGroup.isPojo(logic) && ">=" in logic;
+const isJsonLogicLessThan = (logic) => require_isRuleGroup.isPojo(logic) && "<" in logic && logic["<"].length === 2;
+const isJsonLogicLessThanOrEqual = (logic) => require_isRuleGroup.isPojo(logic) && "<=" in logic && logic["<="].length === 2;
+const isJsonLogicInArray = (logic) => require_isRuleGroup.isPojo(logic) && "in" in logic && Array.isArray(logic.in[1]);
+const isJsonLogicInString = (logic) => require_isRuleGroup.isPojo(logic) && "in" in logic && !Array.isArray(logic.in[1]);
+const isJsonLogicAll = (logic) => require_isRuleGroup.isPojo(logic) && "all" in logic;
+const isJsonLogicNone = (logic) => require_isRuleGroup.isPojo(logic) && "none" in logic;
+const isJsonLogicSome = (logic) => require_isRuleGroup.isPojo(logic) && "some" in logic;
+const isJsonLogicBetweenExclusive = (logic) => require_isRuleGroup.isPojo(logic) && "<" in logic && Array.isArray(logic["<"]) && logic["<"].length === 3;
+const isJsonLogicBetweenInclusive = (logic) => require_isRuleGroup.isPojo(logic) && "<=" in logic && Array.isArray(logic["<="]) && logic["<="].length === 3;
+const isRQBJsonLogicStartsWith = (logic) => require_isRuleGroup.isPojo(logic) && "startsWith" in logic;
+const isRQBJsonLogicEndsWith = (logic) => require_isRuleGroup.isPojo(logic) && "endsWith" in logic;
+/**
+* A JsonLogic comparison operand that is a candidate expression subtree: a plain object that
+* is not a variable reference (i.e. an arithmetic/function operation object). The
+* expr-supplied `getExpression` handler decides whether it maps to a known function.
+*/
+const isJsonLogicExpressionOperand = (logic) => require_isRuleGroup.isPojo(logic) && !isRQBJsonLogicVar(logic);
 //#endregion
 //#region src/utils/parseJsonLogic/parseJsonLogic.ts
 const emptyRuleGroup = {
@@ -35,7 +42,7 @@ const emptyRuleGroup = {
 };
 function parseJsonLogic(rqbJsonLogic, options = {}) {
 	const fieldsFlat = require_prepareQueryObjects.getFieldsArray(options.fields);
-	const { getValueSources, listsAsArrays, jsonLogicOperations } = options;
+	const { getValueSources, listsAsArrays, jsonLogicOperations, getExpression } = options;
 	const fieldIsValid = (fieldName, operator, subordinateFieldName) => require_prepareQueryObjects.fieldIsValidUtil({
 		fieldName,
 		fieldsFlat,
@@ -43,12 +50,13 @@ function parseJsonLogic(rqbJsonLogic, options = {}) {
 		subordinateFieldName,
 		getValueSources
 	});
+	const exprCtx = { fieldExists: (fieldName) => fieldsFlat.length === 0 || fieldsFlat.some((f) => f.name === fieldName) };
 	function processLogic(logic, outermost, inSubquery) {
-		if (outermost && !require_objectUtils.isPojo(logic)) return false;
+		if (outermost && !require_isRuleGroup.isPojo(logic)) return false;
 		const [key, keyValue] = Object.entries(logic || {})?.[0] ?? [];
 		if (jsonLogicOperations && require_objectUtils.objectKeys(jsonLogicOperations).includes(key)) {
 			const rule = jsonLogicOperations[key](keyValue);
-			return rule ? outermost && !require_objectUtils.isRuleGroup(rule) ? {
+			return rule ? outermost && !require_isRuleGroup.isRuleGroup(rule) ? {
 				combinator: "and",
 				rules: [rule]
 			} : rule : false;
@@ -64,7 +72,7 @@ function parseJsonLogic(rqbJsonLogic, options = {}) {
 		else if (isJsonLogicNegation(logic)) {
 			const rule = processLogic(logic["!"], false, inSubquery);
 			if (rule) {
-				if (!require_objectUtils.isRuleGroupType(rule) && (rule.operator === "between" || rule.operator === "in" || rule.operator === "contains" || rule.operator === "beginsWith" || rule.operator === "endsWith")) {
+				if (!require_isRuleGroup.isRuleGroupType(rule) && (rule.operator === "between" || rule.operator === "in" || rule.operator === "contains" || rule.operator === "beginsWith" || rule.operator === "endsWith")) {
 					const newRule = {
 						...rule,
 						operator: require_utils.defaultOperatorNegationMap[rule.operator]
@@ -74,7 +82,7 @@ function parseJsonLogic(rqbJsonLogic, options = {}) {
 						rules: [newRule]
 					};
 					return newRule;
-				} else if (isJsonLogicBetweenExclusive(logic["!"]) || require_objectUtils.isRuleGroupType(rule)) return {
+				} else if (isJsonLogicBetweenExclusive(logic["!"]) || require_isRuleGroup.isRuleGroupType(rule)) return {
 					...rule,
 					not: true
 				};
@@ -93,10 +101,47 @@ function parseJsonLogic(rqbJsonLogic, options = {}) {
 		let valueSource = void 0;
 		if (isJsonLogicEqual(logic) || isJsonLogicStrictEqual(logic) || isJsonLogicNotEqual(logic) || isJsonLogicStrictNotEqual(logic) || isJsonLogicGreaterThan(logic) || isJsonLogicGreaterThanOrEqual(logic) || isJsonLogicLessThan(logic) || isJsonLogicLessThanOrEqual(logic) || isJsonLogicInString(logic) || isRQBJsonLogicStartsWith(logic) || isRQBJsonLogicEndsWith(logic)) {
 			const [first, second] = keyValue;
-			if (isRQBJsonLogicVar(first) && !require_objectUtils.isPojo(second)) {
+			const scalarComparison = isJsonLogicEqual(logic) || isJsonLogicStrictEqual(logic) || isJsonLogicNotEqual(logic) || isJsonLogicStrictNotEqual(logic) || isJsonLogicGreaterThan(logic) || isJsonLogicGreaterThanOrEqual(logic) || isJsonLogicLessThan(logic) || isJsonLogicLessThanOrEqual(logic);
+			const firstIsExpr = isJsonLogicExpressionOperand(first);
+			const secondIsExpr = isJsonLogicExpressionOperand(second);
+			if (getExpression && scalarComparison && (firstIsExpr || secondIsExpr)) {
+				const exprOperator = isJsonLogicEqual(logic) || isJsonLogicStrictEqual(logic) ? "=" : isJsonLogicNotEqual(logic) || isJsonLogicStrictNotEqual(logic) ? "!=" : key;
+				if (firstIsExpr && secondIsExpr) {
+					const lhs = getExpression(first, exprCtx);
+					const rhs = getExpression(second, exprCtx);
+					if (lhs && rhs) rule = {
+						field: "",
+						operator: exprOperator,
+						lhs,
+						value: rhs,
+						valueSource: "expression"
+					};
+				} else if (firstIsExpr && !require_isRuleGroup.isPojo(second)) {
+					const lhs = getExpression(first, exprCtx);
+					if (lhs) rule = {
+						field: "",
+						operator: exprOperator,
+						lhs,
+						value: second
+					};
+				} else if (isRQBJsonLogicVar(first) && secondIsExpr) {
+					const node = getExpression(second, exprCtx);
+					if (node && (inSubquery || fieldIsValid(first.var, exprOperator))) rule = {
+						field: first.var,
+						operator: exprOperator,
+						value: node,
+						valueSource: "expression"
+					};
+				}
+				return rule ? outermost ? {
+					combinator: "and",
+					rules: [rule]
+				} : rule : false;
+			}
+			if (isRQBJsonLogicVar(first) && !require_isRuleGroup.isPojo(second)) {
 				field = first.var;
 				value = second;
-			} else if (!require_objectUtils.isPojo(first) && isRQBJsonLogicVar(second)) {
+			} else if (!require_isRuleGroup.isPojo(first) && isRQBJsonLogicVar(second)) {
 				field = second.var;
 				value = first;
 			} else if (isRQBJsonLogicVar(first) && isRQBJsonLogicVar(second)) {
@@ -125,7 +170,7 @@ function parseJsonLogic(rqbJsonLogic, options = {}) {
 				field: fld,
 				operator: "=",
 				match,
-				value: require_objectUtils.isRuleGroup(matcher) ? matcher : {
+				value: require_isRuleGroup.isRuleGroup(matcher) ? matcher : {
 					combinator: "and",
 					rules: [matcher]
 				}
@@ -139,6 +184,20 @@ function parseJsonLogic(rqbJsonLogic, options = {}) {
 			field = logic["<="][1].var;
 			operator = "between";
 			const values = [logic["<="][0], logic["<="][2]];
+			if (getExpression && (isJsonLogicExpressionOperand(values[0]) || isJsonLogicExpressionOperand(values[1]))) {
+				const from = getExpression(values[0], exprCtx);
+				const to = getExpression(values[1], exprCtx);
+				if (from && to && fieldIsValid(field, operator)) rule = {
+					field,
+					operator,
+					value: [from, to],
+					valueSource: "expression"
+				};
+				return rule ? outermost ? {
+					combinator: "and",
+					rules: [rule]
+				} : rule : false;
+			}
 			if (logic["<="].every((v) => isRQBJsonLogicVar(v))) {
 				const vars = values;
 				valueSource = "field";
@@ -183,6 +242,8 @@ function parseJsonLogic(rqbJsonLogic, options = {}) {
 	return prepare(options.independentCombinators ? require_convertQuery.convertToIC(finalQuery) : finalQuery);
 }
 //#endregion
+exports.isJsonLogicExpressionOperand = isJsonLogicExpressionOperand;
+exports.isRQBJsonLogicVar = isRQBJsonLogicVar;
 exports.parseJsonLogic = parseJsonLogic;
 
 //# sourceMappingURL=parseJsonLogic.js.map