fix: replace logic

mwikstrom · Feb 15, 2018 · 475f2a7 · 475f2a7
1 parent 977dc9c
commit 475f2a7
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 13 deletions.
diff --git a/src/nextMetaState.spec.ts b/src/nextMetaState.spec.ts
@@ -1,6 +1,6 @@
 import { createMemoryHistory } from "history";
 
-import { POP, PUSH, REPLACE } from "./api";
+import { IMetaState, POP, PUSH, REPLACE } from "./api";
 import { initialMetaState } from "./initialMetaState";
 import { isWrappedLocation } from "./isWrappedLocation";
 import { nextMetaState } from "./nextMetaState";
@@ -58,6 +58,24 @@ describe("nextMetaState", () => {
         });
     });
 
+    it("can push with cut", () => {
+        const source = createMemoryHistory();
+        const initialState: IMetaState = {
+            cache: ["/foo", "/bar"],
+            cut: "here",
+            depth: 123,
+        };
+
+        source.replace("baz", wrapState(null, initialState));
+        const nextState = nextMetaState(source, PUSH, -1);
+
+        expect(nextState).toMatchObject({
+            cache: ["/foo", "/bar", "/baz"],
+            cut: "before",
+            depth: 124,
+        });
+    });
+
     it("can replace", () => {
         const source = createMemoryHistory();
         const initialState = {
@@ -69,7 +87,43 @@ describe("nextMetaState", () => {
         const nextState = nextMetaState(source, REPLACE, -1);
 
         expect(nextState).toMatchObject({
-            cache: ["/foo", "/baz"],
+            cache: ["/foo", "/bar"],
+            depth: 123,
+        });
+    });
+
+    it("can replace with cut here", () => {
+        const source = createMemoryHistory();
+        const initialState: IMetaState = {
+            cache: ["/foo", "/bar"],
+            cut: "here",
+            depth: 123,
+        };
+
+        source.replace("baz", wrapState(null, initialState));
+        const nextState = nextMetaState(source, REPLACE, -1);
+
+        expect(nextState).toMatchObject({
+            cache: ["/foo", "/bar"],
+            cut: "here",
+            depth: 123,
+        });
+    });
+
+    it("can replace with cut before", () => {
+        const source = createMemoryHistory();
+        const initialState: IMetaState = {
+            cache: ["/foo", "/bar"],
+            cut: "before",
+            depth: 123,
+        };
+
+        source.replace("baz", wrapState(null, initialState));
+        const nextState = nextMetaState(source, REPLACE, -1);
+
+        expect(nextState).toMatchObject({
+            cache: ["/foo", "/bar"],
+            cut: "before",
             depth: 123,
         });
     });

diff --git a/src/nextMetaState.ts b/src/nextMetaState.ts
@@ -23,7 +23,7 @@ function nextMetaCore(
     switch (action) {
         case PUSH: return afterPush(meta, path);
         case POP: return afterPop(meta);
-        default: return afterReplace(meta, path);
+        default: return afterReplace(meta);
     }
 }
 
@@ -35,10 +35,16 @@ function applyCacheLimit(meta: IMetaState, limit: number) {
 }
 
 function afterPush(meta: IMetaState, path: string): IMetaState {
-    return {
+    const next: IMetaState = {
         cache: meta.cache.concat(path),
         depth: meta.depth + 1,
     };
+
+    if (meta.cut === "here") {
+        next.cut = "before";
+    }
+
+    return next;
 }
 
 function afterPop(meta: IMetaState): IMetaState {
@@ -48,13 +54,10 @@ function afterPop(meta: IMetaState): IMetaState {
     };
 }
 
-function afterReplace(meta: IMetaState, path: string): IMetaState {
-    if (meta.depth > 0) {
-        return {
-            cache: meta.cache.slice(0, -1).concat(path),
-            depth: meta.depth,
-        };
-    } else {
-        return meta;
-    }
+function afterReplace(meta: IMetaState): IMetaState {
+    return {
+        cache: meta.cache.slice(),
+        cut: meta.cut,
+        depth: meta.depth,
+    };
 }