moost 0.3.31 → 0.3.32

package/dist/index.cjs

@@ -568,6 +568,13 @@ function Provide(type, fn) {
         return meta;
     });
 }
+function Replace(type, newType) {
+    return getMoostMate().decorate(meta => {
+        meta.replace = meta.replace || {};
+        Object.assign(meta.replace, infact$1.createReplaceRegistry([type, newType]));
+        return meta;
+    });
+}
 function Inject(type) {
     return getMoostMate().decorate('inject', type);
 }
@@ -646,6 +653,7 @@ class Moost {
         this.adapters = [];
         this.controllersOverview = [];
         this.provide = infact$1.createProvideRegistry([infact$1.Infact, getMoostInfact], [mate$1.Mate, getMoostMate]);
+        this.replace = {};
         this.unregisteredControllers = [];
         this.logger = options?.logger || getDefaultLogger('moost');
         getMoostInfact().setLogger(this.getLogger('infact'));
@@ -695,18 +703,18 @@ class Moost {
                 newPrefix = _controller[0];
                 controller = _controller[1];
             }
-            await this.bindController(controller, provide, this.options?.globalPrefix || '', newPrefix);
+            await this.bindController(controller, provide, this.replace, this.options?.globalPrefix || '', newPrefix);
         }
         this.unregisteredControllers = [];
     }
