@opra/nestjs 0.4.0 → 0.6.0

package/cjs/decorators/context.decorator.js

@@ -5,7 +5,7 @@ const handler_paramtype_enum_js_1 = require("../enums/handler-paramtype.enum.js"
 const param_utils_js_1 = require("../utils/param.utils.js");
 /**
  * Handler method parameter decorator. Populates the decorated
- * parameter with the value of `QueryContext`.
+ * parameter with the value of `RequestContext`.
  */
 exports.Context = (0, param_utils_js_1.createOpraParamDecorator)(handler_paramtype_enum_js_1.HandlerParamType.CONTEXT);
 /**

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

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpraApiFactory = void 0;
 const tslib_1 = require("tslib");
-const lodash_1 = tslib_1.__importDefault(require("lodash"));
+const lodash_1 = require("lodash");
 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 schema_1 = require("@opra/schema");
+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");
@@ -36,7 +36,7 @@ let OpraApiFactory = class OpraApiFactory {
         const wrappers = this.explorerService.exploreResourceWrappers(rootModule);
         for (const wrapper of wrappers) {
             const instance = wrapper.instance;
-            const resourceDef = Reflect.getMetadata(schema_1.RESOURCE_METADATA, instance.constructor);
+            const resourceDef = Reflect.getMetadata(common_2.RESOURCE_METADATA, instance.constructor);
             /* istanbul ignore next */
             if (!resourceDef)
                 continue;
@@ -44,7 +44,7 @@ let OpraApiFactory = class OpraApiFactory {
             /* Wrap resolver functions */
             const prototype = Object.getPrototypeOf(instance);
             const isRequestScoped = !wrapper.isDependencyTreeStatic();
-            const methodsToWrap = schema_1.OpraSchema.isCollectionResource(resourceDef) ? schema_1.collectionMethods : [];
+            const methodsToWrap = common_2.OpraSchema.isCollectionResource(resourceDef) ? common_2.collectionMethods : [];
             for (const methodName of methodsToWrap) {
                 const fn = prototype[methodName];
                 if (typeof fn !== 'function')
@@ -62,8 +62,8 @@ let OpraApiFactory = class OpraApiFactory {
                     switch (ctx.type) {
                         case 'http':
                             const http = ctx.switchToHttp();
-                            const req = http.getRequestWrapper().getInstance();
-                            const res = http.getResponseWrapper().getInstance();
+                            const req = http.getRequest().getInstance();
+                            const res = http.getResponse().getInstance();
                             return preCallback(req, res, noOpFunction, ctx);
                         default:
                             throw new Error(`"${ctx.type}" context type is not implemented yet`);
@@ -93,8 +93,8 @@ let OpraApiFactory = class OpraApiFactory {
                     switch (ctx.type) {
                         case 'http':
                             const http = ctx.switchToHttp();
-                            const req = http.getRequestWrapper().getInstance();
-                            const res = http.getResponseWrapper().getInstance();
+                            const req = http.getRequest().getInstance();
+                            const res = http.getResponse().getInstance();
                             return callback(req, res, noOpFunction, ctx);
                         default:
                             throw new Error(`"${ctx.type}" context type is not implemented yet`);
@@ -108,9 +108,9 @@ let OpraApiFactory = class OpraApiFactory {
                 });
             }
         }
-        return await schema_1.OpraDocument.create(serviceArgs);
+        return await common_2.OpraDocument.create(serviceArgs);
     }
-    _createContextCallback(instance, prototype, wrapper, moduleRef, methodName, isRequestScoped, transform = lodash_1.default.identity, contextType, forPre) {
+    _createContextCallback(instance, prototype, wrapper, moduleRef, methodName, isRequestScoped, transform = lodash_1.identity, contextType, forPre) {
         const paramsFactory = this.paramsFactory;
         const options = !forPre ?
             { guards: false, interceptors: false, filters: false } : undefined;
@@ -174,7 +174,7 @@ let OpraApiFactory = class OpraApiFactory {
         ([key, { metatype }]) => metatype && metatype.name === internal_core_module_1.InternalCoreModule.name)
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
             .map(([key, value]) => value);
-        const coreModuleRef = lodash_1.default.head(coreModuleArray);
+        const coreModuleRef = (0, lodash_1.head)(coreModuleArray);
         if (!coreModuleRef) {
             return;
         }

package/cjs/factories/params.factory.js

@@ -18,7 +18,7 @@ class OpraParamsFactory {
             case handler_paramtype_enum_js_1.HandlerParamType.RESPONSE:
                 return args[3].response;
             case handler_paramtype_enum_js_1.HandlerParamType.USER_CONTEXT:
-                return args[3].userContext;
+                return args[3].executionContext.userContext;
             default:
                 return null;
         }

package/cjs/services/nest-explorer.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NestExplorer = void 0;
-const schema_1 = require("@opra/schema");
+const common_1 = require("@opra/common");
 class NestExplorer {
     exploreProviders(rootModule, predicate) {
         const modules = new Set();
@@ -28,7 +28,7 @@ class NestExplorer {
             return !!(wrapper.instance
                 && typeof wrapper.instance === 'object'
                 && wrapper.instance.constructor
-                && Reflect.hasMetadata(schema_1.RESOURCE_METADATA, wrapper.instance.constructor));
+                && Reflect.hasMetadata(common_1.RESOURCE_METADATA, wrapper.instance.constructor));
         });
     }
 }

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

@@ -4,8 +4,8 @@ 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_2 = require("@opra/core");
-const url_1 = require("@opra/url");
 const constants_js_1 = require("../constants.js");
 const opra_api_factory_js_1 = require("../factories/opra-api.factory.js");
 class OpraApiLoader {
@@ -20,7 +20,7 @@ class OpraApiLoader {
         const globalPrefix = this.applicationConfig.getGlobalPrefix();
         const platformName = httpAdapter.getType();
         const moduleOptions = this.opraModuleOptions;
-        const prefix = '/' + (0, url_1.normalizePath)((0, url_1.joinPath)((moduleOptions.useGlobalPrefix !== false ? globalPrefix : ''), moduleOptions.prefix || ''), true);
+        const prefix = '/' + (0, common_2.normalizePath)((0, common_2.joinPath)((moduleOptions.useGlobalPrefix !== false ? globalPrefix : ''), moduleOptions.prefix || ''), true);
         const name = moduleOptions.info?.title || 'untitled service';
         const options = {
             ...moduleOptions,

package/esm/decorators/context.decorator.d.ts

@@ -1,6 +1,6 @@
 /**
  * Handler method parameter decorator. Populates the decorated
- * parameter with the value of `QueryContext`.
+ * parameter with the value of `RequestContext`.
  */
 export declare const Context: ParameterDecorator;
 /**

package/esm/decorators/context.decorator.js

@@ -2,7 +2,7 @@ import { HandlerParamType } from '../enums/handler-paramtype.enum.js';
 import { createOpraParamDecorator } from '../utils/param.utils.js';
 /**
  * Handler method parameter decorator. Populates the decorated
- * parameter with the value of `QueryContext`.
+ * parameter with the value of `RequestContext`.
  */
 export const Context = createOpraParamDecorator(HandlerParamType.CONTEXT);
 /**

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

@@ -1,6 +1,6 @@
 import { ContextType } from '@nestjs/common';
 import { Module } from '@nestjs/core/injector/module.js';
-import { OpraDocument } from '@opra/schema';
+import { OpraDocument } from '@opra/common';
 import { OpraModuleOptions } from '../interfaces/opra-module-options.interface.js';
 export declare class OpraApiFactory {
     private readonly paramsFactory;

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

@@ -1,12 +1,12 @@
 import { __decorate, __metadata } from "tslib";
-import _ from 'lodash';
+import { head, identity } from 'lodash';
 import { Inject, Injectable } from '@nestjs/common';
 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 { collectionMethods, OpraDocument, OpraSchema, RESOURCE_METADATA } from '@opra/schema';
+import { collectionMethods, OpraDocument, 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';
@@ -59,8 +59,8 @@ let OpraApiFactory = class OpraApiFactory {
                     switch (ctx.type) {
                         case 'http':
                             const http = ctx.switchToHttp();
-                            const req = http.getRequestWrapper().getInstance();
-                            const res = http.getResponseWrapper().getInstance();
+                            const req = http.getRequest().getInstance();
+                            const res = http.getResponse().getInstance();
                             return preCallback(req, res, noOpFunction, ctx);
                         default:
                             throw new Error(`"${ctx.type}" context type is not implemented yet`);
@@ -90,8 +90,8 @@ let OpraApiFactory = class OpraApiFactory {
                     switch (ctx.type) {
                         case 'http':
                             const http = ctx.switchToHttp();
-                            const req = http.getRequestWrapper().getInstance();
-                            const res = http.getResponseWrapper().getInstance();
+                            const req = http.getRequest().getInstance();
+                            const res = http.getResponse().getInstance();
                             return callback(req, res, noOpFunction, ctx);
                         default:
                             throw new Error(`"${ctx.type}" context type is not implemented yet`);
@@ -107,7 +107,7 @@ let OpraApiFactory = class OpraApiFactory {
         }
         return await OpraDocument.create(serviceArgs);
     }
-    _createContextCallback(instance, prototype, wrapper, moduleRef, methodName, isRequestScoped, transform = _.identity, contextType, forPre) {
+    _createContextCallback(instance, prototype, wrapper, moduleRef, methodName, isRequestScoped, transform = identity, contextType, forPre) {
         const paramsFactory = this.paramsFactory;
         const options = !forPre ?
             { guards: false, interceptors: false, filters: false } : undefined;
@@ -171,7 +171,7 @@ let OpraApiFactory = class OpraApiFactory {
         ([key, { metatype }]) => metatype && metatype.name === InternalCoreModule.name)
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
             .map(([key, value]) => value);
-        const coreModuleRef = _.head(coreModuleArray);
+        const coreModuleRef = head(coreModuleArray);
         if (!coreModuleRef) {
             return;
         }

package/esm/factories/params.factory.js

@@ -15,7 +15,7 @@ export class OpraParamsFactory {
             case HandlerParamType.RESPONSE:
                 return args[3].response;
             case HandlerParamType.USER_CONTEXT:
-                return args[3].userContext;
+                return args[3].executionContext.userContext;
             default:
                 return null;
         }

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

@@ -1,6 +1,6 @@
 import { ModuleMetadata, Type } from '@nestjs/common';
+import { OpraSchema } from '@opra/common';
 import { OpraHttpAdapter } from '@opra/core';
-import { OpraSchema } from '@opra/schema';
 export declare type OpraModuleOptions = OpraHttpAdapter.Options & {
     info?: OpraSchema.DocumentInfo;
     /**

package/esm/services/nest-explorer.js

@@ -1,4 +1,4 @@
-import { RESOURCE_METADATA } from '@opra/schema';
+import { RESOURCE_METADATA } from '@opra/common';
 export class NestExplorer {
     exploreProviders(rootModule, predicate) {
         const modules = new Set();

package/esm/services/opra-api-loader.d.ts

@@ -1,7 +1,7 @@
 import { ApplicationConfig, HttpAdapterHost } from '@nestjs/core';
 import { Module } from '@nestjs/core/injector/module.js';
+import { OpraDocument } from '@opra/common';
 import { OpraExpressAdapter } from '@opra/core';
-import { OpraDocument } from '@opra/schema';
 import { OpraApiFactory } from '../factories/opra-api.factory.js';
 import { OpraModuleOptions } from '../interfaces/opra-module-options.interface.js';
 export declare class OpraApiLoader {

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

@@ -1,8 +1,8 @@
 import { __decorate, __metadata } from "tslib";
 import { Inject, Logger } from '@nestjs/common';
 import { ApplicationConfig, HttpAdapterHost } from '@nestjs/core';
+import { joinPath, normalizePath } from '@opra/common';
 import { OpraExpressAdapter } from '@opra/core';
-import { joinPath, normalizePath } from '@opra/url';
 import { OPRA_MODULE_OPTIONS } from '../constants.js';
 import { OpraApiFactory } from '../factories/opra-api.factory.js';
 export class OpraApiLoader {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/nestjs",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "description": "Opra NestJS module",
   "author": "Panates",
   "license": "MIT",
@@ -25,23 +25,21 @@
     "clean:cover": "rimraf ../../coverage/nestjs"
   },
   "dependencies": {
-    "@opra/core": "^0.4.0",
-    "@opra/i18n": "^0.4.0",
-    "@opra/schema": "^0.4.0",
-    "@opra/url": "^0.4.0",
+    "@opra/common": "^0.6.0",
+    "@opra/core": "^0.6.0",
     "fast-tokenizer": "^1.2.0",
     "lodash": "^4.17.21",
     "reflect-metadata": "^0.1.13"
   },
   "peerDependencies": {
-    "@nestjs/common": "^9.1.4"
+    "@nestjs/common": "^9.2.1"
   },
   "devDependencies": {
-    "@nestjs/platform-express": "^9.1.4",
-    "@nestjs/testing": "^9.1.4",
-    "@types/lodash": "^4.14.186",
+    "@nestjs/platform-express": "^9.2.1",
+    "@nestjs/testing": "^9.2.1",
+    "@types/lodash": "^4.14.191",
     "filedirname": "^2.7.0",
-    "supertest": "^6.3.0"
+    "supertest": "^6.3.2"
   },
   "type": "module",
   "types": "esm/index.d.ts",