routup 3.3.0 → 4.0.0

package/dist/adapters/node/module.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { RequestListener } from 'node:http';
 import type { Request } from '../../request';
 import type { Response } from '../../response';

package/dist/handler/module.d.ts

@@ -12,7 +12,7 @@ export declare class Handler implements Dispatcher {
     protected _method: MethodName | undefined;
     constructor(handler: HandlerConfig);
     get type(): "error" | "core";
-    get path(): Path | undefined;
+    get path(): string | undefined;
     get method(): MethodName | undefined;
     dispatch(event: DispatchEvent): Promise<void>;
     matchPath(path: string): boolean;

package/dist/index.cjs

@@ -64,55 +64,6 @@ function isRequestCacheable(req, 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.
@@ -188,6 +139,12 @@ function setRequestHeader(req, name, value) {
 function isObject(item) {
     return !!item && typeof item === 'object' && !Array.isArray(item);
 }
+function setProperty(record, property, value) {
+    record[property] = value;
+}
+function getProperty(req, property) {
+    return req[property];
+}
 
 /**
  * Determine if object is a Stats object.
@@ -324,7 +281,7 @@ function basename(input, extension) {
     if (!lastSegment) {
         return input;
     }
-    return extension && lastSegment.endsWith(extension) ? lastSegment.slice(0, -extension.length) : lastSegment;
+    return lastSegment;
 }
 
 function isPromise(p) {
@@ -380,12 +337,66 @@ function isWebResponse(input) {
     return typeof Response !== 'undefined' && input instanceof Response;
 }
 
-const NegotiatorSymbol = Symbol.for('ReqNegotiator');
+const symbol$4 = Symbol.for('ReqEnv');
+function setRequestEnv(req, key, value) {
+    const propertyValue = getProperty(req, symbol$4);
+    if (propertyValue) {
+        if (typeof key === 'object') {
+            if (value) {
+                setProperty(req, symbol$4, smob.merge(propertyValue, key));
+            } else {
+                setProperty(req, symbol$4, key);
+            }
+        } else {
+            propertyValue[key] = value;
+            setProperty(req, symbol$4, propertyValue);
+        }
+        return;
+    }
+    if (typeof key === 'object') {
+        setProperty(req, symbol$4, key);
+        return;
+    }
+    setProperty(req, symbol$4, {
+        [key]: value
+    });
+}
+function useRequestEnv(req, key) {
+    const propertyValue = getProperty(req, symbol$4);
+    if (propertyValue) {
+        if (typeof key !== 'undefined') {
+            return propertyValue[key];
+        }
+        return propertyValue;
+    }
+    if (typeof key !== 'undefined') {
+        return undefined;
+    }
+    return {};
+}
+function unsetRequestEnv(req, key) {
+    const propertyValue = getProperty(req, symbol$4);
+    if (smob.hasOwnProperty(propertyValue, key)) {
+        delete propertyValue[key];
+    }
+}
+
+function getRequestHeader(req, name) {
+    return req.headers[name];
+}
+function setRequestHeader(req, name, value) {
+    req.headers[name] = value;
+}
+
+const symbol$3 = Symbol.for('ReqNegotiator');
 function useRequestNegotiator(req) {
-    if (NegotiatorSymbol in req) {
-        return req[NegotiatorSymbol];
+    let value = getProperty(req, symbol$3);
+    if (value) {
+        return value;
     }
-    return new Negotiator(req);
+    value = new Negotiator(req);
+    setProperty(req, symbol$3, value);
+    return value;
 }
 
 function getRequestAcceptableContentTypes(req) {
@@ -513,13 +524,10 @@ function findRouterOption(key, path) {
 
 const routerSymbol = Symbol.for('ReqRouterID');
 function setRequestRouterPath(req, path) {
-    req[routerSymbol] = path;
+    setProperty(req, routerSymbol, path);
 }
 function useRequestRouterPath(req) {
-    if (routerSymbol in req) {
-        return req[routerSymbol];
-    }
-    return undefined;
+    return getProperty(req, routerSymbol);
 }
 
 function getRequestHostName(req, options) {
@@ -564,32 +572,23 @@ function getRequestIP(req, options) {
     return addrs[addrs.length - 1];
 }
 
-const ReqMountPathSymbol = Symbol.for('ReqMountPath');
+const symbol$2 = Symbol.for('ReqMountPath');
 function useRequestMountPath(req) {
-    if (ReqMountPathSymbol in req) {
-        return req[ReqMountPathSymbol];
-    }
-    return '/';
+    return getProperty(req, symbol$2) || '/';
 }
 function setRequestMountPath(req, basePath) {
-    req[ReqMountPathSymbol] = basePath;
+    setProperty(req, symbol$2, basePath);
 }
 
-const ParamsSymbol = Symbol.for('ReqParams');
+const symbol$1 = Symbol.for('ReqParams');
 function useRequestParams(req) {
-    /* istanbul ignore next */ if ('params' in req) {
-        return req.params;
-    }
-    if (ParamsSymbol in req) {
-        return req[ParamsSymbol];
-    }
-    return {};
+    return getProperty(req, symbol$1) || getProperty(req, 'params') || {};
 }
 function useRequestParam(req, key) {
     return useRequestParams(req)[key];
 }
 function setRequestParams(req, data) {
-    req[ParamsSymbol] = data;
+    setProperty(req, symbol$1, data);
 }
 function setRequestParam(req, key, value) {
     const params = useRequestParams(req);
@@ -599,18 +598,16 @@ function setRequestParam(req, key, value) {
 
 const PathSymbol = Symbol.for('ReqPath');
 function useRequestPath(req) {
-    if ('path' in req) {
-        return req.path;
-    }
-    if (PathSymbol in req) {
-        return req[PathSymbol];
+    const path = getProperty(req, 'path') || getProperty(req, PathSymbol);
+    if (path) {
+        return path;
     }
     if (typeof req.url === 'undefined') {
         return '/';
     }
     const parsed = new URL(req.url, 'http://localhost/');
-    req[PathSymbol] = parsed.pathname;
-    return req[PathSymbol];
+    setProperty(req, PathSymbol, parsed.pathname);
+    return parsed.pathname;
 }
 
 function getRequestProtocol(req, options) {
@@ -757,18 +754,15 @@ function setResponseCacheHeaders(res, options) {
     res.setHeader('cache-control', cacheControls.join(', '));
 }
 
-const GoneSymbol = Symbol.for('ResGone');
+const symbol = Symbol.for('ResGone');
 function isResponseGone(res) {
     if (res.headersSent || res.writableEnded) {
         return true;
     }
-    if (GoneSymbol in res) {
-        return res[GoneSymbol];
-    }
-    return false;
+    return getProperty(res, symbol) ?? false;
 }
 function setResponseGone(res, value) {
-    res[GoneSymbol] = value;
+    setProperty(res, symbol, value);
 }
 
 function serializeEventStreamMessage(message) {
@@ -1730,12 +1724,14 @@ class PathMatcher {
         this.regexpKeys = [];
         this.path = path;
         this.regexpOptions = options || {};
-        this.regexp = pathToRegexp.pathToRegexp(path, this.regexpKeys, options);
+        const regexp = pathToRegexp.pathToRegexp(path, options);
+        this.regexp = regexp;
+        this.regexpKeys = regexp.keys;
     }
 }
 
 function isPath(input) {
-    return typeof input === 'string' || input instanceof RegExp;
+    return typeof input === 'string';
 }
 
 class Handler {
@@ -1928,15 +1924,9 @@ class Router {
             this.pathMatcher = undefined;
             return;
         }
-        if (typeof value === 'string') {
-            this.pathMatcher = new PathMatcher(withLeadingSlash(withoutTrailingSlash(`${value}`)), {
-                end: false
-            });
-        } else {
-            this.pathMatcher = new PathMatcher(value, {
-                end: false
-            });
-        }
+        this.pathMatcher = new PathMatcher(withLeadingSlash(withoutTrailingSlash(`${value}`)), {
+            end: false
+        });
     }
     // --------------------------------------------------
     async executePipelineStep(context) {
@@ -2158,11 +2148,7 @@ class Router {
         for(let i = 0; i < input.length; i++){
             const item = input[i];
             if (isPath(item)) {
-                if (typeof item === 'string') {
-                    path = withLeadingSlash(item);
-                } else {
-                    path = item;
-                }
+                path = withLeadingSlash(item);
                 continue;
             }
             if (isRouterInstance(item)) {