routup 3.0.0-alpha.1 → 3.0.0-alpha.2

package/dist/index.cjs

@@ -1791,14 +1791,17 @@ function isLayerInstance(input) {
     return isInstance(input, LayerSymbol);
 }
 
-function isPluginInstallContext(input) {
-    if (!isObject(input) || !isObject(input.options)) {
+function isPlugin(input) {
+    if (!isObject(input)) {
         return false;
     }
     if (typeof input.name !== 'undefined' && typeof input.name !== 'string') {
         return false;
     }
-    return typeof input.path === 'undefined' || isPath(input.path);
+    if (typeof input.install !== 'function' || input.install.length !== 1) {
+        return false;
+    }
+    return typeof input.version === 'undefined' || typeof input.version === 'string';
 }
 
 function transformRouterOptions(input) {
@@ -2026,9 +2029,6 @@ class Router {
         return this;
     }
     use(...input) {
-        /* istanbul ignore next */ if (input.length === 0) {
-            return this;
-        }
         const modifyPath = (input)=>{
             if (typeof input === 'string') {
                 return withLeadingSlash(input);
@@ -2053,33 +2053,32 @@ class Router {
                 item.path = path || modifyPath(item.path);
                 this.stack.push(new Layer(item));
             }
+            if (isPlugin(item)) {
+                if (path) {
+                    this.install(item, {
+                        path
+                    });
+                } else {
+                    this.install(item);
+                }
+            }
         }
         return this;
     }
     // --------------------------------------------------
-    install(plugin, context) {
-        if (isPluginInstallContext(context)) {
-            const name = context.name || plugin.name;
-            if (context.path) {
-                const router = new Router({
-                    name
-                });
-                plugin.install(router, context.options);
-                this.use(context.path, router);
-                return this;
-            }
-            plugin.install(this, context.options);
+    install(plugin, context = {}) {
+        const name = context.name || plugin.name;
+        if (context.path) {
+            const router = new Router({
+                name
+            });
+            plugin.install(router);
+            this.use(context.path, router);
             return this;
         }
-        plugin.install(this, context);
+        plugin.install(this);
         return this;
     }
-    uninstall(name) {
-        const index = this.stack.findIndex((el)=>isRouterInstance(el) && el.name === name);
-        if (index !== -1) {
-            this.stack.splice(index, 1);
-        }
-    }
     // --------------------------------------------------
     constructor(options = {}){
         this['@instanceof'] = RouterSymbol;
@@ -2137,7 +2136,7 @@ exports.isError = isError;
 exports.isHandler = isHandler;
 exports.isLayerInstance = isLayerInstance;
 exports.isPath = isPath;
-exports.isPluginInstallContext = isPluginInstallContext;
+exports.isPlugin = isPlugin;
 exports.isRequestCacheable = isRequestCacheable;
 exports.isResponseGone = isResponseGone;
 exports.isRouterInstance = isRouterInstance;