@react-querybuilder/core 8.20.2 → 8.21.1

package/dist/formatQuery.mjs

@@ -1,7 +1,7 @@
-import { D as toArray, O as trimIfString, S as toFlatOptionArray, T as parseNumber, _ as shouldRenderAsNumber, a as getNLTranslataion, c as isValidValue, d as mapSQLOperator, f as mongoOperators, g as processMatchMode, h as prismaOperators, i as defaultNLTranslations, l as isValueProcessorLegacy, m as numerifyValues, n as bigIntJsonStringifyReplacer, o as getQuoteFieldNamesWithArray, p as normalizeConstituentWordOrder, r as celCombinatorMap, s as getQuotedFieldName, t as bigIntJsonParseReviver, u as jsonLogicAdditionalOperators, v as getParseNumberMethod, w as toFullOptionList, y as getOption } from "./utils-CJRGiPb-.mjs";
-import { a as isRuleGroupTypeIC, c as nullOrUndefinedOrEmpty, i as isRuleGroupType, l as numericRegex, o as isPojo, r as isRuleGroup, s as lc } from "./objectUtils-ZvPkF6u6.mjs";
+import { A as parseNumber, C as getParseNumberMethod, D as toFlatOptionArray, M as toArray, N as trimIfString, S as wrapLikeFragment, _ as prismaOperators, a as getLikeWildcards, b as stripParamPrefix, c as getQuotedFieldName, d as isValueProcessorLegacy, f as jsonLogicAdditionalOperators, g as numerifyValues, h as normalizeConstituentWordOrder, i as defaultNLTranslations, k as toFullOptionList, l as getSQLConcat, m as mongoOperators, n as bigIntJsonStringifyReplacer, o as getNLTranslataion, p as mapSQLOperator, r as celCombinatorMap, s as getQuoteFieldNamesWithArray, t as bigIntJsonParseReviver, u as isValidValue, v as processMatchMode, w as getOption, x as withParamPrefix, y as shouldRenderAsNumber } from "./utils-Dt0D_DMV.mjs";
+import { a as lc, i as isPojo, n as isRuleGroupType, o as nullOrUndefinedOrEmpty, r as isRuleGroupTypeIC, s as numericRegex, t as isRuleGroup } from "./isRuleGroup-CqLThsbu.mjs";
 import { transformQuery } from "./transformQuery.mjs";
