@react-querybuilder/core 8.22.5 → 8.23.0

package/dist/isRuleOrGroupValid-CIMZNkt4.mjs

@@ -0,0 +1,27 @@
+import { c as isPojo, i as isRuleGroup } from "./objectUtils-DDZ-KhV5.mjs";
+//#region src/utils/isRuleOrGroupValid.ts
+/**
+* Determines if an object is useful as a validation result.
+*/
+const isValidationResult = (vr) => isPojo(vr) && typeof vr.valid === "boolean";
+/**
+* Determines if a rule or group is valid based on a validation result (if defined)
+* or a validator function. Returns `true` if neither are defined and the `muted`
+* property is not `true`.
+*/
+const isRuleOrGroupValid = (rg, validationResult, validator) => {
+	if (rg.muted) return false;
+	if (typeof validationResult === "boolean") return validationResult;
+	if (isValidationResult(validationResult)) return validationResult.valid;
+	if (typeof validator === "function" && !isRuleGroup(rg)) {
+		const vr = validator(rg);
+		if (typeof vr === "boolean") return vr;
+		// v8 ignore else
+		if (isValidationResult(vr)) return vr.valid;
+	}
+	return true;
+};
+//#endregion
+export { isValidationResult as n, isRuleOrGroupValid as t };
+
+//# sourceMappingURL=isRuleOrGroupValid-CIMZNkt4.mjs.map

package/dist/isRuleOrGroupValid-CIMZNkt4.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"isRuleOrGroupValid-CIMZNkt4.mjs","names":[],"sources":["../src/utils/isRuleOrGroupValid.ts"],"sourcesContent":["import type { RuleGroupTypeAny, RuleType, RuleValidator, ValidationResult } from '../types';\nimport { isRuleGroup } from './isRuleGroup';\nimport { isPojo } from './misc';\n\n/**\n * Determines if an object is useful as a validation result.\n */\nexport const isValidationResult = (vr?: ValidationResult): vr is ValidationResult =>\n  isPojo(vr) && typeof vr.valid === 'boolean';\n\n/**\n * Determines if a rule or group is valid based on a validation result (if defined)\n * or a validator function. Returns `true` if neither are defined and the `muted`\n * property is not `true`.\n */\nexport const isRuleOrGroupValid = (\n  rg: RuleType | RuleGroupTypeAny,\n  validationResult?: boolean | ValidationResult,\n  validator?: RuleValidator\n): boolean => {\n  if (rg.muted) {\n    return false;\n  }\n  if (typeof validationResult === 'boolean') {\n    return validationResult;\n  }\n  if (isValidationResult(validationResult)) {\n    return validationResult.valid;\n  }\n  if (typeof validator === 'function' && !isRuleGroup(rg)) {\n    const vr = validator(rg);\n    if (typeof vr === 'boolean') {\n      return vr;\n    }\n    // v8 ignore else\n    if (isValidationResult(vr)) {\n      return vr.valid;\n    }\n  }\n  return true;\n};\n"],"mappings":";;;;;AAOA,MAAa,sBAAsB,OACjC,OAAO,EAAE,KAAK,OAAO,GAAG,UAAU;;;;;;AAOpC,MAAa,sBACX,IACA,kBACA,cACY;CACZ,IAAI,GAAG,OACL,OAAO;CAET,IAAI,OAAO,qBAAqB,WAC9B,OAAO;CAET,IAAI,mBAAmB,gBAAgB,GACrC,OAAO,iBAAiB;CAE1B,IAAI,OAAO,cAAc,cAAc,CAAC,YAAY,EAAE,GAAG;EACvD,MAAM,KAAK,UAAU,EAAE;EACvB,IAAI,OAAO,OAAO,WAChB,OAAO;;EAGT,IAAI,mBAAmB,EAAE,GACvB,OAAO,GAAG;CAEd;CACA,OAAO;AACT"}

package/dist/isRuleOrGroupValid-CtUf4_4x.js

