moost 0.4.11 → 0.4.13

package/dist/index.cjs

@@ -142,12 +142,12 @@ function defineMoostEventHandler(options) {
         const instance = await options.getControllerInstance();
         if (instance) {
             setControllerContext(instance, options.controllerMethod || '', options.targetPath);
-            ci.hook('Controller:registered');
+            ci.hook(options.handlerType, 'Controller:registered');
         }
         const interceptorHandler = await options.getIterceptorHandler();
         if (interceptorHandler?.count) {
             try {
-                response = await ci.with('Inteceptors:init', () => interceptorHandler.init());
+                response = await ci.with('Interceptors:init', () => interceptorHandler.init());
                 if (response !== undefined) {
                     return await endWithResponse();
                 }
@@ -170,7 +170,7 @@ function defineMoostEventHandler(options) {
             }
         }
         if (interceptorHandler?.countBefore) {
-            response = await ci.with('Inteceptors:before', () => interceptorHandler.fireBefore(response));
+            response = await ci.with('Interceptors:before', () => interceptorHandler.fireBefore(response));
             if (response !== undefined) {
                 return endWithResponse();
             }
@@ -186,7 +186,7 @@ function defineMoostEventHandler(options) {
             }
         };
         try {
-            response = await ci.with('Handler', {
+            response = await ci.with(`Handler:${options.targetPath}`, {
                 'moost.handler': options.controllerMethod || '',
                 'moost.controller': mate$1.getConstructor(instance).name,
             }, () => callControllerMethod());
@@ -199,7 +199,7 @@ function defineMoostEventHandler(options) {
         async function endWithResponse(raise = false) {
             if (interceptorHandler?.countAfter || interceptorHandler?.countOnError) {
                 try {
-                    response = await ci.with('Inteceptors:after', () => interceptorHandler.fireAfter(response));
+                    response = await ci.with('Interceptors:after', () => interceptorHandler.fireAfter(response));
                 }
                 catch (error) {
                     options.logErrors && logger.error(error);
@@ -311,16 +311,15 @@ class InterceptorHandler {
     }
     async init() {
         const ci = eventCore.getContextInjector();
-        for (const handler of this.handlers) {
-            const response = await ci.with(`Inteceptor:${handler.name}`, {
+        for (const { handler, name } of this.handlers) {
+            const response = await ci.with(`Interceptor:${name}`, {
                 'moost.interceptor.stage': 'init',
-                'moost.interceptor.priority': handler.priority || '',
             }, () => handler(fn => {
-                this.before.push({ handler, fn });
+                this.before.push({ name, fn });
             }, fn => {
-                this.after.unshift({ handler, fn });
+                this.after.unshift({ name, fn });
             }, fn => {
-                this.onError.unshift({ handler, fn });
+                this.onError.unshift({ name, fn });
             }));
             if (response !== undefined) {
                 return response;
@@ -330,10 +329,9 @@ class InterceptorHandler {
     async fireBefore(response) {
         const ci = eventCore.getContextInjector();
         this.response = response;
-        for (const { handler, fn } of this.before) {
-            await ci.with(`Inteceptor:${handler.name}`, {
+        for (const { name, fn } of this.before) {
+            await ci.with(`Interceptor:${name}`, {
                 'moost.interceptor.stage': 'before',
-                'moost.interceptor.priority': handler.priority || '',
             }, () => fn(this.replyFn.bind(this)));
             if (this.responseOverwritten) {
                 break;
@@ -345,18 +343,16 @@ class InterceptorHandler {
         const ci = eventCore.getContextInjector();
         this.response = response;
         if (response instanceof Error) {
-            for (const { handler, fn } of this.onError) {
-                await ci.with(`Inteceptor:${handler.name}`, {
+            for (const { name, fn } of this.onError) {
+                await ci.with(`Interceptor:${name}`, {
                     'moost.interceptor.stage': 'after',
-                    'moost.interceptor.priority': handler.priority || '',
                 }, () => fn(response, this.replyFn.bind(this)));
             }
         }
         else {
-            for (const { handler, fn } of this.after) {
-                await ci.with(`Inteceptor:${handler.name}`, {
+            for (const { name, fn } of this.after) {
+                await ci.with(`Interceptor:${name}`, {
                     'moost.interceptor.stage': 'onError',
-                    'moost.interceptor.priority': handler.priority || '',
                 }, () => fn(response, this.replyFn.bind(this)));
             }
         }
@@ -368,16 +364,19 @@ const mate = getMoostMate();
 function getIterceptorHandlerFactory(interceptors, getTargetInstance, pipes, logger) {
     return () => {
         const interceptorHandlers = [];
-        for (const { handler } of interceptors) {
+        for (const { handler, name } of interceptors) {
             const interceptorMeta = mate.read(handler);
             if (interceptorMeta?.injectable) {
-                interceptorHandlers.push(async (...args) => {
-                    const targetInstance = await getTargetInstance();
-                    return (await getCallableFn(targetInstance, handler, pipes, logger))(...args);
+                interceptorHandlers.push({
+                    handler: async (...args) => {
+                        const targetInstance = await getTargetInstance();
+                        return (await getCallableFn(targetInstance, handler, pipes, logger))(...args);
+                    },
+                    name,
                 });
             }
             else {
-                interceptorHandlers.push(handler);
+                interceptorHandlers.push({ handler: handler, name });
             }
         }
         return Promise.resolve(new InterceptorHandler(interceptorHandlers));
@@ -547,10 +546,11 @@ exports.TInterceptorPriority = void 0;
     TInterceptorPriority[TInterceptorPriority["CATCH_ERROR"] = 5] = "CATCH_ERROR";
     TInterceptorPriority[TInterceptorPriority["AFTER_ALL"] = 6] = "AFTER_ALL";
 })(exports.TInterceptorPriority || (exports.TInterceptorPriority = {}));
-function Intercept(handler, priority) {
+function Intercept(handler, priority, name) {
     return getMoostMate().decorate('interceptors', {
         handler,
         priority: priority || handler.priority || exports.TInterceptorPriority.INTERCEPTOR,
+        name: name || handler._name || handler.name,
     }, true);
 }
 
@@ -828,12 +828,17 @@ class Moost extends hookable.Hookable {
                     priority: typeof item.priority === 'number'
                         ? item.priority
                         : exports.TInterceptorPriority.INTERCEPTOR,
+                    name: item._name || item.name || '<anonymous>',
                 });
             }
             else {
                 this.interceptors.push({
                     handler: item.handler,
                     priority: item.priority,
+                    name: item.name ||
+                        item.handler._name ||
+                        item.handler.name ||
+                        '<anonymous>',
                 });
             }
         }

package/dist/index.d.ts

@@ -112,6 +112,7 @@ type TInterceptorOnError = (error: Error, reply: (response: TAny) => void) => vo
 interface TInterceptorFn {
     (before: (fn: TInterceptorBefore) => void, after: (fn: TInterceptorAfter) => void, onError: (fn: TInterceptorOnError) => void): unknown | Promise<unknown>;
     priority?: TInterceptorPriority;
+    _name?: string;
 }
 declare enum TInterceptorPriority {
     BEFORE_ALL = 0,
@@ -130,7 +131,7 @@ declare enum TInterceptorPriority {
  * @param priority interceptor priority
  * @returns
  */
-declare function Intercept(handler: TCallableClassFunction<TInterceptorFn>, priority?: TInterceptorPriority): ClassDecorator & MethodDecorator;
+declare function Intercept(handler: TCallableClassFunction<TInterceptorFn>, priority?: TInterceptorPriority, name?: string): ClassDecorator & MethodDecorator;
 
 type TDecoratorLevel = 'CLASS' | 'METHOD' | 'PROP' | 'PARAM';
 
@@ -207,6 +208,7 @@ type TMoostHandler<T> = {
 interface TInterceptorData {
     handler: TCallableClassFunction<TInterceptorFn>;
     priority: TInterceptorPriority;
+    name: string;
 }
 declare function getMoostMate<Class extends TObject = TEmpty, Prop extends TObject = TEmpty, Param extends TObject = TEmpty>(): Mate<TMoostMetadata<TEmpty> & Class & {
     params: Array<Param & TMateParamMeta>;
@@ -319,18 +321,24 @@ declare function ConstFactory<T>(factory: () => T | Promise<T>, label?: string):
 declare function InjectEventLogger(topic?: string): ParameterDecorator & PropertyDecorator;
 
 declare class InterceptorHandler {
-    protected handlers: TInterceptorFn[];
-    constructor(handlers: TInterceptorFn[]);
-    protected before: Array<{
+    protected handlers: Array<{
+        handler: TInterceptorFn;
+        name: string;
+    }>;
+    constructor(handlers: Array<{
         handler: TInterceptorFn;
+        name: string;
+    }>);
+    protected before: Array<{
+        name: string;
         fn: TInterceptorBefore;
     }>;
     protected after: Array<{
-        handler: TInterceptorFn;
+        name: string;
         fn: TInterceptorAfter;
     }>;
     protected onError: Array<{
-        handler: TInterceptorFn;
+        name: string;
         fn: TInterceptorOnError;
     }>;
     response?: unknown;
@@ -369,6 +377,7 @@ interface TMoostEventHandlerOptions<T> {
         end?: (opts: TMoostEventHandlerHookOptions<T>) => unknown;
     };
     targetPath: string;
+    handlerType: string;
 }
 declare function registerEventScope(scopeId: string): () => void;
 declare function defineMoostEventHandler<T>(options: TMoostEventHandlerOptions<T>): () => Promise<unknown>;
@@ -393,7 +402,7 @@ interface THandlerOverview {
         args: string[];
     }>;
 }
-type TContextInjectorHook = 'Event:start' | 'Inteceptors:init' | 'Arguments:resolve' | 'Inteceptors:before' | 'Handler' | 'Inteceptors:after';
+type TContextInjectorHook = 'Event:start' | 'Interceptors:init' | 'Arguments:resolve' | 'Interceptors:before' | 'Handler' | 'Interceptors:after';
 
 interface TMoostOptions {
     /**

package/dist/index.mjs

@@ -143,12 +143,12 @@ function defineMoostEventHandler(options) {
         const instance = await options.getControllerInstance();
         if (instance) {
             setControllerContext(instance, options.controllerMethod || '', options.targetPath);
-            ci.hook('Controller:registered');
+            ci.hook(options.handlerType, 'Controller:registered');
         }
         const interceptorHandler = await options.getIterceptorHandler();
         if (interceptorHandler?.count) {
             try {
-                response = await ci.with('Inteceptors:init', () => interceptorHandler.init());
+                response = await ci.with('Interceptors:init', () => interceptorHandler.init());
                 if (response !== undefined) {
                     return await endWithResponse();
                 }
@@ -171,7 +171,7 @@ function defineMoostEventHandler(options) {
             }
         }
         if (interceptorHandler?.countBefore) {
-            response = await ci.with('Inteceptors:before', () => interceptorHandler.fireBefore(response));
+            response = await ci.with('Interceptors:before', () => interceptorHandler.fireBefore(response));
             if (response !== undefined) {
                 return endWithResponse();
             }
@@ -187,7 +187,7 @@ function defineMoostEventHandler(options) {
             }
         };
         try {
-            response = await ci.with('Handler', {
+            response = await ci.with(`Handler:${options.targetPath}`, {
                 'moost.handler': options.controllerMethod || '',
                 'moost.controller': getConstructor(instance).name,
             }, () => callControllerMethod());
@@ -200,7 +200,7 @@ function defineMoostEventHandler(options) {
         async function endWithResponse(raise = false) {
             if (interceptorHandler?.countAfter || interceptorHandler?.countOnError) {
                 try {
-                    response = await ci.with('Inteceptors:after', () => interceptorHandler.fireAfter(response));
+                    response = await ci.with('Interceptors:after', () => interceptorHandler.fireAfter(response));
                 }
                 catch (error) {
                     options.logErrors && logger.error(error);
@@ -312,16 +312,15 @@ class InterceptorHandler {
     }
     async init() {
         const ci = getContextInjector();
-        for (const handler of this.handlers) {
-            const response = await ci.with(`Inteceptor:${handler.name}`, {
+        for (const { handler, name } of this.handlers) {
+            const response = await ci.with(`Interceptor:${name}`, {
                 'moost.interceptor.stage': 'init',
-                'moost.interceptor.priority': handler.priority || '',
             }, () => handler(fn => {
-                this.before.push({ handler, fn });
+                this.before.push({ name, fn });
             }, fn => {
-                this.after.unshift({ handler, fn });
+                this.after.unshift({ name, fn });
             }, fn => {
-                this.onError.unshift({ handler, fn });
+                this.onError.unshift({ name, fn });
             }));
             if (response !== undefined) {
                 return response;
@@ -331,10 +330,9 @@ class InterceptorHandler {
     async fireBefore(response) {
         const ci = getContextInjector();
         this.response = response;
-        for (const { handler, fn } of this.before) {
-            await ci.with(`Inteceptor:${handler.name}`, {
+        for (const { name, fn } of this.before) {
+            await ci.with(`Interceptor:${name}`, {
                 'moost.interceptor.stage': 'before',
-                'moost.interceptor.priority': handler.priority || '',
             }, () => fn(this.replyFn.bind(this)));
             if (this.responseOverwritten) {
                 break;
@@ -346,18 +344,16 @@ class InterceptorHandler {
         const ci = getContextInjector();
         this.response = response;
         if (response instanceof Error) {
-            for (const { handler, fn } of this.onError) {
-                await ci.with(`Inteceptor:${handler.name}`, {
+            for (const { name, fn } of this.onError) {
+                await ci.with(`Interceptor:${name}`, {
                     'moost.interceptor.stage': 'after',
-                    'moost.interceptor.priority': handler.priority || '',
                 }, () => fn(response, this.replyFn.bind(this)));
             }
         }
         else {
-            for (const { handler, fn } of this.after) {
-                await ci.with(`Inteceptor:${handler.name}`, {
+            for (const { name, fn } of this.after) {
+                await ci.with(`Interceptor:${name}`, {
                     'moost.interceptor.stage': 'onError',
-                    'moost.interceptor.priority': handler.priority || '',
                 }, () => fn(response, this.replyFn.bind(this)));
             }
         }
@@ -369,16 +365,19 @@ const mate = getMoostMate();
 function getIterceptorHandlerFactory(interceptors, getTargetInstance, pipes, logger) {
     return () => {
         const interceptorHandlers = [];
-        for (const { handler } of interceptors) {
+        for (const { handler, name } of interceptors) {
             const interceptorMeta = mate.read(handler);
             if (interceptorMeta?.injectable) {
-                interceptorHandlers.push(async (...args) => {
-                    const targetInstance = await getTargetInstance();
-                    return (await getCallableFn(targetInstance, handler, pipes, logger))(...args);
+                interceptorHandlers.push({
+                    handler: async (...args) => {
+                        const targetInstance = await getTargetInstance();
+                        return (await getCallableFn(targetInstance, handler, pipes, logger))(...args);
+                    },
+                    name,
                 });
             }
             else {
-                interceptorHandlers.push(handler);
+                interceptorHandlers.push({ handler: handler, name });
             }
         }
         return Promise.resolve(new InterceptorHandler(interceptorHandlers));
@@ -548,10 +547,11 @@ var TInterceptorPriority;
     TInterceptorPriority[TInterceptorPriority["CATCH_ERROR"] = 5] = "CATCH_ERROR";
     TInterceptorPriority[TInterceptorPriority["AFTER_ALL"] = 6] = "AFTER_ALL";
 })(TInterceptorPriority || (TInterceptorPriority = {}));
-function Intercept(handler, priority) {
+function Intercept(handler, priority, name) {
     return getMoostMate().decorate('interceptors', {
         handler,
         priority: priority || handler.priority || TInterceptorPriority.INTERCEPTOR,
+        name: name || handler._name || handler.name,
     }, true);
 }
 
@@ -829,12 +829,17 @@ class Moost extends Hookable {
                     priority: typeof item.priority === 'number'
                         ? item.priority
                         : TInterceptorPriority.INTERCEPTOR,
+                    name: item._name || item.name || '<anonymous>',
                 });
             }
             else {
                 this.interceptors.push({
                     handler: item.handler,
                     priority: item.priority,
+                    name: item.name ||
+                        item.handler._name ||
+                        item.handler.name ||
+                        '<anonymous>',
                 });
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "moost",
-  "version": "0.4.11",
+  "version": "0.4.13",
   "description": "moost",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -34,9 +34,9 @@
     "@prostojs/infact": "^0.2.3",
     "@prostojs/mate": "^0.3.2",
     "@prostojs/logger": "^0.4.0",
-    "@wooksjs/event-core": "^0.5.9",
+    "@wooksjs/event-core": "^0.5.11",
     "hookable": "^5.5.3",
-    "wooks": "^0.5.9"
+    "wooks": "^0.5.11"
   },
   "author": "Artem Maltsev",
   "license": "MIT",