@aeriajs/http 0.0.193 → 0.0.194

package/dist/cors.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.cors = void 0;
-const cors = async (req, res, config) => {
+export const cors = async (req, res, config) => {
     const { allowOrigin = [], allowMethods = [], allowHeaders = [], maxAge, } = config;
     const headers = {
         'Access-Control-Allow-Origin': allowOrigin.join(','),
@@ -18,4 +15,3 @@ const cors = async (req, res, config) => {
         res.setHeader(key, value);
     });
 };
-exports.cors = cors;

package/dist/index.js

@@ -1,20 +1,4 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./cors.js"), exports);
-__exportStar(require("./log.js"), exports);
-__exportStar(require("./routing.js"), exports);
-__exportStar(require("./payload.js"), exports);
+export * from './cors.js';
+export * from './log.js';
+export * from './routing.js';
+export * from './payload.js';

package/dist/log.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.logResponse = void 0;
-const types_1 = require("@aeriajs/types");
-const node_util_1 = require("node:util");
-const logResponse = (response) => {
+import { METHOD_COLORS } from '@aeriajs/types';
+import { styleText } from 'node:util';
+export const logResponse = (response) => {
     const { statusCode, req: { method, url } } = response;
     if (!method) {
         return;
@@ -11,17 +8,16 @@ const logResponse = (response) => {
     const statusColor = statusCode >= 400 && statusCode <= 599
         ? 'red'
         : 'white';
-    const methodColor = method in types_1.METHOD_COLORS
-        ? types_1.METHOD_COLORS[method]
+    const methodColor = method in METHOD_COLORS
+        ? METHOD_COLORS[method]
         : 'white';
     const now = new Date();
-    let line = `[${(0, node_util_1.styleText)(statusColor, statusCode.toString())}] `;
+    let line = `[${styleText(statusColor, statusCode.toString())}] `;
     line += `[${now.toLocaleString()}] `;
-    line += (0, node_util_1.styleText)([
+    line += styleText([
         'bold',
         methodColor,
     ], method) + ' ';
     line += url;
     console.log(line);
 };
-exports.logResponse = logResponse;

package/dist/payload.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.safeJson = void 0;
-const safeJson = (candidate) => {
+export const safeJson = (candidate) => {
     if (!candidate || typeof candidate !== 'string') {
         return candidate;
     }
@@ -12,4 +9,3 @@ const safeJson = (candidate) => {
     }
     return json;
 };
-exports.safeJson = safeJson;

package/dist/routing.js

@@ -1,43 +1,40 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createRouter = exports.wrapRouteExecution = exports.registerRoute = exports.matches = void 0;
-const node_stream_1 = require("node:stream");
-const mongodb_1 = require("mongodb");
-const types_1 = require("@aeriajs/types");
-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");
+import { Stream } from 'node:stream';
+import { ObjectId } from 'mongodb';
+import { Result, ACError, HTTPStatus, REQUEST_METHODS, STREAMED_RESPONSE } from '@aeriajs/types';
+import { pipe, isGranted, deepMerge, endpointError } from '@aeriajs/common';
+import { validateWithRefs } from '@aeriajs/validation';
+import { getConfig } from '@aeriajs/entrypoint';
+import { safeJson } from './payload.js';
 const checkUnprocessable = async (what, schema, context, validateOptions = {}) => {
     let result;
     if (Array.isArray(schema)) {
         for (const property of schema) {
-            result = await (0, validation_1.validateWithRefs)(what, property, validateOptions);
+            result = await validateWithRefs(what, property, validateOptions);
             if (!result.error) {
                 break;
             }
         }
     }
     else {
-        result = await (0, validation_1.validateWithRefs)(what, schema, validateOptions);
+        result = await validateWithRefs(what, schema, validateOptions);
     }
     const { error, result: validated } = result;
     if (error) {
         if ('code' in error) {
-            return context.error(types_1.HTTPStatus.UnprocessableContent, {
+            return context.error(HTTPStatus.UnprocessableContent, {
                 code: error.code,
                 details: error.details,
             });
         }
-        return context.error(types_1.HTTPStatus.UnprocessableContent, {
-            code: types_1.ACError.MalformedInput,
+        return context.error(HTTPStatus.UnprocessableContent, {
+            code: ACError.MalformedInput,
             message: 'the provided payload is unprocessable',
             details: error,
         });
     }
-    return types_1.Result.result(validated);
+    return Result.result(validated);
 };
-const matches = (req, method, exp, options = {}, config) => {
+export const matches = (req, method, exp, options = {}, config) => {
     const base = config?.baseUrl && config.baseUrl !== '/'
         ? options.base
             ? `${config.baseUrl}${options.base}`
@@ -62,20 +59,19 @@ const matches = (req, method, exp, options = {}, config) => {
         };
     }
 };
-exports.matches = matches;
-const registerRoute = async (context, method, exp, cb, contract, options = {}) => {
-    const config = await (0, entrypoint_1.getConfig)();
-    const match = (0, exports.matches)(context.request, method, exp, options, config);
+export const registerRoute = async (context, method, exp, cb, contract, options = {}) => {
+    const config = await getConfig();
+    const match = matches(context.request, method, exp, options, config);
     if (match) {
         if (context.request.headers['content-type'] === 'application/json') {
             try {
-                context.request.payload = (0, common_1.deepMerge)((0, payload_js_1.safeJson)(context.request.body), context.request.payload, {
+                context.request.payload = deepMerge(safeJson(context.request.body), context.request.payload, {
                     arrays: false,
                 });
             }
             catch (err) {
-                return context.error(types_1.HTTPStatus.UnprocessableContent, {
-                    code: types_1.ACError.MalformedInput,
+                return context.error(HTTPStatus.UnprocessableContent, {
+                    code: ACError.MalformedInput,
                     message: 'Invalid JSON',
                 });
             }
@@ -83,13 +79,13 @@ const registerRoute = async (context, method, exp, cb, contract, options = {}) =
         Object.assign(context.request, match);
         if (contract) {
             if (contract.streamed) {
-                context.response[types_1.STREAMED_RESPONSE] = true;
+                context.response[STREAMED_RESPONSE] = true;
             }
             if (contract.roles) {
-                const granted = (0, common_1.isGranted)(contract.roles, context.token);
+                const granted = isGranted(contract.roles, context.token);
                 if (!granted) {
-                    return context.error(types_1.HTTPStatus.Unauthorized, {
-                        code: types_1.ACError.AuthorizationError,
+                    return context.error(HTTPStatus.Unauthorized, {
+                        code: ACError.AuthorizationError,
                         message: 'your roles dont grant access to this route',
                     });
                 }
@@ -99,10 +95,10 @@ const registerRoute = async (context, method, exp, cb, contract, options = {}) =
                     checkObjectIds: true,
                     coerceObjectIds: true,
                     context,
-                    objectIdConstructor: mongodb_1.ObjectId,
+                    objectIdConstructor: ObjectId,
                 });
                 if (error) {
-                    return types_1.Result.error(error);
+                    return Result.error(error);
                 }
             }
             if ('query' in contract && contract.query) {
@@ -110,10 +106,10 @@ const registerRoute = async (context, method, exp, cb, contract, options = {}) =
                     checkObjectIds: true,
                     coerce: true,
                     context,
-                    objectIdConstructor: mongodb_1.ObjectId,
+                    objectIdConstructor: ObjectId,
                 });
                 if (error) {
-                    return types_1.Result.error(error);
+                    return Result.error(error);
                 }
                 context.request.query = validated;
             }
@@ -124,14 +120,13 @@ const registerRoute = async (context, method, exp, cb, contract, options = {}) =
             : result;
     }
 };
-exports.registerRoute = registerRoute;
-const wrapRouteExecution = async (response, cb) => {
+export const wrapRouteExecution = async (response, cb) => {
     try {
         const result = await cb();
-        if (response[types_1.STREAMED_RESPONSE] && !result) {
+        if (response[STREAMED_RESPONSE] && !result) {
             return;
         }
-        if (result instanceof node_stream_1.Stream) {
+        if (result instanceof Stream) {
             try {
                 result.pipe(response);
             }
@@ -141,7 +136,7 @@ const wrapRouteExecution = async (response, cb) => {
         }
         if (result === null) {
             if (!response.headersSent) {
-                response.writeHead(types_1.HTTPStatus.NoContent);
+                response.writeHead(HTTPStatus.NoContent);
             }
             response.end(result);
             return;
@@ -154,19 +149,18 @@ const wrapRouteExecution = async (response, cb) => {
     catch (e) {
         console.trace(e);
         if (!response.headersSent) {
-            response.writeHead(types_1.HTTPStatus.InternalServerError);
+            response.writeHead(HTTPStatus.InternalServerError);
         }
         if (!response.writableEnded) {
-            return (0, common_1.endpointError)({
-                httpStatus: types_1.HTTPStatus.InternalServerError,
-                code: types_1.ACError.UnknownError,
+            return endpointError({
+                httpStatus: HTTPStatus.InternalServerError,
+                code: ACError.UnknownError,
                 message: 'Internal server error',
             });
         }
     }
 };
-exports.wrapRouteExecution = wrapRouteExecution;
-const createRouter = (options = {}) => {
+export const createRouter = (options = {}) => {
     const { exhaust } = options;
     const routes = [];
     const routesMeta = {};
@@ -176,7 +170,7 @@ const createRouter = (options = {}) => {
             ? method[0]
             : method] = contract || null;
         routes.push((_, context, groupOptions) => {
-            return (0, exports.registerRoute)(context, method, exp, cb, contract, groupOptions || options);
+            return registerRoute(context, method, exp, cb, contract, groupOptions || options);
         });
     };
     const group = (exp, router, middleware) => {
@@ -185,14 +179,14 @@ const createRouter = (options = {}) => {
             routesMeta[`${exp}${route}`] = router.routesMeta[route];
         }
         routes.push(async (_, context, groupOptions) => {
-            const config = await (0, entrypoint_1.getConfig)();
+            const config = await getConfig();
             const base = groupOptions
                 ? groupOptions.base
                 : options.base;
             newOptions.base = base && base !== '/'
                 ? `${base}${exp}`
                 : exp;
-            const match = (0, exports.matches)(context.request, null, config.baseUrl === '/'
+            const match = matches(context.request, null, config.baseUrl === '/'
                 ? new RegExp(`^${newOptions.base}/`)
                 : new RegExp(`^${config.baseUrl}${newOptions.base}/`), newOptions);
             if (match) {
@@ -206,7 +200,7 @@ const createRouter = (options = {}) => {
             }
         });
     };
-    const routerPipe = (0, common_1.pipe)(routes, {
+    const routerPipe = pipe(routes, {
         returnFirst: (value) => {
             if (value !== undefined) {
                 return value;
@@ -223,8 +217,8 @@ const createRouter = (options = {}) => {
             context.response = response;
             const result = await routerPipe(undefined, context, options);
             if (exhaust && result === undefined) {
-                return context.error(types_1.HTTPStatus.NotFound, {
-                    code: types_1.ACError.ResourceNotFound,
+                return context.error(HTTPStatus.NotFound, {
+                    code: ACError.ResourceNotFound,
                     message: 'Not found',
                 });
             }
@@ -233,11 +227,10 @@ const createRouter = (options = {}) => {
     };
     return new Proxy(router, {
         get: (target, key) => {
-            if (types_1.REQUEST_METHODS.includes(key)) {
+            if (REQUEST_METHODS.includes(key)) {
                 return (...args) => target.route(key, ...args);
             }
             return target[key];
         },
     });
 };
-exports.createRouter = createRouter;

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@aeriajs/http",
-  "version": "0.0.193",
+  "type": "module",
+  "version": "0.0.194",
   "description": "## Installation",
   "main": "dist/index.js",
   "aeriaMain": "tests/fixtures/aeriaMain.js",
-  "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
   "publishConfig": {
     "access": "public"
@@ -15,8 +15,7 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.js"
+      "default": "./dist/index.js"
     }
   },
   "files": [
@@ -30,19 +29,16 @@
     "mongodb": "^6.17.0"
   },
   "peerDependencies": {
-    "@aeriajs/common": "^0.0.157",
-    "@aeriajs/entrypoint": "^0.0.163",
-    "@aeriajs/types": "^0.0.135",
-    "@aeriajs/validation": "^0.0.178",
+    "@aeriajs/common": "^0.0.158",
+    "@aeriajs/entrypoint": "^0.0.164",
+    "@aeriajs/types": "^0.0.136",
+    "@aeriajs/validation": "^0.0.179",
     "mongodb": "^6.17.0"
   },
   "scripts": {
     "test": "vitest run",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
-    "build": "pnpm build:cjs && pnpm build:esm",
-    "build:cjs": "tsc",
-    "build:esm": "esbuild './src/**/*.ts' --outdir=dist --out-extension:.js=.mjs && pnpm build:esm-transform",
-    "build:esm-transform": "pnpm -w esm-transform $PWD/dist"
+    "build": "tsc"
   }
 }

package/dist/cors.mjs

@@ -1,23 +0,0 @@
-"use strict";
-export const cors = async (req, res, config) => {
-  const {
-    allowOrigin = [],
-    allowMethods = [],
-    allowHeaders = [],
-    maxAge
-  } = config;
-  const headers = {
-    "Access-Control-Allow-Origin": allowOrigin.join(","),
-    "Access-Control-Allow-Methods": allowMethods.join(","),
-    "Access-Control-Allow-Headers": allowHeaders.join(","),
-    "Access-Control-Max-Age": maxAge
-  };
-  if (req.method === "OPTIONS") {
-    res.writeHead(204, headers);
-    res.end();
-    return null;
-  }
-  Object.entries(headers).forEach(([key, value]) => {
-    res.setHeader(key, value);
-  });
-};

package/dist/index.mjs

@@ -1,5 +0,0 @@
-"use strict";
-export * from "./cors.mjs";
-export * from "./log.mjs";
-export * from "./routing.mjs";
-export * from "./payload.mjs";

package/dist/log.mjs

@@ -1,20 +0,0 @@
-"use strict";
-import { METHOD_COLORS } from "@aeriajs/types";
-import { styleText } from "node:util";
-export const logResponse = (response) => {
-  const { statusCode, req: { method, url } } = response;
-  if (!method) {
-    return;
-  }
-  const statusColor = statusCode >= 400 && statusCode <= 599 ? "red" : "white";
-  const methodColor = method in METHOD_COLORS ? METHOD_COLORS[method] : "white";
-  const now = /* @__PURE__ */ new Date();
-  let line = `[${styleText(statusColor, statusCode.toString())}] `;
-  line += `[${now.toLocaleString()}] `;
-  line += styleText([
-    "bold",
-    methodColor
-  ], method) + " ";
-  line += url;
-  console.log(line);
-};

package/dist/payload.mjs

@@ -1,12 +0,0 @@
-"use strict";
-export const safeJson = (candidate) => {
-  if (!candidate || typeof candidate !== "string") {
-    return candidate;
-  }
-  const json = JSON.parse(candidate);
-  if (json && typeof json === "object") {
-    delete json.constructor;
-    delete json.__proto__;
-  }
-  return json;
-};

package/dist/routing.mjs

@@ -1,233 +0,0 @@
-"use strict";
-import { Stream } from "node:stream";
-import { ObjectId } from "mongodb";
-import { Result, ACError, HTTPStatus, REQUEST_METHODS, STREAMED_RESPONSE } from "@aeriajs/types";
-import { pipe, isGranted, deepMerge, endpointError } from "@aeriajs/common";
-import { validateWithRefs } from "@aeriajs/validation";
-import { getConfig } from "@aeriajs/entrypoint";
-import { safeJson } from "./payload.mjs";
-const checkUnprocessable = async (what, schema, context, validateOptions = {}) => {
-  let result;
-  if (Array.isArray(schema)) {
-    for (const property of schema) {
-      result = await validateWithRefs(what, property, validateOptions);
-      if (!result.error) {
-        break;
-      }
-    }
-  } else {
-    result = await validateWithRefs(what, schema, validateOptions);
-  }
-  const { error, result: validated } = result;
-  if (error) {
-    if ("code" in error) {
-      return context.error(HTTPStatus.UnprocessableContent, {
-        code: error.code,
-        details: error.details
-      });
-    }
-    return context.error(HTTPStatus.UnprocessableContent, {
-      code: ACError.MalformedInput,
-      message: "the provided payload is unprocessable",
-      details: error
-    });
-  }
-  return Result.result(validated);
-};
-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) {
-    if (!Array.isArray(method) || !method.includes(req.method)) {
-      return;
-    }
-  }
-  const regexp = exp instanceof RegExp ? exp : new RegExp(`^${base}${exp}$`);
-  const url = new URL(`http://0.com${req.url}`).pathname;
-  const expMatches = url.match(regexp);
-  if (expMatches) {
-    const fragments = expMatches.splice(1);
-    return {
-      fragments
-    };
-  }
-};
-export const registerRoute = async (context, method, exp, cb, contract, options = {}) => {
-  const config = await getConfig();
-  const match = matches(
-    context.request,
-    method,
-    exp,
-    options,
-    config
-  );
-  if (match) {
-    if (context.request.headers["content-type"] === "application/json") {
-      try {
-        context.request.payload = deepMerge(safeJson(context.request.body), context.request.payload, {
-          arrays: false
-        });
-      } catch (err) {
-        return context.error(HTTPStatus.UnprocessableContent, {
-          code: ACError.MalformedInput,
-          message: "Invalid JSON"
-        });
-      }
-    }
-    Object.assign(context.request, match);
-    if (contract) {
-      if (contract.streamed) {
-        context.response[STREAMED_RESPONSE] = true;
-      }
-      if (contract.roles) {
-        const granted = isGranted(contract.roles, context.token);
-        if (!granted) {
-          return context.error(HTTPStatus.Unauthorized, {
-            code: ACError.AuthorizationError,
-            message: "your roles dont grant access to this route"
-          });
-        }
-      }
-      if ("payload" in contract && contract.payload) {
-        const { error } = await checkUnprocessable(context.request.payload, contract.payload, context, {
-          checkObjectIds: true,
-          coerceObjectIds: true,
-          context,
-          objectIdConstructor: ObjectId
-        });
-        if (error) {
-          return Result.error(error);
-        }
-      }
-      if ("query" in contract && contract.query) {
-        const { error, result: validated } = await checkUnprocessable(context.request.query, contract.query, context, {
-          checkObjectIds: true,
-          coerce: true,
-          context,
-          objectIdConstructor: ObjectId
-        });
-        if (error) {
-          return Result.error(error);
-        }
-        context.request.query = validated;
-      }
-    }
-    const result = await cb(context);
-    return result === void 0 ? null : result;
-  }
-};
-export const wrapRouteExecution = async (response, cb) => {
-  try {
-    const result = await cb();
-    if (response[STREAMED_RESPONSE] && !result) {
-      return;
-    }
-    if (result instanceof Stream) {
-      try {
-        result.pipe(response);
-      } catch (err) {
-      }
-      return;
-    }
-    if (result === null) {
-      if (!response.headersSent) {
-        response.writeHead(HTTPStatus.NoContent);
-      }
-      response.end(result);
-      return;
-    }
-    if (!response.writableEnded) {
-      response.end(result);
-    }
-    return result;
-  } catch (e) {
-    console.trace(e);
-    if (!response.headersSent) {
-      response.writeHead(HTTPStatus.InternalServerError);
-    }
-    if (!response.writableEnded) {
-      return endpointError({
-        httpStatus: HTTPStatus.InternalServerError,
-        code: ACError.UnknownError,
-        message: "Internal server error"
-      });
-    }
-  }
-};
-export const createRouter = (options = {}) => {
-  const { exhaust } = options;
-  const routes = [];
-  const routesMeta = {};
-  const route = (method, exp, cb, contract) => {
-    routesMeta[exp] ??= {};
-    routesMeta[exp][Array.isArray(method) ? method[0] : method] = contract || null;
-    routes.push((_, context, groupOptions) => {
-      return registerRoute(
-        context,
-        method,
-        exp,
-        cb,
-        contract,
-        groupOptions || options
-      );
-    });
-  };
-  const group = (exp, router2, middleware) => {
-    const newOptions = Object.assign({}, options);
-    for (const route2 in router2.routesMeta) {
-      routesMeta[`${exp}${route2}`] = router2.routesMeta[route2];
-    }
-    routes.push(async (_, context, groupOptions) => {
-      const config = await getConfig();
-      const base = groupOptions ? groupOptions.base : options.base;
-      newOptions.base = base && base !== "/" ? `${base}${exp}` : exp;
-      const match = matches(
-        context.request,
-        null,
-        config.baseUrl === "/" ? new RegExp(`^${newOptions.base}/`) : new RegExp(`^${config.baseUrl}${newOptions.base}/`),
-        newOptions
-      );
-      if (match) {
-        if (middleware) {
-          const result = await middleware(context);
-          if (result) {
-            return result;
-          }
-        }
-        return router2.handle(context.request, context.response, context, newOptions);
-      }
-    });
-  };
-  const routerPipe = pipe(routes, {
-    returnFirst: (value) => {
-      if (value !== void 0) {
-        return value;
-      }
-    }
-  });
-  const router = {
-    route,
-    routes,
-    routesMeta,
-    group,
-    handle: async (request, response, context, options2) => {
-      context.request = request;
-      context.response = response;
-      const result = await routerPipe(void 0, context, options2);
-      if (exhaust && result === void 0) {
-        return context.error(HTTPStatus.NotFound, {
-          code: ACError.ResourceNotFound,
-          message: "Not found"
-        });
-      }
-      return result;
-    }
-  };
-  return new Proxy(router, {
-    get: (target, key) => {
-      if (REQUEST_METHODS.includes(key)) {
-        return (...args) => target.route(key, ...args);
-      }
-      return target[key];
-    }
-  });
-};