@react-querybuilder/core 8.21.1 → 8.21.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (66) hide show
  1. package/dist/cjs/react-querybuilder_core.cjs.development.d.ts +30 -1
  2. package/dist/cjs/react-querybuilder_core.cjs.development.js +37 -8
  3. package/dist/cjs/react-querybuilder_core.cjs.development.js.map +1 -1
  4. package/dist/cjs/react-querybuilder_core.cjs.production.d.ts +30 -1
  5. package/dist/cjs/react-querybuilder_core.cjs.production.js +1 -1
  6. package/dist/cjs/react-querybuilder_core.cjs.production.js.map +1 -1
  7. package/dist/formatQuery.d.mts +17 -2
  8. package/dist/formatQuery.d.ts +17 -2
  9. package/dist/formatQuery.js +23 -9
  10. package/dist/formatQuery.js.map +1 -1
  11. package/dist/formatQuery.mjs +22 -10
  12. package/dist/formatQuery.mjs.map +1 -1
  13. package/dist/{import-Ddc3d_8q.d.ts → import-6ExjhifL.d.ts} +2 -2
  14. package/dist/{import-BVdxeIBO.d.mts → import-DVWI7Fdh.d.mts} +2 -2
  15. package/dist/{index-BSwFvkeI.d.mts → index-CX9mehdL.d.mts} +15 -1
  16. package/dist/{index-BSwFvkeI.d.ts → index-CX9mehdL.d.ts} +15 -1
  17. package/dist/parseCEL.d.mts +2 -2
  18. package/dist/parseCEL.d.ts +2 -2
  19. package/dist/parseCEL.js +2 -2
  20. package/dist/parseCEL.mjs +2 -2
  21. package/dist/parseCypher.d.mts +1 -1
  22. package/dist/parseCypher.d.ts +1 -1
  23. package/dist/parseGremlin.d.mts +1 -1
  24. package/dist/parseGremlin.d.ts +1 -1
  25. package/dist/parseJSONata.d.mts +2 -2
  26. package/dist/parseJSONata.d.ts +2 -2
  27. package/dist/parseJSONata.js +1 -1
  28. package/dist/parseJSONata.mjs +1 -1
  29. package/dist/parseJsonLogic.d.mts +2 -2
  30. package/dist/parseJsonLogic.d.ts +2 -2
  31. package/dist/parseJsonLogic.js +2 -2
  32. package/dist/parseJsonLogic.mjs +2 -2
  33. package/dist/parseMongoDB.d.mts +2 -2
  34. package/dist/parseMongoDB.d.ts +2 -2
  35. package/dist/parseMongoDB.js +2 -2
  36. package/dist/parseMongoDB.mjs +2 -2
  37. package/dist/parseSPARQL.d.mts +1 -1
  38. package/dist/parseSPARQL.d.ts +1 -1
  39. package/dist/parseSQL.d.mts +2 -2
  40. package/dist/parseSQL.d.ts +2 -2
  41. package/dist/parseSQL.js +2 -2
  42. package/dist/parseSQL.mjs +2 -2
  43. package/dist/parseSpEL.d.mts +2 -2
  44. package/dist/parseSpEL.d.ts +2 -2
  45. package/dist/parseSpEL.js +2 -2
  46. package/dist/parseSpEL.mjs +2 -2
  47. package/dist/{prepareQueryObjects-Q18lHCKl.mjs → prepareQueryObjects-9emVAGYG.mjs} +2 -2
  48. package/dist/{prepareQueryObjects-Q18lHCKl.mjs.map → prepareQueryObjects-9emVAGYG.mjs.map} +1 -1
  49. package/dist/{prepareQueryObjects-C2-kTZvR.js → prepareQueryObjects-C5dHLhnC.js} +2 -2
  50. package/dist/{prepareQueryObjects-C2-kTZvR.js.map → prepareQueryObjects-C5dHLhnC.js.map} +1 -1
  51. package/dist/react-querybuilder_core.d.mts +30 -1
  52. package/dist/react-querybuilder_core.legacy-esm.d.ts +30 -1
  53. package/dist/react-querybuilder_core.legacy-esm.js +38 -9
  54. package/dist/react-querybuilder_core.legacy-esm.js.map +1 -1
  55. package/dist/react-querybuilder_core.mjs +36 -9
  56. package/dist/react-querybuilder_core.mjs.map +1 -1
  57. package/dist/react-querybuilder_core.production.d.mts +30 -1
  58. package/dist/react-querybuilder_core.production.mjs +1 -1
  59. package/dist/react-querybuilder_core.production.mjs.map +1 -1
  60. package/dist/transformQuery.d.mts +1 -1
  61. package/dist/transformQuery.d.ts +1 -1
  62. package/dist/{utils-Dt0D_DMV.mjs → utils-CxWs-N47.mjs} +17 -2
  63. package/dist/{utils-Dt0D_DMV.mjs.map → utils-CxWs-N47.mjs.map} +1 -1
  64. package/dist/{utils-DEwV7F6B.js → utils-SchkzSCN.js} +28 -1
  65. package/dist/{utils-DEwV7F6B.js.map → utils-SchkzSCN.js.map} +1 -1
  66. package/package.json +2 -2
