@aeriajs/http 0.0.58 → 0.0.60

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

@@ -129,7 +129,7 @@ const wrapRouteExecution = async (response, cb) => {
             response.writeHead(500);
         }
         if (!response.writableEnded) {
-            return (0, common_1.endpointError)({
+            return (0, common_1.error)({
                 httpCode: 500,
                 code: 'UNKNOWN_ERROR',
                 message: 'Internal server error',

package/dist/routing.mjs

@@ -1,7 +1,7 @@
 "use strict";
 import { Stream } from "stream";
 import { ACErrors, REQUEST_METHODS } from "@aeriajs/types";
-import { pipe, isGranted, isLeft, deepMerge, endpointError } from "@aeriajs/common";
+import { pipe, isGranted, isLeft, deepMerge, error } from "@aeriajs/common";
 import { validate } from "@aeriajs/validation";
 import { getConfig } from "@aeriajs/entrypoint";
 import { safeJson } from "./payload.mjs";
@@ -76,18 +76,18 @@ export const registerRoute = async (context, method, exp, cb, contract, options
       }
       if ("payload" in contract && contract.payload) {
         const validationEither = validate(context.request.payload, contract.payload);
-        const error = checkUnprocessable(validationEither, context);
-        if (error) {
-          return error;
+        const error2 = checkUnprocessable(validationEither, context);
+        if (error2) {
+          return error2;
         }
       }
       if ("query" in contract && contract.query) {
         const validationEither = validate(context.request.query, contract.query, {
           coerce: true
         });
-        const error = checkUnprocessable(validationEither, context);
-        if (error) {
-          return error;
+        const error2 = checkUnprocessable(validationEither, context);
+        if (error2) {
+          return error2;
         }
       }
     }
@@ -122,7 +122,7 @@ export const wrapRouteExecution = async (response, cb) => {
       response.writeHead(500);
     }
     if (!response.writableEnded) {
-      return endpointError({
+      return error({
         httpCode: 500,
         code: "UNKNOWN_ERROR",
         message: "Internal server error"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/http",
-  "version": "0.0.58",
+  "version": "0.0.60",
   "description": "## Installation",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -28,10 +28,10 @@
     "@aeriajs/validation": "link:../validation"
   },
   "peerDependencies": {
-    "@aeriajs/common": "^0.0.50",
-    "@aeriajs/entrypoint": "^0.0.50",
-    "@aeriajs/types": "^0.0.47",
-    "@aeriajs/validation": "^0.0.53"
+    "@aeriajs/common": "^0.0.52",
+    "@aeriajs/entrypoint": "^0.0.52",
+    "@aeriajs/types": "^0.0.49",
+    "@aeriajs/validation": "^0.0.55"
   },
   "scripts": {
     "test": "echo skipping",