@ndiinginc/router 4.3.0 → 4.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ndiinginc/router",
-  "version": "4.3.0",
+  "version": "4.4.0",
   "description": "",
   "main": "./src/index.js",
   "scripts": {

package/src/node.js

@@ -3,7 +3,9 @@ const { Pattern } = require("./pattern.js");
 class Node {
     constructor(segment = "") {
         this.segment = segment;
-        this.pattern = new Pattern(segment);
+        this.hasRegExp = segment.startsWith(":") || segment.indexOf("*") !== -1;
+        this.hasRegExpChildren = false;
+        this.pattern = this.hasRegExp && new Pattern(segment);
         /**@type {Map<string,Node>}*/
         this.children = new Map();
         this.handlers = new Map([
@@ -19,11 +21,15 @@ class Node {
             ["PATCH", []],
             ["CONNECT", []],
         ]);
+        // debug
+        Object.defineProperty(this, "handlers", { configurable: true, enumerable: false, writable: true });
     }
 
     add(segment) {
         if (!this.children.has(segment)) {
-            this.children.set(segment, new Node(segment));
+            const node = new Node(segment);
+            if (node.hasRegExp) this.hasRegExpChildren = true; // node.hasRegExp;
+            this.children.set(segment, node);
         }
         return this.children.get(segment);
     }
@@ -40,6 +46,7 @@ class Node {
         }
 
         for (const [segment, child] of node.children) {
+            if (child.hasRegExp) this.hasRegExpChildren = true; // child.hasRegExp;
             if (!this.children.has(segment)) {
                 child.setSeqOffset(offset);
                 this.children.set(segment, child);

package/src/router.js

@@ -114,8 +114,9 @@ class Router {
         for (const input of this.split(path)) {
             let matched = node.children.get(input);
 
-            if (!matched) {
+            if (!matched && node.hasRegExpChildren) {
                 for (const [, child] of node.children) {
+                    if (!child.hasRegExp) continue;
                     const match = child.pattern.exec(input);
                     if (match) {
                         matched = child;