@react-querybuilder/core 8.21.1 → 8.21.2

package/dist/formatQuery.d.mts

@@ -1,4 +1,4 @@
-import { E as RuleGroupTypeAny, I as SetRequired, N as RuleType, S as ValueProcessorOptions, _ as RuleGroupProcessor, a as DiagnosticsResult, b as ValueProcessorByRule, c as ExportOperatorMap, d as NLTranslationKey, f as NLTranslations, h as RQBJsonLogic, i as ConstituentWordOrder, l as FormatQueryOptions, m as ParameterizedSQL, o as ExportFormat, p as ParameterizedNamedSQL, s as ExportObjectFormats, u as GroupVariantCondition, v as RuleProcessor, x as ValueProcessorLegacy, y as SQLPreset } from "./index-BSwFvkeI.mjs";
+import { E as RuleGroupTypeAny, I as SetRequired, N as RuleType, S as ValueProcessorOptions, _ as RuleGroupProcessor, a as DiagnosticsResult, b as ValueProcessorByRule, c as ExportOperatorMap, d as NLTranslationKey, f as NLTranslations, h as RQBJsonLogic, i as ConstituentWordOrder, l as FormatQueryOptions, m as ParameterizedSQL, o as ExportFormat, p as ParameterizedNamedSQL, s as ExportObjectFormats, u as GroupVariantCondition, v as RuleProcessor, x as ValueProcessorLegacy, y as SQLPreset } from "./index-CX9mehdL.mjs";
 import { Column, Operators, SQL, Table } from "drizzle-orm";
 import { WhereOptions } from "sequelize";
 import { eq } from "@tanstack/db";
@@ -777,6 +777,21 @@ type ProcessedMatchMode = {
  *   2. `value` is not a valid rule group.
  */
 declare const processMatchMode: (rule: RuleType) => null | false | ProcessedMatchMode;
+/**
+ * Base alias assigned to the element binding of a subquery generated for a rule's
+ * {@link MatchMode `match` mode} (e.g. `unnest(field) as elem_alias`).
+ */
+declare const subqueryElementAliasBase = "elem_alias";
+/**
+ * Returns the element alias for a subquery at the given nesting depth. Depth 0 (the common,
+ * non-nested case) uses {@link subqueryElementAliasBase} unchanged; deeper levels are suffixed
+ * with the depth, so a subquery nested within a subquery cannot shadow its parent's binding.
+ *
+ * Deterministic by depth rather than randomized, so output remains stable and snapshot-friendly.
+ *
+ * @group Export
+ */
+declare const getSubqueryElementAlias: (subqueryDepth?: number) => string;
 /**
  * "Replacer" method for JSON.stringify's second argument. Converts `bigint` values to
  * objects with a `$bigint` property having a value of a string representation of
@@ -843,5 +858,5 @@ declare const defaultValueProcessorMongoDBByRule: RuleProcessor;
  */
 declare const defaultValueProcessorSpELByRule: RuleProcessor;
 //#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, 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, getLikeWildcards, getNLTranslataion, getQuoteFieldNamesWithArray, getQuotedFieldName, getSQLConcat, isValidValue, isValueProcessorLegacy, jsonLogicAdditionalOperators, mapSQLOperator, mongoDbFallback, mongoOperators, normalizeConstituentWordOrder, numerifyValues, prismaFallback, prismaOperators, processMatchMode, shouldRenderAsNumber, sparqlVar, sqlDialectPresets, stripParamPrefix, withParamPrefix, wrapLikeFragment };
+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, getLikeWildcards, getNLTranslataion, getQuoteFieldNamesWithArray, getQuotedFieldName, getSQLConcat, getSubqueryElementAlias, isValidValue, isValueProcessorLegacy, jsonLogicAdditionalOperators, mapSQLOperator, mongoDbFallback, mongoOperators, normalizeConstituentWordOrder, numerifyValues, prismaFallback, prismaOperators, processMatchMode, shouldRenderAsNumber, sparqlVar, sqlDialectPresets, stripParamPrefix, subqueryElementAliasBase, withParamPrefix, wrapLikeFragment };
 //# sourceMappingURL=formatQuery.d.mts.map

package/dist/formatQuery.d.ts

