@react-querybuilder/core 8.14.0 → 8.14.2

package/dist/{utils-CR1ToTMW.js → utils-CZRhzje-.js}

@@ -1,32 +1,8 @@
-const require_chunk = require('./chunk-U64pC571.js');
-const require_isRuleGroup = require('./isRuleGroup-Cjk1Q2mj.js');
+const require_objectUtils = require("./objectUtils-ButT0Mng.js");
+require("./parseJSONata.js");
 let numeric_quantity = require("numeric-quantity");
-let immer = require("immer");
-
 //#region src/defaults.ts
 /**
-* @group Defaults
-*/
-const defaultPlaceholderName = "~";
-/**
-* Default `name` for placeholder option in the `fields` array.
-*
-* @group Defaults
-*/
-const defaultPlaceholderFieldName = defaultPlaceholderName;
-/**
-* Default `name` for placeholder option in the `operators` array.
-*
-* @group Defaults
-*/
-const defaultPlaceholderOperatorName = defaultPlaceholderName;
-/**
-* Default character used to `.join` and `.split` arrays.
-*
-* @group Defaults
-*/
-const defaultJoinChar = ",";
-/**
 * Map of default operators to their respective opposite/negating operators.
 *
 * @group Defaults
@@ -51,31 +27,6 @@ const defaultOperatorNegationMap = {
 	notNull: "null",
 	null: "notNull"
 };
-/**
-* Default combinator list.
-*
-* @group Defaults
-*/
-const defaultCombinators = [{
-	name: "and",
-	value: "and",
-	label: "AND"
-}, {
-	name: "or",
-	value: "or",
-	label: "OR"
-}];
-/**
-* Default combinator list, with `XOR` added.
-*
-* @group Defaults
-*/
-const defaultCombinatorsExtended = [...defaultCombinators, {
-	name: "xor",
-	value: "xor",
-	label: "XOR"
-}];
-
 //#endregion
 //#region src/utils/arrayUtils.ts
 /**
@@ -90,7 +41,7 @@ const defaultCombinatorsExtended = [...defaultCombinators, {
 * // would return
 * ['this,,that', '', 'the other', '', '', ',']
 */
