@react-querybuilder/core 8.20.2 → 8.21.0

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

@@ -322,6 +322,50 @@ const defaultOperatorNegationMap = {
 	null: "notNull"
 };
 /**
+* Relational/comparison operators (`=`, `!=`, `<`, `>`, `<=`, `>=`).
+*
+* @group Defaults
+*/
+const relationalOperators = /* @__PURE__ */ new Set([
+	"=",
+	"!=",
+	"<",
+	">",
+	"<=",
+	">="
+]);
+/**
+* Substring/text-matching operators (`contains`, `beginsWith`, `endsWith`, and negations).
+*
+* @group Defaults
+*/
+const substringOperators = /* @__PURE__ */ new Set([
+	"contains",
+	"beginsWith",
+	"endsWith",
+	"doesNotContain",
+	"doesNotBeginWith",
+	"doesNotEndWith"
+]);
+/**
+* Null-check operators (`null`, `notNull`).
+*
+* @group Defaults
+*/
+const nullOperators = /* @__PURE__ */ new Set(["null", "notNull"]);
+/**
+* List-membership operators (`in`, `notIn`).
+*
+* @group Defaults
+*/
+const inOperators = /* @__PURE__ */ new Set(["in", "notIn"]);
+/**
+* Range operators (`between`, `notBetween`).
+*
+* @group Defaults
+*/
+const betweenOperators = /* @__PURE__ */ new Set(["between", "notBetween"]);
+/**
 * Default combinator list.
 *
 * @group Defaults
@@ -674,7 +718,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.137.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -684,7 +728,7 @@ function _typeof(o) {
 	}, _typeof(o);
 }
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -696,13 +740,13 @@ function toPrimitive(t, r) {
 	return ("string" === r ? String : Number)(t);
 }
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -712,7 +756,7 @@ function _defineProperty(e, r, t) {
 	}) : e[r] = t, e;
 }
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/objectSpread2.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/objectSpread2.js
 function ownKeys(e, r) {
 	var t = Object.keys(e);
 	if (Object.getOwnPropertySymbols) {
@@ -735,7 +779,7 @@ function _objectSpread2(e) {
 	return e;
 }
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/objectWithoutPropertiesLoose.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/objectWithoutPropertiesLoose.js
 function _objectWithoutPropertiesLoose(r, e) {
 	if (null == r) return {};
 	var t = {};
@@ -746,7 +790,7 @@ function _objectWithoutPropertiesLoose(r, e) {
 	return t;
 }
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/objectWithoutProperties.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/objectWithoutProperties.js
 function _objectWithoutProperties(e, t) {
 	if (null == e) return {};
 	var o, r, i = _objectWithoutPropertiesLoose(e, t);
@@ -1254,6 +1298,51 @@ const mapSQLOperator = (rqbOperator) => {
 	}
 };
 /**
+* Returns a preset-aware SQL string-concatenation function. Emits `CONCAT(a, b, ...)` when
+* `concatOperator` is `"CONCAT"` (case-insensitive), otherwise joins with the infix operator
+* (e.g. `a || b`, `a + b`).
+*
+* @group Export
+*/
+const getSQLConcat = (concatOperator = "||") => (...values) => concatOperator.toUpperCase() === "CONCAT" ? `CONCAT(${values.join(", ")})` : values.join(` ${concatOperator} `);
+/**
+* Returns the `[prefix, suffix]` `LIKE` wildcards for a string-match operator (e.g. `contains`
+* → `['%', '%']`, `beginsWith` → `['', '%']`, `endsWith` → `['%', '']`). Unknown operators
+* yield `['', '']`.
+*
+* @group Export
+*/
+const getLikeWildcards = (operatorLC) => {
+	switch (operatorLC) {
+		case "contains":
+		case "doesnotcontain": return ["%", "%"];
+		case "beginswith":
+		case "doesnotbeginwith": return ["", "%"];
+		case "endswith":
+		case "doesnotendwith": return ["%", ""];
+		default: return ["", ""];
+	}
+};
+/**
+* Wraps an already-serialized SQL fragment (a quoted field name or an expression) with the
+* `LIKE` wildcards for the given (lowercase) string-match operator, concatenating the literal
+* `%` markers via the preset-aware {@link getSQLConcat}. Returns the fragment untouched for
+* operators without wildcards.
+*
+* @group Export
+*/
+const wrapLikeFragment = (fragment, operatorLC, { concatOperator = "||", quoteValuesWith, wrapValueWith = ["", ""] } = {}) => {
+	const [pre, post] = getLikeWildcards(operatorLC);
+	const quoteChar = quoteValuesWith || `'`;
+	const quote = (p) => `${wrapValueWith[0]}${quoteChar}${p}${quoteChar}${wrapValueWith[1]}`;
+	const parts = [
+		pre && quote(pre),
+		fragment,
+		post && quote(post)
+	].filter(Boolean);
+	return parts.length > 1 ? getSQLConcat(concatOperator)(...parts) : fragment;
+};
+/**
 * Maps a (lowercase) {@link DefaultOperatorName} to a MongoDB operator.
 *
 * @group Export
@@ -1405,6 +1494,27 @@ const normalizeConstituentWordOrder = (input) => {
 	return result;
 };
 /**
+* Prefixes a named-parameter value with the given `paramPrefix` unless the value already
+* begins with it. Used by {@link formatQuery} to render rules whose `valueSource` is
+* `"parameter"` (e.g. `"p1"` with prefix `":"` → `":p1"`; `":p1"` → `":p1"`).
+*
+* @group Export
+*/
+const withParamPrefix = (value, paramPrefix = ":") => {
+	const v = `${value !== null && value !== void 0 ? value : ""}`;
+	return paramPrefix && v.startsWith(paramPrefix) ? v : `${paramPrefix}${v}`;
+};
+/**
+* Strips a leading `paramPrefix` from a named-parameter value if present. Inverse of
+* {@link withParamPrefix}; used to normalize parameter names for validation/lookup.
+*
+* @group Export
+*/
+const stripParamPrefix = (value, paramPrefix = ":") => {
+	const v = `${value !== null && value !== void 0 ? value : ""}`;
+	return paramPrefix && v.startsWith(paramPrefix) ? v.slice(paramPrefix.length) : v;
+};
+/**
 * Default translations used by {@link formatQuery} for "natural_language" format.
 *
 * @group Export
@@ -1547,7 +1657,7 @@ const escapeDoubleQuotes$1 = (v, escapeQuotes) => typeof v !== "string" || !esca
 const defaultRuleProcessorCEL = (rule, opts = {}) => {
 	const { escapeQuotes, parseNumbers, preserveValueOrder } = opts;
 	const { field, operator, value, valueSource } = rule;
-	const valueIsField = valueSource === "field";
+	const valueIsField = valueSource === "field" || valueSource === "parameter";
 	const operatorTL = lc(operator === "=" ? "==" : operator);
 	const useBareValue = typeof value === "number" || typeof value === "boolean" || typeof value === "bigint" || shouldRenderAsNumber(value, parseNumbers);
 	const matchEval = processMatchMode(rule);
@@ -1854,7 +1964,7 @@ const escapeSingleQuotes$2 = (v, escapeQuotes) => typeof v !== "string" || !esca
 const defaultRuleProcessorSpEL = (rule, opts = {}) => {
 	const { field, operator, value, valueSource } = rule;
 	const { escapeQuotes, parseNumbers, preserveValueOrder } = opts;
-	const valueIsField = valueSource === "field";
+	const valueIsField = valueSource === "field" || valueSource === "parameter";
 	const operatorTL = lc(operator === "=" ? "==" : operator);
 	const useBareValue = typeof value === "number" || typeof value === "boolean" || typeof value === "bigint" || shouldRenderAsNumber(value, parseNumbers);
 	const matchEval = processMatchMode(rule);
@@ -1885,11 +1995,20 @@ const defaultRuleProcessorSpEL = (rule, opts = {}) => {
 		case ">":
 		case ">=": return `${field} ${operatorTL} ${valueIsField || useBareValue ? trimIfString(value) : `'${escapeSingleQuotes$2(value, escapeQuotes)}'`}`;
 		case "contains":
-		case "doesnotcontain": return wrapInNegation(`${field} matches ${valueIsField || useBareValue ? trimIfString(value) : `'${escapeSingleQuotes$2(value, escapeQuotes)}'`}`, shouldNegate$1(operatorTL));
+		case "doesnotcontain": {
+			const valueTL = valueIsField ? `'.*'.concat(${trimIfString(value)}).concat('.*')` : `'.*${escapeSingleQuotes$2(value, escapeQuotes)}.*'`;
+			return wrapInNegation(`${field} matches ${valueTL}`, shouldNegate$1(operatorTL));
+		}
 		case "beginswith":
-		case "doesnotbeginwith": return wrapInNegation(`${field} matches ${valueIsField ? `'^'.concat(${trimIfString(value)})` : `'${typeof value === "string" && !value.startsWith("^") || useBareValue ? "^" : ""}${escapeSingleQuotes$2(value, escapeQuotes)}'`}`, shouldNegate$1(operatorTL));
+		case "doesnotbeginwith": {
+			const valueTL = valueIsField ? `'^'.concat(${trimIfString(value)}).concat('.*')` : `'${typeof value === "string" && !value.startsWith("^") || useBareValue ? "^" : ""}${escapeSingleQuotes$2(value, escapeQuotes)}.*'`;
+			return wrapInNegation(`${field} matches ${valueTL}`, shouldNegate$1(operatorTL));
+		}
 		case "endswith":
-		case "doesnotendwith": return wrapInNegation(`${field} matches ${valueIsField ? `${trimIfString(value)}.concat('$')` : `'${escapeSingleQuotes$2(value, escapeQuotes)}${typeof value === "string" && !value.endsWith("$") || useBareValue ? "$" : ""}'`}`, shouldNegate$1(operatorTL));
+		case "doesnotendwith": {
+			const valueTL = valueIsField ? `'.*'.concat(${trimIfString(value)}).concat('$')` : `'.*${escapeSingleQuotes$2(value, escapeQuotes)}${typeof value === "string" && !value.endsWith("$") || useBareValue ? "$" : ""}'`;
+			return wrapInNegation(`${field} matches ${valueTL}`, shouldNegate$1(operatorTL));
+		}
 		case "null": return `${field} == null`;
 		case "notnull": return `${field} != null`;
 		case "in":
@@ -1927,7 +2046,36 @@ const escapeStringValueQuotes$1 = (v, quoteChar, escapeQuotes) => escapeQuotes &
 *
 * @group Export
 */
