@ndiinginc/router 4.4.1 → 4.5.0

package/package.json

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

package/src/index.js

@@ -1,4 +1,4 @@
-const { inspect } = require("node:util");
+require('./polyfill.js')
 const { json } = require("./middleware/json.js");
 const { cors } = require("./middleware/cors.js");
 const { App } = require("./app.js");

package/src/node.js

@@ -1,37 +1,19 @@
 const { Pattern } = require("./pattern.js");
 
+
 class Node {
     constructor(segment = "") {
-        this.segment = segment;
-        this.hasRegExp = segment.startsWith(":") || segment.indexOf("*") !== -1;
         this.hasRegExpChildren = false;
-        this.pattern = this.hasRegExp && new Pattern(segment);
+        this.pattern = /[:*]/.test(segment) && new Pattern(segment);
         /**@type {Map<string,Node>}*/
         this.children = new Map();
-        this.handlers = new Map([
-            ["ALL", []],
-            ["GET", []],
-            ["QUERY", []],
-            ["HEAD", []],
-            ["OPTIONS", []],
-            ["TRACE", []],
-            ["PUT", []],
-            ["DELETE", []],
-            ["POST", []],
-            ["PATCH", []],
-            ["CONNECT", []],
-        ]);
-        // debug
-        Object.defineProperty(this, "handlers", { configurable: true, enumerable: false, writable: true });
+        this.handlers = new Map();
     }
 
     add(segment) {
-        if (!this.children.has(segment)) {
-            const node = new Node(segment);
-            if (node.hasRegExp) this.hasRegExpChildren = true; // node.hasRegExp;
-            this.children.set(segment, node);
-        }
-        return this.children.get(segment);
+        const node = new Node(segment);
+        if (node.pattern) this.hasRegExpChildren = true; // node.hasRegExp;
+        return this.children.getOrInsert(segment,node);
     }
 
     /**
@@ -41,12 +23,12 @@ class Node {
         for (const [method, handlers] of node.handlers) {
             for (const handler of handlers) {
                 handler.seq += offset;
-                this.handlers.get(method).push(handler);
+                this.handlers.getOrInsert(method,[]).push(handler);
             }
         }
 
         for (const [segment, child] of node.children) {
-            if (child.hasRegExp) this.hasRegExpChildren = true; // child.hasRegExp;
+            if (child.pattern) this.hasRegExpChildren = true; // child.hasRegExp;
             if (!this.children.has(segment)) {
                 child.setSeqOffset(offset);
                 this.children.set(segment, child);

package/src/polyfill.js

@@ -0,0 +1,21 @@
+// Polyfill for Map.prototype.getOrInsert
+if (!Map.prototype.getOrInsert) {
+    Map.prototype.getOrInsert = function (key, defaultValue) {
+        if (!this.has(key)) {
+            this.set(key, defaultValue);
+        }
+        return this.get(key);
+    };
+}
+// Polyfill for Map.prototype.getOrInsertComputed
+if (!Map.prototype.getOrInsertComputed) {
+    Map.prototype.getOrInsertComputed = function (key, callbackFunction) {
+        if (typeof callbackFunction !== 'function') {
+            throw new TypeError('The callback argument must be a function');
+        }
+        if (!this.has(key)) {
+            this.set(key, callbackFunction(key));
+        }
+        return this.get(key);
+    };
+}

package/src/router.js

@@ -34,7 +34,7 @@ class Router {
                 this.seq = node.getMaxSeq() + 1;
             } else {
                 handler.seq = this.seq++;
-                node.handlers.get(method).push(handler);
+                node.handlers.getOrInsert(method,[]).push(handler);
             }
         }
     }
@@ -116,7 +116,7 @@ class Router {
 
             if (!matched && node.hasRegExpChildren) {
                 for (const [, child] of node.children) {
-                    if (!child.hasRegExp) continue;
+                    if (!child.pattern) continue;
                     const match = child.pattern.exec(input);
                     if (match) {
                         matched = child;
@@ -141,18 +141,20 @@ class Router {
 
             node = matched;
 
+            if(node.handlers.has("ALL"))
             for (const handler of node.handlers.get("ALL")) {
                 if (handler.length === 3) errorHandlers[handler.seq] = handler;
                 else handlers[handler.seq] = handler;
             }
         }
 
+        if(this.root.handlers.has("ALL"))
         for (const handler of this.root.handlers.get("ALL")) {
             if (handler.length === 3) errorHandlers[handler.seq] = handler;
             else handlers[handler.seq] = handler;
         }
 
-        if (node) {
+        if (node&&node.handlers.has(method)) {
             for (const handler of node.handlers.get(method)) {
                 handlers[handler.seq] = handler;
             }