@react-querybuilder/core 8.13.0 → 8.14.1

package/dist/react-querybuilder_core.mjs

@@ -1,6 +1,5 @@
-import { produce } from "immer";
 import { numericQuantity, numericRegex as numericRegex$1 } from "numeric-quantity";
-
+import { current, isDraft, produce } from "immer";
 //#region src/defaults.ts
 /**
 * @group Defaults
@@ -15,7 +14,7 @@ const defaultPlaceholderLabel = "------";
 *
 * @group Defaults
 */
-const defaultPlaceholderFieldName = defaultPlaceholderName;
+const defaultPlaceholderFieldName = "~";
 /**
 * Default `label` for placeholder option in the `fields` array.
 *
@@ -33,7 +32,7 @@ const defaultPlaceholderFieldGroupLabel = defaultPlaceholderLabel;
 *
 * @group Defaults
 */
-const defaultPlaceholderOperatorName = defaultPlaceholderName;
+const defaultPlaceholderOperatorName = "~";
 /**
 * Default `label` for placeholder option in the `operators` array.
 *
@@ -51,7 +50,7 @@ const defaultPlaceholderOperatorGroupLabel = defaultPlaceholderLabel;
 *
 * @group Defaults
 */
-const defaultPlaceholderValueName = defaultPlaceholderName;
+const defaultPlaceholderValueName = "~";
 /**
 * Default `label` for placeholder option in the `values` array.
 *
@@ -72,19 +71,19 @@ const defaultPlaceholderValueGroupLabel = defaultPlaceholderLabel;
 const defaultTranslations = {
 	fields: {
 		title: "Field",
-		placeholderName: defaultPlaceholderFieldName,
+		placeholderName: "~",
 		placeholderLabel: defaultPlaceholderFieldLabel,
 		placeholderGroupLabel: defaultPlaceholderFieldGroupLabel
 	},
 	operators: {
 		title: "Operator",
-		placeholderName: defaultPlaceholderOperatorName,
+		placeholderName: "~",
 		placeholderLabel: defaultPlaceholderOperatorLabel,
 		placeholderGroupLabel: defaultPlaceholderOperatorGroupLabel
 	},
 	values: {
 		title: "Values",
-		placeholderName: defaultPlaceholderValueName,
+		placeholderName: "~",
 		placeholderLabel: defaultPlaceholderValueLabel,
 		placeholderGroupLabel: defaultPlaceholderValueGroupLabel
 	},
@@ -562,7 +561,6 @@ const queryBuilderFlagDefaults = {
 	showShiftActions: false,
 	suppressStandardClassnames: false
 };
-
 //#endregion
 //#region src/utils/arrayUtils.ts
 /**
@@ -577,7 +575,7 @@ const queryBuilderFlagDefaults = {
 * // would return
 * ['this,,that', '', 'the other', '', '', ',']
 */
