routup 1.0.0-alpha.5 → 1.0.0-alpha.6

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

@@ -323,20 +323,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,6 +335,27 @@ 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.
@@ -372,15 +384,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;
     }
-    req[CookieSymbol] = record;
+    if (isObject(key)) {
+        setRequestCookies(req, key);
+        return;
+    }
+    setRequestCookies(req, key, value);
 }
 
 const envSymbol = Symbol.for('ReqEnv');
@@ -680,10 +709,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 +724,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;
     }
@@ -1554,6 +1585,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 +1605,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;