@@ -0,0 +1,38 @@
+const require_objectUtils = require("./objectUtils-DfnEmDSV.js");
+//#region src/utils/isRuleOrGroupValid.ts
+/**
+* Determines if an object is useful as a validation result.
+*/
+const isValidationResult = (vr) => require_objectUtils.isPojo(vr) && typeof vr.valid === "boolean";
+/**
+* Determines if a rule or group is valid based on a validation result (if defined)
+* or a validator function. Returns `true` if neither are defined and the `muted`
+* property is not `true`.
+*/
+const isRuleOrGroupValid = (rg, validationResult, validator) => {
+	if (rg.muted) return false;
+	if (typeof validationResult === "boolean") return validationResult;
+	if (isValidationResult(validationResult)) return validationResult.valid;
+	if (typeof validator === "function" && !require_objectUtils.isRuleGroup(rg)) {
+		const vr = validator(rg);
+		if (typeof vr === "boolean") return vr;
+		// v8 ignore else
+		if (isValidationResult(vr)) return vr.valid;
+	}
+	return true;
+};
+//#endregion
+Object.defineProperty(exports, "isRuleOrGroupValid", {
+	enumerable: true,
+	get: function() {
+		return isRuleOrGroupValid;
+	}
+});
+Object.defineProperty(exports, "isValidationResult", {
+	enumerable: true,
+	get: function() {
+		return isValidationResult;
+	}
+});
+
+//# sourceMappingURL=isRuleOrGroupValid-CtUf4_4x.js.map

package/dist/isRuleOrGroupValid-CtUf4_4x.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"isRuleOrGroupValid-CtUf4_4x.js","names":["isPojo","isRuleGroup"],"sources":["../src/utils/isRuleOrGroupValid.ts"],"sourcesContent":["import type { RuleGroupTypeAny, RuleType, RuleValidator, ValidationResult } from '../types';\nimport { isRuleGroup } from './isRuleGroup';\nimport { isPojo } from './misc';\n\n/**\n * Determines if an object is useful as a validation result.\n */\nexport const isValidationResult = (vr?: ValidationResult): vr is ValidationResult =>\n  isPojo(vr) && typeof vr.valid === 'boolean';\n\n/**\n * Determines if a rule or group is valid based on a validation result (if defined)\n * or a validator function. Returns `true` if neither are defined and the `muted`\n * property is not `true`.\n */\nexport const isRuleOrGroupValid = (\n  rg: RuleType | RuleGroupTypeAny,\n  validationResult?: boolean | ValidationResult,\n  validator?: RuleValidator\n): boolean => {\n  if (rg.muted) {\n    return false;\n  }\n  if (typeof validationResult === 'boolean') {\n    return validationResult;\n  }\n  if (isValidationResult(validationResult)) {\n    return validationResult.valid;\n  }\n  if (typeof validator === 'function' && !isRuleGroup(rg)) {\n    const vr = validator(rg);\n    if (typeof vr === 'boolean') {\n      return vr;\n    }\n    // v8 ignore else\n    if (isValidationResult(vr)) {\n      return vr.valid;\n    }\n  }\n  return true;\n};\n"],"mappings":";;;;;AAOA,MAAa,sBAAsB,OACjCA,oBAAAA,OAAO,EAAE,KAAK,OAAO,GAAG,UAAU;;;;;;AAOpC,MAAa,sBACX,IACA,kBACA,cACY;CACZ,IAAI,GAAG,OACL,OAAO;CAET,IAAI,OAAO,qBAAqB,WAC9B,OAAO;CAET,IAAI,mBAAmB,gBAAgB,GACrC,OAAO,iBAAiB;CAE1B,IAAI,OAAO,cAAc,cAAc,CAACC,oBAAAA,YAAY,EAAE,GAAG;EACvD,MAAM,KAAK,UAAU,EAAE;EACvB,IAAI,OAAO,OAAO,WAChB,OAAO;;EAGT,IAAI,mBAAmB,EAAE,GACvB,OAAO,GAAG;CAEd;CACA,OAAO;AACT"}

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

