@react-querybuilder/core 8.23.1 → 8.24.1

package/dist/derivations.js

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_utils = require("./utils-e-7KHkjV.js");
+const require_utils = require("./utils-B4E1-ZvU.js");
 const require_objectUtils = require("./objectUtils-DfnEmDSV.js");
 const require_convertQuery = require("./convertQuery-BLT0GIhM.js");
-const require_prepareQueryObjects = require("./prepareQueryObjects-Dj9cTl9D.js");
+const require_prepareQueryObjects = require("./prepareQueryObjects-DJ_VjOLb.js");
 const require_isRuleOrGroupValid = require("./isRuleOrGroupValid-CtUf4_4x.js");
 const require_transformQuery = require("./transformQuery.js");
 let immer = require("immer");
@@ -49,6 +49,7 @@ const controlKeys = [
 	"ruleGroupHeaderElements",
 	"shiftActions",
 	"undoRedoActions",
+	"ungroupAction",
 	"valueEditor",
 	"valueSelector",
 	"valueSourceSelector"
@@ -459,6 +460,7 @@ const controlPropKeys = {
 		"toggleLockGroup",
 		"toggleMuteGroup",
 		"translations",
+		"ungroup",
 		"validationClassName",
 		"validationResult"
 	],
@@ -506,6 +508,7 @@ const controlPropKeys = {
 		"toggleLockGroup",
 		"toggleMuteGroup",
 		"translations",
+		"ungroup",
 		"validationClassName",
 		"validationResult"
 	],
@@ -542,6 +545,22 @@ const controlPropKeys = {
 		"titles",
 		"validation"
 	],
+	ungroupAction: [
+		"className",
+		"context",
+		"disabled",
+		"disabledTranslation",
+		"handleOnClick",
+		"label",
+		"level",
+		"path",
+		"ruleOrGroup",
+		"rules",
+		"schema",
+		"testID",
+		"title",
+		"validation"
+	],
 	valueEditor: [
 		"className",
 		"context",
@@ -642,6 +661,7 @@ const controlKind = {
 	ruleGroupHeaderElements: null,
 	shiftActions: null,
 	undoRedoActions: null,
+	ungroupAction: "action",
 	valueEditor: null,
 	valueSelector: null,
 	valueSourceSelector: "selector"
@@ -662,6 +682,7 @@ const strictAbortReasons = [
 	"target-not-found",
 	"parent-not-found",
 	"parent-not-a-group",
+	"target-not-a-group",
 	"destination-not-found",
 	"root-not-allowed",
 	"not-a-combinator-slot",
@@ -856,6 +877,7 @@ const ruleGroupClassnameSources = {
 	addRule: ["actionElement", "addRule"],
 	addGroup: ["actionElement", "addGroup"],
 	cloneGroup: ["actionElement", "cloneGroup"],
+	ungroup: ["actionElement", "ungroup"],
 	lockGroup: ["actionElement", "lockGroup"],
 	muteGroup: ["actionElement", "muteGroup"],
 	removeGroup: ["actionElement", "removeGroup"],
@@ -1515,6 +1537,7 @@ const mergeClassnames = (...args) => ({
 	addGroup: joinClassnamesByName("addGroup", args),
 	cloneRule: joinClassnamesByName("cloneRule", args),
 	cloneGroup: joinClassnamesByName("cloneGroup", args),
+	ungroup: joinClassnamesByName("ungroup", args),
 	removeGroup: joinClassnamesByName("removeGroup", args),
 	rule: joinClassnamesByName("rule", args),
 	fields: joinClassnamesByName("fields", args),
@@ -2020,6 +2043,81 @@ const removeInPlace = (query, pathOrID, options = {}) => {
 	} else parent.rules.splice(index, 1);
 	return query;
 };
+/**
+* Replaces a group with its own rules in its parent group, without mutating the original query.
+*
+* The group's `combinator`, `not`, `id`, `muted`, and `disabled` properties are discarded; its
+* rules keep their `id`s since they remain in the same query. An empty group is simply removed.
+*
+* @returns A new query with the group's rules promoted into its parent group.
+*
+* @group Query Tools
+*/
+const ungroup = (query, pathOrID, options = {}) => producerFor(options.freeze)(query, (q) => ungroupInPlace(q, pathOrID, options));
+/**
+* Replaces a group with its own rules in its parent group, in place.
+*
+* @returns The query (mutated in place) with the group's rules promoted into its parent group.
+*
+* @group Query Tools
+*/
+const ungroupInPlace = (query, pathOrID, options = {}) => {
+	const { onAbort } = options;
+	const path = Array.isArray(pathOrID) ? pathOrID : getPathOfID(pathOrID, query);
+	if (!path) {
+		onAbort?.({
+			reason: "target-not-found",
+			operation: "ungroup",
+			pathOrID
+		});
+		return query;
+	}
+	if (path.length === 0) {
+		onAbort?.({
+			reason: "root-not-allowed",
+			operation: "ungroup",
+			pathOrID
+		});
+		return query;
+	}
+	const ungroupGuardReason = getGuardAbortReason(query, path, options);
+	if (ungroupGuardReason) {
+		onAbort?.({
+			reason: ungroupGuardReason,
+			operation: "ungroup",
+			pathOrID
+		});
+		return query;
+	}
+	const target = findPath(path, query);
+	if (!target) {
+		onAbort?.({
+			reason: "target-not-found",
+			operation: "ungroup",
+			pathOrID
+		});
+		return query;
+	}
+	if (!require_objectUtils.isRuleGroup(target)) {
+		onAbort?.({
+			reason: "target-not-a-group",
+			operation: "ungroup",
+			pathOrID
+		});
+		return query;
+	}
+	const index = path.at(-1);
+	const parent = findPath(getParentPath(path), query);
+	if (target.rules.length === 0) {
+		if (!require_objectUtils.isRuleGroupType(parent) && parent.rules.length > 1) {
+			const idxStartDelete = index === 0 ? 0 : index - 1;
+			parent.rules.splice(idxStartDelete, 2);
+		} else parent.rules.splice(index, 1);
+		return query;
+	}
+	parent.rules.splice(index, 1, ...target.rules);
+	return query;
+};
 const getNextPath = (query, currentPath, newPathOrShiftDirection) => {
 	if (Array.isArray(newPathOrShiftDirection)) return newPathOrShiftDirection;
 	const ic = require_objectUtils.isRuleGroupTypeIC(query);
@@ -2358,7 +2456,7 @@ const groupInPlace = (query, sourcePathOrID, targetPathOrID, options = {}) => {
 //#endregion
 //#region src/utils/queryActions.ts
 /**
-* Builds the query builder's six mutation handlers as pure functions of the current query.
+* Builds the query builder's seven mutation handlers as pure functions of the current query.
 *
 * This is the framework-agnostic core of the action handlers in `useQueryBuilderSchema`. It owns
 * the policy that surrounds the query tools—disabled gating, the confirmation callback protocol,
@@ -2368,7 +2466,7 @@ const groupInPlace = (query, sourcePathOrID, targetPathOrID, options = {}) => {
 * @group Query Tools
 */
 const createQueryActions = (config = {}) => {
-	const { qbId, combinators, idGenerator, maxLevels = Infinity, queryDisabled, respectDisabled = true, disabledPaths, resetOnFieldChange, resetOnOperatorChange, getRuleDefaultOperator, getValueSources, getRuleDefaultValue, getMatchModes, freeze, onAddRule, onAddGroup, onRemove, onMoveRule, onMoveGroup, onGroupRule, onGroupGroup, onLog } = config;
+	const { qbId, combinators, idGenerator, maxLevels = Infinity, queryDisabled, respectDisabled = true, disabledPaths, resetOnFieldChange, resetOnOperatorChange, getRuleDefaultOperator, getValueSources, getRuleDefaultValue, getMatchModes, freeze, onAddRule, onAddGroup, onRemove, onMoveRule, onMoveGroup, onGroupRule, onGroupGroup, onUngroup, onLog } = config;
 	const log = (payload) => onLog?.({
 		qbId,
 		...payload
@@ -2608,6 +2706,39 @@ const createQueryActions = (config = {}) => {
 				clone
 			});
 			return newQuery;
+		},
+		ungroupRuleGroup: (query, path, context) => {
+			if (blocked(query, path)) {
+				log({
+					type: require_utils.LogType.pathDisabled,
+					path,
+					query
+				});
+				return;
+			}
+			const ruleGroup = findPath(path, query);
+			if (path.length === 0 || !require_objectUtils.isRuleGroup(ruleGroup)) return void 0;
+			const nextQuery = ungroup(query, path, { freeze });
+			const callbackResult = onUngroup ? onUngroup(ruleGroup, path, query, nextQuery, context) : true;
+			if (!callbackResult) {
+				log({
+					type: require_utils.LogType.onUngroupFalse,
+					ruleGroup,
+					path,
+					query,
+					nextQuery
+				});
+				return;
+			}
+			const newQuery = require_objectUtils.isRuleGroup(callbackResult) ? callbackResult : nextQuery;
+			log({
+				type: require_utils.LogType.ungroup,
+				query,
+				newQuery,
+				path,
+				ruleGroup
+			});
+			return newQuery;
 		}
 	};
 };
@@ -2833,6 +2964,8 @@ exports.toFullOptionMap = require_utils.toFullOptionMap;
 exports.transformQuery = require_transformQuery.transformQuery;
 exports.trimIfString = require_utils.trimIfString;
 exports.unchangedSignature = unchangedSignature;
+exports.ungroup = ungroup;
+exports.ungroupInPlace = ungroupInPlace;
 exports.uniqByIdentifier = require_utils.uniqByIdentifier;
 exports.uniqByName = require_utils.uniqByName;
 exports.uniqOptGroups = require_utils.uniqOptGroups;