Add NavigationPresenter

src/content/navigates.ts

@@ -1,83 +0,0 @@
-const REL_PATTERN: {[key: string]: RegExp} = {
-  prev: /^(?:prev(?:ious)?|older)\b|\u2039|\u2190|\xab|\u226a|<</i,
-  next: /^(?:next|newer)\b|\u203a|\u2192|\xbb|\u226b|>>/i,
-};
-
-// Return the last element in the document matching the supplied selector
-// and the optional filter, or null if there are no matches.
-// eslint-disable-next-line func-style
-function selectLast<E extends Element>(
-  win: Window,
-  selector: string,
-  filter?: (e: E) => boolean,
-): E | null {
-  let nodes = Array.from(
-    win.document.querySelectorAll(selector) as NodeListOf<E>
-  );
-
-  if (filter) {
-    nodes = nodes.filter(filter);
-  }
-  return nodes.length ? nodes[nodes.length - 1] : null;
-}
-
-const historyPrev = (win: Window): void => {
-  win.history.back();
-};
-
-const historyNext = (win: Window): void => {
-  win.history.forward();
-};
-
-// Code common to linkPrev and linkNext which navigates to the specified page.
-const linkRel = (win: Window, rel: string): void => {
-  let link = selectLast<HTMLLinkElement>(win, `link[rel~=${rel}][href]`);
-  if (link) {
-    win.location.href = link.href;
-    return;
-  }
-
-  const pattern = REL_PATTERN[rel];
-
-  let a = selectLast<HTMLAnchorElement>(win, `a[rel~=${rel}][href]`) ||
-    // `innerText` is much slower than `textContent`, but produces much better
-    // (i.e. less unexpected) results
-    selectLast(win, 'a[href]', lnk => pattern.test(lnk.innerText));
-
-  if (a) {
-    a.click();
-  }
-};
-
-const linkPrev = (win: Window): void => {
-  linkRel(win, 'prev');
-};
-
-const linkNext = (win: Window): void => {
-  linkRel(win, 'next');
-};
-
-const parent = (win: Window): void => {
-  const loc = win.location;
-  if (loc.hash !== '') {
-    loc.hash = '';
-    return;
-  } else if (loc.search !== '') {
-    loc.search = '';
-    return;
-  }
-
-  const basenamePattern = /\/[^/]+$/;
-  const lastDirPattern = /\/[^/]+\/$/;
-  if (basenamePattern.test(loc.pathname)) {
-    loc.pathname = loc.pathname.replace(basenamePattern, '/');
-  } else if (lastDirPattern.test(loc.pathname)) {
-    loc.pathname = loc.pathname.replace(lastDirPattern, '/');
-  }
-};
-
-const root = (win: Window): void => {
-  win.location.href = win.location.origin;
-};
-
-export { historyPrev, historyNext, linkPrev, linkNext, parent, root };

src/content/presenters/NavigationPresenter.ts

@@ -0,0 +1,98 @@
+export default interface NavigationPresenter {
+  openHistoryPrev(): void;
+
+  openHistoryNext(): void;
+
+  openLinkPrev(): void;
+
+  openLinkNext(): void;
+
+  openParent(): void;
+
+  openRoot(): void;
+
+  // eslint-disable-next-line semi
+}
+
+const REL_PATTERN: {[key: string]: RegExp} = {
+  prev: /^(?:prev(?:ious)?|older)\b|\u2039|\u2190|\xab|\u226a|<</i,
+  next: /^(?:next|newer)\b|\u203a|\u2192|\xbb|\u226b|>>/i,
+};
+
+// Return the last element in the document matching the supplied selector
+// and the optional filter, or null if there are no matches.
+// eslint-disable-next-line func-style
+function selectLast<E extends Element>(
+  selector: string,
+  filter?: (e: E) => boolean,
+): E | null {
+  let nodes = Array.from(
+    window.document.querySelectorAll(selector) as NodeListOf<E>
+  );
+
+  if (filter) {
+    nodes = nodes.filter(filter);
+  }
+  return nodes.length ? nodes[nodes.length - 1] : null;
+}
+
+export class NavigationPresenterImpl implements NavigationPresenter {
+  openHistoryPrev(): void {
+    window.history.back();
+  }
+
+  openHistoryNext(): void {
+    window.history.forward();
+  }
+
+  openLinkPrev(): void {
+    this.linkRel('prev');
+  }
+
+  openLinkNext(): void {
+    this.linkRel('next');
+  }
+
+  openParent(): void {
+    const loc = window.location;
+    if (loc.hash !== '') {
+      loc.hash = '';
+      return;
+    } else if (loc.search !== '') {
+      loc.search = '';
+      return;
+    }
+
+    const basenamePattern = /\/[^/]+$/;
+    const lastDirPattern = /\/[^/]+\/$/;
+    if (basenamePattern.test(loc.pathname)) {
+      loc.pathname = loc.pathname.replace(basenamePattern, '/');
+    } else if (lastDirPattern.test(loc.pathname)) {
+      loc.pathname = loc.pathname.replace(lastDirPattern, '/');
+    }
+  }
+
+  openRoot(): void {
+    window.location.href = window.location.origin;
+  }
+
+  // Code common to linkPrev and linkNext which navigates to the specified page.
+  private linkRel(rel: 'prev' | 'next'): void {
+    let link = selectLast<HTMLLinkElement>(`link[rel~=${rel}][href]`);
+    if (link) {
+      window.location.href = link.href;
+      return;
+    }
+
+    const pattern = REL_PATTERN[rel];
+
+    let a = selectLast<HTMLAnchorElement>(`a[rel~=${rel}][href]`) ||
+    // `innerText` is much slower than `textContent`, but produces much better
+    // (i.e. less unexpected) results
+    selectLast('a[href]', lnk => pattern.test(lnk.innerText));
+
+    if (a) {
+      a.click();
+    }
+  }
+}

src/content/usecases/FocusUseCase.ts

@@ -1,5 +1,6 @@
 import FocusPresenter, { FocusPresenterImpl }
   from '../presenters/FocusPresenter';
+
 export default class FocusUseCases {
   private presenter: FocusPresenter;
 

src/content/usecases/NavigateUseCase.ts

@@ -1,27 +1,36 @@
-import * as navigates from '../navigates';
+import NavigationPresenter, { NavigationPresenterImpl }
+  from '../presenters/NavigationPresenter';
+
+export default class NavigateUseCase {
+  private navigationPresenter: NavigationPresenter;
+
+  constructor({
+    navigationPresenter = new NavigationPresenterImpl(),
+  } = {}) {
+    this.navigationPresenter = navigationPresenter;
+  }
 
-export default class NavigateClass {
   openHistoryPrev(): void {
-    navigates.historyPrev(window);
+    this.navigationPresenter.openHistoryPrev();
   }
 
   openHistoryNext(): void {
-    navigates.historyNext(window);
+    this.navigationPresenter.openHistoryNext();
   }
 
   openLinkPrev(): void {
-    navigates.linkPrev(window);
+    this.navigationPresenter.openLinkPrev();
   }
 
   openLinkNext(): void {
-    navigates.linkNext(window);
+    this.navigationPresenter.openLinkNext();
   }
 
   openParent(): void {
-    navigates.parent(window);
+    this.navigationPresenter.openParent();
   }
 
   openRoot(): void {
-    navigates.root(window);
+    this.navigationPresenter.openRoot();
   }
 }