router.ts tests

templates/router.test.ts

@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2021  Aravinth Manivannan <realaravinth@batsense.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import {Router} from './router';
+
+'use strict';
+
+const result = {
+  result: '',
+};
+
+const panelResult = 'hello from panel';
+const panelRoute = '/panel';
+const panel = () => (result.result = panelResult);
+
+const settingsRoute = '/settings';
+const settingsResult = 'hello from settings';
+const settings = () => (result.result = settingsResult);
+
+const router = new Router();
+router.register(panelRoute, panel);
+router.register(settingsRoute, settings);
+
+test('checks if Router works', () => {
+  window.history.pushState({}, 'Settings', settingsRoute);
+  router.route();
+  expect(result.result).toBe(settingsResult);
+  window.history.pushState({}, 'Panel', panelRoute);
+  router.route();
+  expect(result.result).toBe(panelResult);
+});

templates/router.ts

@@ -17,19 +17,19 @@
 
 /** Removes trailing slashed from URI */
 const normalizeUri = (uri: string) => {
-  if (!uri) {
-    throw new Error('uri is empty');
-  }
+  if (typeof uri == 'string') {
+    if (uri.trim().length == 0) {
+      throw new Error('uri is empty');
+    }
 
-  if (typeof uri !== 'string') {
-    throw new TypeError('URI must be a string');
+    let uriLength = uri.length;
+    if (uri[uriLength - 1] == '/') {
+      uri = uri.slice(0, uriLength - 1);
+    }
+    return uri;
+  } else {
+    throw new TypeError(`${typeof uri} ${uri}`);
   }
-
-  let uriLength = uri.length;
-  if (uri[uriLength - 1] == '/') {
-    uri = uri.slice(0, uriLength - 1);
-  }
-  return uri;
 };
 
 /** URI<-> Fn mapping type */
@@ -38,9 +38,9 @@ type routeTuple = {
   fn: () => void;
 };
 
-/** 
+/**
  * Router that selectively executes fucntions
- * based on window.location.pathname 
+ * based on window.location.pathname
  * */
 export class Router {
   routes: Array<routeTuple>;
@@ -48,15 +48,15 @@ export class Router {
     this.routes = [];
   }
 
-  /** 
-   * registers a route-function pair with Router 
+  /**
+   * registers a route-function pair with Router
    * @param {string} uri - route to be registered
    * @param {function} fn: - function to be registered when window.locatin.path
    * matches uri
    * */
   register(uri: string, fn: () => void) {
     // typechecks
-    if (!uri) {
+    if (uri.trim().length == 0) {
       throw new Error('uri is empty');
     }
 
@@ -90,12 +90,11 @@ export class Router {
    * matches window.pathname.location
    * */
   route() {
+    const path = normalizeUri(window.location.pathname);
+
     this.routes.forEach(route => {
-      // normalize for trailing slash
       const pattern = new RegExp(`^${route.uri}$`);
-      const path = normalizeUri(window.location.pathname);
       if (path.match(pattern)) {
-        //return route.fn.call();
         return route.fn();
       }
     });