@@ -1,4 +1,4 @@
-import { E as RuleGroupTypeAny, I as SetRequired, N as RuleType, S as ValueProcessorOptions, _ as RuleGroupProcessor, a as DiagnosticsResult, b as ValueProcessorByRule, c as ExportOperatorMap, d as NLTranslationKey, f as NLTranslations, h as RQBJsonLogic, i as ConstituentWordOrder, l as FormatQueryOptions, m as ParameterizedSQL, o as ExportFormat, p as ParameterizedNamedSQL, s as ExportObjectFormats, u as GroupVariantCondition, v as RuleProcessor, x as ValueProcessorLegacy, y as SQLPreset } from "./index-BSwFvkeI.js";
+import { E as RuleGroupTypeAny, I as SetRequired, N as RuleType, S as ValueProcessorOptions, _ as RuleGroupProcessor, a as DiagnosticsResult, b as ValueProcessorByRule, c as ExportOperatorMap, d as NLTranslationKey, f as NLTranslations, h as RQBJsonLogic, i as ConstituentWordOrder, l as FormatQueryOptions, m as ParameterizedSQL, o as ExportFormat, p as ParameterizedNamedSQL, s as ExportObjectFormats, u as GroupVariantCondition, v as RuleProcessor, x as ValueProcessorLegacy, y as SQLPreset } from "./index-CX9mehdL.js";
 import { Column, Operators, SQL, Table } from "drizzle-orm";
 import { WhereOptions } from "sequelize";
 import { eq } from "@tanstack/db";
@@ -777,6 +777,21 @@ type ProcessedMatchMode = {
  *   2. `value` is not a valid rule group.
  */
 declare const processMatchMode: (rule: RuleType) => null | false | ProcessedMatchMode;
+/**
+ * Base alias assigned to the element binding of a subquery generated for a rule's
+ * {@link MatchMode `match` mode} (e.g. `unnest(field) as elem_alias`).
+ */
+declare const subqueryElementAliasBase = "elem_alias";
+/**
+ * Returns the element alias for a subquery at the given nesting depth. Depth 0 (the common,
+ * non-nested case) uses {@link subqueryElementAliasBase} unchanged; deeper levels are suffixed
+ * with the depth, so a subquery nested within a subquery cannot shadow its parent's binding.
+ *
+ * Deterministic by depth rather than randomized, so output remains stable and snapshot-friendly.
+ *
+ * @group Export
+ */
+declare const getSubqueryElementAlias: (subqueryDepth?: number) => string;
 /**
  * "Replacer" method for JSON.stringify's second argument. Converts `bigint` values to
  * objects with a `$bigint` property having a value of a string representation of
@@ -843,5 +858,5 @@ declare const defaultValueProcessorMongoDBByRule: RuleProcessor;
  */
 declare const defaultValueProcessorSpELByRule: RuleProcessor;
 //#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, 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, getLikeWildcards, getNLTranslataion, getQuoteFieldNamesWithArray, getQuotedFieldName, getSQLConcat, isValidValue, isValueProcessorLegacy, jsonLogicAdditionalOperators, mapSQLOperator, mongoDbFallback, mongoOperators, normalizeConstituentWordOrder, numerifyValues, prismaFallback, prismaOperators, processMatchMode, shouldRenderAsNumber, sparqlVar, sqlDialectPresets, stripParamPrefix, withParamPrefix, wrapLikeFragment };
+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, getLikeWildcards, getNLTranslataion, getQuoteFieldNamesWithArray, getQuotedFieldName, getSQLConcat, getSubqueryElementAlias, isValidValue, isValueProcessorLegacy, jsonLogicAdditionalOperators, mapSQLOperator, mongoDbFallback, mongoOperators, normalizeConstituentWordOrder, numerifyValues, prismaFallback, prismaOperators, processMatchMode, shouldRenderAsNumber, sparqlVar, sqlDialectPresets, stripParamPrefix, subqueryElementAliasBase, withParamPrefix, wrapLikeFragment };
 //# sourceMappingURL=formatQuery.d.ts.map

package/dist/formatQuery.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_utils = require("./utils-DEwV7F6B.js");
+const require_utils = require("./utils-SchkzSCN.js");
 const require_isRuleGroup = require("./isRuleGroup-0JNiQgLg.js");
 const require_transformQuery = require("./transformQuery.js");
 const require_convertQuery = require("./convertQuery-Cw76XFIn.js");
