routup 1.0.0-alpha.5 → 1.0.0

package/dist/constants.d.ts

@@ -23,6 +23,7 @@ export declare enum HeaderName {
     COOKIE = "cookie",
     ETag = "etag",
     HOST = "host",
+    IF_MODIFIED_SINCE = "if-modified-since",
     IF_NONE_MATCH = "if-none-match",
     LAST_MODIFIED = "last-modified",
     LOCATION = "location",

package/dist/helpers/request/body.d.ts

@@ -1,5 +1,8 @@
 import type { Request } from '../../type';
 export declare function useRequestBody(req: Request): Record<string, any>;
 export declare function useRequestBody(req: Request, key: string): any | undefined;
+export declare function hasRequestBody(req: Request): boolean;
 export declare function setRequestBody(req: Request, key: string, value: unknown): void;
-export declare function setRequestBody(req: Request, record: Record<string, any>, append?: boolean): void;
+export declare function setRequestBody(req: Request, record: Record<string, any>): void;
+export declare function extendRequestBody(req: Request, key: string, value: unknown): void;
+export declare function extendRequestBody(req: Request, record: Record<string, any>): void;

package/dist/helpers/request/cookie.d.ts

@@ -2,5 +2,7 @@ import type { Request } from '../../type';
 export declare function useRequestCookies(req: Request): Record<string, string>;
 export declare function hasRequestCookies(req: Request): boolean;
 export declare function useRequestCookie(req: Request, name: string): string | undefined;
+export declare function setRequestCookies(req: Request, key: string, value: unknown): void;
 export declare function setRequestCookies(req: Request, record: Record<string, any>): void;
+export declare function extendRequestCookies(req: Request, key: string, value: string): void;
 export declare function extendRequestCookies(req: Request, record: Record<string, any>): void;

package/dist/index.cjs

@@ -55,12 +55,7 @@ var node_http = require('node:http');
     return weak ? `W/${tag}` : tag;
 }
 
