@opra/nestjs 0.31.11 → 0.31.13

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

@@ -21,17 +21,18 @@ let OpraApiFactory = class OpraApiFactory {
         this.paramsFactory = new params_factory_js_1.OpraParamsFactory();
         this.injector = new injector_1.Injector();
     }
-    async generateService(rootModule, moduleOptions, contextType) {
-        const info = { title: '', version: '', ...moduleOptions.info };
+    async generateService(rootModule, contextType, apiSchema) {
+        const info = { ...apiSchema?.info };
         info.title = info.title || 'Untitled service';
         info.version = info.version || '1';
         const root = {
             resources: []
         };
-        const apiSchema = {
+        const apiInit = {
             version: common_2.OpraSchema.SpecVersion,
+            ...apiSchema,
             info,
-            types: [],
+            types: apiSchema?.types || [],
             root
         };
         /*
@@ -93,7 +94,7 @@ let OpraApiFactory = class OpraApiFactory {
             }
         });
         // Create api document
-        return common_2.ApiDocumentFactory.createDocument(apiSchema);
+        return common_2.ApiDocumentFactory.createDocument(apiInit);
     }
     _createHandler(callback) {
         return function (ctx) {

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

@@ -23,13 +23,13 @@ class OpraApiLoader {
         let prefixPath = new common_2.OpraURLPath((moduleOptions.useGlobalPrefix !== false ? globalPrefix : ''));
         if (moduleOptions.basePath)
             prefixPath = prefixPath.join(moduleOptions.basePath);
-        const name = moduleOptions.info?.title || 'untitled service';
+        const name = moduleOptions.document?.info?.title || 'untitled service';
         const options = {
             ...moduleOptions,
             basePath: prefixPath.toString()
         };
         try {
-            const apiDocument = await this.opraFactory.generateService(rootModule, options, 'http');
+            const apiDocument = await this.opraFactory.generateService(rootModule, 'http', options.document);
             if (!Object.keys(apiDocument.root).length) {
                 this.logger.warn(`No Sources found (${name})`);
                 return;

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

@@ -18,17 +18,18 @@ let OpraApiFactory = class OpraApiFactory {
         this.paramsFactory = new OpraParamsFactory();
         this.injector = new Injector();
     }
-    async generateService(rootModule, moduleOptions, contextType) {
-        const info = { title: '', version: '', ...moduleOptions.info };
+    async generateService(rootModule, contextType, apiSchema) {
+        const info = { ...apiSchema?.info };
         info.title = info.title || 'Untitled service';
         info.version = info.version || '1';
         const root = {
             resources: []
         };
-        const apiSchema = {
+        const apiInit = {
             version: OpraSchema.SpecVersion,
+            ...apiSchema,
             info,
-            types: [],
+            types: apiSchema?.types || [],
             root
         };
         /*
@@ -90,7 +91,7 @@ let OpraApiFactory = class OpraApiFactory {
             }
         });
         // Create api document
-        return ApiDocumentFactory.createDocument(apiSchema);
+        return ApiDocumentFactory.createDocument(apiInit);
     }
     _createHandler(callback) {
         return function (ctx) {

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

@@ -20,13 +20,13 @@ export class OpraApiLoader {
         let prefixPath = new OpraURLPath((moduleOptions.useGlobalPrefix !== false ? globalPrefix : ''));
         if (moduleOptions.basePath)
             prefixPath = prefixPath.join(moduleOptions.basePath);
-        const name = moduleOptions.info?.title || 'untitled service';
+        const name = moduleOptions.document?.info?.title || 'untitled service';
         const options = {
             ...moduleOptions,
             basePath: prefixPath.toString()
         };
         try {
-            const apiDocument = await this.opraFactory.generateService(rootModule, options, 'http');
+            const apiDocument = await this.opraFactory.generateService(rootModule, 'http', options.document);
             if (!Object.keys(apiDocument.root).length) {
                 this.logger.warn(`No Sources found (${name})`);
                 return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/nestjs",
-  "version": "0.31.11",
+  "version": "0.31.13",
   "description": "Opra NestJS module",
   "author": "Panates",
   "license": "MIT",
@@ -26,8 +26,8 @@
     "clean:cover": "rimraf ../../coverage/client"
   },
   "dependencies": {
-    "@opra/common": "^0.31.11",
-    "@opra/core": "^0.31.11",
+    "@opra/common": "^0.31.13",
+    "@opra/core": "^0.31.13",
     "fast-tokenizer": "^1.2.2",
     "lodash.head": "^4.0.1",
     "reflect-metadata": "^0.1.13"
@@ -40,7 +40,7 @@
     "@nestjs/platform-express": "^10.2.10",
     "@nestjs/testing": "^10.2.10",
     "@types/lodash.head": "^4.0.9",
-    "filedirname": "^2.10.0",
+    "filedirname": "^3.1.0",
     "ts-gems": "^2.5.0"
   },
   "type": "module",

package/types/factories/opra-api.factory.d.ts

@@ -1,14 +1,13 @@
 import { ContextType } from '@nestjs/common';
 import { Module } from '@nestjs/core/injector/module.js';
-import { ApiDocument } from '@opra/common';
-import { OpraModuleOptions } from '../interfaces/opra-module-options.interface.js';
+import { ApiDocument, ApiDocumentFactory } from '@opra/common';
 export declare class OpraApiFactory {
     private readonly paramsFactory;
     private readonly injector;
     private readonly modulesContainer;
     private readonly externalContextCreator;
     private readonly explorerService;
-    generateService(rootModule: Module, moduleOptions: OpraModuleOptions, contextType: ContextType): Promise<ApiDocument>;
+    generateService(rootModule: Module, contextType: ContextType, apiSchema?: Partial<ApiDocumentFactory.InitArguments>): Promise<ApiDocument>;
     private _createHandler;
     private _createContextCallback;
     private getContextId;

package/types/interfaces/opra-module-options.interface.d.ts

@@ -1,9 +1,11 @@
 import { ModuleMetadata, Type } from '@nestjs/common';
-import { OpraSchema } from '@opra/common';
-import { NodeHttpAdapter } from '@opra/core';
+import { ApiDocumentFactory } from '@opra/common';
+import { ExpressAdapter, NodeHttpAdapter } from '@opra/core';
 export type OpraModuleOptions = NodeHttpAdapter.Options & {
     id?: any;
-    info?: OpraSchema.DocumentInfo;
+    adapterNode?: ExpressAdapter.Options;
+    adapterExpress?: ExpressAdapter.Options;
+    document?: Partial<ApiDocumentFactory.InitArguments>;
     /**
      * @default true
      */