routup 3.0.0-alpha.1 → 3.0.0-alpha.3

package/dist/index.cjs

@@ -79,6 +79,64 @@ function isError(input) {
     }, input);
 }
 
+function isRequestCacheable(req, modifiedTime) {
+    const modifiedSince = req.headers[exports.HeaderName.IF_MODIFIED_SINCE];
+    if (!modifiedSince) {
+        return false;
+    }
+    modifiedTime = typeof modifiedTime === 'string' ? new Date(modifiedTime) : modifiedTime;
+    return new Date(modifiedSince) >= modifiedTime;
+}
+
+const envSymbol = Symbol.for('ReqEnv');
+function setRequestEnv(req, key, value) {
+    if (envSymbol in req) {
+        if (typeof key === 'object') {
+            if (value) {
+                req[envSymbol] = smob.merge(req[envSymbol], key);
+            } else {
+                req[envSymbol] = key;
+            }
+        } else {
+            req[envSymbol][key] = value;
+        }
+        return;
+    }
+    if (typeof key === 'object') {
+        req[envSymbol] = key;
+        return;
+    }
+    req[envSymbol] = {
+        [key]: value
+    };
+}
+function useRequestEnv(req, key) {
+    if (envSymbol in req) {
+        if (typeof key === 'string') {
+            return req[envSymbol][key];
+        }
+        return req[envSymbol];
+    }
+    if (typeof key === 'string') {
+        return undefined;
+    }
+    return {};
+}
+function unsetRequestEnv(req, key) {
+    if (envSymbol in req) {
+        if (smob.hasOwnProperty(req[envSymbol], key)) {
+            delete req[envSymbol][key];
+        }
+    }
+}
+
+function getRequestHeader(req, name) {
+    return req.headers[name];
+}
+function setRequestHeader(req, name, value) {
+    req.headers[name] = value;
+}
+
 /*
   Set-Cookie header field-values are sometimes comma joined in one string. This splits them without choking on commas
   that are within a single set-cookie field-value, such as in the Expires portion.
@@ -364,160 +422,6 @@ function isWebResponse(input) {
     return typeof Response !== 'undefined' && input instanceof Response;
 }
 
-const BodySymbol = Symbol.for('ReqBody');
-function useRequestBody(req, key) {
-    let body;
-    /* istanbul ignore next */ if ('body' in req) {
-        body = req.body;
-    }
-    if (BodySymbol in req) {
-        if (body) {
-            body = smob.merge({}, req[BodySymbol], body);
-        } else {
-            body = req[BodySymbol];
-        }
-    }
-    if (body) {
-        if (typeof key === 'string') {
-            return body[key];
-        }
-        return body;
-    }
-    return typeof key === 'string' ? undefined : {};
-}
-function hasRequestBody(req) {
-    return 'body' in req || BodySymbol in req;
-}
-function setRequestBody(req, key, value) {
-    if (isObject(key)) {
-        req[BodySymbol] = key;
-        return;
-    }
-    req[BodySymbol] = {
-        [key]: value
-    };
-}
-function extendRequestBody(req, key, value) {
-    if (hasRequestBody(req)) {
-        const body = useRequestBody(req);
-        // body can not be merged :/
-        if (!isObject(body)) {
-            return;
-        }
-        if (isObject(key)) {
-            req[BodySymbol] = smob.merge({}, key, body);
-        } else {
-            body[key] = value;
-            req[BodySymbol] = body;
-        }
-        return;
-    }
-    if (isObject(key)) {
-        setRequestBody(req, key);
-        return;
-    }
-    setRequestBody(req, key, value);
-}
-
-function isRequestCacheable(req, modifiedTime) {
-    const modifiedSince = req.headers[exports.HeaderName.IF_MODIFIED_SINCE];
-    if (!modifiedSince) {
-        return false;
-    }
-    modifiedTime = typeof modifiedTime === 'string' ? new Date(modifiedTime) : modifiedTime;
-    return new Date(modifiedSince) >= modifiedTime;
-}
-
-const CookieSymbol = Symbol.for('ReqCookie');
-function useRequestCookies(req) {
-    if (CookieSymbol in req) {
-        return req[CookieSymbol];
-    }
-    return {};
-}
-function hasRequestCookies(req) {
-    return CookieSymbol in req && isObject(req[CookieSymbol]);
-}
-function useRequestCookie(req, name) {
-    return useRequestCookies(req)[name];
-}
-function setRequestCookies(req, key, value) {
-    if (isObject(key)) {
-        req[CookieSymbol] = key;
-        return;
-    }
-    req[CookieSymbol] = {
-        [key]: value
-    };
-}
-function extendRequestCookies(req, key, value) {
-    if (hasRequestCookies(req)) {
-        const cookies = useRequestCookies(req);
-        if (isObject(key)) {
-            req[CookieSymbol] = smob.merge({}, key, cookies);
-        } else {
-            cookies[key] = value;
-            req[CookieSymbol] = cookies;
-        }
-        req[CookieSymbol] = smob.merge(req[CookieSymbol], cookies);
-        return;
-    }
-    if (isObject(key)) {
-        setRequestCookies(req, key);
-        return;
-    }
-    setRequestCookies(req, key, value);
-}
-
-const envSymbol = Symbol.for('ReqEnv');
-function setRequestEnv(req, key, value) {
-    if (envSymbol in req) {
-        if (typeof key === 'object') {
-            if (value) {
-                req[envSymbol] = smob.merge(req[envSymbol], key);
-            } else {
-                req[envSymbol] = key;
-            }
-        } else {
-            req[envSymbol][key] = value;
-        }
-        return;
-    }
-    if (typeof key === 'object') {
-        req[envSymbol] = key;
-        return;
-    }
-    req[envSymbol] = {
-        [key]: value
-    };
-}
-function useRequestEnv(req, key) {
-    if (envSymbol in req) {
-        if (typeof key === 'string') {
-            return req[envSymbol][key];
-        }
-        return req[envSymbol];
-    }
-    if (typeof key === 'string') {
-        return undefined;
-    }
-    return {};
-}
-function unsetRequestEnv(req, key) {
-    if (envSymbol in req) {
-        if (smob.hasOwnProperty(req[envSymbol], key)) {
-            delete req[envSymbol][key];
-        }
-    }
-}
-
-function getRequestHeader(req, name) {
-    return req.headers[name];
-}
-function setRequestHeader(req, name, value) {
-    req.headers[name] = value;
-}
-
 const NegotiatorSymbol = Symbol.for('ReqNegotiator');
 function useRequestNegotiator(req) {
     if (NegotiatorSymbol in req) {
@@ -775,52 +679,6 @@ function getRequestProtocol(req, options) {
     return index !== -1 ? header.substring(0, index).trim() : header.trim();
 }
 
-const QuerySymbol = Symbol.for('ReqQuery');
-function useRequestQuery(req, key) {
-    /* istanbul ignore if  */ if ('query' in req) {
-        if (typeof key === 'string') {
-            return req.query[key];
-        }
-        return req.query;
-    }
-    if (QuerySymbol in req) {
-        if (typeof key === 'string') {
-            return req[QuerySymbol][key];
-        }
-        return req[QuerySymbol];
-    }
-    return typeof key === 'string' ? undefined : {};
-}
-function hasRequestQuery(req) {
-    return QuerySymbol in req && isObject(req[QuerySymbol]) || 'query' in req && isObject(req.query);
-}
-function setRequestQuery(req, key, value) {
-    if (isObject(key)) {
-        req[QuerySymbol] = key;
-        return;
-    }
-    req[QuerySymbol] = {
-        [key]: value
-    };
-}
-function extendRequestQuery(req, key, value) {
-    if (hasRequestQuery(req)) {
-        const query = useRequestQuery(req);
-        if (isObject(key)) {
-            req[QuerySymbol] = smob.merge({}, key, query);
-        } else {
-            query[key] = value;
-            req[QuerySymbol] = query;
-        }
-        return;
-    }
-    if (isObject(key)) {
-        setRequestQuery(req, key);
-        return;
-    }
-    setRequestQuery(req, key, value);
-}
-
 function createRequest(context) {
     let readable;
     if (context.body) {
@@ -1791,14 +1649,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 +1887,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 +1911,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;
@@ -2115,9 +1972,6 @@ exports.dispatchNodeRequest = dispatchNodeRequest;
 exports.dispatchRawRequest = dispatchRawRequest;
 exports.dispatchWebRequest = dispatchWebRequest;
 exports.errorHandler = errorHandler;
-exports.extendRequestBody = extendRequestBody;
-exports.extendRequestCookies = extendRequestCookies;
-exports.extendRequestQuery = extendRequestQuery;
 exports.getRequestAcceptableCharset = getRequestAcceptableCharset;
 exports.getRequestAcceptableCharsets = getRequestAcceptableCharsets;
 exports.getRequestAcceptableContentType = getRequestAcceptableContentType;
@@ -2130,14 +1984,11 @@ exports.getRequestHeader = getRequestHeader;
 exports.getRequestHostName = getRequestHostName;
 exports.getRequestIP = getRequestIP;
 exports.getRequestProtocol = getRequestProtocol;
-exports.hasRequestBody = hasRequestBody;
-exports.hasRequestCookies = hasRequestCookies;
-exports.hasRequestQuery = hasRequestQuery;
 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;
@@ -2152,29 +2003,22 @@ exports.sendRedirect = sendRedirect;
 exports.sendStream = sendStream;
 exports.sendWebBlob = sendWebBlob;
 exports.sendWebResponse = sendWebResponse;
-exports.setRequestBody = setRequestBody;
-exports.setRequestCookies = setRequestCookies;
 exports.setRequestEnv = setRequestEnv;
 exports.setRequestHeader = setRequestHeader;
 exports.setRequestMountPath = setRequestMountPath;
 exports.setRequestParam = setRequestParam;
 exports.setRequestParams = setRequestParams;
-exports.setRequestQuery = setRequestQuery;
 exports.setRequestRouterPath = setRequestRouterPath;
 exports.setResponseCacheHeaders = setResponseCacheHeaders;
 exports.setResponseContentTypeByFileName = setResponseContentTypeByFileName;
 exports.setResponseHeaderAttachment = setResponseHeaderAttachment;
 exports.setResponseHeaderContentType = setResponseHeaderContentType;
 exports.unsetRequestEnv = unsetRequestEnv;
-exports.useRequestBody = useRequestBody;
-exports.useRequestCookie = useRequestCookie;
-exports.useRequestCookies = useRequestCookies;
 exports.useRequestEnv = useRequestEnv;
 exports.useRequestMountPath = useRequestMountPath;
 exports.useRequestNegotiator = useRequestNegotiator;
 exports.useRequestParam = useRequestParam;
 exports.useRequestParams = useRequestParams;
 exports.useRequestPath = useRequestPath;
-exports.useRequestQuery = useRequestQuery;
 exports.useRequestRouterPath = useRequestRouterPath;
 //# sourceMappingURL=index.cjs.map