@react-querybuilder/core 8.12.0 → 8.14.0

package/dist/react-querybuilder_core.legacy-esm.js

@@ -695,7 +695,7 @@ const isRuleGroupType = (rg) => isRuleGroup(rg) && typeof rg.combinator === "str
 const isRuleGroupTypeIC = (rg) => isRuleGroup(rg) && rg.combinator === void 0;
 
 //#endregion
-//#region \0@oxc-project+runtime@0.96.0/helpers/typeof.js
+//#region \0@oxc-project+runtime@0.103.0/helpers/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o$1) {
@@ -706,7 +706,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.96.0/helpers/toPrimitive.js
+//#region \0@oxc-project+runtime@0.103.0/helpers/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -719,14 +719,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.96.0/helpers/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.103.0/helpers/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.96.0/helpers/defineProperty.js
+//#region \0@oxc-project+runtime@0.103.0/helpers/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -737,7 +737,7 @@ function _defineProperty(e, r, t) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.96.0/helpers/objectSpread2.js
+//#region \0@oxc-project+runtime@0.103.0/helpers/objectSpread2.js
 function ownKeys(e, r) {
 	var t = Object.keys(e);
 	if (Object.getOwnPropertySymbols) {
@@ -761,7 +761,7 @@ function _objectSpread2(e) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.96.0/helpers/objectWithoutPropertiesLoose.js
+//#region \0@oxc-project+runtime@0.103.0/helpers/objectWithoutPropertiesLoose.js
 function _objectWithoutPropertiesLoose(r, e) {
 	if (null == r) return {};
 	var t = {};
@@ -773,7 +773,7 @@ function _objectWithoutPropertiesLoose(r, e) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.96.0/helpers/objectWithoutProperties.js
+//#region \0@oxc-project+runtime@0.103.0/helpers/objectWithoutProperties.js
 function _objectWithoutProperties(e, t) {
 	if (null == e) return {};
 	var o, r, i = _objectWithoutPropertiesLoose(e, t);
@@ -2649,7 +2649,27 @@ const defaultRuleProcessorElasticSearch = (rule, options = {}) => {
 	const { field, operator, value, valueSource } = rule;
 	const { parseNumbers, preserveValueOrder } = options;
 	const operatorLC = lc(operator);
-	if (processMatchMode(rule)) return false;
+	const matchEval = processMatchMode(rule);
+	if (matchEval === false) return false;
+	else if (matchEval) {
+		const { mode } = matchEval;
+		const subQuery = defaultRuleGroupProcessorElasticSearch(transformQuery(rule.value, { ruleProcessor: (r) => _objectSpread2(_objectSpread2({}, r), {}, { field: r.field ? `${field}.${r.field}` : field }) }), options);
+		if (Object.keys(subQuery).length === 0) return false;
+		switch (mode) {
+			case "some": return { nested: {
+				path: field,
+				query: subQuery
+			} };
+			case "none": return { bool: { must_not: { nested: {
+				path: field,
+				query: subQuery
+			} } } };
+			case "all":
+			case "atleast":
+			case "atmost":
+			case "exactly": return false;
+		}
+	}
 	if (valueSource === "field") {
 		if (toArray(value).some((v) => typeof v !== "string")) return false;
 		const fieldForScript = escapeSQ(field);
@@ -3024,7 +3044,8 @@ const defaultValueProcessorNL = (rule, opts = {}) => {
 				var _getOption$label2, _getOption2, _ref2;
 				return valueIsField ? wrapFieldName((_getOption$label2 = (_getOption2 = getOption((_ref2 = fields) !== null && _ref2 !== void 0 ? _ref2 : [], v)) === null || _getOption2 === void 0 ? void 0 : _getOption2.label) !== null && _getOption$label2 !== void 0 ? _getOption$label2 : 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;
@@ -3070,17 +3091,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 = getOption(toFullOptionList((_getOperators = getOperators(field, { fieldData: (_opts$fieldData = opts.fieldData) !== null && _opts$fieldData !== void 0 ? _opts$fieldData : {
 		name: field,
 		value: field,
 		label: field
-	} })) !== null && _getOperators !== void 0 ? _getOperators : []), operator)) !== null && _getOption !== void 0 ? _getOption : {
-		name: operator,
-		value: operator,
-		label: operator
+	} })) !== null && _getOperators !== void 0 ? _getOperators : []), normalizedOperator)) !== null && _getOption !== void 0 ? _getOption : {
+		name: normalizedOperator,
+		value: normalizedOperator,
+		label: normalizedOperator
 	};
 	const operatorTL = (_ref = (_operatorMap = operatorMap[operatorNL]) !== null && _operatorMap !== void 0 ? _operatorMap : operatorMap[lc(operatorNL)]) !== null && _ref !== void 0 ? _ref : [label, label];
 	return typeof operatorTL === "string" ? operatorTL : operatorTL[valueSource === "field" ? 1 : 0];