1.0.6

.gitlab-ci.yml

@@ -19,23 +19,35 @@ mirror:
   stage: security
   script:
     - npmci git mirror
+  only:
+    - tags
   tags:
     - lossless
     - docker
     - notpriv
 
-audit:
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install --production --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=prod --production
+  tags:
+    - docker
+
+auditDevDependencies:
   image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
     - npmci command npm install --ignore-scripts
     - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm audit --audit-level=high
+    - npmci command npm audit --audit-level=high --only=dev
   tags:
-    - lossless
     - docker
-    - notpriv
+  allow_failure: true
 
 # ====================
 # test stage
@@ -50,9 +62,7 @@ testStable:
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - priv
 
 testBuild:
   stage: test
@@ -63,9 +73,7 @@ testBuild:
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - notpriv
 
 release:
   stage: release
@@ -85,6 +93,8 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  only:
+    - tags
   script:
     - npmci command npm install -g tslint typescript
     - npmci npm prepare

.vscode/settings.json

@@ -15,7 +15,7 @@
             "properties": {
               "projectType": {
                 "type": "string",
-                "enum": ["website", "element", "service", "npm"]
+                "enum": ["website", "element", "service", "npm", "wcc"]
               }
             }
           }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartrouter",
-  "version": "1.0.3",
+  "version": "1.0.6",
   "private": false,
   "description": "a router for routing on websites",
   "main": "dist_ts/index.js",
@@ -14,11 +14,11 @@
   },
   "devDependencies": {
     "@gitzone/tsbuild": "^2.0.22",
-    "@gitzone/tsbundle": "^1.0.69",
+    "@gitzone/tsbundle": "^1.0.72",
-    "@gitzone/tstest": "^1.0.15",
+    "@gitzone/tstest": "^1.0.43",
-    "@pushrocks/tapbundle": "^3.0.7",
+    "@pushrocks/tapbundle": "^3.2.9",
-    "@types/node": "^10.11.7",
+    "@types/node": "^14.0.23",
-    "tslint": "^5.11.0",
+    "tslint": "^6.1.2",
     "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
@@ -35,5 +35,8 @@
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

test/test.browser.ts

@@ -0,0 +1,32 @@
+import { expect, tap } from '@pushrocks/tapbundle';
+import * as smartrouter from '../ts/index';
+
+let testrouter: smartrouter.SmartRouter;
+
+tap.test('first test', async () => {
+  testrouter = new smartrouter.SmartRouter({});
+  expect(testrouter).to.be.instanceOf(smartrouter.SmartRouter);
+});
+
+tap.test('should handle a route change', async (tools) => {
+  const done = tools.defer();
+  testrouter.on('/myawesomeroute/:any', async (routeInfoArg) => {
+    expect(routeInfoArg.params.any).to.equal('hello');
+    done.resolve();
+  });
+  testrouter.pushUrl('/myawesomeroute/hello');
+  await done.promise;
+});
+
+tap.test('should handle a route change', async (tools) => {
+  const done = tools.defer();
+  testrouter.on('/myawesomeroute2/:wow', async (routeInfoArg) => {
+    expect(routeInfoArg.params.wow).to.equal('hello2');
+    done.resolve();
+  });
+  testrouter.pushUrl('/myawesomeroute2/hello2');
+  await done.promise;
+  expect(window.location.href).to.equal('http://localhost:3007/myawesomeroute2/hello2');
+});
+
+tap.start();

test/test.ts

@@ -1,8 +0,0 @@
-import { expect, tap } from '@pushrocks/tapbundle';
-import * as smartrouter from '../ts/index';
-
-tap.test('first test', async () => {
-  const router = new smartrouter.SmartRouter({});
-});
-
-tap.start();

ts/index.ts

@@ -1,6 +1,6 @@
 import * as plugins from './smartrouter.plugins';
 
-const routeLog = message => {
+const routeLog = (message) => {
   console.log(`%c[Router]%c ${message}`, 'color: rgb(255, 105, 100);', 'color: inherit');
 };
 
@@ -8,12 +8,19 @@ export interface IRouterOptions {
   debug?: boolean;
 }
 
+export type THandlerFunction = <T extends object>(routeArg: IRouteInfo) => Promise<any>;
+export interface IRouteInfo {
+  path: string;
+  index: number;
+  params: { [key: string]: string };
+}
+
 /**
  * Router
  */
 export class SmartRouter {
   public options: IRouterOptions = {
-    debug: false
+    debug: false,
   };
 
   /**
@@ -21,7 +28,7 @@ export class SmartRouter {
    */
   public routes: Array<{
     matchFunction: plugins.pathToRegExp.MatchFunction;
-    handler: <T extends object>(matchArg: plugins.pathToRegExp.Match<T>) => Promise<any>;
+    handler: THandlerFunction;
   }> = [];
 
   /**
@@ -31,11 +38,11 @@ export class SmartRouter {
     // lets set the router options
     this.options = {
       ...this.options,
-      ...optionsArg
+      ...optionsArg,
     };
 
     // lets subscribe to route changes
-    window.addEventListener('popstate', popStateEventArg => {
+    window.addEventListener('popstate', (popStateEventArg) => {
       popStateEventArg.preventDefault();
       this._handleRouteState();
     });
@@ -61,10 +68,10 @@ export class SmartRouter {
    * @param {string|RegExp} routeArg
    * @param {function} handlerArg
    */
-  public on(routeArg: string, handlerArg: () => Promise<any>) {
+  public on(routeArg: string, handlerArg: THandlerFunction) {
     this.routes.push({
       matchFunction: plugins.pathToRegExp.match(routeArg),
-      handler: handlerArg
+      handler: handlerArg,
     });
   }
 
@@ -73,13 +80,13 @@ export class SmartRouter {
    */
   async _handleRouteState() {
     const currentLocation = window.location.pathname;
-    const wantedRoute = this.routes.find(routeArg => {
+    const wantedRoutes = this.routes.filter((routeArg) => {
       return !!routeArg.matchFunction(currentLocation);
     });
 
-    if (wantedRoute) {
+    for (const wantedRoute of wantedRoutes) {
       const routeResult = wantedRoute.matchFunction(currentLocation);
-      await wantedRoute.handler(routeResult);
+      await wantedRoute.handler(routeResult.valueOf() as IRouteInfo);
     }
   }
 }