@react-querybuilder/core 8.9.1 → 8.10.0

package/dist/react-querybuilder_core.legacy-esm.js

@@ -65,6 +65,108 @@ const defaultPlaceholderValueLabel = defaultPlaceholderLabel;
 */
 const defaultPlaceholderValueGroupLabel = defaultPlaceholderLabel;
 /**
+* Default configuration of translatable strings.
+*
+* @group Defaults
+*/
+const defaultTranslations = {
+	fields: {
+		title: "Field",
+		placeholderName: defaultPlaceholderFieldName,
+		placeholderLabel: defaultPlaceholderFieldLabel,
+		placeholderGroupLabel: defaultPlaceholderFieldGroupLabel
+	},
+	operators: {
+		title: "Operator",
+		placeholderName: defaultPlaceholderOperatorName,
+		placeholderLabel: defaultPlaceholderOperatorLabel,
+		placeholderGroupLabel: defaultPlaceholderOperatorGroupLabel
+	},
+	values: {
+		title: "Values",
+		placeholderName: defaultPlaceholderValueName,
+		placeholderLabel: defaultPlaceholderValueLabel,
+		placeholderGroupLabel: defaultPlaceholderValueGroupLabel
+	},
+	matchMode: { title: "Match mode" },
+	matchThreshold: { title: "Match threshold" },
+	value: { title: "Value" },
+	removeRule: {
+		label: "⨯",
+		title: "Remove rule"
+	},
+	removeGroup: {
+		label: "⨯",
+		title: "Remove group"
+	},
+	addRule: {
+		label: "+ Rule",
+		title: "Add rule"
+	},
+	addGroup: {
+		label: "+ Group",
+		title: "Add group"
+	},
+	combinators: { title: "Combinator" },
+	notToggle: {
+		label: "Not",
+		title: "Invert this group"
+	},
+	cloneRule: {
+		label: "⧉",
+		title: "Clone rule"
+	},
+	cloneRuleGroup: {
+		label: "⧉",
+		title: "Clone group"
+	},
+	shiftActionUp: {
+		label: "˄",
+		title: "Shift up"
+	},
+	shiftActionDown: {
+		label: "˅",
+		title: "Shift down"
+	},
+	dragHandle: {
+		label: "⁞⁞",
+		title: "Drag handle"
+	},
+	lockRule: {
+		label: "🔓",
+		title: "Lock rule"
+	},
+	lockGroup: {
+		label: "🔓",
+		title: "Lock group"
+	},
+	lockRuleDisabled: {
+		label: "🔒",
+		title: "Unlock rule"
+	},
+	lockGroupDisabled: {
+		label: "🔒",
+		title: "Unlock group"
+	},
+	muteRule: {
+		label: "🔊",
+		title: "Mute rule"
+	},
+	muteGroup: {
+		label: "🔊",
+		title: "Mute group"
+	},
+	unmuteRule: {
+		label: "🔇",
+		title: "Unmute rule"
+	},
+	unmuteGroup: {
+		label: "🔇",
+		title: "Unmute group"
+	},
+	valueSourceSelector: { title: "Value source" }
+};
+/**
 * Default character used to `.join` and `.split` arrays.
 *
 * @group Defaults
@@ -313,8 +415,11 @@ const standardClassnames = {
 	dndDropNotAllowed: "dndDropNotAllowed",
 	dragHandle: "queryBuilder-dragHandle",
 	disabled: "queryBuilder-disabled",
+	muted: "queryBuilder-muted",
 	lockRule: "rule-lock",
 	lockGroup: "ruleGroup-lock",
+	muteRule: "rule-mute",
+	muteGroup: "ruleGroup-mute",
 	valueSource: "rule-valueSource",
 	valueListItem: "rule-value-list-item",
 	branches: "queryBuilder-branches",
@@ -349,6 +454,9 @@ const defaultControlClassnames = {
 	dragHandle: "",
 	lockRule: "",
 	lockGroup: "",
+	muteRule: "",
+	muteGroup: "",
+	muted: "",
 	valueSource: "",
 	actionElement: "",
 	valueSelector: "",
@@ -399,6 +507,8 @@ const TestID = {
 	dragHandle: "drag-handle",
 	lockRule: "lock-rule",
 	lockGroup: "lock-group",
+	muteRule: "mute-rule",
+	muteGroup: "mute-group",
 	valueSourceSelector: "value-source-selector",
 	matchModeEditor: "match-mode-editor"
 };
@@ -498,6 +608,11 @@ function toVal(mix) {
 	}
 	return str;
 }
+/**
+* Vendored/adapted version of the `clsx` package.
+*
+* **NOTE:** Prefer the official package from npm outside the context of React Query Builder.
+*/
 // istanbul ignore next
 function clsx(...args) {
 	let i = 0;
@@ -536,6 +651,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);
@@ -549,7 +668,7 @@ const isRuleGroupType = (rg) => isRuleGroup(rg) && typeof rg.combinator === "str
 const isRuleGroupTypeIC = (rg) => isRuleGroup(rg) && rg.combinator === void 0;
 
 //#endregion