-import { t as convertFromIC } from "./convertQuery-J1CaoDxe.mjs";
+import { t as convertFromIC } from "./convertQuery-D_4J7E-Z.mjs";
 //#region src/utils/isRuleOrGroupValid.ts
 /**
 * Determines if an object is useful as a validation result.
@@ -91,7 +91,7 @@ const escapeDoubleQuotes$1 = (v, escapeQuotes) => typeof v !== "string" || !esca
 const defaultRuleProcessorCEL = (rule, opts = {}) => {
 	const { escapeQuotes, parseNumbers, preserveValueOrder } = opts;
 	const { field, operator, value, valueSource } = rule;
-	const valueIsField = valueSource === "field";
+	const valueIsField = valueSource === "field" || valueSource === "parameter";
 	const operatorTL = lc(operator === "=" ? "==" : operator);
 	const useBareValue = typeof value === "number" || typeof value === "boolean" || typeof value === "bigint" || shouldRenderAsNumber(value, parseNumbers);
 	const matchEval = processMatchMode(rule);
@@ -412,7 +412,7 @@ const escapeSingleQuotes$2 = (v, escapeQuotes) => typeof v !== "string" || !esca
 const defaultRuleProcessorSpEL = (rule, opts = {}) => {
 	const { field, operator, value, valueSource } = rule;
 	const { escapeQuotes, parseNumbers, preserveValueOrder } = opts;
-	const valueIsField = valueSource === "field";
+	const valueIsField = valueSource === "field" || valueSource === "parameter";
 	const operatorTL = lc(operator === "=" ? "==" : operator);
 	const useBareValue = typeof value === "number" || typeof value === "boolean" || typeof value === "bigint" || shouldRenderAsNumber(value, parseNumbers);
 	const matchEval = processMatchMode(rule);
@@ -446,11 +446,20 @@ const defaultRuleProcessorSpEL = (rule, opts = {}) => {
 		case ">":
 		case ">=": return `${field} ${operatorTL} ${valueIsField || useBareValue ? trimIfString(value) : `'${escapeSingleQuotes$2(value, escapeQuotes)}'`}`;
 		case "contains":
-		case "doesnotcontain": return wrapInNegation(`${field} matches ${valueIsField || useBareValue ? trimIfString(value) : `'${escapeSingleQuotes$2(value, escapeQuotes)}'`}`, shouldNegate$1(operatorTL));
+		case "doesnotcontain": {
+			const valueTL = valueIsField ? `'.*'.concat(${trimIfString(value)}).concat('.*')` : `'.*${escapeSingleQuotes$2(value, escapeQuotes)}.*'`;
+			return wrapInNegation(`${field} matches ${valueTL}`, shouldNegate$1(operatorTL));
+		}
 		case "beginswith":
-		case "doesnotbeginwith": return wrapInNegation(`${field} matches ${valueIsField ? `'^'.concat(${trimIfString(value)})` : `'${typeof value === "string" && !value.startsWith("^") || useBareValue ? "^" : ""}${escapeSingleQuotes$2(value, escapeQuotes)}'`}`, shouldNegate$1(operatorTL));
+		case "doesnotbeginwith": {
+			const valueTL = valueIsField ? `'^'.concat(${trimIfString(value)}).concat('.*')` : `'${typeof value === "string" && !value.startsWith("^") || useBareValue ? "^" : ""}${escapeSingleQuotes$2(value, escapeQuotes)}.*'`;
+			return wrapInNegation(`${field} matches ${valueTL}`, shouldNegate$1(operatorTL));
+		}
 		case "endswith":
-		case "doesnotendwith": return wrapInNegation(`${field} matches ${valueIsField ? `${trimIfString(value)}.concat('$')` : `'${escapeSingleQuotes$2(value, escapeQuotes)}${typeof value === "string" && !value.endsWith("$") || useBareValue ? "$" : ""}'`}`, shouldNegate$1(operatorTL));
+		case "doesnotendwith": {
+			const valueTL = valueIsField ? `'.*'.concat(${trimIfString(value)}).concat('$')` : `'.*${escapeSingleQuotes$2(value, escapeQuotes)}${typeof value === "string" && !value.endsWith("$") || useBareValue ? "$" : ""}'`;
+			return wrapInNegation(`${field} matches ${valueTL}`, shouldNegate$1(operatorTL));
+		}
 		case "null": return `${field} == null`;
 		case "notnull": return `${field} != null`;
 		case "in":
@@ -488,7 +497,35 @@ const escapeStringValueQuotes$1 = (v, quoteChar, escapeQuotes) => escapeQuotes &
 *
 * @group Export
 */
