@opra/nestjs 0.24.0 → 0.24.2

package/cjs/factories/opra-api.factory.js

@@ -5,12 +5,14 @@ const tslib_1 = require("tslib");
 const lodash_head_1 = tslib_1.__importDefault(require("lodash.head"));
 const common_1 = require("@nestjs/common");
 const core_1 = require("@nestjs/core");
+const external_context_creator_1 = require("@nestjs/core/helpers/external-context-creator");
 const injector_1 = require("@nestjs/core/injector/injector");
 const internal_core_module_1 = require("@nestjs/core/injector/internal-core-module");
 const request_constants_1 = require("@nestjs/core/router/request/request-constants");
 const common_2 = require("@opra/common");
 const constants_js_1 = require("../constants.js");
 const handler_paramtype_enum_js_1 = require("../enums/handler-paramtype.enum.js");
+const nest_explorer_js_1 = require("../services/nest-explorer.js");
 const function_utils_js_1 = require("../utils/function.utils.js");
 const params_factory_js_1 = require("./params.factory.js");
 const noOpFunction = () => void 0;
@@ -37,21 +39,22 @@ let OpraApiFactory = exports.OpraApiFactory = class OpraApiFactory {
         for (const wrapper of wrappers) {
             const instance = wrapper.instance;
             const ctor = instance.constructor;
-            const metadata = Reflect.getMetadata(common_2.SOURCE_METADATA, ctor);
+            const metadata = Reflect.getMetadata(common_2.RESOURCE_METADATA, ctor);
             if (common_2.OpraSchema.isSource(metadata))
                 resources.push(instance);
         }
         for (const wrapper of wrappers) {
             const instance = wrapper.instance;
             const ctor = instance.constructor;
-            const sourceDef = Reflect.getMetadata(common_2.SOURCE_METADATA, ctor);
+            const sourceDef = Reflect.getMetadata(common_2.RESOURCE_METADATA, ctor);
             /* istanbul ignore next */
             if (!sourceDef)
                 continue;
             resources.push(instance);
             /* Wrap resolver functions */
             const isRequestScoped = !wrapper.isDependencyTreeStatic();
-            if ((common_2.OpraSchema.isCollection(sourceDef) || common_2.OpraSchema.isSingleton(sourceDef)) && sourceDef.operations) {
+            if (sourceDef.operations &&
+                (common_2.OpraSchema.isCollection(sourceDef) || common_2.OpraSchema.isSingleton(sourceDef) || common_2.OpraSchema.isStorage(sourceDef))) {
                 for (const methodName of Object.keys(sourceDef.operations)) {
                     const endpointFunction = instance[methodName];
                     const nestHandlerName = methodName + '_nestjs';
@@ -171,13 +174,16 @@ let OpraApiFactory = exports.OpraApiFactory = class OpraApiFactory {
     }
 };
 tslib_1.__decorate([
-    (0, common_1.Inject)()
+    (0, common_1.Inject)(),
+    tslib_1.__metadata("design:type", core_1.ModulesContainer)
 ], OpraApiFactory.prototype, "modulesContainer", void 0);
 tslib_1.__decorate([
-    (0, common_1.Inject)()
+    (0, common_1.Inject)(),
+    tslib_1.__metadata("design:type", external_context_creator_1.ExternalContextCreator)
 ], OpraApiFactory.prototype, "externalContextCreator", void 0);
 tslib_1.__decorate([
-    (0, common_1.Inject)()
+    (0, common_1.Inject)(),
+    tslib_1.__metadata("design:type", nest_explorer_js_1.NestExplorer)
 ], OpraApiFactory.prototype, "explorerService", void 0);
 exports.OpraApiFactory = OpraApiFactory = tslib_1.__decorate([
     (0, common_1.Injectable)()

package/cjs/opra-core.module.js

@@ -5,6 +5,7 @@ exports.OpraCoreModule = void 0;
 const tslib_1 = require("tslib");
 const crypto = tslib_1.__importStar(require("crypto"));
 const common_1 = require("@nestjs/common");
+const core_1 = require("@nestjs/core");
 const metadata_scanner_1 = require("@nestjs/core/metadata-scanner");
 const constants_js_1 = require("./constants.js");
 const opra_api_factory_js_1 = require("./factories/opra-api.factory.js");
@@ -115,5 +116,7 @@ exports.OpraCoreModule = OpraCoreModule = OpraCoreModule_1 = tslib_1.__decorate(
         ]
     }),
     tslib_1.__param(2, (0, common_1.Inject)(constants_js_1.OPRA_MODULE_OPTIONS)),
-    tslib_1.__param(3, (0, common_1.Inject)(constants_js_1.OPRA_INITIALIZER))
+    tslib_1.__param(3, (0, common_1.Inject)(constants_js_1.OPRA_INITIALIZER)),
+    tslib_1.__metadata("design:paramtypes", [core_1.HttpAdapterHost,
+        core_1.ModulesContainer, Object, opra_api_loader_js_1.OpraApiLoader])
 ], OpraCoreModule);

package/cjs/services/nest-explorer.js

@@ -28,7 +28,7 @@ class NestExplorer {
             return !!(wrapper.instance
                 && typeof wrapper.instance === 'object'
                 && wrapper.instance.constructor
-                && common_1.OpraSchema.isSource(Reflect.getMetadata(common_1.SOURCE_METADATA, wrapper.instance.constructor)));
+                && common_1.OpraSchema.isSource(Reflect.getMetadata(common_1.RESOURCE_METADATA, wrapper.instance.constructor)));
         });
     }
 }

