slower 2.0.2 → 2.1.0

package/package.json

@@ -3,7 +3,7 @@
 		"path-to-regexp": "^6.2.2"
 	},
 	"name": "slower",
-	"version": "2.0.2",
+	"version": "2.1.0",
 	"main": "index.js",
 	"devDependencies": {},
 	"scripts": {

package/src/slower.js

@@ -80,13 +80,13 @@ class SlowerRouter {
     #setRoute (method, path, handler) {
         if (typeof method !== 'string') 
             throw new Error('<SlowerRouter>.route :: "method" parameter must be of type String');
-        if (typeof path !== 'string' && path?.constructor?.name !== 'RegExp')
-            throw new Error('<SlowerRouter>.route :: "path" parameter must be of type String or RegExp');
+        if (typeof path !== 'string' && typeof path !== 'function' && path?.constructor?.name !== 'RegExp')
+            throw new Error('<SlowerRouter>.route :: "path" parameter must be of type Function, String or RegExp');
         if (typeof handler !== 'function')
             throw new Error('<SlowerRouter>.route :: "handler" parameter must be of type Function');
         if (!this.layers.get(method))
             this.layers.set(method, new Map());
-        if (typeof path === 'string') 
+        if (typeof path === 'string' || path?.constructor?.name !== 'RegExp') 
             path = match(path, { decode: decodeURIComponent }); // 'path' is a function now
         this.layers.get(method).set(path, handler);
         return this;
@@ -165,6 +165,76 @@ class SlowerRouter {
         }
         return this;
     }
+
+    /**
+     * Import and use another SlowerRouter, mounted at a specific path
+     * @param {string} mountPath Mount the router at a specific path
+     * @param {SlowerRouter} SlowerRouterInstance 
+     */
+    useRouter (SlowerSubRouterInstance, mountPath = '/') {
+        const mount = p => mountPath ? (mountPath + '/' + p).replace(/\/{2,}/g, '/') : p;
+        const layers = SlowerSubRouterInstance.layers;
+        for (let layer of layers) {
+            if (!!layer.static) {
+                this.static(layer.directoryPath, mount(layer.mountPath));
+                continue;
+            }
+            console.log(layer)
+            this.#setRoute(layer.method, mount(layer.path), layer.handler);
+        }
+        return this;
+    }
+}
+
+class SlowerSubRouter {
+    constructor () {
+        this.METHODS = HTTP_VERBS;
+        this.layers = new Array();
+
+        // Create basic route shortcuts
+        // get(), post(), put(), delete()
+        for (let verb of HTTP_VERBS) {
+            this[verb] = function (path, callback) {
+                return this.#setRoute(verb, path, callback);
+            };
+        }
+    }
+
+    #setRoute (method, path, handler) {
+        if (typeof method !== 'string') 
+            throw new Error('<SlowerSubRouter>.route :: "method" parameter must be of type String');
+        if (typeof path !== 'string' && path?.constructor?.name !== 'RegExp')
+            throw new Error('<SlowerSubRouter>.route :: "path" parameter must be of type Function, String or RegExp');
+        if (typeof handler !== 'function')
+            throw new Error('<SlowerSubRouter>.route :: "handler" parameter must be of type Function');
+        this.layers.push({ method, path, handler });
+        return this;
+    }
+
+    all (path, handler) {
+        if (typeof path === 'string')
+            for (let verb of HTTP_VERBS) this.#setRoute(verb, path, handler);
+        else if (typeof path !== 'function')
+            throw new Error('<SlowerSubRouter>.use :: "handler" parameter must be of type Function');
+        else for (let verb of HTTP_VERBS) this.#setRoute(verb, '/(.{0,})', path);
+        return this;
+    }
+    // Just a more comprehensive call to app.all for defining middlewares
+    use (...b) { this.all(...b); return this; };
+
+    static (directoryPath, mountPath = '') {
+        this.layers.push({ static: true, directoryPath, mountPath });
+        return this;
+    }
+}
+
+// Create basic main routing creation
+function Slower (options) {
+    return new SlowerRouter(options);
+}
+// Add the subrouter class
+Slower.Router = function () {
+    return new SlowerSubRouter();
 }
 
-module.exports = Slower = options => new SlowerRouter(options);
+module.exports = Slower;