@react-querybuilder/core 8.11.1 → 8.12.0

package/dist/react-querybuilder_core.mjs

@@ -424,7 +424,8 @@ const standardClassnames = {
 	valueListItem: "rule-value-list-item",
 	branches: "queryBuilder-branches",
 	justified: "queryBuilder-justified",
-	hasSubQuery: "rule-hasSubQuery"
+	hasSubQuery: "rule-hasSubQuery",
+	loading: "queryBuilder-loading"
 };
 /**
 * Default classnames for each component.
@@ -471,7 +472,8 @@ const defaultControlClassnames = {
 	disabled: "",
 	valueListItem: "",
 	branches: "",
-	hasSubQuery: ""
+	hasSubQuery: "",
+	loading: ""
 };
 /**
 * Default reason codes for a group being invalid.
@@ -1003,7 +1005,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,
@@ -1088,6 +1090,13 @@ const parseNumber = (val, { parseNumbers, bigIntOnOverflow } = {}) => {
 
 //#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) {
@@ -1364,18 +1373,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
@@ -3877,7 +3897,8 @@ const mergeClassnames = (...args) => ({
 	matchMode: joinClassnamesByName("matchMode", args),
 	matchThreshold: joinClassnamesByName("matchThreshold", args),
 	branches: joinClassnamesByName("branches", args),
-	hasSubQuery: joinClassnamesByName("hasSubQuery", args)
+	hasSubQuery: joinClassnamesByName("hasSubQuery", args),
+	loading: joinClassnamesByName("loading", args)
 });
 
 //#endregion
@@ -3910,6 +3931,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