moost 0.2.30 → 0.2.32

package/dist/index.cjs

@@ -400,8 +400,14 @@ function Required() {
 function Resolve(resolver, label) {
     return (target, key, index) => {
         const i = typeof index === 'number' ? index : undefined;
-        fillLabel(target, key || '', i, label);
-        getMoostMate().decorate('resolver', resolver)(target, key, i);
+        getMoostMate().decorate('resolver', (metas, level) => {
+            let newLabel = label;
+            if (!newLabel && level === 'PROP' && typeof metas.key === 'string') {
+                newLabel = metas.key;
+            }
+            fillLabel(target, key || '', i, newLabel);
+            return resolver(metas, level);
+        })(target, key, i);
     };
 }
 /**
@@ -1076,7 +1082,7 @@ class Moost {
      * Provides InterceptorHandler with global interceptors and pipes.
      * Used to process interceptors when event handler was not found.
      *
-     * @returns array of interceptors
+     * @returns IterceptorHandler
      */
     getGlobalInterceptorHandler() {
         if (!this.globalInterceptorHandler) {
@@ -1085,9 +1091,9 @@ class Moost {
             const pipes = [...(this.pipes || []), ...((thisMeta === null || thisMeta === void 0 ? void 0 : thisMeta.pipes) || [])].sort((a, b) => a.priority - b.priority);
             const interceptors = [...this.interceptors, ...((thisMeta === null || thisMeta === void 0 ? void 0 : thisMeta.interceptors) || [])]
                 .sort((a, b) => a.priority - b.priority);
-            this.globalInterceptorHandler = getIterceptorHandlerFactory(interceptors, () => Promise.resolve(this), pipes, this.logger)();
+            this.globalInterceptorHandler = getIterceptorHandlerFactory(interceptors, () => Promise.resolve(this), pipes, this.logger);
         }
-        return this.globalInterceptorHandler;
+        return this.globalInterceptorHandler();
     }
     applyGlobalInterceptors(...items) {
         for (const item of items) {
@@ -1144,12 +1150,20 @@ function useControllerContext() {
     // todo: add generic types to getControllerMeta
     const getControllerMeta = () => getMoostMate().read(getController());
     // todo: add generic types to getMethodMeta
-    const getMethodMeta = () => getMoostMate().read(getController(), getMethod());
+    const getMethodMeta = (name) => getMoostMate().read(getController(), name || getMethod());
+    function instantiate(c) {
+        return getMoostInfact().getForInstance(getController(), c);
+    }
     return {
+        instantiate,
         getController,
         getMethod,
         getControllerMeta,
         getMethodMeta,
+        getPropertiesList: () => { var _a; return ((_a = getControllerMeta()) === null || _a === void 0 ? void 0 : _a.properties) || []; },
+        getScope: () => { var _a; return ((_a = getControllerMeta()) === null || _a === void 0 ? void 0 : _a.injectable) || 'SINGLETON'; },
+        getParamsMeta: () => { var _a; return ((_a = getMethodMeta()) === null || _a === void 0 ? void 0 : _a.params) || []; },
+        getPropMeta: (name) => getMethodMeta(name),
     };
 }
 
@@ -1267,6 +1281,14 @@ function defineMoostEventHandler(options) {
     });
 }
 
+Object.defineProperty(exports, 'createProvideRegistry', {
+    enumerable: true,
+    get: function () { return infact$1.createProvideRegistry; }
+});
+Object.defineProperty(exports, 'EventLogger', {
+    enumerable: true,
+    get: function () { return eventCore.EventLogger; }
+});
 exports.Circular = Circular;
 exports.Const = Const;
 exports.ConstFactory = ConstFactory;

package/dist/index.d.ts

@@ -1,6 +1,9 @@
+import { createProvideRegistry } from '@prostojs/infact';
+import { EventLogger } from '@wooksjs/event-core';
 import { Infact } from '@prostojs/infact';
 import { Mate } from '@prostojs/mate';
 import { TConsoleBase } from '@prostojs/logger';
+import { THook } from '@wooksjs/event-core';
 import { TMateClassMeta } from '@prostojs/mate';
 import { TMateParamMeta } from '@prostojs/mate';
 import { TMatePropMeta } from '@prostojs/mate';
@@ -41,6 +44,8 @@ export declare function ConstFactory<T>(factory: () => T | Promise<T>, label?: s
  */
 export declare function Controller(prefix?: string): ClassDecorator;
 
+export { createProvideRegistry }
+
 /**
  * ### Define Interceptor Function
  *
@@ -98,6 +103,8 @@ export declare function Description(value: string): MethodDecorator & ClassDecor
 
 export declare function Dto(dtoOptions?: TValidoDtoOptions): ClassDecorator;
 
+export { EventLogger }
+
 export declare const genericTypesCastPipe: (strict?: boolean) => TPipeFn;
 
 export declare function getMoostInfact(): Infact<TMoostMetadata, TMoostMetadata, TMoostParamsMetadata, TCustom>;
@@ -283,7 +290,7 @@ export declare class Moost {
      * @returns
      */
     getLogger(topic: string): TConsoleBase;
-    adapter<T>(a: TMoostAdapter<T>): TMoostAdapter<T>;
+    adapter<T extends TMoostAdapter<TAny>>(a: T): T;
     /**
      * ### init
      * Ititializes adapter. Must be called after adapters are attached.
@@ -292,12 +299,12 @@ export declare class Moost {
     protected bindControllers(): Promise<void>;
     protected bindController(controller: TFunction | TObject, provide: TProvideRegistry, globalPrefix: string, replaceOwnPrefix?: string): Promise<void>;
     applyGlobalPipes(...items: (TPipeFn | TPipeData)[]): this;
-    protected globalInterceptorHandler?: Promise<InterceptorHandler>;
+    protected globalInterceptorHandler?: () => Promise<InterceptorHandler>;
     /**
      * Provides InterceptorHandler with global interceptors and pipes.
      * Used to process interceptors when event handler was not found.
      *
-     * @returns array of interceptors
+     * @returns IterceptorHandler
      */
     getGlobalInterceptorHandler(): Promise<InterceptorHandler>;
     applyGlobalInterceptors(...items: (TInterceptorData['handler'] | TInterceptorData)[]): this;
@@ -429,6 +436,8 @@ declare interface TEmpty {
 
 declare type TFunction = Function;
 
+export { THook }
+
 export declare type TInjectableScope = 'FOR_EVENT' | 'SINGLETON';
 
 export declare type TInterceptorAfter = (response: TAny, reply: (response: TAny) => void) => void | Promise<void>;
@@ -586,10 +595,15 @@ declare interface TValidatePipeOptions {
 }
 
 export declare function useControllerContext<T extends object>(): {
+    instantiate: <T_1>(c: TClassConstructor<T_1>) => Promise<T_1>;
     getController: () => T;
     getMethod: () => keyof T;
     getControllerMeta: () => Partial<TMoostMetadata & TEmpty & TMateClassMeta & TMatePropMeta<TMoostMetadata & TMoostParamsMetadata & TEmpty> & TMoostParamsMetadata & TMateParamMeta> | undefined;
-    getMethodMeta: () => Partial<TMoostMetadata & TEmpty & TMateClassMeta & TMatePropMeta<TMoostMetadata & TMoostParamsMetadata & TEmpty> & TMoostParamsMetadata & TMateParamMeta> | undefined;
+    getMethodMeta: (name?: string) => Partial<TMoostMetadata & TEmpty & TMateClassMeta & TMatePropMeta<TMoostMetadata & TMoostParamsMetadata & TEmpty> & TMoostParamsMetadata & TMateParamMeta> | undefined;
+    getPropertiesList: () => (string | symbol)[];
+    getScope: () => true | TInjectableScope;
+    getParamsMeta: () => (TMoostMetadata & TMoostParamsMetadata & TEmpty & TMateParamMeta)[];
+    getPropMeta: (name: string) => Partial<TMoostMetadata & TEmpty & TMateClassMeta & TMatePropMeta<TMoostMetadata & TMoostParamsMetadata & TEmpty> & TMoostParamsMetadata & TMateParamMeta> | undefined;
 };
 
 export declare function Validate<T = unknown>(validator: TValidoFn<T>): PropertyDecorator & ParameterDecorator;

package/dist/index.mjs

@@ -1,6 +1,8 @@
 import { Mate, getConstructor, isConstructor } from '@prostojs/mate';
 import { Infact, createProvideRegistry } from '@prostojs/infact';
+export { createProvideRegistry } from '@prostojs/infact';
 import { useEventId, useEventContext, useRouteParams, useEventLogger } from '@wooksjs/event-core';
+export { EventLogger } from '@wooksjs/event-core';
 import { validoIsTypeOf, validoIsString, validoIsNumber, validoIsBoolean, Valido } from '@prostojs/valido';
 import { ProstoLogger, createConsoleTransort, coloredConsole } from '@prostojs/logger';
 
@@ -398,8 +400,14 @@ function Required() {
 function Resolve(resolver, label) {
     return (target, key, index) => {
         const i = typeof index === 'number' ? index : undefined;
-        fillLabel(target, key || '', i, label);
-        getMoostMate().decorate('resolver', resolver)(target, key, i);
+        getMoostMate().decorate('resolver', (metas, level) => {
+            let newLabel = label;
+            if (!newLabel && level === 'PROP' && typeof metas.key === 'string') {
+                newLabel = metas.key;
+            }
+            fillLabel(target, key || '', i, newLabel);
+            return resolver(metas, level);
+        })(target, key, i);
     };
 }
 /**
@@ -1074,7 +1082,7 @@ class Moost {
      * Provides InterceptorHandler with global interceptors and pipes.
      * Used to process interceptors when event handler was not found.
      *
-     * @returns array of interceptors
+     * @returns IterceptorHandler
      */
     getGlobalInterceptorHandler() {
         if (!this.globalInterceptorHandler) {
@@ -1083,9 +1091,9 @@ class Moost {
             const pipes = [...(this.pipes || []), ...((thisMeta === null || thisMeta === void 0 ? void 0 : thisMeta.pipes) || [])].sort((a, b) => a.priority - b.priority);
             const interceptors = [...this.interceptors, ...((thisMeta === null || thisMeta === void 0 ? void 0 : thisMeta.interceptors) || [])]
                 .sort((a, b) => a.priority - b.priority);
-            this.globalInterceptorHandler = getIterceptorHandlerFactory(interceptors, () => Promise.resolve(this), pipes, this.logger)();
+            this.globalInterceptorHandler = getIterceptorHandlerFactory(interceptors, () => Promise.resolve(this), pipes, this.logger);
         }
-        return this.globalInterceptorHandler;
+        return this.globalInterceptorHandler();
     }
     applyGlobalInterceptors(...items) {
         for (const item of items) {
@@ -1142,12 +1150,20 @@ function useControllerContext() {
     // todo: add generic types to getControllerMeta
     const getControllerMeta = () => getMoostMate().read(getController());
     // todo: add generic types to getMethodMeta
-    const getMethodMeta = () => getMoostMate().read(getController(), getMethod());
+    const getMethodMeta = (name) => getMoostMate().read(getController(), name || getMethod());
+    function instantiate(c) {
+        return getMoostInfact().getForInstance(getController(), c);
+    }
     return {
+        instantiate,
         getController,
         getMethod,
         getControllerMeta,
         getMethodMeta,
+        getPropertiesList: () => { var _a; return ((_a = getControllerMeta()) === null || _a === void 0 ? void 0 : _a.properties) || []; },
+        getScope: () => { var _a; return ((_a = getControllerMeta()) === null || _a === void 0 ? void 0 : _a.injectable) || 'SINGLETON'; },
+        getParamsMeta: () => { var _a; return ((_a = getMethodMeta()) === null || _a === void 0 ? void 0 : _a.params) || []; },
+        getPropMeta: (name) => getMethodMeta(name),
     };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "moost",
-  "version": "0.2.30",
+  "version": "0.2.32",
   "description": "moost",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -26,8 +26,8 @@
     "@prostojs/mate": "^0.1.14",
     "@prostojs/logger": "^0.3.4",
     "@prostojs/valido": "^0.0.2",
-    "@wooksjs/event-core": "^0.3.1",
-    "wooks": "^0.3.1"
+    "@wooksjs/event-core": "^0.3.3",
+    "wooks": "^0.3.3"
   },
   "author": "Artem Maltsev",
   "license": "MIT",