@react-querybuilder/core 8.17.0 → 8.18.0

package/dist/react-querybuilder_core.mjs

@@ -88,7 +88,10 @@ const defaultTranslations = {
 		placeholderGroupLabel: defaultPlaceholderValueGroupLabel
 	},
 	matchMode: { title: "Match mode" },
-	matchThreshold: { title: "Match threshold" },
+	matchThreshold: {
+		title: "Match threshold",
+		placeholderName: "#"
+	},
 	value: { title: "Value" },
 	removeRule: {
 		label: "⨯",
@@ -1512,7 +1515,7 @@ const defaultRuleProcessorCEL = (rule, opts = {}) => {
 				const totalCount = `double(${field}.size())`;
 				const filteredCount = `${field}.filter(${arrayElementAlias}, ${nestedArrayFilter}).size()`;
 				const op = mode === "atleast" ? ">=" : mode === "atmost" ? "<=" : "==";
-				if (threshold > 0 && threshold < 1) return `${filteredCount} ${op} (${totalCount} * ${threshold})`;
+				if (threshold > 0 && threshold < 1) return `double(${filteredCount}) ${op} (${totalCount} * ${threshold})`;
 				return `${filteredCount} ${op} ${threshold}`;
 			}
 		}
@@ -2013,7 +2016,7 @@ const defaultRuleProcessorDrizzle = (rule, _options) => {
 	if (!columns || !drizzleOperators) return void 0;
 	const { between, eq, gt, gte, inArray, isNotNull, isNull, like, lt, lte, ne, notBetween, notInArray, notLike, sql } = drizzleOperators;
 	const { field, operator, value, valueSource } = rule;
-	const column = useRawFields && /[a-z][a-z0-9]*/i.test(field) ? sql.raw(field) : columns[field];
+	const column = useRawFields && /^[a-z_][a-z0-9_.]*$/i.test(field) ? sql.raw(field) : columns[field];
 	const operatorLC = lc(operator);
 	const valueIsField = valueSource === "field";
 	const asFieldOrValue = (v) => valueIsField ? columns[v] : v;
@@ -2046,7 +2049,7 @@ const defaultRuleProcessorDrizzle = (rule, _options) => {
 			case "atmost":
 			case "exactly": {
 				const op = mode === "atleast" ? ">=" : mode === "atmost" ? "<=" : "=";
-				return threshold > 0 && threshold < 1 ? sql`(select count(*) / array_length(${column}, 1) from unnest(${column}) as ${sql.raw(arrayElementAlias)} where ${nestedArrayFilter({}, drizzleOperators)}) ${sql.raw(`${op} ${threshold}`)}` : sql`(select count(*) from unnest(${column}) as ${sql.raw(arrayElementAlias)} where ${nestedArrayFilter({}, drizzleOperators)}) ${sql.raw(`${op} ${threshold}`)}`;
+				return threshold > 0 && threshold < 1 ? sql`(select count(*)::float / array_length(${column}, 1) from unnest(${column}) as ${sql.raw(arrayElementAlias)} where ${nestedArrayFilter({}, drizzleOperators)}) ${sql.raw(`${op} ${threshold}`)}` : sql`(select count(*) from unnest(${column}) as ${sql.raw(arrayElementAlias)} where ${nestedArrayFilter({}, drizzleOperators)}) ${sql.raw(`${op} ${threshold}`)}`;
 			}
 		}
 	}
@@ -2394,7 +2397,7 @@ const defaultRuleGroupProcessorMongoDB = (ruleGroup, options, meta) => {
 const defaultRuleGroupProcessorNL = (ruleGroup, options) => {
 	const { fields, fallbackExpression, getParseNumberBoolean, placeholderFieldName, placeholderOperatorName, placeholderValueName, ruleProcessor, translations, validateRule, validationMap } = options;
 	const processRuleGroup = (rg, outermostOrLonelyInGroup) => {
-		if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return outermostOrLonelyInGroup ? fallbackExpression : 		/* v8 ignore next -- @preserve */ "";
+		if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return outermostOrLonelyInGroup ? fallbackExpression : "";
 		const rg2 = isRuleGroupTypeIC(rg) && rg.rules.some((r) => typeof r === "string" && lc(r) === "xor") ? convertFromIC(rg) : rg;
 		const processedRules = [];
 		let precedingCombinator = "";
@@ -2492,7 +2495,7 @@ const defaultRuleGroupProcessorParameterized = (ruleGroup, options) => {
 		return sql;
 	};
 	const processRuleGroup = (rg, outermostOrLonelyInGroup) => {
-		if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return outermostOrLonelyInGroup ? fallbackExpression : 		/* v8 ignore next -- @preserve */ "";
+		if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return outermostOrLonelyInGroup ? fallbackExpression : "";
 		const processedRules = [];
 		let precedingCombinator = "";
 		let firstRule = true;
@@ -2685,7 +2688,7 @@ const defaultRuleGroupProcessorSPARQL = (ruleGroup, options) => {
 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 : 		/* v8 ignore next -- @preserve */ "";
+		if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return outermostOrLonelyInGroup ? fallbackExpression : "";
 		const processedRules = [];
 		let precedingCombinator = "";
 		let firstRule = true;
@@ -3889,7 +3892,7 @@ const defaultRuleProcessorSQL = (rule, opts = {}) => {
 			case "atmost":
 			case "exactly": {
 				const op = mode === "atleast" ? ">=" : mode === "atmost" ? "<=" : "=";
-				return `(select count(*)${threshold > 0 && threshold < 1 ? ` / array_length(${ruleField}, 1)` : ""} from unnest(${ruleField}) as ${wrapFieldName(arrayElementAlias)} where ${nestedArrayFilter}) ${op} ${threshold}`;
+				return `(select count(*)${threshold > 0 && threshold < 1 ? `::float / array_length(${ruleField}, 1)` : ""} from unnest(${ruleField}) as ${wrapFieldName(arrayElementAlias)} where ${nestedArrayFilter}) ${op} ${threshold}`;
 			}
 		}
 	}
@@ -3956,7 +3959,7 @@ const defaultRuleProcessorParameterized = (rule, opts, meta) => {
 			case "atmost":
 			case "exactly": {
 				const op = mode === "atleast" ? ">=" : mode === "atmost" ? "<=" : "=";
-				return finalize(`(select count(*)${threshold > 0 && threshold < 1 ? ` / array_length(${ruleField}, 1)` : ""} from unnest(${ruleField}) as ${wrapFieldName(arrayElementAlias)} where ${nestedSQL}) ${op} ${threshold}`);
+				return finalize(`(select count(*)${threshold > 0 && threshold < 1 ? `::float / array_length(${ruleField}, 1)` : ""} from unnest(${ruleField}) as ${wrapFieldName(arrayElementAlias)} where ${nestedSQL}) ${op} ${threshold}`);
 			}
 		}
 	}
@@ -4458,6 +4461,8 @@ const generateValueProcessor = (vpbr) => (field, operator, value, valueSource) =
 /**
 * Default value processor used by {@link formatQuery} for "sql" format.
 *
+* @deprecated Prefer {@link defaultValueProcessorByRule}.
+*
 * @group Export
 */
 const defaultValueProcessor = generateValueProcessor(defaultValueProcessorByRule);