@react-querybuilder/core 8.9.2 → 8.10.0

package/dist/parseJSONata.js

@@ -1,6 +1,6 @@
 const require_isRuleGroup = require('./isRuleGroup-DqAs2x4E.js');
-require('./optGroupUtils-CXLgyg2i.js');
-const require_prepareQueryObjects = require('./prepareQueryObjects-BqFEs4eV.js');
+require('./optGroupUtils-B0hTpodo.js');
+const require_prepareQueryObjects = require('./prepareQueryObjects-BOUWfel5.js');
 
 //#region ../../node_modules/jsonata/jsonata.js
 var require_jsonata = /* @__PURE__ */ require_isRuleGroup.__commonJS({ "../../node_modules/jsonata/jsonata.js": ((exports, module) => {
@@ -230,8 +230,7 @@ var require_jsonata = /* @__PURE__ */ require_isRuleGroup.__commonJS({ "../../no
 						var decimal = 0;
 						var max = 1;
 						for (var i = roman.length - 1; i >= 0; i--) {
-							const digit = roman[i];
-							const value = romanValues[digit];
+							const value = romanValues[roman[i]];
 							if (value < max) decimal -= value;
 							else {
 								max = value;
@@ -334,13 +333,11 @@ var require_jsonata = /* @__PURE__ */ require_isRuleGroup.__commonJS({ "../../no
 									formattedInteger = formattedInteger.substr(0, pos) + separator.character + formattedInteger.substr(pos);
 								});
 								if (format.ordinal) {
-									var suffix123 = {
+									var suffix = {
 										"1": "st",
 										"2": "nd",
 										"3": "rd"
-									};
-									var lastDigit = formattedInteger[formattedInteger.length - 1];
-									var suffix = suffix123[lastDigit];
+									}[formattedInteger[formattedInteger.length - 1]];
 									if (!suffix || formattedInteger.length > 1 && formattedInteger[formattedInteger.length - 2] === "1") suffix = "th";
 									formattedInteger = formattedInteger + suffix;
 								}
@@ -690,12 +687,9 @@ var require_jsonata = /* @__PURE__ */ require_isRuleGroup.__commonJS({ "../../no
 							case "D":
 								componentValue = date.getUTCDate();
 								break;
-							case "d": {
-								const today = Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate());
-								const firstJan = Date.UTC(date.getUTCFullYear(), 0);
-								componentValue = (today - firstJan) / millisInADay + 1;
+							case "d":
+								componentValue = (Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate()) - Date.UTC(date.getUTCFullYear(), 0)) / millisInADay + 1;
 								break;
-							}
 							case "F":
 								componentValue = date.getUTCDay();
 								if (componentValue === 0) componentValue = 7;
@@ -706,12 +700,8 @@ var require_jsonata = /* @__PURE__ */ require_isRuleGroup.__commonJS({ "../../no
 								const today = Date.UTC(thisYear.year, date.getUTCMonth(), date.getUTCDate());
 								let week = deltaWeeks(startOfWeek1, today);
 								if (week > 52) {
-									const startOfFollowingYear = startOfFirstWeek(thisYear.nextYear());
-									if (today >= startOfFollowingYear) week = 1;
-								} else if (week < 1) {
-									const startOfPreviousYear = startOfFirstWeek(thisYear.previousYear());
-									week = deltaWeeks(startOfPreviousYear, today);
-								}
+									if (today >= startOfFirstWeek(thisYear.nextYear())) week = 1;
+								} else if (week < 1) week = deltaWeeks(startOfFirstWeek(thisYear.previousYear()), today);
 								componentValue = Math.floor(week);
 								break;
 							}
@@ -721,12 +711,8 @@ var require_jsonata = /* @__PURE__ */ require_isRuleGroup.__commonJS({ "../../no
 								const today = Date.UTC(thisMonth.year, thisMonth.month, date.getUTCDate());
 								let week = deltaWeeks(startOfWeek1, today);
 								if (week > 4) {
-									const startOfFollowingMonth = startOfFirstWeek(thisMonth.nextMonth());
-									if (today >= startOfFollowingMonth) week = 1;
-								} else if (week < 1) {
-									const startOfPreviousMonth = startOfFirstWeek(thisMonth.previousMonth());
-									week = deltaWeeks(startOfPreviousMonth, today);
-								}
+									if (today >= startOfFirstWeek(thisMonth.nextMonth())) week = 1;
+								} else if (week < 1) week = deltaWeeks(startOfFirstWeek(thisMonth.previousMonth()), today);
 								componentValue = Math.floor(week);
 								break;
 							}
@@ -967,8 +953,7 @@ var require_jsonata = /* @__PURE__ */ require_isRuleGroup.__commonJS({ "../../no
 					*/
 					function parseInteger(value, picture) {
 						if (typeof value === "undefined") return;
-						const formatSpec = analyseIntegerPicture(picture);
-						return generateRegex(formatSpec).parse(value);
+						return generateRegex(analyseIntegerPicture(picture)).parse(value);
 					}
 					/**
 					* parse a string containing a timestamp as specified by the picture string
@@ -977,8 +962,7 @@ var require_jsonata = /* @__PURE__ */ require_isRuleGroup.__commonJS({ "../../no
 					* @returns {number} - the parsed timestamp in millis since the epoch
 					*/
 					function parseDateTime(timestamp, picture) {
-						const formatSpec = analyseDateTimePicture(picture);
-						const matchSpec = generateRegex(formatSpec);
+						const matchSpec = generateRegex(analyseDateTimePicture(picture));
 						const fullRegex = "^" + matchSpec.parts.map((part) => "(" + part.regex + ")").join("") + "$";
 						var info = new RegExp(fullRegex, "i").exec(timestamp);
 						if (info !== null) {
@@ -2075,8 +2059,7 @@ var require_jsonata = /* @__PURE__ */ require_isRuleGroup.__commonJS({ "../../no
 								for (var i = 0; i < arr.length; i++) {
 									var entry = arr[i];
 									var func_args = hofFuncArgs(func, entry, i, arr);
-									var res = await func.apply(this, func_args);
-									if (boolean(res)) result.push(entry);
+									if (boolean(await func.apply(this, func_args))) result.push(entry);
 								}
 								return result;
 							}
@@ -2096,8 +2079,7 @@ var require_jsonata = /* @__PURE__ */ require_isRuleGroup.__commonJS({ "../../no
 									var positiveResult = true;
 									if (typeof func !== "undefined") {
 										var func_args = hofFuncArgs(func, entry, i, arr);
-										var res = await func.apply(this, func_args);
-										positiveResult = boolean(res);
+										positiveResult = boolean(await func.apply(this, func_args));
 									}
 									if (positiveResult) if (!hasFoundMatch) {
 										result = entry;
@@ -2425,8 +2407,7 @@ var require_jsonata = /* @__PURE__ */ require_isRuleGroup.__commonJS({ "../../no
 								for (var item in arg) {
 									var entry = arg[item];
 									var func_args = hofFuncArgs(func, entry, item, arg);
-									var res = await func.apply(this, func_args);
-									if (boolean(res)) result[item] = entry;
+									if (boolean(await func.apply(this, func_args))) result[item] = entry;
 								}
 								if (Object.keys(result).length === 0) result = void 0;
 								return result;
@@ -3447,10 +3428,8 @@ var require_jsonata = /* @__PURE__ */ require_isRuleGroup.__commonJS({ "../../no
 								position: expr.position,
 								value: func
 							};
-							if (isFunction(lhs)) {
-								var chain = await evaluate(chainAST, null, environment);
-								result = await apply(chain, [lhs, func], null, environment);
-							} else result = await apply(func, [lhs], null, environment);
+							if (isFunction(lhs)) result = await apply(await evaluate(chainAST, null, environment), [lhs, func], null, environment);
+							else result = await apply(func, [lhs], null, environment);
 						}
 						return result;
 					}
@@ -3669,8 +3648,7 @@ var require_jsonata = /* @__PURE__ */ require_isRuleGroup.__commonJS({ "../../no
 						sigArgs = sigArgs.map(function(sigArg) {
 							return "$" + sigArg.trim();
 						});
-						var body = "function(" + sigArgs.join(", ") + "){ _ }";
-						var bodyAST = parser(body);
+						var bodyAST = parser("function(" + sigArgs.join(", ") + "){ _ }");
 						bodyAST.body = native;
 						return partialApplyProcedure(bodyAST, args);
 					}
@@ -4361,19 +4339,19 @@ var require_jsonata = /* @__PURE__ */ require_isRuleGroup.__commonJS({ "../../no
 							return remaining;
 						};
 						var base_symbol = { nud: function() {
-							var err$1 = {
+							var err = {
 								code: "S0211",
 								token: this.value,
 								position: this.position
 							};
 							if (recover) {
-								err$1.remaining = remainingTokens();
-								err$1.type = "error";
-								errors.push(err$1);
-								return err$1;
+								err.remaining = remainingTokens();
+								err.type = "error";
+								errors.push(err);
+								return err;
 							} else {
-								err$1.stack = (/* @__PURE__ */ new Error()).stack;
-								throw err$1;
+								err.stack = (/* @__PURE__ */ new Error()).stack;
+								throw err;
 							}
 						} };
 						var symbol = function(id, bp) {
@@ -4389,18 +4367,18 @@ var require_jsonata = /* @__PURE__ */ require_isRuleGroup.__commonJS({ "../../no
 							}
 							return s;
 						};
-						var handleError = function(err$1) {
+						var handleError = function(err) {
 							if (recover) {
-								err$1.remaining = remainingTokens();
-								errors.push(err$1);
+								err.remaining = remainingTokens();
+								errors.push(err);
 								var symbol$1 = symbol_table["(error)"];
 								node = Object.create(symbol$1);
-								node.error = err$1;
+								node.error = err;
 								node.type = "(error)";
 								return node;
 							} else {
-								err$1.stack = (/* @__PURE__ */ new Error()).stack;
-								throw err$1;
+								err.stack = (/* @__PURE__ */ new Error()).stack;
+								throw err;
 							}
 						};
 						var advance = function(id, infix$1) {
@@ -4408,13 +4386,12 @@ var require_jsonata = /* @__PURE__ */ require_isRuleGroup.__commonJS({ "../../no
 								var code;
 								if (node.id === "(end)") code = "S0203";
 								else code = "S0202";
-								var err$1 = {
+								return handleError({
 									code,
 									position: node.position,
 									token: node.value,
 									value: id
-								};
-								return handleError(err$1);
+								});
 							}
 							var next_token = lexer(infix$1);
 							if (next_token === null) {
@@ -4608,9 +4585,9 @@ var require_jsonata = /* @__PURE__ */ require_isRuleGroup.__commonJS({ "../../no
 									advance(">");
 									try {
 										this.signature = parseSignature(sig);
-									} catch (err$1) {
-										err$1.position = sigPos + err$1.offset;
-										return handleError(err$1);
+									} catch (err) {
+										err.position = sigPos + err.offset;
+										return handleError(err);
 									}
 								}
 								advance("{");
@@ -5095,8 +5072,7 @@ var require_jsonata = /* @__PURE__ */ require_isRuleGroup.__commonJS({ "../../no
 										signature: expr$1.signature,
 										position: expr$1.position
 									};
-									var body = processAST(expr$1.body);
-									result.body = tailCallOptimize(body);
+									result.body = tailCallOptimize(processAST(expr$1.body));
 									break;
 								case "condition":
 									result = {
@@ -5180,20 +5156,20 @@ var require_jsonata = /* @__PURE__ */ require_isRuleGroup.__commonJS({ "../../no
 									var code = "S0206";
 									/* istanbul ignore else */
 									if (expr$1.id === "(end)") code = "S0207";
-									var err$1 = {
+									var err = {
 										code,
 										position: expr$1.position,
 										token: expr$1.value
 									};
 									if (recover) {
-										errors.push(err$1);
+										errors.push(err);
 										return {
 											type: "error",
-											error: err$1
+											error: err
 										};
 									} else {
-										err$1.stack = (/* @__PURE__ */ new Error()).stack;
-										throw err$1;
+										err.stack = (/* @__PURE__ */ new Error()).stack;
+										throw err;
 									}
 							}
 							if (expr$1.keepArray) result.keepArray = true;
@@ -5202,14 +5178,11 @@ var require_jsonata = /* @__PURE__ */ require_isRuleGroup.__commonJS({ "../../no
 						lexer = tokenizer(source);
 						advance();
 						var expr = expression(0);
-						if (node.id !== "(end)") {
-							var err = {
-								code: "S0201",
-								position: node.position,
-								token: node.value
-							};
-							handleError(err);
-						}
+						if (node.id !== "(end)") handleError({
+							code: "S0201",
+							position: node.position,
+							token: node.value
+						});
 						expr = processAST(expr);
 						if (expr.type === "parent" || typeof expr.seekingParent !== "undefined") throw {
 							code: "S0217",
@@ -5867,8 +5840,7 @@ function parseJSONata(jsonataInput, options = {}) {
 	} catch {
 		return prepare(emptyQuery);
 	}
-	const jsonataAST = jsonataExpr.ast();
-	const result = parseJSONataAST(jsonataAST);
+	const result = parseJSONataAST(jsonataExpr.ast());
 	if (result) {
 		if (require_isRuleGroup.isRuleGroup(result)) return prepare(result);
 		return prepare({