@react-querybuilder/core 8.20.2 → 8.21.1

package/dist/{objectUtils-DBJI82bl.js → isRuleGroup-0JNiQgLg.js}

@@ -33,19 +33,6 @@ const isRuleGroupType = (rg) => isRuleGroup(rg) && typeof rg.combinator === "str
 */
 const isRuleGroupTypeIC = (rg) => isRuleGroup(rg) && rg.combinator === void 0;
 //#endregion
-//#region src/utils/objectUtils.ts
-/**
-* A strongly-typed version of `Object.keys()`.
-*
-* [Original source](https://github.com/sindresorhus/ts-extras/blob/44f57392c5f027268330771996c4fdf9260b22d6/source/object-keys.ts)
-*/
-const objectKeys = Object.keys;
-/**
-* Returns `true` if the key could cause prototype pollution when used
-* as a property name in bracket-notation assignment.
-*/
-const isUnsafeKey = (key) => key === "__proto__" || key === "constructor" || key === "prototype";
-//#endregion
 Object.defineProperty(exports, "isPojo", {
 	enumerable: true,
 	get: function() {
@@ -70,12 +57,6 @@ Object.defineProperty(exports, "isRuleGroupTypeIC", {
 		return isRuleGroupTypeIC;
 	}
 });
-Object.defineProperty(exports, "isUnsafeKey", {
-	enumerable: true,
-	get: function() {
-		return isUnsafeKey;
-	}
-});
 Object.defineProperty(exports, "lc", {
 	enumerable: true,
 	get: function() {
@@ -94,11 +75,5 @@ Object.defineProperty(exports, "numericRegex", {
 		return numericRegex;
 	}
 });
-Object.defineProperty(exports, "objectKeys", {
-	enumerable: true,
-	get: function() {
-		return objectKeys;
-	}
-});
 
-//# sourceMappingURL=objectUtils-DBJI82bl.js.map
+//# sourceMappingURL=isRuleGroup-0JNiQgLg.js.map

package/dist/isRuleGroup-0JNiQgLg.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"isRuleGroup-0JNiQgLg.js","names":["numericQuantityRegex"],"sources":["../src/utils/misc.ts","../src/utils/isRuleGroup.ts"],"sourcesContent":["import { numericRegex as numericQuantityRegex } from 'numeric-quantity';\n\n/**\n * Converts a value to lowercase if it's a string, otherwise returns the value as is.\n */\n// v8 ignore next\nexport const lc = <T>(v: T): T => (typeof v === 'string' ? (v.toLowerCase() as T) : v);\n\n/**\n * Regex matching numeric strings. Passes for positive/negative integers, decimals,\n * and E notation, with optional surrounding whitespace.\n */\nexport const numericRegex: RegExp = new RegExp(\n  numericQuantityRegex.source.replace(/^\\^/, String.raw`^\\s*`).replace(/\\$$/, String.raw`\\s*$`)\n);\n\n/**\n * Determines if a variable is a plain old JavaScript object, aka POJO.\n */\n// oxlint-disable-next-line typescript/no-explicit-any\nexport const isPojo = (obj: unknown): obj is Record<string, any> =>\n  obj !== null && typeof obj === 'object' && Object.getPrototypeOf(obj) === Object.prototype;\n\n/**\n * Simple helper to determine whether a value is null, undefined, or an empty string.\n */\nexport const nullOrUndefinedOrEmpty = (value: unknown): value is null | undefined | '' =>\n  value === null || value === undefined || value === '';\n","import type { RuleGroupType, RuleGroupTypeAny, RuleGroupTypeIC, RuleType } from '../types';\nimport { isPojo } from './misc';\n\n/**\n * Determines if an object is a {@link RuleType} (only checks for a `field` property).\n */\nexport const isRuleType = (s: unknown): s is RuleType =>\n  isPojo(s) && 'field' in s && typeof s.field === 'string';\n\n/**\n * Determines if an object is a {@link RuleGroupType} or {@link RuleGroupTypeIC}.\n */\nexport const isRuleGroup = (rg: unknown): rg is RuleGroupTypeAny =>\n  isPojo(rg) && Array.isArray(rg.rules);\n\n/**\n * Determines if an object is a {@link RuleGroupType}.\n */\nexport const isRuleGroupType = (rg: unknown): rg is RuleGroupType =>\n  isRuleGroup(rg) && typeof rg.combinator === 'string';\n\n/**\n * Determines if an object is a {@link RuleGroupTypeIC}.\n */\nexport const isRuleGroupTypeIC = (rg: unknown): rg is RuleGroupTypeIC =>\n  isRuleGroup(rg) && rg.combinator === undefined;\n"],"mappings":";;;;;;AAMA,MAAa,MAAS,MAAa,OAAO,MAAM,WAAY,EAAE,YAAY,IAAU;;;;;AAMpF,MAAa,eAAuB,IAAI,OACtCA,iBAAAA,aAAqB,OAAO,QAAQ,OAAO,OAAO,GAAG,MAAM,CAAC,CAAC,QAAQ,OAAO,OAAO,GAAG,MAAM,CAC9F;;;;AAMA,MAAa,UAAU,QACrB,QAAQ,QAAQ,OAAO,QAAQ,YAAY,OAAO,eAAe,GAAG,MAAM,OAAO;;;;AAKnF,MAAa,0BAA0B,UACrC,UAAU,QAAQ,UAAU,KAAA,KAAa,UAAU;;;;;;ACfrD,MAAa,eAAe,OAC1B,OAAO,EAAE,KAAK,MAAM,QAAQ,GAAG,KAAK;;;;AAKtC,MAAa,mBAAmB,OAC9B,YAAY,EAAE,KAAK,OAAO,GAAG,eAAe;;;;AAK9C,MAAa,qBAAqB,OAChC,YAAY,EAAE,KAAK,GAAG,eAAe,KAAA"}

package/dist/{objectUtils-ZvPkF6u6.mjs → isRuleGroup-CqLThsbu.mjs}

@@ -33,19 +33,6 @@ const isRuleGroupType = (rg) => isRuleGroup(rg) && typeof rg.combinator === "str
 */
 const isRuleGroupTypeIC = (rg) => isRuleGroup(rg) && rg.combinator === void 0;
 //#endregion
-//#region src/utils/objectUtils.ts
-/**
-* A strongly-typed version of `Object.keys()`.
-*
-* [Original source](https://github.com/sindresorhus/ts-extras/blob/44f57392c5f027268330771996c4fdf9260b22d6/source/object-keys.ts)
-*/
-const objectKeys = Object.keys;
-/**
-* Returns `true` if the key could cause prototype pollution when used
-* as a property name in bracket-notation assignment.
-*/
-const isUnsafeKey = (key) => key === "__proto__" || key === "constructor" || key === "prototype";
-//#endregion
-export { isRuleGroupTypeIC as a, nullOrUndefinedOrEmpty as c, isRuleGroupType as i, numericRegex$1 as l, objectKeys as n, isPojo as o, isRuleGroup as r, lc as s, isUnsafeKey as t };
+export { lc as a, isPojo as i, isRuleGroupType as n, nullOrUndefinedOrEmpty as o, isRuleGroupTypeIC as r, numericRegex$1 as s, isRuleGroup as t };
 
-//# sourceMappingURL=objectUtils-ZvPkF6u6.mjs.map
+//# sourceMappingURL=isRuleGroup-CqLThsbu.mjs.map

package/dist/isRuleGroup-CqLThsbu.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"isRuleGroup-CqLThsbu.mjs","names":["numericRegex","numericQuantityRegex"],"sources":["../src/utils/misc.ts","../src/utils/isRuleGroup.ts"],"sourcesContent":["import { numericRegex as numericQuantityRegex } from 'numeric-quantity';\n\n/**\n * Converts a value to lowercase if it's a string, otherwise returns the value as is.\n */\n// v8 ignore next\nexport const lc = <T>(v: T): T => (typeof v === 'string' ? (v.toLowerCase() as T) : v);\n\n/**\n * Regex matching numeric strings. Passes for positive/negative integers, decimals,\n * and E notation, with optional surrounding whitespace.\n */\nexport const numericRegex: RegExp = new RegExp(\n  numericQuantityRegex.source.replace(/^\\^/, String.raw`^\\s*`).replace(/\\$$/, String.raw`\\s*$`)\n);\n\n/**\n * Determines if a variable is a plain old JavaScript object, aka POJO.\n */\n// oxlint-disable-next-line typescript/no-explicit-any\nexport const isPojo = (obj: unknown): obj is Record<string, any> =>\n  obj !== null && typeof obj === 'object' && Object.getPrototypeOf(obj) === Object.prototype;\n\n/**\n * Simple helper to determine whether a value is null, undefined, or an empty string.\n */\nexport const nullOrUndefinedOrEmpty = (value: unknown): value is null | undefined | '' =>\n  value === null || value === undefined || value === '';\n","import type { RuleGroupType, RuleGroupTypeAny, RuleGroupTypeIC, RuleType } from '../types';\nimport { isPojo } from './misc';\n\n/**\n * Determines if an object is a {@link RuleType} (only checks for a `field` property).\n */\nexport const isRuleType = (s: unknown): s is RuleType =>\n  isPojo(s) && 'field' in s && typeof s.field === 'string';\n\n/**\n * Determines if an object is a {@link RuleGroupType} or {@link RuleGroupTypeIC}.\n */\nexport const isRuleGroup = (rg: unknown): rg is RuleGroupTypeAny =>\n  isPojo(rg) && Array.isArray(rg.rules);\n\n/**\n * Determines if an object is a {@link RuleGroupType}.\n */\nexport const isRuleGroupType = (rg: unknown): rg is RuleGroupType =>\n  isRuleGroup(rg) && typeof rg.combinator === 'string';\n\n/**\n * Determines if an object is a {@link RuleGroupTypeIC}.\n */\nexport const isRuleGroupTypeIC = (rg: unknown): rg is RuleGroupTypeIC =>\n  isRuleGroup(rg) && rg.combinator === undefined;\n"],"mappings":";;;;;;AAMA,MAAa,MAAS,MAAa,OAAO,MAAM,WAAY,EAAE,YAAY,IAAU;;;;;AAMpF,MAAaA,iBAAuB,IAAI,OACtCC,aAAqB,OAAO,QAAQ,OAAO,OAAO,GAAG,MAAM,CAAC,CAAC,QAAQ,OAAO,OAAO,GAAG,MAAM,CAC9F;;;;AAMA,MAAa,UAAU,QACrB,QAAQ,QAAQ,OAAO,QAAQ,YAAY,OAAO,eAAe,GAAG,MAAM,OAAO;;;;AAKnF,MAAa,0BAA0B,UACrC,UAAU,QAAQ,UAAU,KAAA,KAAa,UAAU;;;;;;ACfrD,MAAa,eAAe,OAC1B,OAAO,EAAE,KAAK,MAAM,QAAQ,GAAG,KAAK;;;;AAKtC,MAAa,mBAAmB,OAC9B,YAAY,EAAE,KAAK,OAAO,GAAG,eAAe;;;;AAK9C,MAAa,qBAAqB,OAChC,YAAY,EAAE,KAAK,GAAG,eAAe,KAAA"}

package/dist/objectUtils-Cr02aGxb.js

@@ -0,0 +1,27 @@
+//#region src/utils/objectUtils.ts
+/**
+* A strongly-typed version of `Object.keys()`.
+*
+* [Original source](https://github.com/sindresorhus/ts-extras/blob/44f57392c5f027268330771996c4fdf9260b22d6/source/object-keys.ts)
+*/
+const objectKeys = Object.keys;
+/**
+* Returns `true` if the key could cause prototype pollution when used
+* as a property name in bracket-notation assignment.
+*/
+const isUnsafeKey = (key) => key === "__proto__" || key === "constructor" || key === "prototype";
+//#endregion
+Object.defineProperty(exports, "isUnsafeKey", {
+	enumerable: true,
+	get: function() {
+		return isUnsafeKey;
+	}
+});
+Object.defineProperty(exports, "objectKeys", {
+	enumerable: true,
+	get: function() {
+		return objectKeys;
+	}
+});
+
+//# sourceMappingURL=objectUtils-Cr02aGxb.js.map

package/dist/objectUtils-Cr02aGxb.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"objectUtils-Cr02aGxb.js","names":[],"sources":["../src/utils/objectUtils.ts"],"sourcesContent":["// All code in this file is adapted from:\n// npm: https://www.npmjs.com/package/ts-extras\n// src: https://github.com/sindresorhus/ts-extras\n\n/**\n * Original looked like this (not sure why template string is used):\n * ```\n * type ObjectKeys<T extends object> = `${Exclude<keyof T, symbol>}`;\n * ```\n */\ntype ObjectKeys<T extends object> = Exclude<keyof T, symbol>;\n\n/**\n * A strongly-typed version of `Object.keys()`.\n *\n * [Original source](https://github.com/sindresorhus/ts-extras/blob/44f57392c5f027268330771996c4fdf9260b22d6/source/object-keys.ts)\n */\nexport const objectKeys = Object.keys as <Type extends object>(\n  value: Type\n) => Array<ObjectKeys<Type>>;\n\n/**\n * A strongly-typed version of `Object.entries()`.\n *\n * [Original source](https://github.com/sindresorhus/ts-extras/blob/44f57392c5f027268330771996c4fdf9260b22d6/source/object-entries.ts)\n */\nexport const objectEntries = Object.entries as <Type extends Record<PropertyKey, unknown>>(\n  value: Type\n) => Array<[ObjectKeys<Type>, Type[ObjectKeys<Type>]]>;\n\n/**\n * Returns `true` if the key could cause prototype pollution when used\n * as a property name in bracket-notation assignment.\n */\nexport const isUnsafeKey = (key: unknown): boolean =>\n  key === '__proto__' || key === 'constructor' || key === 'prototype';\n"],"mappings":";;;;;;AAiBA,MAAa,aAAa,OAAO;;;;;AAiBjC,MAAa,eAAe,QAC1B,QAAQ,eAAe,QAAQ,iBAAiB,QAAQ"}

package/dist/objectUtils-DBlmJgBf.mjs

@@ -0,0 +1,16 @@
+//#region src/utils/objectUtils.ts
+/**
+* A strongly-typed version of `Object.keys()`.
+*
+* [Original source](https://github.com/sindresorhus/ts-extras/blob/44f57392c5f027268330771996c4fdf9260b22d6/source/object-keys.ts)
+*/
+const objectKeys = Object.keys;
+/**
+* Returns `true` if the key could cause prototype pollution when used
+* as a property name in bracket-notation assignment.
+*/
+const isUnsafeKey = (key) => key === "__proto__" || key === "constructor" || key === "prototype";
+//#endregion
+export { objectKeys as n, isUnsafeKey as t };
+
+//# sourceMappingURL=objectUtils-DBlmJgBf.mjs.map

package/dist/objectUtils-DBlmJgBf.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"objectUtils-DBlmJgBf.mjs","names":[],"sources":["../src/utils/objectUtils.ts"],"sourcesContent":["// All code in this file is adapted from:\n// npm: https://www.npmjs.com/package/ts-extras\n// src: https://github.com/sindresorhus/ts-extras\n\n/**\n * Original looked like this (not sure why template string is used):\n * ```\n * type ObjectKeys<T extends object> = `${Exclude<keyof T, symbol>}`;\n * ```\n */\ntype ObjectKeys<T extends object> = Exclude<keyof T, symbol>;\n\n/**\n * A strongly-typed version of `Object.keys()`.\n *\n * [Original source](https://github.com/sindresorhus/ts-extras/blob/44f57392c5f027268330771996c4fdf9260b22d6/source/object-keys.ts)\n */\nexport const objectKeys = Object.keys as <Type extends object>(\n  value: Type\n) => Array<ObjectKeys<Type>>;\n\n/**\n * A strongly-typed version of `Object.entries()`.\n *\n * [Original source](https://github.com/sindresorhus/ts-extras/blob/44f57392c5f027268330771996c4fdf9260b22d6/source/object-entries.ts)\n */\nexport const objectEntries = Object.entries as <Type extends Record<PropertyKey, unknown>>(\n  value: Type\n) => Array<[ObjectKeys<Type>, Type[ObjectKeys<Type>]]>;\n\n/**\n * Returns `true` if the key could cause prototype pollution when used\n * as a property name in bracket-notation assignment.\n */\nexport const isUnsafeKey = (key: unknown): boolean =>\n  key === '__proto__' || key === 'constructor' || key === 'prototype';\n"],"mappings":";;;;;;AAiBA,MAAa,aAAa,OAAO;;;;;AAiBjC,MAAa,eAAe,QAC1B,QAAQ,eAAe,QAAQ,iBAAiB,QAAQ"}