-const defaultValueProcessorByRule = ({ operator, value, valueSource }, { escapeQuotes, parseNumbers, preserveValueOrder, quoteFieldNamesWith, quoteValuesWith, concatOperator = "||", fieldIdentifierSeparator, wrapValueWith = ["", ""], translations } = {}) => {
+const defaultValueProcessorByRule = ({ operator, value, valueSource }, { escapeQuotes, parseNumbers, preserveValueOrder, quoteFieldNamesWith, quoteValuesWith, concatOperator = "||", fieldIdentifierSeparator, paramPrefix, wrapValueWith = ["", ""], translations } = {}) => {
+	if (valueSource === "parameter") {
+		const operatorLowerCase = lc(operator);
+		if (operatorLowerCase === "between" || operatorLowerCase === "notbetween") {
+			var _ref, _translations$between;
+			const valueAsArray = toArray(value, { retainEmptyStrings: true });
+			if (valueAsArray.length < 2 || !isValidValue(valueAsArray[0]) || !isValidValue(valueAsArray[1])) return "";
+			const [first, second] = valueAsArray;
+			return [withParamPrefix(first, paramPrefix), withParamPrefix(second, paramPrefix)].join(` ${(_ref = (_translations$between = translations === null || translations === void 0 ? void 0 : translations.betweenAnd) !== null && _translations$between !== void 0 ? _translations$between : translations === null || translations === void 0 ? void 0 : translations.and) !== null && _ref !== void 0 ? _ref : "and"} `);
+		}
+		if (operatorLowerCase === "in" || operatorLowerCase === "notin") {
+			const valueAsArray = toArray(value);
+			if (valueAsArray.length === 0) return "";
+			return `(${valueAsArray.map((v) => withParamPrefix(v, paramPrefix)).join(", ")})`;
+		}
+		const paramRef = withParamPrefix(value, paramPrefix);
+		switch (operatorLowerCase) {
+			case "contains":
+			case "doesnotcontain":
+			case "beginswith":
+			case "doesnotbeginwith":
+			case "endswith":
+			case "doesnotendwith": return wrapLikeFragment(paramRef, operatorLowerCase, {
+				concatOperator,
+				quoteValuesWith,
+				wrapValueWith
+			});
+		}
+		return paramRef;
+	}
 	const valueIsField = valueSource === "field";
 	const operatorLowerCase = lc(operator);
 	const quoteChar = quoteValuesWith || "'";
@@ -1938,7 +2086,11 @@ const defaultValueProcessorByRule = ({ operator, value, valueSource }, { escapeQ
 		quoteFieldNamesWith,
 		fieldIdentifierSeparator
 	});
-	const concat = (...values) => concatOperator.toUpperCase() === "CONCAT" ? `CONCAT(${values.join(", ")})` : values.join(` ${concatOperator} `);
+	const likeOpts = {
+		concatOperator,
+		quoteValuesWith,
+		wrapValueWith
+	};
 	switch (operatorLowerCase) {
 		case "null":
 		case "notnull": return "";
@@ -1950,7 +2102,7 @@ const defaultValueProcessorByRule = ({ operator, value, valueSource }, { escapeQ
 		}
 		case "between":
 		case "notbetween": {
-			var _ref, _translations$between;
+			var _ref2, _translations$between2;
 			const valueAsArray = toArray(value, { retainEmptyStrings: true });
 			if (valueAsArray.length < 2 || !isValidValue(valueAsArray[0]) || !isValidValue(valueAsArray[1])) return "";
 			const [first, second] = valueAsArray;
@@ -1963,14 +2115,14 @@ const defaultValueProcessorByRule = ({ operator, value, valueSource }, { escapeQ
 				valsOneAndTwoOnly[0] = secondNum;
 				valsOneAndTwoOnly[1] = firstNum;
 			}
-			return (valueIsField ? valsOneAndTwoOnly.map((v) => wrapFieldName(v)) : valsOneAndTwoOnly.every((v) => shouldRenderAsNumber(v, parseNumbers)) ? valsOneAndTwoOnly.map((v) => parseNumber(v, { parseNumbers: "strict" })) : valsOneAndTwoOnly.map((v) => wrapAndEscape(v))).join(` ${(_ref = (_translations$between = translations === null || translations === void 0 ? void 0 : translations.betweenAnd) !== null && _translations$between !== void 0 ? _translations$between : translations === null || translations === void 0 ? void 0 : translations.and) !== null && _ref !== void 0 ? _ref : "and"} `);
+			return (valueIsField ? valsOneAndTwoOnly.map((v) => wrapFieldName(v)) : valsOneAndTwoOnly.every((v) => shouldRenderAsNumber(v, parseNumbers)) ? valsOneAndTwoOnly.map((v) => parseNumber(v, { parseNumbers: "strict" })) : valsOneAndTwoOnly.map((v) => wrapAndEscape(v))).join(` ${(_ref2 = (_translations$between2 = translations === null || translations === void 0 ? void 0 : translations.betweenAnd) !== null && _translations$between2 !== void 0 ? _translations$between2 : translations === null || translations === void 0 ? void 0 : translations.and) !== null && _ref2 !== void 0 ? _ref2 : "and"} `);
 		}
 		case "contains":
-		case "doesnotcontain": return valueIsField ? concat(quoteValue("%"), wrapFieldName(value), quoteValue("%")) : quoteValue(`%${escapeValue(value)}%`);
+		case "doesnotcontain": return valueIsField ? wrapLikeFragment(wrapFieldName(value), operatorLowerCase, likeOpts) : quoteValue(`%${escapeValue(value)}%`);
 		case "beginswith":
-		case "doesnotbeginwith": return valueIsField ? concat(wrapFieldName(value), quoteValue("%")) : quoteValue(`${escapeValue(value)}%`);
+		case "doesnotbeginwith": return valueIsField ? wrapLikeFragment(wrapFieldName(value), operatorLowerCase, likeOpts) : quoteValue(`${escapeValue(value)}%`);
 		case "endswith":
-		case "doesnotendwith": return valueIsField ? concat(quoteValue("%"), wrapFieldName(value)) : quoteValue(`%${escapeValue(value)}`);
+		case "doesnotendwith": return valueIsField ? wrapLikeFragment(wrapFieldName(value), operatorLowerCase, likeOpts) : quoteValue(`%${escapeValue(value)}`);
 	}
 	if (typeof value === "boolean") return value ? "TRUE" : "FALSE";
 	return valueIsField ? wrapFieldName(value) : shouldRenderAsNumber(value, parseNumbers) ? `${trimIfString(value)}` : `${wrapAndEscape(value)}`;
@@ -3538,7 +3690,10 @@ const defaultRuleProcessorJsonLogic = (rule, options = {}) => {
 		case "null":
 		case "notnull": return { [`${operatorLC === "notnull" ? "!" : "="}=`]: [fieldObject, null] };
 		case "in":
-		case "notin": return negateIfNotOp(operatorLC, { in: [fieldObject, toArray(value).map((v) => fieldOrNumberRenderer(v))] });
+		case "notin": {
+			const valueAsArray = toArray(value).map((v) => fieldOrNumberRenderer(v));
+			return negateIfNotOp(operatorLC, { in: [fieldObject, valueAsArray] });
+		}
 		case "between":
 		case "notbetween": {
 			const valueAsArray = toArray(value);
@@ -3569,11 +3724,20 @@ const defaultRuleProcessorJsonLogic = (rule, options = {}) => {
 			return false;
 		}
 		case "contains":
-		case "doesnotcontain": return negateIfNotOp(operatorLC, { in: [fieldOrNumberRenderer(value), fieldObject] });
+		case "doesnotcontain": {
+			const jsonRule = { in: [fieldOrNumberRenderer(value), fieldObject] };
+			return negateIfNotOp(operatorLC, jsonRule);
+		}
 		case "beginswith":
-		case "doesnotbeginwith": return negateIfNotOp(operatorLC, { startsWith: [fieldObject, fieldOrNumberRenderer(value)] });
+		case "doesnotbeginwith": {
+			const jsonRule = { startsWith: [fieldObject, fieldOrNumberRenderer(value)] };
+			return negateIfNotOp(operatorLC, jsonRule);
+		}
 		case "endswith":
-		case "doesnotendwith": return negateIfNotOp(operatorLC, { endsWith: [fieldObject, fieldOrNumberRenderer(value)] });
+		case "doesnotendwith": {
+			const jsonRule = { endsWith: [fieldObject, fieldOrNumberRenderer(value)] };
+			return negateIfNotOp(operatorLC, jsonRule);
+		}
 	}
 	return false;
 };
@@ -3607,7 +3771,10 @@ const defaultRuleProcessorLDAP = (rule, options = {}) => {
 		case "null":
 		case "notnull": return negateIf(`(${field}=*)`, operatorLC === "notnull");
 		case "in":
-		case "notin": return negateIf(`(|${toArray(value).map((val) => `(${field}=${ldapEscape(val)})`).join("")})`, operatorLC === "notin");
+		case "notin": {
+			const valueAsArray = toArray(value);
+			return negateIf(`(|${valueAsArray.map((val) => `(${field}=${ldapEscape(val)})`).join("")})`, operatorLC === "notin");
+		}
 		case "between":
 		case "notbetween": {
 			const valueAsArray = toArray(value);
@@ -3914,7 +4081,22 @@ const defaultRuleProcessorParameterized = (rule, opts, meta) => {
 	const [qPre, qPost] = quoteFieldNamesWith;
 	if ((sqlOperatorLowerCase === "in" || sqlOperatorLowerCase === "not in" || sqlOperatorLowerCase === "between" || sqlOperatorLowerCase === "not between") && !value) return finalize("");
 	else if (sqlOperatorLowerCase === "is null" || sqlOperatorLowerCase === "is not null") return finalize(`${qPre}${rule.field}${qPost} ${sqlOperator}`);
-	else if (rule.valueSource === "field") return finalize(`${qPre}${rule.field}${qPost} ${sqlOperator} ${value}`.trim());
+	else if (rule.valueSource === "parameter") {
+		const registerParam = (v) => {
+			const ref = withParamPrefix(v, paramPrefix);
+			if (!parameterized) paramsNamed[paramsKeepPrefix ? ref : stripParamPrefix(v, paramPrefix)] = null;
+			return ref;
+		};
+		if (sqlOperatorLowerCase === "between" || sqlOperatorLowerCase === "not between") {
+			const [first, second] = toArray(rule.value, { retainEmptyStrings: true }).slice(0, 2);
+			return finalize(`${qPre}${rule.field}${qPost} ${sqlOperator} ${registerParam(first)} and ${registerParam(second)}`.trim());
+		}
+		if (sqlOperatorLowerCase === "in" || sqlOperatorLowerCase === "not in") {
+			const splitValue = toArray(rule.value);
+			return finalize(`${qPre}${rule.field}${qPost} ${sqlOperator} (${splitValue.map((v) => registerParam(v)).join(", ")})`);
+		}
+		return finalize(`${qPre}${rule.field}${qPost} ${sqlOperator} ${wrapLikeFragment(registerParam(rule.value), lc(rule.operator), { concatOperator })}`.trim());
+	} else if (rule.valueSource === "field") return finalize(`${qPre}${rule.field}${qPost} ${sqlOperator} ${value}`.trim());
 	else if (sqlOperatorLowerCase === "in" || sqlOperatorLowerCase === "not in") {
 		const splitValue = toArray(rule.value);
 		if (parameterized) {
@@ -4107,7 +4289,9 @@ const defaultRuleProcessorSPARQL = (rule, opts = {}) => {
 		if (typeof v === "bigint") return String(v);
 		if (valueIsField) return sparqlVar(trimIfString(v));
 		if (typeof v === "number" || shouldRenderAsNumber(v, parseNumbers)) return trimIfString(v);
+		/* v8 ignore start -- @preserve */
 		const s = typeof v === "string" ? v : (_JSON$stringify = JSON.stringify(v)) !== null && _JSON$stringify !== void 0 ? _JSON$stringify : "";
+		/* v8 ignore stop -- @preserve */
 		if (s.startsWith("?") || s.startsWith("<") || s.includes(":")) return s;
 		return `"${escapeDoubleQuotes(s, escapeQuotes)}"`;
 	};
@@ -4433,6 +4617,10 @@ function formatQuery(ruleGroup, optionParam = {}) {
 				if (typeof field.validator === "function") fieldValidator = field.validator;
 			}
 		}
+		if (rule.valueSource === "parameter" && typeof optObj.getParameters === "function") {
+			const fieldData = getOption(fields, rule.field);
+			if (!new Set(toFlatOptionArray(toFullOptionList(optObj.getParameters(rule.field, rule.operator, { fieldData }))).map((p) => stripParamPrefix(p.value, optObj.paramPrefix))).has(stripParamPrefix(rule.value, optObj.paramPrefix))) validationResult = false;
+		}
 		return [validationResult, fieldValidator];
 	};
 	const finalOptions = _objectSpread2(_objectSpread2({}, optObj), {}, {
@@ -4694,6 +4882,45 @@ const getMatchModesUtil = (fieldData, getMatchModes) => {
 	})) !== null && _matchModes$map !== void 0 ? _matchModes$map : [];
 };
 //#endregion
+//#region src/utils/getRuleDefaultValue.ts
+const getFirstOptionsFrom = (opts, r, listsAsArrays) => {
+	const firstOption = getFirstOption(opts);
+	if (r.operator === "between" || r.operator === "notBetween") {
+		const valueAsArray = [firstOption, firstOption];
+		return listsAsArrays ? valueAsArray : joinWith(valueAsArray.map((v) => v !== null && v !== void 0 ? v : 		/* v8 ignore start -- @preserve */ ""), ",");
+	}
+	return firstOption;
+};
+/**
+* Computes the default `value` for a rule given its `field`/`operator`/`valueSource`, mirroring
+* the precedence the {@link react-querybuilder!QueryBuilder QueryBuilder} applies: a field's
+* `defaultValue`, then a `getDefaultValue` override, then a value derived from the field/operator's
+* value list and editor type (first option for `select`/`radio`, `false` for `checkbox`, paired for
+* `between`/`notBetween`), or a comparator-valid field when `valueSource` is `'field'`. Falls back
+* to `''`.
+*
+* @group Option Lists
+*/
+const getRuleDefaultValue = (rule, options) => {
+	const { fieldData, fields, getValueEditorType, getValues, getDefaultValue, getParameters, listsAsArrays } = options;
+	if ((fieldData === null || fieldData === void 0 ? void 0 : fieldData.defaultValue) !== void 0 && fieldData.defaultValue !== null) return fieldData.defaultValue;
+	else if (getDefaultValue) return getDefaultValue(rule, { fieldData });
+	let value = "";
+	const values = getValues(rule.field, rule.operator, { fieldData });
+	if (rule.valueSource === "field") {
+		const filteredFields = filterFieldsByComparator(fieldData, fields, rule.operator);
+		value = filteredFields.length > 0 ? getFirstOptionsFrom(filteredFields, rule, listsAsArrays) : "";
+	} else if (rule.valueSource === "parameter") {
+		const parameters = getParameters ? getParameters(rule.field, rule.operator, { fieldData }) : null;
+		value = parameters && parameters.length > 0 ? getFirstOption(parameters) : "";
+	} else if (values.length > 0) {
+		const editorType = getValueEditorType(rule.field, rule.operator, { fieldData });
+		if (editorType === "multiselect") value = listsAsArrays ? [] : "";
+		else if (editorType === "select" || editorType === "radio") value = getFirstOptionsFrom(values, rule, listsAsArrays);
+	} else if (getValueEditorType(rule.field, rule.operator, { fieldData }) === "checkbox") value = false;
+	return value;
+};
+//#endregion
 //#region src/utils/getValidationClassNames.ts
 /**
 * Gets the standard classname for valid or invalid components
@@ -4933,21 +5160,89 @@ const addInPlace = (query, ruleOrGroup, parentPathOrID, options = {}) => {
 	return query;
 };
 /**
-* Updates a property of a rule or group within a query without mutating the original query.
+* Relative order in which properties are applied during a multi-property update.
+* Lower ranks apply first; `value` applies last so an explicitly-provided value
+* is never clobbered by a reset triggered by a `field`/`operator`/`valueSource`
+* change. Unranked properties default to `3` (between `valueSource` and `value`).
+*/
+const updatePropRank = {
+	field: 0,
+	operator: 1,
+	valueSource: 2,
+	value: 4
+};
+/** Stable-sorts `[prop, value]` entries by {@link updatePropRank}. */
+const orderUpdateEntries = (entries) => entries.sort((x, y) => {
+	var _updatePropRank$x$, _updatePropRank$y$;
+	return ((_updatePropRank$x$ = updatePropRank[x[0]]) !== null && _updatePropRank$x$ !== void 0 ? _updatePropRank$x$ : 3) - ((_updatePropRank$y$ = updatePropRank[y[0]]) !== null && _updatePropRank$y$ !== void 0 ? _updatePropRank$y$ : 3);
+});
+/**
+* Normalizes the variadic {@link update}/{@link updateInPlace} arguments (single
+* prop+value, parallel arrays, or property map) into a canonically-ordered list
+* of `[prop, value]` entries plus the target path/ID and options.
+*/
+const normalizeUpdateArgs = (a, b, c, d) => {
+	var _ref3;
+	if (typeof a === "string") {
+		var _ref;
+		return {
+			entries: [[a, b]],
+			pathOrID: c,
+			options: (_ref = d) !== null && _ref !== void 0 ? _ref : {}
+		};
+	}
+	if (Array.isArray(a)) {
+		var _ref2;
+		const values = b;
+		return {
+			entries: orderUpdateEntries(a.map((prop, i) => [prop, values[i]])),
+			pathOrID: c,
+			options: (_ref2 = d) !== null && _ref2 !== void 0 ? _ref2 : {}
+		};
+	}
+	return {
+		entries: orderUpdateEntries(Object.entries(a)),
+		pathOrID: b,
+		options: (_ref3 = c) !== null && _ref3 !== void 0 ? _ref3 : {}
+	};
+};
+/**
+* Applies one or more property updates to a query in place. Shared by
+* {@link update} and {@link updateInPlace}.
+*/
+const applyUpdatesInPlace = (query, a, b, c, d) => {
+	const { entries, pathOrID, options } = normalizeUpdateArgs(a, b, c, d);
+	for (const [prop, value] of entries) updateInPlaceSingle(query, prop, value, pathOrID, options);
+	return query;
+};
+/**
+* Updates one or more properties of a rule or group within a query without
+* mutating the original query. Properties may be supplied individually
+* (`prop`, `value`), as parallel arrays (`props`, `values`), or as a
+* property-to-value map. For multi-property updates, `field`, `operator`, and
+* `valueSource` are applied before `value`, so an explicit `value` is never
+* reset by a change to one of those properties.
 *
-* @returns A new query with the rule or group property updated.
+* @returns A new query with the rule or group properties updated.
 *
 * @group Query Tools
 */
-const update = (query, prop, value, pathOrID, options = {}) => produce(query, (q) => updateInPlace(q, prop, value, pathOrID, options));
+const update = ((query, a, b, c, d) => produce(query, (q) => {
+	applyUpdatesInPlace(q, a, b, c, d);
+}));
 /**
-* Updates a property of a rule or group within a query in place.
+* Updates one or more properties of a rule or group within a query in place.
+* See {@link update} for the supported argument forms and ordering semantics.
 *
-* @returns The query (mutated in place) with the rule or group property updated.
+* @returns The query (mutated in place) with the rule or group properties updated.
 *
 * @group Query Tools
 */
-const updateInPlace = (query, prop, value, pathOrID, options = {}) => {
+const updateInPlace = ((query, a, b, c, d) => applyUpdatesInPlace(query, a, b, c, d));
+/**
+* Updates a single property of a rule or group within a query in place.
+*/
+const updateInPlaceSingle = (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);
@@ -5099,13 +5394,13 @@ const moveInPlace = (query, oldPathOrID, newPath, options = {}) => {
 	if (parentToInsertInto.rules.length === 0 || !independentCombinators) insertRuleOrGroup(ruleOrGroup);
 	else if (newIndex === 0) if (ruleToRemoveIndex === 0 && oldNextCombinator) insertRuleOrGroup(ruleOrGroup, oldNextCombinator);
 	else {
-		var _ref, _parentToInsertInto$r;
-		insertRuleOrGroup(ruleOrGroup, (_ref = (_parentToInsertInto$r = parentToInsertInto.rules[1]) !== null && _parentToInsertInto$r !== void 0 ? _parentToInsertInto$r : oldPrevCombinator) !== null && _ref !== void 0 ? _ref : getFirstOption(combinators));
+		var _ref4, _parentToInsertInto$r;
+		insertRuleOrGroup(ruleOrGroup, (_ref4 = (_parentToInsertInto$r = parentToInsertInto.rules[1]) !== null && _parentToInsertInto$r !== void 0 ? _parentToInsertInto$r : oldPrevCombinator) !== null && _ref4 !== void 0 ? _ref4 : getFirstOption(combinators));
 	}
 	else if (oldPrevCombinator) insertRuleOrGroup(oldPrevCombinator, ruleOrGroup);
 	else {
-		var _ref2, _parentToInsertInto$r2;
-		insertRuleOrGroup((_ref2 = (_parentToInsertInto$r2 = parentToInsertInto.rules[newIndex - 2]) !== null && _parentToInsertInto$r2 !== void 0 ? _parentToInsertInto$r2 : oldNextCombinator) !== null && _ref2 !== void 0 ? _ref2 : getFirstOption(combinators), ruleOrGroup);
+		var _ref5, _parentToInsertInto$r2;
+		insertRuleOrGroup((_ref5 = (_parentToInsertInto$r2 = parentToInsertInto.rules[newIndex - 2]) !== null && _parentToInsertInto$r2 !== void 0 ? _parentToInsertInto$r2 : oldNextCombinator) !== null && _ref5 !== void 0 ? _ref5 : getFirstOption(combinators), ruleOrGroup);
 	}
 	return query;
 };
@@ -5142,15 +5437,15 @@ const insertInPlace = (query, ruleOrGroup, path, options = {}) => {
 		var _rorg$path;
 		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;
-			insertRuleOrGroup(newIndex, rorg, (_ref3 = (_parentToInsertInto$r3 = parentToInsertInto.rules[1]) !== null && _parentToInsertInto$r3 !== void 0 ? _parentToInsertInto$r3 : combinatorPreceding) !== null && _ref3 !== void 0 ? _ref3 : getFirstOption(combinators));
+			var _ref6, _parentToInsertInto$r3;
+			insertRuleOrGroup(newIndex, rorg, (_ref6 = (_parentToInsertInto$r3 = parentToInsertInto.rules[1]) !== null && _parentToInsertInto$r3 !== void 0 ? _parentToInsertInto$r3 : combinatorPreceding) !== null && _ref6 !== void 0 ? _ref6 : getFirstOption(combinators));
 		}
 	} else {
 		const normalizedNewIndex = newIndex % 2 === 0 ? newIndex - 1 : newIndex;
 		if (combinatorPreceding) insertRuleOrGroup(normalizedNewIndex, combinatorPreceding, rorg);
 		else {
-			var _ref4, _parentToInsertInto$r4;
-			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);
+			var _ref7, _parentToInsertInto$r4;
+			insertRuleOrGroup(normalizedNewIndex, (_ref7 = (_parentToInsertInto$r4 = parentToInsertInto.rules[normalizedNewIndex - 2]) !== null && _parentToInsertInto$r4 !== void 0 ? _parentToInsertInto$r4 : combinatorSucceeding) !== null && _ref7 !== void 0 ? _ref7 : getFirstOption(combinators), rorg);
 		}
 	}
 	return query;
@@ -5209,6 +5504,6 @@ const groupInPlace = (query, sourcePathOrID, targetPathOrID, options = {}) => {
 	return query;
 };
 //#endregion
-export { LogType, TestID, add, addInPlace, bigIntJsonParseReviver, bigIntJsonStringifyReplacer, celCombinatorMap, clsx, convertFromIC, convertQuery, convertToIC, cypherCombinatorMap, 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, defaultRuleGroupProcessorCypher, defaultRuleGroupProcessorDiagnostics, defaultRuleGroupProcessorDrizzle, defaultRuleGroupProcessorElasticSearch, defaultRuleGroupProcessorGremlin, defaultRuleGroupProcessorJSONata, defaultRuleGroupProcessorJsonLogic, defaultRuleGroupProcessorLDAP, defaultRuleGroupProcessorMongoDB, defaultRuleGroupProcessorMongoDBQuery, defaultRuleGroupProcessorNL, defaultRuleGroupProcessorParameterized, defaultRuleGroupProcessorPrisma, defaultRuleGroupProcessorSPARQL, defaultRuleGroupProcessorSQL, defaultRuleGroupProcessorSequelize, defaultRuleGroupProcessorSpEL, defaultRuleGroupProcessorTanStackDB, defaultRuleProcessorCEL, defaultRuleProcessorCypher, defaultRuleProcessorDrizzle, defaultRuleProcessorElasticSearch, defaultRuleProcessorGremlin, defaultRuleProcessorJSONata, defaultRuleProcessorJsonLogic, defaultRuleProcessorLDAP, defaultRuleProcessorMongoDB, defaultRuleProcessorMongoDBQuery, defaultRuleProcessorNL, defaultRuleProcessorParameterized, defaultRuleProcessorPrisma, defaultRuleProcessorSPARQL, defaultRuleProcessorSQL, defaultRuleProcessorSequelize, defaultRuleProcessorSpEL, defaultRuleProcessorTanStackDB, 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, isUnsafeKey, 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, sparqlVar, splitBy, sqlDialectPresets, standardClassnames, toArray, toFlatOptionArray, toFullOption, toFullOptionList, toFullOptionMap, transformQuery, trimIfString, uniqByIdentifier, uniqByName, uniqOptGroups, uniqOptList, update, updateInPlace, uuidV4regex };
+export { LogType, TestID, add, addInPlace, betweenOperators, bigIntJsonParseReviver, bigIntJsonStringifyReplacer, celCombinatorMap, clsx, convertFromIC, convertQuery, convertToIC, cypherCombinatorMap, 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, defaultRuleGroupProcessorCypher, defaultRuleGroupProcessorDiagnostics, defaultRuleGroupProcessorDrizzle, defaultRuleGroupProcessorElasticSearch, defaultRuleGroupProcessorGremlin, defaultRuleGroupProcessorJSONata, defaultRuleGroupProcessorJsonLogic, defaultRuleGroupProcessorLDAP, defaultRuleGroupProcessorMongoDB, defaultRuleGroupProcessorMongoDBQuery, defaultRuleGroupProcessorNL, defaultRuleGroupProcessorParameterized, defaultRuleGroupProcessorPrisma, defaultRuleGroupProcessorSPARQL, defaultRuleGroupProcessorSQL, defaultRuleGroupProcessorSequelize, defaultRuleGroupProcessorSpEL, defaultRuleGroupProcessorTanStackDB, defaultRuleProcessorCEL, defaultRuleProcessorCypher, defaultRuleProcessorDrizzle, defaultRuleProcessorElasticSearch, defaultRuleProcessorGremlin, defaultRuleProcessorJSONata, defaultRuleProcessorJsonLogic, defaultRuleProcessorLDAP, defaultRuleProcessorMongoDB, defaultRuleProcessorMongoDBQuery, defaultRuleProcessorNL, defaultRuleProcessorParameterized, defaultRuleProcessorPrisma, defaultRuleProcessorSPARQL, defaultRuleProcessorSQL, defaultRuleProcessorSequelize, defaultRuleProcessorSpEL, defaultRuleProcessorTanStackDB, defaultSpELValueProcessor, defaultTranslations, defaultValidator, defaultValueProcessor, defaultValueProcessorByRule, defaultValueProcessorCELByRule, defaultValueProcessorMongoDBByRule, defaultValueProcessorNL, defaultValueProcessorSpELByRule, filterFieldsByComparator, findID, findPath, formatQuery, formatQueryOptionPresets, generateAccessibleDescription, generateID, getCommonAncestorPath, getFirstOption, getLikeWildcards, getMatchModesUtil, getNLTranslataion, getOption, getParentPath, getParseNumberMethod, getPathOfID, getQuoteFieldNamesWithArray, getQuotedFieldName, getRuleDefaultValue, getSQLConcat, getValidationClassNames, getValueSourcesUtil, group, groupInPlace, groupInvalidReasons, inOperators, insert, insertInPlace, isAncestor, isFlexibleOptionArray, isFlexibleOptionGroupArray, isFullOptionArray, isFullOptionGroupArray, isOptionGroupArray, isPojo, isRuleGroup, isRuleGroupType, isRuleGroupTypeIC, isRuleOrGroupValid, isRuleType, isUnsafeKey, isValidValue, isValidationResult, isValueProcessorLegacy, joinWith, jsonLogicAdditionalOperators, lc, mapSQLOperator, mergeAnyTranslation, mergeAnyTranslations, mergeClassnames, mongoDbFallback, mongoOperators, move, moveInPlace, normalizeConstituentWordOrder, nullFreeArray, nullOperators, nullOrUndefinedOrEmpty, numericRegex, numerifyValues, objectEntries, objectKeys, parseNumber, pathIsDisabled, pathsAreEqual, preferAnyProp, preferFlagProps, preferProp, prepareOptionList, prepareRule, prepareRuleGroup, prepareRuleOrGroup, prismaFallback, prismaOperators, processMatchMode, queryBuilderFlagDefaults, regenerateID, regenerateIDs, relationalOperators, remove, removeInPlace, rootPath, shouldRenderAsNumber, sparqlVar, splitBy, sqlDialectPresets, standardClassnames, stripParamPrefix, substringOperators, toArray, toFlatOptionArray, toFullOption, toFullOptionList, toFullOptionMap, transformQuery, trimIfString, uniqByIdentifier, uniqByName, uniqOptGroups, uniqOptList, update, updateInPlace, uuidV4regex, withParamPrefix, wrapLikeFragment };
 
 //# sourceMappingURL=react-querybuilder_core.legacy-esm.js.map