@@ -99,11 +99,15 @@ const defaultRuleProcessorCEL = (rule, opts = {}) => {
 	if (matchEval === false) return "";
 	else if (matchEval) {
 		const { mode, threshold } = matchEval;
-		const arrayElementAlias = "elem_alias";
+		const subqueryDepth = opts.subqueryDepth ?? 0;
+		const arrayElementAlias = require_utils.getSubqueryElementAlias(subqueryDepth);
 		const nestedArrayFilter = defaultRuleGroupProcessorCEL(require_transformQuery.transformQuery(rule.value, { ruleProcessor: (r) => ({
 			...r,
 			field: `${arrayElementAlias}${r.field ? `.${r.field}` : ""}`
-		}) }), opts);
+		}) }), {
+			...opts,
+			subqueryDepth: subqueryDepth + 1
+		});
 		switch (mode) {
 			case "all": return `${field}.all(${arrayElementAlias}, ${nestedArrayFilter})`;
 			case "none":
@@ -1719,7 +1723,8 @@ const defaultRuleProcessorDrizzle = (rule, _options) => {
 	else if (matchEval) {
 		if (opts.preset !== "postgresql") return void 0;
 		const { mode, threshold } = matchEval;
-		const arrayElementAlias = "elem_alias";
+		const subqueryDepth = opts.subqueryDepth ?? 0;
+		const arrayElementAlias = require_utils.getSubqueryElementAlias(subqueryDepth);
 		const nestedArrayFilter = defaultRuleGroupProcessorDrizzle(require_transformQuery.transformQuery(rule.value, { ruleProcessor: (r) => ({
 			...r,
 			field: arrayElementAlias
@@ -1728,7 +1733,8 @@ const defaultRuleProcessorDrizzle = (rule, _options) => {
 			context: {
 				...opts.context,
 				useRawFields: true
-			}
+			},
+			subqueryDepth: subqueryDepth + 1
 		});
 		switch (mode) {
 			case "all": return sql`(select count(*) from unnest(${column}) as ${sql.raw(arrayElementAlias)} where ${nestedArrayFilter({}, drizzleOperators)}) = array_length(${column}, 1)`;
@@ -2442,11 +2448,15 @@ const defaultRuleProcessorSQL = (rule, opts = {}) => {
 	else if (matchEval) {
 		if (opts?.preset !== "postgresql") return "";
 		const { mode, threshold } = matchEval;
-		const arrayElementAlias = "elem_alias";
+		const subqueryDepth = opts.subqueryDepth ?? 0;
+		const arrayElementAlias = require_utils.getSubqueryElementAlias(subqueryDepth);
 		const nestedArrayFilter = defaultRuleGroupProcessorSQL(require_transformQuery.transformQuery(rule.value, { ruleProcessor: (r) => ({
 			...r,
 			field: arrayElementAlias
-		}) }), opts);
+		}) }), {
+			...opts,
+			subqueryDepth: subqueryDepth + 1
+		});
 		switch (mode) {
 			case "all": return `(select count(*) from unnest(${ruleField}) as ${wrapFieldName(arrayElementAlias)} where ${nestedArrayFilter}) = array_length(${ruleField}, 1)`;
 			case "none": return `not exists (select 1 from unnest(${ruleField}) as ${wrapFieldName(arrayElementAlias)} where ${nestedArrayFilter})`;
@@ -2504,13 +2514,15 @@ const defaultRuleProcessorParameterized = (rule, opts, meta) => {
 	else if (matchEval) {
 		if (opts?.preset !== "postgresql") return finalize("");
 		const { mode, threshold } = matchEval;
-		const arrayElementAlias = "elem_alias";
+		const subqueryDepth = opts.subqueryDepth ?? 0;
+		const arrayElementAlias = require_utils.getSubqueryElementAlias(subqueryDepth);
 		const { sql: nestedSQL, params: nestedParams } = defaultRuleGroupProcessorParameterized(require_transformQuery.transformQuery(rule.value, { ruleProcessor: (r) => ({
 			...r,
 			field: arrayElementAlias
 		}) }), {
 			...opts,
-			fields: []
+			fields: [],
+			subqueryDepth: subqueryDepth + 1
 		});
 		if (Array.isArray(nestedParams)) params.push(...nestedParams);
 		else Object.assign(paramsNamed, nestedParams);
@@ -3238,6 +3250,7 @@ exports.getNLTranslataion = require_utils.getNLTranslataion;
 exports.getQuoteFieldNamesWithArray = require_utils.getQuoteFieldNamesWithArray;
 exports.getQuotedFieldName = require_utils.getQuotedFieldName;
 exports.getSQLConcat = require_utils.getSQLConcat;
+exports.getSubqueryElementAlias = require_utils.getSubqueryElementAlias;
 exports.isValidValue = require_utils.isValidValue;
 exports.isValueProcessorLegacy = require_utils.isValueProcessorLegacy;
 exports.jsonLogicAdditionalOperators = require_utils.jsonLogicAdditionalOperators;
@@ -3253,6 +3266,7 @@ exports.shouldRenderAsNumber = require_utils.shouldRenderAsNumber;
 exports.sparqlVar = sparqlVar;
 exports.sqlDialectPresets = sqlDialectPresets;
 exports.stripParamPrefix = require_utils.stripParamPrefix;
+exports.subqueryElementAliasBase = require_utils.subqueryElementAliasBase;
 exports.withParamPrefix = require_utils.withParamPrefix;
 exports.wrapLikeFragment = require_utils.wrapLikeFragment;