package/dist/parseCEL.d.mts

@@ -1,6 +1,5 @@
-import { C as RuleGroupTypeIC, D as RuleGroupType, E as DefaultRuleGroupType, O as RuleType, T as DefaultOperatorName, j as Except, w as DefaultCombinatorName, x as DefaultRuleGroupTypeIC } from "./index-DlVg-QXo.mjs";
-import { t as ParserCommonOptions } from "./import-ShTj5IdB.mjs";
-
+import { A as DefaultOperatorName, D as RuleGroupTypeIC, L as Except, M as RuleGroupType, N as RuleType, O as DefaultCombinatorName, P as ExpressionNode, T as DefaultRuleGroupTypeIC, j as DefaultRuleGroupType } from "./index-BSwFvkeI.mjs";
+import { t as ParserCommonOptions } from "./import-BVdxeIBO.mjs";
 //#region src/utils/parseCEL/types.d.ts
 type CELExpressionType = "Addition" | "BooleanLiteral" | "BytesLiteral" | "ConditionalAnd" | "ConditionalExpr" | "ConditionalOr" | "Division" | "DynamicPropertyAccessor" | "ExpressionGroup" | "ExpressionList" | "FieldInit" | "FieldInits" | "MessageInit" | "FloatLiteral" | "FunctionCall" | "Identifier" | "IntegerLiteral" | "List" | "Map" | "MapInit" | "MapInits" | "Member" | "Modulo" | "Multiplication" | "Negation" | "Negative" | "NullLiteral" | "Property" | "Relation" | "StringLiteral" | "Subtraction" | "Unary" | "UnsignedIntegerLiteral" | "LikeExpression" | "SubqueryExpression";
 type CELRelop = "==" | ">=" | ">" | "<=" | "<" | "!=" | "in";
