@aeriajs/http 0.0.97 → 0.0.98

package/dist/routing.d.ts

@@ -1,26 +1,25 @@
-import type { RouteContext, GenericRequest, GenericResponse, RequestMethod, RouteUri, InferProperty, InferResponse, PackReferences, ContractWithRoles, ApiConfig, RoleFromAccessCondition } from '@aeriajs/types';
+import type { RouteContext, GenericRequest, GenericResponse, RequestMethod, RouteUri, InferProperties, PackReferences, ContractWithRoles, ApiConfig, RoleFromAccessCondition } from '@aeriajs/types';
 export type RouterOptions = {
     exhaust?: boolean;
     base?: RouteUri;
 };
 export type RoutesMeta = Record<RouteUri, Partial<Record<RequestMethod, ContractWithRoles | null> | undefined>>;
-export type Middleware = (context: RouteContext) => any;
 export type RouteGroupOptions = {
     base?: RouteUri;
 };
-type TypedContext<TContractWithRoles extends ContractWithRoles> = RouteContext<RoleFromAccessCondition<TContractWithRoles['roles']>> & {
+type TypedContext<TContractWithRoles extends ContractWithRoles> = Omit<RouteContext<RoleFromAccessCondition<TContractWithRoles['roles']>>, 'request'> & {
     request: Omit<RouteContext['request'], 'payload' | 'query'> & {
         payload: TContractWithRoles extends {
             payload: infer Payload;
-        } ? PackReferences<InferProperty<Payload>> : any;
+        } ? PackReferences<InferProperties<Payload>> : any;
         query: TContractWithRoles extends {
             query: infer Query;
-        } ? InferProperty<Query> : any;
+        } ? InferProperties<Query> : any;
     };
 };
 export type ProxiedRouter<TRouter> = TRouter & Record<RequestMethod, <const TContractWithRoles extends ContractWithRoles, TCallback extends (TContractWithRoles extends {
     response: infer Response;
-} ? InferResponse<Response> : any) extends infer Response ? (context: TypedContext<TContractWithRoles>) => Response : never>(exp: RouteUri, cb: TCallback, contract?: TContractWithRoles) => ReturnType<typeof registerRoute>>;
+} ? InferProperties<Response> extends infer InferredResponse ? InferredResponse | Promise<InferredResponse> : never : 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;
@@ -29,13 +28,13 @@ 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 ? (context: TypedContext<TContractWithRoles>) => Response : never>(method: RequestMethod | RequestMethod[], exp: RouteUri, cb: TCallback, contract?: TContractWithRoles) => void;
+    } ? InferProperties<Response> : any) extends infer Response ? (context: TypedContext<TContractWithRoles>) => Response : 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 {
         install: (context: RouteContext, options?: RouterOptions) => any;
         routesMeta: RoutesMeta;
-    }>(exp: RouteUri, router: TRouter, middleware?: Middleware) => void;
+    }>(exp: RouteUri, router: TRouter, middleware?: (context: RouteContext) => any) => void;
     install: (_context: RouteContext, _options?: RouterOptions) => ReturnType<(value: unknown, context: RouteContext, groupOptions?: RouteGroupOptions | undefined) => Promise<any>>;
 }>;
 export {};

package/dist/routing.js

@@ -8,7 +8,20 @@ const validation_1 = require("@aeriajs/validation");
 const entrypoint_1 = require("@aeriajs/entrypoint");
 const payload_js_1 = require("./payload.js");
 const next_js_1 = require("./next.js");
