@opra/nestjs 1.0.0-alpha.2 → 1.0.0-alpha.4

package/cjs/opra-http-core.module.js

@@ -7,10 +7,17 @@ const ts_gems_1 = require("ts-gems");
 const common_1 = require("@nestjs/common");
 const common_2 = require("@opra/common");
 const opra_nestjs_adapter_js_1 = require("./opra-nestjs-adapter.js");
+const opra_middleware_js_1 = require("./services/opra-middleware.js");
 let OpraHttpCoreModule = OpraHttpCoreModule_1 = class OpraHttpCoreModule {
     constructor(opraAdapter) {
         this.opraAdapter = opraAdapter;
     }
+    configure(consumer) {
+        consumer.apply(opra_middleware_js_1.OpraMiddleware).forRoutes({
+            path: '*',
+            method: common_1.RequestMethod.ALL,
+        });
+    }
     static forRoot(options) {
         const opraAdapter = new opra_nestjs_adapter_js_1.OpraNestAdapter(options);
         const token = options?.id || opra_nestjs_adapter_js_1.OpraNestAdapter;

package/cjs/opra-nestjs-adapter.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpraNestAdapter = exports.kHandler = void 0;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
+const ts_gems_1 = require("ts-gems");
 const common_1 = require("@nestjs/common");
 const common_2 = require("@opra/common");
 const core_1 = require("@opra/core");
@@ -15,7 +16,6 @@ class OpraNestAdapter extends core_1.HttpAdapter {
             document.api = new common_2.HttpApi(document);
             return document;
         })(), options);
-        // protected _platform: string = 'express';
         this.controllers = [];
         let basePath = options.basePath || '/';
         if (!basePath.startsWith('/'))
