@react-querybuilder/core 8.21.2 → 8.22.1
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.
- package/README.md +1 -1
- package/dist/cjs/react-querybuilder_core.cjs.development.d.ts +1399 -44
- package/dist/cjs/react-querybuilder_core.cjs.development.js +2244 -87
- package/dist/cjs/react-querybuilder_core.cjs.development.js.map +1 -1
- package/dist/cjs/react-querybuilder_core.cjs.production.d.ts +1399 -44
- package/dist/cjs/react-querybuilder_core.cjs.production.js +1 -1
- package/dist/cjs/react-querybuilder_core.cjs.production.js.map +1 -1
- package/dist/formatQuery.js +47 -38
- package/dist/formatQuery.js.map +1 -1
- package/dist/formatQuery.mjs +47 -38
- package/dist/formatQuery.mjs.map +1 -1
- package/dist/parseCEL.js +6 -8
- package/dist/parseCEL.js.map +1 -1
- package/dist/parseCEL.mjs +6 -8
- package/dist/parseCEL.mjs.map +1 -1
- package/dist/parseCypher.js.map +1 -1
- package/dist/parseJSONata.js +2 -2
- package/dist/parseJSONata.js.map +1 -1
- package/dist/parseJSONata.mjs +1 -1
- package/dist/parseJsonLogic.js +3 -3
- package/dist/parseJsonLogic.js.map +1 -1
- package/dist/parseJsonLogic.mjs +3 -3
- package/dist/parseJsonLogic.mjs.map +1 -1
- package/dist/parseMongoDB.js +2 -2
- package/dist/parseMongoDB.mjs +2 -2
- package/dist/parseSPARQL.js +0 -1
- package/dist/parseSPARQL.js.map +1 -1
- package/dist/parseSPARQL.mjs +0 -1
- package/dist/parseSPARQL.mjs.map +1 -1
- package/dist/parseSQL.js +54 -62
- package/dist/parseSQL.js.map +1 -1
- package/dist/parseSQL.mjs +54 -62
- package/dist/parseSQL.mjs.map +1 -1
- package/dist/parseSpEL.js +3 -3
- package/dist/parseSpEL.js.map +1 -1
- package/dist/parseSpEL.mjs +3 -3
- package/dist/parseSpEL.mjs.map +1 -1
- package/dist/{prepareQueryObjects-C5dHLhnC.js → prepareQueryObjects-BnGL91Tt.js} +9 -5
- package/dist/{prepareQueryObjects-C5dHLhnC.js.map → prepareQueryObjects-BnGL91Tt.js.map} +1 -1
- package/dist/{prepareQueryObjects-9emVAGYG.mjs → prepareQueryObjects-ChINDIap.mjs} +9 -5
- package/dist/{prepareQueryObjects-9emVAGYG.mjs.map → prepareQueryObjects-ChINDIap.mjs.map} +1 -1
- package/dist/query-builder-layout.css +1 -1
- package/dist/query-builder-layout.css.map +1 -1
- package/dist/query-builder.css +1 -1
- package/dist/query-builder.css.map +1 -1
- package/dist/react-querybuilder_core.d.mts +1399 -44
- package/dist/react-querybuilder_core.legacy-esm.d.ts +1399 -44
- package/dist/react-querybuilder_core.legacy-esm.js +2266 -81
- package/dist/react-querybuilder_core.legacy-esm.js.map +1 -1
- package/dist/react-querybuilder_core.mjs +2202 -89
- package/dist/react-querybuilder_core.mjs.map +1 -1
- package/dist/react-querybuilder_core.production.d.mts +1399 -44
- package/dist/react-querybuilder_core.production.mjs +1 -1
- package/dist/react-querybuilder_core.production.mjs.map +1 -1
- package/dist/styles/_layout.scss +5 -2
- package/dist/{utils-CxWs-N47.mjs → utils-4k-j5FBa.mjs} +4 -2
- package/dist/utils-4k-j5FBa.mjs.map +1 -0
- package/dist/{utils-SchkzSCN.js → utils-C79dxwZb.js} +4 -2
- package/dist/utils-C79dxwZb.js.map +1 -0
- package/package.json +9 -8
- package/dist/utils-CxWs-N47.mjs.map +0 -1
- package/dist/utils-SchkzSCN.js.map +0 -1
package/dist/formatQuery.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
|
|
2
|
-
const require_utils = require("./utils-
|
|
2
|
+
const require_utils = require("./utils-C79dxwZb.js");
|
|
3
3
|
const require_isRuleGroup = require("./isRuleGroup-0JNiQgLg.js");
|
|
4
4
|
const require_transformQuery = require("./transformQuery.js");
|
|
5
5
|
const require_convertQuery = require("./convertQuery-Cw76XFIn.js");
|
|
@@ -35,7 +35,7 @@ const isRuleOrGroupValid = (rg, validationResult, validator) => {
|
|
|
35
35
|
const defaultRuleGroupProcessorCEL = (ruleGroup, options) => {
|
|
36
36
|
const { fields, fallbackExpression, getParseNumberBoolean, placeholderFieldName, placeholderOperatorName, placeholderValueName, ruleProcessor, validateRule, validationMap } = options;
|
|
37
37
|
const processRuleGroup = (rg, outermost) => {
|
|
38
|
-
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return outermost ? fallbackExpression : "";
|
|
38
|
+
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? /* v8 ignore start -- @preserve */ ""])) return outermost ? fallbackExpression : "";
|
|
39
39
|
const processedRules = [];
|
|
40
40
|
let precedingCombinator = "";
|
|
41
41
|
let firstRule = true;
|
|
@@ -101,10 +101,11 @@ const defaultRuleProcessorCEL = (rule, opts = {}) => {
|
|
|
101
101
|
const { mode, threshold } = matchEval;
|
|
102
102
|
const subqueryDepth = opts.subqueryDepth ?? 0;
|
|
103
103
|
const arrayElementAlias = require_utils.getSubqueryElementAlias(subqueryDepth);
|
|
104
|
-
const
|
|
104
|
+
const celQuery = require_transformQuery.transformQuery(rule.value, { ruleProcessor: (r) => ({
|
|
105
105
|
...r,
|
|
106
106
|
field: `${arrayElementAlias}${r.field ? `.${r.field}` : ""}`
|
|
107
|
-
}) })
|
|
107
|
+
}) });
|
|
108
|
+
const nestedArrayFilter = defaultRuleGroupProcessorCEL(celQuery, {
|
|
108
109
|
...opts,
|
|
109
110
|
subqueryDepth: subqueryDepth + 1
|
|
110
111
|
});
|
|
@@ -181,7 +182,7 @@ const defaultRuleGroupProcessorMongoDBQuery = (ruleGroup, options, meta) => {
|
|
|
181
182
|
const { context, fields, getParseNumberBoolean, placeholderFieldName, placeholderOperatorName, placeholderValueName, ruleProcessor, validateRule, validationMap } = options;
|
|
182
183
|
const { inExpressionContext } = context ?? {};
|
|
183
184
|
const processRuleGroup = (rg, outermost) => {
|
|
184
|
-
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return outermost ? mongoDbFallback : false;
|
|
185
|
+
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? /* v8 ignore start -- @preserve */ ""])) return outermost ? mongoDbFallback : false;
|
|
185
186
|
const combinator = `$${require_isRuleGroup.lc(rg.combinator)}`;
|
|
186
187
|
let hasChildRules = false;
|
|
187
188
|
const expressions = rg.rules.map((rule) => {
|
|
@@ -359,7 +360,7 @@ const defaultRuleProcessorMongoDB = (rule, options) => {
|
|
|
359
360
|
const defaultRuleGroupProcessorSpEL = (ruleGroup, options) => {
|
|
360
361
|
const { fields, fallbackExpression, getParseNumberBoolean, placeholderFieldName, placeholderOperatorName, placeholderValueName, ruleProcessor, validateRule, validationMap } = options;
|
|
361
362
|
const processRuleGroup = (rg, outermost) => {
|
|
362
|
-
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return outermost ? fallbackExpression : "";
|
|
363
|
+
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? /* v8 ignore start -- @preserve */ ""])) return outermost ? fallbackExpression : "";
|
|
363
364
|
const processedRules = [];
|
|
364
365
|
let precedingCombinator = "";
|
|
365
366
|
let firstRule = true;
|
|
@@ -600,7 +601,7 @@ const cypherCombinatorMap = {
|
|
|
600
601
|
const defaultRuleGroupProcessorCypher = (ruleGroup, options) => {
|
|
601
602
|
const { fields, fallbackExpression, getParseNumberBoolean, placeholderFieldName, placeholderOperatorName, placeholderValueName, ruleProcessor, validateRule, validationMap } = options;
|
|
602
603
|
const processRuleGroup = (rg, outermost) => {
|
|
603
|
-
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return outermost ? fallbackExpression : "";
|
|
604
|
+
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? /* v8 ignore start -- @preserve */ ""])) return outermost ? fallbackExpression : "";
|
|
604
605
|
const processedRules = [];
|
|
605
606
|
let precedingCombinator = "";
|
|
606
607
|
let firstRule = true;
|
|
@@ -664,7 +665,7 @@ const defaultRuleGroupProcessorDrizzle = (ruleGroup, options, _meta) => (columns
|
|
|
664
665
|
if (!columns || !drizzleOperators) return void 0;
|
|
665
666
|
const { and, not, or } = drizzleOperators;
|
|
666
667
|
const processRuleGroup = (rg, _outermost) => {
|
|
667
|
-
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return;
|
|
668
|
+
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? /* v8 ignore start -- @preserve */ ""])) return;
|
|
668
669
|
const processedRules = rg.rules.map((rule) => {
|
|
669
670
|
if (require_isRuleGroup.isRuleGroup(rule)) return processRuleGroup(rule);
|
|
670
671
|
const [validationResult, fieldValidator] = validateRule(rule);
|
|
@@ -697,7 +698,7 @@ const defaultRuleGroupProcessorDrizzle = (ruleGroup, options, _meta) => (columns
|
|
|
697
698
|
const defaultRuleGroupProcessorElasticSearch = (ruleGroup, options) => {
|
|
698
699
|
const { fields, getParseNumberBoolean, placeholderFieldName, placeholderOperatorName, placeholderValueName, ruleProcessor, validateRule, validationMap } = options;
|
|
699
700
|
const processRuleGroup = (rg) => {
|
|
700
|
-
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return false;
|
|
701
|
+
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? /* v8 ignore start -- @preserve */ ""])) return false;
|
|
701
702
|
const processedRules = rg.rules.map((rule) => {
|
|
702
703
|
if (require_isRuleGroup.isRuleGroup(rule)) return processRuleGroup(rule);
|
|
703
704
|
const [validationResult, fieldValidator] = validateRule(rule);
|
|
@@ -732,7 +733,9 @@ const defaultRuleGroupProcessorGremlin = (ruleGroup, options) => {
|
|
|
732
733
|
// v8 ignore next -- @preserve
|
|
733
734
|
if (typeof rule === "string" || require_isRuleGroup.isRuleGroup(rule)) return void 0;
|
|
734
735
|
const [validationResult, fieldValidator] = validateRule(rule);
|
|
735
|
-
if (!isRuleOrGroupValid(rule, validationResult, fieldValidator) ||
|
|
736
|
+
if (!isRuleOrGroupValid(rule, validationResult, fieldValidator) ||
|
|
737
|
+
/* v8 ignore next 2 -- @preserve */
|
|
738
|
+
rule.field === placeholderFieldName || rule.operator === placeholderOperatorName || placeholderValueName !== void 0 && rule.value === placeholderValueName) return;
|
|
736
739
|
const fieldData = require_utils.getOption(fields, rule.field);
|
|
737
740
|
return ruleProcessor(rule, {
|
|
738
741
|
...options,
|
|
@@ -743,7 +746,7 @@ const defaultRuleGroupProcessorGremlin = (ruleGroup, options) => {
|
|
|
743
746
|
};
|
|
744
747
|
/** Recursively processes a nested group into `.and()`/`.or()`/`.not()` form. */
|
|
745
748
|
const processNested = (rg) => {
|
|
746
|
-
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return "";
|
|
749
|
+
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? /* v8 ignore start -- @preserve */ ""])) return "";
|
|
747
750
|
const predicates = [];
|
|
748
751
|
for (const rule of rg.rules) {
|
|
749
752
|
if (typeof rule === "string") continue;
|
|
@@ -761,7 +764,7 @@ const defaultRuleGroupProcessorGremlin = (ruleGroup, options) => {
|
|
|
761
764
|
if (predicates.length === 1 && !rg.not) return predicates[0];
|
|
762
765
|
return `.${prefix}(${predicates.map((p) => p.startsWith(".") ? `__${p}` : p).join(", ")})`;
|
|
763
766
|
};
|
|
764
|
-
if (!isRuleOrGroupValid(ruleGroup, validationMap[ruleGroup.id ?? ""])) return fallbackExpression;
|
|
767
|
+
if (!isRuleOrGroupValid(ruleGroup, validationMap[ruleGroup.id ?? /* v8 ignore start -- @preserve */ ""])) return fallbackExpression;
|
|
765
768
|
const steps = [];
|
|
766
769
|
for (const rule of ruleGroup.rules) {
|
|
767
770
|
if (typeof rule === "string") continue;
|
|
@@ -786,7 +789,7 @@ const defaultRuleGroupProcessorGremlin = (ruleGroup, options) => {
|
|
|
786
789
|
const defaultRuleGroupProcessorJSONata = (ruleGroup, options) => {
|
|
787
790
|
const { fields, fallbackExpression, getParseNumberBoolean, placeholderFieldName, placeholderOperatorName, placeholderValueName, ruleProcessor, validateRule, validationMap } = options;
|
|
788
791
|
const processRuleGroup = (rg, outermost) => {
|
|
789
|
-
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return outermost ? fallbackExpression : "";
|
|
792
|
+
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? /* v8 ignore start -- @preserve */ ""])) return outermost ? fallbackExpression : "";
|
|
790
793
|
const processedRules = [];
|
|
791
794
|
let precedingCombinator = "";
|
|
792
795
|
let firstRule = true;
|
|
@@ -842,7 +845,7 @@ const defaultRuleGroupProcessorJsonLogic = (ruleGroup, options) => {
|
|
|
842
845
|
const { fields, getParseNumberBoolean, placeholderFieldName, placeholderOperatorName, placeholderValueName, ruleProcessor, validateRule, validationMap } = options;
|
|
843
846
|
const query = require_convertQuery.convertFromIC(ruleGroup);
|
|
844
847
|
const processRuleGroup = (rg, _outermost) => {
|
|
845
|
-
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return false;
|
|
848
|
+
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? /* v8 ignore start -- @preserve */ ""])) return false;
|
|
846
849
|
const processedRules = rg.rules.map((rule) => {
|
|
847
850
|
if (require_isRuleGroup.isRuleGroup(rule)) return processRuleGroup(rule);
|
|
848
851
|
const [validationResult, fieldValidator] = validateRule(rule);
|
|
@@ -870,7 +873,7 @@ const defaultRuleGroupProcessorJsonLogic = (ruleGroup, options) => {
|
|
|
870
873
|
const defaultRuleGroupProcessorLDAP = (ruleGroup, options) => {
|
|
871
874
|
const { fields, fallbackExpression, getParseNumberBoolean, placeholderFieldName, placeholderOperatorName, placeholderValueName, ruleProcessor, validateRule, validationMap } = options;
|
|
872
875
|
const processRuleGroup = (rg, outermost) => {
|
|
873
|
-
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return outermost ? fallbackExpression : "";
|
|
876
|
+
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? /* v8 ignore start -- @preserve */ ""])) return outermost ? fallbackExpression : "";
|
|
874
877
|
const rules = rg.rules.map((rule) => {
|
|
875
878
|
if (require_isRuleGroup.isRuleGroup(rule)) return processRuleGroup(rule);
|
|
876
879
|
const [validationResult, fieldValidator] = validateRule(rule);
|
|
@@ -903,7 +906,7 @@ const isBracketed = (str) => str.startsWith("{") && str.endsWith("}");
|
|
|
903
906
|
const defaultRuleGroupProcessorMongoDB = (ruleGroup, options, meta) => {
|
|
904
907
|
const { fields, fallbackExpression, getParseNumberBoolean, placeholderFieldName, placeholderOperatorName, placeholderValueName, ruleProcessor, validateRule, validationMap } = options;
|
|
905
908
|
const processRuleGroup = (rg, outermost) => {
|
|
906
|
-
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return outermost ? fallbackExpression : "";
|
|
909
|
+
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? /* v8 ignore start -- @preserve */ ""])) return outermost ? fallbackExpression : "";
|
|
907
910
|
const combinator = `"$${require_isRuleGroup.lc(rg.combinator)}"`;
|
|
908
911
|
let hasChildRules = false;
|
|
909
912
|
const expressions = rg.rules.map((rule) => {
|
|
@@ -940,7 +943,7 @@ const defaultRuleGroupProcessorMongoDB = (ruleGroup, options, meta) => {
|
|
|
940
943
|
const defaultRuleGroupProcessorNL = (ruleGroup, options) => {
|
|
941
944
|
const { fields, fallbackExpression, getParseNumberBoolean, placeholderFieldName, placeholderOperatorName, placeholderValueName, ruleProcessor, translations, validateRule, validationMap } = options;
|
|
942
945
|
const processRuleGroup = (rg, outermostOrLonelyInGroup) => {
|
|
943
|
-
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return outermostOrLonelyInGroup ? fallbackExpression : "";
|
|
946
|
+
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? /* v8 ignore start -- @preserve */ ""])) return outermostOrLonelyInGroup ? fallbackExpression : "";
|
|
944
947
|
const rg2 = require_isRuleGroup.isRuleGroupTypeIC(rg) && rg.rules.some((r) => typeof r === "string" && require_isRuleGroup.lc(r) === "xor") ? require_convertQuery.convertFromIC(rg) : rg;
|
|
945
948
|
const processedRules = [];
|
|
946
949
|
let precedingCombinator = "";
|
|
@@ -951,7 +954,8 @@ const defaultRuleGroupProcessorNL = (ruleGroup, options) => {
|
|
|
951
954
|
continue;
|
|
952
955
|
}
|
|
953
956
|
if (require_isRuleGroup.isRuleGroup(rule)) {
|
|
954
|
-
const processedGroup = processRuleGroup(rule, rg2.rules.length === 1 && !(rg2.not || /^xor$/i.test(rg2.combinator ??
|
|
957
|
+
const processedGroup = processRuleGroup(rule, rg2.rules.length === 1 && !(rg2.not || /^xor$/i.test(rg2.combinator ??
|
|
958
|
+
/* v8 ignore start -- @preserve */ "")));
|
|
955
959
|
// v8 ignore else
|
|
956
960
|
if (processedGroup) {
|
|
957
961
|
if (!firstRule && precedingCombinator) {
|
|
@@ -1038,7 +1042,7 @@ const defaultRuleGroupProcessorParameterized = (ruleGroup, options) => {
|
|
|
1038
1042
|
return sql;
|
|
1039
1043
|
};
|
|
1040
1044
|
const processRuleGroup = (rg, outermostOrLonelyInGroup) => {
|
|
1041
|
-
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return outermostOrLonelyInGroup ? fallbackExpression : "";
|
|
1045
|
+
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? /* v8 ignore start -- @preserve */ ""])) return outermostOrLonelyInGroup ? fallbackExpression : "";
|
|
1042
1046
|
const processedRules = [];
|
|
1043
1047
|
let precedingCombinator = "";
|
|
1044
1048
|
let firstRule = true;
|
|
@@ -1098,7 +1102,7 @@ const prismaFallback = {};
|
|
|
1098
1102
|
const defaultRuleGroupProcessorPrisma = (ruleGroup, options) => {
|
|
1099
1103
|
const { fields, getParseNumberBoolean, placeholderFieldName, placeholderOperatorName, placeholderValueName, ruleProcessor, validateRule, validationMap } = options;
|
|
1100
1104
|
const processRuleGroup = (rg, outermost) => {
|
|
1101
|
-
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return outermost ? prismaFallback : void 0;
|
|
1105
|
+
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? /* v8 ignore start -- @preserve */ ""])) return outermost ? prismaFallback : void 0;
|
|
1102
1106
|
const combinator = rg.combinator.toUpperCase();
|
|
1103
1107
|
let hasChildRules = false;
|
|
1104
1108
|
const expressions = rg.rules.map((rule) => {
|
|
@@ -1137,7 +1141,7 @@ const defaultRuleGroupProcessorSequelize = (ruleGroup, options) => {
|
|
|
1137
1141
|
const { sequelizeOperators: Op } = context;
|
|
1138
1142
|
if (!Op) return void 0;
|
|
1139
1143
|
const processRuleGroup = (rg, _outermost) => {
|
|
1140
|
-
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return;
|
|
1144
|
+
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? /* v8 ignore start -- @preserve */ ""])) return;
|
|
1141
1145
|
const combinator = rg.combinator.toUpperCase();
|
|
1142
1146
|
let hasChildRules = false;
|
|
1143
1147
|
const expressions = rg.rules.map((rule) => {
|
|
@@ -1176,7 +1180,7 @@ const defaultRuleGroupProcessorSequelize = (ruleGroup, options) => {
|
|
|
1176
1180
|
const defaultRuleGroupProcessorSPARQL = (ruleGroup, options) => {
|
|
1177
1181
|
const { fields, fallbackExpression, getParseNumberBoolean, placeholderFieldName, placeholderOperatorName, placeholderValueName, ruleProcessor, validateRule, validationMap } = options;
|
|
1178
1182
|
const processRuleGroup = (rg, outermost) => {
|
|
1179
|
-
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return outermost ? fallbackExpression : "";
|
|
1183
|
+
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? /* v8 ignore start -- @preserve */ ""])) return outermost ? fallbackExpression : "";
|
|
1180
1184
|
const processedRules = [];
|
|
1181
1185
|
let precedingCombinator = "";
|
|
1182
1186
|
let firstRule = true;
|
|
@@ -1231,7 +1235,7 @@ const defaultRuleGroupProcessorSPARQL = (ruleGroup, options) => {
|
|
|
1231
1235
|
const defaultRuleGroupProcessorSQL = (ruleGroup, options) => {
|
|
1232
1236
|
const { fields, fallbackExpression, getParseNumberBoolean, placeholderFieldName, placeholderOperatorName, placeholderValueName, ruleProcessor, validateRule, validationMap } = options;
|
|
1233
1237
|
const processRuleGroup = (rg, outermostOrLonelyInGroup) => {
|
|
1234
|
-
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return outermostOrLonelyInGroup ? fallbackExpression : "";
|
|
1238
|
+
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? /* v8 ignore start -- @preserve */ ""])) return outermostOrLonelyInGroup ? fallbackExpression : "";
|
|
1235
1239
|
const processedRules = [];
|
|
1236
1240
|
let precedingCombinator = "";
|
|
1237
1241
|
let firstRule = true;
|
|
@@ -1299,7 +1303,7 @@ const defaultRuleGroupProcessorTanStackDB = (ruleGroup, options) => (refs) => {
|
|
|
1299
1303
|
/* v8 ignore next -- @preserve */
|
|
1300
1304
|
if (refKeys.length === 0) return fallback;
|
|
1301
1305
|
const processRuleGroup = (rg) => {
|
|
1302
|
-
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? ""])) return;
|
|
1306
|
+
if (!isRuleOrGroupValid(rg, validationMap[rg.id ?? /* v8 ignore start -- @preserve */ ""])) return;
|
|
1303
1307
|
const processedRules = rg.rules.map((rule) => {
|
|
1304
1308
|
if (require_isRuleGroup.isRuleGroup(rule)) return processRuleGroup(rule);
|
|
1305
1309
|
const [validationResult, fieldValidator] = validateRule(rule);
|
|
@@ -1702,7 +1706,7 @@ const defaultRuleProcessorCypher = (rule, opts = {}) => {
|
|
|
1702
1706
|
* @group Export
|
|
1703
1707
|
*/
|
|
1704
1708
|
const defaultRuleProcessorDrizzle = (rule, _options) => {
|
|
1705
|
-
const opts = _options ??
|
|
1709
|
+
const opts = _options ?? /* v8 ignore start -- @preserve */ {};
|
|
1706
1710
|
// v8 ignore next
|
|
1707
1711
|
const { parseNumbers, preserveValueOrder, context = {} } = opts;
|
|
1708
1712
|
const { columns, drizzleOperators, useRawFields } = context;
|
|
@@ -1725,10 +1729,11 @@ const defaultRuleProcessorDrizzle = (rule, _options) => {
|
|
|
1725
1729
|
const { mode, threshold } = matchEval;
|
|
1726
1730
|
const subqueryDepth = opts.subqueryDepth ?? 0;
|
|
1727
1731
|
const arrayElementAlias = require_utils.getSubqueryElementAlias(subqueryDepth);
|
|
1728
|
-
const
|
|
1732
|
+
const sqlQuery = require_transformQuery.transformQuery(rule.value, { ruleProcessor: (r) => ({
|
|
1729
1733
|
...r,
|
|
1730
1734
|
field: arrayElementAlias
|
|
1731
|
-
}) })
|
|
1735
|
+
}) });
|
|
1736
|
+
const nestedArrayFilter = defaultRuleGroupProcessorDrizzle(sqlQuery, {
|
|
1732
1737
|
...opts,
|
|
1733
1738
|
context: {
|
|
1734
1739
|
...opts.context,
|
|
@@ -2267,7 +2272,7 @@ const defaultValueProcessorNL = (rule, opts = {}) => {
|
|
|
2267
2272
|
const { escapeQuotes, fields, parseNumbers, quoteFieldNamesWith, quoteValuesWith, fieldIdentifierSeparator, translations } = opts;
|
|
2268
2273
|
const valueIsField = rule.valueSource === "field";
|
|
2269
2274
|
const operatorLowerCase = require_isRuleGroup.lc(rule.operator);
|
|
2270
|
-
const quoteChar = quoteValuesWith || "'";
|
|
2275
|
+
const quoteChar = quoteValuesWith || /* v8 ignore start -- @preserve */ "'";
|
|
2271
2276
|
const quoteValue = (v) => `${quoteChar}${v}${quoteChar}`;
|
|
2272
2277
|
const escapeValue = (v) => escapeStringValueQuotes(v, quoteChar, escapeQuotes);
|
|
2273
2278
|
const wrapAndEscape = (v) => quoteValue(escapeValue(v));
|
|
@@ -2275,7 +2280,7 @@ const defaultValueProcessorNL = (rule, opts = {}) => {
|
|
|
2275
2280
|
quoteFieldNamesWith,
|
|
2276
2281
|
fieldIdentifierSeparator
|
|
2277
2282
|
});
|
|
2278
|
-
const t = translations ??
|
|
2283
|
+
const t = translations ?? /* v8 ignore start -- @preserve */ {};
|
|
2279
2284
|
const orTL = t.or ?? "or";
|
|
2280
2285
|
const trueTL = t.true ?? "true";
|
|
2281
2286
|
const falseTL = t.false ?? "false";
|
|
@@ -2287,7 +2292,8 @@ const defaultValueProcessorNL = (rule, opts = {}) => {
|
|
|
2287
2292
|
case "between":
|
|
2288
2293
|
case "notbetween": {
|
|
2289
2294
|
if (!valueIsField) return defaultValueProcessorByRule(rule, opts);
|
|
2290
|
-
const valueAsArray = require_utils.toArray(rule.value, { retainEmptyStrings: true }).slice(0, 2).map((v) => wrapFieldName(require_utils.getOption(fields ??
|
|
2295
|
+
const valueAsArray = require_utils.toArray(rule.value, { retainEmptyStrings: true }).slice(0, 2).map((v) => wrapFieldName(require_utils.getOption(fields ??
|
|
2296
|
+
/* v8 ignore start -- @preserve */ [], v)?.label ?? v));
|
|
2291
2297
|
if (valueAsArray.length < 2 || !require_utils.isValidValue(valueAsArray[0]) || !require_utils.isValidValue(valueAsArray[1])) return "";
|
|
2292
2298
|
return defaultValueProcessorByRule({
|
|
2293
2299
|
...rule,
|
|
@@ -2298,14 +2304,16 @@ const defaultValueProcessorNL = (rule, opts = {}) => {
|
|
|
2298
2304
|
case "notin": {
|
|
2299
2305
|
const valueAsArray = require_utils.toArray(rule.value);
|
|
2300
2306
|
if (valueAsArray.length === 0) return "";
|
|
2301
|
-
const valStringArray = valueAsArray.map((v) => valueIsField ? wrapFieldName(require_utils.getOption(fields ??
|
|
2307
|
+
const valStringArray = valueAsArray.map((v) => valueIsField ? wrapFieldName(require_utils.getOption(fields ??
|
|
2308
|
+
/* v8 ignore start -- @preserve */ [], v)?.label ?? v) : require_utils.shouldRenderAsNumber(v, parseNumbers) ? `${require_utils.trimIfString(v)}` : `${wrapAndEscape(v)}`);
|
|
2302
2309
|
if (valStringArray.length === 1) return valStringArray[0];
|
|
2303
2310
|
const oxfordComma = useOxfordComma && valStringArray.length > 2 ? "," : "";
|
|
2304
2311
|
return `(${`${valStringArray.slice(0, -1).join(listSep)}${oxfordComma} ${orTL} ${valStringArray.at(-1)}`})`;
|
|
2305
2312
|
}
|
|
2306
2313
|
}
|
|
2307
2314
|
if (typeof rule.value === "boolean") return rule.value ? trueTL : falseTL;
|
|
2308
|
-
return valueIsField ? wrapFieldName(require_utils.getOption(fields ??
|
|
2315
|
+
return valueIsField ? wrapFieldName(require_utils.getOption(fields ??
|
|
2316
|
+
/* v8 ignore start -- @preserve */ [], rule.value)?.label ?? rule.value) : require_utils.shouldRenderAsNumber(rule.value, parseNumbers) ? `${require_utils.trimIfString(rule.value)}` : `${wrapAndEscape(rule.value)}`;
|
|
2309
2317
|
};
|
|
2310
2318
|
//#endregion
|
|
2311
2319
|
//#region src/utils/formatQuery/defaultRuleProcessorNL.ts
|
|
@@ -2357,7 +2365,7 @@ const defaultOperatorProcessorNL = (rule, opts = {}) => {
|
|
|
2357
2365
|
name: field,
|
|
2358
2366
|
value: field,
|
|
2359
2367
|
label: field
|
|
2360
|
-
} }) ?? []), normalizedOperator) ?? {
|
|
2368
|
+
} }) ?? /* v8 ignore start -- @preserve */ []), normalizedOperator) ?? {
|
|
2361
2369
|
name: normalizedOperator,
|
|
2362
2370
|
value: normalizedOperator,
|
|
2363
2371
|
label: normalizedOperator
|
|
@@ -2373,7 +2381,7 @@ const defaultOperatorProcessorNL = (rule, opts = {}) => {
|
|
|
2373
2381
|
const defaultRuleProcessorNL = (rule, opts) => {
|
|
2374
2382
|
const { field, operator } = rule;
|
|
2375
2383
|
// v8 ignore next
|
|
2376
|
-
const { fieldData, quoteFieldNamesWith = ["", ""], fieldIdentifierSeparator = "", quoteValuesWith = `'`, operatorProcessor = defaultOperatorProcessorNL, valueProcessor = defaultValueProcessorNL, concatOperator = "||", wordOrder = "SVO" } = opts ??
|
|
2384
|
+
const { fieldData, quoteFieldNamesWith = ["", ""], fieldIdentifierSeparator = "", quoteValuesWith = `'`, operatorProcessor = defaultOperatorProcessorNL, valueProcessor = defaultValueProcessorNL, concatOperator = "||", wordOrder = "SVO" } = opts ?? /* v8 ignore start -- @preserve */ {};
|
|
2377
2385
|
const processedField = require_utils.getQuotedFieldName(fieldData?.label ?? field, {
|
|
2378
2386
|
quoteFieldNamesWith,
|
|
2379
2387
|
fieldIdentifierSeparator
|
|
@@ -2594,7 +2602,7 @@ const defaultRuleProcessorParameterized = (rule, opts, meta) => {
|
|
|
2594
2602
|
}
|
|
2595
2603
|
let paramValue = rule.value;
|
|
2596
2604
|
if (typeof rule.value === "string") if (require_utils.shouldRenderAsNumber(rule.value, parseNumbers)) paramValue = require_utils.parseNumber(rule.value, { parseNumbers });
|
|
2597
|
-
else paramValue = /^'.*'$/g.test(value) ? value.replaceAll(/(^'|'$)/g, "") :
|
|
2605
|
+
else paramValue = /^'.*'$/g.test(value) ? value.replaceAll(/(^'|'$)/g, "") : /* v8 ignore next -- @preserve */ value;
|
|
2598
2606
|
let paramName = "";
|
|
2599
2607
|
if (parameterized) params.push(paramValue);
|
|
2600
2608
|
else {
|
|
@@ -2811,7 +2819,7 @@ const defaultRuleProcessorSPARQL = (rule, opts = {}) => {
|
|
|
2811
2819
|
* @group Export
|
|
2812
2820
|
*/
|
|
2813
2821
|
const defaultRuleProcessorTanStackDB = (rule, _options) => {
|
|
2814
|
-
const { parseNumbers, preserveValueOrder, context = {} } = _options ??
|
|
2822
|
+
const { parseNumbers, preserveValueOrder, context = {} } = _options ?? /* v8 ignore start -- @preserve */ {};
|
|
2815
2823
|
const ops = context.tanStackDbOperators;
|
|
2816
2824
|
const refs = context._tanstackDbRefs;
|
|
2817
2825
|
const primaryRef = context._tanstackDbPrimaryRef;
|
|
@@ -3047,7 +3055,8 @@ function formatQuery(ruleGroup, optionParam = {}) {
|
|
|
3047
3055
|
const ruleProcessor = (typeof ruleProcessor_option === "function" ? ruleProcessor_option : null) ?? (valueProcessorCanActAsRuleProcessor.has(format) && typeof ruleProcessor_option !== "function" && valueProcessor_option ? valueProcessor : null) ?? defaultRuleProcessors[format] ?? defaultRuleProcessorSQL;
|
|
3048
3056
|
const quoteFieldNamesWith = require_utils.getQuoteFieldNamesWithArray(quoteFieldNamesWith_option);
|
|
3049
3057
|
const fields = require_utils.toFullOptionList(optObj.fields);
|
|
3050
|
-
const getOperators = (f, m) => require_utils.toFullOptionList(getOperators_option(f, m) ??
|
|
3058
|
+
const getOperators = (f, m) => require_utils.toFullOptionList(getOperators_option(f, m) ??
|
|
3059
|
+
/* v8 ignore start -- @preserve */ []);
|
|
3051
3060
|
const fallbackExpression = fallbackExpression_option ?? defaultFallbackExpressions[format] ?? defaultFallbackExpressions.sql;
|
|
3052
3061
|
let validationMap = {};
|
|
3053
3062
|
// v8 ignore else
|
|
@@ -3070,7 +3079,7 @@ function formatQuery(ruleGroup, optionParam = {}) {
|
|
|
3070
3079
|
const uniqueFields = require_utils.toFlatOptionArray(fields);
|
|
3071
3080
|
for (const f of uniqueFields)
|
|
3072
3081
|
// v8 ignore else
|
|
3073
|
-
if (typeof f.validator === "function") validatorMap[f.value ?? f.name] = f.validator;
|
|
3082
|
+
if (typeof f.validator === "function") validatorMap[f.value ?? /* v8 ignore start -- @preserve */ f.name] = f.validator;
|
|
3074
3083
|
const validateRule = (rule) => {
|
|
3075
3084
|
let validationResult;
|
|
3076
3085
|
let fieldValidator;
|