@react-querybuilder/core 8.9.1 → 8.10.0

package/dist/formatQuery.js

@@ -1,8 +1,8 @@
 const require_isRuleGroup = require('./isRuleGroup-DqAs2x4E.js');
-const require_arrayUtils = require('./arrayUtils-D5EoIsKP.js');
-const require_parseNumber = require('./parseNumber-Bcys1kOH.js');
-const require_transformQuery = require('./transformQuery-FL_nlpp5.js');
-const require_optGroupUtils = require('./optGroupUtils-CXLgyg2i.js');
+const require_optGroupUtils = require('./optGroupUtils-B0hTpodo.js');
+const require_arrayUtils = require('./arrayUtils-QxZOZTf6.js');
+const require_parseNumber = require('./parseNumber-D4iQDxK-.js');
+const require_transformQuery = require('./transformQuery-CWDPogO5.js');
 const require_convertQuery = require('./convertQuery-DAqoID3O.js');
 let immer = require("immer");
 immer = require_isRuleGroup.__toESM(immer);
@@ -14,9 +14,11 @@ immer = require_isRuleGroup.__toESM(immer);
 const isValidationResult = (vr) => require_isRuleGroup.isPojo(vr) && typeof vr.valid === "boolean";
 /**
 * Determines if a rule or group is valid based on a validation result (if defined)
-* or a validator function. Returns `true` if neither are defined.
+* or a validator function. Returns `true` if neither are defined and the `muted`
+* property is not `true`.
 */
 const isRuleOrGroupValid = (rg, validationResult, validator) => {
+	if (rg.muted) return false;
 	if (typeof validationResult === "boolean") return validationResult;
 	if (isValidationResult(validationResult)) return validationResult.valid;
 	if (typeof validator === "function" && !require_isRuleGroup.isRuleGroup(rg)) {
@@ -290,19 +292,45 @@ const defaultRuleGroupProcessorCEL = (ruleGroup, options) => {
 	const { fields, fallbackExpression, getParseNumberBoolean, placeholderFieldName, placeholderOperatorName, placeholderValueName, ruleProcessor, validateRule, validationMap } = options;
 	const processRuleGroup = (rg, outermost) => {
 		if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return outermost ? fallbackExpression : "";
-		const expression = rg.rules.map((rule) => {
-			if (typeof rule === "string") return celCombinatorMap[rule];
-			if (require_isRuleGroup.isRuleGroup(rule)) return processRuleGroup(rule);
+		const processedRules = [];
+		let precedingCombinator = "";
+		let firstRule = true;
+		for (const rule of rg.rules) {
+			if (typeof rule === "string") {
+				precedingCombinator = celCombinatorMap[rule];
+				continue;
+			}
+			if (require_isRuleGroup.isRuleGroup(rule)) {
+				const processedGroup = processRuleGroup(rule);
+				if (processedGroup) {
+					if (!firstRule && precedingCombinator) {
+						processedRules.push(precedingCombinator);
+						precedingCombinator = "";
+					}
+					firstRule = false;
+					processedRules.push(processedGroup);
+				}
+				continue;
+			}
 			const [validationResult, fieldValidator] = validateRule(rule);
-			if (!isRuleOrGroupValid(rule, validationResult, fieldValidator) || rule.field === placeholderFieldName || rule.operator === placeholderOperatorName || placeholderValueName !== void 0 && rule.value === placeholderValueName) return "";
+			if (!isRuleOrGroupValid(rule, validationResult, fieldValidator) || rule.field === placeholderFieldName || rule.operator === placeholderOperatorName || placeholderValueName !== void 0 && rule.value === placeholderValueName) continue;
 			const fieldData = require_optGroupUtils.getOption(fields, rule.field);
-			return ruleProcessor(rule, {
+			const processedRule = ruleProcessor(rule, {
 				...options,
 				parseNumbers: getParseNumberBoolean(fieldData?.inputType),
 				escapeQuotes: (rule.valueSource ?? "value") === "value",
 				fieldData
 			});
-		}).filter(Boolean).join(require_isRuleGroup.isRuleGroupType(rg) ? ` ${celCombinatorMap[rg.combinator]} ` : " ");
+			if (processedRule) {
+				if (!firstRule && precedingCombinator) {
+					processedRules.push(precedingCombinator);
+					precedingCombinator = "";
+				}
+				firstRule = false;
+				processedRules.push(processedRule);
+			}
+		}
+		const expression = processedRules.join(require_isRuleGroup.isRuleGroupType(rg) ? ` ${celCombinatorMap[rg.combinator]} ` : " ");
 		const [prefix, suffix] = rg.not || !outermost ? [`${rg.not ? "!" : ""}(`, ")"] : ["", ""];
 		return expression ? `${prefix}${expression}${suffix}` : fallbackExpression;
 	};
@@ -329,11 +357,10 @@ const defaultRuleProcessorCEL = (rule, opts = {}) => {
 	else if (matchEval) {
 		const { mode, threshold } = matchEval;
 		const arrayElementAlias = "elem_alias";
-		const celQuery = require_transformQuery.transformQuery(rule.value, { ruleProcessor: (r) => ({
+		const nestedArrayFilter = defaultRuleGroupProcessorCEL(require_transformQuery.transformQuery(rule.value, { ruleProcessor: (r) => ({
 			...r,
 			field: `${arrayElementAlias}${r.field ? `.${r.field}` : ""}`
-		}) });
-		const nestedArrayFilter = defaultRuleGroupProcessorCEL(celQuery, opts);
+		}) }), opts);
 		switch (mode) {
 			case "all": return `${field}.all(${arrayElementAlias}, ${nestedArrayFilter})`;
 			case "none":
@@ -367,8 +394,7 @@ const defaultRuleProcessorCEL = (rule, opts = {}) => {
 		case "in":
 		case "notin": {
 			const [prefix, suffix] = shouldNegate$2(operatorTL) ? ["!(", ")"] : ["", ""];
-			const valueAsArray = require_arrayUtils.toArray(value);
-			return `${prefix}${field} in [${valueAsArray.map((val) => valueIsField || shouldRenderAsNumber(val, parseNumbers) ? `${require_arrayUtils.trimIfString(val)}` : `"${escapeDoubleQuotes(val, escapeQuotes)}"`).join(", ")}]${suffix}`;
+			return `${prefix}${field} in [${require_arrayUtils.toArray(value).map((val) => valueIsField || shouldRenderAsNumber(val, parseNumbers) ? `${require_arrayUtils.trimIfString(val)}` : `"${escapeDoubleQuotes(val, escapeQuotes)}"`).join(", ")}]${suffix}`;
 		}
 		case "between":
 		case "notbetween": {
@@ -588,19 +614,45 @@ const defaultRuleGroupProcessorSpEL = (ruleGroup, options) => {
 	const { fields, fallbackExpression, getParseNumberBoolean, placeholderFieldName, placeholderOperatorName, placeholderValueName, ruleProcessor, validateRule, validationMap } = options;
 	const processRuleGroup = (rg, outermost) => {
 		if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return outermost ? fallbackExpression : "";
-		const expression = rg.rules.map((rule) => {
-			if (typeof rule === "string") return rule;
-			if (require_isRuleGroup.isRuleGroup(rule)) return processRuleGroup(rule);
+		const processedRules = [];
+		let precedingCombinator = "";
+		let firstRule = true;
+		for (const rule of rg.rules) {
+			if (typeof rule === "string") {
+				precedingCombinator = rule;
+				continue;
+			}
+			if (require_isRuleGroup.isRuleGroup(rule)) {
+				const processedGroup = processRuleGroup(rule);
+				if (processedGroup) {
+					if (!firstRule && precedingCombinator) {
+						processedRules.push(precedingCombinator);
+						precedingCombinator = "";
+					}
+					firstRule = false;
+					processedRules.push(processedGroup);
+				}
+				continue;
+			}
 			const [validationResult, fieldValidator] = validateRule(rule);
-			if (!isRuleOrGroupValid(rule, validationResult, fieldValidator) || rule.field === placeholderFieldName || rule.operator === placeholderOperatorName || placeholderValueName !== void 0 && rule.value === placeholderValueName) return "";
+			if (!isRuleOrGroupValid(rule, validationResult, fieldValidator) || rule.field === placeholderFieldName || rule.operator === placeholderOperatorName || placeholderValueName !== void 0 && rule.value === placeholderValueName) continue;
 			const fieldData = require_optGroupUtils.getOption(fields, rule.field);
-			return ruleProcessor(rule, {
+			const processedRule = ruleProcessor(rule, {
 				...options,
 				parseNumbers: getParseNumberBoolean(fieldData?.inputType),
 				escapeQuotes: (rule.valueSource ?? "value") === "value",
 				fieldData
 			});
-		}).filter(Boolean).join(require_isRuleGroup.isRuleGroupType(rg) ? ` ${rg.combinator} ` : " ");
+			if (processedRule) {
+				if (!firstRule && precedingCombinator) {
+					processedRules.push(precedingCombinator);
+					precedingCombinator = "";
+				}
+				firstRule = false;
+				processedRules.push(processedRule);
+			}
+		}
+		const expression = processedRules.join(require_isRuleGroup.isRuleGroupType(rg) ? ` ${rg.combinator} ` : " ");
 		const [prefix, suffix] = rg.not || !outermost ? [`${rg.not ? "!" : ""}(`, ")"] : ["", ""];
 		return expression ? `${prefix}${expression}${suffix}` : fallbackExpression;
 	};
@@ -656,15 +708,9 @@ const defaultRuleProcessorSpEL = (rule, opts = {}) => {
 		case "contains":
 		case "doesnotcontain": return wrapInNegation(`${field} matches ${valueIsField || useBareValue ? require_arrayUtils.trimIfString(value) : `'${escapeSingleQuotes(value, escapeQuotes)}'`}`, shouldNegate$1(operatorTL));
 		case "beginswith":
-		case "doesnotbeginwith": {
-			const valueTL = valueIsField ? `'^'.concat(${require_arrayUtils.trimIfString(value)})` : `'${typeof value === "string" && !value.startsWith("^") || useBareValue ? "^" : ""}${escapeSingleQuotes(value, escapeQuotes)}'`;
-			return wrapInNegation(`${field} matches ${valueTL}`, shouldNegate$1(operatorTL));
-		}
+		case "doesnotbeginwith": return wrapInNegation(`${field} matches ${valueIsField ? `'^'.concat(${require_arrayUtils.trimIfString(value)})` : `'${typeof value === "string" && !value.startsWith("^") || useBareValue ? "^" : ""}${escapeSingleQuotes(value, escapeQuotes)}'`}`, shouldNegate$1(operatorTL));
 		case "endswith":
-		case "doesnotendwith": {
-			const valueTL = valueIsField ? `${require_arrayUtils.trimIfString(value)}.concat('$')` : `'${escapeSingleQuotes(value, escapeQuotes)}${typeof value === "string" && !value.endsWith("$") || useBareValue ? "$" : ""}'`;
-			return wrapInNegation(`${field} matches ${valueTL}`, shouldNegate$1(operatorTL));
-		}
+		case "doesnotendwith": return wrapInNegation(`${field} matches ${valueIsField ? `${require_arrayUtils.trimIfString(value)}.concat('$')` : `'${escapeSingleQuotes(value, escapeQuotes)}${typeof value === "string" && !value.endsWith("$") || useBareValue ? "$" : ""}'`}`, shouldNegate$1(operatorTL));
 		case "null": return `${field} == null`;
 		case "notnull": return `${field} != null`;
 		case "in":
@@ -777,11 +823,10 @@ const defaultRuleProcessorDrizzle = (rule, _options) => {
 		if (opts.preset !== "postgresql") return;
 		const { mode, threshold } = matchEval;
 		const arrayElementAlias = "elem_alias";
-		const sqlQuery = require_transformQuery.transformQuery(rule.value, { ruleProcessor: (r) => ({
+		const nestedArrayFilter = defaultRuleGroupProcessorDrizzle(require_transformQuery.transformQuery(rule.value, { ruleProcessor: (r) => ({
 			...r,
 			field: arrayElementAlias
-		}) });
-		const nestedArrayFilter = defaultRuleGroupProcessorDrizzle(sqlQuery, {
+		}) }), {
 			...opts,
 			context: {
 				...opts.context,
@@ -867,7 +912,6 @@ const defaultRuleGroupProcessorDrizzle = (ruleGroup, options, _meta) => (columns
 	const { fields, getParseNumberBoolean, placeholderFieldName, placeholderOperatorName, placeholderValueName, validateRule, validationMap } = options;
 	if (!columns || !drizzleOperators) return;
 	const { and, not, or } = drizzleOperators;
-	const query = require_isRuleGroup.isRuleGroupType(ruleGroup) ? ruleGroup : require_convertQuery.convertFromIC(ruleGroup);
 	const ruleProcessor = defaultRuleProcessorDrizzle;
 	const processRuleGroup = (rg, _outermost) => {
 		if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return;
@@ -891,7 +935,7 @@ const defaultRuleGroupProcessorDrizzle = (ruleGroup, options, _meta) => (columns
 		const ruleGroupSQL = rg.combinator === "or" ? or(...processedRules) : and(...processedRules);
 		return rg.not ? not(ruleGroupSQL) : ruleGroupSQL;
 	};
-	return processRuleGroup(query, true);
+	return processRuleGroup(require_convertQuery.convertFromIC(ruleGroup), true);
 };
 
 //#endregion
@@ -903,7 +947,6 @@ const defaultRuleGroupProcessorDrizzle = (ruleGroup, options, _meta) => (columns
 */
 const defaultRuleGroupProcessorElasticSearch = (ruleGroup, options) => {
 	const { fields, getParseNumberBoolean, placeholderFieldName, placeholderOperatorName, placeholderValueName, ruleProcessor, validateRule, validationMap } = options;
-	const query = require_convertQuery.convertFromIC(ruleGroup);
 	const processRuleGroup = (rg) => {
 		if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return false;
 		const processedRules = rg.rules.map((rule) => {
@@ -920,7 +963,7 @@ const defaultRuleGroupProcessorElasticSearch = (ruleGroup, options) => {
 		if (processedRules.length === 0) return false;
 		return { bool: rg.not ? { must_not: /^or$/i.test(rg.combinator) ? { bool: { should: processedRules } } : processedRules } : { [/^or$/i.test(rg.combinator) ? "should" : "must"]: processedRules } };
 	};
-	const processedRuleGroup = processRuleGroup(query);
+	const processedRuleGroup = processRuleGroup(require_convertQuery.convertFromIC(ruleGroup));
 	return processedRuleGroup === false ? {} : processedRuleGroup;
 };
 
@@ -935,19 +978,45 @@ const defaultRuleGroupProcessorJSONata = (ruleGroup, options) => {
 	const { fields, fallbackExpression, getParseNumberBoolean, placeholderFieldName, placeholderOperatorName, placeholderValueName, ruleProcessor, validateRule, validationMap } = options;
 	const processRuleGroup = (rg, outermost) => {
 		if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return outermost ? fallbackExpression : "";
-		const expression = rg.rules.map((rule) => {
-			if (typeof rule === "string") return rule;
-			if (require_isRuleGroup.isRuleGroup(rule)) return processRuleGroup(rule);
+		const processedRules = [];
+		let precedingCombinator = "";
+		let firstRule = true;
+		for (const rule of rg.rules) {
+			if (typeof rule === "string") {
+				precedingCombinator = rule;
+				continue;
+			}
+			if (require_isRuleGroup.isRuleGroup(rule)) {
+				const processedGroup = processRuleGroup(rule);
+				if (processedGroup) {
+					if (!firstRule && precedingCombinator) {
+						processedRules.push(precedingCombinator);
+						precedingCombinator = "";
+					}
+					firstRule = false;
+					processedRules.push(processedGroup);
+				}
+				continue;
+			}
 			const [validationResult, fieldValidator] = validateRule(rule);
-			if (!isRuleOrGroupValid(rule, validationResult, fieldValidator) || rule.field === placeholderFieldName || rule.operator === placeholderOperatorName || placeholderValueName !== void 0 && rule.value === placeholderValueName) return "";
+			if (!isRuleOrGroupValid(rule, validationResult, fieldValidator) || rule.field === placeholderFieldName || rule.operator === placeholderOperatorName || placeholderValueName !== void 0 && rule.value === placeholderValueName) continue;
 			const fieldData = require_optGroupUtils.getOption(fields, rule.field);
-			return ruleProcessor(rule, {
+			const processedRule = ruleProcessor(rule, {
 				...options,
 				parseNumbers: getParseNumberBoolean(fieldData?.inputType),
 				escapeQuotes: (rule.valueSource ?? "value") === "value",
 				fieldData
 			});
-		}).filter(Boolean).join(require_isRuleGroup.isRuleGroupType(rg) ? ` ${rg.combinator} ` : " ");
+			if (processedRule) {
+				if (!firstRule && precedingCombinator) {
+					processedRules.push(precedingCombinator);
+					precedingCombinator = "";
+				}
+				firstRule = false;
+				processedRules.push(processedRule);
+			}
+		}
+		const expression = processedRules.join(require_isRuleGroup.isRuleGroupType(rg) ? ` ${rg.combinator} ` : " ");
 		const [prefix, suffix] = rg.not || !outermost ? [`${rg.not ? "$not" : ""}(`, ")"] : ["", ""];
 		return expression ? `${prefix}${expression}${suffix}` : fallbackExpression;
 	};
@@ -993,7 +1062,6 @@ const defaultRuleGroupProcessorJsonLogic = (ruleGroup, options) => {
 */
 const defaultRuleGroupProcessorLDAP = (ruleGroup, options) => {
 	const { fields, fallbackExpression, getParseNumberBoolean, placeholderFieldName, placeholderOperatorName, placeholderValueName, ruleProcessor, validateRule, validationMap } = options;
-	const query = require_convertQuery.convertFromIC(ruleGroup);
 	const processRuleGroup = (rg, outermost) => {
 		if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return outermost ? fallbackExpression : "";
 		const rules = rg.rules.map((rule) => {
@@ -1013,7 +1081,7 @@ const defaultRuleGroupProcessorLDAP = (ruleGroup, options) => {
 		const [prefix, suffix] = rules.length > 1 ? [`${notPrefix}(${rg.combinator === "or" ? "|" : "&"}`, `)${notSuffix}`] : [notPrefix, notSuffix];
 		return expression ? `${prefix}${expression}${suffix}` : fallbackExpression;
 	};
-	return processRuleGroup(query, true);
+	return processRuleGroup(require_convertQuery.convertFromIC(ruleGroup), true);
 };
 
 //#endregion
@@ -1068,20 +1136,46 @@ const defaultRuleGroupProcessorNL = (ruleGroup, options) => {
 	const processRuleGroup = (rg, outermostOrLonelyInGroup) => {
 		if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return outermostOrLonelyInGroup ? fallbackExpression : "";
 		const rg2 = require_isRuleGroup.isRuleGroupTypeIC(rg) && rg.rules.some((r) => typeof r === "string" && require_isRuleGroup.lc(r) === "xor") ? require_convertQuery.convertFromIC(rg) : rg;
-		const processedRules = rg2.rules.map((rule) => {
-			if (typeof rule === "string") return `, ${translations[rule] ?? rule} `;
-			if (require_isRuleGroup.isRuleGroup(rule)) return processRuleGroup(rule, rg2.rules.length === 1 && !(rg2.not || /^xor$/i.test(rg2.combinator ?? "")));
+		const processedRules = [];
+		let precedingCombinator = "";
+		let firstRule = true;
+		for (const rule of rg2.rules) {
+			if (typeof rule === "string") {
+				precedingCombinator = `, ${translations[rule] ?? rule} `;
+				continue;
+			}
+			if (require_isRuleGroup.isRuleGroup(rule)) {
+				const processedGroup = processRuleGroup(rule, rg2.rules.length === 1 && !(rg2.not || /^xor$/i.test(rg2.combinator ?? "")));
+				// istanbul ignore else
+				if (processedGroup) {
+					if (!firstRule && precedingCombinator) {
+						processedRules.push(precedingCombinator);
+						precedingCombinator = "";
+					}
+					firstRule = false;
+					processedRules.push(processedGroup);
+				}
+				continue;
+			}
 			const [validationResult, fieldValidator] = validateRule(rule);
-			if (!isRuleOrGroupValid(rule, validationResult, fieldValidator) || rule.field === placeholderFieldName || rule.operator === placeholderOperatorName || placeholderValueName !== void 0 && rule.value === placeholderValueName) return "";
+			if (!isRuleOrGroupValid(rule, validationResult, fieldValidator) || rule.field === placeholderFieldName || rule.operator === placeholderOperatorName || placeholderValueName !== void 0 && rule.value === placeholderValueName) continue;
 			const escapeQuotes = (rule.valueSource ?? "value") === "value";
 			const fieldData = require_optGroupUtils.getOption(fields, rule.field);
-			return ruleProcessor(rule, {
+			const processedRule = ruleProcessor(rule, {
 				...options,
 				parseNumbers: getParseNumberBoolean(fieldData?.inputType),
 				escapeQuotes,
 				fieldData
 			});
-		});
+			if (processedRule) {
+				if (!firstRule && precedingCombinator) {
+					processedRules.push(precedingCombinator);
+					precedingCombinator = "";
+				}
+				firstRule = false;
+				processedRules.push(processedRule);
+			}
+		}
 		if (processedRules.length === 0) return fallbackExpression;
 		const isXOR = require_isRuleGroup.lc(rg2.combinator ?? "") === "xor";
 		const combinator = isXOR ? rg2.combinator.slice(1) : rg2.combinator;
@@ -1089,7 +1183,7 @@ const defaultRuleGroupProcessorNL = (ruleGroup, options) => {
 		const [prefixTL, suffixTL] = ["groupPrefix", "groupSuffix"].map((key) => rg2.not ? isXOR ? getNLTranslataion(key, translations, ["not", "xor"]) : getNLTranslataion(key, translations, ["not"]) : isXOR ? getNLTranslataion(key, translations, ["xor"]) : getNLTranslataion(key, translations));
 		const prefix = mustWrap ? `${prefixTL} (`.trim() : "";
 		const suffix = mustWrap ? `) ${suffixTL}`.trim() : "";
-		return `${prefix}${processedRules.filter(Boolean).join(require_isRuleGroup.isRuleGroupType(rg2) ? `, ${translations[combinator] ?? combinator} ` : "")}${suffix}`;
+		return `${prefix}${processedRules.join(require_isRuleGroup.isRuleGroupType(rg2) ? `, ${translations[combinator] ?? combinator} ` : "")}${suffix}`;
 	};
 	return processRuleGroup(ruleGroup, true);
 };
@@ -1139,11 +1233,37 @@ const defaultRuleGroupProcessorParameterized = (ruleGroup, options) => {
 	};
 	const processRuleGroup = (rg, outermostOrLonelyInGroup) => {
 		if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return outermostOrLonelyInGroup ? fallbackExpression : "";
-		const processedRules = rg.rules.map((rule) => {
-			if (typeof rule === "string") return rule;
-			if (require_isRuleGroup.isRuleGroup(rule)) return processRuleGroup(rule, rg.rules.length === 1);
-			return processRule(rule);
-		}).filter(Boolean);
+		const processedRules = [];
+		let precedingCombinator = "";
+		let firstRule = true;
+		for (const rule of rg.rules) {
+			if (typeof rule === "string") {
+				precedingCombinator = rule;
+				continue;
+			}
+			if (require_isRuleGroup.isRuleGroup(rule)) {
+				const processedGroup = processRuleGroup(rule, rg.rules.length === 1);
+				// istanbul ignore else
+				if (processedGroup) {
+					if (!firstRule && precedingCombinator) {
+						processedRules.push(precedingCombinator);
+						precedingCombinator = "";
+					}
+					firstRule = false;
+					processedRules.push(processedGroup);
+				}
+				continue;
+			}
+			const processedRule = processRule(rule);
+			if (processedRule) {
+				if (!firstRule && precedingCombinator) {
+					processedRules.push(precedingCombinator);
+					precedingCombinator = "";
+				}
+				firstRule = false;
+				processedRules.push(processedRule);
+			}
+		}
 		if (processedRules.length === 0) return fallbackExpression;
 		return `${rg.not ? "NOT " : ""}(${processedRules.join(require_isRuleGroup.isRuleGroupType(rg) ? ` ${rg.combinator} ` : " ")})`;
 	};
@@ -1252,20 +1372,46 @@ const defaultRuleGroupProcessorSQL = (ruleGroup, options) => {
 	const { fields, fallbackExpression, getParseNumberBoolean, placeholderFieldName, placeholderOperatorName, placeholderValueName, ruleProcessor, validateRule, validationMap } = options;
 	const processRuleGroup = (rg, outermostOrLonelyInGroup) => {
 		if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return outermostOrLonelyInGroup ? fallbackExpression : "";
-		const processedRules = rg.rules.map((rule) => {
-			if (typeof rule === "string") return rule;
-			if (require_isRuleGroup.isRuleGroup(rule)) return processRuleGroup(rule, rg.rules.length === 1);
+		const processedRules = [];
+		let precedingCombinator = "";
+		let firstRule = true;
+		for (const rule of rg.rules) {
+			if (typeof rule === "string") {
+				precedingCombinator = rule;
+				continue;
+			}
+			if (require_isRuleGroup.isRuleGroup(rule)) {
+				const processedGroup = processRuleGroup(rule, rg.rules.length === 1);
+				// istanbul ignore else
+				if (processedGroup) {
+					if (!firstRule && precedingCombinator) {
+						processedRules.push(precedingCombinator);
+						precedingCombinator = "";
+					}
+					firstRule = false;
+					processedRules.push(processedGroup);
+				}
+				continue;
+			}
 			const [validationResult, fieldValidator] = validateRule(rule);
-			if (!isRuleOrGroupValid(rule, validationResult, fieldValidator) || rule.field === placeholderFieldName || rule.operator === placeholderOperatorName || placeholderValueName !== void 0 && rule.value === placeholderValueName) return "";
+			if (!isRuleOrGroupValid(rule, validationResult, fieldValidator) || rule.field === placeholderFieldName || rule.operator === placeholderOperatorName || placeholderValueName !== void 0 && rule.value === placeholderValueName) continue;
 			const escapeQuotes = (rule.valueSource ?? "value") === "value";
 			const fieldData = require_optGroupUtils.getOption(fields, rule.field);
-			return ruleProcessor(rule, {
+			const processedRule = ruleProcessor(rule, {
 				...options,
 				parseNumbers: getParseNumberBoolean(fieldData?.inputType),
 				escapeQuotes,
 				fieldData
 			});
-		}).filter(Boolean);
+			if (processedRule) {
+				if (!firstRule && precedingCombinator) {
+					processedRules.push(precedingCombinator);
+					precedingCombinator = "";
+				}
+				firstRule = false;
+				processedRules.push(processedRule);
+			}
+		}
 		if (processedRules.length === 0) return fallbackExpression;
 		return `${rg.not ? "NOT " : ""}(${processedRules.join(require_isRuleGroup.isRuleGroupType(rg) ? ` ${rg.combinator} ` : " ")})`;
 	};
@@ -1543,10 +1689,7 @@ const defaultRuleProcessorJsonLogic = (rule, options = {}) => {
 		case "null":
 		case "notnull": return { [`${operatorLC === "notnull" ? "!" : "="}=`]: [fieldObject, null] };
 		case "in":
-		case "notin": {
-			const valueAsArray = require_arrayUtils.toArray(value).map((v) => fieldOrNumberRenderer(v));
-			return negateIfNotOp(operatorLC, { in: [fieldObject, valueAsArray] });
-		}
+		case "notin": return negateIfNotOp(operatorLC, { in: [fieldObject, require_arrayUtils.toArray(value).map((v) => fieldOrNumberRenderer(v))] });
 		case "between":
 		case "notbetween": {
 			const valueAsArray = require_arrayUtils.toArray(value);
@@ -1577,20 +1720,11 @@ const defaultRuleProcessorJsonLogic = (rule, options = {}) => {
 			return false;
 		}
 		case "contains":
-		case "doesnotcontain": {
-			const jsonRule = { in: [fieldOrNumberRenderer(value), fieldObject] };
-			return negateIfNotOp(operatorLC, jsonRule);
-		}
+		case "doesnotcontain": return negateIfNotOp(operatorLC, { in: [fieldOrNumberRenderer(value), fieldObject] });
 		case "beginswith":
-		case "doesnotbeginwith": {
-			const jsonRule = { startsWith: [fieldObject, fieldOrNumberRenderer(value)] };
-			return negateIfNotOp(operatorLC, jsonRule);
-		}
+		case "doesnotbeginwith": return negateIfNotOp(operatorLC, { startsWith: [fieldObject, fieldOrNumberRenderer(value)] });
 		case "endswith":
-		case "doesnotendwith": {
-			const jsonRule = { endsWith: [fieldObject, fieldOrNumberRenderer(value)] };
-			return negateIfNotOp(operatorLC, jsonRule);
-		}
+		case "doesnotendwith": return negateIfNotOp(operatorLC, { endsWith: [fieldObject, fieldOrNumberRenderer(value)] });
 	}
 	return false;
 };
@@ -1625,10 +1759,7 @@ const defaultRuleProcessorLDAP = (rule, options = {}) => {
 		case "null":
 		case "notnull": return negateIf(`(${field}=*)`, operatorLC === "notnull");
 		case "in":
-		case "notin": {
-			const valueAsArray = require_arrayUtils.toArray(value);
-			return negateIf(`(|${valueAsArray.map((val) => `(${field}=${ldapEscape(val)})`).join("")})`, operatorLC === "notin");
-		}
+		case "notin": return negateIf(`(|${require_arrayUtils.toArray(value).map((val) => `(${field}=${ldapEscape(val)})`).join("")})`, operatorLC === "notin");
 		case "between":
 		case "notbetween": {
 			const valueAsArray = require_arrayUtils.toArray(value);
@@ -1796,10 +1927,9 @@ const defaultRuleProcessorNL = (rule, opts) => {
 	});
 	const operatorLC = require_isRuleGroup.lc(operator);
 	if ((operatorLC === "in" || operatorLC === "notin" || operatorLC === "between" || operatorLC === "notbetween") && !value) return "";
-	const processedOperator = operatorProcessor(rule, opts);
 	const wordOrderMap = {
 		S: processedField,
-		V: processedOperator,
+		V: operatorProcessor(rule, opts),
 		O: value
 	};
 	return normalizeConstituentWordOrder(wordOrder).map((term) => `${wordOrderMap[term]}`).join(" ").trim();
@@ -2182,8 +2312,8 @@ const defaultFormatQueryOptions = {
 	paramsKeepPrefix: false,
 	numberedParams: false,
 	preserveValueOrder: false,
-	placeholderFieldName: require_arrayUtils.defaultPlaceholderFieldName,
-	placeholderOperatorName: require_arrayUtils.defaultPlaceholderOperatorName,
+	placeholderFieldName: require_optGroupUtils.defaultPlaceholderFieldName,
+	placeholderOperatorName: require_optGroupUtils.defaultPlaceholderOperatorName,
 	quoteValuesWith: "'",
 	concatOperator: "||",
 	preset: "ansi",