@aeriajs/http 0.0.57 → 0.0.59

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 export * from './cors.js';
+export * from './next.js';
 export * from './options.js';
 export * from './routing.js';
 export * from './payload.js';

package/dist/index.js

@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./cors.js"), exports);
+__exportStar(require("./next.js"), exports);
 __exportStar(require("./options.js"), exports);
 __exportStar(require("./routing.js"), exports);
 __exportStar(require("./payload.js"), exports);

package/dist/index.mjs

@@ -1,5 +1,6 @@
 "use strict";
 export * from "./cors.mjs";
+export * from "./next.mjs";
 export * from "./options.mjs";
 export * from "./routing.mjs";
 export * from "./payload.mjs";

package/dist/next.d.ts

@@ -0,0 +1,9 @@
+export declare const NEXT_SYMBOL: unique symbol;
+type NextObject = {
+    [NEXT_SYMBOL]: null;
+};
+export declare const next: () => {
+    [NEXT_SYMBOL]: null;
+};
+export declare const isNext: (object: any) => object is NextObject;
+export {};

package/dist/next.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isNext = exports.next = exports.NEXT_SYMBOL = void 0;
+exports.NEXT_SYMBOL = Symbol('NEXT_SYMBOL');
+const next = () => {
+    return {
+        [exports.NEXT_SYMBOL]: null,
+    };
+};
+exports.next = next;
+const isNext = (object) => {
+    const sym = Object.getOwnPropertyDescriptor(object, exports.NEXT_SYMBOL);
+    return !!sym;
+};
+exports.isNext = isNext;

package/dist/next.mjs

@@ -0,0 +1,11 @@
+"use strict";
+export const NEXT_SYMBOL = Symbol("NEXT_SYMBOL");
+export const next = () => {
+  return {
+    [NEXT_SYMBOL]: null
+  };
+};
+export const isNext = (object) => {
+  const sym = Object.getOwnPropertyDescriptor(object, NEXT_SYMBOL);
+  return !!sym;
+};

package/dist/routing.d.ts

@@ -29,7 +29,7 @@ export declare const matches: <TRequest extends GenericRequest>(req: TRequest, m
     fragments: string[];
 } | undefined;
 export declare const registerRoute: (context: RouteContext, method: RequestMethod | RequestMethod[], exp: RouteUri, cb: (context: RouteContext) => any, contract?: ContractWithRoles, options?: RouterOptions) => Promise<any>;
