@coaction/history 1.1.0 → 1.3.0

package/dist/index.js

@@ -25,24 +25,90 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/index.ts
-var toSnapshot = (state) => {
+var toSnapshot = (state, visited = /* @__PURE__ */ new WeakMap()) => {
   if (Array.isArray(state)) {
-    return state.map((item) => toSnapshot(item));
+    if (visited.has(state)) {
+      return visited.get(state);
+    }
+    const next = [];
+    visited.set(state, next);
+    for (const item of state) {
+      next.push(toSnapshot(item, visited));
+    }
+    return next;
   }
   if (typeof state === "object" && state !== null) {
+    if (visited.has(state)) {
+      return visited.get(state);
+    }
     const next = {};
-    for (const key in state) {
+    visited.set(state, next);
+    for (const key of Object.keys(state)) {
       const value = state[key];
       if (typeof value === "function") {
         continue;
       }
-      next[key] = toSnapshot(value);
+      next[key] = toSnapshot(value, visited);
     }
     return next;
   }
   return state;
 };
-var isEqual = (a, b) => JSON.stringify(a) === JSON.stringify(b);
+var isEqual = (a, b, visited = /* @__PURE__ */ new WeakMap()) => {
+  if (Object.is(a, b)) {
+    return true;
+  }
+  if (Array.isArray(a) || Array.isArray(b)) {
+    if (!Array.isArray(a) || !Array.isArray(b) || a.length !== b.length) {
+      return false;
+    }
+    for (let index = 0; index < a.length; index += 1) {
+      if (!isEqual(a[index], b[index], visited)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  if (typeof a !== "object" || a === null || typeof b !== "object" || b === null) {
+    return false;
+  }
+  let seenTargets = visited.get(a);
+  if (!seenTargets) {
+    seenTargets = /* @__PURE__ */ new WeakSet();
+    visited.set(a, seenTargets);
+  } else if (seenTargets.has(b)) {
+    return true;
+  }
+  seenTargets.add(b);
+  const aObject = a;
+  const bObject = b;
+  const aKeys = Object.keys(aObject);
+  const bKeys = Object.keys(bObject);
+  if (aKeys.length !== bKeys.length) {
+    return false;
+  }
+  for (const key of aKeys) {
+    if (!Object.prototype.hasOwnProperty.call(bObject, key)) {
+      return false;
+    }
+    if (!isEqual(aObject[key], bObject[key], visited)) {
+      return false;
+    }
+  }
+  return true;
+};
+var applySnapshot = (target, nextState, currentState) => {
+  const next = nextState;
+  const current = currentState;
+  for (const key of Object.keys(current)) {
+    if (!Object.prototype.hasOwnProperty.call(next, key)) {
+      delete target[key];
+    }
+  }
+  for (const key of Object.keys(next)) {
+    target[key] = toSnapshot(next[key]);
+  }
+};
 var history = ({
   limit = 100,
   partialize = (state) => state
@@ -81,7 +147,13 @@ var history = ({
       future.push(current);
       isTimeTraveling = true;
       try {
-        baseSetState(previous);
+        baseSetState((draft) => {
+          applySnapshot(
+            draft,
+            previous,
+            current
+          );
+        });
       } finally {
         isTimeTraveling = false;
       }
@@ -96,7 +168,13 @@ var history = ({
       past.push(current);
       isTimeTraveling = true;
       try {
-        baseSetState(next);
+        baseSetState((draft) => {
+          applySnapshot(
+            draft,
+            next,
+            current
+          );
+        });
       } finally {
         isTimeTraveling = false;
       }

package/dist/index.mjs

@@ -1,22 +1,88 @@
 // src/index.ts
-var toSnapshot = (state) => {
+var toSnapshot = (state, visited = /* @__PURE__ */ new WeakMap()) => {
   if (Array.isArray(state)) {
-    return state.map((item) => toSnapshot(item));
+    if (visited.has(state)) {
+      return visited.get(state);
+    }
+    const next = [];
+    visited.set(state, next);
+    for (const item of state) {
+      next.push(toSnapshot(item, visited));
+    }
+    return next;
   }
   if (typeof state === "object" && state !== null) {
+    if (visited.has(state)) {
+      return visited.get(state);
+    }
     const next = {};
-    for (const key in state) {
+    visited.set(state, next);
+    for (const key of Object.keys(state)) {
       const value = state[key];
       if (typeof value === "function") {
         continue;
       }
-      next[key] = toSnapshot(value);
+      next[key] = toSnapshot(value, visited);
     }
     return next;
   }
   return state;
 };
-var isEqual = (a, b) => JSON.stringify(a) === JSON.stringify(b);
+var isEqual = (a, b, visited = /* @__PURE__ */ new WeakMap()) => {
+  if (Object.is(a, b)) {
+    return true;
+  }
+  if (Array.isArray(a) || Array.isArray(b)) {
+    if (!Array.isArray(a) || !Array.isArray(b) || a.length !== b.length) {
+      return false;
+    }
+    for (let index = 0; index < a.length; index += 1) {
+      if (!isEqual(a[index], b[index], visited)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  if (typeof a !== "object" || a === null || typeof b !== "object" || b === null) {
+    return false;
+  }
+  let seenTargets = visited.get(a);
+  if (!seenTargets) {
+    seenTargets = /* @__PURE__ */ new WeakSet();
+    visited.set(a, seenTargets);
+  } else if (seenTargets.has(b)) {
+    return true;
+  }
+  seenTargets.add(b);
+  const aObject = a;
+  const bObject = b;
+  const aKeys = Object.keys(aObject);
+  const bKeys = Object.keys(bObject);
+  if (aKeys.length !== bKeys.length) {
+    return false;
+  }
+  for (const key of aKeys) {
+    if (!Object.prototype.hasOwnProperty.call(bObject, key)) {
+      return false;
+    }
+    if (!isEqual(aObject[key], bObject[key], visited)) {
+      return false;
+    }
+  }
+  return true;
+};
+var applySnapshot = (target, nextState, currentState) => {
+  const next = nextState;
+  const current = currentState;
+  for (const key of Object.keys(current)) {
+    if (!Object.prototype.hasOwnProperty.call(next, key)) {
+      delete target[key];
+    }
+  }
+  for (const key of Object.keys(next)) {
+    target[key] = toSnapshot(next[key]);
+  }
+};
 var history = ({
   limit = 100,
   partialize = (state) => state
@@ -55,7 +121,13 @@ var history = ({
       future.push(current);
       isTimeTraveling = true;
       try {
-        baseSetState(previous);
+        baseSetState((draft) => {
+          applySnapshot(
+            draft,
+            previous,
+            current
+          );
+        });
       } finally {
         isTimeTraveling = false;
       }
@@ -70,7 +142,13 @@ var history = ({
       past.push(current);
       isTimeTraveling = true;
       try {
-        baseSetState(next);
+        baseSetState((draft) => {
+          applySnapshot(
+            draft,
+            next,
+            current
+          );
+        });
       } finally {
         isTimeTraveling = false;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coaction/history",
-  "version": "1.1.0",
+  "version": "1.3.0",
   "description": "A undo/redo middleware for Coaction",
   "keywords": [
     "state",
@@ -40,7 +40,7 @@
     "url": "https://github.com/unadlib/coaction/issues"
   },
   "peerDependencies": {
-    "coaction": "^1.1.0"
+    "coaction": "^1.3.0"
   },
   "peerDependenciesMeta": {
     "coaction": {
@@ -48,7 +48,7 @@
     }
   },
   "devDependencies": {
-    "coaction": "^1.1.0"
+    "coaction": "1.3.0"
   },
   "publishConfig": {
     "access": "public",