@opra/nestjs 1.21.0 → 1.22.0

package/{esm/mq-controller.factory.js → mq-controller.factory.js}

@@ -1,8 +1,5 @@
 import { MQ_CONTROLLER_METADATA } from '@opra/common';
 import { RpcControllerFactory } from './rpc-controller.factory.js';
 export class MQControllerFactory extends RpcControllerFactory {
-    constructor() {
-        super(...arguments);
-        this._metadataKey = MQ_CONTROLLER_METADATA;
-    }
+    _metadataKey = MQ_CONTROLLER_METADATA;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/nestjs",
-  "version": "1.21.0",
+  "version": "1.22.0",
   "description": "Opra NestJS module",
   "author": "Panates",
   "license": "MIT",
@@ -10,47 +10,30 @@
     "tslib": "^2.8.1"
   },
   "peerDependencies": {
-    "@opra/common": "^1.21.0",
-    "@opra/core": "^1.21.0",
+    "@opra/common": "^1.22.0",
+    "@opra/core": "^1.22.0",
     "@nestjs/common": "^10.0.0 || ^11.0.0",
     "@nestjs/core": "^10.0.0 || ^11.0.0",
     "@nestjs/microservices": "^10.0.0 || ^11.0.0"
   },
-  "type": "module",
   "exports": {
     ".": {
-      "import": {
-        "types": "./types/index.d.ts",
-        "default": "./esm/index.js"
-      },
-      "require": {
-        "types": "./types/index.d.cts",
-        "default": "./cjs/index.js"
-      },
-      "default": "./esm/index.js"
+      "types": "./index.d.ts",
+      "default": "./index.js"
     },
     "./package.json": "./package.json"
   },
-  "main": "./cjs/index.js",
-  "module": "./esm/index.js",
-  "types": "./types/index.d.ts",
+  "type": "module",
+  "module": "./index.js",
+  "types": "./index.d.ts",
+  "engines": {
+    "node": ">=20.0"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/panates/opra.git",
     "directory": "packages/nestjs"
   },