-    async bindController(controller, provide, globalPrefix, replaceOwnPrefix) {
+    async bindController(controller, provide, replace, globalPrefix, replaceOwnPrefix) {
         const mate = getMoostMate();
         const classMeta = mate.read(controller);
         const infact = getMoostInfact();
         const isControllerConsructor = mate$1.isConstructor(controller);
         const pipes = [...this.pipes, ...(classMeta?.pipes || [])].sort((a, b) => a.priority - b.priority);
         let instance;
-        const infactOpts = { provide, customData: { pipes } };
+        const infactOpts = { provide, replace, customData: { pipes } };
         if (isControllerConsructor &&
             (classMeta?.injectable === 'SINGLETON' || classMeta?.injectable === true)) {
             eventCore.createEventContext({
@@ -743,12 +751,14 @@ class Moost {
             replaceOwnPrefix,
             interceptors: Array.from(this.interceptors),
             pipes,
-            provide: classMeta?.provide || {},
+            provide: classMeta?.provide,
+            replace: classMeta?.replace,
             logger: this.logger,
         }));
         if (classMeta && classMeta.importController) {
             const prefix = typeof replaceOwnPrefix === 'string' ? replaceOwnPrefix : classMeta.controller?.prefix;
             const mergedProvide = { ...provide, ...classMeta.provide };
+            const mergedReplace = { ...this.replace, ...classMeta.replace };
             for (const ic of classMeta.importController) {
                 if (ic.typeResolver) {
                     const isConstr = mate$1.isConstructor(ic.typeResolver);
@@ -757,7 +767,7 @@ class Moost {
                         ? ic.typeResolver
                         : isFunc
                             ? await ic.typeResolver()
-                            : ic.typeResolver, ic.provide ? { ...mergedProvide, ...ic.provide } : mergedProvide, `${globalPrefix}/${prefix || ''}`, ic.prefix);
+                            : ic.typeResolver, ic.provide ? { ...mergedProvide, ...ic.provide } : mergedProvide, mergedReplace, `${globalPrefix}/${prefix || ''}`, ic.prefix);
                 }
             }
         }
@@ -836,6 +846,10 @@ Object.defineProperty(exports, "createProvideRegistry", {
   enumerable: true,
   get: function () { return infact$1.createProvideRegistry; }
 });
+Object.defineProperty(exports, "createReplaceRegistry", {
+  enumerable: true,
+  get: function () { return infact$1.createReplaceRegistry; }
+});
 Object.defineProperty(exports, "getConstructor", {
   enumerable: true,
   get: function () { return mate$1.getConstructor; }
@@ -864,6 +878,7 @@ exports.Param = Param;
 exports.Params = Params;
 exports.Pipe = Pipe;
 exports.Provide = Provide;
+exports.Replace = Replace;
 exports.Required = Required;
 exports.Resolve = Resolve;
 exports.Value = Value;

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { useEventLogger } from '@wooksjs/event-core';
 export { EventLogger, THook, useEventContext, useEventLogger } from '@wooksjs/event-core';
-import { TProvideRegistry, Infact, TProvideFn } from '@prostojs/infact';
-export { TProvideRegistry, createProvideRegistry } from '@prostojs/infact';
+import { TProvideRegistry, Infact, TReplaceRegistry, TProvideFn } from '@prostojs/infact';
+export { TProvideRegistry, createProvideRegistry, createReplaceRegistry } from '@prostojs/infact';
 import { TConsoleBase } from '@prostojs/logger';
 import * as _prostojs_mate from '@prostojs/mate';
 import { TMateParamMeta, Mate } from '@prostojs/mate';
@@ -188,6 +188,7 @@ interface TMoostMetadata<H extends TObject = TEmpty> extends TCommonMetaFields,
     handlers?: Array<TMoostHandler<H>>;
     returnType?: TFunction;
     provide?: TProvideRegistry;
+    replace?: TReplaceRegistry;
     params: Array<TMateParamMeta & TMoostParamsMetadata>;
 }
 interface TMoostParamsMetadata extends TCommonMetaFields, TCommonMoostMeta {
@@ -255,6 +256,14 @@ declare function Pipe(handler: TPipeFn, priority?: TPipePriority): ClassDecorato
  * @param fn - factory function for provided value
  */
 declare function Provide(type: string | TClassConstructor, fn: TProvideFn): ClassDecorator;
+/**
+ * ## Replace
+ * ### @Decorator
+ * Defines class to replace in DI
+ * @param type - class to replace
+ * @param newType - new class
+ */
+declare function Replace(type: TClassConstructor, newType: TClassConstructor): ClassDecorator;
 /**
  * ## Inject
  * ### @Decorator
@@ -436,6 +445,7 @@ declare class Moost {
     protected adapters: Array<TMoostAdapter<TAny>>;
     protected controllersOverview: TControllerOverview[];
     protected provide: TProvideRegistry;
+    protected replace: TReplaceRegistry;
     protected unregisteredControllers: Array<TObject | TFunction | [string, TObject | TFunction]>;
     constructor(options?: TMoostOptions | undefined);
     /**
@@ -458,7 +468,7 @@ declare class Moost {
      */
     init(): Promise<void>;
     protected bindControllers(): Promise<void>;
-    protected bindController(controller: TFunction | TObject, provide: TProvideRegistry, globalPrefix: string, replaceOwnPrefix?: string): Promise<void>;
+    protected bindController(controller: TFunction | TObject, provide: TProvideRegistry, replace: TReplaceRegistry, globalPrefix: string, replaceOwnPrefix?: string): Promise<void>;
     applyGlobalPipes(...items: Array<TPipeFn | TPipeData>): this;
     protected globalInterceptorHandler?: () => Promise<InterceptorHandler>;
     /**
@@ -566,4 +576,4 @@ type TInterceptorClass = TClassFunction<TInterceptorFn>;
  */
 declare function definePipeFn<T extends TObject = TEmpty>(fn: TPipeFn<T>, priority?: TPipePriority): TPipeFn<T>;
 
-export { Circular, Const, ConstFactory, Controller, Description, Id, ImportController, Inherit, Inject, InjectEventLogger, Injectable, Intercept, InterceptorHandler, Label, Moost, Optional, Param, Params, Pipe, Provide, Required, Resolve, type TCallableClassFunction, type TClassConstructor, type TClassFunction, type TControllerOverview, type TInjectableScope, type TInterceptorAfter, type TInterceptorBefore, type TInterceptorClass, type TInterceptorData, type TInterceptorFn, type TInterceptorOnError, TInterceptorPriority, type TMoostAdapter, type TMoostAdapterOptions, type TMoostEventHandlerHookOptions, type TMoostEventHandlerOptions, type TMoostHandler, type TMoostMetadata, type TMoostOptions, type TMoostParamsMetadata, type TPipeData, type TPipeFn, type TPipeMetas, TPipePriority, Value, defineInterceptorFn, defineMoostEventHandler, definePipeFn, getInstanceOwnMethods, getInstanceOwnProps, getMoostInfact, getMoostMate, getNewMoostInfact, registerEventScope, resolvePipe, setControllerContext, useControllerContext };
+export { Circular, Const, ConstFactory, Controller, Description, Id, ImportController, Inherit, Inject, InjectEventLogger, Injectable, Intercept, InterceptorHandler, Label, Moost, Optional, Param, Params, Pipe, Provide, Replace, Required, Resolve, type TCallableClassFunction, type TClassConstructor, type TClassFunction, type TControllerOverview, type TInjectableScope, type TInterceptorAfter, type TInterceptorBefore, type TInterceptorClass, type TInterceptorData, type TInterceptorFn, type TInterceptorOnError, TInterceptorPriority, type TMoostAdapter, type TMoostAdapterOptions, type TMoostEventHandlerHookOptions, type TMoostEventHandlerOptions, type TMoostHandler, type TMoostMetadata, type TMoostOptions, type TMoostParamsMetadata, type TPipeData, type TPipeFn, type TPipeMetas, TPipePriority, Value, defineInterceptorFn, defineMoostEventHandler, definePipeFn, getInstanceOwnMethods, getInstanceOwnProps, getMoostInfact, getMoostMate, getNewMoostInfact, registerEventScope, resolvePipe, setControllerContext, useControllerContext };

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { useEventId, useEventContext, useEventLogger, useRouteParams, createEventContext } from '@wooksjs/event-core';
 export { EventLogger, useEventContext, useEventLogger } from '@wooksjs/event-core';
-import { Infact, createProvideRegistry } from '@prostojs/infact';
-export { createProvideRegistry } from '@prostojs/infact';
+import { Infact, createProvideRegistry, createReplaceRegistry } from '@prostojs/infact';
+export { createProvideRegistry, createReplaceRegistry } from '@prostojs/infact';
 import { Mate, getConstructor, isConstructor } from '@prostojs/mate';
 export { getConstructor, isConstructor } from '@prostojs/mate';
 import { ProstoLogger, createConsoleTransort, coloredConsole } from '@prostojs/logger';
@@ -569,6 +569,13 @@ function Provide(type, fn) {
         return meta;
     });
 }
+function Replace(type, newType) {
+    return getMoostMate().decorate(meta => {
+        meta.replace = meta.replace || {};
+        Object.assign(meta.replace, createReplaceRegistry([type, newType]));
+        return meta;
+    });
+}
 function Inject(type) {
     return getMoostMate().decorate('inject', type);
 }
@@ -647,6 +654,7 @@ class Moost {
         this.adapters = [];
         this.controllersOverview = [];
         this.provide = createProvideRegistry([Infact, getMoostInfact], [Mate, getMoostMate]);
+        this.replace = {};
         this.unregisteredControllers = [];
         this.logger = options?.logger || getDefaultLogger('moost');
         getMoostInfact().setLogger(this.getLogger('infact'));
@@ -696,18 +704,18 @@ class Moost {
                 newPrefix = _controller[0];
                 controller = _controller[1];
             }
-            await this.bindController(controller, provide, this.options?.globalPrefix || '', newPrefix);
+            await this.bindController(controller, provide, this.replace, this.options?.globalPrefix || '', newPrefix);
         }
         this.unregisteredControllers = [];
     }
-    async bindController(controller, provide, globalPrefix, replaceOwnPrefix) {
+    async bindController(controller, provide, replace, globalPrefix, replaceOwnPrefix) {
         const mate = getMoostMate();
         const classMeta = mate.read(controller);
         const infact = getMoostInfact();
         const isControllerConsructor = isConstructor(controller);
         const pipes = [...this.pipes, ...(classMeta?.pipes || [])].sort((a, b) => a.priority - b.priority);
         let instance;
-        const infactOpts = { provide, customData: { pipes } };
+        const infactOpts = { provide, replace, customData: { pipes } };
         if (isControllerConsructor &&
             (classMeta?.injectable === 'SINGLETON' || classMeta?.injectable === true)) {
             createEventContext({
@@ -744,12 +752,14 @@ class Moost {
             replaceOwnPrefix,
             interceptors: Array.from(this.interceptors),
             pipes,
-            provide: classMeta?.provide || {},
+            provide: classMeta?.provide,
+            replace: classMeta?.replace,
             logger: this.logger,
         }));
         if (classMeta && classMeta.importController) {
             const prefix = typeof replaceOwnPrefix === 'string' ? replaceOwnPrefix : classMeta.controller?.prefix;
             const mergedProvide = { ...provide, ...classMeta.provide };
+            const mergedReplace = { ...this.replace, ...classMeta.replace };
             for (const ic of classMeta.importController) {
                 if (ic.typeResolver) {
                     const isConstr = isConstructor(ic.typeResolver);
@@ -758,7 +768,7 @@ class Moost {
                         ? ic.typeResolver
                         : isFunc
                             ? await ic.typeResolver()
-                            : ic.typeResolver, ic.provide ? { ...mergedProvide, ...ic.provide } : mergedProvide, `${globalPrefix}/${prefix || ''}`, ic.prefix);
+                            : ic.typeResolver, ic.provide ? { ...mergedProvide, ...ic.provide } : mergedProvide, mergedReplace, `${globalPrefix}/${prefix || ''}`, ic.prefix);
                 }
             }
         }
@@ -821,4 +831,4 @@ class Moost {
     }
 }
 
-export { Circular, Const, ConstFactory, Controller, Description, Id, ImportController, Inherit, Inject, InjectEventLogger, Injectable, Intercept, InterceptorHandler, Label, Moost, Optional, Param, Params, Pipe, Provide, Required, Resolve, TInterceptorPriority, TPipePriority, Value, defineInterceptorFn, defineMoostEventHandler, definePipeFn, getInstanceOwnMethods, getInstanceOwnProps, getMoostInfact, getMoostMate, getNewMoostInfact, registerEventScope, resolvePipe, setControllerContext, useControllerContext };
+export { Circular, Const, ConstFactory, Controller, Description, Id, ImportController, Inherit, Inject, InjectEventLogger, Injectable, Intercept, InterceptorHandler, Label, Moost, Optional, Param, Params, Pipe, Provide, Replace, Required, Resolve, TInterceptorPriority, TPipePriority, Value, defineInterceptorFn, defineMoostEventHandler, definePipeFn, getInstanceOwnMethods, getInstanceOwnProps, getMoostInfact, getMoostMate, getNewMoostInfact, registerEventScope, resolvePipe, setControllerContext, useControllerContext };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "moost",
-  "version": "0.3.31",
+  "version": "0.3.32",
   "description": "moost",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -31,7 +31,7 @@
     "prostojs"
   ],
   "dependencies": {
-    "@prostojs/infact": "^0.1.13",
+    "@prostojs/infact": "^0.1.14",
     "@prostojs/mate": "^0.3.2",
     "@prostojs/logger": "^0.4.0",
     "@wooksjs/event-core": "^0.4.34",