@react-querybuilder/core 8.11.1 → 8.11.2

package/dist/react-querybuilder_core.mjs

@@ -1003,7 +1003,7 @@ const prepareOptionList = (props) => {
 		label: placeholderLabel
 	};
 	const optionsProp = optionListPropOriginal ?? [defaultOption];
-	let optionList = [];
+	let optionList;
 	const opts = Array.isArray(optionsProp) ? toFullOptionList(optionsProp, baseOption, labelMap) : objectKeys(toFullOptionMap(optionsProp, baseOption)).map((opt) => ({
 		...optionsProp[opt],
 		name: opt,
@@ -1364,18 +1364,29 @@ const translationMatchFilter = (key, keyToTest, conditions) => keyToTest.startsW
 * @group Export
 */
 const getNLTranslataion = (key, translations, conditions = []) => conditions.length === 0 ? translations[key] ?? defaultNLTranslations[key] ?? "" : Object.entries(translations).find(([keyToTest]) => translationMatchFilter(key, keyToTest, conditions))?.[1] ?? Object.entries(defaultNLTranslations).find(([keyToTest]) => translationMatchFilter(key, keyToTest, conditions))?.[1] ?? defaultNLTranslations[key] ?? "";
+/**
+* Transforms
+* - `match: { mode: "atLeast", threshold: 1 }` to `match: { mode: "some" }`
+* - `match: { mode: "atMost", threshold: 0 }` to `match: { mode: "none" }`.
+*
+* Returns:
+* - Processed `{ mode, threshold }` object for valid subqueries
+* - `null` if match mode is not applicable for the rule
+* - `false` if match mode is valid, but either
+*   1. `threshold` is required and invalid, or
+*   2. `value` is not a valid rule group.
+*/
 const processMatchMode = (rule) => {
 	const { mode, threshold } = rule.match ?? {};
-	if (mode) {
-		if (!isRuleGroup(rule.value)) return false;
-		const matchModeLC = lc(mode);
-		const matchModeCoerced = matchModeLC === "atleast" && threshold === 1 ? "some" : matchModeLC === "atmost" && threshold === 0 ? "none" : matchModeLC;
-		if ((matchModeCoerced === "atleast" || matchModeCoerced === "atmost" || matchModeCoerced === "exactly") && (typeof threshold !== "number" || threshold < 0)) return false;
-		return {
-			mode: matchModeCoerced,
-			threshold
-		};
-	}
+	if (!mode) return null;
+	if (!isRuleGroup(rule.value)) return false;
+	const matchModeLC = lc(mode);
+	const matchModeCoerced = matchModeLC === "atleast" && threshold === 1 ? "some" : matchModeLC === "atmost" && threshold === 0 ? "none" : matchModeLC;
+	if ((matchModeCoerced === "atleast" || matchModeCoerced === "atmost" || matchModeCoerced === "exactly") && (typeof threshold !== "number" || threshold < 0)) return false;
+	return {
+		mode: matchModeCoerced,
+		threshold
+	};
 };
 /**
 * "Replacer" method for JSON.stringify's second argument. Converts `bigint` values to
@@ -3910,6 +3921,7 @@ const preferFlagProps = (props = {}, contextVals = {}, finalize) => objectEntrie
 */
 const prepareRule = (rule, { idGenerator = generateID } = {}) => produce(rule, (draft) => {
 	if (!draft.id) draft.id = idGenerator();
+	if (processMatchMode(draft)) draft.value = prepareRuleGroup(draft.value, { idGenerator });
 });
 /**
 * Ensures that a rule group is valid by recursively adding an `id` property to the group itself