-  "engines": {
-    "node": ">=16.0",
-    "npm": ">=7.0.0"
-  },
-  "files": [
-    "bin/",
-    "cjs/",
-    "esm/",
-    "types/",
-    "LICENSE",
-    "README.md"
-  ],
   "keywords": [
     "opra",
     "nestjs",

package/{esm/rpc-controller.factory.js → rpc-controller.factory.js}

@@ -10,12 +10,15 @@ import { RPC_CONTROLLER_METADATA } from '@opra/common';
 import { OpraNestUtils } from './opra-nest-utils.js';
 import { RpcParamsFactory } from './rpc-params.factory.js';
 let RpcControllerFactory = class RpcControllerFactory {
+    modulesContainer;
+    externalContextCreator;
+    _metadataKey = RPC_CONTROLLER_METADATA;
+    _coreModuleRef;
+    paramsFactory = new RpcParamsFactory();
+    injector = new Injector();
     constructor(modulesContainer, externalContextCreator) {
         this.modulesContainer = modulesContainer;
         this.externalContextCreator = externalContextCreator;
-        this._metadataKey = RPC_CONTROLLER_METADATA;
-        this.paramsFactory = new RpcParamsFactory();
-        this.injector = new Injector();
     }
     wrapControllers() {
         const out = [];

package/{esm/ws-controller.factory.js → ws-controller.factory.js}

@@ -1,8 +1,5 @@
 import { WS_CONTROLLER_METADATA } from '@opra/common';
 import { RpcControllerFactory } from './rpc-controller.factory.js';
 export class WSControllerFactory extends RpcControllerFactory {
-    constructor() {
-        super(...arguments);
-        this._metadataKey = WS_CONTROLLER_METADATA;
-    }
+    _metadataKey = WS_CONTROLLER_METADATA;
 }

package/cjs/augmentation/nestjs.augmentation.js

@@ -1,25 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const common_1 = require("@nestjs/common");
-const external_exception_filter_js_1 = require("@nestjs/core/exceptions/external-exception-filter.js");
-const common_2 = require("@opra/common");
-var WSControllerDecoratorFactory = common_2.classes.WSControllerDecoratorFactory;
-const { MQControllerDecoratorFactory } = common_2.classes;
-const oldCatchMethod = external_exception_filter_js_1.ExternalExceptionFilter.prototype.catch;
-external_exception_filter_js_1.ExternalExceptionFilter.prototype.catch = function (exception, host) {
-    const opraContext = host.getArgByIndex(3);
-    // Prevents error logging for all Opra controllers
-    if (opraContext && opraContext.request && opraContext.response)
-        throw exception;
-    oldCatchMethod(exception, host);
-};
-MQControllerDecoratorFactory.augment((decorator, decoratorChain) => {
-    decoratorChain.push((_, target) => {
-        (0, common_1.Controller)()(target);
-    });
-});
-WSControllerDecoratorFactory.augment((decorator, decoratorChain) => {
-    decoratorChain.push((_, target) => {
-        (0, common_1.Controller)()(target);
-    });
-});

package/cjs/constants.js

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

package/cjs/decorators/public.decorator.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Public = void 0;
-const common_1 = require("@nestjs/common");
-const constants_js_1 = require("../constants.js");
-const Public = () => (0, common_1.SetMetadata)(constants_js_1.IS_PUBLIC_KEY, true);
-exports.Public = Public;

package/cjs/index.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-require("reflect-metadata");
-require("./augmentation/nestjs.augmentation.js");
-tslib_1.__exportStar(require("./constants.js"), exports);
-tslib_1.__exportStar(require("./decorators/public.decorator.js"), exports);
-tslib_1.__exportStar(require("./mq-controller.factory.js"), exports);
-tslib_1.__exportStar(require("./opra-nest-utils.js"), exports);
-tslib_1.__exportStar(require("./rpc-controller.factory.js"), exports);
-tslib_1.__exportStar(require("./rpc-params.factory.js"), exports);
-tslib_1.__exportStar(require("./ws-controller.factory.js"), exports);

package/cjs/mq-controller.factory.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MQControllerFactory = void 0;
-const common_1 = require("@opra/common");
-const rpc_controller_factory_js_1 = require("./rpc-controller.factory.js");
-class MQControllerFactory extends rpc_controller_factory_js_1.RpcControllerFactory {
-    constructor() {
-        super(...arguments);
-        this._metadataKey = common_1.MQ_CONTROLLER_METADATA;
-    }
-}
-exports.MQControllerFactory = MQControllerFactory;

package/cjs/opra-nest-utils.js

@@ -1,36 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OpraNestUtils = void 0;
-const GUARDS_METADATA = '__guards__';
-const INTERCEPTORS_METADATA = '__interceptors__';
-const EXCEPTION_FILTERS_METADATA = '__exceptionFilters__';
-class OpraNestUtils {
-    static copyDecoratorMetadata(target, ...source) {
-        for (const parent of source) {
-            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 metadata = [...m1];
-                    const m2 = Reflect.getOwnMetadata(key, parent) || [];
-                    m2.forEach((t) => {
-                        if (!metadata.includes(t)) {
-                            metadata.push(t);
-                        }
-                    });
-                    Reflect.defineMetadata(key, metadata, target);
-                }
-            }
-        }
-    }
-}
-exports.OpraNestUtils = OpraNestUtils;

package/cjs/package.json

@@ -1,3 +0,0 @@
-{
-  "type": "commonjs"
-}

package/cjs/rpc-controller.factory.js

@@ -1,120 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RpcControllerFactory = void 0;
-const tslib_1 = require("tslib");
-const common_1 = require("@nestjs/common");
-const core_1 = require("@nestjs/core");
-const external_context_creator_js_1 = require("@nestjs/core/helpers/external-context-creator.js");
-const injector_js_1 = require("@nestjs/core/injector/injector.js");
-const index_js_1 = require("@nestjs/core/injector/internal-core-module/index.js");
-const request_constants_js_1 = require("@nestjs/core/router/request/request-constants.js");
-const constants_js_1 = require("@nestjs/microservices/constants.js");
-const common_2 = require("@opra/common");
-const opra_nest_utils_js_1 = require("./opra-nest-utils.js");
-const rpc_params_factory_js_1 = require("./rpc-params.factory.js");
-let RpcControllerFactory = class RpcControllerFactory {
-    constructor(modulesContainer, externalContextCreator) {
-        this.modulesContainer = modulesContainer;
-        this.externalContextCreator = externalContextCreator;
-        this._metadataKey = common_2.RPC_CONTROLLER_METADATA;
-        this.paramsFactory = new rpc_params_factory_js_1.RpcParamsFactory();
-        this.injector = new injector_js_1.Injector();
-    }
-    wrapControllers() {
-        const out = [];
-        for (const { module, wrapper } of this.exploreControllers()) {
-            const instance = wrapper.instance;
-            const sourceClass = instance.constructor;
-            const metadata = Reflect.getMetadata(this._metadataKey, sourceClass);
-            const isRequestScoped = !wrapper.isDependencyTreeStatic();
-            /** Create a new controller class */
-            const newClass = {
-                [sourceClass.name]: class extends sourceClass {
-                },
-            }[sourceClass.name];
-            /** Copy metadata keys from source class to new one */
-            opra_nest_utils_js_1.OpraNestUtils.copyDecoratorMetadata(newClass, sourceClass);
-            (0, common_1.Controller)()(newClass);
-            out.push(newClass);
-            if (metadata.operations) {
-                for (const operationName of Object.keys(metadata.operations)) {
-                    // const orgFn: Function = sourceClass.prototype[operationName];
-                    newClass.prototype[operationName] = this._createContextCallback(instance, wrapper, module, operationName, isRequestScoped, 'rpc');
-                    Reflect.defineMetadata(constants_js_1.PARAM_ARGS_METADATA, [core_1.REQUEST], instance.constructor, operationName);
-                }
-            }
-        }
-        return out;
-    }
-    _createContextCallback(instance, wrapper, moduleRef, methodName, isRequestScoped, contextType, options) {
-        const paramsFactory = this.paramsFactory;
-        if (isRequestScoped) {
-            return async (opraContext) => {
-                const contextId = (0, core_1.createContextId)();
-                Object.defineProperty(opraContext, request_constants_js_1.REQUEST_CONTEXT_ID, {
-                    value: contextId,
-                    enumerable: false,
-                    configurable: false,
-                    writable: false,
-                });
-                this.registerContextProvider(opraContext, contextId);
-                const contextInstance = await this.injector.loadPerContext(instance, moduleRef, moduleRef.providers, contextId);
-                const contextCallback = this.externalContextCreator.create(contextInstance, contextInstance[methodName], methodName, constants_js_1.PARAM_ARGS_METADATA, paramsFactory, contextId, wrapper.id, options, opraContext.transport);
-                return contextCallback(opraContext);
-            };
-        }
-        return this.externalContextCreator.create(instance, instance[methodName], methodName, constants_js_1.PARAM_ARGS_METADATA, paramsFactory, undefined, undefined, options, contextType);
-    }
-    registerContextProvider(request, contextId) {
-        if (!this._coreModuleRef) {
-            const coreModuleArray = [...this.modulesContainer.entries()]
-                .filter(
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            ([_, { metatype }]) => metatype && metatype.name === index_js_1.InternalCoreModule.name)
-                // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                .map(([_, value]) => value);
-            this._coreModuleRef = coreModuleArray[0];
-        }
-        if (!this._coreModuleRef) {
-            return;
-        }
-        const wrapper = this._coreModuleRef.getProviderByKey(core_1.REQUEST);
-        wrapper.setInstanceByContextId(contextId, {
-            instance: request,
-            isResolved: true,
-        });
-    }
-    exploreControllers() {
-        const scannedModules = new Set();
-        const controllers = new Set();
-        const scanModule = (module) => {
-            if (scannedModules.has(module))
-                return;
-            scannedModules.add(module);
-            for (const mm of module.imports.values()) {
-                scanModule(mm);
-            }
-            for (const wrapper of module.controllers.values()) {
-                if (wrapper.instance &&
-                    typeof wrapper.instance === 'object' &&
-                    wrapper.instance.constructor &&
-                    Reflect.getMetadata(this._metadataKey, wrapper.instance.constructor) &&
-                    !controllers.has(wrapper)) {
-                    controllers.add({ module, wrapper });
-                }
-                if (wrapper.host)
-                    scanModule(wrapper.host);
-            }
-        };
-        for (const module of this.modulesContainer.values()) {
-            scanModule(module);
-        }
-        return Array.from(controllers);
-    }
-};
-exports.RpcControllerFactory = RpcControllerFactory;
-exports.RpcControllerFactory = RpcControllerFactory = tslib_1.__decorate([
-    (0, common_1.Injectable)(),
-    tslib_1.__metadata("design:paramtypes", [core_1.ModulesContainer,
-        external_context_creator_js_1.ExternalContextCreator])
-], RpcControllerFactory);

package/cjs/rpc-params.factory.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RpcParamsFactory = void 0;
-class RpcParamsFactory {
-    exchangeKeyForValue(type, data, args) {
-        if (!args) {
-            return null;
-        }
-        args = Array.isArray(args) ? args : [];
-        return args[0];
-    }
-}
-exports.RpcParamsFactory = RpcParamsFactory;

package/cjs/ws-controller.factory.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WSControllerFactory = void 0;
-const common_1 = require("@opra/common");
-const rpc_controller_factory_js_1 = require("./rpc-controller.factory.js");
-class WSControllerFactory extends rpc_controller_factory_js_1.RpcControllerFactory {
-    constructor() {
-        super(...arguments);
-        this._metadataKey = common_1.WS_CONTROLLER_METADATA;
-    }
-}
-exports.WSControllerFactory = WSControllerFactory;

package/esm/package.json

@@ -1,3 +0,0 @@
-{
-  "type": "module"
-}

package/types/index.d.cts

@@ -1,9 +0,0 @@
-import 'reflect-metadata';
-import './augmentation/nestjs.augmentation.js';
-export * from './constants.js';
-export * from './decorators/public.decorator.js';
-export * from './mq-controller.factory.js';
-export * from './opra-nest-utils.js';
-export * from './rpc-controller.factory.js';
-export * from './rpc-params.factory.js';
-export * from './ws-controller.factory.js';