@@ -1,4 +1,4 @@
1
- import { A as parseNumber, C as getParseNumberMethod, D as toFlatOptionArray, M as toArray, N as trimIfString, S as wrapLikeFragment, _ as prismaOperators, a as getLikeWildcards, b as stripParamPrefix, c as getQuotedFieldName, d as isValueProcessorLegacy, f as jsonLogicAdditionalOperators, g as numerifyValues, h as normalizeConstituentWordOrder, i as defaultNLTranslations, k as toFullOptionList, l as getSQLConcat, m as mongoOperators, n as bigIntJsonStringifyReplacer, o as getNLTranslataion, p as mapSQLOperator, r as celCombinatorMap, s as getQuoteFieldNamesWithArray, t as bigIntJsonParseReviver, u as isValidValue, v as processMatchMode, w as getOption, x as withParamPrefix, y as shouldRenderAsNumber } from "./utils-Dt0D_DMV.mjs";
1
+ import { C as withParamPrefix, E as getOption, F as trimIfString, M as parseNumber, P as toArray, S as subqueryElementAliasBase, T as getParseNumberMethod, _ as numerifyValues, a as getLikeWildcards, b as shouldRenderAsNumber, c as getQuotedFieldName, d as isValidValue, f as isValueProcessorLegacy, g as normalizeConstituentWordOrder, h as mongoOperators, i as defaultNLTranslations, j as toFullOptionList, k as toFlatOptionArray, l as getSQLConcat, m as mapSQLOperator, n as bigIntJsonStringifyReplacer, o as getNLTranslataion, p as jsonLogicAdditionalOperators, r as celCombinatorMap, s as getQuoteFieldNamesWithArray, t as bigIntJsonParseReviver, u as getSubqueryElementAlias, v as prismaOperators, w as wrapLikeFragment, x as stripParamPrefix, y as processMatchMode } from "./utils-CxWs-N47.mjs";
2
2
  import { a as lc, i as isPojo, n as isRuleGroupType, o as nullOrUndefinedOrEmpty, r as isRuleGroupTypeIC, s as numericRegex, t as isRuleGroup } from "./isRuleGroup-CqLThsbu.mjs";
3
3
  import { transformQuery } from "./transformQuery.mjs";
4
4
  import { t as convertFromIC } from "./convertQuery-D_4J7E-Z.mjs";