@@ -218,59 +217,85 @@ interface ParsedCEL {
   nodeType: "Main";
   value: CELExpression;
 }
+/**
+ * A CEL operand subtree that {@link parseCEL!ParseCELOptions.getExpression} may receive — an
+ * arithmetic infix node (`Addition`/`Subtraction`/`Multiplication`/`Division`/`Modulo`,
+ * optionally wrapped in an `ExpressionGroup`), a `FunctionCall`, or a `ConditionalExpr` (the
+ * `min`/`max` emulated template).
+ */
+type CELExpressionOperand = CELExpression;
+/** Context passed to {@link parseCEL!ParseCELOptions.getExpression}. */
+interface ParseCELExpressionContext {
+  /** Returns `true` if the field is configured (or if no `fields` were supplied). */
+  fieldExists: (fieldName: string) => boolean;
+}
 //#endregion
 //#region src/utils/parseCEL/parseCEL.d.ts
 interface ParseCELOptionsStandard extends Except<ParserCommonOptions, "independentCombinators"> {
   independentCombinators?: false;
   /**
-  * Handler for custom CEL expressions.
-  */
+   * Handler for custom CEL expressions.
+   */
   customExpressionHandler?: (expr: CELExpression) => RuleType | RuleGroupType | null;
+  /**
+   * Handler that converts a CEL arithmetic/function operand subtree into an
+   * {@link ExpressionNode}. Return `null` to reject (the rule is dropped). Supplied by
+   * `@react-querybuilder/expr` (`expressionParserCEL`). When omitted, expression operands
+   * are ignored (rule dropped).
+   */
+  getExpression?: (node: CELExpressionOperand, ctx: ParseCELExpressionContext) => ExpressionNode | null;
 }
 interface ParseCELOptionsIC extends Except<ParserCommonOptions, "independentCombinators"> {
   independentCombinators: true;
   /**
-  * Handler for custom CEL expressions.
-  */
+   * Handler for custom CEL expressions.
+   */
   customExpressionHandler?: (expr: CELExpression) => RuleType | RuleGroupTypeIC | null;
+  /**
+   * Handler that converts a CEL arithmetic/function operand subtree into an
+   * {@link ExpressionNode}. Return `null` to reject (the rule is dropped). Supplied by
+   * `@react-querybuilder/expr` (`expressionParserCEL`). When omitted, expression operands
+   * are ignored (rule dropped).
+   */
+  getExpression?: (node: CELExpressionOperand, ctx: ParseCELExpressionContext) => ExpressionNode | null;
 }
 /**
-* Options object for {@link parseCEL}.
-*/
+ * Options object for {@link parseCEL}.
+ */
 type ParseCELOptions = ParseCELOptionsStandard | ParseCELOptionsIC;
 /**
-* Converts a CEL string expression into a query suitable for the
-* {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props
-* ({@link index!DefaultRuleGroupType DefaultRuleGroupType}).
-*/
+ * Converts a CEL string expression into a query suitable for the
+ * {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props
+ * ({@link index!DefaultRuleGroupType DefaultRuleGroupType}).
+ */
 declare function parseCEL(cel: string): DefaultRuleGroupType;
 /**
-* Converts a CEL string expression into a query suitable for the
-* {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props
-* ({@link index!RuleGroupType RuleGroupType}).
-*/
+ * Converts a CEL string expression into a query suitable for the
+ * {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props
+ * ({@link index!RuleGroupType RuleGroupType}).
+ */
 declare function parseCEL(cel: string, options: ParseCELOptionsStandard & {
   customExpressionHandler: (expr: CELExpression) => RuleType | RuleGroupType | null;
 }): RuleGroupType;
 /**
-* Converts a CEL string expression into a query suitable for the
-* {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props
-* ({@link index!RuleGroupTypeIC RuleGroupTypeIC}).
-*/
+ * Converts a CEL string expression into a query suitable for the
+ * {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props
+ * ({@link index!RuleGroupTypeIC RuleGroupTypeIC}).
+ */
 declare function parseCEL(cel: string, options: ParseCELOptionsIC & {
   customExpressionHandler: (expr: CELExpression) => RuleType | RuleGroupTypeIC | null;
 }): RuleGroupTypeIC;
 /**
-* Converts a CEL string expression into a query suitable for the
-* {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props
-* ({@link index!DefaultRuleGroupType DefaultRuleGroupType}).
-*/
+ * Converts a CEL string expression into a query suitable for the
+ * {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props
+ * ({@link index!DefaultRuleGroupType DefaultRuleGroupType}).
+ */
 declare function parseCEL(cel: string, options?: ParseCELOptionsStandard): DefaultRuleGroupType;
 /**
-* Converts a CEL string expression into a query suitable for the
-* {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props
-* ({@link index!DefaultRuleGroupTypeIC DefaultRuleGroupTypeIC}).
-*/
+ * Converts a CEL string expression into a query suitable for the
+ * {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props
+ * ({@link index!DefaultRuleGroupTypeIC DefaultRuleGroupTypeIC}).
+ */
 declare function parseCEL(cel: string, options: ParseCELOptionsIC): DefaultRuleGroupTypeIC;
 //#endregion
 //#region src/utils/parseCEL/utils.d.ts
@@ -334,6 +359,15 @@ declare const celNormalizeOperator: (op: CELRelop, flip?: boolean) => DefaultOpe
 declare const celGenerateFlatAndOrList: (expr: CELConditionalAnd | CELConditionalOr) => (DefaultCombinatorName | CELExpression)[];
 declare const celGenerateMixedAndOrList: (expr: CELConditionalAnd | CELConditionalOr) => (DefaultCombinatorName | CELExpression | ("and" | CELExpression)[])[];
 declare const transformAliasInExpression: (expr: CELExpression, alias: string | null) => CELExpression;
+/** A CEL arithmetic infix node (`Addition`/`Subtraction`/`Multiplication`/`Division`/`Modulo`). */
+declare const isCELMathOperation: (expr: CELExpression) => boolean;
+/**
+ * Whether a relation operand should be routed to `getExpression`: an arithmetic infix node, a
+ * `FunctionCall`, or a `ConditionalExpr` (`min`/`max` template) — optionally wrapped in one or
+ * more `ExpressionGroup`s. Bare identifiers, chains, and literals are not expression operands
+ * (they retain their normal handling).
+ */
+declare const isCELExpressionOperand: (expr: CELExpression) => boolean;
 //#endregion
-export { CELAddition, CELBooleanLiteral, CELBytesLiteral, CELConditionalAnd, CELConditionalExpr, CELConditionalOr, CELDivision, CELDynamicPropertyAccessor, CELExpression, CELExpressionGroup, CELExpressionList, CELExpressionType, CELFieldInit, CELFieldInits, CELFloatLiteral, CELFunctionCall, CELIdentifier, CELIntegerLiteral, CELLikeExpression, CELList, CELLiteral, CELMap, CELMapInit, CELMapInits, CELMathOperation, CELMember, CELMemberIdentifierChain, CELMemberNegatedIdentifier, CELMemberNegatedIdentifierChain, CELMessageInit, CELModulo, CELMultiplication, CELNegatedLikeExpression, CELNegatedSubqueryExpression, CELNegation, CELNegative, CELNullLiteral, CELNumericLiteral, CELPrimary, CELProperty, CELRelation, CELRelop, CELStringLiteral, CELSubqueryExpression, CELSubtraction, CELUnsignedIntegerLiteral, ParseCELOptions, ParseCELOptionsIC, ParseCELOptionsStandard, ParsedCEL, celGenerateFlatAndOrList, celGenerateMixedAndOrList, celNormalizeCombinator, celNormalizeOperator, evalCELLiteralValue, extractSubqueryComponents, getCELIdentifierFromChain, getCELIdentifierFromNegatedChain, isCELAddition, isCELBooleanLiteral, isCELBytesLiteral, isCELConditionalAnd, isCELConditionalExpr, isCELConditionalOr, isCELDivision, isCELDynamicPropertyAccessor, isCELExpressionGroup, isCELExpressionList, isCELFieldInit, isCELFieldInits, isCELFloatLiteral, isCELFunctionCall, isCELIdentifier, isCELIdentifierOrChain, isCELIntegerLiteral, isCELLikeExpression, isCELList, isCELLiteral, isCELMap, isCELMapInit, isCELMapInits, isCELMember, isCELMessageInit, isCELModulo, isCELMultiplication, isCELNegatedIdentifier, isCELNegatedIdentifierOrChain, isCELNegatedLikeExpression, isCELNegatedSubqueryExpression, isCELNegation, isCELNegative, isCELNullLiteral, isCELNumericLiteral, isCELProperty, isCELRelation, isCELStringLiteral, isCELSubqueryExpression, isCELSubtraction, isCELUnsignedIntegerLiteral, parseCEL, transformAliasInExpression };
+export { CELAddition, CELBooleanLiteral, CELBytesLiteral, CELConditionalAnd, CELConditionalExpr, CELConditionalOr, CELDivision, CELDynamicPropertyAccessor, CELExpression, CELExpressionGroup, CELExpressionList, CELExpressionOperand, CELExpressionType, CELFieldInit, CELFieldInits, CELFloatLiteral, CELFunctionCall, CELIdentifier, CELIntegerLiteral, CELLikeExpression, CELList, CELLiteral, CELMap, CELMapInit, CELMapInits, CELMathOperation, CELMember, CELMemberIdentifierChain, CELMemberNegatedIdentifier, CELMemberNegatedIdentifierChain, CELMessageInit, CELModulo, CELMultiplication, CELNegatedLikeExpression, CELNegatedSubqueryExpression, CELNegation, CELNegative, CELNullLiteral, CELNumericLiteral, CELPrimary, CELProperty, CELRelation, CELRelop, CELStringLiteral, CELSubqueryExpression, CELSubtraction, CELUnsignedIntegerLiteral, ParseCELExpressionContext, ParseCELOptions, ParseCELOptionsIC, ParseCELOptionsStandard, ParsedCEL, celGenerateFlatAndOrList, celGenerateMixedAndOrList, celNormalizeCombinator, celNormalizeOperator, evalCELLiteralValue, extractSubqueryComponents, getCELIdentifierFromChain, getCELIdentifierFromNegatedChain, isCELAddition, isCELBooleanLiteral, isCELBytesLiteral, isCELConditionalAnd, isCELConditionalExpr, isCELConditionalOr, isCELDivision, isCELDynamicPropertyAccessor, isCELExpressionGroup, isCELExpressionList, isCELExpressionOperand, isCELFieldInit, isCELFieldInits, isCELFloatLiteral, isCELFunctionCall, isCELIdentifier, isCELIdentifierOrChain, isCELIntegerLiteral, isCELLikeExpression, isCELList, isCELLiteral, isCELMap, isCELMapInit, isCELMapInits, isCELMathOperation, isCELMember, isCELMessageInit, isCELModulo, isCELMultiplication, isCELNegatedIdentifier, isCELNegatedIdentifierOrChain, isCELNegatedLikeExpression, isCELNegatedSubqueryExpression, isCELNegation, isCELNegative, isCELNullLiteral, isCELNumericLiteral, isCELProperty, isCELRelation, isCELStringLiteral, isCELSubqueryExpression, isCELSubtraction, isCELUnsignedIntegerLiteral, parseCEL, transformAliasInExpression };
 //# sourceMappingURL=parseCEL.d.mts.map

package/dist/parseCEL.d.ts

@@ -1,6 +1,5 @@
-import { C as RuleGroupTypeIC, D as RuleGroupType, E as DefaultRuleGroupType, O as RuleType, T as DefaultOperatorName, j as Except, w as DefaultCombinatorName, x as DefaultRuleGroupTypeIC } from "./index-DlVg-QXo.js";
-import { t as ParserCommonOptions } from "./import-Qs1-kgv5.js";
-
+import { A as DefaultOperatorName, D as RuleGroupTypeIC, L as Except, M as RuleGroupType, N as RuleType, O as DefaultCombinatorName, P as ExpressionNode, T as DefaultRuleGroupTypeIC, j as DefaultRuleGroupType } from "./index-BSwFvkeI.js";
+import { t as ParserCommonOptions } from "./import-Ddc3d_8q.js";
 //#region src/utils/parseCEL/types.d.ts
 type CELExpressionType = "Addition" | "BooleanLiteral" | "BytesLiteral" | "ConditionalAnd" | "ConditionalExpr" | "ConditionalOr" | "Division" | "DynamicPropertyAccessor" | "ExpressionGroup" | "ExpressionList" | "FieldInit" | "FieldInits" | "MessageInit" | "FloatLiteral" | "FunctionCall" | "Identifier" | "IntegerLiteral" | "List" | "Map" | "MapInit" | "MapInits" | "Member" | "Modulo" | "Multiplication" | "Negation" | "Negative" | "NullLiteral" | "Property" | "Relation" | "StringLiteral" | "Subtraction" | "Unary" | "UnsignedIntegerLiteral" | "LikeExpression" | "SubqueryExpression";
 type CELRelop = "==" | ">=" | ">" | "<=" | "<" | "!=" | "in";
@@ -218,59 +217,85 @@ interface ParsedCEL {
   nodeType: "Main";
   value: CELExpression;
 }
+/**
+ * A CEL operand subtree that {@link parseCEL!ParseCELOptions.getExpression} may receive — an
+ * arithmetic infix node (`Addition`/`Subtraction`/`Multiplication`/`Division`/`Modulo`,
+ * optionally wrapped in an `ExpressionGroup`), a `FunctionCall`, or a `ConditionalExpr` (the
+ * `min`/`max` emulated template).
+ */
+type CELExpressionOperand = CELExpression;
+/** Context passed to {@link parseCEL!ParseCELOptions.getExpression}. */
+interface ParseCELExpressionContext {
+  /** Returns `true` if the field is configured (or if no `fields` were supplied). */
+  fieldExists: (fieldName: string) => boolean;
+}
 //#endregion
 //#region src/utils/parseCEL/parseCEL.d.ts
 interface ParseCELOptionsStandard extends Except<ParserCommonOptions, "independentCombinators"> {
   independentCombinators?: false;
   /**
-  * Handler for custom CEL expressions.
-  */
+   * Handler for custom CEL expressions.
+   */
   customExpressionHandler?: (expr: CELExpression) => RuleType | RuleGroupType | null;
+  /**
+   * Handler that converts a CEL arithmetic/function operand subtree into an
+   * {@link ExpressionNode}. Return `null` to reject (the rule is dropped). Supplied by
+   * `@react-querybuilder/expr` (`expressionParserCEL`). When omitted, expression operands
+   * are ignored (rule dropped).
+   */
+  getExpression?: (node: CELExpressionOperand, ctx: ParseCELExpressionContext) => ExpressionNode | null;
 }
 interface ParseCELOptionsIC extends Except<ParserCommonOptions, "independentCombinators"> {
   independentCombinators: true;
   /**
-  * Handler for custom CEL expressions.
-  */
+   * Handler for custom CEL expressions.
+   */
   customExpressionHandler?: (expr: CELExpression) => RuleType | RuleGroupTypeIC | null;
+  /**
+   * Handler that converts a CEL arithmetic/function operand subtree into an
+   * {@link ExpressionNode}. Return `null` to reject (the rule is dropped). Supplied by
+   * `@react-querybuilder/expr` (`expressionParserCEL`). When omitted, expression operands
+   * are ignored (rule dropped).
+   */
+  getExpression?: (node: CELExpressionOperand, ctx: ParseCELExpressionContext) => ExpressionNode | null;
 }
 /**
-* Options object for {@link parseCEL}.
-*/
+ * Options object for {@link parseCEL}.
+ */
 type ParseCELOptions = ParseCELOptionsStandard | ParseCELOptionsIC;
 /**
-* Converts a CEL string expression into a query suitable for the
-* {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props
-* ({@link index!DefaultRuleGroupType DefaultRuleGroupType}).
-*/
+ * Converts a CEL string expression into a query suitable for the
+ * {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props
+ * ({@link index!DefaultRuleGroupType DefaultRuleGroupType}).
+ */
 declare function parseCEL(cel: string): DefaultRuleGroupType;
 /**
-* Converts a CEL string expression into a query suitable for the
-* {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props
-* ({@link index!RuleGroupType RuleGroupType}).
-*/
+ * Converts a CEL string expression into a query suitable for the
+ * {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props
+ * ({@link index!RuleGroupType RuleGroupType}).
+ */
 declare function parseCEL(cel: string, options: ParseCELOptionsStandard & {
   customExpressionHandler: (expr: CELExpression) => RuleType | RuleGroupType | null;
 }): RuleGroupType;
 /**
-* Converts a CEL string expression into a query suitable for the
-* {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props
-* ({@link index!RuleGroupTypeIC RuleGroupTypeIC}).
-*/
+ * Converts a CEL string expression into a query suitable for the
+ * {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props
+ * ({@link index!RuleGroupTypeIC RuleGroupTypeIC}).
+ */
 declare function parseCEL(cel: string, options: ParseCELOptionsIC & {
   customExpressionHandler: (expr: CELExpression) => RuleType | RuleGroupTypeIC | null;
 }): RuleGroupTypeIC;
 /**
-* Converts a CEL string expression into a query suitable for the
-* {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props
-* ({@link index!DefaultRuleGroupType DefaultRuleGroupType}).
-*/
+ * Converts a CEL string expression into a query suitable for the
+ * {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props
+ * ({@link index!DefaultRuleGroupType DefaultRuleGroupType}).
+ */
 declare function parseCEL(cel: string, options?: ParseCELOptionsStandard): DefaultRuleGroupType;
 /**
-* Converts a CEL string expression into a query suitable for the
-* {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props
-* ({@link index!DefaultRuleGroupTypeIC DefaultRuleGroupTypeIC}).
-*/
+ * Converts a CEL string expression into a query suitable for the
+ * {@link index!QueryBuilder QueryBuilder} component's `query` or `defaultQuery` props
+ * ({@link index!DefaultRuleGroupTypeIC DefaultRuleGroupTypeIC}).
+ */
 declare function parseCEL(cel: string, options: ParseCELOptionsIC): DefaultRuleGroupTypeIC;
 //#endregion
 //#region src/utils/parseCEL/utils.d.ts
@@ -334,6 +359,15 @@ declare const celNormalizeOperator: (op: CELRelop, flip?: boolean) => DefaultOpe
 declare const celGenerateFlatAndOrList: (expr: CELConditionalAnd | CELConditionalOr) => (DefaultCombinatorName | CELExpression)[];
 declare const celGenerateMixedAndOrList: (expr: CELConditionalAnd | CELConditionalOr) => (DefaultCombinatorName | CELExpression | ("and" | CELExpression)[])[];
 declare const transformAliasInExpression: (expr: CELExpression, alias: string | null) => CELExpression;
+/** A CEL arithmetic infix node (`Addition`/`Subtraction`/`Multiplication`/`Division`/`Modulo`). */
+declare const isCELMathOperation: (expr: CELExpression) => boolean;
+/**
+ * Whether a relation operand should be routed to `getExpression`: an arithmetic infix node, a
+ * `FunctionCall`, or a `ConditionalExpr` (`min`/`max` template) — optionally wrapped in one or
+ * more `ExpressionGroup`s. Bare identifiers, chains, and literals are not expression operands
+ * (they retain their normal handling).
+ */
+declare const isCELExpressionOperand: (expr: CELExpression) => boolean;
 //#endregion
-export { CELAddition, CELBooleanLiteral, CELBytesLiteral, CELConditionalAnd, CELConditionalExpr, CELConditionalOr, CELDivision, CELDynamicPropertyAccessor, CELExpression, CELExpressionGroup, CELExpressionList, CELExpressionType, CELFieldInit, CELFieldInits, CELFloatLiteral, CELFunctionCall, CELIdentifier, CELIntegerLiteral, CELLikeExpression, CELList, CELLiteral, CELMap, CELMapInit, CELMapInits, CELMathOperation, CELMember, CELMemberIdentifierChain, CELMemberNegatedIdentifier, CELMemberNegatedIdentifierChain, CELMessageInit, CELModulo, CELMultiplication, CELNegatedLikeExpression, CELNegatedSubqueryExpression, CELNegation, CELNegative, CELNullLiteral, CELNumericLiteral, CELPrimary, CELProperty, CELRelation, CELRelop, CELStringLiteral, CELSubqueryExpression, CELSubtraction, CELUnsignedIntegerLiteral, ParseCELOptions, ParseCELOptionsIC, ParseCELOptionsStandard, ParsedCEL, celGenerateFlatAndOrList, celGenerateMixedAndOrList, celNormalizeCombinator, celNormalizeOperator, evalCELLiteralValue, extractSubqueryComponents, getCELIdentifierFromChain, getCELIdentifierFromNegatedChain, isCELAddition, isCELBooleanLiteral, isCELBytesLiteral, isCELConditionalAnd, isCELConditionalExpr, isCELConditionalOr, isCELDivision, isCELDynamicPropertyAccessor, isCELExpressionGroup, isCELExpressionList, isCELFieldInit, isCELFieldInits, isCELFloatLiteral, isCELFunctionCall, isCELIdentifier, isCELIdentifierOrChain, isCELIntegerLiteral, isCELLikeExpression, isCELList, isCELLiteral, isCELMap, isCELMapInit, isCELMapInits, isCELMember, isCELMessageInit, isCELModulo, isCELMultiplication, isCELNegatedIdentifier, isCELNegatedIdentifierOrChain, isCELNegatedLikeExpression, isCELNegatedSubqueryExpression, isCELNegation, isCELNegative, isCELNullLiteral, isCELNumericLiteral, isCELProperty, isCELRelation, isCELStringLiteral, isCELSubqueryExpression, isCELSubtraction, isCELUnsignedIntegerLiteral, parseCEL, transformAliasInExpression };
+export { CELAddition, CELBooleanLiteral, CELBytesLiteral, CELConditionalAnd, CELConditionalExpr, CELConditionalOr, CELDivision, CELDynamicPropertyAccessor, CELExpression, CELExpressionGroup, CELExpressionList, CELExpressionOperand, CELExpressionType, CELFieldInit, CELFieldInits, CELFloatLiteral, CELFunctionCall, CELIdentifier, CELIntegerLiteral, CELLikeExpression, CELList, CELLiteral, CELMap, CELMapInit, CELMapInits, CELMathOperation, CELMember, CELMemberIdentifierChain, CELMemberNegatedIdentifier, CELMemberNegatedIdentifierChain, CELMessageInit, CELModulo, CELMultiplication, CELNegatedLikeExpression, CELNegatedSubqueryExpression, CELNegation, CELNegative, CELNullLiteral, CELNumericLiteral, CELPrimary, CELProperty, CELRelation, CELRelop, CELStringLiteral, CELSubqueryExpression, CELSubtraction, CELUnsignedIntegerLiteral, ParseCELExpressionContext, ParseCELOptions, ParseCELOptionsIC, ParseCELOptionsStandard, ParsedCEL, celGenerateFlatAndOrList, celGenerateMixedAndOrList, celNormalizeCombinator, celNormalizeOperator, evalCELLiteralValue, extractSubqueryComponents, getCELIdentifierFromChain, getCELIdentifierFromNegatedChain, isCELAddition, isCELBooleanLiteral, isCELBytesLiteral, isCELConditionalAnd, isCELConditionalExpr, isCELConditionalOr, isCELDivision, isCELDynamicPropertyAccessor, isCELExpressionGroup, isCELExpressionList, isCELExpressionOperand, isCELFieldInit, isCELFieldInits, isCELFloatLiteral, isCELFunctionCall, isCELIdentifier, isCELIdentifierOrChain, isCELIntegerLiteral, isCELLikeExpression, isCELList, isCELLiteral, isCELMap, isCELMapInit, isCELMapInits, isCELMathOperation, isCELMember, isCELMessageInit, isCELModulo, isCELMultiplication, isCELNegatedIdentifier, isCELNegatedIdentifierOrChain, isCELNegatedLikeExpression, isCELNegatedSubqueryExpression, isCELNegation, isCELNegative, isCELNullLiteral, isCELNumericLiteral, isCELProperty, isCELRelation, isCELStringLiteral, isCELSubqueryExpression, isCELSubtraction, isCELUnsignedIntegerLiteral, parseCEL, transformAliasInExpression };
 //# sourceMappingURL=parseCEL.d.ts.map

package/dist/parseCEL.js

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_utils = require("./utils-BpaOtylk.js");
-const require_objectUtils = require("./objectUtils-DBJI82bl.js");
-const require_prepareQueryObjects = require("./prepareQueryObjects-Bni5VgYM.js");
+const require_utils = require("./utils-DEwV7F6B.js");
+const require_isRuleGroup = require("./isRuleGroup-0JNiQgLg.js");
+const require_prepareQueryObjects = require("./prepareQueryObjects-C2-kTZvR.js");
 let _ts_jison_parser = require("@ts-jison/parser");
 let _ts_jison_lexer = require("@ts-jison/lexer");
 //#region src/utils/parseCEL/celParser.ts
@@ -2245,12 +2245,26 @@ const transformAliasInExpressionInternal = (expr, alias, isPrimitive) => {
 const transformAliasInExpression = (expr, alias) => {
 	// v8 ignore next
 	if (!alias) return expr;
-	return transformAliasInExpressionInternal(expr, alias, isPrimitiveArrayUsage(expr, alias));
+	const isPrimitive = isPrimitiveArrayUsage(expr, alias);
+	return transformAliasInExpressionInternal(expr, alias, isPrimitive);
+};
+/** A CEL arithmetic infix node (`Addition`/`Subtraction`/`Multiplication`/`Division`/`Modulo`). */
+const isCELMathOperation = (expr) => expr.type === "Addition" || expr.type === "Subtraction" || expr.type === "Multiplication" || expr.type === "Division" || expr.type === "Modulo";
+/**
+* Whether a relation operand should be routed to `getExpression`: an arithmetic infix node, a
+* `FunctionCall`, or a `ConditionalExpr` (`min`/`max` template) — optionally wrapped in one or
+* more `ExpressionGroup`s. Bare identifiers, chains, and literals are not expression operands
+* (they retain their normal handling).
+*/
+const isCELExpressionOperand = (expr) => {
+	const inner = isCELExpressionGroup(expr) ? expr.value : expr;
+	if (isCELExpressionGroup(inner)) return isCELExpressionOperand(inner);
+	return isCELMathOperation(inner) || inner.type === "FunctionCall" || inner.type === "ConditionalExpr";
 };
 //#endregion
 //#region src/utils/parseCEL/parseCEL.ts
 function parseCEL(cel, options = {}) {
-	const { fields, independentCombinators, listsAsArrays, customExpressionHandler } = options;
+	const { fields, independentCombinators, listsAsArrays, customExpressionHandler, getExpression } = options;
 	const ic = !!independentCombinators;
 	const fieldsFlat = require_prepareQueryObjects.getFieldsArray(fields);
 	const fieldIsValid = (fieldName, operator, subordinateFieldName) => require_prepareQueryObjects.fieldIsValidUtil({
@@ -2264,6 +2278,7 @@ function parseCEL(cel, options = {}) {
 		rules: [],
 		...ic ? {} : { combinator: "and" }
 	};
+	const exprCtx = { fieldExists: (fieldName) => fieldsFlat.length === 0 || fieldsFlat.some((f) => f.name === fieldName) };
 	const processCELExpression = (expr, processOpts = {}) => {
 		const { forwardNegation: forwardedNegation, groupOnlyIfNecessary } = processOpts;
 		/* v8 ignore if -- @preserve */
@@ -2281,7 +2296,7 @@ function parseCEL(cel, options = {}) {
 			});
 			if (negatedExpr) {
 				if (isCELNegatedLikeExpression(expr) || isCELNegation(expr) && isCELExpressionGroup(expr.value) && isCELRelation(expr.value.value)) return negatedExpr;
-				else if (!negate || negate && !require_objectUtils.isRuleGroup(negatedExpr) && negatedExpr.operator.startsWith("doesNot")) return ic ? { rules: [negatedExpr] } : {
+				else if (!negate || negate && !require_isRuleGroup.isRuleGroup(negatedExpr) && negatedExpr.operator.startsWith("doesNot")) return ic ? { rules: [negatedExpr] } : {
 					combinator: "and",
 					rules: [negatedExpr]
 				};
@@ -2297,7 +2312,7 @@ function parseCEL(cel, options = {}) {
 		} else if (isCELExpressionGroup(expr)) {
 			const rule = processCELExpression(expr.value, { groupOnlyIfNecessary: true });
 			if (rule) {
-				if (require_objectUtils.isRuleGroup(rule) || groupOnlyIfNecessary && isCELExpressionGroup(expr.value)) return rule;
+				if (require_isRuleGroup.isRuleGroup(rule) || groupOnlyIfNecessary && isCELExpressionGroup(expr.value)) return rule;
 				return ic ? { rules: [rule] } : {
 					combinator: "and",
 					rules: [rule]
@@ -2350,9 +2365,10 @@ function parseCEL(cel, options = {}) {
 			if (components) {
 				const { field, method, alias, condition } = components;
 				const matchMode = method === "all" ? "all" : "some";
-				const subqueryValue = processCELExpression(transformAliasInExpression(condition, alias));
+				const transformedCondition = transformAliasInExpression(condition, alias);
+				const subqueryValue = processCELExpression(transformedCondition);
 				if (subqueryValue && fieldIsValid(field, "=")) {
-					const ruleGroupValue = require_objectUtils.isRuleGroup(subqueryValue) ? subqueryValue : ic ? { rules: [subqueryValue] } : {
+					const ruleGroupValue = require_isRuleGroup.isRuleGroup(subqueryValue) ? subqueryValue : ic ? { rules: [subqueryValue] } : {
 						combinator: "and",
 						rules: [subqueryValue]
 					};
@@ -2368,10 +2384,11 @@ function parseCEL(cel, options = {}) {
 			const field = getCELIdentifierFromNegatedChain(expr.left).replace(/^!+/, "");
 			const method = expr.right.value;
 			const [aliasExpr, conditionExpr] = expr.list.value;
-			const subqueryValue = processCELExpression(transformAliasInExpression(conditionExpr, isCELIdentifier(aliasExpr) ? aliasExpr.value : 			/* v8 ignore next -- @preserve */ null));
+			const transformedCondition = transformAliasInExpression(conditionExpr, isCELIdentifier(aliasExpr) ? aliasExpr.value : 			/* v8 ignore next -- @preserve */ null);
+			const subqueryValue = processCELExpression(transformedCondition);
 			// v8 ignore else
 			if (subqueryValue && fieldIsValid(field, "=")) {
-				const ruleGroupValue = require_objectUtils.isRuleGroup(subqueryValue) ? subqueryValue : ic ? { rules: [subqueryValue] } : {
+				const ruleGroupValue = require_isRuleGroup.isRuleGroup(subqueryValue) ? subqueryValue : ic ? { rules: [subqueryValue] } : {
 					combinator: "and",
 					rules: [subqueryValue]
 				};
@@ -2396,6 +2413,66 @@ function parseCEL(cel, options = {}) {
 			let valueSource = void 0;
 			let flip = false;
 			const { left, right } = expr;
+			if (getExpression) {
+				const leftIsExpr = isCELExpressionOperand(left);
+				const rightIsExpr = isCELExpressionOperand(right);
+				const normOp = (flipOp) => {
+					const o = celNormalizeOperator(expr.operator, flipOp);
+					return forwardedNegation ? require_utils.defaultOperatorNegationMap[o] : o;
+				};
+				if (leftIsExpr && rightIsExpr) {
+					const l = getExpression(left, exprCtx);
+					const r = getExpression(right, exprCtx);
+					if (l && r) return {
+						field: "",
+						operator: normOp(false),
+						lhs: l,
+						value: r,
+						valueSource: "expression"
+					};
+					return null;
+				} else if (isCELIdentifierOrChain(left) && rightIsExpr) {
+					const node = getExpression(right, exprCtx);
+					const f = getCELIdentifierFromChain(left);
+					const op = normOp(false);
+					if (node && fieldIsValid(f, op)) return {
+						field: f,
+						operator: op,
+						value: node,
+						valueSource: "expression"
+					};
+					return null;
+				} else if (leftIsExpr && isCELIdentifierOrChain(right)) {
+					const node = getExpression(left, exprCtx);
+					const f = getCELIdentifierFromChain(right);
+					const op = normOp(true);
+					if (node && fieldIsValid(f, op)) return {
+						field: f,
+						operator: op,
+						value: node,
+						valueSource: "expression"
+					};
+					return null;
+				} else if (leftIsExpr && isCELLiteral(right)) {
+					const l = getExpression(left, exprCtx);
+					if (l) return {
+						field: "",
+						operator: normOp(false),
+						lhs: l,
+						value: evalCELLiteralValue(right)
+					};
+					return null;
+				} else if (isCELLiteral(left) && rightIsExpr) {
+					const r = getExpression(right, exprCtx);
+					if (r) return {
+						field: "",
+						operator: normOp(true),
+						lhs: r,
+						value: evalCELLiteralValue(left)
+					};
+					return null;
+				}
+			}
 			if (isCELIdentifierOrChain(left)) {
 				field = getCELIdentifierFromChain(left);
 				if (isCELIdentifierOrChain(right)) {
@@ -2445,7 +2522,7 @@ function parseCEL(cel, options = {}) {
 	}
 	const result = processCELExpression(processedCEL);
 	if (result) {
-		if (require_objectUtils.isRuleGroup(result)) return prepare(result);
+		if (require_isRuleGroup.isRuleGroup(result)) return prepare(result);
 		return prepare({
 			rules: [result],
 			...ic ? {} : { combinator: "and" }
@@ -2472,6 +2549,7 @@ exports.isCELDivision = isCELDivision;
 exports.isCELDynamicPropertyAccessor = isCELDynamicPropertyAccessor;
 exports.isCELExpressionGroup = isCELExpressionGroup;
 exports.isCELExpressionList = isCELExpressionList;
+exports.isCELExpressionOperand = isCELExpressionOperand;
 exports.isCELFieldInit = isCELFieldInit;
 exports.isCELFieldInits = isCELFieldInits;
 exports.isCELFloatLiteral = isCELFloatLiteral;
@@ -2485,6 +2563,7 @@ exports.isCELLiteral = isCELLiteral;
 exports.isCELMap = isCELMap;
 exports.isCELMapInit = isCELMapInit;
 exports.isCELMapInits = isCELMapInits;
+exports.isCELMathOperation = isCELMathOperation;
 exports.isCELMember = isCELMember;
 exports.isCELMessageInit = isCELMessageInit;
 exports.isCELModulo = isCELModulo;