-const splitBy = (str, splitChar = defaultJoinChar) => typeof str === "string" ? str.split(`\\${splitChar}`).map((c) => c.split(splitChar)).reduce((prev, curr, idx) => {
+const splitBy = (str, splitChar = ",") => typeof str === "string" ? str.split(`\\${splitChar}`).map((c) => c.split(splitChar)).reduce((prev, curr, idx) => {
 	if (idx === 0) return curr;
 	return [
 		...prev.slice(0, -1),
@@ -598,7 +596,7 @@ const splitBy = (str, splitChar = defaultJoinChar) => typeof str === "string" ?
 * // would return
 * 'this\\,\\,that, , the other, , , \\,'
 */
-const joinWith = (strArr, joinChar = defaultJoinChar) => strArr.map((str) => `${str ?? ""}`.replaceAll(joinChar[0], `\\${joinChar[0]}`)).join(joinChar);
+const joinWith = (strArr, joinChar = ",") => strArr.map((str) => `${str ?? ""}`.replaceAll(joinChar[0], `\\${joinChar[0]}`)).join(joinChar);
 /**
 * Trims the value if it is a string. Otherwise returns the value as is.
 */
@@ -607,12 +605,11 @@ const trimIfString = (val) => typeof val === "string" ? val.trim() : val;
 * Splits a string by comma then trims each element. Arrays are returned as is except
 * any string elements are trimmed.
 */
-const toArray = (v, { retainEmptyStrings } = {}) => Array.isArray(v) ? v.map((v$1) => trimIfString(v$1)) : typeof v === "string" ? splitBy(v, defaultJoinChar).filter(retainEmptyStrings ? () => true : (s) => !/^\s*$/.test(s)).map((s) => s.trim()) : typeof v === "number" ? [v] : [];
+const toArray = (a, { retainEmptyStrings } = {}) => Array.isArray(a) ? a.map((v) => trimIfString(v)) : typeof a === "string" ? splitBy(a, ",").filter(retainEmptyStrings ? () => true : (s) => !/^\s*$/.test(s)).map((s) => s.trim()) : typeof a === "number" ? [a] : [];
 /**
 * Determines if an array is free of `null`/`undefined`.
 */
 const nullFreeArray = (arr) => arr.every((el) => el === false || (el ?? false) !== false);
-
 //#endregion
 //#region src/utils/clsx.ts
 // istanbul ignore next
@@ -653,7 +650,6 @@ function clsx(...args) {
 	}
 	return str;
 }
-
 //#endregion
 //#region src/utils/misc.ts
 /**
@@ -674,7 +670,6 @@ const isPojo = (obj) => obj === null || typeof obj !== "object" ? false : Object
 * Simple helper to determine whether a value is null, undefined, or an empty string.
 */
 const nullOrUndefinedOrEmpty = (value) => value === null || value === void 0 || value === "";
-
 //#endregion
 //#region src/utils/isRuleGroup.ts
 /**
@@ -693,7 +688,6 @@ const isRuleGroupType = (rg) => isRuleGroup(rg) && typeof rg.combinator === "str
 * Determines if an object is a {@link RuleGroupTypeIC}.
 */
 const isRuleGroupTypeIC = (rg) => isRuleGroup(rg) && rg.combinator === void 0;
-
 //#endregion
 //#region src/utils/convertQuery.ts
 const combinatorLevels = [
@@ -705,20 +699,27 @@ const isSameString = (a, b) => lc(a) === b;
 const generateRuleGroupICWithConsistentCombinators = (rg, baseCombinatorLevel = 0) => {
 	const baseCombinator = combinatorLevels[baseCombinatorLevel];
 	if (!rg.rules.includes(baseCombinator)) return baseCombinatorLevel < combinatorLevels.length - 2 ? generateRuleGroupICWithConsistentCombinators(rg, baseCombinatorLevel + 1) : rg;
-	return produce(rg, (draft) => {
-		let cursor = 0;
-		while (cursor < draft.rules.length - 2) {
-			if (isSameString(draft.rules[cursor + 1], baseCombinator)) {
-				cursor += 2;
-				continue;
-			}
-			const nextBaseCombinatorIndex = draft.rules.findIndex((r, i) => i > cursor && typeof r === "string" && lc(r) === baseCombinator);
-			if (nextBaseCombinatorIndex === -1) {
-				draft.rules.splice(cursor, draft.rules.length, generateRuleGroupICWithConsistentCombinators({ rules: draft.rules.slice(cursor) }, baseCombinatorLevel + 1));
-				break;
-			} else draft.rules.splice(cursor, nextBaseCombinatorIndex - cursor, generateRuleGroupICWithConsistentCombinators({ rules: draft.rules.slice(cursor, nextBaseCombinatorIndex) }, baseCombinatorLevel + 1));
+	const newRules = [...rg.rules];
+	let cursor = 0;
+	while (cursor < newRules.length - 2) {
+		if (isSameString(newRules[cursor + 1], baseCombinator)) {
+			cursor += 2;
+			continue;
 		}
-	});
+		let nextBaseCombinatorIndex = -1;
+		for (let i = cursor + 2; i < newRules.length; i++) if (typeof newRules[i] === "string" && lc(newRules[i]) === baseCombinator) {
+			nextBaseCombinatorIndex = i;
+			break;
+		}
+		if (nextBaseCombinatorIndex === -1) {
+			newRules.splice(cursor, newRules.length, generateRuleGroupICWithConsistentCombinators({ rules: newRules.slice(cursor) }, baseCombinatorLevel + 1));
+			break;
+		} else newRules.splice(cursor, nextBaseCombinatorIndex - cursor, generateRuleGroupICWithConsistentCombinators({ rules: newRules.slice(cursor, nextBaseCombinatorIndex) }, baseCombinatorLevel + 1));
+	}
+	return {
+		...rg,
+		rules: newRules
+	};
 };
 /**
 * Converts a {@link RuleGroupTypeIC} to {@link RuleGroupType}.
@@ -731,9 +732,11 @@ const generateRuleGroupICWithConsistentCombinators = (rg, baseCombinatorLevel =
 const convertFromIC = (rg) => {
 	if (isRuleGroupType(rg)) return rg;
 	const processedRG = generateRuleGroupICWithConsistentCombinators(rg);
-	const rulesAsMixedList = processedRG.rules.map((r) => typeof r === "string" || !isRuleGroup(r) ? r : convertFromIC(r));
-	const combinator = rulesAsMixedList.length < 2 ? "and" : rulesAsMixedList[1];
-	const rules = rulesAsMixedList.filter((r) => typeof r !== "string");
+	const rules = [];
+	let combinator = "and";
+	for (const [idx, r] of processedRG.rules.entries()) if (typeof r === "string") {
+		if (idx === 1) combinator = r;
+	} else rules.push(isRuleGroup(r) ? convertFromIC(r) : r);
 	return {
 		...processedRG,
 		combinator,
@@ -753,7 +756,8 @@ const convertToIC = (rg) => {
 	const { combinator, ...queryWithoutCombinator } = rg;
 	const rules = [];
 	const { length } = rg.rules;
-	for (const [idx, r] of rg.rules.entries()) {
+	for (let idx = 0; idx < length; idx++) {
+		const r = rg.rules[idx];
 		if (isRuleGroup(r)) rules.push(convertToIC(r));
 		else rules.push(r);
 		if (combinator && idx < length - 1) rules.push(combinator);
@@ -766,7 +770,6 @@ const convertToIC = (rg) => {
 function convertQuery(query) {
 	return isRuleGroupTypeIC(query) ? convertFromIC(query) : convertToIC(query);
 }
-
 //#endregion
 //#region src/utils/defaultValidator.ts
 /**
@@ -803,7 +806,6 @@ const defaultValidator = (query) => {
 	validateGroup(query);
 	return result;
 };
-
 //#endregion
 //#region src/utils/objectUtils.ts
 /**
@@ -818,7 +820,6 @@ const objectKeys = Object.keys;
 * [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";
@@ -830,24 +831,23 @@ const isOptionWithValue = (opt) => isPojo(opt) && "value" in opt && typeof opt.v
 * @group Option Lists
 */
 function toFullOption(opt, baseProperties, labelMap) {
-	return produce((draft) => {
-		const idObj = {};
-		let needsUpdating = !!baseProperties;
-		if (typeof draft === "string") return {
-			...baseProperties,
-			name: draft,
-			value: draft,
-			label: labelMap?.[draft] ?? draft
-		};
-		if (isOptionWithName(draft) && !isOptionWithValue(draft)) {
-			idObj.value = draft.name;
-			needsUpdating = true;
-		} else if (!isOptionWithName(draft) && isOptionWithValue(draft)) {
-			idObj.name = draft.value;
-			needsUpdating = true;
-		}
-		if (needsUpdating) return Object.assign({}, baseProperties, draft, idObj);
-	})(opt);
+	if (typeof opt === "string") return {
+		...baseProperties,
+		name: opt,
+		value: opt,
+		label: labelMap?.[opt] ?? opt
+	};
+	const idObj = {};
+	let needsUpdating = !!baseProperties;
+	if (isOptionWithName(opt) && !isOptionWithValue(opt)) {
+		idObj.value = opt.name;
+		needsUpdating = true;
+	} else if (!isOptionWithName(opt) && isOptionWithValue(opt)) {
+		idObj.name = opt.value;
+		needsUpdating = true;
+	}
+	if (needsUpdating) return Object.assign({}, baseProperties, opt, idObj);
+	return opt;
 }
 /**
 * Converts an {@link OptionList} or {@link FlexibleOptionList} into a {@link FullOptionList}.
@@ -857,10 +857,12 @@ function toFullOption(opt, baseProperties, labelMap) {
 */
 function toFullOptionList(optList, baseProperties, labelMap) {
 	if (!Array.isArray(optList)) return [];
-	return produce((draft) => {
-		if (isFlexibleOptionGroupArray(draft)) for (const optGroup of draft) for (const [idx, opt] of optGroup.options.entries()) optGroup.options[idx] = toFullOption(opt, baseProperties, labelMap);
-		else for (const [idx, opt] of draft.entries()) draft[idx] = toFullOption(opt, baseProperties, labelMap);
-	})(optList);
+	const list = optList;
+	if (isFlexibleOptionGroupArray(list)) return list.map((optGroup) => ({
+		...optGroup,
+		options: optGroup.options.map((opt) => toFullOption(opt, baseProperties, labelMap))
+	}));
+	return list.map((opt) => toFullOption(opt, baseProperties, labelMap));
 }
 /**
 * Converts a {@link FlexibleOptionList} into a {@link FullOptionList}.
@@ -997,7 +999,7 @@ const uniqOptList = (originalArray) => {
 };
 const prepareOptionList = (props) => {
 	// istanbul ignore next
-	const { optionList: optionListPropOriginal, baseOption = {}, labelMap = {}, placeholder: { placeholderName = defaultPlaceholderName, placeholderLabel = defaultPlaceholderLabel, placeholderGroupLabel = defaultPlaceholderLabel } = {}, autoSelectOption = true } = props;
+	const { optionList: optionListPropOriginal, baseOption = {}, labelMap = {}, placeholder: { placeholderName = "~", placeholderLabel = defaultPlaceholderLabel, placeholderGroupLabel = defaultPlaceholderLabel } = {}, autoSelectOption = true } = props;
 	const defaultOption = {
 		id: placeholderName,
 		name: placeholderName,
@@ -1031,7 +1033,6 @@ const prepareOptionList = (props) => {
 		optionsMap
 	};
 };
-
 //#endregion
 //#region src/utils/filterFieldsByComparator.ts
 const filterByComparator = (field, operator, fieldToCompare) => {
@@ -1067,7 +1068,6 @@ const filterFieldsByComparator = (field, fields, operator) => {
 	})).filter((og) => og.options.length > 0);
 	return fields.filter((f) => filterByComparator(field, operator, f));
 };
-
 //#endregion
 //#region src/utils/parseNumber.ts
 /**
@@ -1087,23 +1087,20 @@ const parseNumber = (val, { parseNumbers, bigIntOnOverflow } = {}) => {
 	});
 	return typeof valAsNum === "bigint" || !Number.isNaN(valAsNum) ? valAsNum : val;
 };
-
 //#endregion
 //#region src/utils/transformQuery.ts
-/**
-* Recursively steps through a query object ({@link index!RuleGroupType RuleGroupType} or {@link index!RuleGroupTypeIC RuleGroupTypeIC}),
-* passing each {@link index!RuleType RuleType} object to a provided `ruleProcessor` function and returning a
-* new query object if there were any referential changes.
-*
-* @module transformQuery
-*/
-const remapProperties = (obj, propertyMap, deleteRemappedProperties) => produce(obj, (draft) => {
-	for (const [k, v] of Object.entries(propertyMap)) if (v === false) delete draft[k];
-	else if (!!v && k !== v && k in draft) {
-		draft[v] = draft[k];
-		if (deleteRemappedProperties) delete draft[k];
+const remapProperties = (obj, propertyMap, deleteRemappedProperties) => {
+	const result = {};
+	for (const key in obj) {
+		const mappedKey = propertyMap[key];
+		if (mappedKey === false) continue;
+		if (mappedKey && key !== mappedKey) {
+			result[mappedKey] = obj[key];
+			if (!deleteRemappedProperties) result[key] = obj[key];
+		} else result[key] = obj[key];
 	}
-});
+	return result;
+};
 function transformQuery(query, options = {}) {
 	const { ruleProcessor = (r) => r, ruleGroupProcessor = (rg) => rg, propertyMap = {}, combinatorMap = {}, operatorMap = {}, omitPath = false, deleteRemappedProperties = true } = options;
 	const processGroup = (rg) => ({
@@ -1130,7 +1127,6 @@ function transformQuery(query, options = {}) {
 		...omitPath ? null : { path: [] }
 	});
 }
-
 //#endregion
 //#region src/utils/isRuleOrGroupValid.ts
 /**
@@ -1154,7 +1150,6 @@ const isRuleOrGroupValid = (rg, validationResult, validator) => {
 	}
 	return true;
 };
-
 //#endregion
 //#region src/utils/getParseNumberMethod.ts
 const getParseNumberMethod = ({ parseNumbers, inputType }) => {
@@ -1165,7 +1160,6 @@ const getParseNumberMethod = ({ parseNumbers, inputType }) => {
 	}
 	return parseNumbers ? "strict" : false;
 };
-
 //#endregion
 //#region src/utils/formatQuery/utils.ts
 /**
@@ -1247,7 +1241,8 @@ const jsonLogicAdditionalOperators = {
 	endsWith: (a, b) => typeof a === "string" && a.endsWith(b)
 };
 /**
-* Converts all `string`-type `value` properties of a query object into `number` where appropriate.
+* Returns a new query object with all `string`-type `value` properties converted
+* to `number` where appropriate.
 *
 * Used by {@link formatQuery} for the `json*` formats when `parseNumbers` is `true`.
 *
@@ -1416,7 +1411,6 @@ const bigIntJsonStringifyReplacer = (_key, value) => typeof value === "bigint" ?
 * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/BigInt#use_within_json
 */
 const bigIntJsonParseReviver = (_key, value) => isPojo(value) && Object.keys(value).length === 1 && typeof value.$bigint === "string" ? BigInt(value.$bigint) : value;
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleGroupProcessorCEL.ts
 /**
@@ -1472,7 +1466,6 @@ const defaultRuleGroupProcessorCEL = (ruleGroup, options) => {
 	};
 	return processRuleGroup(ruleGroup, true);
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleProcessorCEL.ts
 const shouldNegate$2 = (op) => op.startsWith("not") || op.startsWith("doesnot");
@@ -1553,7 +1546,6 @@ const defaultRuleProcessorCEL = (rule, opts = {}) => {
 	}
 	return "";
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleGroupProcessorMongoDBQuery.ts
 /**
@@ -1591,11 +1583,11 @@ const defaultRuleGroupProcessorMongoDBQuery = (ruleGroup, options, meta) => {
 				fieldData
 			}, meta);
 		}).filter(Boolean);
-		return expressions.length > 0 ? expressions.length === 1 && !hasChildRules ? expressions[0] : { [combinator]: expressions } : mongoDbFallback;
+		const result = expressions.length > 0 ? expressions.length === 1 && !hasChildRules ? expressions[0] : { [combinator]: expressions } : mongoDbFallback;
+		return rg.not ? { $not: result } : result;
 	};
 	return processRuleGroup(convertFromIC(ruleGroup), true);
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleProcessorMongoDBQuery.ts
 const processNumber$1 = (value, fallback, parseNumbers = false) => shouldRenderAsNumber(value, parseNumbers || typeof value === "bigint") ? Number(parseNumber(value, { parseNumbers: "strict" })) : fallback;
@@ -1724,7 +1716,6 @@ const defaultRuleProcessorMongoDBQuery = (rule, options = {}) => {
 	}
 	return "";
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleProcessorMongoDB.ts
 /**
@@ -1738,7 +1729,6 @@ const defaultRuleProcessorMongoDB = (rule, options) => {
 	const queryObj = defaultRuleProcessorMongoDBQuery(rule, options);
 	return queryObj ? JSON.stringify(queryObj) : "";
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleGroupProcessorSpEL.ts
 /**
@@ -1794,11 +1784,10 @@ const defaultRuleGroupProcessorSpEL = (ruleGroup, options) => {
 	};
 	return processRuleGroup(ruleGroup, true);
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleProcessorSpEL.ts
 const shouldNegate$1 = (op) => op.startsWith("not") || op.startsWith("doesnot");
-const wrapInNegation = (clause, negate$1) => negate$1 ? `!(${clause})` : clause;
+const wrapInNegation = (clause, negate) => negate ? `!(${clause})` : clause;
 const escapeSingleQuotes = (v, escapeQuotes) => typeof v !== "string" || !escapeQuotes ? `${v}` : v.replaceAll(`'`, `\\'`);
 /**
 * Default rule processor used by {@link formatQuery} for "spel" format.
@@ -1851,9 +1840,9 @@ const defaultRuleProcessorSpEL = (rule, opts = {}) => {
 		case "notnull": return `${field} != null`;
 		case "in":
 		case "notin": {
-			const negate$1 = shouldNegate$1(operatorTL) ? "!" : "";
+			const negate = shouldNegate$1(operatorTL) ? "!" : "";
 			const valueAsArray = toArray(value);
-			return valueAsArray.length > 0 ? `${negate$1}(${valueAsArray.map((val) => `${field} == ${valueIsField || shouldRenderAsNumber(val, parseNumbers) ? `${trimIfString(val)}` : `'${escapeSingleQuotes(val, escapeQuotes)}'`}`).join(" or ")})` : "";
+			return valueAsArray.length > 0 ? `${negate}(${valueAsArray.map((val) => `${field} == ${valueIsField || shouldRenderAsNumber(val, parseNumbers) ? `${trimIfString(val)}` : `'${escapeSingleQuotes(val, escapeQuotes)}'`}`).join(" or ")})` : "";
 		}
 		case "between":
 		case "notbetween": {
@@ -1876,7 +1865,6 @@ const defaultRuleProcessorSpEL = (rule, opts = {}) => {
 	}
 	return "";
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultValueProcessorByRule.ts
 const escapeStringValueQuotes$1 = (v, quoteChar, escapeQuotes) => escapeQuotes && typeof v === "string" ? v.replaceAll(`${quoteChar}`, `${quoteChar}${quoteChar}`) : v;
@@ -1932,7 +1920,6 @@ const defaultValueProcessorByRule = ({ operator, value, valueSource }, { escapeQ
 	if (typeof value === "boolean") return value ? "TRUE" : "FALSE";
 	return valueIsField ? wrapFieldName(value) : shouldRenderAsNumber(value, parseNumbers) ? `${trimIfString(value)}` : `${wrapAndEscape(value)}`;
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleProcessorDrizzle.ts
 /**
@@ -2029,7 +2016,6 @@ const defaultRuleProcessorDrizzle = (rule, _options) => {
 		default: return;
 	}
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleGroupProcessorDrizzle.ts
 /**
@@ -2073,7 +2059,6 @@ const defaultRuleGroupProcessorDrizzle = (ruleGroup, options, _meta) => (columns
 	};
 	return processRuleGroup(convertFromIC(ruleGroup), true);
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleGroupProcessorElasticSearch.ts
 /**
@@ -2102,7 +2087,6 @@ const defaultRuleGroupProcessorElasticSearch = (ruleGroup, options) => {
 	const processedRuleGroup = processRuleGroup(convertFromIC(ruleGroup));
 	return processedRuleGroup === false ? {} : processedRuleGroup;
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleGroupProcessorJSONata.ts
 /**
@@ -2158,7 +2142,6 @@ const defaultRuleGroupProcessorJSONata = (ruleGroup, options) => {
 	};
 	return processRuleGroup(ruleGroup, true);
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleGroupProcessorJsonLogic.ts
 /**
@@ -2188,7 +2171,6 @@ const defaultRuleGroupProcessorJsonLogic = (ruleGroup, options) => {
 	};
 	return processRuleGroup(query, true);
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleGroupProcessorLDAP.ts
 /**
@@ -2219,7 +2201,6 @@ const defaultRuleGroupProcessorLDAP = (ruleGroup, options) => {
 	};
 	return processRuleGroup(convertFromIC(ruleGroup), true);
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleGroupProcessorMongoDB.ts
 const isBracketed = (str) => str.startsWith("{") && str.endsWith("}");
@@ -2254,12 +2235,12 @@ const defaultRuleGroupProcessorMongoDB = (ruleGroup, options, meta) => {
 				fieldData
 			}, meta);
 		}).filter(Boolean);
-		return expressions.length > 0 ? expressions.length === 1 && !hasChildRules ? expressions[0] : `${combinator}:[${expressions.join(",")}]` : fallbackExpression;
+		const result = expressions.length > 0 ? expressions.length === 1 && !hasChildRules ? expressions[0] : `${combinator}:[${expressions.join(",")}]` : fallbackExpression;
+		return rg.not ? `"$not":${isBracketed(result) ? result : `{${result}}`}` : result;
 	};
 	const processedQuery = processRuleGroup(convertFromIC(ruleGroup), true);
 	return isBracketed(processedQuery) ? processedQuery : `{${processedQuery}}`;
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleGroupProcessorNL.ts
 /**
@@ -2323,7 +2304,6 @@ const defaultRuleGroupProcessorNL = (ruleGroup, options) => {
 	};
 	return processRuleGroup(ruleGroup, true);
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleGroupProcessorParameterized.ts
 /**
@@ -2412,7 +2392,6 @@ const defaultRuleGroupProcessorParameterized = (ruleGroup, options) => {
 		params: paramsNamed
 	};
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleGroupProcessorPrisma.ts
 /**
@@ -2455,7 +2434,6 @@ const defaultRuleGroupProcessorPrisma = (ruleGroup, options) => {
 	const result = processRuleGroup(convertFromIC(ruleGroup), true);
 	return ruleGroup.not ? { NOT: result } : result;
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleGroupProcessorSequelize.ts
 /**
@@ -2496,7 +2474,6 @@ const defaultRuleGroupProcessorSequelize = (ruleGroup, options) => {
 	};
 	return processRuleGroup(convertFromIC(ruleGroup), true);
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleGroupProcessorSQL.ts
 /**
@@ -2553,7 +2530,6 @@ const defaultRuleGroupProcessorSQL = (ruleGroup, options) => {
 	};
 	return processRuleGroup(ruleGroup, true);
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleProcessorElasticSearch.ts
 const rangeOperatorMap = {
@@ -2585,7 +2561,30 @@ const defaultRuleProcessorElasticSearch = (rule, options = {}) => {
 	const { field, operator, value, valueSource } = rule;
 	const { parseNumbers, preserveValueOrder } = options;
 	const operatorLC = lc(operator);
-	if (processMatchMode(rule)) return false;
+	const matchEval = processMatchMode(rule);
+	if (matchEval === false) return false;
+	else if (matchEval) {
+		const { mode } = matchEval;
+		const subQuery = defaultRuleGroupProcessorElasticSearch(transformQuery(rule.value, { ruleProcessor: (r) => ({
+			...r,
+			field: r.field ? `${field}.${r.field}` : field
+		}) }), options);
+		if (Object.keys(subQuery).length === 0) return false;
+		switch (mode) {
+			case "some": return { nested: {
+				path: field,
+				query: subQuery
+			} };
+			case "none": return { bool: { must_not: { nested: {
+				path: field,
+				query: subQuery
+			} } } };
+			case "all":
+			case "atleast":
+			case "atmost":
+			case "exactly": return false;
+		}
+	}
 	if (valueSource === "field") {
 		if (toArray(value).some((v) => typeof v !== "string")) return false;
 		const fieldForScript = escapeSQ(field);
@@ -2682,12 +2681,11 @@ const defaultRuleProcessorElasticSearch = (rule, options = {}) => {
 	}
 	return false;
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleProcessorJSONata.ts
 const shouldNegate = (op) => op.startsWith("not") || op.startsWith("doesnot");
 const quote = (v, escapeQuotes) => `"${typeof v !== "string" || !escapeQuotes ? `${v}` : v.replaceAll(`"`, `\\"`)}"`;
-const negate = (clause, negate$1) => negate$1 ? `$not(${clause})` : clause;
+const negate = (clause, neg) => neg ? `$not(${clause})` : clause;
 const escapeStringRegex = (s) => `${s}`.replaceAll(/[/$()*+.?[\\\]^{|}]/g, String.raw`\$&`).replaceAll("-", String.raw`\x2d`);
 /**
 * Default rule processor used by {@link formatQuery} for "jsonata" format.
@@ -2769,7 +2767,6 @@ const defaultRuleProcessorJSONata = (rule, options = {}) => {
 	}
 	return "";
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleProcessorJsonLogic.ts
 const convertOperator = (op) => op.replace(/^(=)$/, "$1=").replace(/^notnull$/i, "!=").replace(/^null$/i, "==");
@@ -2864,10 +2861,9 @@ const defaultRuleProcessorJsonLogic = (rule, options = {}) => {
 	}
 	return false;
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleProcessorLDAP.ts
-const negateIf = (clause, negate$1) => negate$1 ? `(!${clause})` : `${clause}`;
+const negateIf = (clause, negate) => negate ? `(!${clause})` : `${clause}`;
 const ldapEscape = (s) => `${trimIfString(s)}`.replaceAll(/[()&|=<>~*\\/]/g, (m) => `\\${m.codePointAt(0).toString(16)}`);
 /**
 * Default rule processor used by {@link formatQuery} for "ldap" format.
@@ -2916,7 +2912,6 @@ const defaultRuleProcessorLDAP = (rule, options = {}) => {
 	// istanbul ignore next
 	return "";
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultValueProcessorNL.ts
 const escapeStringValueQuotes = (v, quoteChar, escapeQuotes) => escapeQuotes && typeof v === "string" ? v.replaceAll(`${quoteChar}`, `${quoteChar}${quoteChar}`) : v;
@@ -2966,7 +2961,6 @@ const defaultValueProcessorNL = (rule, opts = {}) => {
 	if (typeof rule.value === "boolean") return rule.value ? trueTL : falseTL;
 	return valueIsField ? wrapFieldName(getOption(fields ?? [], rule.value)?.label ?? rule.value) : shouldRenderAsNumber(rule.value, parseNumbers) ? `${trimIfString(rule.value)}` : `${wrapAndEscape(rule.value)}`;
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleProcessorNL.ts
 /**
@@ -3076,7 +3070,6 @@ const defaultRuleProcessorNL = (rule, opts) => {
 	};
 	return normalizeConstituentWordOrder(wordOrder).map((term) => `${wordOrderMap[term]}`).join(" ").trim();
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleProcessorSQL.ts
 /**
@@ -3131,7 +3124,6 @@ const defaultRuleProcessorSQL = (rule, opts = {}) => {
 	if ((operatorLowerCase === "in" || operatorLowerCase === "not in" || operatorLowerCase === "between" || operatorLowerCase === "not between") && !value) return "";
 	return `${ruleField} ${operator} ${value}`.trim();
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleProcessorParameterized.ts
 /**
@@ -3236,7 +3228,6 @@ const defaultRuleProcessorParameterized = (rule, opts, meta) => {
 	}
 	return finalize(`${qPre}${rule.field}${qPost} ${sqlOperator} ${parameterized ? numberedParams ? `${paramPrefix}${processedParams.length + 1}` : "?" : `${paramPrefix}${paramName}`}`.trim());
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleProcessorPrisma.ts
 const processNumber = (value, fallback, parseNumbers) => shouldRenderAsNumber(value, !!parseNumbers || typeof value === "bigint") ? Number(parseNumber(value, { parseNumbers: !!parseNumbers })) : fallback;
@@ -3298,7 +3289,6 @@ const defaultRuleProcessorPrisma = (rule, options = {}) => {
 	}
 	return "";
 };
-
 //#endregion
 //#region src/utils/formatQuery/defaultRuleProcessorSequelize.ts
 /**
@@ -3365,7 +3355,6 @@ const defaultRuleProcessorSequelize = (rule, { parseNumbers, preserveValueOrder,
 		}
 	}
 };
-
 //#endregion
 //#region src/utils/formatQuery/formatQuery.ts
 /**
@@ -3454,8 +3443,8 @@ const defaultFormatQueryOptions = {
 	paramsKeepPrefix: false,
 	numberedParams: false,
 	preserveValueOrder: false,
-	placeholderFieldName: defaultPlaceholderFieldName,
-	placeholderOperatorName: defaultPlaceholderOperatorName,
+	placeholderFieldName: "~",
+	placeholderOperatorName: "~",
 	quoteValuesWith: "'",
 	concatOperator: "||",
 	preset: "ansi",
@@ -3560,7 +3549,7 @@ function formatQuery(ruleGroup, optionParam = {}) {
 	switch (format) {
 		case "json":
 		case "json_without_ids": {
-			const rg = parseNumbers ? produce(ruleGroup, (g) => numerifyValues(g, finalOptions)) : ruleGroup;
+			const rg = parseNumbers ? numerifyValues(ruleGroup, finalOptions) : ruleGroup;
 			if (format === "json_without_ids") return JSON.stringify(rg, (key, value) => key === "id" || key === "path" ? void 0 : bigIntJsonStringifyReplacer(key, value));
 			return JSON.stringify(rg, bigIntJsonStringifyReplacer, 2);
 		}
@@ -3582,7 +3571,6 @@ function formatQuery(ruleGroup, optionParam = {}) {
 		default: return "";
 	}
 }
-
 //#endregion
 //#region src/utils/formatQuery/index.ts
 const generateValueProcessor = (vpbr) => (field, operator, value, valueSource) => vpbr({
@@ -3633,7 +3621,6 @@ const defaultValueProcessorMongoDBByRule = defaultRuleProcessorMongoDB;
 * @group Export
 */
 const defaultValueProcessorSpELByRule = defaultRuleProcessorSpEL;
-
 //#endregion
 //#region src/utils/pathUtils.ts
 /**
@@ -3692,7 +3679,7 @@ const pathsAreEqual = (path1, path2) => path1.length === path2.length && path1.e
 * Determines if the first path is an ancestor of the second path. The first path must
 * be shorter and exactly match the second path up through the length of the first path.
 */
-const isAncestor = (maybeAncestor, path) => maybeAncestor.length < path.length && (/* @__PURE__ */ new RegExp(`^${maybeAncestor.join("-")}`)).test(path.join("-"));
+const isAncestor = (maybeAncestor, path) => maybeAncestor.length < path.length && new RegExp(`^${maybeAncestor.join("-")}`).test(path.join("-"));
 /**
 * Finds the deepest/longest path that two paths have in common.
 */
@@ -3725,11 +3712,9 @@ const pathIsDisabled = (path, query) => {
 	}
 	return disabled;
 };
-
 //#endregion
 //#region src/utils/generateAccessibleDescription.ts
 const generateAccessibleDescription = (params) => pathsAreEqual([], params.path) ? `Query builder` : `Rule group at path ${params.path.join("-")}`;
-
 //#endregion
 //#region src/utils/generateID.ts
 const cryptoModule = globalThis.crypto;
@@ -3764,7 +3749,6 @@ if (cryptoModule) {
 		};
 	}
 }
-
 //#endregion
 //#region src/utils/getMatchModesUtil.ts
 const dummyFD$1 = {
@@ -3792,7 +3776,6 @@ const getMatchModesUtil = (fieldData, getMatchModes) => {
 		label: mm
 	}) ?? [];
 };
-
 //#endregion
 //#region src/utils/getValidationClassNames.ts
 /**
@@ -3803,7 +3786,6 @@ const getValidationClassNames = (validationResult) => {
 	const valid = typeof validationResult === "boolean" ? validationResult : typeof validationResult === "object" && validationResult !== null ? validationResult.valid : null;
 	return typeof valid === "boolean" ? valid ? standardClassnames.valid : standardClassnames.invalid : "";
 };
-
 //#endregion
 //#region src/utils/getValueSourcesUtil.ts
 const defaultValueSourcesArray = [{
@@ -3836,18 +3818,22 @@ const getValueSourcesUtil = (fieldData, operator, getValueSources) => {
 		label: vs
 	});
 };
-
 //#endregion
 //#region src/utils/mergeAnyTranslations.ts
 /**
 * Merges any number of partial translations into a single definition.
 */
-const mergeAnyTranslations = (base, ...otherTranslations) => produce(base, (draft) => {
+const mergeAnyTranslations = (base, ...otherTranslations) => {
+	const result = { ...base };
 	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] });
-});
+	if (translations) for (const key of objectKeys(translations)) if (result[key]) result[key] = {
+		...result[key],
+		...translations[key]
+	};
+	else result[key] = { ...translations[key] };
+	return result;
+};
 const mergeAnyTranslation = (el, keyPropContextMap, defaults) => {
 	const finalKeys = objectEntries(keyPropContextMap).map(([key, [pT, cT]]) => [key, pT ?? cT ?? defaults?.[el]?.[key]]).filter((k) => !!k[1]);
 	if (finalKeys.length > 0 || defaults) {
@@ -3856,7 +3842,6 @@ const mergeAnyTranslation = (el, keyPropContextMap, defaults) => {
 		return { [el]: finalObject };
 	}
 };
-
 //#endregion
 //#region src/utils/mergeClassnames.ts
 const joinClassnamesByName = (name, args) => clsx(args.map((c) => clsx(c?.[name])));
@@ -3906,7 +3891,6 @@ const mergeClassnames = (...args) => ({
 	hasSubQuery: joinClassnamesByName("hasSubQuery", args),
 	loading: joinClassnamesByName("loading", args)
 });
-
 //#endregion
 //#region src/utils/preferProp.ts
 const preferPropDefaultTrue = (prop, context) => prop === false ? false : prop ? true : !(context === false);
@@ -3929,29 +3913,49 @@ const preferFlagProps = (props = {}, contextVals = {}, finalize) => objectEntrie
 	acc[key] = preferProp(def, props[key], contextVals[key], !finalize);
 	return acc;
 }, {});