@@ -21,6 +21,10 @@ const nullOrUndefinedOrEmpty = (value) => value === null || value === void 0 ||
 //#endregion
 //#region src/utils/isRuleGroup.ts
 /**
+* Determines if an object is a {@link RuleType} (only checks for a `field` property).
+*/
+const isRuleType = (s) => isPojo(s) && "field" in s && typeof s.field === "string";
+/**
 * Determines if an object is a {@link RuleGroupType} or {@link RuleGroupTypeIC}.
 */
 const isRuleGroup = (rg) => isPojo(rg) && Array.isArray(rg.rules);
@@ -33,6 +37,25 @@ const isRuleGroupType = (rg) => isRuleGroup(rg) && typeof rg.combinator === "str
 */
 const isRuleGroupTypeIC = (rg) => isRuleGroup(rg) && rg.combinator === void 0;
 //#endregion
-export { lc as a, isPojo as i, isRuleGroupType as n, nullOrUndefinedOrEmpty as o, isRuleGroupTypeIC as r, numericRegex$1 as s, isRuleGroup as t };
+//#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;
+/**
+* A strongly-typed version of `Object.entries()`.
+*
+* [Original source](https://github.com/sindresorhus/ts-extras/blob/44f57392c5f027268330771996c4fdf9260b22d6/source/object-entries.ts)
+*/
+const objectEntries = Object.entries;
+/**
+* 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 { isRuleGroupType as a, isPojo as c, numericRegex$1 as d, isRuleGroup as i, lc as l, objectEntries as n, isRuleGroupTypeIC as o, objectKeys as r, isRuleType as s, isUnsafeKey as t, nullOrUndefinedOrEmpty as u };
 
-//# sourceMappingURL=isRuleGroup-CqLThsbu.mjs.map
+//# sourceMappingURL=objectUtils-DDZ-KhV5.mjs.map

package/dist/objectUtils-DDZ-KhV5.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"objectUtils-DDZ-KhV5.mjs","names":["numericRegex","numericQuantityRegex"],"sources":["../src/utils/misc.ts","../src/utils/isRuleGroup.ts","../src/utils/objectUtils.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","// 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":";;;;;;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;;;;;;ACrBrD,MAAa,cAAc,MACzB,OAAO,CAAC,KAAK,WAAW,KAAK,OAAO,EAAE,UAAU;;;;AAKlD,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;;;;;;;;ACRvC,MAAa,aAAa,OAAO;;;;;;AASjC,MAAa,gBAAgB,OAAO;;;;;AAQpC,MAAa,eAAe,QAC1B,QAAQ,eAAe,QAAQ,iBAAiB,QAAQ"}

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

@@ -21,6 +21,10 @@ const nullOrUndefinedOrEmpty = (value) => value === null || value === void 0 ||
 //#endregion
 //#region src/utils/isRuleGroup.ts
 /**
+* Determines if an object is a {@link RuleType} (only checks for a `field` property).
+*/
+const isRuleType = (s) => isPojo(s) && "field" in s && typeof s.field === "string";
+/**
 * Determines if an object is a {@link RuleGroupType} or {@link RuleGroupTypeIC}.
 */
 const isRuleGroup = (rg) => isPojo(rg) && Array.isArray(rg.rules);