package/cjs/services/opra-api-loader.js

@@ -3,9 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpraApiLoader = void 0;
 const tslib_1 = require("tslib");
 const common_1 = require("@nestjs/common");
+const core_1 = require("@nestjs/core");
 const common_2 = require("@opra/common");
-const core_1 = require("@opra/core");
+const core_2 = require("@opra/core");
 const constants_js_1 = require("../constants.js");
+const opra_api_factory_js_1 = require("../factories/opra-api.factory.js");
 class OpraApiLoader {
     constructor() {
         this.logger = new common_1.Logger(OpraApiLoader.name, { timestamp: true });
@@ -53,7 +55,7 @@ class OpraApiLoader {
             return;
         const app = httpAdapter.getInstance();
         const logger = moduleOptions.logger || new common_1.Logger(service.info.title);
-        return await core_1.ExpressAdapter.create(app, service, {
+        return await core_2.ExpressAdapter.create(app, service, {
             ...moduleOptions,
             logger,
         });
@@ -61,14 +63,18 @@ class OpraApiLoader {
 }
 exports.OpraApiLoader = OpraApiLoader;
 tslib_1.__decorate([
-    (0, common_1.Inject)()
+    (0, common_1.Inject)(),
+    tslib_1.__metadata("design:type", core_1.HttpAdapterHost)
 ], OpraApiLoader.prototype, "httpAdapterHost", void 0);
 tslib_1.__decorate([
-    (0, common_1.Inject)()
+    (0, common_1.Inject)(),
+    tslib_1.__metadata("design:type", core_1.ApplicationConfig)
 ], OpraApiLoader.prototype, "applicationConfig", void 0);
 tslib_1.__decorate([
-    (0, common_1.Inject)()
+    (0, common_1.Inject)(),
+    tslib_1.__metadata("design:type", opra_api_factory_js_1.OpraApiFactory)
 ], OpraApiLoader.prototype, "opraFactory", void 0);
 tslib_1.__decorate([
-    (0, common_1.Inject)(constants_js_1.OPRA_MODULE_OPTIONS)
+    (0, common_1.Inject)(constants_js_1.OPRA_MODULE_OPTIONS),
+    tslib_1.__metadata("design:type", Object)
 ], OpraApiLoader.prototype, "opraModuleOptions", void 0);

package/esm/factories/opra-api.factory.js

@@ -1,13 +1,15 @@
-import { __decorate } from "tslib";
+import { __decorate, __metadata } from "tslib";
 import head from 'lodash.head';
 import { Inject, Injectable } from '@nestjs/common';
-import { ContextIdFactory, createContextId, REQUEST } from '@nestjs/core';
+import { ContextIdFactory, createContextId, ModulesContainer, REQUEST } from '@nestjs/core';
+import { ExternalContextCreator } from '@nestjs/core/helpers/external-context-creator';
 import { Injector } from '@nestjs/core/injector/injector';
 import { InternalCoreModule } from '@nestjs/core/injector/internal-core-module';
 import { REQUEST_CONTEXT_ID } from '@nestjs/core/router/request/request-constants';
-import { DocumentFactory, OpraSchema, SOURCE_METADATA } from '@opra/common';
+import { DocumentFactory, OpraSchema, RESOURCE_METADATA } from '@opra/common';
 import { PARAM_ARGS_METADATA } from '../constants.js';
 import { HandlerParamType } from '../enums/handler-paramtype.enum.js';
+import { NestExplorer } from '../services/nest-explorer.js';
 import { getNumberOfArguments } from '../utils/function.utils.js';
 import { OpraParamsFactory } from './params.factory.js';
 const noOpFunction = () => void 0;
@@ -34,21 +36,22 @@ export let OpraApiFactory = class OpraApiFactory {
         for (const wrapper of wrappers) {
             const instance = wrapper.instance;
             const ctor = instance.constructor;
-            const metadata = Reflect.getMetadata(SOURCE_METADATA, ctor);
+            const metadata = Reflect.getMetadata(RESOURCE_METADATA, ctor);
             if (OpraSchema.isSource(metadata))
                 resources.push(instance);
         }
         for (const wrapper of wrappers) {
             const instance = wrapper.instance;
             const ctor = instance.constructor;
-            const sourceDef = Reflect.getMetadata(SOURCE_METADATA, ctor);
+            const sourceDef = Reflect.getMetadata(RESOURCE_METADATA, ctor);
             /* istanbul ignore next */
             if (!sourceDef)
                 continue;
             resources.push(instance);
             /* Wrap resolver functions */
             const isRequestScoped = !wrapper.isDependencyTreeStatic();
-            if ((OpraSchema.isCollection(sourceDef) || OpraSchema.isSingleton(sourceDef)) && sourceDef.operations) {
+            if (sourceDef.operations &&
+                (OpraSchema.isCollection(sourceDef) || OpraSchema.isSingleton(sourceDef) || OpraSchema.isStorage(sourceDef))) {
                 for (const methodName of Object.keys(sourceDef.operations)) {
                     const endpointFunction = instance[methodName];
                     const nestHandlerName = methodName + '_nestjs';
@@ -168,13 +171,16 @@ export let OpraApiFactory = class OpraApiFactory {
     }
 };
 __decorate([
-    Inject()
+    Inject(),
+    __metadata("design:type", ModulesContainer)
 ], OpraApiFactory.prototype, "modulesContainer", void 0);
 __decorate([
-    Inject()
+    Inject(),
+    __metadata("design:type", ExternalContextCreator)
 ], OpraApiFactory.prototype, "externalContextCreator", void 0);
 __decorate([
-    Inject()
+    Inject(),
+    __metadata("design:type", NestExplorer)
 ], OpraApiFactory.prototype, "explorerService", void 0);
 OpraApiFactory = __decorate([
     Injectable()

package/esm/opra-core.module.js

@@ -1,7 +1,8 @@
 var OpraCoreModule_1;
-import { __decorate, __param } from "tslib";
+import { __decorate, __metadata, __param } from "tslib";
 import * as crypto from 'crypto';
 import { Inject, Module } from '@nestjs/common';
+import { HttpAdapterHost, ModulesContainer } from '@nestjs/core';
 import { MetadataScanner } from '@nestjs/core/metadata-scanner';
 import { OPRA_INITIALIZER, OPRA_MODULE_ID, OPRA_MODULE_OPTIONS } from './constants.js';
 import { OpraApiFactory } from './factories/opra-api.factory.js';
@@ -112,5 +113,7 @@ OpraCoreModule = OpraCoreModule_1 = __decorate([
         ]
     }),
     __param(2, Inject(OPRA_MODULE_OPTIONS)),
-    __param(3, Inject(OPRA_INITIALIZER))
+    __param(3, Inject(OPRA_INITIALIZER)),
+    __metadata("design:paramtypes", [HttpAdapterHost,
+        ModulesContainer, Object, OpraApiLoader])
 ], OpraCoreModule);

package/esm/services/nest-explorer.js

@@ -1,4 +1,4 @@
-import { OpraSchema, SOURCE_METADATA } from '@opra/common';
+import { OpraSchema, RESOURCE_METADATA } from '@opra/common';
 export class NestExplorer {
     exploreProviders(rootModule, predicate) {
         const modules = new Set();
@@ -25,7 +25,7 @@ export class NestExplorer {
             return !!(wrapper.instance
                 && typeof wrapper.instance === 'object'
                 && wrapper.instance.constructor
-                && OpraSchema.isSource(Reflect.getMetadata(SOURCE_METADATA, wrapper.instance.constructor)));
+                && OpraSchema.isSource(Reflect.getMetadata(RESOURCE_METADATA, wrapper.instance.constructor)));
         });
     }
 }

package/esm/services/opra-api-loader.js

@@ -1,8 +1,10 @@
-import { __decorate } from "tslib";
+import { __decorate, __metadata } from "tslib";
 import { Inject, Logger } from '@nestjs/common';
+import { ApplicationConfig, HttpAdapterHost } from '@nestjs/core';
 import { OpraURLPath } from '@opra/common';
 import { ExpressAdapter } from '@opra/core';
 import { OPRA_MODULE_OPTIONS } from '../constants.js';
+import { OpraApiFactory } from '../factories/opra-api.factory.js';
 export class OpraApiLoader {
     constructor() {
         this.logger = new Logger(OpraApiLoader.name, { timestamp: true });
@@ -57,14 +59,18 @@ export class OpraApiLoader {
     }
 }
 __decorate([
-    Inject()
+    Inject(),
+    __metadata("design:type", HttpAdapterHost)
 ], OpraApiLoader.prototype, "httpAdapterHost", void 0);
 __decorate([
-    Inject()
+    Inject(),
+    __metadata("design:type", ApplicationConfig)
 ], OpraApiLoader.prototype, "applicationConfig", void 0);
 __decorate([
-    Inject()
+    Inject(),
+    __metadata("design:type", OpraApiFactory)
 ], OpraApiLoader.prototype, "opraFactory", void 0);
 __decorate([
-    Inject(OPRA_MODULE_OPTIONS)
+    Inject(OPRA_MODULE_OPTIONS),
+    __metadata("design:type", Object)
 ], OpraApiLoader.prototype, "opraModuleOptions", void 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/nestjs",
-  "version": "0.24.0",
+  "version": "0.24.2",
   "description": "Opra NestJS module",
   "author": "Panates",
   "license": "MIT",
@@ -25,19 +25,19 @@
     "clean:cover": "rimraf ../../coverage/nestjs"
   },
   "dependencies": {
-    "@opra/common": "^0.24.0",
-    "@opra/core": "^0.24.0",
+    "@opra/common": "^0.24.2",
+    "@opra/core": "^0.24.2",
     "fast-tokenizer": "^1.2.2",
     "lodash.head": "^4.0.1",
     "lodash.identity": "^3.0.0",
     "reflect-metadata": "^0.1.13"
   },
   "peerDependencies": {
-    "@nestjs/common": "^10.2.0"
+    "@nestjs/common": "^10.2.1"
   },
   "devDependencies": {
-    "@nestjs/platform-express": "^10.2.0",
-    "@nestjs/testing": "^10.2.0",
+    "@nestjs/platform-express": "^10.2.1",
+    "@nestjs/testing": "^10.2.1",
     "@types/lodash": "^4.14.197",
     "filedirname": "^2.7.0",
     "ts-gems": "^2.4.1"