async

.vscode/launch.json

@@ -0,0 +1,23 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Jest All",
+      "program": "${workspaceRoot}/node_modules/jest/bin/jest",
+      "args": ["--runInBand", "--coverage", "false"],
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen"
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Jest __DEBUG__",
+      "program": "${workspaceRoot}/node_modules/jest/bin/jest",
+      "args": ["--runInBand", "--coverage", "false", "-t", "__DEBUG__"],
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen"
+    }
+  ]
+}

package.json

@@ -7,6 +7,8 @@
   "scripts": {
     "test": "jest",
     "test:watch": "jest --watch",
+    "test:nocoverage": "jest --coverage false",
+    "test:debug": "jest --coverage false -t __DEBUG__",
     "build": "webpack",
     "lint": "tslint --format stylish src/*.ts src/**/*.ts",
     "lint:fix": "tslint --format stylish --fix src/*.ts src/**/*.ts",
@@ -49,7 +51,7 @@
     "transform": {
       "^.+\\.ts$": "ts-jest"
     },
-    "testRegex": "src/.*\\.spec\\.ts$",
+    "testRegex": "\\.spec\\.ts$",
     "moduleFileExtensions": [
       "ts",
       "js",

src/Blocker.ts

@@ -8,17 +8,25 @@ import {
 import { Suppressor } from "./Suppressor";
 
 export class Blocker {
-    constructor(private source: IHistory, private suppressor: Suppressor) { }
+    constructor(private source: IHistory, private suppressor: Suppressor, private onBlocked: () => void) { }
 
-    public block(prompt?: boolean | string | BlockPrompt) {
+    public block(prompt: boolean | string | BlockPrompt = false) {
         const wrapper = ((location: ILocation, action: NavigationAction) => {
+            let result;
+
             if (this.suppressor.isActive) {
-                return true;
+                result = true;
             } else if (typeof prompt === "function") {
-                return prompt(location, action);
+                result = prompt(location, action);
             } else {
-                return prompt;
+                result = prompt;
+            }
+
+            if (result === false) {
+                this.onBlocked();
             }
+
+            return result;
         }).bind(this);
 
         return this.source.block(wrapper);

src/api/IAppHistory.ts

@@ -8,28 +8,28 @@ export interface IAppHistory extends IHistory {
     readonly cacheLimit: number;
     readonly depth: number;
     readonly isSuppressed: boolean;
+    readonly source: IHistory;
 
-    cut(): IAppHistory;
+    cut(): Promise<void>;
 
-    findLast(match: string | RegExp | PathPredicate): number;
+    findLast(match: string | RegExp | PathPredicate): Promise<number>;
 
-    go(delta: number): IAppHistory;
+    go(delta: number): Promise<void>;
 
-    goBack(to?: RegExp | PathPredicate): boolean;
-    goBack(to: string, state?: any): IAppHistory;
-    goBack(to?: Partial<ILocation>): IAppHistory;
+    goBack(to: string, state?: any): Promise<boolean>;
+    goBack(to?: Partial<ILocation> | RegExp | PathPredicate): Promise<boolean>;
 
-    goForward(): IAppHistory;
+    goForward(): Promise<void>;
 
-    goHome(to: string, state?: any): IAppHistory;
-    goHome(to?: Partial<ILocation>): IAppHistory;
+    goHome(to: string, state?: any): Promise<void>;
+    goHome(to?: Partial<ILocation>): Promise<void>;
 
-    push(path: string, state?: any): IAppHistory;
-    push(location: Partial<ILocation>): IAppHistory;
+    push(path: string, state?: any): Promise<void>;
+    push(location: Partial<ILocation>): Promise<void>;
 
-    replace(path: string, state?: any): IAppHistory;
-    replace(location: Partial<ILocation>): IAppHistory;
+    replace(path: string, state?: any): Promise<void>;
+    replace(location: Partial<ILocation>): Promise<void>;
 
     suppress(): UnregisterCallback;
-    suppress(action: WithSuppressionAction): IAppHistory;
+    suppress(action: WithSuppressionAction): Promise<void>;
 }

src/api/IAppHistoryOptions.ts

@@ -1,6 +1,10 @@
-import { IHistory } from "./IHistory";
+export type SourceType = "browser" | "memory";
+
+export type UserConfirmationCallback = (result: boolean) => void;
+export type UserConfirmation = (message: string, callback: UserConfirmationCallback) => void;
 
 export interface IAppHistoryOptions {
-    source?: IHistory;
+    sourceType?: SourceType;
+    getUserConfirmation?: UserConfirmation;
     cacheLimit?: number;
 }

src/api/WithSuppressionAction.ts

@@ -1,3 +1,3 @@
 import { IAppHistory } from "./IAppHistory";
 
-export type WithSuppressionAction = (history: IAppHistory) => void;
+export type WithSuppressionAction = (history: IAppHistory) => void | Promise<void>;