@@ -33,6 +37,25 @@ 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;
+/**
+* A strongly-typed version of `Object.entries()`.
+*
+* [Original source](https://github.com/sindresorhus/ts-extras/blob/44f57392c5f027268330771996c4fdf9260b22d6/source/object-entries.ts)
+*/
+const objectEntries = Object.entries;
+/**
+* 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() {
@@ -57,6 +80,18 @@ Object.defineProperty(exports, "isRuleGroupTypeIC", {
 		return isRuleGroupTypeIC;
 	}
 });
+Object.defineProperty(exports, "isRuleType", {
+	enumerable: true,
+	get: function() {
+		return isRuleType;
+	}
+});
+Object.defineProperty(exports, "isUnsafeKey", {
+	enumerable: true,
+	get: function() {
+		return isUnsafeKey;
+	}
+});
 Object.defineProperty(exports, "lc", {
 	enumerable: true,
 	get: function() {
@@ -75,5 +110,17 @@ Object.defineProperty(exports, "numericRegex", {
 		return numericRegex;
 	}
 });
+Object.defineProperty(exports, "objectEntries", {
+	enumerable: true,
+	get: function() {
+		return objectEntries;
+	}
+});
+Object.defineProperty(exports, "objectKeys", {
+	enumerable: true,
+	get: function() {
+		return objectKeys;
+	}
+});
 
-//# sourceMappingURL=isRuleGroup-0JNiQgLg.js.map
+//# sourceMappingURL=objectUtils-DfnEmDSV.js.map

package/dist/objectUtils-DfnEmDSV.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"objectUtils-DfnEmDSV.js","names":["numericQuantityRegex"],"sources":["../src/utils/misc.ts","../src/utils/isRuleGroup.ts","../src/utils/objectUtils.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","// 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":";;;;;;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;;;;;;ACrBrD,MAAa,cAAc,MACzB,OAAO,CAAC,KAAK,WAAW,KAAK,OAAO,EAAE,UAAU;;;;AAKlD,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;;;;;;;;ACRvC,MAAa,aAAa,OAAO;;;;;;AASjC,MAAa,gBAAgB,OAAO;;;;;AAQpC,MAAa,eAAe,QAC1B,QAAQ,eAAe,QAAQ,iBAAiB,QAAQ"}

package/dist/parseCEL.d.mts

@@ -1,5 +1,5 @@
-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-CX9mehdL.mjs";
-import { t as ParserCommonOptions } from "./import-DVWI7Fdh.mjs";
+import { $t as DefaultRuleGroupType, Jt as DefaultCombinatorName, Pt as DefaultRuleGroupTypeIC, Vt as RuleGroupTypeIC, Zt as DefaultOperatorName, jn as Except, nn as RuleGroupType, on as ExpressionNode, rn as RuleType } from "./index-DOIE2pwx.mjs";
+import { t as ParserCommonOptions } from "./import-BdKPtLzo.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";

package/dist/parseCEL.d.ts

@@ -1,5 +1,5 @@
-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-CX9mehdL.js";
-import { t as ParserCommonOptions } from "./import-6ExjhifL.js";
+import { $t as DefaultRuleGroupType, Jt as DefaultCombinatorName, Pt as DefaultRuleGroupTypeIC, Vt as RuleGroupTypeIC, Zt as DefaultOperatorName, jn as Except, nn as RuleGroupType, on as ExpressionNode, rn as RuleType } from "./index-DOIE2pwx.js";
+import { t as ParserCommonOptions } from "./import-BfZTwhp2.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";

package/dist/parseCEL.js

@@ -1,7 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_utils = require("./utils-C79dxwZb.js");
-const require_isRuleGroup = require("./isRuleGroup-0JNiQgLg.js");
-const require_prepareQueryObjects = require("./prepareQueryObjects-BnGL91Tt.js");
+const require_utils = require("./utils-e-7KHkjV.js");
+const require_objectUtils = require("./objectUtils-DfnEmDSV.js");
+const require_prepareQueryObjects = require("./prepareQueryObjects-Dj9cTl9D.js");
+const require_parserUtils = require("./parserUtils-DbBXyAht.js");
 let _ts_jison_parser = require("@ts-jison/parser");
 let _ts_jison_lexer = require("@ts-jison/lexer");
 //#region src/utils/parseCEL/celParser.ts
@@ -2139,12 +2140,14 @@ const celGenerateMixedAndOrList = (expr) => {
 		const tempAndArray = arr.slice(startIndex, i + 1);
 		returnArray.push(tempAndArray);
 		i -= 2;
-	} else if (arr[i + 1] === "or") if (i === 0 || i === arr.length - 3) {
-		if (i === 0 || arr[i - 1] === "or") returnArray.push(arr[i]);
-		returnArray.push(arr[i + 1]);
-		if (i === arr.length - 3) returnArray.push(arr[i + 2]);
-	} else if (arr[i - 1] === "and") returnArray.push(arr[i + 1]);
-	else returnArray.push(arr[i], arr[i + 1]);
+	} else if (arr[i + 1] === "or") {
+		if (i === 0 || i === arr.length - 3) {
+			if (i === 0 || arr[i - 1] === "or") returnArray.push(arr[i]);
+			returnArray.push(arr[i + 1]);
+			if (i === arr.length - 3) returnArray.push(arr[i + 2]);
+		} else if (arr[i - 1] === "and") returnArray.push(arr[i + 1]);
+		else returnArray.push(arr[i], arr[i + 1]);
+	}
 	if (returnArray.length === 1 && Array.isArray(returnArray[0])) return returnArray[0];
 	return returnArray;
 };
@@ -2263,8 +2266,8 @@ const isCELExpressionOperand = (expr) => {
 function parseCEL(cel, 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({
+	const fieldsFlat = require_parserUtils.getFieldsArray(fields);
+	const fieldIsValid = (fieldName, operator, subordinateFieldName) => require_parserUtils.fieldIsValidUtil({
 		fieldName,
 		fieldsFlat,
 		operator,
@@ -2293,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_isRuleGroup.isRuleGroup(negatedExpr) && negatedExpr.operator.startsWith("doesNot")) return ic ? { rules: [negatedExpr] } : {
+				else if (!negate || negate && !require_objectUtils.isRuleGroup(negatedExpr) && negatedExpr.operator.startsWith("doesNot")) return ic ? { rules: [negatedExpr] } : {
 					combinator: "and",
 					rules: [negatedExpr]
 				};
@@ -2309,7 +2312,7 @@ function parseCEL(cel, options = {}) {
 		} else if (isCELExpressionGroup(expr)) {
 			const rule = processCELExpression(expr.value, { groupOnlyIfNecessary: true });
 			if (rule) {
-				if (require_isRuleGroup.isRuleGroup(rule) || groupOnlyIfNecessary && isCELExpressionGroup(expr.value)) return rule;
+				if (require_objectUtils.isRuleGroup(rule) || groupOnlyIfNecessary && isCELExpressionGroup(expr.value)) return rule;
 				return ic ? { rules: [rule] } : {
 					combinator: "and",
 					rules: [rule]
@@ -2365,7 +2368,7 @@ function parseCEL(cel, options = {}) {
 				const transformedCondition = transformAliasInExpression(condition, alias);
 				const subqueryValue = processCELExpression(transformedCondition);
 				if (subqueryValue && fieldIsValid(field, "=")) {
-					const ruleGroupValue = require_isRuleGroup.isRuleGroup(subqueryValue) ? subqueryValue : ic ? { rules: [subqueryValue] } : {
+					const ruleGroupValue = require_objectUtils.isRuleGroup(subqueryValue) ? subqueryValue : ic ? { rules: [subqueryValue] } : {
 						combinator: "and",
 						rules: [subqueryValue]
 					};
@@ -2386,7 +2389,7 @@ function parseCEL(cel, options = {}) {
 			const subqueryValue = processCELExpression(transformedCondition);
 			// v8 ignore else
 			if (subqueryValue && fieldIsValid(field, "=")) {
-				const ruleGroupValue = require_isRuleGroup.isRuleGroup(subqueryValue) ? subqueryValue : ic ? { rules: [subqueryValue] } : {
+				const ruleGroupValue = require_objectUtils.isRuleGroup(subqueryValue) ? subqueryValue : ic ? { rules: [subqueryValue] } : {
 					combinator: "and",
 					rules: [subqueryValue]
 				};
@@ -2520,7 +2523,7 @@ function parseCEL(cel, options = {}) {
 	}
 	const result = processCELExpression(processedCEL);
 	if (result) {
-		if (require_isRuleGroup.isRuleGroup(result)) return prepare(result);
+		if (require_objectUtils.isRuleGroup(result)) return prepare(result);
 		return prepare({
 			rules: [result],
 			...ic ? {} : { combinator: "and" }