-
 //#endregion
 //#region src/utils/prepareQueryObjects.ts
 /**
 * Ensures that a rule is valid by adding an `id` property if it does not already exist.
 */
-const prepareRule = (rule, { idGenerator = generateID } = {}) => produce(rule, (draft) => {
-	if (!draft.id) draft.id = idGenerator();
-	if (processMatchMode(draft)) draft.value = prepareRuleGroup(draft.value, { idGenerator });
-});
+const prepareRule = (rule, { idGenerator = generateID } = {}) => {
+	const needsId = !rule.id;
+	const hasMatchMode = processMatchMode(rule);
+	if (!needsId && !hasMatchMode) return rule;
+	return {
+		...rule,
+		...needsId && { id: idGenerator() },
+		...hasMatchMode && { value: prepareRuleGroup(rule.value, { idGenerator }) }
+	};
+};
 /**
 * Ensures that a rule group is valid by recursively adding an `id` property to the group itself
 * and all its rules and subgroups where one does not already exist.
 */
-const prepareRuleGroup = (queryObject, { idGenerator = generateID } = {}) => produce(queryObject, (draft) => {
-	if (!draft.id) draft.id = idGenerator();
-	draft.rules = draft.rules.map((r) => typeof r === "string" ? r : isRuleGroup(r) ? prepareRuleGroup(r, { idGenerator }) : prepareRule(r, { idGenerator }));
-});
+const prepareRuleGroup = (queryObject, { idGenerator = generateID } = {}) => {
+	const needsId = !queryObject.id;
+	let rulesChanged = false;
+	const newRules = [];
+	for (let i = 0; i < queryObject.rules.length; i++) {
+		const r = queryObject.rules[i];
+		if (typeof r === "string") newRules.push(r);
+		else {
+			const prepared = isRuleGroup(r) ? prepareRuleGroup(r, { idGenerator }) : prepareRule(r, { idGenerator });
+			newRules.push(prepared);
+			if (prepared !== r) rulesChanged = true;
+		}
+	}
+	if (!needsId && !rulesChanged) return queryObject;
+	return {
+		...queryObject,
+		...needsId && { id: idGenerator() },
+		rules: newRules
+	};
+};
 /**
 * Ensures that a rule or group is valid. See {@link prepareRule} and {@link prepareRuleGroup}.
 */
 const prepareRuleOrGroup = (rg, { idGenerator = generateID } = {}) => isRuleGroup(rg) ? prepareRuleGroup(rg, { idGenerator }) : prepareRule(rg, { idGenerator });
