@opra/nestjs-rabbitmq 1.20.0 → 1.22.0

package/constants.d.ts

@@ -0,0 +1 @@
+export declare const OPRA_RMQ_MODULE_OPTIONS = "OPRA_RMQ_MODULE_OPTIONS";

package/constants.js

@@ -0,0 +1 @@
+export const OPRA_RMQ_MODULE_OPTIONS = 'OPRA_RMQ_MODULE_OPTIONS';

package/{types/opra-rabbitmq-core.module.d.ts → opra-rabbitmq-core.module.d.ts}

@@ -5,8 +5,8 @@ import type { OpraRabbitmqModule } from './opra-rabbitmq.module.js';
 export declare class OpraRabbitmqCoreModule implements OnModuleInit, OnApplicationBootstrap, OnApplicationShutdown {
     private controllerFactory;
     protected adapter: RabbitmqAdapter;
-    protected config: OpraRabbitmqModule.ApiConfig;
-    constructor(controllerFactory: MQControllerFactory, adapter: RabbitmqAdapter, config: OpraRabbitmqModule.ApiConfig);
+    protected config: OpraRabbitmqModule.ModuleOptions;
+    constructor(controllerFactory: MQControllerFactory, adapter: RabbitmqAdapter, config: OpraRabbitmqModule.ModuleOptions);
     static forRoot(moduleOptions: OpraRabbitmqModule.ModuleOptions): DynamicModule;
     static forRootAsync(moduleOptions: OpraRabbitmqModule.AsyncModuleOptions): DynamicModule;
     protected static _getDynamicModule(moduleOptions: OpraRabbitmqModule.ModuleOptions | OpraRabbitmqModule.AsyncModuleOptions): DynamicModule;

package/{esm/opra-rabbitmq-core.module.js → opra-rabbitmq-core.module.js}

@@ -6,9 +6,12 @@ import { ModuleRef } from '@nestjs/core';
 import { ApiDocumentFactory } from '@opra/common';
 import { MQControllerFactory } from '@opra/nestjs';
 import { RabbitmqAdapter } from '@opra/rabbitmq';
-import { OPRA_RMQ_MODULE_CONFIG } from './constants.js';
+import { OPRA_RMQ_MODULE_OPTIONS } from './constants.js';
 const opraRabbitmqNestjsAdapterToken = Symbol('OpraRabbitmqNestjsAdapter');
 let OpraRabbitmqCoreModule = OpraRabbitmqCoreModule_1 = class OpraRabbitmqCoreModule {
+    controllerFactory;
+    adapter;
+    config;
     constructor(controllerFactory, adapter, config) {
         this.controllerFactory = controllerFactory;
         this.adapter = adapter;
@@ -20,7 +23,7 @@ let OpraRabbitmqCoreModule = OpraRabbitmqCoreModule_1 = class OpraRabbitmqCoreMo
             providers: [
                 ...(moduleOptions?.providers || []),
                 {
-                    provide: OPRA_RMQ_MODULE_CONFIG,
+                    provide: OPRA_RMQ_MODULE_OPTIONS,
                     useValue: {
                         ...moduleOptions,
                         logger: moduleOptions.logger || new Logger(moduleOptions.name),
@@ -37,7 +40,7 @@ let OpraRabbitmqCoreModule = OpraRabbitmqCoreModule_1 = class OpraRabbitmqCoreMo
             providers: [
                 ...(moduleOptions?.providers || []),
                 {
-                    provide: OPRA_RMQ_MODULE_CONFIG,
+                    provide: OPRA_RMQ_MODULE_OPTIONS,
                     inject: moduleOptions.inject,
                     useFactory: async (...args) => {
                         const result = await moduleOptions.useFactory(...args);
@@ -52,11 +55,11 @@ let OpraRabbitmqCoreModule = OpraRabbitmqCoreModule_1 = class OpraRabbitmqCoreMo
         const token = moduleOptions.id || RabbitmqAdapter;
         const adapterProvider = {
             provide: token,
-            inject: [MQControllerFactory, ModuleRef, OPRA_RMQ_MODULE_CONFIG],
+            inject: [MQControllerFactory, ModuleRef, OPRA_RMQ_MODULE_OPTIONS],
             useFactory: async (controllerFactory, moduleRef, config) => {
                 const controllers = controllerFactory
                     .exploreControllers()
-                    .map(x => x.wrapper.instance.constructor);
+                    .map(x => x.wrapper.instance);
                 const document = await ApiDocumentFactory.createDocument({
                     info: config.info,
                     types: config.types,
@@ -127,7 +130,7 @@ OpraRabbitmqCoreModule = OpraRabbitmqCoreModule_1 = __decorate([
     Module({}),
     Global(),
     __param(1, Inject(opraRabbitmqNestjsAdapterToken)),
-    __param(2, Inject(OPRA_RMQ_MODULE_CONFIG)),
+    __param(2, Inject(OPRA_RMQ_MODULE_OPTIONS)),
     __metadata("design:paramtypes", [MQControllerFactory,
         RabbitmqAdapter, Object])
 ], OpraRabbitmqCoreModule);

package/{types/opra-rabbitmq.module.d.ts → opra-rabbitmq.module.d.ts}

@@ -1,5 +1,5 @@
 import { type DynamicModule, Logger, type Type } from '@nestjs/common';
-import { ApiDocumentFactory } from '@opra/common';
+import type { ApiDocumentFactory } from '@opra/common';
 import type { RabbitmqAdapter } from '@opra/rabbitmq';
 export declare namespace OpraRabbitmqModule {
     export interface ModuleOptions extends BaseModuleOptions, ApiConfig {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/nestjs-rabbitmq",
-  "version": "1.20.0",
+  "version": "1.22.0",
   "description": "Opra NestJS RabbitMQ Module",
   "author": "Panates",
   "license": "MIT",
@@ -9,50 +9,33 @@
     "tslib": "^2.8.1"
   },
   "peerDependencies": {
-    "@opra/common": "^1.20.0",
-    "@opra/core": "^1.20.0",
-    "@opra/nestjs": "^1.20.0",
-    "@opra/rabbitmq": "^1.20.0",
+    "@opra/common": "^1.22.0",
+    "@opra/core": "^1.22.0",
+    "@opra/nestjs": "^1.22.0",
+    "@opra/rabbitmq": "^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",
     "rabbitmq-client": ">=5.0.0 <6"
   },
   "type": "module",
+  "module": "./index.js",
+  "types": "./index.d.ts",
   "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",
+  "engines": {
+    "node": ">=20.0"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/panates/opra.git",
     "directory": "packages/nestjs-rabbitmq"
   },
-  "engines": {
-    "node": ">=16.0",
-    "npm": ">=7.0.0"
-  },
-  "files": [
-    "bin/",
-    "cjs/",
-    "esm/",
-    "types/",
-    "LICENSE",
-    "README.md"
-  ],
   "keywords": [
     "opra",
     "nestjs",

package/cjs/constants.js

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

package/cjs/index.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Public = exports.OpraNestUtils = exports.IS_PUBLIC_KEY = void 0;
-const tslib_1 = require("tslib");
-const nestjs_1 = require("@opra/nestjs");
-Object.defineProperty(exports, "IS_PUBLIC_KEY", { enumerable: true, get: function () { return nestjs_1.IS_PUBLIC_KEY; } });
-Object.defineProperty(exports, "OpraNestUtils", { enumerable: true, get: function () { return nestjs_1.OpraNestUtils; } });
-Object.defineProperty(exports, "Public", { enumerable: true, get: function () { return nestjs_1.Public; } });
-tslib_1.__exportStar(require("./constants.js"), exports);
-tslib_1.__exportStar(require("./opra-rabbitmq.module.js"), exports);

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

@@ -1,137 +0,0 @@
-"use strict";
-var OpraRabbitmqCoreModule_1;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OpraRabbitmqCoreModule = void 0;
-const tslib_1 = require("tslib");
-const objects_1 = require("@jsopen/objects");
-const common_1 = require("@nestjs/common");
-const core_1 = require("@nestjs/core");
-const common_2 = require("@opra/common");
-const nestjs_1 = require("@opra/nestjs");
-const rabbitmq_1 = require("@opra/rabbitmq");
-const constants_js_1 = require("./constants.js");
-const opraRabbitmqNestjsAdapterToken = Symbol('OpraRabbitmqNestjsAdapter');
-let OpraRabbitmqCoreModule = OpraRabbitmqCoreModule_1 = class OpraRabbitmqCoreModule {
-    constructor(controllerFactory, adapter, config) {
-        this.controllerFactory = controllerFactory;
-        this.adapter = adapter;
-        this.config = config;
-    }
-    static forRoot(moduleOptions) {
-        return this._getDynamicModule({
-            ...moduleOptions,
-            providers: [
-                ...(moduleOptions?.providers || []),
-                {
-                    provide: constants_js_1.OPRA_RMQ_MODULE_CONFIG,
-                    useValue: {
-                        ...moduleOptions,
-                        logger: moduleOptions.logger || new common_1.Logger(moduleOptions.name),
-                    },
-                },
-            ],
-        });
-    }
-    static forRootAsync(moduleOptions) {
-        if (!moduleOptions.useFactory)
-            throw new Error('Invalid configuration. Must provide "useFactory"');
-        return this._getDynamicModule({
-            ...moduleOptions,
-            providers: [
-                ...(moduleOptions?.providers || []),
-                {
-                    provide: constants_js_1.OPRA_RMQ_MODULE_CONFIG,
-                    inject: moduleOptions.inject,
-                    useFactory: async (...args) => {
-                        const result = await moduleOptions.useFactory(...args);
-                        result.logger = result.logger || new common_1.Logger(result.name);
-                        return result;
-                    },
-                },
-            ],
-        });
-    }
-    static _getDynamicModule(moduleOptions) {
-        const token = moduleOptions.id || rabbitmq_1.RabbitmqAdapter;
-        const adapterProvider = {
-            provide: token,
-            inject: [nestjs_1.MQControllerFactory, core_1.ModuleRef, constants_js_1.OPRA_RMQ_MODULE_CONFIG],
-            useFactory: async (controllerFactory, moduleRef, config) => {
-                const controllers = controllerFactory
-                    .exploreControllers()
-                    .map(x => x.wrapper.instance.constructor);
-                const document = await common_2.ApiDocumentFactory.createDocument({
-                    info: config.info,
-                    types: config.types,
-                    references: config.references,
-                    api: {
-                        name: config.name,
-                        description: config.description,
-                        transport: 'mq',
-                        platform: rabbitmq_1.RabbitmqAdapter.PlatformName,
-                        controllers,
-                    },
-                });
-                const interceptors = moduleOptions.interceptors
-                    ? moduleOptions.interceptors.map(x => {
-                        if ((0, objects_1.isConstructor)(x)) {
-                            return async (ctx, next) => {
-                                const interceptor = moduleRef.get(x);
-                                if (typeof interceptor.intercept === 'function')
-                                    return interceptor.intercept(ctx, next);
-                            };
-                        }
-                        return x;
-                    })
-                    : undefined;
-                return new rabbitmq_1.RabbitmqAdapter(document, { ...config, interceptors });
-            },
-        };
-        return {
-            global: moduleOptions.global,
-            module: OpraRabbitmqCoreModule_1,
-            controllers: moduleOptions.controllers,
-            providers: [
-                ...(moduleOptions?.providers || []),
-                nestjs_1.MQControllerFactory,
-                adapterProvider,
-                {
-                    provide: opraRabbitmqNestjsAdapterToken,
-                    useExisting: token,
-                },
-            ],
-            imports: [...(moduleOptions?.imports || [])],
-            exports: [...(moduleOptions?.exports || []), adapterProvider],
-        };
-    }
-    onModuleInit() {
-        /** NestJS initialize controller instances on init stage.
-         * So we should update instance properties */
-        const mqApi = this.adapter.document.getMqApi();
-        const controllers = Array.from(mqApi.controllers.values());
-        for (const { wrapper } of this.controllerFactory
-            .exploreControllers()
-            .values()) {
-            const ctor = wrapper.instance.constructor;
-            const controller = controllers.find(x => x.ctor === ctor);
-            if (controller) {
-                controller.instance = wrapper.instance;
-            }
-        }
-    }
-    async onApplicationBootstrap() {
-        await this.adapter.start();
-    }
-    async onApplicationShutdown() {
-        await this.adapter.close();
-    }
-};
-exports.OpraRabbitmqCoreModule = OpraRabbitmqCoreModule;
-exports.OpraRabbitmqCoreModule = OpraRabbitmqCoreModule = OpraRabbitmqCoreModule_1 = tslib_1.__decorate([
-    (0, common_1.Module)({}),
-    (0, common_1.Global)(),
-    tslib_1.__param(1, (0, common_1.Inject)(opraRabbitmqNestjsAdapterToken)),
-    tslib_1.__param(2, (0, common_1.Inject)(constants_js_1.OPRA_RMQ_MODULE_CONFIG)),
-    tslib_1.__metadata("design:paramtypes", [nestjs_1.MQControllerFactory,
-        rabbitmq_1.RabbitmqAdapter, Object])
-], OpraRabbitmqCoreModule);

package/cjs/opra-rabbitmq.module.js

@@ -1,33 +0,0 @@
-"use strict";
-var OpraRabbitmqModule_1;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OpraRabbitmqModule = void 0;
-const tslib_1 = require("tslib");
-const common_1 = require("@nestjs/common");
-const opra_rabbitmq_core_module_js_1 = require("./opra-rabbitmq-core.module.js");
-let OpraRabbitmqModule = OpraRabbitmqModule_1 = class OpraRabbitmqModule {
-    /**
-     *
-     * @param options
-     */
-    static forRoot(options) {
-        return {
-            module: OpraRabbitmqModule_1,
-            imports: [opra_rabbitmq_core_module_js_1.OpraRabbitmqCoreModule.forRoot(options)],
-        };
-    }
-    /**
-     *
-     * @param options
-     */
-    static forRootAsync(options) {
-        return {
-            module: OpraRabbitmqModule_1,
-            imports: [opra_rabbitmq_core_module_js_1.OpraRabbitmqCoreModule.forRootAsync(options)],
-        };
-    }
-};
-exports.OpraRabbitmqModule = OpraRabbitmqModule;
-exports.OpraRabbitmqModule = OpraRabbitmqModule = OpraRabbitmqModule_1 = tslib_1.__decorate([
-    (0, common_1.Module)({})
-], OpraRabbitmqModule);

package/cjs/package.json

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

package/esm/constants.js

@@ -1 +0,0 @@
-export const OPRA_RMQ_MODULE_CONFIG = 'OPRA_RMQ_MODULE_CONFIG';

package/esm/package.json

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

package/types/constants.d.ts

@@ -1 +0,0 @@
-export declare const OPRA_RMQ_MODULE_CONFIG = "OPRA_RMQ_MODULE_CONFIG";

package/types/index.d.cts

@@ -1,4 +0,0 @@
-import { IS_PUBLIC_KEY, OpraNestUtils, Public } from '@opra/nestjs';
-export * from './constants.js';
-export * from './opra-rabbitmq.module.js';
-export { IS_PUBLIC_KEY, OpraNestUtils, Public };