@aeriajs/http 0.0.59 → 0.0.61

package/dist/routing.d.ts

@@ -1,4 +1,4 @@
-import type { RouteContext, GenericRequest, GenericResponse, RequestMethod, RouteUri, InferProperty, InferResponse, PackReferences, ContractWithRoles, ApiConfig, UserRole } from '@aeriajs/types';
+import type { RouteContext, GenericRequest, GenericResponse, RequestMethod, RouteUri, InferProperty, InferResponse, PackReferences, ContractWithRoles, ApiConfig, RoleFromAccessCondition } from '@aeriajs/types';
 export type RouterOptions = {
     exhaust?: boolean;
     base?: RouteUri;
@@ -8,7 +8,7 @@ export type Middleware = (context: RouteContext) => any;
 export type RouteGroupOptions = {
     base?: RouteUri;
 };
-type TypedContext<TContractWithRoles extends ContractWithRoles> = RouteContext<TContractWithRoles['roles'] extends infer AccessCondition ? number extends keyof AccessCondition ? AccessCondition[number] : AccessCondition extends true ? UserRole : AccessCondition extends false ? never : AccessCondition extends 'unauthenticated-only' ? 'guest' : AccessCondition extends 'unauthenticated' ? UserRole : null : never> & {
+type TypedContext<TContractWithRoles extends ContractWithRoles> = RouteContext<RoleFromAccessCondition<TContractWithRoles['roles']>> & {
     request: Omit<RouteContext['request'], 'payload' | 'query'> & {
         payload: TContractWithRoles extends {
             payload: infer Payload;
@@ -20,11 +20,7 @@ type TypedContext<TContractWithRoles extends ContractWithRoles> = RouteContext<T
 };
 export type ProxiedRouter<TRouter> = TRouter & Record<RequestMethod, <const TContractWithRoles extends ContractWithRoles, TCallback extends (TContractWithRoles extends {
     response: infer Response;
-} ? InferResponse<Response> : any) extends infer Response ? TContractWithRoles['roles'] extends infer AccessCondition ? AccessCondition extends true ? (context: TypedContext<TContractWithRoles> & {
-    token: {
-        authenticated: true;
-    };
-}) => Response : (context: TypedContext<TContractWithRoles>) => Response : never : never>(exp: RouteUri, cb: TCallback, contract?: TContractWithRoles) => ReturnType<typeof registerRoute>>;
+} ? InferResponse<Response> : any) extends infer Response ? (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) => {
     fragments: string[];
 } | undefined;
@@ -33,20 +29,7 @@ export declare const wrapRouteExecution: (response: GenericResponse, cb: () => a
 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 infer AccessCondition ? AccessCondition extends true ? (context: RouteContext<TContractWithRoles["roles"] extends infer AccessCondition_1 ? number extends keyof AccessCondition_1 ? AccessCondition_1[number] : AccessCondition_1 extends true ? any : AccessCondition_1 extends false ? never : AccessCondition_1 extends "unauthenticated-only" ? "guest" : AccessCondition_1 extends "unauthenticated" ? any : null : never> & {
-        request: Omit<GenericRequest, "payload" | "query"> & {
-            payload: TContractWithRoles extends {
-                payload: infer Payload;
-            } ? PackReferences<InferProperty<Payload>> : any;
-            query: TContractWithRoles extends {
-                query: infer Query;
-            } ? InferProperty<Query> : any;
-        };
-    } & {
-        token: {
-            authenticated: true;
-        };
-    }) => Response_1 : (context: TypedContext<TContractWithRoles>) => Response_1 : never : never>(method: RequestMethod | RequestMethod[], exp: RouteUri, cb: TCallback, contract?: TContractWithRoles) => void;
+    } ? InferResponse<Response> : any) extends infer Response_1 ? (context: TypedContext<TContractWithRoles>) => Response_1 : never>(method: RequestMethod | RequestMethod[], exp: RouteUri, cb: TCallback, contract?: TContractWithRoles) => void;
     routes: ((_: unknown, context: RouteContext, groupOptions?: RouteGroupOptions) => ReturnType<typeof registerRoute>)[];
     routesMeta: RoutesMeta;
     group: <TRouter extends {

package/dist/routing.js

@@ -10,20 +10,14 @@ const payload_js_1 = require("./payload.js");
 const next_js_1 = require("./next.js");
 const checkUnprocessable = (validationEither, context) => {
     if ((0, common_1.isLeft)(validationEither)) {
-        context.response.writeHead(422, {
-            'content-type': 'application/json',
+        const validationError = (0, common_1.unwrapEither)(validationEither);
+        return context.error(types_1.HTTPStatus.UnprocessableContent, {
+            code: 'UNPROCESSABLE_ENTITY',
+            message: 'the provided payload is unprocessable',
+            details: validationError,
         });
-        return validationEither;
     }
 };
-const unsufficientRoles = (context) => {
-    context.response.writeHead(403, {
-        'content-type': 'application/json',
-    });
-    return {
-        error: types_1.ACErrors.AuthorizationError,
-    };
-};
 const matches = (req, method, exp, options, config) => {
     const base = config?.baseUrl && config.baseUrl !== '/'
         ? options.base
@@ -61,8 +55,7 @@ const registerRoute = async (context, method, exp, cb, contract, options = {}) =
                 });
             }
             catch (err) {
-                return context.error({
-                    httpCode: 500,
+                return context.error(types_1.HTTPStatus.UnprocessableContent, {
                     code: 'INVALID_JSON',
                     message: 'Invalid JSON',
                 });
@@ -73,7 +66,10 @@ const registerRoute = async (context, method, exp, cb, contract, options = {}) =
             if (contract.roles) {
                 const granted = (0, common_1.isGranted)(contract.roles, context.token);
                 if (!granted) {
-                    return unsufficientRoles(context);
+                    return context.error(types_1.HTTPStatus.Unauthorized, {
+                        code: types_1.ACError.AuthorizationError,
+                        message: 'your roles dont grant access to this route',
+                    });
                 }
             }
             if ('payload' in contract && contract.payload) {
@@ -199,8 +195,7 @@ const createRouter = (options = {}) => {
     router.install = async (context, options) => {
         const result = await routerPipe(undefined, context, options);
         if (exhaust && (result === undefined || (0, next_js_1.isNext)(result))) {
-            return context.error({
-                httpCode: 404,
+            return context.error(types_1.HTTPStatus.NotFound, {
                 code: 'NOT_FOUND',
                 message: 'Not found',
             });

package/dist/routing.mjs

@@ -1,27 +1,21 @@
 "use strict";
 import { Stream } from "stream";
-import { ACErrors, REQUEST_METHODS } from "@aeriajs/types";
-import { pipe, isGranted, isLeft, deepMerge, error } from "@aeriajs/common";
+import { ACError, HTTPStatus, REQUEST_METHODS } from "@aeriajs/types";
+import { pipe, isGranted, isLeft, unwrapEither, deepMerge, error } from "@aeriajs/common";
 import { validate } from "@aeriajs/validation";
 import { getConfig } from "@aeriajs/entrypoint";
 import { safeJson } from "./payload.mjs";
 import { isNext } from "./next.mjs";
 const checkUnprocessable = (validationEither, context) => {
   if (isLeft(validationEither)) {
-    context.response.writeHead(422, {
-      "content-type": "application/json"
+    const validationError = unwrapEither(validationEither);
+    return context.error(HTTPStatus.UnprocessableContent, {
+      code: "UNPROCESSABLE_ENTITY",
+      message: "the provided payload is unprocessable",
+      details: validationError
     });
-    return validationEither;
   }
 };
-const unsufficientRoles = (context) => {
-  context.response.writeHead(403, {
-    "content-type": "application/json"
-  });
-  return {
-    error: ACErrors.AuthorizationError
-  };
-};
 export const matches = (req, method, exp, options, config) => {
   const base = config?.baseUrl && config.baseUrl !== "/" ? options.base ? `${config.baseUrl}${options.base}` : config.baseUrl : options.base ? options.base : "";
   if (method && method !== req.method) {
@@ -59,8 +53,7 @@ export const registerRoute = async (context, method, exp, cb, contract, options
           }
         );
       } catch (err) {
-        return context.error({
-          httpCode: 500,
+        return context.error(HTTPStatus.UnprocessableContent, {
           code: "INVALID_JSON",
           message: "Invalid JSON"
         });
@@ -71,7 +64,10 @@ export const registerRoute = async (context, method, exp, cb, contract, options
       if (contract.roles) {
         const granted = isGranted(contract.roles, context.token);
         if (!granted) {
-          return unsufficientRoles(context);
+          return context.error(HTTPStatus.Unauthorized, {
+            code: ACError.AuthorizationError,
+            message: "your roles dont grant access to this route"
+          });
         }
       }
       if ("payload" in contract && contract.payload) {
@@ -195,8 +191,7 @@ export const createRouter = (options = {}) => {
   router.install = async (context, options2) => {
     const result = await routerPipe(void 0, context, options2);
     if (exhaust && (result === void 0 || isNext(result))) {
-      return context.error({
-        httpCode: 404,
+      return context.error(HTTPStatus.NotFound, {
         code: "NOT_FOUND",
         message: "Not found"
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/http",
-  "version": "0.0.59",
+  "version": "0.0.61",
   "description": "## Installation",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -28,10 +28,10 @@
     "@aeriajs/validation": "link:../validation"
   },
   "peerDependencies": {
-    "@aeriajs/common": "^0.0.51",
-    "@aeriajs/entrypoint": "^0.0.51",
-    "@aeriajs/types": "^0.0.48",
-    "@aeriajs/validation": "^0.0.54"
+    "@aeriajs/common": "^0.0.53",
+    "@aeriajs/entrypoint": "^0.0.53",
+    "@aeriajs/types": "^0.0.50",
+    "@aeriajs/validation": "^0.0.56"
   },
   "scripts": {
     "test": "echo skipping",