@opra/nestjs 1.0.0-alpha.26 → 1.0.0-alpha.28

package/cjs/constants.js

@@ -1,4 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IS_PUBLIC_KEY = void 0;
-exports.IS_PUBLIC_KEY = 'isPublic';
+exports.OPRA_HTTP_MODULE_OPTIONS = exports.IS_PUBLIC_KEY = void 0;
+exports.IS_PUBLIC_KEY = 'opra:isPublic';
+exports.OPRA_HTTP_MODULE_OPTIONS = 'OPRA_HTTP_MODULE_OPTIONS';

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

@@ -7,6 +7,7 @@ const common_1 = require("@nestjs/common");
 const core_1 = require("@nestjs/core");
 const common_2 = require("@opra/common");
 const ts_gems_1 = require("ts-gems");
+const constants_1 = require("./constants");
 const opra_nestjs_adapter_js_1 = require("./opra-nestjs-adapter.js");
 const opra_exception_filter_1 = require("./services/opra-exception-filter");
 const opra_middleware_js_1 = require("./services/opra-middleware.js");
@@ -25,13 +26,28 @@ let OpraHttpCoreModule = OpraHttpCoreModule_1 = class OpraHttpCoreModule {
         const token = init?.id || opra_nestjs_adapter_js_1.OpraNestAdapter;
         const providers = [
             ...(init?.providers || []),
+            {
+                provide: constants_1.OPRA_HTTP_MODULE_OPTIONS,
+                useValue: { ...options },
+            },
             {
                 provide: opra_nestjs_adapter_js_1.OpraNestAdapter,
-                useFactory: async () => {
+                inject: [core_1.ModuleRef],
+                useFactory: async (moduleRef) => {
                     (0, ts_gems_1.asMutable)(opraAdapter).document = await common_2.ApiDocumentFactory.createDocument({
                         ...init,
                         api: { protocol: 'http', name: init.name, controllers: init.controllers },
                     });
+                    opraAdapter.interceptors.map(x => {
+                        if ((0, common_2.isConstructor)(x)) {
+                            return (ctx, next) => {
+                                const interceptor = moduleRef.get(x);
+                                if (typeof interceptor.intercept === 'function')
+                                    return interceptor.intercept(ctx, next());
+                            };
+                        }
+                        return x;
+                    });
                     return opraAdapter;
                 },
             },

package/cjs/opra-nestjs-adapter.js

@@ -15,16 +15,15 @@ class OpraNestAdapter extends core_1.HttpAdapter {
             const document = new common_2.ApiDocument();
             document.api = new common_2.HttpApi(document);
             return document;
-        })(), options);
+        })(), {
+            ...options,
+            interceptors: options?.interceptors,
+        });
         this.nestControllers = [];
         this.options = options;
         let basePath = options?.basePath || '/';
         if (!basePath.startsWith('/'))
             basePath = '/' + basePath;
-        if (options?.onError)
-            this.on('error', options.onError);
-        if (options?.onRequest)
-            this.on('request', options.onRequest);
         this._addRootController(basePath);
         if (init.controllers)
             init.controllers.forEach(c => this._addToNestControllers(c, basePath, []));
@@ -98,8 +97,6 @@ class OpraNestAdapter extends core_1.HttpAdapter {
                             });
                         }
                         /** Configure the HttpContext */
-                        context.adapter = adapter;
-                        context.document = adapter.document;
                         context.operation = operation;
                         context.controller = operation.owner;
                         context.controllerInstance = this;
