@react-querybuilder/core 8.16.1 → 8.16.2

package/dist/formatQuery.mjs

@@ -618,6 +618,10 @@ const defaultRuleProcessorDrizzle = (rule, _options) => {
 	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;
@@ -648,12 +652,12 @@ const defaultRuleProcessorDrizzle = (rule, _options) => {
 		}
 	}
 	switch (operatorLC) {
-		case "=": return eq(column, asFieldOrValue(value));
-		case "!=": return ne(column, asFieldOrValue(value));
-		case ">": return gt(column, asFieldOrValue(value));
-		case "<": return lt(column, asFieldOrValue(value));
-		case ">=": return gte(column, asFieldOrValue(value));
-		case "<=": return lte(column, asFieldOrValue(value));
+		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":
@@ -664,7 +668,7 @@ const defaultRuleProcessorDrizzle = (rule, _options) => {
 		case "notnull": return isNotNull(column);
 		case "in":
 		case "notin": {
-			const valueAsArray = toArray(value).map((v) => asFieldOrValue(v));
+			const valueAsArray = toArray(value).map((v) => maybeParseNumber(v));
 			return operatorLC === "notin" ? notInArray(column, valueAsArray) : inArray(column, valueAsArray);
 		}
 		case "between":
@@ -1329,6 +1333,142 @@ 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.
+* Returns a `WhereCallback` suitable for TanStack DB's `.where()` method.
+*
+* @example
+* const where = formatQuery(query, { format: 'tanstack_db', context: { tanstackDb: tsdb } });
+* const results = useLiveQuery(q => q.from({ todo: todosCollection }).where(where));
+*
+* @group Export
+*/
+const defaultRuleGroupProcessorTanStackDB = (ruleGroup, options) => (refs) => {
+	const { fields, getParseNumberBoolean, placeholderFieldName, placeholderOperatorName, placeholderValueName, validateRule, validationMap, context = {} } = options;
+	const ops = context.tanStackDbOperators;
+	if (!ops) return void 0;
+	const { and, eq, not, or } = ops;
+	const fallback = eq(1, 1);
+	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) => {
+			if (isRuleGroup(rule)) return processRuleGroup(rule);
+			const [validationResult, fieldValidator] = validateRule(rule);
+			if (!isRuleOrGroupValid(rule, validationResult, fieldValidator) || rule.field === placeholderFieldName || rule.operator === placeholderOperatorName || placeholderValueName !== void 0 && rule.value === placeholderValueName) return;
+			const fieldData = getOption(fields, rule.field);
+			return ruleProcessor(rule, {
+				...options,
+				parseNumbers: getParseNumberBoolean(fieldData?.inputType),
+				fieldData,
+				context: {
+					...context,
+					_tanstackDbRefs: refs,
+					_tanstackDbPrimaryRef: refKeys[0]
+				}
+			});
+		}).filter(Boolean);
+		if (processedRules.length === 0) return fallback;
+		const ruleGroupExpr = processedRules.length === 1 ? processedRules[0] : rg.combinator === "or" ? or(...processedRules) : and(...processedRules);
+		return rg.not ? not(ruleGroupExpr) : ruleGroupExpr;
+	};
+	return processRuleGroup(convertFromIC(ruleGroup)) ?? fallback;
+};
+//#endregion
 //#region src/utils/formatQuery/defaultRuleGroupProcessorDiagnostics.ts
 const numericInputTypes = new Set([
 	"number",
@@ -2717,6 +2857,7 @@ const defaultRuleProcessors = {
 	sequelize: defaultRuleProcessorSequelize,
 	spel: defaultRuleProcessorSpEL,
 	sql: defaultRuleProcessorSQL,
+	tanstack_db: defaultRuleProcessorTanStackDB,
 	cypher: defaultRuleProcessorCypher,
 	gql: defaultRuleProcessorCypher,
 	sparql: defaultRuleProcessorSPARQL,
@@ -2743,6 +2884,7 @@ const defaultOperatorProcessors = {
 	sequelize: defaultOperatorProcessor,
 	spel: defaultOperatorProcessor,
 	sql: defaultOperatorProcessorSQL,
+	tanstack_db: defaultOperatorProcessor,
 	cypher: defaultOperatorProcessor,
 	gql: defaultOperatorProcessor,
 	sparql: defaultOperatorProcessor,
@@ -2789,7 +2931,8 @@ const valueProcessorCanActAsRuleProcessor = new Set([
 	"mongodb",
 	"prisma",
 	"sequelize",
-	"spel"
+	"spel",
+	"tanstack_db"
 ]);
 const sqlFormats = new Set([
 	"sql",
@@ -2835,7 +2978,7 @@ function formatQuery(ruleGroup, optionParam = {}) {
 				} : format === "parameterized_named" ? {
 					sql: fallbackExpression,
 					params: {}
-				} : format === "mongodb" ? `{${fallbackExpression}}` : format === "mongodb_query" ? mongoDbFallback : format === "prisma" ? prismaFallback : format === "jsonlogic" ? false : format === "elasticsearch" ? {} : format === "drizzle" || format === "sequelize" ? void 0 : fallbackExpression;
+				} : format === "mongodb" ? `{${fallbackExpression}}` : format === "mongodb_query" ? mongoDbFallback : format === "prisma" ? prismaFallback : format === "jsonlogic" ? false : format === "elasticsearch" ? {} : format === "drizzle" || format === "sequelize" || format === "tanstack_db" ? void 0 : fallbackExpression;
 			}
 		} else validationMap = validationResult;
 	}
@@ -2895,6 +3038,7 @@ function formatQuery(ruleGroup, optionParam = {}) {
 		case "ldap": return defaultRuleGroupProcessorLDAP(ruleGroup, finalOptions);
 		case "prisma": return defaultRuleGroupProcessorPrisma(ruleGroup, finalOptions);
 		case "drizzle": return defaultRuleGroupProcessorDrizzle(ruleGroup, finalOptions);
+		case "tanstack_db": return defaultRuleGroupProcessorTanStackDB(ruleGroup, finalOptions);
 		case "sequelize": return defaultRuleGroupProcessorSequelize(ruleGroup, finalOptions);
 		case "cypher":
 		case "gql": return defaultRuleGroupProcessorCypher(ruleGroup, finalOptions);
@@ -2955,6 +3099,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, 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, getNLTranslataion, getQuoteFieldNamesWithArray, getQuotedFieldName, isValidValue, isValueProcessorLegacy, jsonLogicAdditionalOperators, mapSQLOperator, mongoDbFallback, mongoOperators, normalizeConstituentWordOrder, numerifyValues, prismaFallback, prismaOperators, processMatchMode, shouldRenderAsNumber, sparqlVar, sqlDialectPresets };
 
 //# sourceMappingURL=formatQuery.mjs.map