diesel-core 0.0.1 → 0.0.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "diesel-core",
-  "version": "0.0.1",
-  "main": "index.js",
+  "version": "0.0.3",
+  "main": "src/server.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },

package/src/router.js

@@ -1,53 +1,43 @@
 import diesel from "./server";
 
-class Router extends diesel{
-    constructor(){
-        super()
-    }
-    #addRoute(method,path,handlers){
-        
+class Router extends diesel {
+  constructor() {
+    super();
+  }
+  #addRoute(method, path, handlers) {
+      if (!this.trie.root.subMiddlewares.has(path)) {
+          this.trie.root.subMiddlewares.set(path,[])
+        }  
         const middlewareHandlers = handlers.slice(0, -1);
 
-        if (!this.middlewares.has(path)) {
-            this.middlewares.set(path,[])
-        }
-        if (path === '/') {
-            middlewareHandlers.forEach(midlleware => {
-                if(!this.globalMiddlewares.includes(midlleware)){
-                    this.globalMiddlewares.push(midlleware)
-                }
-            })
-        } else {
-            if (!this.middlewares.get(path).includes(...middlewareHandlers)) {
-                this.middlewares.get(path).push(...middlewareHandlers);
-            }
-        }
-
-        const handler = handlers[handlers.length-1]
-        this.trie.insert(path,{handler,method})
-        
+    if (!this.trie.root.subMiddlewares.get(path).includes(...middlewareHandlers)) {
+        this.trie.root.subMiddlewares.get(path).push(...middlewareHandlers)
     }
-    get(path,...handlers){
-        return this.#addRoute("GET",path,handlers)
-}
 
-post(path,...handlers){
-        return this.#addRoute("POST",path,handlers)
-}
+    const handler = handlers[handlers.length - 1];
+    this.trie.insert(path, { handler, method });
+  }
+  get(path, ...handlers) {
+    return this.#addRoute("GET", path, handlers);
+  }
 
-put(path,...handlers){
-        return this.#addRoute("PUT",path,handlers)
-}
+  post(path, ...handlers) {
+    return this.#addRoute("POST", path, handlers);
+  }
 
-patch(path,...handlers){
-    if (handlers.length>0) {
-        return this.#addRoute("PATCH",path,handlers)
+  put(path, ...handlers) {
+    return this.#addRoute("PUT", path, handlers);
+  }
+
+  patch(path, ...handlers) {
+    if (handlers.length > 0) {
+      return this.#addRoute("PATCH", path, handlers);
     }
-}
+  }
 
-delete(path,...handlers){
-        return this.#addRoute("DELETE",path,handlers)
-}
+  delete(path, ...handlers) {
+    return this.#addRoute("DELETE", path, handlers);
+  }
 }
 
-export default Router
+export default Router;

package/src/server.js

@@ -44,6 +44,7 @@ class diesel {
 
     register(pathPrefix,handlerInstance){
         const routeEntries = Object.entries(handlerInstance.trie.root.children);
+        // console.log(handlerInstance.trie.root);
         handlerInstance.trie.root.subMiddlewares.forEach((middleware,path)=>{
             if (!this.middlewares.has(pathPrefix+path)) {
               this.middlewares.set(pathPrefix+path, []);