routup 1.0.0-alpha.3 → 1.0.0-alpha.5

package/dist/helpers/index.d.ts

@@ -1,3 +1,2 @@
 export * from './request';
 export * from './response';
-export * from './type';

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

@@ -1,8 +1,6 @@
-/// <reference types="node" />
-import type { IncomingMessage } from 'node:http';
-import type { RequestFn } from '../type';
-export declare function setRequestCookieFn(fn: RequestFn): void;
-export declare function useRequestCookies(req: IncomingMessage): Record<string, string>;
-export declare function hasRequestCookies(req: IncomingMessage): boolean;
-export declare function useRequestCookie(req: IncomingMessage, name: string): string | undefined;
-export declare function setRequestCookies(req: IncomingMessage, record: Record<string, any>, mergeIt?: boolean): void;
+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, record: Record<string, any>): void;
+export declare function extendRequestCookies(req: Request, record: Record<string, any>): void;

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

@@ -1,8 +1,8 @@
 import type { Request } from '../../type';
-import type { RequestFn } from '../type';
-export declare function setRequestQueryFn(fn: RequestFn): void;
 export declare function useRequestQuery(req: Request): Record<string, any>;
 export declare function useRequestQuery(req: Request, key: string): any;
 export declare function hasRequestQuery(req: Request): boolean;
 export declare function setRequestQuery(req: Request, key: string, value: unknown): void;
-export declare function setRequestQuery(req: Request, record: Record<string, any>, append?: boolean): void;
+export declare function setRequestQuery(req: Request, record: Record<string, any>): void;
+export declare function extendRequestQuery(req: Request, key: string, value: unknown): void;
+export declare function extendRequestQuery(req: Request, record: Record<string, any>): void;

package/dist/helpers/response/send-format.d.ts

@@ -1,6 +1,7 @@
 import type { Response } from '../../type';
-export type ResponseFormat = {
+type ResponseFormats = {
     default: () => void;
     [key: string]: () => void;
 };
-export declare function sendFormat(res: Response, input: ResponseFormat): void;
+export declare function sendFormat(res: Response, input: ResponseFormats): void;
+export {};

package/dist/index.cjs

@@ -360,14 +360,7 @@ function setRequestBody(req, key, value) {
 }
 
 const CookieSymbol = Symbol.for('ReqCookie');
-let requestFn$1;
-function setRequestCookieFn(fn) {
-    requestFn$1 = fn;
-}
 function useRequestCookies(req) {
-    if (!(CookieSymbol in req) && typeof requestFn$1 !== 'undefined') {
-        req[CookieSymbol] = requestFn$1(req);
-    }
     if (CookieSymbol in req) {
         return req[CookieSymbol];
     }
@@ -379,11 +372,12 @@ function hasRequestCookies(req) {
 function useRequestCookie(req, name) {
     return useRequestCookies(req)[name];
 }
-function setRequestCookies(req, record, mergeIt) {
+function setRequestCookies(req, record) {
+    req[CookieSymbol] = record;
+}
+function extendRequestCookies(req, record) {
     if (CookieSymbol in req) {
-        if (mergeIt) {
-            req[CookieSymbol] = smob.merge(req[CookieSymbol], record);
-        }
+        req[CookieSymbol] = smob.merge(req[CookieSymbol], record);
         return;
     }
     req[CookieSymbol] = record;
@@ -612,7 +606,7 @@ function setRequestMountPath(req, basePath) {
  * view the LICENSE file that was distributed with this source code.
  */ const ParamsSymbol = Symbol.for('ReqParams');
 function useRequestParams(req) {
-    if ('params' in req) {
+    /* istanbul ignore next */ if ('params' in req) {
         return req.params;
     }
     if (ParamsSymbol in req) {
@@ -673,10 +667,6 @@ function getRequestProtocol(req, options) {
 }
 
 const QuerySymbol = Symbol.for('ReqQuery');
-let requestFn;
-function setRequestQueryFn(fn) {
-    requestFn = fn;
-}
 function useRequestQuery(req, key) {
     /* istanbul ignore if  */ if ('query' in req) {
         if (typeof key === 'string') {
@@ -684,9 +674,6 @@ function useRequestQuery(req, key) {
         }
         return req.query;
     }
-    if (!(QuerySymbol in req) && typeof requestFn !== 'undefined') {
-        req[QuerySymbol] = requestFn(req);
-    }
     if (QuerySymbol in req) {
         if (typeof key === 'string') {
             return req[QuerySymbol][key];
@@ -699,25 +686,28 @@ function hasRequestQuery(req) {
     return QuerySymbol in req && isObject(req[QuerySymbol]);
 }
 function setRequestQuery(req, key, value) {
+    if (isObject(key)) {
+        req[QuerySymbol] = key;
+        return;
+    }
+    req[QuerySymbol] = {
+        [key]: value
+    };
+}
+function extendRequestQuery(req, key, value) {
     if (QuerySymbol in req) {
-        if (typeof key === 'object') {
-            if (value) {
-                req[QuerySymbol] = smob.merge(req[QuerySymbol], key);
-            } else {
-                req[QuerySymbol] = key;
-            }
+        if (isObject(key)) {
+            req[QuerySymbol] = smob.merge(req[QuerySymbol], key);
         } else {
             req[QuerySymbol][key] = value;
         }
         return;
     }
-    if (typeof key === 'object') {
-        req[QuerySymbol] = key;
+    if (isObject(key)) {
+        setRequestQuery(req, key);
         return;
     }
-    req[QuerySymbol] = {
-        [key]: value
-    };
+    setRequestQuery(req, key, value);
 }
 
 /*
@@ -1564,6 +1554,8 @@ exports.buildTrustProxyFn = buildTrustProxyFn;
 exports.cleanDoubleSlashes = cleanDoubleSlashes;
 exports.createEtag = createEtag;
 exports.createRequestTimeout = createRequestTimeout;
+exports.extendRequestCookies = extendRequestCookies;
+exports.extendRequestQuery = extendRequestQuery;
 exports.generateETag = generateETag;
 exports.getCharsetForMimeType = getCharsetForMimeType;
 exports.getConfigOption = getConfigOption;
@@ -1605,7 +1597,6 @@ exports.sendStream = sendStream;
 exports.setConfig = setConfig;
 exports.setConfigOption = setConfigOption;
 exports.setRequestBody = setRequestBody;
-exports.setRequestCookieFn = setRequestCookieFn;
 exports.setRequestCookies = setRequestCookies;
 exports.setRequestEnv = setRequestEnv;
 exports.setRequestHeader = setRequestHeader;
@@ -1613,7 +1604,6 @@ exports.setRequestMountPath = setRequestMountPath;
 exports.setRequestParam = setRequestParam;
 exports.setRequestParams = setRequestParams;
 exports.setRequestQuery = setRequestQuery;
-exports.setRequestQueryFn = setRequestQueryFn;
 exports.setResponseCacheHeaders = setResponseCacheHeaders;
 exports.setResponseContentTypeByFileName = setResponseContentTypeByFileName;
 exports.setResponseHeaderAttachment = setResponseHeaderAttachment;