@aeriajs/http 0.0.36 → 0.0.38

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-export * from './constants.js';
 export * from './cors.js';
 export * from './options.js';
 export * from './routing.js';

package/dist/index.js

@@ -14,7 +14,6 @@ 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("./constants.js"), exports);
 __exportStar(require("./cors.js"), exports);
 __exportStar(require("./options.js"), exports);
 __exportStar(require("./routing.js"), exports);

package/dist/index.mjs

@@ -1,5 +1,4 @@
 "use strict";
-export * from "./constants.mjs";
 export * from "./cors.mjs";
 export * from "./options.mjs";
 export * from "./routing.mjs";

package/dist/routing.d.ts

@@ -1,16 +1,15 @@
-import type { Context, GenericRequest, GenericResponse, RequestMethod, InferProperty, InferResponse, PackReferences, ContractWithRoles } from '@aeriajs/types';
-export type RouteUri = `/${string}`;
+import type { RouteContext, GenericRequest, GenericResponse, RequestMethod, RouteUri, InferProperty, InferResponse, PackReferences, ContractWithRoles, ApiConfig } 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: Context) => any;
+export type Middleware = (context: RouteContext) => any;
 export type RouteGroupOptions = {
     base?: RouteUri;
 };
-type TypedContext<TContractWithRoles extends ContractWithRoles> = Omit<Context, 'request'> & {
-    request: Omit<Context['request'], 'payload' | 'query'> & {
+type TypedContext<TContractWithRoles extends ContractWithRoles> = RouteContext & {
+    request: Omit<RouteContext['request'], 'payload' | 'query'> & {
         payload: TContractWithRoles extends {
             payload: infer Payload;
         } ? PackReferences<InferProperty<Payload>> : any;
@@ -26,15 +25,15 @@ export type ProxiedRouter<TRouter> = TRouter & Record<RequestMethod, <const TCon
         authenticated: true;
     };
 }) => Response : never : (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) => {
+export declare const matches: <TRequest extends GenericRequest>(req: TRequest, method: RequestMethod | RequestMethod[] | null, exp: string | RegExp, options: RouterOptions, config?: ApiConfig) => {
     fragments: string[];
 } | undefined;
-export declare const registerRoute: (context: Context, method: RequestMethod | RequestMethod[], exp: RouteUri, cb: (context: Context) => any, contract?: ContractWithRoles, options?: RouterOptions) => Promise<any>;
+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 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 unknown[] ? TContractWithRoles["roles"][number] extends infer Role ? "guest" extends Role ? (context: TypedContext<TContractWithRoles>) => Response_1 : (context: Omit<Context, "request"> & {
+    } ? InferResponse<Response> : any) extends infer Response_1 ? TContractWithRoles["roles"] extends unknown[] ? TContractWithRoles["roles"][number] extends infer Role ? "guest" extends Role ? (context: TypedContext<TContractWithRoles>) => Response_1 : (context: RouteContext & {
         request: Omit<GenericRequest, "payload" | "query"> & {
             payload: TContractWithRoles extends {
                 payload: infer Payload;
@@ -48,12 +47,12 @@ export declare const createRouter: (options?: Partial<RouterOptions>) => Proxied
             authenticated: true;
         };
     }) => Response_1 : never : (context: TypedContext<TContractWithRoles>) => Response_1 : never>(method: RequestMethod | RequestMethod[], exp: RouteUri, cb: TCallback, contract?: TContractWithRoles) => void;
-    routes: ((_: unknown, context: Context, groupOptions?: RouteGroupOptions) => ReturnType<typeof registerRoute>)[];
+    routes: ((_: unknown, context: RouteContext, groupOptions?: RouteGroupOptions) => ReturnType<typeof registerRoute>)[];
     routesMeta: RoutesMeta;
     group: <TRouter extends {
-        install: (context: Context, options?: RouterOptions) => any;
+        install: (context: RouteContext, options?: RouterOptions) => any;
         routesMeta: RoutesMeta;
     }>(exp: RouteUri, router: TRouter, middleware?: Middleware) => void;
-    install: (_context: Context, _options?: RouterOptions) => Promise<true | Promise<any>>;
+    install: (_context: RouteContext, _options?: RouterOptions) => Promise<true | Promise<any>>;
 }>;
 export {};

package/dist/routing.js

@@ -5,8 +5,8 @@ const stream_1 = require("stream");
 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");
-const constants_js_1 = require("./constants.js");
 const checkUnprocessable = (validationEither, context) => {
     if ((0, common_1.isLeft)(validationEither)) {
         context.response.writeHead(422, {
@@ -23,9 +23,17 @@ const unsufficientRoles = (context) => {
         error: types_1.ACErrors.AuthorizationError,
     };
 };
-const matches = (req, method, exp, options) => {
-    const { url } = req;
-    const { base = constants_js_1.DEFAULT_BASE_URI } = options;
+const matches = (req, method, exp, options, config) => {
+    let base = '';
+    if (config?.apiBase) {
+        base += config.apiBase;
+    }
+    if (options.base) {
+        base += `/${options.base}`;
+    }
+    base = base
+        .replace('//', '/')
+        .replace(/\/$/, '');
     if (method && method !== req.method) {
         if (!Array.isArray(method) || !method.includes(req.method)) {
             return;
@@ -34,9 +42,10 @@ const matches = (req, method, exp, options) => {
     const regexp = exp instanceof RegExp
         ? exp
         : new RegExp(`^${base}${exp}$`);
-    const matches = url.split('?')[0].match(regexp);
-    if (matches) {
-        const fragments = matches.splice(1);
+    const url = new URL(`http://0.com${req.url}`).pathname;
+    const expMatches = url.match(regexp);
+    if (expMatches) {
+        const fragments = expMatches.splice(1);
         return {
             fragments,
         };
@@ -44,7 +53,8 @@ const matches = (req, method, exp, options) => {
 };
 exports.matches = matches;
 const registerRoute = async (context, method, exp, cb, contract, options = {}) => {
-    const match = (0, exports.matches)(context.request, method, exp, options);
+    const config = await (0, entrypoint_1.getConfig)();
+    const match = (0, exports.matches)(context.request, method, exp, options, config);
     if (match) {
         if (context.request.headers['content-type'] === 'application/json') {
             try {
@@ -143,7 +153,6 @@ const wrapRouteExecution = async (res, cb) => {
 exports.wrapRouteExecution = wrapRouteExecution;
 const createRouter = (options = {}) => {
     const { exhaust } = options;
-    options.base ??= constants_js_1.DEFAULT_BASE_URI;
     const routes = [];
     const routesMeta = {};
     const route = (method, exp, cb, contract) => {
@@ -161,10 +170,14 @@ const createRouter = (options = {}) => {
             routesMeta[`${exp}${route}`] = router.routesMeta[route];
         }
         routes.push(async (_, context, groupOptions) => {
-            newOptions.base = groupOptions
-                ? `${groupOptions.base}${exp}`
-                : `${options.base}${exp}`;
-            const match = (0, exports.matches)(context.request, null, new RegExp(`^${newOptions.base}/`), newOptions);
+            const config = await (0, entrypoint_1.getConfig)();
+            const base = groupOptions
+                ? groupOptions.base
+                : options.base;
+            newOptions.base = base
+                ? `${base}${exp}`
+                : exp;
+            const match = (0, exports.matches)(context.request, null, new RegExp(`^${config.apiBase}${newOptions.base}/`), newOptions);
             if (match) {
                 if (middleware) {
                     const result = await middleware(context);

package/dist/routing.mjs

@@ -3,8 +3,8 @@ import { Stream } from "stream";
 import { ACErrors, REQUEST_METHODS } from "@aeriajs/types";
 import { pipe, arraysIntersects, left, isLeft, unwrapEither, deepMerge } from "@aeriajs/common";
 import { validate } from "@aeriajs/validation";
+import { getConfig } from "@aeriajs/entrypoint";
 import { safeJson } from "./payload.mjs";
-import { DEFAULT_BASE_URI } from "./constants.mjs";
 const checkUnprocessable = (validationEither, context) => {
   if (isLeft(validationEither)) {
     context.response.writeHead(422, {
@@ -21,25 +21,39 @@ const unsufficientRoles = (context) => {
     error: ACErrors.AuthorizationError
   };
 };
-export const matches = (req, method, exp, options) => {
-  const { url } = req;
-  const { base = DEFAULT_BASE_URI } = options;
+export const matches = (req, method, exp, options, config) => {
+  let base = "";
+  if (config?.apiBase) {
+    base += config.apiBase;
+  }
+  if (options.base) {
+    base += `/${options.base}`;
+  }
+  base = base.replace("//", "/").replace(/\/$/, "");
   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 matches2 = url.split("?")[0].match(regexp);
-  if (matches2) {
-    const fragments = matches2.splice(1);
+  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 match = matches(context.request, method, exp, 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 {
@@ -134,7 +148,6 @@ export const wrapRouteExecution = async (res, cb) => {
 };
 export const createRouter = (options = {}) => {
   const { exhaust } = options;
-  options.base ??= DEFAULT_BASE_URI;
   const routes = [];
   const routesMeta = {};
   const route = (method, exp, cb, contract) => {
@@ -157,8 +170,15 @@ export const createRouter = (options = {}) => {
       routesMeta[`${exp}${route2}`] = router2.routesMeta[route2];
     }
     routes.push(async (_, context, groupOptions) => {
-      newOptions.base = groupOptions ? `${groupOptions.base}${exp}` : `${options.base}${exp}`;
-      const match = matches(context.request, null, new RegExp(`^${newOptions.base}/`), newOptions);
+      const config = await getConfig();
+      const base = groupOptions ? groupOptions.base : options.base;
+      newOptions.base = base ? `${base}${exp}` : exp;
+      const match = matches(
+        context.request,
+        null,
+        new RegExp(`^${config.apiBase}${newOptions.base}/`),
+        newOptions
+      );
       if (match) {
         if (middleware) {
           const result = await middleware(context);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/http",
-  "version": "0.0.36",
+  "version": "0.0.38",
   "description": "## Installation",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -22,16 +22,18 @@
     "dist"
   ],
   "devDependencies": {
-    "@aeriajs/access-control": "^0.0.29",
-    "@aeriajs/common": "^0.0.29",
-    "@aeriajs/types": "^0.0.26",
-    "@aeriajs/validation": "^0.0.32"
+    "@aeriajs/access-control": "^0.0.31",
+    "@aeriajs/common": "^0.0.31",
+    "@aeriajs/entrypoint": "^0.0.31",
+    "@aeriajs/types": "^0.0.28",
+    "@aeriajs/validation": "^0.0.34"
   },
   "peerDependencies": {
-    "@aeriajs/access-control": "^0.0.29",
-    "@aeriajs/common": "^0.0.29",
-    "@aeriajs/types": "^0.0.26",
-    "@aeriajs/validation": "^0.0.32"
+    "@aeriajs/access-control": "^0.0.31",
+    "@aeriajs/common": "^0.0.31",
+    "@aeriajs/entrypoint": "^0.0.31",
+    "@aeriajs/types": "^0.0.28",
+    "@aeriajs/validation": "^0.0.34"
   },
   "scripts": {
     "test": "echo skipping",

package/dist/constants.d.ts

@@ -1 +0,0 @@
-export declare const DEFAULT_BASE_URI = "/api";

package/dist/constants.js

@@ -1,4 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_BASE_URI = void 0;
-exports.DEFAULT_BASE_URI = '/api';

package/dist/constants.mjs

@@ -1,2 +0,0 @@
-"use strict";
-export const DEFAULT_BASE_URI = "/api";