@aeriajs/http 0.0.37 → 0.0.39

package/dist/routing.d.ts

@@ -25,7 +25,7 @@ export type ProxiedRouter<TRouter> = TRouter & Record<RequestMethod, <const TCon
         authenticated: true;
     };
 }) => Response : never : (context: TypedContext<TContractWithRoles>) => Response : never>(exp: RouteUri, cb: TCallback, contract?: TContractWithRoles) => ReturnType<typeof registerRoute>>;
-export declare const matches: <TRequest extends GenericRequest>(req: TRequest, method: RequestMethod | RequestMethod[] | null, exp: string | RegExp, options: RouterOptions, config: ApiConfig) => {
+export declare const matches: <TRequest extends GenericRequest>(req: TRequest, method: RequestMethod | RequestMethod[] | null, exp: string | RegExp, options: RouterOptions, config?: ApiConfig) => {
     fragments: string[];
 } | undefined;
 export declare const registerRoute: (context: RouteContext, method: RequestMethod | RequestMethod[], exp: RouteUri, cb: (context: RouteContext) => any, contract?: ContractWithRoles, options?: RouterOptions) => Promise<any>;

package/dist/routing.js

@@ -24,12 +24,13 @@ const unsufficientRoles = (context) => {
     };
 };
 const matches = (req, method, exp, options, config) => {
-    const { url } = req;
-    const base = `${config.apiBase}${options.base
-        ? `/${options.base}`
-        : ''}`
-        .replace('//', '/')
-        .replace(/\/$/, '');
+    const base = config?.apiBase && config.apiBase !== '/'
+        ? options.base
+            ? `${config.apiBase}${options.base}`
+            : config.apiBase
+        : options.base
+            ? options.base
+            : '';
     if (method && method !== req.method) {
         if (!Array.isArray(method) || !method.includes(req.method)) {
             return;
@@ -38,9 +39,10 @@ const matches = (req, method, exp, options, config) => {
     const regexp = exp instanceof RegExp
         ? exp
         : new RegExp(`^${base}${exp}$`);
-    const matches = url.split('?')[0].match(regexp);
-    if (matches) {
-        const fragments = matches.splice(1);
+    const url = new URL(`http://0.com${req.url}`).pathname;
+    const expMatches = url.match(regexp);
+    if (expMatches) {
+        const fragments = expMatches.splice(1);
         return {
             fragments,
         };
@@ -166,10 +168,15 @@ const createRouter = (options = {}) => {
         }
         routes.push(async (_, context, groupOptions) => {
             const config = await (0, entrypoint_1.getConfig)();
-            newOptions.base = groupOptions
-                ? `${groupOptions.base}${exp}`
-                : `${options.base}${exp}`;
-            const match = (0, exports.matches)(context.request, null, new RegExp(`^${newOptions.base}/`), newOptions, config);
+            const base = groupOptions
+                ? groupOptions.base
+                : options.base;
+            newOptions.base = base && base !== '/'
+                ? `${base}${exp}`
+                : exp;
+            const match = (0, exports.matches)(context.request, null, config.apiBase === '/'
+                ? new RegExp(`^${newOptions.base}/`)
+                : new RegExp(`^${config.apiBase}${newOptions.base}/`), newOptions);
             if (match) {
                 if (middleware) {
                     const result = await middleware(context);

package/dist/routing.mjs

@@ -22,17 +22,17 @@ const unsufficientRoles = (context) => {
   };
 };
 export const matches = (req, method, exp, options, config) => {
-  const { url } = req;
-  const base = `${config.apiBase}${options.base ? `/${options.base}` : ""}`.replace("//", "/").replace(/\/$/, "");
+  const base = config?.apiBase && config.apiBase !== "/" ? options.base ? `${config.apiBase}${options.base}` : config.apiBase : options.base ? options.base : "";
   if (method && method !== req.method) {
     if (!Array.isArray(method) || !method.includes(req.method)) {
       return;
     }
   }
   const regexp = exp instanceof RegExp ? exp : new RegExp(`^${base}${exp}$`);
-  const matches2 = url.split("?")[0].match(regexp);
-  if (matches2) {
-    const fragments = matches2.splice(1);
+  const url = new URL(`http://0.com${req.url}`).pathname;
+  const expMatches = url.match(regexp);
+  if (expMatches) {
+    const fragments = expMatches.splice(1);
     return {
       fragments
     };
@@ -164,13 +164,13 @@ export const createRouter = (options = {}) => {
     }
     routes.push(async (_, context, groupOptions) => {
       const config = await getConfig();
-      newOptions.base = groupOptions ? `${groupOptions.base}${exp}` : `${options.base}${exp}`;
+      const base = groupOptions ? groupOptions.base : options.base;
+      newOptions.base = base && base !== "/" ? `${base}${exp}` : exp;
       const match = matches(
         context.request,
         null,
-        new RegExp(`^${newOptions.base}/`),
-        newOptions,
-        config
+        config.apiBase === "/" ? new RegExp(`^${newOptions.base}/`) : new RegExp(`^${config.apiBase}${newOptions.base}/`),
+        newOptions
       );
       if (match) {
         if (middleware) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/http",
-  "version": "0.0.37",
+  "version": "0.0.39",
   "description": "## Installation",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -22,18 +22,18 @@
     "dist"
   ],
   "devDependencies": {
-    "@aeriajs/access-control": "^0.0.30",
-    "@aeriajs/common": "^0.0.30",
-    "@aeriajs/entrypoint": "^0.0.30",
-    "@aeriajs/types": "^0.0.27",
-    "@aeriajs/validation": "^0.0.33"
+    "@aeriajs/access-control": "^0.0.31",
+    "@aeriajs/common": "^0.0.31",
+    "@aeriajs/entrypoint": "^0.0.31",
+    "@aeriajs/types": "^0.0.28",
+    "@aeriajs/validation": "^0.0.34"
   },
   "peerDependencies": {
-    "@aeriajs/access-control": "^0.0.30",
-    "@aeriajs/common": "^0.0.30",
-    "@aeriajs/entrypoint": "^0.0.30",
-    "@aeriajs/types": "^0.0.27",
-    "@aeriajs/validation": "^0.0.33"
+    "@aeriajs/access-control": "^0.0.31",
+    "@aeriajs/common": "^0.0.31",
+    "@aeriajs/entrypoint": "^0.0.31",
+    "@aeriajs/types": "^0.0.28",
+    "@aeriajs/validation": "^0.0.34"
   },
   "scripts": {
     "test": "echo skipping",