-/*
- * Copyright (c) 2022-2023.
- * Author Peter Placzek (tada5hi)
- * For the full copyright and license information,
- * view the LICENSE file that was distributed with this source code.
- */ function isObject(item) {
+function isObject(item) {
     return !!item && typeof item === 'object' && !Array.isArray(item);
 }
 
@@ -106,12 +101,7 @@ function buildTrustProxyFn(input) {
     return proxyAddr.compile(input || []);
 }
 
-/*
- * Copyright (c) 2022-2022.
- * Author Peter Placzek (tada5hi)
- * For the full copyright and license information,
- * view the LICENSE file that was distributed with this source code.
- */ function isInstance(input, name) {
+function isInstance(input, name) {
     return typeof input === 'object' && input !== null && input['@instanceof'] === Symbol.for(name);
 }
 
@@ -132,12 +122,7 @@ function getCharsetForMimeType(type) {
     return undefined;
 }
 
-/*
- * Copyright (c) 2022.
- * Author Peter Placzek (tada5hi)
- * For the full copyright and license information,
- * view the LICENSE file that was distributed with this source code.
- */ function isPath(input) {
+function isPath(input) {
     return typeof input === 'string' || input instanceof RegExp;
 }
 
@@ -167,12 +152,7 @@ function isPromise(p) {
     });
 }
 
-/*
- * Copyright (c) 2022-2023.
- * Author Peter Placzek (tada5hi)
- * For the full copyright and license information,
- * view the LICENSE file that was distributed with this source code.
- */ const TRAILING_SLASH_RE = /\/$|\/\?/;
+const TRAILING_SLASH_RE = /\/$|\/\?/;
 function hasTrailingSlash(input = '', queryParams = false) {
     if (!queryParams) {
         return input.endsWith('/');
@@ -255,12 +235,7 @@ function getConfigOption(key) {
     return config.get(key);
 }
 
-/*
- * Copyright (c) 2022-2023.
- * Author Peter Placzek (tada5hi)
- * For the full copyright and license information,
- * view the LICENSE file that was distributed with this source code.
- */ exports.Method = void 0;
+exports.Method = void 0;
 (function(Method) {
     Method["GET"] = 'get';
     Method["POST"] = 'post';
@@ -287,6 +262,7 @@ exports.HeaderName = void 0;
     HeaderName["COOKIE"] = 'cookie';
     HeaderName["ETag"] = 'etag';
     HeaderName["HOST"] = 'host';
+    HeaderName["IF_MODIFIED_SINCE"] = 'if-modified-since';
     HeaderName["IF_NONE_MATCH"] = 'if-none-match';
     HeaderName["LAST_MODIFIED"] = 'last-modified';
     HeaderName["LOCATION"] = 'location';
@@ -323,20 +299,11 @@ function useRequestBody(req, key) {
     }
     return typeof key === 'string' ? undefined : {};
 }
+function hasRequestBody(req) {
+    return 'body' in req || BodySymbol in req;
+}
 function setRequestBody(req, key, value) {
-    if (BodySymbol in req) {
-        if (typeof key === 'object') {
-            if (value) {
-                req[BodySymbol] = smob.merge(req[BodySymbol], key);
-            } else {
-                req[BodySymbol] = key;
-            }
-        } else {
-            req[BodySymbol][key] = value;
-        }
-        return;
-    }
-    if (typeof key === 'object') {
+    if (isObject(key)) {
         req[BodySymbol] = key;
         return;
     }
@@ -344,14 +311,30 @@ function setRequestBody(req, key, value) {
         [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);
+}
 
-/*
- * Copyright (c) 2022.
- * Author Peter Placzek (tada5hi)
- * For the full copyright and license information,
- * view the LICENSE file that was distributed with this source code.
- */ function isRequestCacheable(req, modifiedTime) {
-    const modifiedSince = req.headers['if-modified-since'];
+function isRequestCacheable(req, modifiedTime) {
+    const modifiedSince = req.headers[exports.HeaderName.IF_MODIFIED_SINCE];
     if (!modifiedSince) {
         return false;
     }
@@ -372,15 +355,32 @@ function hasRequestCookies(req) {
 function useRequestCookie(req, name) {
     return useRequestCookies(req)[name];
 }
-function setRequestCookies(req, record) {
-    req[CookieSymbol] = record;
+function setRequestCookies(req, key, value) {
+    if (isObject(key)) {
+        req[CookieSymbol] = key;
+        return;
+    }
+    req[CookieSymbol] = {
+        [key]: value
+    };
 }
-function extendRequestCookies(req, record) {
-    if (CookieSymbol in req) {
-        req[CookieSymbol] = smob.merge(req[CookieSymbol], record);
+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;
     }
-    req[CookieSymbol] = record;
+    setRequestCookies(req, key, value);
 }
 
 const envSymbol = Symbol.for('ReqEnv');
@@ -425,12 +425,7 @@ function unsetRequestEnv(req, key) {
     }
 }
 
-/*
- * Copyright (c) 2022.
- * Author Peter Placzek (tada5hi)
- * For the full copyright and license information,
- * view the LICENSE file that was distributed with this source code.
- */ function getRequestHeader(req, name) {
+function getRequestHeader(req, name) {
     return req.headers[name];
 }
 function setRequestHeader(req, name, value) {
@@ -583,12 +578,7 @@ function getRequestIP(req, options) {
     return proxyAddr(req, trustProxy);
 }
 
-/*
- * Copyright (c) 2022.
- * Author Peter Placzek (tada5hi)
- * For the full copyright and license information,
- * view the LICENSE file that was distributed with this source code.
- */ const ReqMountPathSymbol = Symbol.for('ReqMountPath');
+const ReqMountPathSymbol = Symbol.for('ReqMountPath');
 function useRequestMountPath(req) {
     if (ReqMountPathSymbol in req) {
         return req[ReqMountPathSymbol];
@@ -599,12 +589,7 @@ function setRequestMountPath(req, basePath) {
     req[ReqMountPathSymbol] = basePath;
 }
 
-/*
- * Copyright (c) 2022.
- * Author Peter Placzek (tada5hi)
- * For the full copyright and license information,
- * view the LICENSE file that was distributed with this source code.
- */ const ParamsSymbol = Symbol.for('ReqParams');
+const ParamsSymbol = Symbol.for('ReqParams');
 function useRequestParams(req) {
     /* istanbul ignore next */ if ('params' in req) {
         return req.params;
@@ -626,15 +611,20 @@ function setRequestParam(req, key, value) {
     setRequestParams(req, params);
 }
 
+const PathSymbol = Symbol.for('ReqPath');
 function useRequestPath(req) {
     if ('path' in req) {
         return req.path;
     }
+    if (PathSymbol in req) {
+        return req[PathSymbol];
+    }
     if (typeof req.url === 'undefined') {
         return '/';
     }
     const parsed = new node_url.URL(req.url, 'http://localhost/');
-    return parsed.pathname;
+    req[PathSymbol] = parsed.pathname;
+    return req[PathSymbol];
 }
 
 function getRequestProtocol(req, options) {
@@ -680,10 +670,10 @@ function useRequestQuery(req, key) {
         }
         return req[QuerySymbol];
     }
-    return {};
+    return typeof key === 'string' ? undefined : {};
 }
 function hasRequestQuery(req) {
-    return QuerySymbol in req && isObject(req[QuerySymbol]);
+    return QuerySymbol in req && isObject(req[QuerySymbol]) || 'query' in req && isObject(req.query);
 }
 function setRequestQuery(req, key, value) {
     if (isObject(key)) {
@@ -695,11 +685,13 @@ function setRequestQuery(req, key, value) {
     };
 }
 function extendRequestQuery(req, key, value) {
-    if (QuerySymbol in req) {
+    if (hasRequestQuery(req)) {
+        const query = useRequestQuery(req);
         if (isObject(key)) {
-            req[QuerySymbol] = smob.merge(req[QuerySymbol], key);
+            req[QuerySymbol] = smob.merge({}, key, query);
         } else {
-            req[QuerySymbol][key] = value;
+            query[key] = value;
+            req[QuerySymbol] = query;
         }
         return;
     }
@@ -710,12 +702,7 @@ function extendRequestQuery(req, key, value) {
     setRequestQuery(req, key, value);
 }
 
-/*
- * Copyright (c) 2022.
- * Author Peter Placzek (tada5hi)
- * For the full copyright and license information,
- * view the LICENSE file that was distributed with this source code.
- */ function setResponseCacheHeaders(res, options) {
+function setResponseCacheHeaders(res, options) {
     options = options || {};
     const cacheControls = [
         'public'
@@ -730,12 +717,7 @@ function extendRequestQuery(req, key, value) {
     res.setHeader('cache-control', cacheControls.join(', '));
 }
 
-/*
- * Copyright (c) 2022.
- * Author Peter Placzek (tada5hi)
- * For the full copyright and license information,
- * view the LICENSE file that was distributed with this source code.
- */ function appendResponseHeader(res, name, value) {
+function appendResponseHeader(res, name, value) {
     let header = res.getHeader(name);
     if (!header) {
         res.setHeader(name, value);
@@ -927,12 +909,7 @@ function sendCreated(res, chunk) {
     return send(res, chunk);
 }
 
-/*
- * Copyright (c) 2022.
- * Author Peter Placzek (tada5hi)
- * For the full copyright and license information,
- * view the LICENSE file that was distributed with this source code.
- */ function sendStream(res, stream, fn) {
+function sendStream(res, stream, fn) {
     stream.on('open', ()=>{
         stream.pipe(res);
     });
@@ -1554,6 +1531,7 @@ exports.buildTrustProxyFn = buildTrustProxyFn;
 exports.cleanDoubleSlashes = cleanDoubleSlashes;
 exports.createEtag = createEtag;
 exports.createRequestTimeout = createRequestTimeout;
+exports.extendRequestBody = extendRequestBody;
 exports.extendRequestCookies = extendRequestCookies;
 exports.extendRequestQuery = extendRequestQuery;
 exports.generateETag = generateETag;
@@ -1573,6 +1551,7 @@ exports.getRequestHostName = getRequestHostName;
 exports.getRequestIP = getRequestIP;
 exports.getRequestProtocol = getRequestProtocol;
 exports.hasLeadingSlash = hasLeadingSlash;
+exports.hasRequestBody = hasRequestBody;
 exports.hasRequestCookies = hasRequestCookies;
 exports.hasRequestQuery = hasRequestQuery;
 exports.hasTrailingSlash = hasTrailingSlash;