@@ -98,11 +98,15 @@ const defaultRuleProcessorCEL = (rule, opts = {}) => {
98
98
  if (matchEval === false) return "";
99
99
  else if (matchEval) {
100
100
  const { mode, threshold } = matchEval;
101
- const arrayElementAlias = "elem_alias";
101
+ const subqueryDepth = opts.subqueryDepth ?? 0;
102
+ const arrayElementAlias = getSubqueryElementAlias(subqueryDepth);
102
103
  const nestedArrayFilter = defaultRuleGroupProcessorCEL(transformQuery(rule.value, { ruleProcessor: (r) => ({
103
104
  ...r,
104
105
  field: `${arrayElementAlias}${r.field ? `.${r.field}` : ""}`
105
- }) }), opts);
106
+ }) }), {
107
+ ...opts,
108
+ subqueryDepth: subqueryDepth + 1
109
+ });
106
110
  switch (mode) {
107
111
  case "all": return `${field}.all(${arrayElementAlias}, ${nestedArrayFilter})`;
108
112
  case "none":
@@ -1718,7 +1722,8 @@ const defaultRuleProcessorDrizzle = (rule, _options) => {
1718
1722
  else if (matchEval) {
1719
1723
  if (opts.preset !== "postgresql") return void 0;
1720
1724
  const { mode, threshold } = matchEval;
1721
- const arrayElementAlias = "elem_alias";
1725
+ const subqueryDepth = opts.subqueryDepth ?? 0;
1726
+ const arrayElementAlias = getSubqueryElementAlias(subqueryDepth);
1722
1727
  const nestedArrayFilter = defaultRuleGroupProcessorDrizzle(transformQuery(rule.value, { ruleProcessor: (r) => ({
1723
1728
  ...r,
1724
1729
  field: arrayElementAlias
@@ -1727,7 +1732,8 @@ const defaultRuleProcessorDrizzle = (rule, _options) => {
1727
1732
  context: {
1728
1733
  ...opts.context,
1729
1734
  useRawFields: true
1730
- }
1735
+ },
1736
+ subqueryDepth: subqueryDepth + 1
1731
1737
  });
1732
1738
  switch (mode) {
1733
1739
  case "all": return sql`(select count(*) from unnest(${column}) as ${sql.raw(arrayElementAlias)} where ${nestedArrayFilter({}, drizzleOperators)}) = array_length(${column}, 1)`;
@@ -2441,11 +2447,15 @@ const defaultRuleProcessorSQL = (rule, opts = {}) => {
2441
2447
  else if (matchEval) {
2442
2448
  if (opts?.preset !== "postgresql") return "";
2443
2449
  const { mode, threshold } = matchEval;
2444
- const arrayElementAlias = "elem_alias";
2450
+ const subqueryDepth = opts.subqueryDepth ?? 0;
2451
+ const arrayElementAlias = getSubqueryElementAlias(subqueryDepth);
2445
2452
  const nestedArrayFilter = defaultRuleGroupProcessorSQL(transformQuery(rule.value, { ruleProcessor: (r) => ({
2446
2453
  ...r,
2447
2454
  field: arrayElementAlias
2448
- }) }), opts);
2455
+ }) }), {
2456
+ ...opts,
2457
+ subqueryDepth: subqueryDepth + 1
2458
+ });
2449
2459
  switch (mode) {
2450
2460
  case "all": return `(select count(*) from unnest(${ruleField}) as ${wrapFieldName(arrayElementAlias)} where ${nestedArrayFilter}) = array_length(${ruleField}, 1)`;
2451
2461
  case "none": return `not exists (select 1 from unnest(${ruleField}) as ${wrapFieldName(arrayElementAlias)} where ${nestedArrayFilter})`;
@@ -2503,13 +2513,15 @@ const defaultRuleProcessorParameterized = (rule, opts, meta) => {
2503
2513
  else if (matchEval) {
2504
2514
  if (opts?.preset !== "postgresql") return finalize("");
2505
2515
  const { mode, threshold } = matchEval;
2506
- const arrayElementAlias = "elem_alias";
2516
+ const subqueryDepth = opts.subqueryDepth ?? 0;
2517
+ const arrayElementAlias = getSubqueryElementAlias(subqueryDepth);
2507
2518
  const { sql: nestedSQL, params: nestedParams } = defaultRuleGroupProcessorParameterized(transformQuery(rule.value, { ruleProcessor: (r) => ({
2508
2519
  ...r,
2509
2520
  field: arrayElementAlias
2510
2521
  }) }), {
2511
2522
  ...opts,
2512
- fields: []
2523
+ fields: [],
2524
+ subqueryDepth: subqueryDepth + 1
2513
2525
  });
2514
2526
  if (Array.isArray(nestedParams)) params.push(...nestedParams);
2515
2527
  else Object.assign(paramsNamed, nestedParams);
@@ -3176,6 +3188,6 @@ const defaultValueProcessorMongoDBByRule = defaultRuleProcessorMongoDB;
3176
3188
  */
3177
3189
  const defaultValueProcessorSpELByRule = defaultRuleProcessorSpEL;
3178
3190
  //#endregion
3179
- 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 };
3191
+ 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 };
3180
3192
 
3181
3193
  //# sourceMappingURL=formatQuery.mjs.map