@hvakr/firestate 0.1.4 → 0.1.5

package/dist/index.mjs

@@ -2160,6 +2160,37 @@ const shallow = (a, b) => {
 
 //#endregion
 //#region src/utils/undo.ts
+const getGroupedActions = (action) => action.actions ?? [action];
+/**
+* Apply a group in the required direction. If a member fails, compensate the
+* members already applied so a failed undo/redo does not leave the group
+* partially applied (provided the compensating actions themselves succeed).
+*/
+const applyGroup = async (actions, operation) => {
+	const ordered = operation === "undo" ? [...actions].reverse() : actions;
+	const applied = [];
+	try {
+		for (const action of ordered) {
+			await action[operation]();
+			applied.push(action);
+		}
+	} catch (error) {
+		const compensate = operation === "undo" ? "redo" : "undo";
+		for (const action of applied.reverse()) await action[compensate]();
+		throw error;
+	}
+};
+const mergeGroupedActions = (older, newer) => {
+	const actions = [...getGroupedActions(older), newer];
+	return {
+		undo: () => applyGroup(actions, "undo"),
+		redo: () => applyGroup(actions, "redo"),
+		groupId: newer.groupId,
+		path: newer.path ?? older.path,
+		description: newer.description ?? older.description,
+		actions
+	};
+};
 /**
 * Create an undo manager instance.
 * This is a standalone, framework-agnostic implementation.
@@ -2179,7 +2210,7 @@ const shallow = (a, b) => {
 * ```
 */
 const createUndoManager = (config = {}) => {
-	const { maxLength = 20, onNavigate } = config;
+	const { maxLength = 20, onNavigate, onUndo, onRedo, onError } = config;
 	let undoStack = [];
 	let redoStack = [];
 	const subscribers = /* @__PURE__ */ new Set();
@@ -2203,19 +2234,7 @@ const createUndoManager = (config = {}) => {
 			const last = undoStack[undoStack.length - 1];
 			if (last?.groupId === action.groupId) {
 				undoStack.pop();
-				undoStack.push({
-					undo: async () => {
-						await action.undo();
-						await last.undo();
-					},
-					redo: async () => {
-						await last.redo();
-						await action.redo();
-					},
-					groupId: action.groupId,
-					path: action.path ?? last.path,
-					description: action.description ?? last.description
-				});
+				undoStack.push(mergeGroupedActions(last, action));
 				redoStack = [];
 				notify();
 				return;
@@ -2229,31 +2248,35 @@ const createUndoManager = (config = {}) => {
 	const undo = async () => {
 		const action = undoStack.pop();
 		if (!action) return;
-		if (action.path && onNavigate) onNavigate(action.path);
 		try {
+			if (action.path && onNavigate) onNavigate(action.path);
 			await action.undo();
-			redoStack.push(action);
 		} catch (error) {
 			undoStack.push(action);
-			console.error("Undo failed:", error);
+			if (onError) onError(error, action, "undo");
+			else console.error("Undo failed:", error);
 			throw error;
 		}
+		redoStack.push(action);
 		notify();
+		onUndo?.(action);
 	};
 	const redo = async () => {
 		const action = redoStack.pop();
 		if (!action) return;
-		if (action.path && onNavigate) onNavigate(action.path);
 		try {
+			if (action.path && onNavigate) onNavigate(action.path);
 			await action.redo();
-			undoStack.push(action);
-			if (undoStack.length > maxLength) undoStack.shift();
 		} catch (error) {
 			redoStack.push(action);
-			console.error("Redo failed:", error);
+			if (onError) onError(error, action, "redo");
+			else console.error("Redo failed:", error);
 			throw error;
 		}
+		undoStack.push(action);
+		if (undoStack.length > maxLength) undoStack.shift();
 		notify();
+		onRedo?.(action);
 	};
 	const clear = () => {
 		undoStack = [];
@@ -2311,9 +2334,22 @@ const createStore = (config) => {
 	const { firestore, autosave = 1e3, minLoadTime = 0, maxUndoLength = 20 } = config;
 	let onError = config.onError;
 	let onNavigate = config.onNavigate;
+	let onUndo = config.onUndo;
+	let onRedo = config.onRedo;
 	const undoManager = createUndoManager({
 		maxLength: maxUndoLength,
-		onNavigate: (path) => onNavigate?.(path)
+		onNavigate: (path) => onNavigate?.(path),
+		onUndo: (action) => onUndo?.(action),
+		onRedo: (action) => onRedo?.(action),
+		onError: (error, action, operation) => {
+			const context = {
+				type: "undo",
+				path: action.path ?? "undo",
+				operation
+			};
+			if (onError) onError(error, context);
+			else console.error(`Firestate error in ${context.type} ${context.path} during ${context.operation}:`, error);
+		}
 	});
 	const syncStates = /* @__PURE__ */ new Map();
 	const syncSubscribers = /* @__PURE__ */ new Set();
@@ -2340,6 +2376,12 @@ const createStore = (config) => {
 		setOnNavigate: (handler) => {
 			onNavigate = handler;
 		},
+		setOnUndo: (handler) => {
+			onUndo = handler;
+		},
+		setOnRedo: (handler) => {
+			onRedo = handler;
+		},
 		subscribeToSyncState: (fn) => {
 			syncSubscribers.add(fn);
 			return () => syncSubscribers.delete(fn);
@@ -2386,14 +2428,16 @@ const createStore = (config) => {
 * }
 * ```
 */
-const FirestateProvider = ({ firestore, autosave = 1e3, minLoadTime = 0, maxUndoLength = 20, onError, onNavigate, children }) => {
+const FirestateProvider = ({ firestore, autosave = 1e3, minLoadTime = 0, maxUndoLength = 20, onError, onNavigate, onUndo, onRedo, children }) => {
 	const store = useMemo(() => createStore({
 		firestore,
 		autosave,
 		minLoadTime,
 		maxUndoLength,
 		onError,
-		onNavigate
+		onNavigate,
+		onUndo,
+		onRedo
 	}), [
 		firestore,
 		autosave,
@@ -2406,6 +2450,12 @@ const FirestateProvider = ({ firestore, autosave = 1e3, minLoadTime = 0, maxUndo
 	useEffect(() => {
 		store.setOnNavigate(onNavigate);
 	}, [store, onNavigate]);
+	useEffect(() => {
+		store.setOnUndo(onUndo);
+	}, [store, onUndo]);
+	useEffect(() => {
+		store.setOnRedo(onRedo);
+	}, [store, onRedo]);
 	return /* @__PURE__ */ jsx(FirestateContext.Provider, {
 		value: store,
 		children