@open-norantec/herbal 2.0.0-alpha.5 → 2.0.0-alpha.6

package/dist/abstracts/auth-adapter.abstract.class.d.ts

@@ -1,7 +1,7 @@
-import { ModuleRef } from '@nestjs/core';
 import { Constructor } from 'type-fest';
 import { Request } from 'express';
 import { Transaction } from 'sequelize';
+import { GetModuleFn } from '../types';
 export interface AuthenticateReturn {
     challengeValue: string;
     identifier: string;
@@ -13,8 +13,8 @@ export interface AuthenticateResult extends AuthenticateReturn {
 }
 export declare abstract class AuthAdapter {
     protected readonly request: Request;
-    protected readonly ref: ModuleRef;
-    constructor(request: Request, ref: ModuleRef);
+    protected readonly getModule: GetModuleFn;
+    constructor(request: Request, getModule: GetModuleFn);
     abstract match(): boolean;
     abstract authenticate(transaction?: Transaction): Promise<AuthenticateReturn | null>;
 }

package/dist/abstracts/auth-adapter.abstract.class.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthAdapter = void 0;
 var AuthAdapter = (function () {
-    function AuthAdapter(request, ref) {
+    function AuthAdapter(request, getModule) {
         this.request = request;
-        this.ref = ref;
+        this.getModule = getModule;
     }
     return AuthAdapter;
 }());

package/dist/core.d.ts

@@ -4,11 +4,11 @@ import { Request, RequestContext } from './types/request.type';
 import { z } from '@open-norantec/utilities';
 import 'reflect-metadata';
 import { Request as ExpressRequest } from 'express';
-import { ModuleRef } from '@nestjs/core';
 import { Constructor } from 'type-fest';
 import { Sequelize } from 'sequelize-typescript';
 import { AuthAdapter } from './abstracts/auth-adapter.abstract.class';
 import { PathsObject } from 'openapi3-ts/oas31';
+import { GetModuleFn } from './types';
 export * from '@nestjs/core';
 export type MethodHandler<IS extends z.ZodType<any>, OS extends z.ZodType<any>> = (request: Request, input: unknown, headers: ReturnType<typeof HeaderUtil.parse>) => Promise<{
     request: z.infer<IS>;
@@ -52,8 +52,8 @@ export interface HerbalControllerOptions<C> {
     ignoreControllerNamePostfix?: boolean;
     prefix?: string;
     methods?: (register: MethodRegisterFn<C>) => void;
-    onAfterParsingRequest?: (request: Request, moduleRef: ModuleRef) => void | Promise<void>;
-    onBeforeParsingRequest?: (request: Request, moduleRef: ModuleRef) => void | Promise<void>;
+    onAfterParsingRequest?: (request: Request, getModule: GetModuleFn) => void | Promise<void>;
+    onBeforeParsingRequest?: (request: Request, getModule: GetModuleFn) => void | Promise<void>;
 }
 export interface ControllerUtilCreateOptions {
     prefix?: string;
@@ -61,13 +61,13 @@ export interface ControllerUtilCreateOptions {
     onAfterParsingRequest?: HerbalControllerOptions<any>['onAfterParsingRequest'];
     onBeforeParsingRequest?: HerbalControllerOptions<any>['onBeforeParsingRequest'];
 }
-export declare function parseRequest({ request, traceId: inputTraceId, sequelize: sequelizeInstance, moduleRef, handlerName, handlerPrototype, onLog, }: {
+export declare function parseRequest({ request, traceId: inputTraceId, sequelize: sequelizeInstance, handlerName, handlerPrototype, onLog, getModule, }: {
     handlerPrototype: object;
-    moduleRef: ModuleRef;
     request: Request;
     handlerName?: string;
     sequelize?: Sequelize;
     traceId?: string;
+    getModule: GetModuleFn;
     onLog?: (methodName: string, message: string) => void;
 }): Promise<void>;
 export declare function getMethodPool(targetPrototype: object): MethodPool | null;

package/dist/core.js

@@ -302,7 +302,7 @@ function parseRequest(_a) {
     var _b, request_1, request_1_1;
     var _c, e_1, _d, _e;
     var _f, _g, _h, _j, _k;
-    var request = _a.request, inputTraceId = _a.traceId, sequelizeInstance = _a.sequelize, moduleRef = _a.moduleRef, handlerName = _a.handlerName, handlerPrototype = _a.handlerPrototype, onLog = _a.onLog;
+    var request = _a.request, inputTraceId = _a.traceId, sequelizeInstance = _a.sequelize, handlerName = _a.handlerName, handlerPrototype = _a.handlerPrototype, onLog = _a.onLog, getModule = _a.getModule;
     return __awaiter(this, void 0, void 0, function () {
         var transaction, beforeParsingRequestHandlers, afterParsingRequestHandlers, chunks_1, chunk, e_1_1, _l, parsedBody, methodPool, authAdapters, shouldHaveTransaction, error_2, authSucceeded, error_3, _m;
         var _this = this;
@@ -368,7 +368,7 @@ function parseRequest(_a) {
                 case 16:
                     _.attempt(function () { return onLog === null || onLog === void 0 ? void 0 : onLog('log', "[trace:".concat(request === null || request === void 0 ? void 0 : request.traceId, ":request:body] ").concat(request.rawBody)); });
                     return [4, Promise.all((Array.isArray(beforeParsingRequestHandlers) ? beforeParsingRequestHandlers : []).map(function (handler) {
-                            return handler(request, moduleRef);
+                            return handler(request, getModule);
                         }))];
                 case 17:
                     _o.sent();
@@ -415,7 +415,7 @@ function parseRequest(_a) {
                                     case 1:
                                         if (!(_i < authAdapters_1.length)) return [3, 4];
                                         AuthAdapterClass = authAdapters_1[_i];
-                                        adapter = new AuthAdapterClass(request, moduleRef);
+                                        adapter = new AuthAdapterClass(request, getModule);
                                         if (!adapter.match())
                                             return [3, 3];
                                         return [4, adapter.authenticate(transaction)];
@@ -455,7 +455,7 @@ function parseRequest(_a) {
                     return [3, 30];
                 case 30: throw error_3;
                 case 31: return [4, Promise.all((Array.isArray(afterParsingRequestHandlers) ? afterParsingRequestHandlers : []).map(function (handler) {
-                        return handler(request, moduleRef);
+                        return handler(request, getModule);
                     }))];
                 case 32:
                     _o.sent();
@@ -490,11 +490,11 @@ function HerbalGuard(options) {
                                 traceId = uuid_util_class_1.UUIDUtil.generateV4();
                             return [4, parseRequest({
                                     request: request,
-                                    moduleRef: this.ref,
                                     sequelize: sequelizeInstance instanceof Error ? undefined : sequelizeInstance,
                                     handlerPrototype: (_c = (_b = (_a = context === null || context === void 0 ? void 0 : context.getClass) === null || _a === void 0 ? void 0 : _a.call(context)) === null || _b === void 0 ? void 0 : _b.prototype) !== null && _c !== void 0 ? _c : {},
                                     handlerName: (_e = (_d = context === null || context === void 0 ? void 0 : context.getHandler) === null || _d === void 0 ? void 0 : _d.call(context)) === null || _e === void 0 ? void 0 : _e.name,
                                     traceId: traceId,
+                                    getModule: this.ref.get.bind(this.ref),
                                     onLog: function (method, message) {
                                         var _a;
                                         try {

package/dist/types/index.d.ts

@@ -1,2 +1,7 @@
+import { Constructor } from 'type-fest';
 export * from './request.type';
 export * from './http-response-body.type';
+export type GetModuleFn = <TInput = any, TResult = TInput>(typeOrToken: Constructor<TInput> | Function | string | symbol, options: {
+    strict?: boolean;
+    each?: undefined | false;
+}) => TResult;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@open-norantec/herbal",
-    "version": "2.0.0-alpha.5",
+    "version": "2.0.0-alpha.6",
     "description": "Herbal is a builder and toolchain for Nest.js applications",
     "main": "dist/index.js",
     "scripts": {