@react-querybuilder/core 8.17.0 → 8.18.0

package/dist/cjs/react-querybuilder_core.cjs.development.d.ts

@@ -871,7 +871,36 @@ type Result = ApplyDefaultOptions<PathsOptions, DefaultPathsOptions, SpecifiedOp
 // Types of property 'leavesOnly' are incompatible. Type 'string' is not assignable to type 'boolean'.
 ```
 */
-type ApplyDefaultOptions<Options extends object, Defaults extends Simplify<Omit<Required<Options>, RequiredKeysOf<Options>> & Partial<Record<RequiredKeysOf<Options>, never>>>, SpecifiedOptions extends Options> = If<IsAny<SpecifiedOptions>, Defaults, If<IsNever<SpecifiedOptions>, Defaults, Simplify<Merge<Defaults, { [Key in keyof SpecifiedOptions as Key extends OptionalKeysOf<Options> ? undefined extends SpecifiedOptions[Key] ? never : Key : Key]: SpecifiedOptions[Key] }> & Required<Options>>>>;
+type ApplyDefaultOptions<Options extends object, Defaults extends Simplify<Omit<Required<Options>, RequiredKeysOf<Options>> & Partial<Record<RequiredKeysOf<Options>, never>>>, SpecifiedOptions extends Options> = _ApplyDefaultOptions<Options, Defaults, SpecifiedOptions> extends infer Result extends Required<Options> // `extends Required<Options>` ensures that `ApplyDefaultOptions<SomeOption, ...>` is always assignable to `Required<SomeOption>`
+? Result : never;
+type _ApplyDefaultOptions<Options, Defaults, SpecifiedOptions> = If<IsAny<SpecifiedOptions>, Defaults, If<IsNever<SpecifiedOptions>, Defaults, Merge<Defaults, { [Key in keyof SpecifiedOptions as undefined extends Required<Options>[Key & keyof Options] ? Key : undefined extends SpecifiedOptions[Key] ? never : Key]: SpecifiedOptions[Key] }>>>;
+/**
+Collapses literal types in a union into their corresponding primitive types, when possible. For example, `CollapseLiterals<'foo' | 'bar' | (string & {})>` returns `string`.
+
+Note: This doesn't collapse literals within tagged types. For example, `CollapseLiterals<Tagged<'foo' | (string & {}), 'Tag'>>` returns `("foo" & Tag<"Tag", never>) | (string & Tag<"Tag", never>)` and not `string & Tag<"Tag", never>`.
+
+Use-case: For collapsing unions created using {@link LiteralUnion}.
+
+@example
+```
+import type {LiteralUnion} from 'type-fest';
+
+type A = CollapseLiterals<'foo' | 'bar' | (string & {})>;
+//=> string
+
+type B = CollapseLiterals<LiteralUnion<1 | 2 | 3, number>>;
+//=> number
+
+type C = CollapseLiterals<LiteralUnion<'onClick' | 'onChange', `on${string}`>>;
+//=> `on${string}`
+
+type D = CollapseLiterals<'click' | 'change' | (`on${string}` & {})>;
+//=> 'click' | 'change' | `on${string}`
+
+type E = CollapseLiterals<LiteralUnion<'foo' | 'bar', string> | null | undefined>;
+//=> string | null | undefined
+```
+*/
 //#endregion
 //#region ../../node_modules/type-fest/source/except.d.ts
 /**
@@ -1119,7 +1148,7 @@ type SetArrayRequired<TArray extends UnknownArray, Keys, Counter extends any[] =
 : never; // Should never happen
 //#endregion
 //#region src/types/options.d.ts
-type RequireAtLeastOne<ObjectType, KeysType extends keyof ObjectType> = { [Key in KeysType]-?: Required<Pick<ObjectType, Key>> & Partial<Pick<ObjectType, Exclude<KeysType, Key>>> }[KeysType] & Except<ObjectType, KeysType>;
+type RequireAtLeastOne<O, K extends keyof O> = { [P in K]-?: Required<Pick<O, P>> & Partial<Pick<O, Exclude<K, P>>> }[K] & Except<O, K>;
 type StringUnionToFlexibleOptionArray<Op extends string> = Array<Op extends unknown ? FlexibleOption<Op> : never>;
 type StringUnionToFullOptionArray<Op extends string> = Array<Op extends unknown ? FullOption<Op> : never>;
 /**
@@ -2607,7 +2636,9 @@ interface BaseTranslations<LabelType = string> {
   operators: BaseTranslationWithPlaceholders;
   values: BaseTranslationWithPlaceholders;
   matchMode: BaseTranslation;
-  matchThreshold: BaseTranslation;
+  matchThreshold: BaseTranslation & {
+    placeholderName?: string;
+  };
   value: BaseTranslation;
   removeRule: BaseTranslationWithLabel<LabelType>;
   removeGroup: BaseTranslationWithLabel<LabelType>;
@@ -3868,6 +3899,8 @@ declare const bigIntJsonParseReviver: (_key: string, value: unknown) => unknown;
 /**
 * Default value processor used by {@link formatQuery} for "sql" format.
 *
+* @deprecated Prefer {@link defaultValueProcessorByRule}.
+*
 * @group Export
 */
 declare const defaultValueProcessor: ValueProcessorLegacy;

package/dist/cjs/react-querybuilder_core.cjs.development.js

@@ -89,7 +89,10 @@ const defaultTranslations = {
 		placeholderGroupLabel: defaultPlaceholderValueGroupLabel
 	},
 	matchMode: { title: "Match mode" },
-	matchThreshold: { title: "Match threshold" },
+	matchThreshold: {
+		title: "Match threshold",
+		placeholderName: "#"
+	},
 	value: { title: "Value" },
 	removeRule: {
 		label: "⨯",
@@ -1513,7 +1516,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}`;
 			}
 		}
@@ -2014,7 +2017,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;
@@ -2047,7 +2050,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}`)}`;
 			}
 		}
 	}
@@ -2395,7 +2398,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 = "";
@@ -2493,7 +2496,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;
@@ -2686,7 +2689,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;
@@ -3890,7 +3893,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}`;
 			}
 		}
 	}
@@ -3957,7 +3960,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}`);
 			}
 		}
 	}
@@ -4459,6 +4462,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);