@opra/http 1.0.0-beta.4 → 1.0.0-beta.5

package/cjs/express-adapter.js

@@ -19,7 +19,7 @@ class ExpressAdapter extends http_adapter_js_1.HttpAdapter {
             throw new TypeError('document.api must be instance of HttpApi');
         for (const c of this.api.controllers.values())
             this._createControllers(c);
-        this._initRouter(options?.basePath);
+        this._initRouter();
     }
     get platform() {
         return 'express';
@@ -54,16 +54,9 @@ class ExpressAdapter extends http_adapter_js_1.HttpAdapter {
         const controller = this.api.findController(controllerPath);
         return controller && this._controllerInstances.get(controller);
     }
-    _initRouter(basePath) {
+    _initRouter() {
         const router = (0, express_1.Router)();
-        if (basePath) {
-            if (!basePath.startsWith('/'))
-                basePath = '/' + basePath;
-            if (basePath)
-                this.app.use(basePath, router);
-        }
-        else
-            this.app.use(router);
+        this.app.use(this.basePath, router);
         const createContext = async (_req, _res, args) => {
             const request = http_incoming_interface_js_1.HttpIncoming.from(_req);
             const response = http_outgoing_interface_js_1.HttpOutgoing.from(_res);

package/cjs/http-adapter.js

@@ -16,6 +16,9 @@ class HttpAdapter extends core_1.PlatformAdapter {
             throw new TypeError(`The document does not expose an HTTP Api`);
         this.handler = new http_handler_js_1.HttpHandler(this);
         this.interceptors = [...(options?.interceptors || [])];
+        this.basePath = options?.basePath || '/';
+        if (!this.basePath.startsWith('/'))
+            this.basePath = '/' + this.basePath;
     }
     get api() {
         return this.document.httpApi;

package/esm/express-adapter.js

@@ -15,7 +15,7 @@ export class ExpressAdapter extends HttpAdapter {
             throw new TypeError('document.api must be instance of HttpApi');
         for (const c of this.api.controllers.values())
             this._createControllers(c);
-        this._initRouter(options?.basePath);
+        this._initRouter();
     }
     get platform() {
         return 'express';
@@ -50,16 +50,9 @@ export class ExpressAdapter extends HttpAdapter {
         const controller = this.api.findController(controllerPath);
         return controller && this._controllerInstances.get(controller);
     }
-    _initRouter(basePath) {
+    _initRouter() {
         const router = Router();
-        if (basePath) {
-            if (!basePath.startsWith('/'))
-                basePath = '/' + basePath;
-            if (basePath)
-                this.app.use(basePath, router);
-        }
-        else
-            this.app.use(router);
+        this.app.use(this.basePath, router);
         const createContext = async (_req, _res, args) => {
             const request = HttpIncoming.from(_req);
             const response = HttpOutgoing.from(_res);

package/esm/http-adapter.js

@@ -13,6 +13,9 @@ export class HttpAdapter extends PlatformAdapter {
             throw new TypeError(`The document does not expose an HTTP Api`);
         this.handler = new HttpHandler(this);
         this.interceptors = [...(options?.interceptors || [])];
+        this.basePath = options?.basePath || '/';
+        if (!this.basePath.startsWith('/'))
+            this.basePath = '/' + this.basePath;
     }
     get api() {
         return this.document.httpApi;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/http",
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0-beta.5",
   "description": "Opra Http Server Adapter",
   "author": "Panates",
   "license": "MIT",
@@ -8,8 +8,8 @@
     "@browsery/antlr4": "^4.13.3-r1",
     "@browsery/http-parser": "^0.5.9-r1",
     "@browsery/type-is": "^1.6.18-r5",
-    "@opra/common": "^1.0.0-beta.4",
-    "@opra/core": "^1.0.0-beta.4",
+    "@opra/common": "^1.0.0-beta.5",
+    "@opra/core": "^1.0.0-beta.5",
     "accepts": "^1.3.8",
     "base64-stream": "^1.0.0",
     "busboy": "^1.6.0",

package/types/express-adapter.d.ts

@@ -8,6 +8,6 @@ export declare class ExpressAdapter extends HttpAdapter {
     get platform(): string;
     close(): Promise<void>;
     getControllerInstance<T>(controllerPath: string): T | undefined;
-    protected _initRouter(basePath?: string): void;
+    protected _initRouter(): void;
     protected _createControllers(controller: HttpController): void;
 }

package/types/http-adapter.d.ts

@@ -26,6 +26,7 @@ export declare namespace HttpAdapter {
 export declare abstract class HttpAdapter extends PlatformAdapter {
     readonly handler: HttpHandler;
     readonly protocol: OpraSchema.Transport;
+    readonly basePath: string;
     interceptors: (HttpAdapter.InterceptorFunction | HttpAdapter.IHttpInterceptor)[];
     protected constructor(document: ApiDocument, options?: HttpAdapter.Options);
     get api(): HttpApi;