@aeriajs/http 0.0.40 → 0.0.41

package/dist/routing.d.ts

@@ -8,7 +8,7 @@ export type Middleware = (context: RouteContext) => any;
 export type RouteGroupOptions = {
     base?: RouteUri;
 };
-type TypedContext<TContractWithRoles extends ContractWithRoles> = RouteContext & {
+type TypedContext<TContractWithRoles extends ContractWithRoles> = RouteContext<number extends keyof TContractWithRoles['roles'] ? TContractWithRoles['roles'][number] : string> & {
     request: Omit<RouteContext['request'], 'payload' | 'query'> & {
         payload: TContractWithRoles extends {
             payload: infer Payload;
@@ -33,7 +33,7 @@ export declare const wrapRouteExecution: (res: GenericResponse, cb: () => any |
 export declare const createRouter: (options?: Partial<RouterOptions>) => ProxiedRouter<{
     route: <const TContractWithRoles extends ContractWithRoles, TCallback extends (TContractWithRoles extends {
         response: infer Response;
-    } ? InferResponse<Response> : any) extends infer Response_1 ? TContractWithRoles["roles"] extends unknown[] ? TContractWithRoles["roles"][number] extends infer Role ? "guest" extends Role ? (context: TypedContext<TContractWithRoles>) => Response_1 : (context: RouteContext & {
+    } ? InferResponse<Response> : any) extends infer Response_1 ? TContractWithRoles["roles"] extends unknown[] ? TContractWithRoles["roles"][number] extends infer Role ? "guest" extends Role ? (context: TypedContext<TContractWithRoles>) => Response_1 : (context: RouteContext<number extends keyof TContractWithRoles["roles"] ? TContractWithRoles["roles"][keyof TContractWithRoles["roles"] & number] : string> & {
         request: Omit<GenericRequest, "payload" | "query"> & {
             payload: TContractWithRoles extends {
                 payload: infer Payload;

package/dist/routing.js

@@ -24,10 +24,10 @@ const unsufficientRoles = (context) => {
     };
 };
 const matches = (req, method, exp, options, config) => {
-    const base = config?.apiBase && config.apiBase !== '/'
+    const base = config?.baseUrl && config.baseUrl !== '/'
         ? options.base
-            ? `${config.apiBase}${options.base}`
-            : config.apiBase
+            ? `${config.baseUrl}${options.base}`
+            : config.baseUrl
         : options.base
             ? options.base
             : '';
@@ -174,9 +174,9 @@ const createRouter = (options = {}) => {
             newOptions.base = base && base !== '/'
                 ? `${base}${exp}`
                 : exp;
-            const match = (0, exports.matches)(context.request, null, config.apiBase === '/'
+            const match = (0, exports.matches)(context.request, null, config.baseUrl === '/'
                 ? new RegExp(`^${newOptions.base}/`)
-                : new RegExp(`^${config.apiBase}${newOptions.base}/`), newOptions);
+                : new RegExp(`^${config.baseUrl}${newOptions.base}/`), newOptions);
             if (match) {
                 if (middleware) {
                     const result = await middleware(context);

package/dist/routing.mjs

@@ -22,7 +22,7 @@ const unsufficientRoles = (context) => {
   };
 };
 export const matches = (req, method, exp, options, config) => {
-  const base = config?.apiBase && config.apiBase !== "/" ? options.base ? `${config.apiBase}${options.base}` : config.apiBase : options.base ? options.base : "";
+  const base = config?.baseUrl && config.baseUrl !== "/" ? options.base ? `${config.baseUrl}${options.base}` : config.baseUrl : options.base ? options.base : "";
   if (method && method !== req.method) {
     if (!Array.isArray(method) || !method.includes(req.method)) {
       return;
@@ -169,7 +169,7 @@ export const createRouter = (options = {}) => {
       const match = matches(
         context.request,
         null,
-        config.apiBase === "/" ? new RegExp(`^${newOptions.base}/`) : new RegExp(`^${config.apiBase}${newOptions.base}/`),
+        config.baseUrl === "/" ? new RegExp(`^${newOptions.base}/`) : new RegExp(`^${config.baseUrl}${newOptions.base}/`),
         newOptions
       );
       if (match) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/http",
-  "version": "0.0.40",
+  "version": "0.0.41",
   "description": "## Installation",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -22,18 +22,18 @@
     "dist"
   ],
   "devDependencies": {
-    "@aeriajs/access-control": "^0.0.32",
-    "@aeriajs/common": "^0.0.32",
-    "@aeriajs/entrypoint": "^0.0.32",
-    "@aeriajs/types": "^0.0.29",
-    "@aeriajs/validation": "^0.0.35"
+    "@aeriajs/access-control": "^0.0.33",
+    "@aeriajs/common": "^0.0.33",
+    "@aeriajs/entrypoint": "^0.0.33",
+    "@aeriajs/types": "^0.0.30",
+    "@aeriajs/validation": "^0.0.36"
   },
   "peerDependencies": {
-    "@aeriajs/access-control": "^0.0.32",
-    "@aeriajs/common": "^0.0.32",
-    "@aeriajs/entrypoint": "^0.0.32",
-    "@aeriajs/types": "^0.0.29",
-    "@aeriajs/validation": "^0.0.35"
+    "@aeriajs/access-control": "^0.0.33",
+    "@aeriajs/common": "^0.0.33",
+    "@aeriajs/entrypoint": "^0.0.33",
+    "@aeriajs/types": "^0.0.30",
+    "@aeriajs/validation": "^0.0.36"
   },
   "scripts": {
     "test": "echo skipping",