-const defaultValueProcessorByRule = ({ operator, value, valueSource }, { escapeQuotes, parseNumbers, preserveValueOrder, quoteFieldNamesWith, quoteValuesWith, concatOperator = "||", fieldIdentifierSeparator, wrapValueWith = ["", ""], translations } = {}) => {
+const defaultValueProcessorByRule = ({ operator, value, valueSource }, { escapeQuotes, parseNumbers, preserveValueOrder, quoteFieldNamesWith, quoteValuesWith, concatOperator = "||", fieldIdentifierSeparator, paramPrefix, wrapValueWith = ["", ""], translations } = {}) => {
+	if (valueSource === "parameter") {
+		const operatorLowerCase = lc(operator);
+		if (operatorLowerCase === "between" || operatorLowerCase === "notbetween") {
+			const valueAsArray = toArray(value, { retainEmptyStrings: true });
+			if (valueAsArray.length < 2 || !isValidValue(valueAsArray[0]) || !isValidValue(valueAsArray[1])) return "";
+			const [first, second] = valueAsArray;
+			return [withParamPrefix(first, paramPrefix), withParamPrefix(second, paramPrefix)].join(` ${translations?.betweenAnd ?? translations?.and ?? "and"} `);
+		}
+		if (operatorLowerCase === "in" || operatorLowerCase === "notin") {
+			const valueAsArray = toArray(value);
+			if (valueAsArray.length === 0) return "";
+			return `(${valueAsArray.map((v) => withParamPrefix(v, paramPrefix)).join(", ")})`;
+		}
+		const paramRef = withParamPrefix(value, paramPrefix);
+		switch (operatorLowerCase) {
+			case "contains":
+			case "doesnotcontain":
+			case "beginswith":
+			case "doesnotbeginwith":
+			case "endswith":
+			case "doesnotendwith": return wrapLikeFragment(paramRef, operatorLowerCase, {
+				concatOperator,
+				quoteValuesWith,
+				wrapValueWith
+			});
+		}
+		return paramRef;
+	}
 	const valueIsField = valueSource === "field";
 	const operatorLowerCase = lc(operator);
 	const quoteChar = quoteValuesWith || "'";
@@ -499,7 +536,11 @@ const defaultValueProcessorByRule = ({ operator, value, valueSource }, { escapeQ
 		quoteFieldNamesWith,
 		fieldIdentifierSeparator
 	});
-	const concat = (...values) => concatOperator.toUpperCase() === "CONCAT" ? `CONCAT(${values.join(", ")})` : values.join(` ${concatOperator} `);
+	const likeOpts = {
+		concatOperator,
+		quoteValuesWith,
+		wrapValueWith
+	};
 	switch (operatorLowerCase) {
 		case "null":
 		case "notnull": return "";
@@ -526,11 +567,11 @@ const defaultValueProcessorByRule = ({ operator, value, valueSource }, { escapeQ
 			return (valueIsField ? valsOneAndTwoOnly.map((v) => wrapFieldName(v)) : valsOneAndTwoOnly.every((v) => shouldRenderAsNumber(v, parseNumbers)) ? valsOneAndTwoOnly.map((v) => parseNumber(v, { parseNumbers: "strict" })) : valsOneAndTwoOnly.map((v) => wrapAndEscape(v))).join(` ${translations?.betweenAnd ?? translations?.and ?? "and"} `);
 		}
 		case "contains":
-		case "doesnotcontain": return valueIsField ? concat(quoteValue("%"), wrapFieldName(value), quoteValue("%")) : quoteValue(`%${escapeValue(value)}%`);
+		case "doesnotcontain": return valueIsField ? wrapLikeFragment(wrapFieldName(value), operatorLowerCase, likeOpts) : quoteValue(`%${escapeValue(value)}%`);
 		case "beginswith":
-		case "doesnotbeginwith": return valueIsField ? concat(wrapFieldName(value), quoteValue("%")) : quoteValue(`${escapeValue(value)}%`);
+		case "doesnotbeginwith": return valueIsField ? wrapLikeFragment(wrapFieldName(value), operatorLowerCase, likeOpts) : quoteValue(`${escapeValue(value)}%`);
 		case "endswith":
-		case "doesnotendwith": return valueIsField ? concat(quoteValue("%"), wrapFieldName(value)) : quoteValue(`%${escapeValue(value)}`);
+		case "doesnotendwith": return valueIsField ? wrapLikeFragment(wrapFieldName(value), operatorLowerCase, likeOpts) : quoteValue(`%${escapeValue(value)}`);
 	}
 	if (typeof value === "boolean") return value ? "TRUE" : "FALSE";
 	return valueIsField ? wrapFieldName(value) : shouldRenderAsNumber(value, parseNumbers) ? `${trimIfString(value)}` : `${wrapAndEscape(value)}`;
@@ -2102,7 +2143,10 @@ const defaultRuleProcessorJsonLogic = (rule, options = {}) => {
 		case "null":
 		case "notnull": return { [`${operatorLC === "notnull" ? "!" : "="}=`]: [fieldObject, null] };
 		case "in":
-		case "notin": return negateIfNotOp(operatorLC, { in: [fieldObject, toArray(value).map((v) => fieldOrNumberRenderer(v))] });
+		case "notin": {
+			const valueAsArray = toArray(value).map((v) => fieldOrNumberRenderer(v));
+			return negateIfNotOp(operatorLC, { in: [fieldObject, valueAsArray] });
+		}
 		case "between":
 		case "notbetween": {
 			const valueAsArray = toArray(value);
@@ -2133,11 +2177,20 @@ const defaultRuleProcessorJsonLogic = (rule, options = {}) => {
 			return false;
 		}
 		case "contains":
-		case "doesnotcontain": return negateIfNotOp(operatorLC, { in: [fieldOrNumberRenderer(value), fieldObject] });
+		case "doesnotcontain": {
+			const jsonRule = { in: [fieldOrNumberRenderer(value), fieldObject] };
+			return negateIfNotOp(operatorLC, jsonRule);
+		}
 		case "beginswith":
-		case "doesnotbeginwith": return negateIfNotOp(operatorLC, { startsWith: [fieldObject, fieldOrNumberRenderer(value)] });
+		case "doesnotbeginwith": {
+			const jsonRule = { startsWith: [fieldObject, fieldOrNumberRenderer(value)] };
+			return negateIfNotOp(operatorLC, jsonRule);
+		}
 		case "endswith":
-		case "doesnotendwith": return negateIfNotOp(operatorLC, { endsWith: [fieldObject, fieldOrNumberRenderer(value)] });
+		case "doesnotendwith": {
+			const jsonRule = { endsWith: [fieldObject, fieldOrNumberRenderer(value)] };
+			return negateIfNotOp(operatorLC, jsonRule);
+		}
 	}
 	return false;
 };
@@ -2171,7 +2224,10 @@ const defaultRuleProcessorLDAP = (rule, options = {}) => {
 		case "null":
 		case "notnull": return negateIf(`(${field}=*)`, operatorLC === "notnull");
 		case "in":
-		case "notin": return negateIf(`(|${toArray(value).map((val) => `(${field}=${ldapEscape(val)})`).join("")})`, operatorLC === "notin");
+		case "notin": {
+			const valueAsArray = toArray(value);
+			return negateIf(`(|${valueAsArray.map((val) => `(${field}=${ldapEscape(val)})`).join("")})`, operatorLC === "notin");
+		}
 		case "between":
 		case "notbetween": {
 			const valueAsArray = toArray(value);
@@ -2482,7 +2538,22 @@ const defaultRuleProcessorParameterized = (rule, opts, meta) => {
 	const [qPre, qPost] = quoteFieldNamesWith;
 	if ((sqlOperatorLowerCase === "in" || sqlOperatorLowerCase === "not in" || sqlOperatorLowerCase === "between" || sqlOperatorLowerCase === "not between") && !value) return finalize("");
 	else if (sqlOperatorLowerCase === "is null" || sqlOperatorLowerCase === "is not null") return finalize(`${qPre}${rule.field}${qPost} ${sqlOperator}`);
-	else if (rule.valueSource === "field") return finalize(`${qPre}${rule.field}${qPost} ${sqlOperator} ${value}`.trim());
+	else if (rule.valueSource === "parameter") {
+		const registerParam = (v) => {
+			const ref = withParamPrefix(v, paramPrefix);
+			if (!parameterized) paramsNamed[paramsKeepPrefix ? ref : stripParamPrefix(v, paramPrefix)] = null;
+			return ref;
+		};
+		if (sqlOperatorLowerCase === "between" || sqlOperatorLowerCase === "not between") {
+			const [first, second] = toArray(rule.value, { retainEmptyStrings: true }).slice(0, 2);
+			return finalize(`${qPre}${rule.field}${qPost} ${sqlOperator} ${registerParam(first)} and ${registerParam(second)}`.trim());
+		}
+		if (sqlOperatorLowerCase === "in" || sqlOperatorLowerCase === "not in") {
+			const splitValue = toArray(rule.value);
+			return finalize(`${qPre}${rule.field}${qPost} ${sqlOperator} (${splitValue.map((v) => registerParam(v)).join(", ")})`);
+		}
+		return finalize(`${qPre}${rule.field}${qPost} ${sqlOperator} ${wrapLikeFragment(registerParam(rule.value), lc(rule.operator), { concatOperator })}`.trim());
+	} else if (rule.valueSource === "field") return finalize(`${qPre}${rule.field}${qPost} ${sqlOperator} ${value}`.trim());
 	else if (sqlOperatorLowerCase === "in" || sqlOperatorLowerCase === "not in") {
 		const splitValue = toArray(rule.value);
 		if (parameterized) {
@@ -2674,7 +2745,9 @@ const defaultRuleProcessorSPARQL = (rule, opts = {}) => {
 		if (typeof v === "bigint") return String(v);
 		if (valueIsField) return sparqlVar(trimIfString(v));
 		if (typeof v === "number" || shouldRenderAsNumber(v, parseNumbers)) return trimIfString(v);
+		/* v8 ignore start -- @preserve */
 		const s = typeof v === "string" ? v : JSON.stringify(v) ?? "";
+		/* v8 ignore stop -- @preserve */
 		if (s.startsWith("?") || s.startsWith("<") || s.includes(":")) return s;
 		return `"${escapeDoubleQuotes(s, escapeQuotes)}"`;
 	};
@@ -2997,6 +3070,10 @@ function formatQuery(ruleGroup, optionParam = {}) {
 				if (typeof field.validator === "function") fieldValidator = field.validator;
 			}
 		}
+		if (rule.valueSource === "parameter" && typeof optObj.getParameters === "function") {
+			const fieldData = getOption(fields, rule.field);
+			if (!new Set(toFlatOptionArray(toFullOptionList(optObj.getParameters(rule.field, rule.operator, { fieldData }))).map((p) => stripParamPrefix(p.value, optObj.paramPrefix))).has(stripParamPrefix(rule.value, optObj.paramPrefix))) validationResult = false;
+		}
 		return [validationResult, fieldValidator];
 	};
 	const finalOptions = {
@@ -3099,6 +3176,6 @@ const defaultValueProcessorMongoDBByRule = defaultRuleProcessorMongoDB;
 */
 const defaultValueProcessorSpELByRule = defaultRuleProcessorSpEL;
 //#endregion
-export { bigIntJsonParseReviver, bigIntJsonStringifyReplacer, celCombinatorMap, cypherCombinatorMap, defaultCELValueProcessor, defaultExportOperatorMap, defaultMongoDBValueProcessor, defaultNLTranslations, defaultOperatorProcessorNL, defaultOperatorProcessorSQL, defaultRuleGroupProcessorCEL, defaultRuleGroupProcessorCypher, defaultRuleGroupProcessorDiagnostics, defaultRuleGroupProcessorDrizzle, defaultRuleGroupProcessorElasticSearch, defaultRuleGroupProcessorGremlin, defaultRuleGroupProcessorJSONata, defaultRuleGroupProcessorJsonLogic, defaultRuleGroupProcessorLDAP, defaultRuleGroupProcessorMongoDB, defaultRuleGroupProcessorMongoDBQuery, defaultRuleGroupProcessorNL, defaultRuleGroupProcessorParameterized, defaultRuleGroupProcessorPrisma, defaultRuleGroupProcessorSPARQL, defaultRuleGroupProcessorSQL, defaultRuleGroupProcessorSequelize, defaultRuleGroupProcessorSpEL, defaultRuleGroupProcessorTanStackDB, defaultRuleProcessorCEL, defaultRuleProcessorCypher, defaultRuleProcessorDrizzle, defaultRuleProcessorElasticSearch, defaultRuleProcessorGremlin, defaultRuleProcessorJSONata, defaultRuleProcessorJsonLogic, defaultRuleProcessorLDAP, defaultRuleProcessorMongoDB, defaultRuleProcessorMongoDBQuery, defaultRuleProcessorNL, defaultRuleProcessorParameterized, defaultRuleProcessorPrisma, defaultRuleProcessorSPARQL, defaultRuleProcessorSQL, defaultRuleProcessorSequelize, defaultRuleProcessorSpEL, defaultRuleProcessorTanStackDB, defaultSpELValueProcessor, defaultValueProcessor, defaultValueProcessorByRule, defaultValueProcessorCELByRule, defaultValueProcessorMongoDBByRule, defaultValueProcessorNL, defaultValueProcessorSpELByRule, formatQuery, formatQueryOptionPresets, getNLTranslataion, getQuoteFieldNamesWithArray, getQuotedFieldName, isValidValue, isValueProcessorLegacy, jsonLogicAdditionalOperators, mapSQLOperator, mongoDbFallback, mongoOperators, normalizeConstituentWordOrder, numerifyValues, prismaFallback, prismaOperators, processMatchMode, shouldRenderAsNumber, sparqlVar, sqlDialectPresets };
+export { bigIntJsonParseReviver, bigIntJsonStringifyReplacer, celCombinatorMap, cypherCombinatorMap, defaultCELValueProcessor, defaultExportOperatorMap, defaultMongoDBValueProcessor, defaultNLTranslations, defaultOperatorProcessorNL, defaultOperatorProcessorSQL, defaultRuleGroupProcessorCEL, defaultRuleGroupProcessorCypher, defaultRuleGroupProcessorDiagnostics, defaultRuleGroupProcessorDrizzle, defaultRuleGroupProcessorElasticSearch, defaultRuleGroupProcessorGremlin, defaultRuleGroupProcessorJSONata, defaultRuleGroupProcessorJsonLogic, defaultRuleGroupProcessorLDAP, defaultRuleGroupProcessorMongoDB, defaultRuleGroupProcessorMongoDBQuery, defaultRuleGroupProcessorNL, defaultRuleGroupProcessorParameterized, defaultRuleGroupProcessorPrisma, defaultRuleGroupProcessorSPARQL, defaultRuleGroupProcessorSQL, defaultRuleGroupProcessorSequelize, defaultRuleGroupProcessorSpEL, defaultRuleGroupProcessorTanStackDB, defaultRuleProcessorCEL, defaultRuleProcessorCypher, defaultRuleProcessorDrizzle, defaultRuleProcessorElasticSearch, defaultRuleProcessorGremlin, defaultRuleProcessorJSONata, defaultRuleProcessorJsonLogic, defaultRuleProcessorLDAP, defaultRuleProcessorMongoDB, defaultRuleProcessorMongoDBQuery, defaultRuleProcessorNL, defaultRuleProcessorParameterized, defaultRuleProcessorPrisma, defaultRuleProcessorSPARQL, defaultRuleProcessorSQL, defaultRuleProcessorSequelize, defaultRuleProcessorSpEL, defaultRuleProcessorTanStackDB, defaultSpELValueProcessor, defaultValueProcessor, defaultValueProcessorByRule, defaultValueProcessorCELByRule, defaultValueProcessorMongoDBByRule, defaultValueProcessorNL, defaultValueProcessorSpELByRule, formatQuery, formatQueryOptionPresets, getLikeWildcards, getNLTranslataion, getQuoteFieldNamesWithArray, getQuotedFieldName, getSQLConcat, isValidValue, isValueProcessorLegacy, jsonLogicAdditionalOperators, mapSQLOperator, mongoDbFallback, mongoOperators, normalizeConstituentWordOrder, numerifyValues, prismaFallback, prismaOperators, processMatchMode, shouldRenderAsNumber, sparqlVar, sqlDialectPresets, stripParamPrefix, withParamPrefix, wrapLikeFragment };
 
 //# sourceMappingURL=formatQuery.mjs.map