@react-querybuilder/core 8.11.1 → 8.11.2

package/dist/{basic-B4vXboTG.d.mts → basic-CLG_Bmom.d.mts}

@@ -1254,4 +1254,4 @@ type ParseNumbersModerationLevel = "-limited" | "";
 type ParseNumbersPropConfig = boolean | `${ParseNumberMethodName}${ParseNumbersModerationLevel}`;
 //#endregion
 export { Except as C, SetRequired as S, RuleGroupType as _, ValueSource as a, FullOptionList as b, RuleValidator as c, DefaultRuleGroupTypeIC as d, RuleGroupTypeAny as f, DefaultRuleGroupType as g, DefaultOperatorName as h, ParseNumbersPropConfig as i, ValidationMap as l, DefaultCombinatorName as m, FullOperator as n, ValueSources as o, RuleGroupTypeIC as p, InputType as r, QueryValidator as s, FullField as t, ValidationResult as u, RuleType as v, OptionList as x, FlexibleOptionList as y };
-//# sourceMappingURL=basic-B4vXboTG.d.mts.map
+//# sourceMappingURL=basic-CLG_Bmom.d.mts.map

package/dist/cjs/react-querybuilder_core.cjs.development.d.ts

@@ -3441,7 +3441,19 @@ type ProcessedMatchMode = {
   mode: "exactly";
   threshold: number;
 };
-declare const processMatchMode: (rule: RuleType) => void | false | ProcessedMatchMode;
+/**
+* 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.
+*/
+declare const processMatchMode: (rule: RuleType) => null | false | ProcessedMatchMode;
 /**
 * "Replacer" method for JSON.stringify's second argument. Converts `bigint` values to
 * objects with a `$bigint` property having a value of a string representation of
@@ -3766,7 +3778,7 @@ declare const uniqOptGroups: <T extends BaseOption>(originalArray: FlexibleOptio
 declare const uniqOptList: <T extends BaseOption>(originalArray: FlexibleOptionList<T>) => WithUnknownIndex<BaseOption & FullOption>[] | OptionGroup<ToFullOption<T>>[];
 interface PreparedOptionList<O$1 extends FullOption> {
   defaultOption: FullOption;
-  optionList: O$1[] | OptionGroup<O$1>[];
+  optionList: FullOptionList<O$1>;
   optionsMap: Partial<FullOptionRecord<FullOption>>;
 }
 interface PrepareOptionListParams<O$1 extends FullOption> {

package/dist/cjs/react-querybuilder_core.cjs.development.js

@@ -1028,7 +1028,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,
@@ -1389,18 +1389,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
@@ -3935,6 +3946,7 @@ const preferFlagProps = (props = {}, contextVals = {}, finalize) => objectEntrie
 */
 const prepareRule = (rule, { idGenerator = generateID } = {}) => (0, immer.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