-const checkUnprocessable = ({ error }, context) => {
+const checkUnprocessable = (what, schema, context, validateOptions = {}) => {
+    let result;
+    if (Array.isArray(schema)) {
+        for (const property of schema) {
+            result = (0, validation_1.validate)(what, property, validateOptions);
+            if (!result.error) {
+                break;
+            }
+        }
+    }
+    else {
+        result = (0, validation_1.validate)(what, schema, validateOptions);
+    }
+    const { error } = result;
     if (error) {
         if ('code' in error) {
             return context.error(types_1.HTTPStatus.UnprocessableContent, {
@@ -22,6 +35,7 @@ const checkUnprocessable = ({ error }, context) => {
             details: error,
         });
     }
+    return types_1.Result.result({});
 };
 const matches = (req, method, exp, options = {}, config) => {
     const base = config?.baseUrl && config.baseUrl !== '/'
@@ -81,19 +95,17 @@ const registerRoute = async (context, method, exp, cb, contract, options = {}) =
                 }
             }
             if ('payload' in contract && contract.payload) {
-                const validationEither = (0, validation_1.validate)(context.request.payload, contract.payload);
-                const error = checkUnprocessable(validationEither, context);
+                const { error } = checkUnprocessable(context.request.query, contract.payload, context);
                 if (error) {
-                    return error;
+                    return types_1.Result.error(error);
                 }
             }
             if ('query' in contract && contract.query) {
-                const validationEither = (0, validation_1.validate)(context.request.query, contract.query, {
+                const { error } = checkUnprocessable(context.request.query, contract.query, context, {
                     coerce: true,
                 });
-                const error = checkUnprocessable(validationEither, context);
                 if (error) {
-                    return error;
+                    return types_1.Result.error(error);
                 }
             }
         }

package/dist/routing.mjs

@@ -1,12 +1,24 @@
 "use strict";
 import { Stream } from "stream";
-import { ACError, HTTPStatus, REQUEST_METHODS, STREAMED_RESPONSE } from "@aeriajs/types";
+import { Result, ACError, HTTPStatus, REQUEST_METHODS, STREAMED_RESPONSE } from "@aeriajs/types";
 import { pipe, isGranted, deepMerge, endpointError } 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 = ({ error }, context) => {
+const checkUnprocessable = (what, schema, context, validateOptions = {}) => {
+  let result;
+  if (Array.isArray(schema)) {
+    for (const property of schema) {
+      result = validate(what, property, validateOptions);
+      if (!result.error) {
+        break;
+      }
+    }
+  } else {
+    result = validate(what, schema, validateOptions);
+  }
+  const { error } = result;
   if (error) {
     if ("code" in error) {
       return context.error(HTTPStatus.UnprocessableContent, {
@@ -20,6 +32,7 @@ const checkUnprocessable = ({ error }, context) => {
       details: error
     });
   }
+  return Result.result({});
 };
 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 : "";
@@ -79,19 +92,17 @@ 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);
+        const { error } = checkUnprocessable(context.request.query, contract.payload, context);
         if (error) {
-          return error;
+          return Result.error(error);
         }
       }
       if ("query" in contract && contract.query) {
-        const validationEither = validate(context.request.query, contract.query, {
+        const { error } = checkUnprocessable(context.request.query, contract.query, context, {
           coerce: true
         });
-        const error = checkUnprocessable(validationEither, context);
         if (error) {
-          return error;
+          return Result.error(error);
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/http",
-  "version": "0.0.97",
+  "version": "0.0.98",
   "description": "## Installation",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -28,10 +28,10 @@
     "@aeriajs/validation": "link:../validation"
   },
   "peerDependencies": {
-    "@aeriajs/common": "^0.0.86",
-    "@aeriajs/entrypoint": "^0.0.88",
-    "@aeriajs/types": "^0.0.74",
-    "@aeriajs/validation": "^0.0.89"
+    "@aeriajs/common": "^0.0.87",
+    "@aeriajs/entrypoint": "^0.0.89",
+    "@aeriajs/types": "^0.0.75",
+    "@aeriajs/validation": "^0.0.90"
   },
   "scripts": {
     "test": "TS_NODE_COMPILER_OPTIONS=\"$(cat ../compilerOptions.json)\" mocha -r ts-node/register tests/*.spec.ts",