-
 //#endregion
 //#region src/utils/regenerateIDs.ts
 /**
@@ -3978,44 +3982,65 @@ const regenerateIDs = (subject, { idGenerator = generateID } = {}) => {
 	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
 //#region src/utils/queryTools.ts
 /**
-* Adds a rule or group to a query.
-* @returns The new query with the rule or group added.
+* Adds a rule or group to a query without mutating the original query.
+*
+* @returns A new query with the rule or group added.
+*
+* @group Query Tools
+*/
+const add = (query, ruleOrGroup, parentPathOrID, options = {}) => produce(query, (q) => addInPlace(q, ruleOrGroup, parentPathOrID, options));
+/**
+* Adds a rule or group to a query in place.
+*
+* @returns The query (mutated in place) with the rule or group added.
 *
 * @group Query Tools
 */
-const add = (query, ruleOrGroup, parentPathOrID, { combinators = defaultCombinators, combinatorPreceding, idGenerator = generateID } = {}) => produce(query, (draft) => {
-	const parent = Array.isArray(parentPathOrID) ? findPath(parentPathOrID, draft) : findID(parentPathOrID, draft);
-	if (!parent || !isRuleGroup(parent)) return;
+const addInPlace = (query, ruleOrGroup, parentPathOrID, options = {}) => {
+	const { combinators = defaultCombinators, combinatorPreceding, idGenerator = generateID } = options;
+	const parent = Array.isArray(parentPathOrID) ? findPath(parentPathOrID, query) : findID(parentPathOrID, query);
+	if (!parent || !isRuleGroup(parent)) return query;
 	if (isRuleGroupTypeIC(parent) && parent.rules.length > 0) {
 		const prevCombinator = parent.rules.at(-2);
 		parent.rules.push(combinatorPreceding ?? (typeof prevCombinator === "string" ? prevCombinator : getFirstOption(combinators)));
 	}
 	parent.rules.push(prepareRuleOrGroup(ruleOrGroup, { idGenerator }));
-});
+	return query;
+};
 /**
-* Updates a property of a rule or group within a query.
-* @returns The new query with the rule or group property updated.
+* Updates a property of a rule or group within a query without mutating the original query.
+*
+* @returns A new query with the rule or group property updated.
+*
+* @group Query Tools
+*/
+const update = (query, prop, value, pathOrID, options = {}) => produce(query, (q) => updateInPlace(q, prop, value, pathOrID, options));
+/**
+* Updates a property of a rule or group within a query in place.
+*
+* @returns The query (mutated in place) with the rule or group property updated.
 *
 * @group Query Tools
 */
