@react-querybuilder/core 8.11.2 → 8.13.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.
@@ -748,7 +750,7 @@ const convertFromIC = (rg) => {
 */
 const convertToIC = (rg) => {
 	if (isRuleGroupTypeIC(rg)) return rg;
-	const { combinator,...queryWithoutCombinator } = rg;
+	const { combinator, ...queryWithoutCombinator } = rg;
 	const rules = [];
 	const { length } = rg.rules;
 	for (const [idx, r] of rg.rules.entries()) {
@@ -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) {
@@ -2950,7 +2959,8 @@ const defaultValueProcessorNL = (rule, opts = {}) => {
 			const valueAsArray = toArray(rule.value);
 			if (valueAsArray.length === 0) return "";
 			const valStringArray = valueAsArray.map((v) => valueIsField ? wrapFieldName(getOption(fields ?? [], v)?.label ?? v) : shouldRenderAsNumber(v, parseNumbers) ? `${trimIfString(v)}` : `${wrapAndEscape(v)}`);
-			return `${valStringArray.slice(0, -1).join(", ")}${valStringArray.length > 2 ? "," : ""} ${orTL} ${valStringArray.at(-1)}`;
+			if (valStringArray.length === 1) return valStringArray[0];
+			return `(${`${valStringArray.slice(0, -1).join(", ")}${valStringArray.length > 2 ? "," : ""} ${orTL} ${valStringArray.at(-1)}`})`;
 		}
 	}
 	if (typeof rule.value === "boolean") return rule.value ? trueTL : falseTL;
@@ -2995,17 +3005,22 @@ const defaultOperatorProcessorNL = (rule, opts = {}) => {
 	const { field, operator, valueSource = "value" } = rule;
 	// istanbul ignore next
 	const { getOperators = defaultGetOperators, operatorMap: operatorMapParam = defaultExportOperatorMap } = opts;
-	const mapOperatorMap = new Map(Object.entries(defaultExportOperatorMap));
-	for (const [key, value] of Object.entries(operatorMapParam)) mapOperatorMap.set(lc(key), value);
-	const operatorMap = Object.fromEntries(mapOperatorMap);
+	const mergedOperatorMap = new Map(Object.entries(defaultExportOperatorMap));
+	for (const [key, value] of Object.entries(operatorMapParam)) mergedOperatorMap.set(lc(key), value);
+	const operatorMap = Object.fromEntries(mergedOperatorMap);
+	const operatorLC = lc(operator);
+	var normalizedOperator = operator;
+	const hasSingleValue = toArray(rule.value).length === 1;
+	if (operatorLC === "in" && hasSingleValue) normalizedOperator = "=";
+	else if (operatorLC === "notin" && hasSingleValue) normalizedOperator = "!=";
 	const { value: operatorNL, label } = getOption(toFullOptionList(getOperators(field, { fieldData: opts.fieldData ?? {
 		name: field,
 		value: field,
 		label: field
-	} }) ?? []), operator) ?? {
-		name: operator,
-		value: operator,
-		label: operator
+	} }) ?? []), normalizedOperator) ?? {
+		name: normalizedOperator,
+		value: normalizedOperator,
+		label: normalizedOperator
 	};
 	const operatorTL = operatorMap[operatorNL] ?? operatorMap[lc(operatorNL)] ?? [label, label];
 	return typeof operatorTL === "string" ? operatorTL : operatorTL[valueSource === "field" ? 1 : 0];
@@ -3888,7 +3903,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