-const splitBy = (str, splitChar = defaultJoinChar) => typeof str === "string" ? str.split(`\\${splitChar}`).map((c) => c.split(splitChar)).reduce((prev, curr, idx) => {
+const splitBy = (str, splitChar = ",") => typeof str === "string" ? str.split(`\\${splitChar}`).map((c) => c.split(splitChar)).reduce((prev, curr, idx) => {
 	if (idx === 0) return curr;
 	return [
 		...prev.slice(0, -1),
@@ -111,7 +62,7 @@ const splitBy = (str, splitChar = defaultJoinChar) => typeof str === "string" ?
 * // would return
 * 'this\\,\\,that, , the other, , , \\,'
 */
-const joinWith = (strArr, joinChar = defaultJoinChar) => strArr.map((str) => `${str ?? ""}`.replaceAll(joinChar[0], `\\${joinChar[0]}`)).join(joinChar);
+const joinWith = (strArr, joinChar = ",") => strArr.map((str) => `${str ?? ""}`.replaceAll(joinChar[0], `\\${joinChar[0]}`)).join(joinChar);
 /**
 * Trims the value if it is a string. Otherwise returns the value as is.
 */
@@ -120,8 +71,7 @@ const trimIfString = (val) => typeof val === "string" ? val.trim() : val;
 * Splits a string by comma then trims each element. Arrays are returned as is except
 * any string elements are trimmed.
 */
-const toArray = (v, { retainEmptyStrings } = {}) => Array.isArray(v) ? v.map((v$1) => trimIfString(v$1)) : typeof v === "string" ? splitBy(v, defaultJoinChar).filter(retainEmptyStrings ? () => true : (s) => !/^\s*$/.test(s)).map((s) => s.trim()) : typeof v === "number" ? [v] : [];
-
+const toArray = (a, { retainEmptyStrings } = {}) => Array.isArray(a) ? a.map((v) => trimIfString(v)) : typeof a === "string" ? splitBy(a, ",").filter(retainEmptyStrings ? () => true : (s) => !/^\s*$/.test(s)).map((s) => s.trim()) : typeof a === "number" ? [a] : [];
 //#endregion
 //#region src/utils/parseNumber.ts
 /**
@@ -141,20 +91,10 @@ const parseNumber = (val, { parseNumbers, bigIntOnOverflow } = {}) => {
 	});
 	return typeof valAsNum === "bigint" || !Number.isNaN(valAsNum) ? valAsNum : val;
 };
-
-//#endregion
-//#region src/utils/objectUtils.ts
-/**
-* A strongly-typed version of `Object.keys()`.
-*
-* [Original source](https://github.com/sindresorhus/ts-extras/blob/44f57392c5f027268330771996c4fdf9260b22d6/source/object-keys.ts)
-*/
-const objectKeys = Object.keys;
-
 //#endregion
 //#region src/utils/optGroupUtils.ts
-const isOptionWithName = (opt) => require_isRuleGroup.isPojo(opt) && "name" in opt && typeof opt.name === "string";
-const isOptionWithValue = (opt) => require_isRuleGroup.isPojo(opt) && "value" in opt && typeof opt.value === "string";
+const isOptionWithName = (opt) => require_objectUtils.isPojo(opt) && "name" in opt && typeof opt.name === "string";
+const isOptionWithValue = (opt) => require_objectUtils.isPojo(opt) && "value" in opt && typeof opt.value === "string";
 /**
 * Converts an {@link Option} or {@link ValueOption} (i.e., {@link BaseOption})
 * into a {@link FullOption}. Full options are left unchanged.
@@ -162,24 +102,23 @@ const isOptionWithValue = (opt) => require_isRuleGroup.isPojo(opt) && "value" in
 * @group Option Lists
 */
 function toFullOption(opt, baseProperties, labelMap) {
-	return (0, immer.produce)((draft) => {
-		const idObj = {};
-		let needsUpdating = !!baseProperties;
-		if (typeof draft === "string") return {
-			...baseProperties,
-			name: draft,
-			value: draft,
-			label: labelMap?.[draft] ?? draft
-		};
-		if (isOptionWithName(draft) && !isOptionWithValue(draft)) {
-			idObj.value = draft.name;
-			needsUpdating = true;
-		} else if (!isOptionWithName(draft) && isOptionWithValue(draft)) {
-			idObj.name = draft.value;
-			needsUpdating = true;
-		}
-		if (needsUpdating) return Object.assign({}, baseProperties, draft, idObj);
-	})(opt);
+	if (typeof opt === "string") return {
+		...baseProperties,
+		name: opt,
+		value: opt,
+		label: labelMap?.[opt] ?? opt
+	};
+	const idObj = {};
+	let needsUpdating = !!baseProperties;
+	if (isOptionWithName(opt) && !isOptionWithValue(opt)) {
+		idObj.value = opt.name;
+		needsUpdating = true;
+	} else if (!isOptionWithName(opt) && isOptionWithValue(opt)) {
+		idObj.name = opt.value;
+		needsUpdating = true;
+	}
+	if (needsUpdating) return Object.assign({}, baseProperties, opt, idObj);
+	return opt;
 }
 /**
 * Converts an {@link OptionList} or {@link FlexibleOptionList} into a {@link FullOptionList}.
@@ -189,10 +128,12 @@ function toFullOption(opt, baseProperties, labelMap) {
 */
 function toFullOptionList(optList, baseProperties, labelMap) {
 	if (!Array.isArray(optList)) return [];
-	return (0, immer.produce)((draft) => {
-		if (isFlexibleOptionGroupArray(draft)) for (const optGroup of draft) for (const [idx, opt] of optGroup.options.entries()) optGroup.options[idx] = toFullOption(opt, baseProperties, labelMap);
-		else for (const [idx, opt] of draft.entries()) draft[idx] = toFullOption(opt, baseProperties, labelMap);
-	})(optList);
+	const list = optList;
+	if (isFlexibleOptionGroupArray(list)) return list.map((optGroup) => ({
+		...optGroup,
+		options: optGroup.options.map((opt) => toFullOption(opt, baseProperties, labelMap))
+	}));
+	return list.map((opt) => toFullOption(opt, baseProperties, labelMap));
 }
 /**
 * Generates a new array of objects with duplicates removed based
@@ -214,7 +155,7 @@ const uniqByIdentifier = (originalArray) => {
 *
 * @group Option Lists
 */
-const isOptionGroupArray = (arr) => Array.isArray(arr) && arr.length > 0 && require_isRuleGroup.isPojo(arr[0]) && "options" in arr[0] && Array.isArray(arr[0].options);
+const isOptionGroupArray = (arr) => Array.isArray(arr) && arr.length > 0 && require_objectUtils.isPojo(arr[0]) && "options" in arr[0] && Array.isArray(arr[0].options);
 /**
 * Determines if an array is a flat array of {@link FlexibleOption}.
 *
@@ -233,7 +174,7 @@ const isFlexibleOptionArray = (arr) => {
 */
 const isFlexibleOptionGroupArray = (arr, { allowEmpty = false } = {}) => {
 	let isFOGA = false;
-	if (Array.isArray(arr)) for (const og of arr) if (require_isRuleGroup.isPojo(og) && "options" in og && (isFlexibleOptionArray(og.options) || allowEmpty && Array.isArray(og.options) && og.options.length === 0)) isFOGA = true;
+	if (Array.isArray(arr)) for (const og of arr) if (require_objectUtils.isPojo(og) && "options" in og && (isFlexibleOptionArray(og.options) || allowEmpty && Array.isArray(og.options) && og.options.length === 0)) isFOGA = true;
 	else return false;
 	return isFOGA;
 };
@@ -247,7 +188,6 @@ function getOption(arr, name) {
 * @group Option Lists
 */
 const toFlatOptionArray = (arr) => uniqByIdentifier(isOptionGroupArray(arr) ? arr.flatMap((og) => og.options) : arr);
-
 //#endregion
 //#region src/utils/getParseNumberMethod.ts
 const getParseNumberMethod = ({ parseNumbers, inputType }) => {
@@ -258,7 +198,6 @@ const getParseNumberMethod = ({ parseNumbers, inputType }) => {
 	}
 	return parseNumbers ? "strict" : false;
 };
-
 //#endregion
 //#region src/utils/formatQuery/utils.ts
 /**
@@ -267,7 +206,7 @@ const getParseNumberMethod = ({ parseNumbers, inputType }) => {
 * @group Export
 */
 const mapSQLOperator = (rqbOperator) => {
-	switch (require_isRuleGroup.lc(rqbOperator)) {
+	switch (require_objectUtils.lc(rqbOperator)) {
 		case "null": return "is null";
 		case "notnull": return "is not null";
 		case "notin": return "not in";
@@ -340,7 +279,8 @@ const jsonLogicAdditionalOperators = {
 	endsWith: (a, b) => typeof a === "string" && a.endsWith(b)
 };
 /**
-* Converts all `string`-type `value` properties of a query object into `number` where appropriate.
+* Returns a new query object with all `string`-type `value` properties converted
+* to `number` where appropriate.
 *
 * Used by {@link formatQuery} for the `json*` formats when `parseNumbers` is `true`.
 *
@@ -350,7 +290,7 @@ const numerifyValues = (rg, options) => ({
 	...rg,
 	rules: rg.rules.map((r) => {
 		if (typeof r === "string") return r;
-		if (require_isRuleGroup.isRuleGroup(r)) return numerifyValues(r, options);
+		if (require_objectUtils.isRuleGroup(r)) return numerifyValues(r, options);
 		const fieldData = getOption(options.fields, r.field);
 		const parseNumbers = getParseNumberMethod({
 			parseNumbers: options.parseNumbers,
@@ -388,7 +328,7 @@ const isValidValue = (value) => typeof value === "string" && value.length > 0 ||
 *
 * @group Export
 */
-const shouldRenderAsNumber = (value, parseNumbers) => !!parseNumbers && (typeof value === "number" || typeof value === "bigint" || typeof value === "string" && require_isRuleGroup.numericRegex.test(value));
+const shouldRenderAsNumber = (value, parseNumbers) => !!parseNumbers && (typeof value === "number" || typeof value === "bigint" || typeof value === "string" && require_objectUtils.numericRegex.test(value));
 /**
 * Used by {@link formatQuery} to determine whether the given value processor is a
 * "legacy" value processor by counting the number of arguments. Legacy value
@@ -481,8 +421,8 @@ const getNLTranslataion = (key, translations, conditions = []) => conditions.len
 const processMatchMode = (rule) => {
 	const { mode, threshold } = rule.match ?? {};
 	if (!mode) return null;
-	if (!require_isRuleGroup.isRuleGroup(rule.value)) return false;
-	const matchModeLC = require_isRuleGroup.lc(mode);
+	if (!require_objectUtils.isRuleGroup(rule.value)) return false;
+	const matchModeLC = require_objectUtils.lc(mode);
 	const matchModeCoerced = matchModeLC === "atleast" && threshold === 1 ? "some" : matchModeLC === "atmost" && threshold === 0 ? "none" : matchModeLC;
 	if ((matchModeCoerced === "atleast" || matchModeCoerced === "atmost" || matchModeCoerced === "exactly") && (typeof threshold !== "number" || threshold < 0)) return false;
 	return {
@@ -508,199 +448,181 @@ const bigIntJsonStringifyReplacer = (_key, value) => typeof value === "bigint" ?
 *
 * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/BigInt#use_within_json
 */
-const bigIntJsonParseReviver = (_key, value) => require_isRuleGroup.isPojo(value) && Object.keys(value).length === 1 && typeof value.$bigint === "string" ? BigInt(value.$bigint) : value;
-
+const bigIntJsonParseReviver = (_key, value) => require_objectUtils.isPojo(value) && Object.keys(value).length === 1 && typeof value.$bigint === "string" ? BigInt(value.$bigint) : value;
 //#endregion
-Object.defineProperty(exports, 'bigIntJsonParseReviver', {
-  enumerable: true,
-  get: function () {
-    return bigIntJsonParseReviver;
-  }
-});
-Object.defineProperty(exports, 'bigIntJsonStringifyReplacer', {
-  enumerable: true,
-  get: function () {
-    return bigIntJsonStringifyReplacer;
-  }
-});
-Object.defineProperty(exports, 'celCombinatorMap', {
-  enumerable: true,
-  get: function () {
-    return celCombinatorMap;
-  }
-});
-Object.defineProperty(exports, 'defaultNLTranslations', {
-  enumerable: true,
-  get: function () {
-    return defaultNLTranslations;
-  }
+Object.defineProperty(exports, "bigIntJsonParseReviver", {
+	enumerable: true,
+	get: function() {
+		return bigIntJsonParseReviver;
+	}
 });
-Object.defineProperty(exports, 'defaultOperatorNegationMap', {
-  enumerable: true,
-  get: function () {
-    return defaultOperatorNegationMap;
-  }
+Object.defineProperty(exports, "bigIntJsonStringifyReplacer", {
+	enumerable: true,
+	get: function() {
+		return bigIntJsonStringifyReplacer;
+	}
 });
-Object.defineProperty(exports, 'defaultPlaceholderFieldName', {
-  enumerable: true,
-  get: function () {
-    return defaultPlaceholderFieldName;
-  }
+Object.defineProperty(exports, "celCombinatorMap", {
+	enumerable: true,
+	get: function() {
+		return celCombinatorMap;
+	}
 });
-Object.defineProperty(exports, 'defaultPlaceholderOperatorName', {
-  enumerable: true,
-  get: function () {
-    return defaultPlaceholderOperatorName;
-  }
+Object.defineProperty(exports, "defaultNLTranslations", {
+	enumerable: true,
+	get: function() {
+		return defaultNLTranslations;
+	}
 });
-Object.defineProperty(exports, 'getNLTranslataion', {
-  enumerable: true,
-  get: function () {
-    return getNLTranslataion;
-  }
+Object.defineProperty(exports, "defaultOperatorNegationMap", {
+	enumerable: true,
+	get: function() {
+		return defaultOperatorNegationMap;
+	}
 });
-Object.defineProperty(exports, 'getOption', {
-  enumerable: true,
-  get: function () {
-    return getOption;
-  }
+Object.defineProperty(exports, "getNLTranslataion", {
+	enumerable: true,
+	get: function() {
+		return getNLTranslataion;
+	}
 });
-Object.defineProperty(exports, 'getParseNumberMethod', {
-  enumerable: true,
-  get: function () {
-    return getParseNumberMethod;
-  }
+Object.defineProperty(exports, "getOption", {
+	enumerable: true,
+	get: function() {
+		return getOption;
+	}
 });
-Object.defineProperty(exports, 'getQuoteFieldNamesWithArray', {
-  enumerable: true,
-  get: function () {
-    return getQuoteFieldNamesWithArray;
-  }
+Object.defineProperty(exports, "getParseNumberMethod", {
+	enumerable: true,
+	get: function() {
+		return getParseNumberMethod;
+	}
 });
-Object.defineProperty(exports, 'getQuotedFieldName', {
-  enumerable: true,
-  get: function () {
-    return getQuotedFieldName;
-  }
+Object.defineProperty(exports, "getQuoteFieldNamesWithArray", {
+	enumerable: true,
+	get: function() {
+		return getQuoteFieldNamesWithArray;
+	}
 });
-Object.defineProperty(exports, 'isFlexibleOptionArray', {
-  enumerable: true,
-  get: function () {
-    return isFlexibleOptionArray;
-  }
+Object.defineProperty(exports, "getQuotedFieldName", {
+	enumerable: true,
+	get: function() {
+		return getQuotedFieldName;
+	}
 });
-Object.defineProperty(exports, 'isFlexibleOptionGroupArray', {
-  enumerable: true,
-  get: function () {
-    return isFlexibleOptionGroupArray;
-  }
+Object.defineProperty(exports, "isFlexibleOptionArray", {
+	enumerable: true,
+	get: function() {
+		return isFlexibleOptionArray;
+	}
 });
-Object.defineProperty(exports, 'isValidValue', {
-  enumerable: true,
-  get: function () {
-    return isValidValue;
-  }
+Object.defineProperty(exports, "isFlexibleOptionGroupArray", {
+	enumerable: true,
+	get: function() {
+		return isFlexibleOptionGroupArray;
+	}
 });
-Object.defineProperty(exports, 'isValueProcessorLegacy', {
-  enumerable: true,
-  get: function () {
-    return isValueProcessorLegacy;
-  }
+Object.defineProperty(exports, "isValidValue", {
+	enumerable: true,
+	get: function() {
+		return isValidValue;
+	}
 });
-Object.defineProperty(exports, 'joinWith', {
-  enumerable: true,
-  get: function () {
-    return joinWith;
-  }
+Object.defineProperty(exports, "isValueProcessorLegacy", {
+	enumerable: true,
+	get: function() {
+		return isValueProcessorLegacy;
+	}
 });
-Object.defineProperty(exports, 'jsonLogicAdditionalOperators', {
-  enumerable: true,
-  get: function () {
-    return jsonLogicAdditionalOperators;
-  }
+Object.defineProperty(exports, "joinWith", {
+	enumerable: true,
+	get: function() {
+		return joinWith;
+	}
 });
-Object.defineProperty(exports, 'mapSQLOperator', {
-  enumerable: true,
-  get: function () {
-    return mapSQLOperator;
-  }
+Object.defineProperty(exports, "jsonLogicAdditionalOperators", {
+	enumerable: true,
+	get: function() {
+		return jsonLogicAdditionalOperators;
+	}
 });
-Object.defineProperty(exports, 'mongoOperators', {
-  enumerable: true,
-  get: function () {
-    return mongoOperators;
-  }
+Object.defineProperty(exports, "mapSQLOperator", {
+	enumerable: true,
+	get: function() {
+		return mapSQLOperator;
+	}
 });
-Object.defineProperty(exports, 'normalizeConstituentWordOrder', {
-  enumerable: true,
-  get: function () {
-    return normalizeConstituentWordOrder;
-  }
+Object.defineProperty(exports, "mongoOperators", {
+	enumerable: true,
+	get: function() {
+		return mongoOperators;
+	}
 });
-Object.defineProperty(exports, 'numerifyValues', {
-  enumerable: true,
-  get: function () {
-    return numerifyValues;
-  }
+Object.defineProperty(exports, "normalizeConstituentWordOrder", {
+	enumerable: true,
+	get: function() {
+		return normalizeConstituentWordOrder;
+	}
 });
-Object.defineProperty(exports, 'objectKeys', {
-  enumerable: true,
-  get: function () {
-    return objectKeys;
-  }
+Object.defineProperty(exports, "numerifyValues", {
+	enumerable: true,
+	get: function() {
+		return numerifyValues;
+	}
 });
-Object.defineProperty(exports, 'parseNumber', {
-  enumerable: true,
-  get: function () {
-    return parseNumber;
-  }
+Object.defineProperty(exports, "parseNumber", {
+	enumerable: true,
+	get: function() {
+		return parseNumber;
+	}
 });
-Object.defineProperty(exports, 'prismaOperators', {
-  enumerable: true,
-  get: function () {
-    return prismaOperators;
-  }
+Object.defineProperty(exports, "prismaOperators", {
+	enumerable: true,
+	get: function() {
+		return prismaOperators;
+	}
 });
-Object.defineProperty(exports, 'processMatchMode', {
-  enumerable: true,
-  get: function () {
-    return processMatchMode;
-  }
+Object.defineProperty(exports, "processMatchMode", {
+	enumerable: true,
+	get: function() {
+		return processMatchMode;
+	}
 });
-Object.defineProperty(exports, 'shouldRenderAsNumber', {
-  enumerable: true,
-  get: function () {
-    return shouldRenderAsNumber;
-  }
+Object.defineProperty(exports, "shouldRenderAsNumber", {
+	enumerable: true,
+	get: function() {
+		return shouldRenderAsNumber;
+	}
 });
-Object.defineProperty(exports, 'toArray', {
-  enumerable: true,
-  get: function () {
-    return toArray;
-  }
+Object.defineProperty(exports, "toArray", {
+	enumerable: true,
+	get: function() {
+		return toArray;
+	}
 });
-Object.defineProperty(exports, 'toFlatOptionArray', {
-  enumerable: true,
-  get: function () {
-    return toFlatOptionArray;
-  }
+Object.defineProperty(exports, "toFlatOptionArray", {
+	enumerable: true,
+	get: function() {
+		return toFlatOptionArray;
+	}
 });
-Object.defineProperty(exports, 'toFullOption', {
-  enumerable: true,
-  get: function () {
-    return toFullOption;
-  }
+Object.defineProperty(exports, "toFullOption", {
+	enumerable: true,
+	get: function() {
+		return toFullOption;
+	}
 });
-Object.defineProperty(exports, 'toFullOptionList', {
-  enumerable: true,
-  get: function () {
-    return toFullOptionList;
-  }
+Object.defineProperty(exports, "toFullOptionList", {
+	enumerable: true,
+	get: function() {
+		return toFullOptionList;
+	}
 });
-Object.defineProperty(exports, 'trimIfString', {
-  enumerable: true,
-  get: function () {
-    return trimIfString;
-  }
+Object.defineProperty(exports, "trimIfString", {
+	enumerable: true,
+	get: function() {
+		return trimIfString;
+	}
 });
-//# sourceMappingURL=utils-CR1ToTMW.js.map
+
+//# sourceMappingURL=utils-CZRhzje-.js.map