@react-querybuilder/core 8.18.0 → 8.19.0

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-01WaTGBL.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-D-w8MzpZ.mjs";
+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 { transformQuery } from "./transformQuery.mjs";
-import { t as convertFromIC } from "./convertQuery-CQwOrjQr.mjs";
+import { t as convertFromIC } from "./convertQuery-J1CaoDxe.mjs";
 //#region src/utils/isRuleOrGroupValid.ts
 /**
 * Determines if an object is useful as a validation result.
@@ -600,106 +600,6 @@ const defaultRuleGroupProcessorCypher = (ruleGroup, options) => {
 	return processRuleGroup(ruleGroup, true);
 };
 //#endregion
-//#region src/utils/formatQuery/defaultRuleProcessorDrizzle.ts
-/**
-* Default rule processor used by {@link formatQuery} for the "drizzle" format.
-*
-* @group Export
-*/
-const defaultRuleProcessorDrizzle = (rule, _options) => {
-	const opts = _options ?? (	/* v8 ignore start -- @preserve */ {});
-	// v8 ignore next
-	const { parseNumbers, preserveValueOrder, context = {} } = opts;
-	const { columns, drizzleOperators, useRawFields } = context;
-	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 operatorLC = lc(operator);
-	const valueIsField = valueSource === "field";
-	const asFieldOrValue = (v) => valueIsField ? columns[v] : v;
-	const maybeParseNumber = (v) => {
-		if (valueIsField || !parseNumbers) return asFieldOrValue(v);
-		return shouldRenderAsNumber(v, true) ? parseNumber(v, { parseNumbers: true }) : v;
-	};
-	if (!column) return void 0;
-	const matchEval = processMatchMode(rule);
-	if (matchEval === false) return;
-	else if (matchEval) {
-		if (opts.preset !== "postgresql") return void 0;
-		const { mode, threshold } = matchEval;
-		const arrayElementAlias = "elem_alias";
-		const nestedArrayFilter = defaultRuleGroupProcessorDrizzle(transformQuery(rule.value, { ruleProcessor: (r) => ({
-			...r,
-			field: arrayElementAlias
-		}) }), {
-			...opts,
-			context: {
-				...opts.context,
-				useRawFields: true
-			}
-		});
-		switch (mode) {
-			case "all": return sql`(select count(*) from unnest(${column}) as ${sql.raw(arrayElementAlias)} where ${nestedArrayFilter({}, drizzleOperators)}) = array_length(${column}, 1)`;
-			case "none": return sql`not exists (select 1 from unnest(${column}) as ${sql.raw(arrayElementAlias)} where ${nestedArrayFilter({}, drizzleOperators)})`;
-			case "some": return sql`exists (select 1 from unnest(${column}) as ${sql.raw(arrayElementAlias)} where ${nestedArrayFilter({}, drizzleOperators)})`;
-			case "atleast":
-			case "atmost":
-			case "exactly": {
-				const op = mode === "atleast" ? ">=" : mode === "atmost" ? "<=" : "=";
-				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}`)}`;
-			}
-		}
-	}
-	switch (operatorLC) {
-		case "=": return eq(column, maybeParseNumber(value));
-		case "!=": return ne(column, maybeParseNumber(value));
-		case ">": return gt(column, maybeParseNumber(value));
-		case "<": return lt(column, maybeParseNumber(value));
-		case ">=": return gte(column, maybeParseNumber(value));
-		case "<=": return lte(column, maybeParseNumber(value));
-		case "beginswith":
-		case "doesnotbeginwith": return (operatorLC === "doesnotbeginwith" ? notLike : like)(column, valueIsField ? sql`${asFieldOrValue(value)} || '%'` : `${value}%`);
-		case "contains":
-		case "doesnotcontain": return (operatorLC === "doesnotcontain" ? notLike : like)(column, valueIsField ? sql`'%' || ${asFieldOrValue(value)} || '%'` : `%${value}%`);
-		case "endswith":
-		case "doesnotendwith": return (operatorLC === "doesnotendwith" ? notLike : like)(column, valueIsField ? sql`'%' || ${asFieldOrValue(value)}` : `%${value}`);
-		case "null": return isNull(column);
-		case "notnull": return isNotNull(column);
-		case "in":
-		case "notin": {
-			const valueAsArray = toArray(value).map((v) => maybeParseNumber(v));
-			return operatorLC === "notin" ? notInArray(column, valueAsArray) : inArray(column, valueAsArray);
-		}
-		case "between":
-		case "notbetween": {
-			const valueAsArray = toArray(value);
-			if (valueAsArray.length >= 2 && isValidValue(valueAsArray[0]) && isValidValue(valueAsArray[1])) {
-				let [first, second] = valueAsArray;
-				const shouldParseNumbers = !(parseNumbers === false);
-				if (!valueIsField && shouldRenderAsNumber(first, shouldParseNumbers) && shouldRenderAsNumber(second, shouldParseNumbers)) {
-					const firstNum = parseNumber(first, { parseNumbers: shouldParseNumbers });
-					const secondNum = parseNumber(second, { parseNumbers: shouldParseNumbers });
-					if (!preserveValueOrder && secondNum < firstNum) {
-						const tempNum = secondNum;
-						second = firstNum;
-						first = tempNum;
-					} else {
-						first = firstNum;
-						second = secondNum;
-					}
-				} else if (valueIsField) {
-					first = asFieldOrValue(first);
-					second = asFieldOrValue(second);
-				}
-				return operatorLC === "notbetween" ? notBetween(column, first, second) : between(column, first, second);
-			}
-			return;
-		}
-		default: return;
-	}
-};
-//#endregion
 //#region src/utils/formatQuery/defaultRuleGroupProcessorDrizzle.ts
 /**
 * Default rule group processor used by {@link formatQuery} for the "drizzle" format. The returned
@@ -714,10 +614,9 @@ const defaultRuleProcessorDrizzle = (rule, _options) => {
 * @group Export
 */
 const defaultRuleGroupProcessorDrizzle = (ruleGroup, options, _meta) => (columns, drizzleOperators) => {
-	const { fields, getParseNumberBoolean, placeholderFieldName, placeholderOperatorName, placeholderValueName, validateRule, validationMap } = options;
+	const { fields, getParseNumberBoolean, placeholderFieldName, placeholderOperatorName, placeholderValueName, validateRule, validationMap, ruleProcessor } = options;
 	if (!columns || !drizzleOperators) return void 0;
 	const { and, not, or } = drizzleOperators;
-	const ruleProcessor = defaultRuleProcessorDrizzle;
 	const processRuleGroup = (rg, _outermost) => {
 		if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return;
 		const processedRules = rg.rules.map((rule) => {
@@ -1333,96 +1232,6 @@ const defaultRuleGroupProcessorSQL = (ruleGroup, options) => {
 	return processRuleGroup(ruleGroup, true);
 };
 //#endregion
-//#region src/utils/formatQuery/defaultRuleProcessorTanStackDB.ts
-/**
-* Default rule processor used by {@link formatQuery} for the "tanstack_db" format.
-*
-* @group Export
-*/
-const defaultRuleProcessorTanStackDB = (rule, _options) => {
-	const { parseNumbers, preserveValueOrder, context = {} } = _options ?? (	/* v8 ignore start -- @preserve */ {});
-	const ops = context.tanStackDbOperators;
-	const refs = context._tanstackDbRefs;
-	const primaryRef = context._tanstackDbPrimaryRef;
-	if (!ops || !refs || !primaryRef) return void 0;
-	const { and, eq, gt, gte, inArray, isNull, like, lt, lte, not } = ops;
-	const resolveField = (fieldName) => {
-		const dotIdx = fieldName.indexOf(".");
-		if (dotIdx > 0) {
-			const prefix = fieldName.slice(0, dotIdx);
-			const rest = fieldName.slice(dotIdx + 1);
-			if (refs[prefix]) return refs[prefix][rest];
-		}
-		return refs[primaryRef][fieldName];
-	};
-	const { field, operator, value, valueSource } = rule;
-	const column = resolveField(field);
-	const operatorLC = lc(operator);
-	const valueIsField = valueSource === "field";
-	const asFieldOrValue = (v) => valueIsField ? resolveField(v) : v;
-	const maybeParseNumber = (v) => {
-		if (valueIsField || !parseNumbers) return asFieldOrValue(v);
-		return shouldRenderAsNumber(v, true) ? parseNumber(v, { parseNumbers: true }) : v;
-	};
-	switch (operatorLC) {
-		case "=": return eq(column, maybeParseNumber(value));
-		case "!=": return not(eq(column, maybeParseNumber(value)));
-		case ">": return gt(column, maybeParseNumber(value));
-		case "<": return lt(column, maybeParseNumber(value));
-		case ">=": return gte(column, maybeParseNumber(value));
-		case "<=": return lte(column, maybeParseNumber(value));
-		case "beginswith":
-		case "doesnotbeginwith": {
-			const expr = like(column, valueIsField ? void 0 : `${value}%`);
-			return operatorLC === "doesnotbeginwith" ? not(expr) : expr;
-		}
-		case "contains":
-		case "doesnotcontain": {
-			const expr = like(column, valueIsField ? void 0 : `%${value}%`);
-			return operatorLC === "doesnotcontain" ? not(expr) : expr;
-		}
-		case "endswith":
-		case "doesnotendwith": {
-			const expr = like(column, valueIsField ? void 0 : `%${value}`);
-			return operatorLC === "doesnotendwith" ? not(expr) : expr;
-		}
-		case "null": return isNull(column);
-		case "notnull": return not(isNull(column));
-		case "in":
-		case "notin": {
-			const expr = inArray(column, toArray(value).map((v) => maybeParseNumber(v)));
-			return operatorLC === "notin" ? not(expr) : expr;
-		}
-		case "between":
-		case "notbetween": {
-			const valueAsArray = toArray(value);
-			if (valueAsArray.length >= 2 && isValidValue(valueAsArray[0]) && isValidValue(valueAsArray[1])) {
-				let [first, second] = valueAsArray;
-				const shouldParseNumbers = !(parseNumbers === false);
-				if (!valueIsField && shouldRenderAsNumber(first, shouldParseNumbers) && shouldRenderAsNumber(second, shouldParseNumbers)) {
-					const firstNum = parseNumber(first, { parseNumbers: shouldParseNumbers });
-					const secondNum = parseNumber(second, { parseNumbers: shouldParseNumbers });
-					if (!preserveValueOrder && secondNum < firstNum) {
-						const tempNum = secondNum;
-						second = firstNum;
-						first = tempNum;
-					} else {
-						first = firstNum;
-						second = secondNum;
-					}
-				} else if (valueIsField) {
-					first = asFieldOrValue(first);
-					second = asFieldOrValue(second);
-				}
-				const expr = and(gte(column, first), lte(column, second));
-				return operatorLC === "notbetween" ? not(expr) : expr;
-			}
-			return;
-		}
-		default: return;
-	}
-};
-//#endregion
 //#region src/utils/formatQuery/defaultRuleGroupProcessorTanStackDB.ts
 /**
 * Default rule group processor used by {@link formatQuery} for the "tanstack_db" format.
@@ -1435,7 +1244,7 @@ const defaultRuleProcessorTanStackDB = (rule, _options) => {
 * @group Export
 */
 const defaultRuleGroupProcessorTanStackDB = (ruleGroup, options) => (refs) => {
-	const { fields, getParseNumberBoolean, placeholderFieldName, placeholderOperatorName, placeholderValueName, validateRule, validationMap, context = {} } = options;
+	const { fields, getParseNumberBoolean, placeholderFieldName, placeholderOperatorName, placeholderValueName, validateRule, validationMap, context = {}, ruleProcessor } = options;
 	const ops = context.tanStackDbOperators;
 	if (!ops) return void 0;
 	const { and, eq, not, or } = ops;
@@ -1443,7 +1252,6 @@ const defaultRuleGroupProcessorTanStackDB = (ruleGroup, options) => (refs) => {
 	const refKeys = Object.keys(refs);
 	/* v8 ignore next -- @preserve */
 	if (refKeys.length === 0) return fallback;
-	const ruleProcessor = defaultRuleProcessorTanStackDB;
 	const processRuleGroup = (rg) => {
 		if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return;
 		const processedRules = rg.rules.map((rule) => {
@@ -1841,6 +1649,106 @@ const defaultRuleProcessorCypher = (rule, opts = {}) => {
 	}
 };
 //#endregion
+//#region src/utils/formatQuery/defaultRuleProcessorDrizzle.ts
+/**
+* Default rule processor used by {@link formatQuery} for the "drizzle" format.
+*
+* @group Export
+*/
+const defaultRuleProcessorDrizzle = (rule, _options) => {
+	const opts = _options ?? (	/* v8 ignore start -- @preserve */ {});
+	// v8 ignore next
+	const { parseNumbers, preserveValueOrder, context = {} } = opts;
+	const { columns, drizzleOperators, useRawFields } = context;
+	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 operatorLC = lc(operator);
+	const valueIsField = valueSource === "field";
+	const asFieldOrValue = (v) => valueIsField ? columns[v] : v;
+	const maybeParseNumber = (v) => {
+		if (valueIsField || !parseNumbers) return asFieldOrValue(v);
+		return shouldRenderAsNumber(v, true) ? parseNumber(v, { parseNumbers: true }) : v;
+	};
+	if (!column) return void 0;
+	const matchEval = processMatchMode(rule);
+	if (matchEval === false) return;
+	else if (matchEval) {
+		if (opts.preset !== "postgresql") return void 0;
+		const { mode, threshold } = matchEval;
+		const arrayElementAlias = "elem_alias";
+		const nestedArrayFilter = defaultRuleGroupProcessorDrizzle(transformQuery(rule.value, { ruleProcessor: (r) => ({
+			...r,
+			field: arrayElementAlias
+		}) }), {
+			...opts,
+			context: {
+				...opts.context,
+				useRawFields: true
+			}
+		});
+		switch (mode) {
+			case "all": return sql`(select count(*) from unnest(${column}) as ${sql.raw(arrayElementAlias)} where ${nestedArrayFilter({}, drizzleOperators)}) = array_length(${column}, 1)`;
+			case "none": return sql`not exists (select 1 from unnest(${column}) as ${sql.raw(arrayElementAlias)} where ${nestedArrayFilter({}, drizzleOperators)})`;
+			case "some": return sql`exists (select 1 from unnest(${column}) as ${sql.raw(arrayElementAlias)} where ${nestedArrayFilter({}, drizzleOperators)})`;
+			case "atleast":
+			case "atmost":
+			case "exactly": {
+				const op = mode === "atleast" ? ">=" : mode === "atmost" ? "<=" : "=";
+				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}`)}`;
+			}
+		}
+	}
+	switch (operatorLC) {
+		case "=": return eq(column, maybeParseNumber(value));
+		case "!=": return ne(column, maybeParseNumber(value));
+		case ">": return gt(column, maybeParseNumber(value));
+		case "<": return lt(column, maybeParseNumber(value));
+		case ">=": return gte(column, maybeParseNumber(value));
+		case "<=": return lte(column, maybeParseNumber(value));
+		case "beginswith":
+		case "doesnotbeginwith": return (operatorLC === "doesnotbeginwith" ? notLike : like)(column, valueIsField ? sql`${asFieldOrValue(value)} || '%'` : `${value}%`);
+		case "contains":
+		case "doesnotcontain": return (operatorLC === "doesnotcontain" ? notLike : like)(column, valueIsField ? sql`'%' || ${asFieldOrValue(value)} || '%'` : `%${value}%`);
+		case "endswith":
+		case "doesnotendwith": return (operatorLC === "doesnotendwith" ? notLike : like)(column, valueIsField ? sql`'%' || ${asFieldOrValue(value)}` : `%${value}`);
+		case "null": return isNull(column);
+		case "notnull": return isNotNull(column);
+		case "in":
+		case "notin": {
+			const valueAsArray = toArray(value).map((v) => maybeParseNumber(v));
+			return operatorLC === "notin" ? notInArray(column, valueAsArray) : inArray(column, valueAsArray);
+		}
+		case "between":
+		case "notbetween": {
+			const valueAsArray = toArray(value);
+			if (valueAsArray.length >= 2 && isValidValue(valueAsArray[0]) && isValidValue(valueAsArray[1])) {
+				let [first, second] = valueAsArray;
+				const shouldParseNumbers = !(parseNumbers === false);
+				if (!valueIsField && shouldRenderAsNumber(first, shouldParseNumbers) && shouldRenderAsNumber(second, shouldParseNumbers)) {
+					const firstNum = parseNumber(first, { parseNumbers: shouldParseNumbers });
+					const secondNum = parseNumber(second, { parseNumbers: shouldParseNumbers });
+					if (!preserveValueOrder && secondNum < firstNum) {
+						const tempNum = secondNum;
+						second = firstNum;
+						first = tempNum;
+					} else {
+						first = firstNum;
+						second = secondNum;
+					}
+				} else if (valueIsField) {
+					first = asFieldOrValue(first);
+					second = asFieldOrValue(second);
+				}
+				return operatorLC === "notbetween" ? notBetween(column, first, second) : between(column, first, second);
+			}
+			return;
+		}
+		default: return;
+	}
+};
+//#endregion
 //#region src/utils/formatQuery/defaultRuleProcessorElasticSearch.ts
 const rangeOperatorMap = {
 	"<": "lt",
@@ -2810,6 +2718,96 @@ const defaultRuleProcessorSPARQL = (rule, opts = {}) => {
 	}
 };
 //#endregion
+//#region src/utils/formatQuery/defaultRuleProcessorTanStackDB.ts
+/**
+* Default rule processor used by {@link formatQuery} for the "tanstack_db" format.
+*
+* @group Export
+*/
+const defaultRuleProcessorTanStackDB = (rule, _options) => {
+	const { parseNumbers, preserveValueOrder, context = {} } = _options ?? (	/* v8 ignore start -- @preserve */ {});
+	const ops = context.tanStackDbOperators;
+	const refs = context._tanstackDbRefs;
+	const primaryRef = context._tanstackDbPrimaryRef;
+	if (!ops || !refs || !primaryRef) return void 0;
+	const { and, eq, gt, gte, inArray, isNull, like, lt, lte, not } = ops;
+	const resolveField = (fieldName) => {
+		const dotIdx = fieldName.indexOf(".");
+		if (dotIdx > 0) {
+			const prefix = fieldName.slice(0, dotIdx);
+			const rest = fieldName.slice(dotIdx + 1);
+			if (refs[prefix]) return refs[prefix][rest];
+		}
+		return refs[primaryRef][fieldName];
+	};
+	const { field, operator, value, valueSource } = rule;
+	const column = resolveField(field);
+	const operatorLC = lc(operator);
+	const valueIsField = valueSource === "field";
+	const asFieldOrValue = (v) => valueIsField ? resolveField(v) : v;
+	const maybeParseNumber = (v) => {
+		if (valueIsField || !parseNumbers) return asFieldOrValue(v);
+		return shouldRenderAsNumber(v, true) ? parseNumber(v, { parseNumbers: true }) : v;
+	};
+	switch (operatorLC) {
+		case "=": return eq(column, maybeParseNumber(value));
+		case "!=": return not(eq(column, maybeParseNumber(value)));
+		case ">": return gt(column, maybeParseNumber(value));
+		case "<": return lt(column, maybeParseNumber(value));
+		case ">=": return gte(column, maybeParseNumber(value));
+		case "<=": return lte(column, maybeParseNumber(value));
+		case "beginswith":
+		case "doesnotbeginwith": {
+			const expr = like(column, valueIsField ? void 0 : `${value}%`);
+			return operatorLC === "doesnotbeginwith" ? not(expr) : expr;
+		}
+		case "contains":
+		case "doesnotcontain": {
+			const expr = like(column, valueIsField ? void 0 : `%${value}%`);
+			return operatorLC === "doesnotcontain" ? not(expr) : expr;
+		}
+		case "endswith":
+		case "doesnotendwith": {
+			const expr = like(column, valueIsField ? void 0 : `%${value}`);
+			return operatorLC === "doesnotendwith" ? not(expr) : expr;
+		}
+		case "null": return isNull(column);
+		case "notnull": return not(isNull(column));
+		case "in":
+		case "notin": {
+			const expr = inArray(column, toArray(value).map((v) => maybeParseNumber(v)));
+			return operatorLC === "notin" ? not(expr) : expr;
+		}
+		case "between":
+		case "notbetween": {
+			const valueAsArray = toArray(value);
+			if (valueAsArray.length >= 2 && isValidValue(valueAsArray[0]) && isValidValue(valueAsArray[1])) {
+				let [first, second] = valueAsArray;
+				const shouldParseNumbers = !(parseNumbers === false);
+				if (!valueIsField && shouldRenderAsNumber(first, shouldParseNumbers) && shouldRenderAsNumber(second, shouldParseNumbers)) {
+					const firstNum = parseNumber(first, { parseNumbers: shouldParseNumbers });
+					const secondNum = parseNumber(second, { parseNumbers: shouldParseNumbers });
+					if (!preserveValueOrder && secondNum < firstNum) {
+						const tempNum = secondNum;
+						second = firstNum;
+						first = tempNum;
+					} else {
+						first = firstNum;
+						second = secondNum;
+					}
+				} else if (valueIsField) {
+					first = asFieldOrValue(first);
+					second = asFieldOrValue(second);
+				}
+				const expr = and(gte(column, first), lte(column, second));
+				return operatorLC === "notbetween" ? not(expr) : expr;
+			}
+			return;
+		}
+		default: return;
+	}
+};
+//#endregion
 //#region src/utils/formatQuery/formatQuery.ts
 /**
 * A collection of option presets for {@link formatQuery}, specifically for SQL-based formats.