@@ -46,41 +46,30 @@ class OpraNestAdapter extends core_1.HttpAdapter {
                 Object.defineProperty(newClass.prototype, k, {
                     writable: true,
                     /** NestJS handler method */
-                    async value(_req, _res) {
-                        const request = core_1.HttpIncoming.from(_req);
-                        const response = core_1.HttpOutgoing.from(_res);
+                    async value(_req) {
                         const api = adapter.document.api;
                         const controller = api.findController(newClass);
                         const operation = controller?.operations.get(k);
-                        if (!(operation && typeof operationHandler === 'function'))
+                        const context = (0, ts_gems_1.asMutable)(_req.opraContext);
+                        if (!(context && operation && typeof operationHandler === 'function'))
                             throw new common_2.NotFoundError({
-                                message: `No endpoint found for [${request.method}]${request.baseUrl}`,
+                                message: `No endpoint found for [${_req.method}]${_req.baseUrl}`,
                                 details: {
-                                    path: request.baseUrl,
-                                    method: request.method,
+                                    path: _req.baseUrl,
+                                    method: _req.method,
                                 },
                             });
-                        /** Create the HttpContext */
-                        const context = new core_1.HttpContext({
-                            adapter,
-                            platform: _req.route ? 'express' : 'fastify',
-                            platformArgs: {
-                                request,
-                                response,
-                            },
-                            request,
-                            response,
-                            operation,
-                            controller: operation.owner,
-                            controllerInstance: this,
-                            operationHandler,
-                        });
+                        /** Configure the HttpContext */
+                        context.adapter = adapter;
+                        context.document = adapter.document;
+                        context.operation = operation;
+                        context.controller = operation.owner;
+                        context.controllerInstance = this;
+                        context.operationHandler = operationHandler;
                         /** Handle request */
                         await adapter[exports.kHandler].handleRequest(context);
                     },
                 });
-                (0, common_1.Req)()(newClass.prototype, k, 0);
-                (0, common_1.Res)()(newClass.prototype, k, 1);
                 /** Copy metadata keys from source function to new one */
                 const metadataKeys = Reflect.getOwnMetadataKeys(operationHandler);
                 const newFn = newClass.prototype[k];
@@ -88,6 +77,8 @@ class OpraNestAdapter extends core_1.HttpAdapter {
                     const m = Reflect.getMetadata(key, operationHandler);
                     Reflect.defineMetadata(key, m, newFn);
                 }
+                (0, common_1.Req)()(newClass.prototype, k, 0);
+                (0, common_1.Res)()(newClass.prototype, k, 1);
                 const descriptor = Object.getOwnPropertyDescriptor(newClass.prototype, k);
                 const operationPath = newPath + (v.path || '');
                 switch (v.method || 'GET') {

package/cjs/services/opra-middleware.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OpraMiddleware = void 0;
+const tslib_1 = require("tslib");
+const common_1 = require("@nestjs/common");
+const core_1 = require("@opra/core");
+let OpraMiddleware = class OpraMiddleware {
+    use(req, res, next) {
+        const request = core_1.HttpIncoming.from(req);
+        const response = core_1.HttpOutgoing.from(res);
+        /** Create the HttpContext */
+        req.opraContext = new core_1.HttpContext({
+            adapter: {},
+            platform: req.route ? 'express' : 'fastify',
+            request,
+            response,
+        });
+        next();
+    }
+};
+exports.OpraMiddleware = OpraMiddleware;
+exports.OpraMiddleware = OpraMiddleware = tslib_1.__decorate([
+    (0, common_1.Injectable)()
+], OpraMiddleware);

package/esm/opra-http-core.module.js

@@ -1,13 +1,20 @@
 var OpraHttpCoreModule_1;
 import { __decorate, __metadata } from "tslib";
 import { asMutable } from 'ts-gems';
-import { Global, Module } from '@nestjs/common';
+import { Global, Module, RequestMethod, } from '@nestjs/common';
 import { ApiDocumentFactory } from '@opra/common';
 import { OpraNestAdapter } from './opra-nestjs-adapter.js';
+import { OpraMiddleware } from './services/opra-middleware.js';
 let OpraHttpCoreModule = OpraHttpCoreModule_1 = class OpraHttpCoreModule {
     constructor(opraAdapter) {
         this.opraAdapter = opraAdapter;
     }
+    configure(consumer) {
+        consumer.apply(OpraMiddleware).forRoutes({
+            path: '*',
+            method: RequestMethod.ALL,
+        });
+    }
     static forRoot(options) {
         const opraAdapter = new OpraNestAdapter(options);
         const token = options?.id || OpraNestAdapter;

package/esm/opra-nestjs-adapter.js

@@ -1,7 +1,8 @@
 import nodePath from 'path';
+import { asMutable } from 'ts-gems';
 import { Controller, Delete, Get, Head, Options, Patch, Post, Put, Req, Res, Search, UseFilters, } from '@nestjs/common';
 import { ApiDocument, HTTP_CONTROLLER_METADATA, HttpApi, isConstructor, NotFoundError, } from '@opra/common';
-import { HttpAdapter, HttpContext, HttpIncoming, HttpOutgoing } from '@opra/core';
+import { HttpAdapter } from '@opra/core';
 import { OpraExceptionFilter } from './services/opra-exception-filter.js';
 export const kHandler = Symbol.for('kHandler');
 export class OpraNestAdapter extends HttpAdapter {
@@ -11,7 +12,6 @@ export class OpraNestAdapter extends HttpAdapter {
             document.api = new HttpApi(document);
             return document;
         })(), options);
-        // protected _platform: string = 'express';
         this.controllers = [];
         let basePath = options.basePath || '/';
         if (!basePath.startsWith('/'))
@@ -42,41 +42,30 @@ export class OpraNestAdapter extends HttpAdapter {
                 Object.defineProperty(newClass.prototype, k, {
                     writable: true,
                     /** NestJS handler method */
-                    async value(_req, _res) {
-                        const request = HttpIncoming.from(_req);
-                        const response = HttpOutgoing.from(_res);
+                    async value(_req) {
                         const api = adapter.document.api;
                         const controller = api.findController(newClass);
                         const operation = controller?.operations.get(k);
-                        if (!(operation && typeof operationHandler === 'function'))
+                        const context = asMutable(_req.opraContext);
+                        if (!(context && operation && typeof operationHandler === 'function'))
                             throw new NotFoundError({
-                                message: `No endpoint found for [${request.method}]${request.baseUrl}`,
+                                message: `No endpoint found for [${_req.method}]${_req.baseUrl}`,
                                 details: {
-                                    path: request.baseUrl,
-                                    method: request.method,
+                                    path: _req.baseUrl,
+                                    method: _req.method,
                                 },
                             });
-                        /** Create the HttpContext */
-                        const context = new HttpContext({
-                            adapter,
-                            platform: _req.route ? 'express' : 'fastify',
-                            platformArgs: {
-                                request,
-                                response,
-                            },
-                            request,
-                            response,
-                            operation,
-                            controller: operation.owner,
-                            controllerInstance: this,
-                            operationHandler,
-                        });
+                        /** Configure the HttpContext */
+                        context.adapter = adapter;
+                        context.document = adapter.document;
+                        context.operation = operation;
+                        context.controller = operation.owner;
+                        context.controllerInstance = this;
+                        context.operationHandler = operationHandler;
                         /** Handle request */
                         await adapter[kHandler].handleRequest(context);
                     },
                 });
-                Req()(newClass.prototype, k, 0);
-                Res()(newClass.prototype, k, 1);
                 /** Copy metadata keys from source function to new one */
                 const metadataKeys = Reflect.getOwnMetadataKeys(operationHandler);
                 const newFn = newClass.prototype[k];
@@ -84,6 +73,8 @@ export class OpraNestAdapter extends HttpAdapter {
                     const m = Reflect.getMetadata(key, operationHandler);
                     Reflect.defineMetadata(key, m, newFn);
                 }
+                Req()(newClass.prototype, k, 0);
+                Res()(newClass.prototype, k, 1);
                 const descriptor = Object.getOwnPropertyDescriptor(newClass.prototype, k);
                 const operationPath = newPath + (v.path || '');
                 switch (v.method || 'GET') {

package/esm/services/opra-middleware.js

@@ -0,0 +1,21 @@
+import { __decorate } from "tslib";
+import { Injectable } from '@nestjs/common';
+import { HttpContext, HttpIncoming, HttpOutgoing } from '@opra/core';
+let OpraMiddleware = class OpraMiddleware {
+    use(req, res, next) {
+        const request = HttpIncoming.from(req);
+        const response = HttpOutgoing.from(res);
+        /** Create the HttpContext */
+        req.opraContext = new HttpContext({
+            adapter: {},
+            platform: req.route ? 'express' : 'fastify',
+            request,
+            response,
+        });
+        next();
+    }
+};
+OpraMiddleware = __decorate([
+    Injectable()
+], OpraMiddleware);
+export { OpraMiddleware };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/nestjs",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.4",
   "description": "Opra NestJS module",
   "author": "Panates",
   "license": "MIT",
@@ -18,8 +18,8 @@
     "postbuild": "cp README.md package.json ../../LICENSE ../../build/nestjs && cp ../../package.cjs.json ../../build/nestjs/cjs/package.json",
     "lint": "eslint . --max-warnings=0",
     "format": "prettier . --write --log-level=warn",
-    "test": "jest",
-    "cover": "jest --collect-coverage",
+    "test": "jest --passWithNoTests",
+    "cover": "jest --passWithNoTests --collect-coverage",
     "clean": "npm run clean:src && npm run clean:test && npm run clean:dist && npm run clean:cover",
     "clean:src": "ts-cleanup -s src --all",
     "clean:test": "ts-cleanup -s test --all",
@@ -27,8 +27,8 @@
     "clean:cover": "rimraf ../../coverage/client"
   },
   "dependencies": {
-    "@opra/common": "^1.0.0-alpha.2",
-    "@opra/core": "^1.0.0-alpha.2",
+    "@opra/common": "^1.0.0-alpha.4",
+    "@opra/core": "^1.0.0-alpha.4",
     "fast-tokenizer": "^1.3.0",
     "lodash.head": "^4.0.1",
     "reflect-metadata": "^0.2.2"

package/types/opra-http-core.module.d.ts

@@ -1,9 +1,10 @@
-import { DynamicModule, OnModuleDestroy } from '@nestjs/common';
+import { DynamicModule, MiddlewareConsumer, NestModule, OnModuleDestroy } from '@nestjs/common';
 import type { OpraHttpModule } from './opra-http.module';
 import { OpraNestAdapter } from './opra-nestjs-adapter.js';
-export declare class OpraHttpCoreModule implements OnModuleDestroy {
+export declare class OpraHttpCoreModule implements OnModuleDestroy, NestModule {
     protected opraAdapter: OpraNestAdapter;
     constructor(opraAdapter: OpraNestAdapter);
+    configure(consumer: MiddlewareConsumer): void;
     static forRoot(options: OpraHttpModule.Options): DynamicModule;
     onModuleDestroy(): Promise<void>;
 }

package/types/services/opra-middleware.d.ts

@@ -0,0 +1,5 @@
+import type { NextFunction, Request, Response } from 'express';
+import { NestMiddleware } from '@nestjs/common';
+export declare class OpraMiddleware implements NestMiddleware {
+    use(req: Request, res: Response, next: NextFunction): void;
+}