@thi.ng/router 4.0.9 → 4.0.11

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2024-04-23T07:02:18Z
+- **Last updated**: 2024-06-21T19:34:38Z
 - **Generator**: [thi.ng/monopub](https://thi.ng/monopub)
 
 All notable changes to this project will be documented in this file.
@@ -9,6 +9,12 @@ See [Conventional Commits](https://conventionalcommits.org/) for commit guidelin
 **Note:** Unlisted _patch_ versions only involve non-code or otherwise excluded changes
 and/or version bumps of transitive dependencies.
 
+### [4.0.11](https://github.com/thi-ng/umbrella/tree/@thi.ng/router@4.0.11) (2024-06-21)
+
+#### ♻️ Refactoring
+
+- enforce uniform naming convention of internal functions ([56992b2](https://github.com/thi-ng/umbrella/commit/56992b2))
+
 ### [4.0.8](https://github.com/thi-ng/umbrella/tree/@thi.ng/router@4.0.8) (2024-04-20)
 
 #### ♻️ Refactoring

package/README.md

@@ -7,7 +7,7 @@
 [![Mastodon Follow](https://img.shields.io/mastodon/follow/109331703950160316?domain=https%3A%2F%2Fmastodon.thi.ng&style=social)](https://mastodon.thi.ng/@toxi)
 
 > [!NOTE]
-> This is one of 192 standalone projects, maintained as part
+> This is one of 193 standalone projects, maintained as part
 > of the [@thi.ng/umbrella](https://github.com/thi-ng/umbrella/) monorepo
 > and anti-framework.
 >

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/router",
-  "version": "4.0.9",
+  "version": "4.0.11",
   "description": "Generic trie-based router with support for wildcards, route param validation/coercion, auth",
   "type": "module",
   "module": "./index.js",
@@ -10,7 +10,7 @@
     "type": "git",
     "url": "https://github.com/thi-ng/umbrella.git"
   },
-  "homepage": "https://github.com/thi-ng/umbrella/tree/develop/packages/router#readme",
+  "homepage": "https://thi.ng/router",
   "funding": [
     {
       "type": "github",
@@ -36,17 +36,17 @@
     "tool:tangle": "../../node_modules/.bin/tangle src/**/*.ts"
   },
   "dependencies": {
-    "@thi.ng/api": "^8.11.1",
-    "@thi.ng/checks": "^3.6.3",
-    "@thi.ng/equiv": "^2.1.57",
-    "@thi.ng/errors": "^2.5.6",
-    "tslib": "^2.6.2"
+    "@thi.ng/api": "^8.11.3",
+    "@thi.ng/checks": "^3.6.5",
+    "@thi.ng/equiv": "^2.1.59",
+    "@thi.ng/errors": "^2.5.8",
+    "tslib": "^2.6.3"
   },
   "devDependencies": {
-    "@microsoft/api-extractor": "^7.43.0",
-    "esbuild": "^0.20.2",
-    "typedoc": "^0.25.12",
-    "typescript": "^5.4.3"
+    "@microsoft/api-extractor": "^7.47.0",
+    "esbuild": "^0.21.5",
+    "typedoc": "^0.25.13",
+    "typescript": "^5.5.2"
   },
   "keywords": [
     "browser",
@@ -97,5 +97,5 @@
     ],
     "year": 2014
   },
-  "gitHead": "5dd66c18a3862a3af69a5b2f49563f7cbdd960c2\n"
+  "gitHead": "154c95cf9d6bab32174498ec3b5b5d87e42be7f9\n"
 }

package/router.js

@@ -5,8 +5,7 @@ var __decorateClass = (decorators, target, key, kind) => {
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp(target, key, result);
+  if (kind && result) __defProp(target, key, result);
   return result;
 };
 import { INotifyMixin } from "@thi.ng/api/mixins/inotify";
@@ -132,7 +131,7 @@ let Router = class {
     if (route) {
       const params2 = match.params;
       let parts = route.match.map((x) => {
-        if (isRouteParam(x)) {
+        if (__isRouteParam(x)) {
           const id2 = x.substring(1);
           const p = params2?.[id2];
           if (p == null) {
@@ -162,7 +161,7 @@ let Router = class {
     }
     let hasParams = false;
     const params = match.reduce((acc, x, i) => {
-      if (isRouteParam(x)) {
+      if (__isRouteParam(x)) {
         hasParams = true;
         acc[i] = x.substring(1);
       }
@@ -179,8 +178,7 @@ let Router = class {
   matchRoutes(src, ctx) {
     const curr = src.split(this.opts.separator);
     const route = this.routes.get(curr);
-    if (!route)
-      return;
+    if (!route) return;
     let params;
     if (route.params) {
       params = Object.entries(route.params).reduce(
@@ -229,7 +227,7 @@ let Router = class {
 Router = __decorateClass([
   INotifyMixin
 ], Router);
-const isRouteParam = (x) => x[0] === "?";
+const __isRouteParam = (x) => x[0] === "?";
 export {
   Router
 };

package/trie.js

@@ -4,10 +4,8 @@ class Trie {
   v;
   constructor(key, v, i = 0) {
     if (key && v !== void 0) {
-      if (i < key.length)
-        this.set(key, v, i);
-      else
-        this.v = v;
+      if (i < key.length) this.set(key, v, i);
+      else this.v = v;
     }
   }
   set(key, v, i = 0) {
@@ -18,25 +16,18 @@ class Trie {
     let k = key[i];
     if (k === "+" && i < key.length - 1)
       illegalArgs("`+` only allowed in tail position");
-    if (k[0] === "?")
-      k = "?";
+    if (k[0] === "?") k = "?";
     const next = this.n[k];
-    if (next)
-      next.set(key, v, i + 1);
-    else
-      this.n[k] = new Trie(key, v, i + 1);
+    if (next) next.set(key, v, i + 1);
+    else this.n[k] = new Trie(key, v, i + 1);
   }
   get(key, i = 0) {
-    if (i >= key.length)
-      return this.v;
+    if (i >= key.length) return this.v;
     let value;
     let next;
-    if (next = this.n[key[i]])
-      value = next.get(key, i + 1);
-    if (value !== void 0)
-      return value;
-    if (next = this.n["?"])
-      value = next.get(key, i + 1);
+    if (next = this.n[key[i]]) value = next.get(key, i + 1);
+    if (value !== void 0) return value;
+    if (next = this.n["?"]) value = next.get(key, i + 1);
     return value !== void 0 ? value : this.n["+"]?.v;
   }
 }