-const update = (query, prop, value, pathOrID, { resetOnFieldChange = true, resetOnOperatorChange = false, getRuleDefaultOperator = () => "=", getValueSources = () => ["value"], getRuleDefaultValue = () => "", getMatchModes = () => [] } = {}) => produce(query, (draft) => {
-	const path = Array.isArray(pathOrID) ? pathOrID : getPathOfID(pathOrID, draft);
-	if (!path) return;
-	if (prop === "combinator" && !isRuleGroupType(draft)) {
-		const parentRules = findPath(getParentPath(path), draft).rules;
+const updateInPlace = (query, prop, value, pathOrID, options = {}) => {
+	const { resetOnFieldChange: _resetOnFieldChange = true, resetOnOperatorChange = false, getRuleDefaultOperator = () => "=", getValueSources = () => ["value"], getRuleDefaultValue = () => "", getMatchModes = () => [] } = options;
+	let resetOnFieldChange = _resetOnFieldChange;
+	const path = Array.isArray(pathOrID) ? pathOrID : getPathOfID(pathOrID, query);
+	if (!path) return query;
+	if (prop === "combinator" && !isRuleGroupType(query)) {
+		const parentRules = findPath(getParentPath(path), query).rules;
 		if (path.at(-1) % 2 === 1) parentRules[path.at(-1)] = value;
-		return;
+		return query;
 	}
-	const ruleOrGroup = findPath(path, draft);
-	if (!ruleOrGroup) return;
+	const ruleOrGroup = findPath(path, query);
+	if (!ruleOrGroup) return query;
 	const isGroup = isRuleGroup(ruleOrGroup);
-	if (ruleOrGroup[prop] === value) return;
+	if (ruleOrGroup[prop] === value) return query;
 	if (prop !== "valueSource") ruleOrGroup[prop] = value;
-	if (isGroup) return;
+	if (isGroup) return query;
 	let resetValueSource = false;
 	let resetValue = false;
 	if (prop === "field") {
@@ -4050,25 +4075,33 @@ const update = (query, prop, value, pathOrID, { resetOnFieldChange = true, reset
 		ruleOrGroup.valueSource = resetValueSource ? defaultValueSource : value;
 	}
 	if (resetValue) ruleOrGroup.value = getRuleDefaultValue(ruleOrGroup);
-});
+	return query;
+};
 /**
-* Removes a rule or group from a query.
-* @returns The new query with the rule or group removed.
+* Removes a rule or group from a query without mutating the original query.
+*
+* @returns A new query with the rule or group removed.
+*
+* @group Query Tools
+*/
+const remove = (query, pathOrID) => produce(query, (q) => removeInPlace(q, pathOrID));
+/**
+* Removes a rule or group from a query in place.
+*
+* @returns The query (mutated in place) with the rule or group removed.
 *
 * @group Query Tools
 */
-const remove = (query, pathOrID) => {
+const removeInPlace = (query, pathOrID) => {
 	const path = Array.isArray(pathOrID) ? pathOrID : getPathOfID(pathOrID, query);
-	if (!path) return query;
-	if (path.length === 0 || !isRuleGroupType(query) && !findPath(path, query)) return query;
-	return produce(query, (draft) => {
-		const index = path.at(-1);
-		const parent = findPath(getParentPath(path), draft);
-		if (parent && isRuleGroup(parent)) if (!isRuleGroupType(parent) && parent.rules.length > 1) {
-			const idxStartDelete = index === 0 ? 0 : index - 1;
-			parent.rules.splice(idxStartDelete, 2);
-		} else parent.rules.splice(index, 1);
-	});
+	if (!path || path.length === 0 || !isRuleGroupType(query) && !findPath(path, query)) return query;
+	const index = path.at(-1);
+	const parent = findPath(getParentPath(path), query);
+	if (parent && isRuleGroup(parent)) if (!isRuleGroupType(parent) && parent.rules.length > 1) {
+		const idxStartDelete = index === 0 ? 0 : index - 1;
+		parent.rules.splice(idxStartDelete, 2);
+	} else parent.rules.splice(index, 1);
+	return query;
 };
 const getNextPath = (query, currentPath, newPathOrShiftDirection) => {
 	if (Array.isArray(newPathOrShiftDirection)) return newPathOrShiftDirection;
@@ -4095,59 +4128,79 @@ const getNextPath = (query, currentPath, newPathOrShiftDirection) => {
 	return currentPath;
 };
 /**
-* Moves a rule or group from one path to another. In the options parameter, pass
-* `{ clone: true }` to copy instead of move.
-* @returns The new query with the rule or group moved or cloned.
+* Moves a rule or group from one path to another without mutating the original query.
+* In the options parameter, pass `{ clone: true }` to copy instead of move.
+*
+* @returns A new query with the rule or group moved or cloned.
+*
+* @group Query Tools
+*/
+const move = (query, oldPathOrID, newPath, options = {}) => produce(query, (q) => moveInPlace(q, oldPathOrID, newPath, options));
+/**
+* Moves a rule or group from one path to another in place.
+* In the options parameter, pass `{ clone: true }` to copy instead of move.
+*
+* @returns The query (mutated in place) with the rule or group moved or cloned.
 *
 * @group Query Tools
 */
-const move = (query, oldPathOrID, newPath, { clone = false, combinators = defaultCombinators, idGenerator = generateID } = {}) => {
+const moveInPlace = (query, oldPathOrID, newPath, options = {}) => {
+	const { clone = false, combinators = defaultCombinators, idGenerator = generateID } = options;
 	const oldPath = Array.isArray(oldPathOrID) ? oldPathOrID : getPathOfID(oldPathOrID, query);
 	if (!oldPath) return query;
 	const nextPath = getNextPath(query, oldPath, newPath);
 	if (oldPath.length === 0 || pathsAreEqual(oldPath, nextPath) || !findPath(getParentPath(nextPath), query)) return query;
 	const ruleOrGroupOriginal = findPath(oldPath, query);
 	if (!ruleOrGroupOriginal) return query;
-	const ruleOrGroup = clone ? regenerateIDs(ruleOrGroupOriginal, { idGenerator }) : ruleOrGroupOriginal;
-	return produce(query, (draft) => {
-		const independentCombinators = isRuleGroupTypeIC(draft);
-		const parentOfRuleToRemove = findPath(getParentPath(oldPath), draft);
-		const ruleToRemoveIndex = oldPath.at(-1);
-		const oldPrevCombinator = independentCombinators && ruleToRemoveIndex > 0 ? parentOfRuleToRemove.rules[ruleToRemoveIndex - 1] : null;
-		const oldNextCombinator = independentCombinators && ruleToRemoveIndex < parentOfRuleToRemove.rules.length - 1 ? parentOfRuleToRemove.rules[ruleToRemoveIndex + 1] : null;
-		if (!clone) {
-			const idxStartDelete = independentCombinators ? Math.max(0, ruleToRemoveIndex - 1) : ruleToRemoveIndex;
-			const deleteLength = independentCombinators ? 2 : 1;
-			parentOfRuleToRemove.rules.splice(idxStartDelete, deleteLength);
-		}
-		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 parentToInsertInto = findPath(getParentPath(newNewPath), draft);
-		const newIndex = newNewPath.at(-1);
-		/**
-		* This function 1) glosses over the need for type assertions to splice directly
-		* into `parentToInsertInto.rules`, and 2) shortens the actual insertion code.
-		*/
-		const insertRuleOrGroup = (...args) => parentToInsertInto.rules.splice(newIndex, 0, ...args);
-		if (parentToInsertInto.rules.length === 0 || !independentCombinators) insertRuleOrGroup(ruleOrGroup);
-		else if (newIndex === 0) if (ruleToRemoveIndex === 0 && oldNextCombinator) insertRuleOrGroup(ruleOrGroup, oldNextCombinator);
-		else insertRuleOrGroup(ruleOrGroup, parentToInsertInto.rules[1] ?? oldPrevCombinator ?? getFirstOption(combinators));
-		else if (oldPrevCombinator) insertRuleOrGroup(oldPrevCombinator, ruleOrGroup);
-		else insertRuleOrGroup(parentToInsertInto.rules[newIndex - 2] ?? oldNextCombinator ?? getFirstOption(combinators), ruleOrGroup);
-	});
+	const ruleOrGroup = clone ? regenerateIDs(isDraft(ruleOrGroupOriginal) ? current(ruleOrGroupOriginal) : ruleOrGroupOriginal, { idGenerator }) : ruleOrGroupOriginal;
+	const independentCombinators = isRuleGroupTypeIC(query);
+	const parentOfRuleToRemove = findPath(getParentPath(oldPath), query);
+	const ruleToRemoveIndex = oldPath.at(-1);
+	const oldPrevCombinator = independentCombinators && ruleToRemoveIndex > 0 ? parentOfRuleToRemove.rules[ruleToRemoveIndex - 1] : null;
+	const oldNextCombinator = independentCombinators && ruleToRemoveIndex < parentOfRuleToRemove.rules.length - 1 ? parentOfRuleToRemove.rules[ruleToRemoveIndex + 1] : null;
+	if (!clone) {
+		const idxStartDelete = independentCombinators ? Math.max(0, ruleToRemoveIndex - 1) : ruleToRemoveIndex;
+		const deleteLength = independentCombinators ? 2 : 1;
+		parentOfRuleToRemove.rules.splice(idxStartDelete, deleteLength);
+	}
+	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 parentToInsertInto = findPath(getParentPath(newNewPath), query);
+	const newIndex = newNewPath.at(-1);
+	/**
+	* This function 1) glosses over the need for type assertions to splice directly
+	* into `parentToInsertInto.rules`, and 2) shortens the actual insertion code.
+	*/
+	const insertRuleOrGroup = (...args) => parentToInsertInto.rules.splice(newIndex, 0, ...args);
+	if (parentToInsertInto.rules.length === 0 || !independentCombinators) insertRuleOrGroup(ruleOrGroup);
+	else if (newIndex === 0) if (ruleToRemoveIndex === 0 && oldNextCombinator) insertRuleOrGroup(ruleOrGroup, oldNextCombinator);
+	else insertRuleOrGroup(ruleOrGroup, parentToInsertInto.rules[1] ?? oldPrevCombinator ?? getFirstOption(combinators));
+	else if (oldPrevCombinator) insertRuleOrGroup(oldPrevCombinator, ruleOrGroup);
+	else insertRuleOrGroup(parentToInsertInto.rules[newIndex - 2] ?? oldNextCombinator ?? getFirstOption(combinators), ruleOrGroup);
+	return query;
 };
 /**
-* Inserts a rule or group into a query.
-* @returns The new query with the rule or group inserted.
+* Inserts a rule or group into a query without mutating the original query.
+*
+* @returns A new query with the rule or group inserted.
+*
+* @group Query Tools
+*/
+const insert = (query, ruleOrGroup, path, options = {}) => produce(query, (q) => insertInPlace(q, ruleOrGroup, path, options));
+/**
+* Inserts a rule or group into a query in place.
+*
+* @returns The query (mutated in place) with the rule or group inserted.
 *
 * @group Query Tools
 */
-const insert = (query, ruleOrGroup, path, { combinators = defaultCombinators, combinatorPreceding, combinatorSucceeding, idGenerator = generateID, replace = false } = {}) => produce(query, (draft) => {
-	const parentToInsertInto = findPath(getParentPath(path), draft);
-	if (!parentToInsertInto || !isRuleGroup(parentToInsertInto)) return;
+const insertInPlace = (query, ruleOrGroup, path, options = {}) => {
+	const { combinators = defaultCombinators, combinatorPreceding, combinatorSucceeding, idGenerator = generateID, replace = false } = options;
+	const parentToInsertInto = findPath(getParentPath(path), query);
+	if (!parentToInsertInto || !isRuleGroup(parentToInsertInto)) return query;
 	const rorg = regenerateIDs(ruleOrGroup, { idGenerator });
-	const independentCombinators = isRuleGroupTypeIC(draft);
+	const independentCombinators = isRuleGroupTypeIC(query);
 	const newIndex = path.at(-1);
 	/**
 	* This function 1) glosses over the need for type assertions to splice directly
@@ -4163,17 +4216,29 @@ const insert = (query, ruleOrGroup, path, { combinators = defaultCombinators, co
 		if (combinatorPreceding) insertRuleOrGroup(normalizedNewIndex, combinatorPreceding, rorg);
 		else insertRuleOrGroup(normalizedNewIndex, parentToInsertInto.rules[normalizedNewIndex - 2] ?? combinatorSucceeding ?? getFirstOption(combinators), rorg);
 	}
-});
+	return query;
+};
+/**
+* Creates a new group at a target path with its `rules` array containing the current
+* objects at the target path and the source path without mutating the original query.
+* In the options parameter, pass `{ clone: true }` to copy the source rule/group instead of move.
+*
+* @returns A new query with the rules or groups grouped.
+*
+* @group Query Tools
+*/
+const group = (query, sourcePathOrID, targetPathOrID, options = {}) => produce(query, (q) => groupInPlace(q, sourcePathOrID, targetPathOrID, options));
 /**
 * Creates a new group at a target path with its `rules` array containing the current
-* objects at the target path and the source path. In the options parameter, pass
-* `{ clone: true }` to copy the source rule/group instead of move.
+* objects at the target path and the source path in place.
+* In the options parameter, pass `{ clone: true }` to copy the source rule/group instead of move.
 *
-* @returns The new query with the rules or groups grouped.
+* @returns The query (mutated in place) with the rules or groups grouped.
 *
 * @group Query Tools
 */
-const group = (query, sourcePathOrID, targetPathOrID, { clone = false, combinators = defaultCombinators, idGenerator = generateID } = {}) => {
+const groupInPlace = (query, sourcePathOrID, targetPathOrID, options = {}) => {
+	const { clone = false, combinators = defaultCombinators, idGenerator = generateID } = options;
 	const sourcePath = Array.isArray(sourcePathOrID) ? sourcePathOrID : getPathOfID(sourcePathOrID, query);
 	const targetPath = Array.isArray(targetPathOrID) ? targetPathOrID : getPathOfID(targetPathOrID, query);
 	if (!sourcePath || !targetPath) return query;
@@ -4182,32 +4247,31 @@ const group = (query, sourcePathOrID, targetPathOrID, { clone = false, combinato
 	const sourceRuleOrGroupOriginal = findPath(sourcePath, query);
 	const targetRuleOrGroup = findPath(targetPath, query);
 	if (!sourceRuleOrGroupOriginal || !targetRuleOrGroup) return query;
-	const sourceRuleOrGroup = clone ? regenerateIDs(sourceRuleOrGroupOriginal, { idGenerator }) : sourceRuleOrGroupOriginal;
-	return produce(query, (draft) => {
-		const independentCombinators = isRuleGroupTypeIC(draft);
-		const parentOfRuleToRemove = findPath(getParentPath(sourcePath), draft);
-		const ruleToRemoveIndex = sourcePath.at(-1);
-		if (!clone) {
-			const idxStartDelete = independentCombinators ? Math.max(0, ruleToRemoveIndex - 1) : ruleToRemoveIndex;
-			const deleteLength = independentCombinators ? 2 : 1;
-			parentOfRuleToRemove.rules.splice(idxStartDelete, deleteLength);
-		}
-		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 parentOfTargetPath = findPath(getParentPath(newNewPath), draft);
-		const targetPathIndex = newNewPath.at(-1);
-		parentOfTargetPath.rules.splice(targetPathIndex, 1, prepareRuleOrGroup(independentCombinators ? { rules: [
-			targetRuleOrGroup,
-			getFirstOption(combinators),
-			sourceRuleOrGroup
-		] } : {
-			combinator: getFirstOption(combinators),
-			rules: [targetRuleOrGroup, sourceRuleOrGroup]
-		}, { idGenerator }));
-	});
+	const sourceRuleOrGroup = clone ? regenerateIDs(isDraft(sourceRuleOrGroupOriginal) ? current(sourceRuleOrGroupOriginal) : sourceRuleOrGroupOriginal, { idGenerator }) : sourceRuleOrGroupOriginal;
+	const independentCombinators = isRuleGroupTypeIC(query);
+	const parentOfRuleToRemove = findPath(getParentPath(sourcePath), query);
+	const ruleToRemoveIndex = sourcePath.at(-1);
+	if (!clone) {
+		const idxStartDelete = independentCombinators ? Math.max(0, ruleToRemoveIndex - 1) : ruleToRemoveIndex;
+		const deleteLength = independentCombinators ? 2 : 1;
+		parentOfRuleToRemove.rules.splice(idxStartDelete, deleteLength);
+	}
+	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 parentOfTargetPath = findPath(getParentPath(newNewPath), query);
+	const targetPathIndex = newNewPath.at(-1);
+	parentOfTargetPath.rules.splice(targetPathIndex, 1, prepareRuleOrGroup(independentCombinators ? { rules: [
+		targetRuleOrGroup,
+		getFirstOption(combinators),
+		sourceRuleOrGroup
+	] } : {
+		combinator: getFirstOption(combinators),
+		rules: [targetRuleOrGroup, sourceRuleOrGroup]
+	}, { idGenerator }));
+	return query;
 };
-
 //#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, 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, preferAnyProp, preferFlagProps, preferProp, prepareOptionList, prepareRule, prepareRuleGroup, prepareRuleOrGroup, prismaFallback, prismaOperators, processMatchMode, queryBuilderFlagDefaults, regenerateID, regenerateIDs, remove, rootPath, shouldRenderAsNumber, splitBy, sqlDialectPresets, standardClassnames, toArray, toFlatOptionArray, toFullOption, toFullOptionList, toFullOptionMap, transformQuery, trimIfString, uniqByIdentifier, uniqByName, uniqOptGroups, uniqOptList, update };
+export { LogType, TestID, add, addInPlace, 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, groupInPlace, groupInvalidReasons, insert, insertInPlace, 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, moveInPlace, normalizeConstituentWordOrder, nullFreeArray, nullOrUndefinedOrEmpty, numericRegex, numerifyValues, objectEntries, objectKeys, parseNumber, pathIsDisabled, pathsAreEqual, preferAnyProp, preferFlagProps, preferProp, prepareOptionList, prepareRule, prepareRuleGroup, prepareRuleOrGroup, prismaFallback, prismaOperators, processMatchMode, queryBuilderFlagDefaults, regenerateID, regenerateIDs, remove, removeInPlace, rootPath, shouldRenderAsNumber, splitBy, sqlDialectPresets, standardClassnames, toArray, toFlatOptionArray, toFullOption, toFullOptionList, toFullOptionMap, transformQuery, trimIfString, uniqByIdentifier, uniqByName, uniqOptGroups, uniqOptList, update, updateInPlace };
+
 //# sourceMappingURL=react-querybuilder_core.mjs.map