@react-querybuilder/core 8.16.0 → 8.16.1

package/dist/formatQuery.mjs

@@ -523,7 +523,7 @@ const defaultValueProcessorByRule = ({ operator, value, valueSource }, { escapeQ
 				valsOneAndTwoOnly[0] = secondNum;
 				valsOneAndTwoOnly[1] = firstNum;
 			}
-			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?.and ?? "and"} `);
+			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)}%`);
@@ -998,7 +998,7 @@ const defaultRuleGroupProcessorNL = (ruleGroup, options) => {
 		let firstRule = true;
 		for (const rule of rg2.rules) {
 			if (typeof rule === "string") {
-				precedingCombinator = `, ${translations[rule] ?? rule} `;
+				precedingCombinator = `${translations.ruleSeparator ?? ", "}${translations[rule] ?? rule} `;
 				continue;
 			}
 			if (isRuleGroup(rule)) {
@@ -1040,7 +1040,8 @@ 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.join(isRuleGroupType(rg2) ? `, ${translations[combinator] ?? combinator} ` : "")}${suffix}`;
+		const sep = translations.ruleSeparator ?? ", ";
+		return `${prefix}${processedRules.join(isRuleGroupType(rg2) ? `${sep}${translations[combinator] ?? combinator} ` : "")}${suffix}`;
 	};
 	return processRuleGroup(ruleGroup, true);
 };
@@ -2167,6 +2168,8 @@ const defaultValueProcessorNL = (rule, opts = {}) => {
 	const orTL = t.or ?? "or";
 	const trueTL = t.true ?? "true";
 	const falseTL = t.false ?? "false";
+	const listSep = t.listSeparator ?? ", ";
+	const useOxfordComma = !t.listSeparator;
 	switch (operatorLowerCase) {
 		case "null":
 		case "notnull": return "";
@@ -2186,7 +2189,8 @@ const defaultValueProcessorNL = (rule, opts = {}) => {
 			if (valueAsArray.length === 0) return "";
 			const valStringArray = valueAsArray.map((v) => valueIsField ? wrapFieldName(getOption(fields ?? [], v)?.label ?? v) : shouldRenderAsNumber(v, parseNumbers) ? `${trimIfString(v)}` : `${wrapAndEscape(v)}`);
 			if (valStringArray.length === 1) return valStringArray[0];
-			return `(${`${valStringArray.slice(0, -1).join(", ")}${valStringArray.length > 2 ? "," : ""} ${orTL} ${valStringArray.at(-1)}`})`;
+			const oxfordComma = useOxfordComma && valStringArray.length > 2 ? "," : "";
+			return `(${`${valStringArray.slice(0, -1).join(listSep)}${oxfordComma} ${orTL} ${valStringArray.at(-1)}`})`;
 		}
 	}
 	if (typeof rule.value === "boolean") return rule.value ? trueTL : falseTL;
@@ -2299,7 +2303,14 @@ const defaultRuleProcessorNL = (rule, opts) => {
 		V: operatorProcessor(rule, opts),
 		O: value
 	};
-	return normalizeConstituentWordOrder(wordOrder).map((term) => `${wordOrderMap[term]}`).join(" ").trim();
+	const translations = opts?.translations ?? {};
+	const suffixMap = {
+		S: translations.afterSubject ?? " ",
+		V: translations.afterVerb ?? " ",
+		O: translations.afterObject ?? " "
+	};
+	const wordOrderTuple = normalizeConstituentWordOrder(wordOrder).filter((term) => wordOrderMap[term] !== "");
+	return wordOrderTuple.map((term, i) => `${wordOrderMap[term]}${i < wordOrderTuple.length - 1 ? suffixMap[term] : ""}`).join("").trim();
 };
 //#endregion
 //#region src/utils/formatQuery/defaultRuleProcessorSQL.ts
@@ -2593,6 +2604,11 @@ const defaultRuleProcessorSequelize = (rule, { parseNumbers, preserveValueOrder,
 //#endregion
 //#region src/utils/formatQuery/defaultRuleProcessorSPARQL.ts
 const escapeDoubleQuotes = (v, escapeQuotes) => typeof v !== "string" || !escapeQuotes ? `${v}` : v.replaceAll(`"`, `\\"`);
+/** Auto-prefix a SPARQL variable name with `?` unless it's already prefixed, a URI, or a prefixed name.
+*
+* @group Export
+*/
+const sparqlVar = (name) => /^[?<]/.test(name) || name.includes(":") ? name : `?${name}`;
 /**
 * Default rule processor used by {@link formatQuery} for "sparql" format.
 *
@@ -2600,14 +2616,15 @@ const escapeDoubleQuotes = (v, escapeQuotes) => typeof v !== "string" || !escape
 */
 const defaultRuleProcessorSPARQL = (rule, opts = {}) => {
 	const { escapeQuotes, parseNumbers } = opts;
-	const { field, operator, value, valueSource } = rule;
+	const { field: rawField, operator, value, valueSource } = rule;
 	const valueIsField = valueSource === "field";
 	const operatorTL = operator.toLowerCase();
+	const field = sparqlVar(rawField);
 	const fmtVal = (v) => {
 		if (v === null || v === void 0) return "\"\"";
 		if (typeof v === "boolean") return `"${v}"^^xsd:boolean`;
 		if (typeof v === "bigint") return String(v);
-		if (valueIsField) return trimIfString(v);
+		if (valueIsField) return sparqlVar(trimIfString(v));
 		if (typeof v === "number" || shouldRenderAsNumber(v, parseNumbers)) return trimIfString(v);
 		const s = typeof v === "string" ? v : JSON.stringify(v) ?? "";
 		if (s.startsWith("?") || s.startsWith("<") || s.includes(":")) return s;
@@ -2632,12 +2649,12 @@ const defaultRuleProcessorSPARQL = (rule, opts = {}) => {
 		case "in": {
 			const items = toArray(value).map(fmtVal);
 			if (!items.length) return "";
-			return items.map((item) => `${field} = ${item}`).join(" || ");
+			return `${field} IN (${items.join(", ")})`;
 		}
 		case "notin": {
 			const items = toArray(value).map(fmtVal);
 			if (!items.length) return "";
-			return items.map((item) => `${field} != ${item}`).join(" && ");
+			return `${field} NOT IN (${items.join(", ")})`;
 		}
 		case "between": {
 			const arr = toArray(value);
@@ -2938,6 +2955,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, defaultRuleProcessorCEL, defaultRuleProcessorCypher, defaultRuleProcessorDrizzle, defaultRuleProcessorElasticSearch, defaultRuleProcessorGremlin, defaultRuleProcessorJSONata, defaultRuleProcessorJsonLogic, defaultRuleProcessorLDAP, defaultRuleProcessorMongoDB, defaultRuleProcessorMongoDBQuery, defaultRuleProcessorNL, defaultRuleProcessorParameterized, defaultRuleProcessorPrisma, defaultRuleProcessorSPARQL, defaultRuleProcessorSQL, defaultRuleProcessorSequelize, defaultRuleProcessorSpEL, defaultSpELValueProcessor, defaultValueProcessor, defaultValueProcessorByRule, defaultValueProcessorCELByRule, defaultValueProcessorMongoDBByRule, defaultValueProcessorNL, defaultValueProcessorSpELByRule, formatQuery, formatQueryOptionPresets, getNLTranslataion, getQuoteFieldNamesWithArray, getQuotedFieldName, isValidValue, isValueProcessorLegacy, jsonLogicAdditionalOperators, mapSQLOperator, mongoDbFallback, mongoOperators, normalizeConstituentWordOrder, numerifyValues, prismaFallback, prismaOperators, processMatchMode, shouldRenderAsNumber, 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, defaultRuleProcessorCEL, defaultRuleProcessorCypher, defaultRuleProcessorDrizzle, defaultRuleProcessorElasticSearch, defaultRuleProcessorGremlin, defaultRuleProcessorJSONata, defaultRuleProcessorJsonLogic, defaultRuleProcessorLDAP, defaultRuleProcessorMongoDB, defaultRuleProcessorMongoDBQuery, defaultRuleProcessorNL, defaultRuleProcessorParameterized, defaultRuleProcessorPrisma, defaultRuleProcessorSPARQL, defaultRuleProcessorSQL, defaultRuleProcessorSequelize, defaultRuleProcessorSpEL, 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 };
 
 //# sourceMappingURL=formatQuery.mjs.map