@thi.ng/router 4.0.2 → 4.0.3

package/api.d.ts

@@ -83,7 +83,8 @@ export interface Route {
     auth?: boolean;
 }
 export interface AugmentedRoute {
-    spec: Route;
+    spec: Readonly<Route>;
+    id: string;
     match: string[];
     params?: Record<number, string>;
     rest: number;

package/html.js

@@ -18,7 +18,7 @@ class HTMLRouter extends Router {
     }
     if (this.opts.initial) {
       const route = this.routeForID(this.opts.initial);
-      this.route(this.format({ id: route.spec.id }));
+      this.route(this.format({ id: route.id }));
     } else {
       this.route(this.useFragment ? location.hash : location.pathname);
     }
@@ -80,7 +80,7 @@ class HTMLRouter extends Router {
   handleRouteFailure() {
     this.ignoreHashChange = true;
     location.hash = this.format({
-      id: this.routeForID(this.opts.default).spec.id
+      id: this.routeForID(this.opts.default).id
     });
     this.ignoreHashChange = false;
     return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/router",
-  "version": "4.0.2",
+  "version": "4.0.3",
   "description": "Generic trie-based router with support for wildcards, route param validation/coercion, auth",
   "type": "module",
   "module": "./index.js",
@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "@thi.ng/api": "^8.9.30",
-    "@thi.ng/checks": "^3.5.3",
+    "@thi.ng/checks": "^3.5.4",
     "@thi.ng/equiv": "^2.1.52",
     "@thi.ng/errors": "^2.5.1",
     "tslib": "^2.6.2"
@@ -98,5 +98,5 @@
     ],
     "year": 2014
   },
-  "gitHead": "bc0f3cb07d6f1cab6dbdc5ff57428f5484e711bb\n"
+  "gitHead": "4b3d4ab6ce373ca817ad780f679572169a9ed733\n"
 }

package/router.js

@@ -62,7 +62,7 @@ let Router = class {
   start() {
     if (this.opts.initial) {
       const route = this.routeForID(this.opts.initial);
-      this.current = { id: route.spec.id, params: {} };
+      this.current = { id: route.id, params: {} };
       this.notify({ id: EVENT_ROUTE_CHANGED, value: this.current });
     }
   }
@@ -71,7 +71,7 @@ let Router = class {
       try {
         const route = this.augmentRoute(r);
         this.routes.set(route.match, route);
-        this.index[r.id] = route;
+        this.index[route.id] = route;
       } catch (e) {
         illegalArgs(
           `error in route "${r.id}": ${e.origMessage}`
@@ -104,7 +104,7 @@ let Router = class {
         return;
       }
       const route = this.routeForID(this.opts.default);
-      match = { id: route.spec.id, redirect: true };
+      match = { id: route.id, redirect: true };
     }
     if (!equiv(match, this.current)) {
       this.current = match;
@@ -157,7 +157,7 @@ let Router = class {
     const existing = this.routes.get(match);
     if (existing) {
       illegalArgs(
-        `duplicate route: ${match} (id: ${route.id}, conflicts with: ${existing.spec.id})`
+        `duplicate route: ${match} (id: ${route.id}, conflicts with: ${existing.id})`
       );
     }
     let hasParams = false;
@@ -170,6 +170,7 @@ let Router = class {
     }, {});
     return {
       spec: route,
+      id: route.id,
       match,
       params: hasParams ? params : void 0,
       rest: match.indexOf("+")
@@ -193,7 +194,7 @@ let Router = class {
     }
     const rest = route.rest >= 0 ? curr.slice(route.rest) : void 0;
     let match = {
-      id: route.spec.id,
+      id: route.id,
       params,
       rest
     };