-export declare const wrapRouteExecution: (res: GenericResponse, cb: () => any | Promise<any>) => Promise<any>;
+export declare const wrapRouteExecution: (response: GenericResponse, cb: () => any | Promise<any>) => Promise<any>;
 export declare const createRouter: (options?: Partial<RouterOptions>) => ProxiedRouter<{
     route: <const TContractWithRoles extends ContractWithRoles, TCallback extends (TContractWithRoles extends {
         response: infer Response;

package/dist/routing.js

@@ -7,6 +7,7 @@ const common_1 = require("@aeriajs/common");
 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 = (validationEither, context) => {
     if ((0, common_1.isLeft)(validationEither)) {
         context.response.writeHead(422, {
@@ -60,12 +61,11 @@ const registerRoute = async (context, method, exp, cb, contract, options = {}) =
                 });
             }
             catch (err) {
-                context.response.writeHead(500);
-                context.response.end((0, common_1.left)({
+                return context.error({
                     httpCode: 500,
+                    code: 'INVALID_JSON',
                     message: 'Invalid JSON',
-                }));
-                return null;
+                });
             }
         }
         Object.assign(context.request, match);
@@ -100,46 +100,42 @@ const registerRoute = async (context, method, exp, cb, contract, options = {}) =
     }
 };
 exports.registerRoute = registerRoute;
-const wrapRouteExecution = async (res, cb) => {
+const wrapRouteExecution = async (response, cb) => {
     try {
         const result = await cb();
         if (result === null) {
-            if (!res.headersSent) {
-                res.writeHead(204);
-                res.end();
+            if (!response.headersSent) {
+                response.writeHead(204);
+                response.end();
             }
             return;
         }
-        if (!res.headersSent && result && (0, common_1.isLeft)(result)) {
-            const error = (0, common_1.unwrapEither)(result);
-            if (error.httpCode) {
-                res.writeHead(error.httpCode);
-            }
-        }
         if (result instanceof stream_1.Stream) {
             try {
-                result.pipe(res);
+                result.pipe(response);
             }
             catch (err) {
             }
             return;
         }
-        if (!res.writableEnded) {
-            res.end(result);
+        if (!response.writableEnded) {
+            response.end(result);
         }
         return result;
     }
     catch (e) {
         console.trace(e);
-        if (!res.headersSent) {
-            res.writeHead(500);
+        if (!response.headersSent) {
+            response.writeHead(500);
         }
-        if (!res.writableEnded) {
-            const error = (0, common_1.left)({
+        if (!response.writableEnded) {
+            return (0, common_1.error)({
                 httpCode: 500,
+                code: 'UNKNOWN_ERROR',
                 message: 'Internal server error',
+            }, {
+                response,
             });
-            res.end(error);
         }
     }
 };
@@ -185,7 +181,11 @@ const createRouter = (options = {}) => {
         });
     };
     const routerPipe = (0, common_1.pipe)(routes, {
-        returnFirst: true,
+        returnFirst: (value) => {
+            if (value && !(0, next_js_1.isNext)(value)) {
+                return value;
+            }
+        },
     });
     const router = {
         route,
@@ -198,9 +198,10 @@ const createRouter = (options = {}) => {
     };
     router.install = async (context, options) => {
         const result = await routerPipe(undefined, context, options);
-        if (exhaust && result === undefined) {
-            return (0, common_1.left)({
+        if (exhaust && (result === undefined || (0, next_js_1.isNext)(result))) {
+            return context.error({
                 httpCode: 404,
+                code: 'NOT_FOUND',
                 message: 'Not found',
             });
         }

package/dist/routing.mjs

@@ -1,10 +1,11 @@
 "use strict";
 import { Stream } from "stream";
 import { ACErrors, REQUEST_METHODS } from "@aeriajs/types";
-import { pipe, isGranted, left, isLeft, unwrapEither, deepMerge } 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";
+import { isNext } from "./next.mjs";
 const checkUnprocessable = (validationEither, context) => {
   if (isLeft(validationEither)) {
     context.response.writeHead(422, {
@@ -58,12 +59,11 @@ export const registerRoute = async (context, method, exp, cb, contract, options
           }
         );
       } catch (err) {
-        context.response.writeHead(500);
-        context.response.end(left({
+        return context.error({
           httpCode: 500,
+          code: "INVALID_JSON",
           message: "Invalid JSON"
-        }));
-        return null;
+        });
       }
     }
     Object.assign(context.request, match);
@@ -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;
         }
       }
     }
@@ -95,44 +95,40 @@ export const registerRoute = async (context, method, exp, cb, contract, options
     return result === void 0 ? null : result;
   }
 };
-export const wrapRouteExecution = async (res, cb) => {
+export const wrapRouteExecution = async (response, cb) => {
   try {
     const result = await cb();
     if (result === null) {
-      if (!res.headersSent) {
-        res.writeHead(204);
-        res.end();
+      if (!response.headersSent) {
+        response.writeHead(204);
+        response.end();
       }
       return;
     }
-    if (!res.headersSent && result && isLeft(result)) {
-      const error = unwrapEither(result);
-      if (error.httpCode) {
-        res.writeHead(error.httpCode);
-      }
-    }
     if (result instanceof Stream) {
       try {
-        result.pipe(res);
+        result.pipe(response);
       } catch (err) {
       }
       return;
     }
-    if (!res.writableEnded) {
-      res.end(result);
+    if (!response.writableEnded) {
+      response.end(result);
     }
     return result;
   } catch (e) {
     console.trace(e);
-    if (!res.headersSent) {
-      res.writeHead(500);
+    if (!response.headersSent) {
+      response.writeHead(500);
     }
-    if (!res.writableEnded) {
-      const error = left({
+    if (!response.writableEnded) {
+      return error({
         httpCode: 500,
+        code: "UNKNOWN_ERROR",
         message: "Internal server error"
+      }, {
+        response
       });
-      res.end(error);
     }
   }
 };
@@ -181,7 +177,11 @@ export const createRouter = (options = {}) => {
     });
   };
   const routerPipe = pipe(routes, {
-    returnFirst: true
+    returnFirst: (value) => {
+      if (value && !isNext(value)) {
+        return value;
+      }
+    }
   });
   const router = {
     route,
@@ -194,9 +194,10 @@ export const createRouter = (options = {}) => {
   };
   router.install = async (context, options2) => {
     const result = await routerPipe(void 0, context, options2);
-    if (exhaust && result === void 0) {
-      return left({
+    if (exhaust && (result === void 0 || isNext(result))) {
+      return context.error({
         httpCode: 404,
+        code: "NOT_FOUND",
         message: "Not found"
       });
     }

package/package.json

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