-//#region \0@oxc-project+runtime@0.89.0/helpers/typeof.js
+//#region \0@oxc-project+runtime@0.94.0/helpers/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o$1) {
@@ -560,7 +679,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.89.0/helpers/toPrimitive.js
+//#region \0@oxc-project+runtime@0.94.0/helpers/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -573,14 +692,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.89.0/helpers/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.94.0/helpers/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.89.0/helpers/defineProperty.js
+//#region \0@oxc-project+runtime@0.94.0/helpers/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -591,7 +710,7 @@ function _defineProperty(e, r, t) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.89.0/helpers/objectSpread2.js
+//#region \0@oxc-project+runtime@0.94.0/helpers/objectSpread2.js
 function ownKeys(e, r) {
 	var t = Object.keys(e);
 	if (Object.getOwnPropertySymbols) {
@@ -615,7 +734,7 @@ function _objectSpread2(e) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.89.0/helpers/objectWithoutPropertiesLoose.js
+//#region \0@oxc-project+runtime@0.94.0/helpers/objectWithoutPropertiesLoose.js
 function _objectWithoutPropertiesLoose(r, e) {
 	if (null == r) return {};
 	var t = {};
@@ -627,7 +746,7 @@ function _objectWithoutPropertiesLoose(r, e) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.89.0/helpers/objectWithoutProperties.js
+//#region \0@oxc-project+runtime@0.94.0/helpers/objectWithoutProperties.js
 function _objectWithoutProperties(e, t) {
 	if (null == e) return {};
 	var o, r, i = _objectWithoutPropertiesLoose(e, t);
@@ -745,6 +864,21 @@ const defaultValidator = (query) => {
 	return result;
 };
 
+//#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;
+
 //#endregion
 //#region src/utils/optGroupUtils.ts
 const isOptionWithName = (opt) => isPojo(opt) && "name" in opt && typeof opt.name === "string";
@@ -932,6 +1066,44 @@ const uniqOptList = (originalArray) => {
 	if (isFlexibleOptionGroupArray(originalArray)) return uniqOptGroups(originalArray);
 	return uniqByIdentifier(originalArray.map((o) => toFullOption(o)));
 };
+const prepareOptionList = (props) => {
+	// istanbul ignore next
+	const { optionList: optionListPropOriginal, baseOption = {}, labelMap = {}, placeholder: { placeholderName = defaultPlaceholderName, placeholderLabel = defaultPlaceholderLabel, placeholderGroupLabel = defaultPlaceholderLabel } = {}, autoSelectOption = true } = props;
+	const defaultOption = {
+		id: placeholderName,
+		name: placeholderName,
+		value: placeholderName,
+		label: placeholderLabel
+	};
+	const optionsProp = optionListPropOriginal !== null && optionListPropOriginal !== void 0 ? optionListPropOriginal : [defaultOption];
+	let optionList = [];
+	const opts = Array.isArray(optionsProp) ? toFullOptionList(optionsProp, baseOption, labelMap) : objectKeys(toFullOptionMap(optionsProp, baseOption)).map((opt) => _objectSpread2(_objectSpread2({}, optionsProp[opt]), {}, {
+		name: opt,
+		value: opt
+	})).sort((a, b) => a.label.localeCompare(b.label));
+	if (isFlexibleOptionGroupArray(opts)) optionList = autoSelectOption ? uniqOptGroups(opts) : uniqOptGroups([{
+		label: placeholderGroupLabel,
+		options: [defaultOption]
+	}, ...opts]);
+	else optionList = autoSelectOption ? uniqByIdentifier(opts) : uniqByIdentifier([defaultOption, ...opts]);
+	let optionsMap = {};
+	if (!Array.isArray(optionsProp)) {
+		const op = toFullOptionMap(optionsProp, baseOption);
+		optionsMap = autoSelectOption ? op : _objectSpread2(_objectSpread2({}, op), {}, { [placeholderName]: defaultOption });
+	} else if (isFlexibleOptionGroupArray(optionList)) for (const og of optionList) for (const opt of og.options) {
+		var _opt$value3;
+		optionsMap[(_opt$value3 = opt.value) !== null && _opt$value3 !== void 0 ? _opt$value3 : opt.name] = toFullOption(opt, baseOption);
+	}
+	else for (const opt of optionList) {
+		var _opt$value4;
+		optionsMap[(_opt$value4 = opt.value) !== null && _opt$value4 !== void 0 ? _opt$value4 : opt.name] = toFullOption(opt, baseOption);
+	}
+	return {
+		defaultOption,
+		optionList,
+		optionsMap
+	};
+};
 
 //#endregion
 //#region src/utils/filterFieldsByComparator.ts
@@ -1021,9 +1193,11 @@ function transformQuery(query, options = {}) {
 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.
+* 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)) {
@@ -1293,19 +1467,45 @@ const defaultRuleGroupProcessorCEL = (ruleGroup, options) => {
 	const processRuleGroup = (rg, outermost) => {
 		var _rg$id;
 		if (!isRuleOrGroupValid(rg, validationMap[(_rg$id = rg.id) !== null && _rg$id !== void 0 ? _rg$id : ""])) return outermost ? fallbackExpression : "";
-		const expression = rg.rules.map((rule) => {
+		const processedRules = [];
+		let precedingCombinator = "";
+		let firstRule = true;
+		for (const rule of rg.rules) {
 			var _rule$valueSource;
-			if (typeof rule === "string") return celCombinatorMap[rule];
-			if (isRuleGroup(rule)) return processRuleGroup(rule);
+			if (typeof rule === "string") {
+				precedingCombinator = celCombinatorMap[rule];
+				continue;
+			}
+			if (isRuleGroup(rule)) {
+				const processedGroup = processRuleGroup(rule);
+				if (processedGroup) {
+					if (!firstRule && precedingCombinator) {
+						processedRules.push(precedingCombinator);
+						precedingCombinator = "";
+					}
+					firstRule = false;
+					processedRules.push(processedGroup);
+				}
+				continue;
+			}
 			const [validationResult, fieldValidator] = validateRule(rule);
-			if (!isRuleOrGroupValid(rule, validationResult, fieldValidator) || rule.field === placeholderFieldName || rule.operator === placeholderOperatorName || placeholderValueName !== void 0 && rule.value === placeholderValueName) return "";
+			if (!isRuleOrGroupValid(rule, validationResult, fieldValidator) || rule.field === placeholderFieldName || rule.operator === placeholderOperatorName || placeholderValueName !== void 0 && rule.value === placeholderValueName) continue;
 			const fieldData = getOption(fields, rule.field);
-			return ruleProcessor(rule, _objectSpread2(_objectSpread2({}, options), {}, {
+			const processedRule = ruleProcessor(rule, _objectSpread2(_objectSpread2({}, options), {}, {
 				parseNumbers: getParseNumberBoolean(fieldData === null || fieldData === void 0 ? void 0 : fieldData.inputType),
 				escapeQuotes: ((_rule$valueSource = rule.valueSource) !== null && _rule$valueSource !== void 0 ? _rule$valueSource : "value") === "value",
 				fieldData
 			}));
-		}).filter(Boolean).join(isRuleGroupType(rg) ? ` ${celCombinatorMap[rg.combinator]} ` : " ");
+			if (processedRule) {
+				if (!firstRule && precedingCombinator) {
+					processedRules.push(precedingCombinator);
+					precedingCombinator = "";
+				}
+				firstRule = false;
+				processedRules.push(processedRule);
+			}
+		}
+		const expression = processedRules.join(isRuleGroupType(rg) ? ` ${celCombinatorMap[rg.combinator]} ` : " ");
 		const [prefix, suffix] = rg.not || !outermost ? [`${rg.not ? "!" : ""}(`, ")"] : ["", ""];
 		return expression ? `${prefix}${expression}${suffix}` : fallbackExpression;
 	};
@@ -1332,8 +1532,7 @@ const defaultRuleProcessorCEL = (rule, opts = {}) => {
 	else if (matchEval) {
 		const { mode, threshold } = matchEval;
 		const arrayElementAlias = "elem_alias";
-		const celQuery = transformQuery(rule.value, { ruleProcessor: (r) => _objectSpread2(_objectSpread2({}, r), {}, { field: `${arrayElementAlias}${r.field ? `.${r.field}` : ""}` }) });
-		const nestedArrayFilter = defaultRuleGroupProcessorCEL(celQuery, opts);
+		const nestedArrayFilter = defaultRuleGroupProcessorCEL(transformQuery(rule.value, { ruleProcessor: (r) => _objectSpread2(_objectSpread2({}, r), {}, { field: `${arrayElementAlias}${r.field ? `.${r.field}` : ""}` }) }), opts);
 		switch (mode) {
 			case "all": return `${field}.all(${arrayElementAlias}, ${nestedArrayFilter})`;
 			case "none":
@@ -1367,8 +1566,7 @@ const defaultRuleProcessorCEL = (rule, opts = {}) => {
 		case "in":
 		case "notin": {
 			const [prefix, suffix] = shouldNegate$2(operatorTL) ? ["!(", ")"] : ["", ""];
-			const valueAsArray = toArray(value);
-			return `${prefix}${field} in [${valueAsArray.map((val) => valueIsField || shouldRenderAsNumber(val, parseNumbers) ? `${trimIfString(val)}` : `"${escapeDoubleQuotes(val, escapeQuotes)}"`).join(", ")}]${suffix}`;
+			return `${prefix}${field} in [${toArray(value).map((val) => valueIsField || shouldRenderAsNumber(val, parseNumbers) ? `${trimIfString(val)}` : `"${escapeDoubleQuotes(val, escapeQuotes)}"`).join(", ")}]${suffix}`;
 		}
 		case "between":
 		case "notbetween": {
@@ -1575,19 +1773,45 @@ const defaultRuleGroupProcessorSpEL = (ruleGroup, options) => {
 	const processRuleGroup = (rg, outermost) => {
 		var _rg$id;
 		if (!isRuleOrGroupValid(rg, validationMap[(_rg$id = rg.id) !== null && _rg$id !== void 0 ? _rg$id : ""])) return outermost ? fallbackExpression : "";
-		const expression = rg.rules.map((rule) => {
+		const processedRules = [];
+		let precedingCombinator = "";
+		let firstRule = true;
+		for (const rule of rg.rules) {
 			var _rule$valueSource;
-			if (typeof rule === "string") return rule;
-			if (isRuleGroup(rule)) return processRuleGroup(rule);
+			if (typeof rule === "string") {
+				precedingCombinator = rule;
+				continue;
+			}
+			if (isRuleGroup(rule)) {
+				const processedGroup = processRuleGroup(rule);
+				if (processedGroup) {
+					if (!firstRule && precedingCombinator) {
+						processedRules.push(precedingCombinator);
+						precedingCombinator = "";
+					}
+					firstRule = false;
+					processedRules.push(processedGroup);
+				}
+				continue;
+			}
 			const [validationResult, fieldValidator] = validateRule(rule);
-			if (!isRuleOrGroupValid(rule, validationResult, fieldValidator) || rule.field === placeholderFieldName || rule.operator === placeholderOperatorName || placeholderValueName !== void 0 && rule.value === placeholderValueName) return "";
+			if (!isRuleOrGroupValid(rule, validationResult, fieldValidator) || rule.field === placeholderFieldName || rule.operator === placeholderOperatorName || placeholderValueName !== void 0 && rule.value === placeholderValueName) continue;
 			const fieldData = getOption(fields, rule.field);
-			return ruleProcessor(rule, _objectSpread2(_objectSpread2({}, options), {}, {
+			const processedRule = ruleProcessor(rule, _objectSpread2(_objectSpread2({}, options), {}, {
 				parseNumbers: getParseNumberBoolean(fieldData === null || fieldData === void 0 ? void 0 : fieldData.inputType),
 				escapeQuotes: ((_rule$valueSource = rule.valueSource) !== null && _rule$valueSource !== void 0 ? _rule$valueSource : "value") === "value",
 				fieldData
 			}));
-		}).filter(Boolean).join(isRuleGroupType(rg) ? ` ${rg.combinator} ` : " ");
+			if (processedRule) {
+				if (!firstRule && precedingCombinator) {
+					processedRules.push(precedingCombinator);
+					precedingCombinator = "";
+				}
+				firstRule = false;
+				processedRules.push(processedRule);
+			}
+		}
+		const expression = processedRules.join(isRuleGroupType(rg) ? ` ${rg.combinator} ` : " ");
 		const [prefix, suffix] = rg.not || !outermost ? [`${rg.not ? "!" : ""}(`, ")"] : ["", ""];
 		return expression ? `${prefix}${expression}${suffix}` : fallbackExpression;
 	};
@@ -1640,15 +1864,9 @@ const defaultRuleProcessorSpEL = (rule, opts = {}) => {
 		case "contains":
 		case "doesnotcontain": return wrapInNegation(`${field} matches ${valueIsField || useBareValue ? trimIfString(value) : `'${escapeSingleQuotes(value, escapeQuotes)}'`}`, shouldNegate$1(operatorTL));
 		case "beginswith":
-		case "doesnotbeginwith": {
-			const valueTL = valueIsField ? `'^'.concat(${trimIfString(value)})` : `'${typeof value === "string" && !value.startsWith("^") || useBareValue ? "^" : ""}${escapeSingleQuotes(value, escapeQuotes)}'`;
-			return wrapInNegation(`${field} matches ${valueTL}`, shouldNegate$1(operatorTL));
-		}
+		case "doesnotbeginwith": return wrapInNegation(`${field} matches ${valueIsField ? `'^'.concat(${trimIfString(value)})` : `'${typeof value === "string" && !value.startsWith("^") || useBareValue ? "^" : ""}${escapeSingleQuotes(value, escapeQuotes)}'`}`, shouldNegate$1(operatorTL));
 		case "endswith":
-		case "doesnotendwith": {
-			const valueTL = valueIsField ? `${trimIfString(value)}.concat('$')` : `'${escapeSingleQuotes(value, escapeQuotes)}${typeof value === "string" && !value.endsWith("$") || useBareValue ? "$" : ""}'`;
-			return wrapInNegation(`${field} matches ${valueTL}`, shouldNegate$1(operatorTL));
-		}
+		case "doesnotendwith": return wrapInNegation(`${field} matches ${valueIsField ? `${trimIfString(value)}.concat('$')` : `'${escapeSingleQuotes(value, escapeQuotes)}${typeof value === "string" && !value.endsWith("$") || useBareValue ? "$" : ""}'`}`, shouldNegate$1(operatorTL));
 		case "null": return `${field} == null`;
 		case "notnull": return `${field} != null`;
 		case "in":
@@ -1762,8 +1980,7 @@ const defaultRuleProcessorDrizzle = (rule, _options) => {
 		if (opts.preset !== "postgresql") return;
 		const { mode, threshold } = matchEval;
 		const arrayElementAlias = "elem_alias";
-		const sqlQuery = transformQuery(rule.value, { ruleProcessor: (r) => _objectSpread2(_objectSpread2({}, r), {}, { field: arrayElementAlias }) });
-		const nestedArrayFilter = defaultRuleGroupProcessorDrizzle(sqlQuery, _objectSpread2(_objectSpread2({}, opts), {}, { context: _objectSpread2(_objectSpread2({}, opts.context), {}, { useRawFields: true }) }));
+		const nestedArrayFilter = defaultRuleGroupProcessorDrizzle(transformQuery(rule.value, { ruleProcessor: (r) => _objectSpread2(_objectSpread2({}, r), {}, { field: arrayElementAlias }) }), _objectSpread2(_objectSpread2({}, opts), {}, { context: _objectSpread2(_objectSpread2({}, opts.context), {}, { useRawFields: true }) }));
 		switch (mode) {
 			case "all": return sql`(select count(*) from unnest(${column}) as ${sql.raw(arrayElementAlias)} where ${nestedArrayFilter({}, drizzleOperators)}) = array_length(${column}, 1)`;
 			case "none": return sql`not exists (select 1 from unnest(${column}) as ${sql.raw(arrayElementAlias)} where ${nestedArrayFilter({}, drizzleOperators)})`;
@@ -1843,7 +2060,6 @@ const defaultRuleGroupProcessorDrizzle = (ruleGroup, options, _meta) => (columns
 	const { fields, getParseNumberBoolean, placeholderFieldName, placeholderOperatorName, placeholderValueName, validateRule, validationMap } = options;
 	if (!columns || !drizzleOperators) return;
 	const { and, not, or } = drizzleOperators;
-	const query = isRuleGroupType(ruleGroup) ? ruleGroup : convertFromIC(ruleGroup);
 	const ruleProcessor = defaultRuleProcessorDrizzle;
 	const processRuleGroup = (rg, _outermost) => {
 		var _rg$id;
@@ -1866,7 +2082,7 @@ const defaultRuleGroupProcessorDrizzle = (ruleGroup, options, _meta) => (columns
 		const ruleGroupSQL = rg.combinator === "or" ? or(...processedRules) : and(...processedRules);
 		return rg.not ? not(ruleGroupSQL) : ruleGroupSQL;
 	};
-	return processRuleGroup(query, true);
+	return processRuleGroup(convertFromIC(ruleGroup), true);
 };
 
 //#endregion
@@ -1878,7 +2094,6 @@ const defaultRuleGroupProcessorDrizzle = (ruleGroup, options, _meta) => (columns
 */
 const defaultRuleGroupProcessorElasticSearch = (ruleGroup, options) => {
 	const { fields, getParseNumberBoolean, placeholderFieldName, placeholderOperatorName, placeholderValueName, ruleProcessor, validateRule, validationMap } = options;
-	const query = convertFromIC(ruleGroup);
 	const processRuleGroup = (rg) => {
 		var _rg$id;
 		if (!isRuleOrGroupValid(rg, validationMap[(_rg$id = rg.id) !== null && _rg$id !== void 0 ? _rg$id : ""])) return false;
@@ -1895,7 +2110,7 @@ const defaultRuleGroupProcessorElasticSearch = (ruleGroup, options) => {
 		if (processedRules.length === 0) return false;
 		return { bool: rg.not ? { must_not: /^or$/i.test(rg.combinator) ? { bool: { should: processedRules } } : processedRules } : { [/^or$/i.test(rg.combinator) ? "should" : "must"]: processedRules } };
 	};
-	const processedRuleGroup = processRuleGroup(query);
+	const processedRuleGroup = processRuleGroup(convertFromIC(ruleGroup));
 	return processedRuleGroup === false ? {} : processedRuleGroup;
 };
 
@@ -1911,19 +2126,45 @@ const defaultRuleGroupProcessorJSONata = (ruleGroup, options) => {
 	const processRuleGroup = (rg, outermost) => {
 		var _rg$id;
 		if (!isRuleOrGroupValid(rg, validationMap[(_rg$id = rg.id) !== null && _rg$id !== void 0 ? _rg$id : ""])) return outermost ? fallbackExpression : "";
-		const expression = rg.rules.map((rule) => {
+		const processedRules = [];
+		let precedingCombinator = "";
+		let firstRule = true;
+		for (const rule of rg.rules) {
 			var _rule$valueSource;
-			if (typeof rule === "string") return rule;
-			if (isRuleGroup(rule)) return processRuleGroup(rule);
+			if (typeof rule === "string") {
+				precedingCombinator = rule;
+				continue;
+			}
+			if (isRuleGroup(rule)) {
+				const processedGroup = processRuleGroup(rule);
+				if (processedGroup) {
+					if (!firstRule && precedingCombinator) {
+						processedRules.push(precedingCombinator);
+						precedingCombinator = "";
+					}
+					firstRule = false;
+					processedRules.push(processedGroup);
+				}
+				continue;
+			}
 			const [validationResult, fieldValidator] = validateRule(rule);
-			if (!isRuleOrGroupValid(rule, validationResult, fieldValidator) || rule.field === placeholderFieldName || rule.operator === placeholderOperatorName || placeholderValueName !== void 0 && rule.value === placeholderValueName) return "";
+			if (!isRuleOrGroupValid(rule, validationResult, fieldValidator) || rule.field === placeholderFieldName || rule.operator === placeholderOperatorName || placeholderValueName !== void 0 && rule.value === placeholderValueName) continue;
 			const fieldData = getOption(fields, rule.field);
-			return ruleProcessor(rule, _objectSpread2(_objectSpread2({}, options), {}, {
+			const processedRule = ruleProcessor(rule, _objectSpread2(_objectSpread2({}, options), {}, {
 				parseNumbers: getParseNumberBoolean(fieldData === null || fieldData === void 0 ? void 0 : fieldData.inputType),
 				escapeQuotes: ((_rule$valueSource = rule.valueSource) !== null && _rule$valueSource !== void 0 ? _rule$valueSource : "value") === "value",
 				fieldData
 			}));
-		}).filter(Boolean).join(isRuleGroupType(rg) ? ` ${rg.combinator} ` : " ");
+			if (processedRule) {
+				if (!firstRule && precedingCombinator) {
+					processedRules.push(precedingCombinator);
+					precedingCombinator = "";
+				}
+				firstRule = false;
+				processedRules.push(processedRule);
+			}
+		}
+		const expression = processedRules.join(isRuleGroupType(rg) ? ` ${rg.combinator} ` : " ");
 		const [prefix, suffix] = rg.not || !outermost ? [`${rg.not ? "$not" : ""}(`, ")"] : ["", ""];
 		return expression ? `${prefix}${expression}${suffix}` : fallbackExpression;
 	};
@@ -1969,7 +2210,6 @@ const defaultRuleGroupProcessorJsonLogic = (ruleGroup, options) => {
 */
 const defaultRuleGroupProcessorLDAP = (ruleGroup, options) => {
 	const { fields, fallbackExpression, getParseNumberBoolean, placeholderFieldName, placeholderOperatorName, placeholderValueName, ruleProcessor, validateRule, validationMap } = options;
-	const query = convertFromIC(ruleGroup);
 	const processRuleGroup = (rg, outermost) => {
 		var _rg$id;
 		if (!isRuleOrGroupValid(rg, validationMap[(_rg$id = rg.id) !== null && _rg$id !== void 0 ? _rg$id : ""])) return outermost ? fallbackExpression : "";
@@ -1990,7 +2230,7 @@ const defaultRuleGroupProcessorLDAP = (ruleGroup, options) => {
 		const [prefix, suffix] = rules.length > 1 ? [`${notPrefix}(${rg.combinator === "or" ? "|" : "&"}`, `)${notSuffix}`] : [notPrefix, notSuffix];
 		return expression ? `${prefix}${expression}${suffix}` : fallbackExpression;
 	};
-	return processRuleGroup(query, true);
+	return processRuleGroup(convertFromIC(ruleGroup), true);
 };
 
 //#endregion
@@ -2046,26 +2286,48 @@ const defaultRuleGroupProcessorNL = (ruleGroup, options) => {
 		var _rg$id, _rg2$combinator2, _translations2;
 		if (!isRuleOrGroupValid(rg, validationMap[(_rg$id = rg.id) !== null && _rg$id !== void 0 ? _rg$id : ""])) return outermostOrLonelyInGroup ? fallbackExpression : "";
 		const rg2 = isRuleGroupTypeIC(rg) && rg.rules.some((r) => typeof r === "string" && lc(r) === "xor") ? convertFromIC(rg) : rg;
-		const processedRules = rg2.rules.map((rule) => {
+		const processedRules = [];
+		let precedingCombinator = "";
+		let firstRule = true;
+		for (const rule of rg2.rules) {
 			var _rule$valueSource;
 			if (typeof rule === "string") {
 				var _translations;
-				return `, ${(_translations = translations[rule]) !== null && _translations !== void 0 ? _translations : rule} `;
+				precedingCombinator = `, ${(_translations = translations[rule]) !== null && _translations !== void 0 ? _translations : rule} `;
+				continue;
 			}
 			if (isRuleGroup(rule)) {
 				var _rg2$combinator;
-				return processRuleGroup(rule, rg2.rules.length === 1 && !(rg2.not || /^xor$/i.test((_rg2$combinator = rg2.combinator) !== null && _rg2$combinator !== void 0 ? _rg2$combinator : "")));
+				const processedGroup = processRuleGroup(rule, rg2.rules.length === 1 && !(rg2.not || /^xor$/i.test((_rg2$combinator = rg2.combinator) !== null && _rg2$combinator !== void 0 ? _rg2$combinator : "")));
+				// istanbul ignore else
+				if (processedGroup) {
+					if (!firstRule && precedingCombinator) {
+						processedRules.push(precedingCombinator);
+						precedingCombinator = "";
+					}
+					firstRule = false;
+					processedRules.push(processedGroup);
+				}
+				continue;
 			}
 			const [validationResult, fieldValidator] = validateRule(rule);
-			if (!isRuleOrGroupValid(rule, validationResult, fieldValidator) || rule.field === placeholderFieldName || rule.operator === placeholderOperatorName || placeholderValueName !== void 0 && rule.value === placeholderValueName) return "";
+			if (!isRuleOrGroupValid(rule, validationResult, fieldValidator) || rule.field === placeholderFieldName || rule.operator === placeholderOperatorName || placeholderValueName !== void 0 && rule.value === placeholderValueName) continue;
 			const escapeQuotes = ((_rule$valueSource = rule.valueSource) !== null && _rule$valueSource !== void 0 ? _rule$valueSource : "value") === "value";
 			const fieldData = getOption(fields, rule.field);
-			return ruleProcessor(rule, _objectSpread2(_objectSpread2({}, options), {}, {
+			const processedRule = ruleProcessor(rule, _objectSpread2(_objectSpread2({}, options), {}, {
 				parseNumbers: getParseNumberBoolean(fieldData === null || fieldData === void 0 ? void 0 : fieldData.inputType),
 				escapeQuotes,
 				fieldData
 			}));
-		});
+			if (processedRule) {
+				if (!firstRule && precedingCombinator) {
+					processedRules.push(precedingCombinator);
+					precedingCombinator = "";
+				}
+				firstRule = false;
+				processedRules.push(processedRule);
+			}
+		}
 		if (processedRules.length === 0) return fallbackExpression;
 		const isXOR = lc((_rg2$combinator2 = rg2.combinator) !== null && _rg2$combinator2 !== void 0 ? _rg2$combinator2 : "") === "xor";
 		const combinator = isXOR ? rg2.combinator.slice(1) : rg2.combinator;
@@ -2073,7 +2335,7 @@ const defaultRuleGroupProcessorNL = (ruleGroup, options) => {
 		const [prefixTL, suffixTL] = ["groupPrefix", "groupSuffix"].map((key) => rg2.not ? isXOR ? getNLTranslataion(key, translations, ["not", "xor"]) : getNLTranslataion(key, translations, ["not"]) : isXOR ? getNLTranslataion(key, translations, ["xor"]) : getNLTranslataion(key, translations));
 		const prefix = mustWrap ? `${prefixTL} (`.trim() : "";
 		const suffix = mustWrap ? `) ${suffixTL}`.trim() : "";
-		return `${prefix}${processedRules.filter(Boolean).join(isRuleGroupType(rg2) ? `, ${(_translations2 = translations[combinator]) !== null && _translations2 !== void 0 ? _translations2 : combinator} ` : "")}${suffix}`;
+		return `${prefix}${processedRules.join(isRuleGroupType(rg2) ? `, ${(_translations2 = translations[combinator]) !== null && _translations2 !== void 0 ? _translations2 : combinator} ` : "")}${suffix}`;
 	};
 	return processRuleGroup(ruleGroup, true);
 };
@@ -2124,11 +2386,37 @@ const defaultRuleGroupProcessorParameterized = (ruleGroup, options) => {
 	const processRuleGroup = (rg, outermostOrLonelyInGroup) => {
 		var _rg$id;
 		if (!isRuleOrGroupValid(rg, validationMap[(_rg$id = rg.id) !== null && _rg$id !== void 0 ? _rg$id : ""])) return outermostOrLonelyInGroup ? fallbackExpression : "";
-		const processedRules = rg.rules.map((rule) => {
-			if (typeof rule === "string") return rule;
-			if (isRuleGroup(rule)) return processRuleGroup(rule, rg.rules.length === 1);
-			return processRule(rule);
-		}).filter(Boolean);
+		const processedRules = [];
+		let precedingCombinator = "";
+		let firstRule = true;
+		for (const rule of rg.rules) {
+			if (typeof rule === "string") {
+				precedingCombinator = rule;
+				continue;
+			}
+			if (isRuleGroup(rule)) {
+				const processedGroup = processRuleGroup(rule, rg.rules.length === 1);
+				// istanbul ignore else
+				if (processedGroup) {
+					if (!firstRule && precedingCombinator) {
+						processedRules.push(precedingCombinator);
+						precedingCombinator = "";
+					}
+					firstRule = false;
+					processedRules.push(processedGroup);
+				}
+				continue;
+			}
+			const processedRule = processRule(rule);
+			if (processedRule) {
+				if (!firstRule && precedingCombinator) {
+					processedRules.push(precedingCombinator);
+					precedingCombinator = "";
+				}
+				firstRule = false;
+				processedRules.push(processedRule);
+			}
+		}
 		if (processedRules.length === 0) return fallbackExpression;
 		return `${rg.not ? "NOT " : ""}(${processedRules.join(isRuleGroupType(rg) ? ` ${rg.combinator} ` : " ")})`;
 	};
@@ -2238,20 +2526,46 @@ const defaultRuleGroupProcessorSQL = (ruleGroup, options) => {
 	const processRuleGroup = (rg, outermostOrLonelyInGroup) => {
 		var _rg$id;
 		if (!isRuleOrGroupValid(rg, validationMap[(_rg$id = rg.id) !== null && _rg$id !== void 0 ? _rg$id : ""])) return outermostOrLonelyInGroup ? fallbackExpression : "";
-		const processedRules = rg.rules.map((rule) => {
+		const processedRules = [];
+		let precedingCombinator = "";
+		let firstRule = true;
+		for (const rule of rg.rules) {
 			var _rule$valueSource;
-			if (typeof rule === "string") return rule;
-			if (isRuleGroup(rule)) return processRuleGroup(rule, rg.rules.length === 1);
+			if (typeof rule === "string") {
+				precedingCombinator = rule;
+				continue;
+			}
+			if (isRuleGroup(rule)) {
+				const processedGroup = processRuleGroup(rule, rg.rules.length === 1);
+				// istanbul ignore else
+				if (processedGroup) {
+					if (!firstRule && precedingCombinator) {
+						processedRules.push(precedingCombinator);
+						precedingCombinator = "";
+					}
+					firstRule = false;
+					processedRules.push(processedGroup);
+				}
+				continue;
+			}
 			const [validationResult, fieldValidator] = validateRule(rule);
-			if (!isRuleOrGroupValid(rule, validationResult, fieldValidator) || rule.field === placeholderFieldName || rule.operator === placeholderOperatorName || placeholderValueName !== void 0 && rule.value === placeholderValueName) return "";
+			if (!isRuleOrGroupValid(rule, validationResult, fieldValidator) || rule.field === placeholderFieldName || rule.operator === placeholderOperatorName || placeholderValueName !== void 0 && rule.value === placeholderValueName) continue;
 			const escapeQuotes = ((_rule$valueSource = rule.valueSource) !== null && _rule$valueSource !== void 0 ? _rule$valueSource : "value") === "value";
 			const fieldData = getOption(fields, rule.field);
-			return ruleProcessor(rule, _objectSpread2(_objectSpread2({}, options), {}, {
+			const processedRule = ruleProcessor(rule, _objectSpread2(_objectSpread2({}, options), {}, {
 				parseNumbers: getParseNumberBoolean(fieldData === null || fieldData === void 0 ? void 0 : fieldData.inputType),
 				escapeQuotes,
 				fieldData
 			}));
-		}).filter(Boolean);
+			if (processedRule) {
+				if (!firstRule && precedingCombinator) {
+					processedRules.push(precedingCombinator);
+					precedingCombinator = "";
+				}
+				firstRule = false;
+				processedRules.push(processedRule);
+			}
+		}
 		if (processedRules.length === 0) return fallbackExpression;
 		return `${rg.not ? "NOT " : ""}(${processedRules.join(isRuleGroupType(rg) ? ` ${rg.combinator} ` : " ")})`;
 	};
@@ -2527,10 +2841,7 @@ const defaultRuleProcessorJsonLogic = (rule, options = {}) => {
 		case "null":
 		case "notnull": return { [`${operatorLC === "notnull" ? "!" : "="}=`]: [fieldObject, null] };
 		case "in":
-		case "notin": {
-			const valueAsArray = toArray(value).map((v) => fieldOrNumberRenderer(v));
-			return negateIfNotOp(operatorLC, { in: [fieldObject, valueAsArray] });
-		}
+		case "notin": return negateIfNotOp(operatorLC, { in: [fieldObject, toArray(value).map((v) => fieldOrNumberRenderer(v))] });
 		case "between":
 		case "notbetween": {
 			const valueAsArray = toArray(value);
@@ -2561,20 +2872,11 @@ const defaultRuleProcessorJsonLogic = (rule, options = {}) => {
 			return false;
 		}
 		case "contains":
-		case "doesnotcontain": {
-			const jsonRule = { in: [fieldOrNumberRenderer(value), fieldObject] };
-			return negateIfNotOp(operatorLC, jsonRule);
-		}
+		case "doesnotcontain": return negateIfNotOp(operatorLC, { in: [fieldOrNumberRenderer(value), fieldObject] });
 		case "beginswith":
-		case "doesnotbeginwith": {
-			const jsonRule = { startsWith: [fieldObject, fieldOrNumberRenderer(value)] };
-			return negateIfNotOp(operatorLC, jsonRule);
-		}
+		case "doesnotbeginwith": return negateIfNotOp(operatorLC, { startsWith: [fieldObject, fieldOrNumberRenderer(value)] });
 		case "endswith":
-		case "doesnotendwith": {
-			const jsonRule = { endsWith: [fieldObject, fieldOrNumberRenderer(value)] };
-			return negateIfNotOp(operatorLC, jsonRule);
-		}
+		case "doesnotendwith": return negateIfNotOp(operatorLC, { endsWith: [fieldObject, fieldOrNumberRenderer(value)] });
 	}
 	return false;
 };
@@ -2609,10 +2911,7 @@ const defaultRuleProcessorLDAP = (rule, options = {}) => {
 		case "null":
 		case "notnull": return negateIf(`(${field}=*)`, operatorLC === "notnull");
 		case "in":
-		case "notin": {
-			const valueAsArray = toArray(value);
-			return negateIf(`(|${valueAsArray.map((val) => `(${field}=${ldapEscape(val)})`).join("")})`, operatorLC === "notin");
-		}
+		case "notin": return negateIf(`(|${toArray(value).map((val) => `(${field}=${ldapEscape(val)})`).join("")})`, operatorLC === "notin");
 		case "between":
 		case "notbetween": {
 			const valueAsArray = toArray(value);
@@ -2783,10 +3082,9 @@ const defaultRuleProcessorNL = (rule, opts) => {
 	}));
 	const operatorLC = lc(operator);
 	if ((operatorLC === "in" || operatorLC === "notin" || operatorLC === "between" || operatorLC === "notbetween") && !value) return "";
-	const processedOperator = operatorProcessor(rule, opts);
 	const wordOrderMap = {
 		S: processedField,
-		V: processedOperator,
+		V: operatorProcessor(rule, opts),
 		O: value
 	};
 	return normalizeConstituentWordOrder(wordOrder).map((term) => `${wordOrderMap[term]}`).join(" ").trim();
@@ -3354,7 +3652,7 @@ const findPath = (path, query) => {
 		target = typeof t === "string" ? null : t;
 		level++;
 	}
-	return target;
+	return level < path.length ? null : target;
 };
 /**
 * Returns the {@link RuleType} or {@link RuleGroupType}/{@link RuleGroupTypeIC}
@@ -3551,6 +3849,30 @@ const getValueSourcesUtil = (fieldData, operator, getValueSources) => {
 	});
 };
 
+//#endregion
+//#region src/utils/mergeAnyTranslations.ts
+/**
+* Merges any number of partial translations into a single definition.
+*/
+const mergeAnyTranslations = (base, ...otherTranslations) => produce(base, (draft) => {
+	for (const translations of otherTranslations)
+ // istanbul ignore else
+	if (translations) for (const t of objectKeys(translations)) if (draft[t]) Object.assign(draft[t], translations[t]);
+	else Object.assign(draft, { [t]: translations[t] });
+});
+const mergeAnyTranslation = (el, keyPropContextMap, defaults) => {
+	const finalKeys = objectEntries(keyPropContextMap).map(([key, [pT, cT]]) => {
+		var _ref, _defaults$el;
+		return [key, (_ref = pT !== null && pT !== void 0 ? pT : cT) !== null && _ref !== void 0 ? _ref : defaults === null || defaults === void 0 || (_defaults$el = defaults[el]) === null || _defaults$el === void 0 ? void 0 : _defaults$el[key]];
+	}).filter((k) => !!k[1]);
+	if (finalKeys.length > 0 || defaults) {
+		var _defaults$el2;
+		const defaultProperties = (_defaults$el2 = defaults === null || defaults === void 0 ? void 0 : defaults[el]) !== null && _defaults$el2 !== void 0 ? _defaults$el2 : {};
+		const finalObject = Object.assign({}, defaultProperties, Object.fromEntries(finalKeys));
+		return { [el]: finalObject };
+	}
+};
+
 //#endregion
 //#region src/utils/mergeClassnames.ts
 const joinClassnamesByName = (name, args) => clsx(args.map((c) => clsx(c === null || c === void 0 ? void 0 : c[name])));
@@ -3578,6 +3900,9 @@ const mergeClassnames = (...args) => ({
 	dragHandle: joinClassnamesByName("dragHandle", args),
 	lockRule: joinClassnamesByName("lockRule", args),
 	lockGroup: joinClassnamesByName("lockGroup", args),
+	muteRule: joinClassnamesByName("muteRule", args),
+	muteGroup: joinClassnamesByName("muteGroup", args),
+	muted: joinClassnamesByName("muted", args),
 	valueSource: joinClassnamesByName("valueSource", args),
 	actionElement: joinClassnamesByName("actionElement", args),
 	valueSelector: joinClassnamesByName("valueSelector", args),
@@ -3597,21 +3922,6 @@ const mergeClassnames = (...args) => ({
 	hasSubQuery: joinClassnamesByName("hasSubQuery", args)
 });
 
-//#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;
-
 //#endregion
 //#region src/utils/prepareQueryObjects.ts
 /**
@@ -3640,23 +3950,15 @@ const prepareRuleOrGroup = (rg, { idGenerator = generateID } = {}) => isRuleGrou
 */
 const regenerateID = (rule, { idGenerator = generateID } = {}) => structuredClone(_objectSpread2(_objectSpread2({}, rule), {}, { id: idGenerator() }));
 /**
-* Recursively generates new `id` properties for a group and all its rules and subgroups.
+* Recursively generates new `id` properties for a rule group and all its rules and subgroups.
 */
-const regenerateIDs = (ruleOrGroup, { idGenerator = generateID } = {}) => {
-	if (!isPojo(ruleOrGroup)) return ruleOrGroup;
-	if (!isRuleGroup(ruleOrGroup)) return structuredClone(_objectSpread2(_objectSpread2({}, ruleOrGroup), {}, { id: idGenerator() }));
-	if (isRuleGroupType(ruleOrGroup)) {
-		const rules$1 = ruleOrGroup.rules.map((r) => isRuleGroup(r) ? regenerateIDs(r, { idGenerator }) : regenerateID(r, { idGenerator }));
-		return _objectSpread2(_objectSpread2({}, ruleOrGroup), {}, {
-			id: idGenerator(),
-			rules: rules$1
-		});
-	}
-	const rules = ruleOrGroup.rules.map((r) => typeof r === "string" ? r : isRuleGroup(r) ? regenerateIDs(r, { idGenerator }) : regenerateID(r, { idGenerator }));
-	return _objectSpread2(_objectSpread2({}, ruleOrGroup), {}, {
-		id: idGenerator(),
-		rules
-	});
+const regenerateIDs = (subject, { idGenerator = generateID } = {}) => {
+	if (!isPojo(subject)) return subject;
+	if (!isRuleGroup(subject)) return structuredClone(_objectSpread2(_objectSpread2({}, subject), {}, { id: idGenerator() }));
+	const newGroup = _objectSpread2(_objectSpread2({}, subject), {}, { id: idGenerator() });
+	// istanbul ignore else
+	if (Array.isArray(newGroup.rules)) newGroup.rules = subject.rules.map((r) => typeof r === "string" ? r : isRuleGroup(r) ? regenerateIDs(r, { idGenerator }) : regenerateID(r, { idGenerator }));
+	return newGroup;
 };
 
 //#endregion
@@ -3721,12 +4023,11 @@ const update = (query, prop, value, pathOrID, { resetOnFieldChange = true, reset
 		resetValueSource = true;
 		resetValue = true;
 	}
-	const valueSources = getValueSourcesUtil({
+	const defaultValueSource = getFirstOption(getValueSourcesUtil({
 		name: ruleOrGroup.field,
 		value: ruleOrGroup.field,
 		label: ""
-	}, ruleOrGroup.operator, getValueSources);
-	const defaultValueSource = getFirstOption(valueSources);
+	}, ruleOrGroup.operator, getValueSources));
 	if (resetValueSource && ruleOrGroup.valueSource && defaultValueSource !== ruleOrGroup.valueSource || prop === "valueSource" && value !== ruleOrGroup.valueSource) {
 		resetValue = !!ruleOrGroup.valueSource || !ruleOrGroup.valueSource && value !== defaultValueSource;
 		ruleOrGroup.valueSource = resetValueSource ? defaultValueSource : value;
@@ -3771,8 +4072,7 @@ const getNextPath = (query, currentPath, newPathOrShiftDirection) => {
 		return [...getParentPath(parentPath), parentPath.at(-1) + 1];
 	} else {
 		const evaluationPath = [...getParentPath(currentPath), currentPath.at(-1) + (ic ? 2 : 1)];
-		const entityToEvaluate = findPath(evaluationPath, query);
-		if (isRuleGroup(entityToEvaluate)) return [...evaluationPath, 0];
+		if (isRuleGroup(findPath(evaluationPath, query))) return [...evaluationPath, 0];
 		else return [...getParentPath(currentPath), currentPath.at(-1) + (ic ? 3 : 2)];
 	}
 	return currentPath;
@@ -3806,8 +4106,7 @@ const move = (query, oldPathOrID, newPath, { clone = false, combinators = defaul
 		const newNewPath = [...nextPath];
 		const commonAncestorPath = getCommonAncestorPath(oldPath, nextPath);
 		if (!clone && oldPath.length === commonAncestorPath.length + 1 && nextPath[commonAncestorPath.length] > oldPath[commonAncestorPath.length]) newNewPath[commonAncestorPath.length] -= independentCombinators ? 2 : 1;
-		const newNewParentPath = getParentPath(newNewPath);
-		const parentToInsertInto = findPath(newNewParentPath, draft);
+		const parentToInsertInto = findPath(getParentPath(newNewPath), draft);
 		const newIndex = newNewPath.at(-1);
 		/**
 		* This function 1) glosses over the need for type assertions to splice directly
@@ -3818,14 +4117,12 @@ const move = (query, oldPathOrID, newPath, { clone = false, combinators = defaul
 		else if (newIndex === 0) if (ruleToRemoveIndex === 0 && oldNextCombinator) insertRuleOrGroup(ruleOrGroup, oldNextCombinator);
 		else {
 			var _ref, _parentToInsertInto$r;
-			const newNextCombinator = (_ref = (_parentToInsertInto$r = parentToInsertInto.rules[1]) !== null && _parentToInsertInto$r !== void 0 ? _parentToInsertInto$r : oldPrevCombinator) !== null && _ref !== void 0 ? _ref : getFirstOption(combinators);
-			insertRuleOrGroup(ruleOrGroup, newNextCombinator);
+			insertRuleOrGroup(ruleOrGroup, (_ref = (_parentToInsertInto$r = parentToInsertInto.rules[1]) !== null && _parentToInsertInto$r !== void 0 ? _parentToInsertInto$r : oldPrevCombinator) !== null && _ref !== void 0 ? _ref : getFirstOption(combinators));
 		}
 		else if (oldPrevCombinator) insertRuleOrGroup(oldPrevCombinator, ruleOrGroup);
 		else {
 			var _ref2, _parentToInsertInto$r2;
-			const newPrevCombinator = (_ref2 = (_parentToInsertInto$r2 = parentToInsertInto.rules[newIndex - 2]) !== null && _parentToInsertInto$r2 !== void 0 ? _parentToInsertInto$r2 : oldNextCombinator) !== null && _ref2 !== void 0 ? _ref2 : getFirstOption(combinators);
-			insertRuleOrGroup(newPrevCombinator, ruleOrGroup);
+			insertRuleOrGroup((_ref2 = (_parentToInsertInto$r2 = parentToInsertInto.rules[newIndex - 2]) !== null && _parentToInsertInto$r2 !== void 0 ? _parentToInsertInto$r2 : oldNextCombinator) !== null && _ref2 !== void 0 ? _ref2 : getFirstOption(combinators), ruleOrGroup);
 		}
 	});
 };
@@ -3853,16 +4150,14 @@ const insert = (query, ruleOrGroup, path, { combinators = defaultCombinators, co
 		if (((_rorg$path = rorg.path) === null || _rorg$path === void 0 ? void 0 : _rorg$path.at(-1)) === 0 && combinatorSucceeding) insertRuleOrGroup(newIndex, rorg, combinatorSucceeding);
 		else {
 			var _ref3, _parentToInsertInto$r3;
-			const newNextCombinator = (_ref3 = (_parentToInsertInto$r3 = parentToInsertInto.rules[1]) !== null && _parentToInsertInto$r3 !== void 0 ? _parentToInsertInto$r3 : combinatorPreceding) !== null && _ref3 !== void 0 ? _ref3 : getFirstOption(combinators);
-			insertRuleOrGroup(newIndex, rorg, newNextCombinator);
+			insertRuleOrGroup(newIndex, rorg, (_ref3 = (_parentToInsertInto$r3 = parentToInsertInto.rules[1]) !== null && _parentToInsertInto$r3 !== void 0 ? _parentToInsertInto$r3 : combinatorPreceding) !== null && _ref3 !== void 0 ? _ref3 : getFirstOption(combinators));
 		}
 	} else {
 		const normalizedNewIndex = newIndex % 2 === 0 ? newIndex - 1 : newIndex;
 		if (combinatorPreceding) insertRuleOrGroup(normalizedNewIndex, combinatorPreceding, rorg);
 		else {
 			var _ref4, _parentToInsertInto$r4;
-			const newPrevCombinator = (_ref4 = (_parentToInsertInto$r4 = parentToInsertInto.rules[normalizedNewIndex - 2]) !== null && _parentToInsertInto$r4 !== void 0 ? _parentToInsertInto$r4 : combinatorSucceeding) !== null && _ref4 !== void 0 ? _ref4 : getFirstOption(combinators);
-			insertRuleOrGroup(normalizedNewIndex, newPrevCombinator, rorg);
+			insertRuleOrGroup(normalizedNewIndex, (_ref4 = (_parentToInsertInto$r4 = parentToInsertInto.rules[normalizedNewIndex - 2]) !== null && _parentToInsertInto$r4 !== void 0 ? _parentToInsertInto$r4 : combinatorSucceeding) !== null && _ref4 !== void 0 ? _ref4 : getFirstOption(combinators), rorg);
 		}
 	}
 });
@@ -3897,8 +4192,7 @@ const group = (query, sourcePathOrID, targetPathOrID, { clone = false, combinato
 		const newNewPath = [...nextPath];
 		const commonAncestorPath = getCommonAncestorPath(sourcePath, nextPath);
 		if (!clone && sourcePath.length === commonAncestorPath.length + 1 && nextPath[commonAncestorPath.length] > sourcePath[commonAncestorPath.length]) newNewPath[commonAncestorPath.length] -= independentCombinators ? 2 : 1;
-		const newNewParentPath = getParentPath(newNewPath);
-		const parentOfTargetPath = findPath(newNewParentPath, draft);
+		const parentOfTargetPath = findPath(getParentPath(newNewPath), draft);
 		const targetPathIndex = newNewPath.at(-1);
 		parentOfTargetPath.rules.splice(targetPathIndex, 1, prepareRuleOrGroup(independentCombinators ? { rules: [
 			targetRuleOrGroup,
@@ -3912,5 +4206,5 @@ const group = (query, sourcePathOrID, targetPathOrID, { clone = false, combinato
 };
 
 //#endregion
-export { LogType, TestID, add, bigIntJsonParseReviver, bigIntJsonStringifyReplacer, celCombinatorMap, clsx, convertFromIC, convertQuery, convertToIC, defaultCELValueProcessor, defaultCombinatorLabelMap, defaultCombinators, defaultCombinatorsExtended, defaultControlClassnames, defaultExportOperatorMap, defaultJoinChar, defaultMatchModes, defaultMongoDBValueProcessor, defaultNLTranslations, defaultOperatorLabelMap, defaultOperatorNegationMap, defaultOperatorProcessorNL, defaultOperatorProcessorSQL, defaultOperators, defaultPlaceholderFieldGroupLabel, defaultPlaceholderFieldLabel, defaultPlaceholderFieldName, defaultPlaceholderLabel, defaultPlaceholderName, defaultPlaceholderOperatorGroupLabel, defaultPlaceholderOperatorLabel, defaultPlaceholderOperatorName, defaultPlaceholderValueGroupLabel, defaultPlaceholderValueLabel, defaultPlaceholderValueName, defaultRuleGroupProcessorCEL, defaultRuleGroupProcessorDrizzle, defaultRuleGroupProcessorElasticSearch, defaultRuleGroupProcessorJSONata, defaultRuleGroupProcessorJsonLogic, defaultRuleGroupProcessorLDAP, defaultRuleGroupProcessorMongoDB, defaultRuleGroupProcessorMongoDBQuery, defaultRuleGroupProcessorNL, defaultRuleGroupProcessorParameterized, defaultRuleGroupProcessorPrisma, defaultRuleGroupProcessorSQL, defaultRuleGroupProcessorSequelize, defaultRuleGroupProcessorSpEL, defaultRuleProcessorCEL, defaultRuleProcessorDrizzle, defaultRuleProcessorElasticSearch, defaultRuleProcessorJSONata, defaultRuleProcessorJsonLogic, defaultRuleProcessorLDAP, defaultRuleProcessorMongoDB, defaultRuleProcessorMongoDBQuery, defaultRuleProcessorNL, defaultRuleProcessorParameterized, defaultRuleProcessorPrisma, defaultRuleProcessorSQL, defaultRuleProcessorSequelize, defaultRuleProcessorSpEL, defaultSpELValueProcessor, defaultValidator, defaultValueProcessor, defaultValueProcessorByRule, defaultValueProcessorCELByRule, defaultValueProcessorMongoDBByRule, defaultValueProcessorNL, defaultValueProcessorSpELByRule, filterFieldsByComparator, findID, findPath, formatQuery, formatQueryOptionPresets, generateAccessibleDescription, generateID, getCommonAncestorPath, getFirstOption, getMatchModesUtil, getNLTranslataion, getOption, getParentPath, getParseNumberMethod, getPathOfID, getQuoteFieldNamesWithArray, getQuotedFieldName, getValidationClassNames, getValueSourcesUtil, group, groupInvalidReasons, insert, isAncestor, isFlexibleOptionArray, isFlexibleOptionGroupArray, isFullOptionArray, isFullOptionGroupArray, isOptionGroupArray, isPojo, isRuleGroup, isRuleGroupType, isRuleGroupTypeIC, isRuleOrGroupValid, isValidValue, isValidationResult, isValueProcessorLegacy, joinWith, jsonLogicAdditionalOperators, lc, mapSQLOperator, mergeClassnames, mongoDbFallback, mongoOperators, move, normalizeConstituentWordOrder, nullFreeArray, nullOrUndefinedOrEmpty, numericRegex, numerifyValues, objectEntries, objectKeys, parseNumber, pathIsDisabled, pathsAreEqual, prepareRule, prepareRuleGroup, prepareRuleOrGroup, prismaFallback, prismaOperators, processMatchMode, regenerateID, regenerateIDs, remove, rootPath, shouldRenderAsNumber, splitBy, sqlDialectPresets, standardClassnames, toArray, toFlatOptionArray, toFullOption, toFullOptionList, toFullOptionMap, transformQuery, trimIfString, uniqByIdentifier, uniqByName, uniqOptGroups, uniqOptList, update };
+export { LogType, TestID, add, bigIntJsonParseReviver, bigIntJsonStringifyReplacer, celCombinatorMap, clsx, convertFromIC, convertQuery, convertToIC, defaultCELValueProcessor, defaultCombinatorLabelMap, defaultCombinators, defaultCombinatorsExtended, defaultControlClassnames, defaultExportOperatorMap, defaultJoinChar, defaultMatchModes, defaultMongoDBValueProcessor, defaultNLTranslations, defaultOperatorLabelMap, defaultOperatorNegationMap, defaultOperatorProcessorNL, defaultOperatorProcessorSQL, defaultOperators, defaultPlaceholderFieldGroupLabel, defaultPlaceholderFieldLabel, defaultPlaceholderFieldName, defaultPlaceholderLabel, defaultPlaceholderName, defaultPlaceholderOperatorGroupLabel, defaultPlaceholderOperatorLabel, defaultPlaceholderOperatorName, defaultPlaceholderValueGroupLabel, defaultPlaceholderValueLabel, defaultPlaceholderValueName, defaultRuleGroupProcessorCEL, defaultRuleGroupProcessorDrizzle, defaultRuleGroupProcessorElasticSearch, defaultRuleGroupProcessorJSONata, defaultRuleGroupProcessorJsonLogic, defaultRuleGroupProcessorLDAP, defaultRuleGroupProcessorMongoDB, defaultRuleGroupProcessorMongoDBQuery, defaultRuleGroupProcessorNL, defaultRuleGroupProcessorParameterized, defaultRuleGroupProcessorPrisma, defaultRuleGroupProcessorSQL, defaultRuleGroupProcessorSequelize, defaultRuleGroupProcessorSpEL, defaultRuleProcessorCEL, defaultRuleProcessorDrizzle, defaultRuleProcessorElasticSearch, defaultRuleProcessorJSONata, defaultRuleProcessorJsonLogic, defaultRuleProcessorLDAP, defaultRuleProcessorMongoDB, defaultRuleProcessorMongoDBQuery, defaultRuleProcessorNL, defaultRuleProcessorParameterized, defaultRuleProcessorPrisma, defaultRuleProcessorSQL, defaultRuleProcessorSequelize, defaultRuleProcessorSpEL, defaultSpELValueProcessor, defaultTranslations, defaultValidator, defaultValueProcessor, defaultValueProcessorByRule, defaultValueProcessorCELByRule, defaultValueProcessorMongoDBByRule, defaultValueProcessorNL, defaultValueProcessorSpELByRule, filterFieldsByComparator, findID, findPath, formatQuery, formatQueryOptionPresets, generateAccessibleDescription, generateID, getCommonAncestorPath, getFirstOption, getMatchModesUtil, getNLTranslataion, getOption, getParentPath, getParseNumberMethod, getPathOfID, getQuoteFieldNamesWithArray, getQuotedFieldName, getValidationClassNames, getValueSourcesUtil, group, groupInvalidReasons, insert, isAncestor, isFlexibleOptionArray, isFlexibleOptionGroupArray, isFullOptionArray, isFullOptionGroupArray, isOptionGroupArray, isPojo, isRuleGroup, isRuleGroupType, isRuleGroupTypeIC, isRuleOrGroupValid, isRuleType, isValidValue, isValidationResult, isValueProcessorLegacy, joinWith, jsonLogicAdditionalOperators, lc, mapSQLOperator, mergeAnyTranslation, mergeAnyTranslations, mergeClassnames, mongoDbFallback, mongoOperators, move, normalizeConstituentWordOrder, nullFreeArray, nullOrUndefinedOrEmpty, numericRegex, numerifyValues, objectEntries, objectKeys, parseNumber, pathIsDisabled, pathsAreEqual, prepareOptionList, prepareRule, prepareRuleGroup, prepareRuleOrGroup, prismaFallback, prismaOperators, processMatchMode, regenerateID, regenerateIDs, remove, rootPath, shouldRenderAsNumber, splitBy, sqlDialectPresets, standardClassnames, toArray, toFlatOptionArray, toFullOption, toFullOptionList, toFullOptionMap, transformQuery, trimIfString, uniqByIdentifier, uniqByName, uniqOptGroups, uniqOptList, update };
 //# sourceMappingURL=react-querybuilder_core.legacy-esm.js.map