routup 3.0.0-alpha.2 → 3.0.0-alpha.3

package/dist/index.mjs

@@ -77,6 +77,64 @@ function isError(input) {
     }, input);
 }
 
+function isRequestCacheable(req, modifiedTime) {
+    const modifiedSince = req.headers[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] = 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 (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.
@@ -362,160 +420,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 = 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] = 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[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] = merge({}, key, cookies);
-        } else {
-            cookies[key] = value;
-            req[CookieSymbol] = cookies;
-        }
-        req[CookieSymbol] = 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] = 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 (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) {
@@ -773,52 +677,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] = 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) {
@@ -2092,5 +1950,5 @@ class Router {
     }
 }
 
-export { ErrorProxy, HandlerType, HeaderName, Layer, MethodName, PathMatcher, Router, appendResponseHeader, appendResponseHeaderDirective, buildDispatcherMeta, cloneDispatcherMeta, cloneDispatcherMetaParams, coreHandler, createError, createNodeDispatcher, createRawDispatcher, createRequest, createResponse, createWebDispatcher, dispatchNodeRequest, dispatchRawRequest, dispatchWebRequest, errorHandler, extendRequestBody, extendRequestCookies, extendRequestQuery, getRequestAcceptableCharset, getRequestAcceptableCharsets, getRequestAcceptableContentType, getRequestAcceptableContentTypes, getRequestAcceptableEncoding, getRequestAcceptableEncodings, getRequestAcceptableLanguage, getRequestAcceptableLanguages, getRequestHeader, getRequestHostName, getRequestIP, getRequestProtocol, hasRequestBody, hasRequestCookies, hasRequestQuery, isError, isHandler, isLayerInstance, isPath, isPlugin, isRequestCacheable, isResponseGone, isRouterInstance, matchRequestContentType, mergeDispatcherMetaParams, send, sendAccepted, sendCreated, sendFile, sendFormat, sendRedirect, sendStream, sendWebBlob, sendWebResponse, setRequestBody, setRequestCookies, setRequestEnv, setRequestHeader, setRequestMountPath, setRequestParam, setRequestParams, setRequestQuery, setRequestRouterPath, setResponseCacheHeaders, setResponseContentTypeByFileName, setResponseHeaderAttachment, setResponseHeaderContentType, unsetRequestEnv, useRequestBody, useRequestCookie, useRequestCookies, useRequestEnv, useRequestMountPath, useRequestNegotiator, useRequestParam, useRequestParams, useRequestPath, useRequestQuery, useRequestRouterPath };
+export { ErrorProxy, HandlerType, HeaderName, Layer, MethodName, PathMatcher, Router, appendResponseHeader, appendResponseHeaderDirective, buildDispatcherMeta, cloneDispatcherMeta, cloneDispatcherMetaParams, coreHandler, createError, createNodeDispatcher, createRawDispatcher, createRequest, createResponse, createWebDispatcher, dispatchNodeRequest, dispatchRawRequest, dispatchWebRequest, errorHandler, getRequestAcceptableCharset, getRequestAcceptableCharsets, getRequestAcceptableContentType, getRequestAcceptableContentTypes, getRequestAcceptableEncoding, getRequestAcceptableEncodings, getRequestAcceptableLanguage, getRequestAcceptableLanguages, getRequestHeader, getRequestHostName, getRequestIP, getRequestProtocol, isError, isHandler, isLayerInstance, isPath, isPlugin, isRequestCacheable, isResponseGone, isRouterInstance, matchRequestContentType, mergeDispatcherMetaParams, send, sendAccepted, sendCreated, sendFile, sendFormat, sendRedirect, sendStream, sendWebBlob, sendWebResponse, setRequestEnv, setRequestHeader, setRequestMountPath, setRequestParam, setRequestParams, setRequestRouterPath, setResponseCacheHeaders, setResponseContentTypeByFileName, setResponseHeaderAttachment, setResponseHeaderContentType, unsetRequestEnv, useRequestEnv, useRequestMountPath, useRequestNegotiator, useRequestParam, useRequestParams, useRequestPath, useRequestRouterPath };
 //# sourceMappingURL=index.mjs.map