@@ -169,10 +166,15 @@ class OpraNestAdapter extends core_1.HttpAdapter {
         for (const parent of parentTree) {
             const metadataKeys = Reflect.getOwnMetadataKeys(parent);
             for (const key of metadataKeys) {
+                if (typeof key === 'string' && key.startsWith('opra:') && !Reflect.hasOwnMetadata(key, target)) {
+                    const metadata = Reflect.getMetadata(key, parent);
+                    Reflect.defineMetadata(key, metadata, target);
+                    continue;
+                }
                 if (key === constants_1.GUARDS_METADATA || key === constants_1.INTERCEPTORS_METADATA || key === constants_1.EXCEPTION_FILTERS_METADATA) {
                     const m1 = Reflect.getMetadata(key, target) || [];
-                    const m2 = Reflect.getOwnMetadata(key, parent) || [];
                     const metadata = [...m1];
+                    const m2 = Reflect.getOwnMetadata(key, parent) || [];
                     m2.forEach((t) => {
                         if (!metadata.includes(t)) {
                             metadata.push(t);

package/cjs/services/opra-middleware.js

@@ -4,21 +4,33 @@ exports.OpraMiddleware = void 0;
 const tslib_1 = require("tslib");
 const common_1 = require("@nestjs/common");
 const core_1 = require("@opra/core");
+const constants_1 = require("../constants");
+const opra_nestjs_adapter_js_1 = require("../opra-nestjs-adapter.js");
 let OpraMiddleware = class OpraMiddleware {
+    constructor(opraAdapter, options) {
+        this.opraAdapter = opraAdapter;
+        this.options = options;
+    }
     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: {},
+        const context = new core_1.HttpContext({
+            adapter: this.opraAdapter,
             platform: req.route ? 'express' : 'fastify',
             request,
             response,
         });
-        next();
+        req.opraContext = context;
+        this.opraAdapter
+            .emitAsync('createContext', context)
+            .then(() => next())
+            .catch(next);
     }
 };
 exports.OpraMiddleware = OpraMiddleware;
 exports.OpraMiddleware = OpraMiddleware = tslib_1.__decorate([
-    (0, common_1.Injectable)()
+    (0, common_1.Injectable)(),
+    tslib_1.__param(1, (0, common_1.Inject)(constants_1.OPRA_HTTP_MODULE_OPTIONS)),
+    tslib_1.__metadata("design:paramtypes", [opra_nestjs_adapter_js_1.OpraNestAdapter, Object])
 ], OpraMiddleware);

package/esm/constants.js

@@ -1 +1,2 @@
-export const IS_PUBLIC_KEY = 'isPublic';
+export const IS_PUBLIC_KEY = 'opra:isPublic';
+export const OPRA_HTTP_MODULE_OPTIONS = 'OPRA_HTTP_MODULE_OPTIONS';

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

@@ -1,9 +1,10 @@
 var OpraHttpCoreModule_1;
 import { __decorate, __metadata } from "tslib";
 import { Global, Module, RequestMethod, } from '@nestjs/common';
-import { APP_FILTER } from '@nestjs/core';
-import { ApiDocumentFactory } from '@opra/common';
+import { APP_FILTER, ModuleRef } from '@nestjs/core';
+import { ApiDocumentFactory, isConstructor } from '@opra/common';
 import { asMutable } from 'ts-gems';
+import { OPRA_HTTP_MODULE_OPTIONS } from './constants';
 import { OpraNestAdapter } from './opra-nestjs-adapter.js';
 import { OpraExceptionFilter } from './services/opra-exception-filter';
 import { OpraMiddleware } from './services/opra-middleware.js';
@@ -22,13 +23,28 @@ let OpraHttpCoreModule = OpraHttpCoreModule_1 = class OpraHttpCoreModule {
         const token = init?.id || OpraNestAdapter;
         const providers = [
             ...(init?.providers || []),
+            {
+                provide: OPRA_HTTP_MODULE_OPTIONS,
+                useValue: { ...options },
+            },
             {
                 provide: OpraNestAdapter,
-                useFactory: async () => {
+                inject: [ModuleRef],
+                useFactory: async (moduleRef) => {
                     asMutable(opraAdapter).document = await ApiDocumentFactory.createDocument({
                         ...init,
                         api: { protocol: 'http', name: init.name, controllers: init.controllers },
                     });
+                    opraAdapter.interceptors.map(x => {
+                        if (isConstructor(x)) {
+                            return (ctx, next) => {
+                                const interceptor = moduleRef.get(x);
+                                if (typeof interceptor.intercept === 'function')
+                                    return interceptor.intercept(ctx, next());
+                            };
+                        }
+                        return x;
+                    });
                     return opraAdapter;
                 },
             },

package/esm/opra-nestjs-adapter.js

@@ -12,16 +12,15 @@ export class OpraNestAdapter extends HttpAdapter {
             const document = new ApiDocument();
             document.api = new HttpApi(document);
             return document;
-        })(), options);
+        })(), {
+            ...options,
+            interceptors: options?.interceptors,
+        });
         this.nestControllers = [];
         this.options = options;
         let basePath = options?.basePath || '/';
         if (!basePath.startsWith('/'))
             basePath = '/' + basePath;
-        if (options?.onError)
-            this.on('error', options.onError);
-        if (options?.onRequest)
-            this.on('request', options.onRequest);
         this._addRootController(basePath);
         if (init.controllers)
             init.controllers.forEach(c => this._addToNestControllers(c, basePath, []));
@@ -95,8 +94,6 @@ export class OpraNestAdapter extends HttpAdapter {
                             });
                         }
                         /** Configure the HttpContext */
-                        context.adapter = adapter;
-                        context.document = adapter.document;
                         context.operation = operation;
                         context.controller = operation.owner;
                         context.controllerInstance = this;
@@ -166,10 +163,15 @@ export class OpraNestAdapter extends HttpAdapter {
         for (const parent of parentTree) {
             const metadataKeys = Reflect.getOwnMetadataKeys(parent);
             for (const key of metadataKeys) {
+                if (typeof key === 'string' && key.startsWith('opra:') && !Reflect.hasOwnMetadata(key, target)) {
+                    const metadata = Reflect.getMetadata(key, parent);
+                    Reflect.defineMetadata(key, metadata, target);
+                    continue;
+                }
                 if (key === GUARDS_METADATA || key === INTERCEPTORS_METADATA || key === EXCEPTION_FILTERS_METADATA) {
                     const m1 = Reflect.getMetadata(key, target) || [];
-                    const m2 = Reflect.getOwnMetadata(key, parent) || [];
                     const metadata = [...m1];
+                    const m2 = Reflect.getOwnMetadata(key, parent) || [];
                     m2.forEach((t) => {
                         if (!metadata.includes(t)) {
                             metadata.push(t);

package/esm/services/opra-middleware.js

@@ -1,21 +1,33 @@
-import { __decorate } from "tslib";
-import { Injectable } from '@nestjs/common';
+import { __decorate, __metadata, __param } from "tslib";
+import { Inject, Injectable } from '@nestjs/common';
 import { HttpContext, HttpIncoming, HttpOutgoing } from '@opra/core';
+import { OPRA_HTTP_MODULE_OPTIONS } from '../constants';
+import { OpraNestAdapter } from '../opra-nestjs-adapter.js';
 let OpraMiddleware = class OpraMiddleware {
+    constructor(opraAdapter, options) {
+        this.opraAdapter = opraAdapter;
+        this.options = options;
+    }
     use(req, res, next) {
         const request = HttpIncoming.from(req);
         const response = HttpOutgoing.from(res);
         /** Create the HttpContext */
-        req.opraContext = new HttpContext({
-            adapter: {},
+        const context = new HttpContext({
+            adapter: this.opraAdapter,
             platform: req.route ? 'express' : 'fastify',
             request,
             response,
         });
-        next();
+        req.opraContext = context;
+        this.opraAdapter
+            .emitAsync('createContext', context)
+            .then(() => next())
+            .catch(next);
     }
 };
 OpraMiddleware = __decorate([
-    Injectable()
+    Injectable(),
+    __param(1, Inject(OPRA_HTTP_MODULE_OPTIONS)),
+    __metadata("design:paramtypes", [OpraNestAdapter, Object])
 ], OpraMiddleware);
 export { OpraMiddleware };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/nestjs",
-  "version": "1.0.0-alpha.26",
+  "version": "1.0.0-alpha.28",
   "description": "Opra NestJS module",
   "author": "Panates",
   "license": "MIT",
@@ -27,10 +27,11 @@
     "clean:cover": "rimraf ../../coverage/client"
   },
   "dependencies": {
-    "@opra/common": "^1.0.0-alpha.26",
-    "@opra/core": "^1.0.0-alpha.26",
+    "@opra/common": "^1.0.0-alpha.28",
+    "@opra/core": "^1.0.0-alpha.28",
     "fast-tokenizer": "^1.3.0",
     "lodash.head": "^4.0.1",
+    "putil-promisify": "^1.10.1",
     "reflect-metadata": "^0.2.2"
   },
   "peerDependencies": {

package/types/constants.d.ts

@@ -1 +1,2 @@
-export declare const IS_PUBLIC_KEY = "isPublic";
+export declare const IS_PUBLIC_KEY = "opra:isPublic";
+export declare const OPRA_HTTP_MODULE_OPTIONS = "OPRA_HTTP_MODULE_OPTIONS";

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

@@ -1,4 +1,4 @@
-import { DynamicModule } from '@nestjs/common';
+import { DynamicModule, Type } from '@nestjs/common';
 import { ApiDocumentFactory } from '@opra/common';
 import { HttpAdapter } from '@opra/core';
 export declare namespace OpraHttpModule {
@@ -9,8 +9,7 @@ export declare namespace OpraHttpModule {
     interface Options {
         basePath?: string;
         schemaRouteIsPublic?: boolean;
-        onRequest?: HttpAdapter.Events['request'];
-        onError?: HttpAdapter.Events['error'];
+        interceptors?: (HttpAdapter.InterceptorFunction | HttpAdapter.IHttpInterceptor | Type<HttpAdapter.IHttpInterceptor>)[];
     }
 }
 export declare class OpraHttpModule {

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

@@ -1,5 +1,10 @@
 import { NestMiddleware } from '@nestjs/common';
 import type { NextFunction, Request, Response } from 'express';
+import type { OpraHttpModule } from '../opra-http.module.js';
+import { OpraNestAdapter } from '../opra-nestjs-adapter.js';
 export declare class OpraMiddleware implements NestMiddleware {
+    protected opraAdapter: OpraNestAdapter;
+    protected options: OpraHttpModule.Options;
+    constructor(opraAdapter: OpraNestAdapter, options: OpraHttpModule.Options);
     use(req: Request, res: Response, next: NextFunction): void;
 }