moost 0.2.19 → 0.2.21

package/dist/index.cjs

@@ -4,6 +4,7 @@ var mate = require('@prostojs/mate');
 var infact = require('@prostojs/infact');
 var eventCore = require('@wooksjs/event-core');
 var valido$1 = require('@prostojs/valido');
+var logger = require('@prostojs/logger');
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -114,33 +115,18 @@ function getParentProps(constructor) {
     return [];
 }
 
-const banner = () => `[${"moost"}][${new Date().toISOString().replace('T', ' ').replace(/\.\d{3}z$/i, '')}] `;
-
-/* istanbul ignore file */
-function log(text) {
-    console.log('' + '' + banner() + text + '');
-}
-function logError(error) {
-    console.error('' + '' + banner() + error + '');
-}
-
-function panic(error) {
-    logError(error);
-    return new Error(error);
-}
-
-function getCallableFn(targetInstance, fn, restoreCtx, pipes, silent) {
+function getCallableFn(targetInstance, fn, restoreCtx, pipes, logger) {
     return __awaiter(this, void 0, void 0, function* () {
         const mate$1 = getMoostMate();
         const meta = mate$1.read(fn);
         if (meta === null || meta === void 0 ? void 0 : meta.injectable) {
             const infact = getMoostInfact();
-            infact.silent(silent || (meta.injectable === 'FOR_EVENT' ? 'logs' : false));
+            infact.silent(true);
             const instance = yield infact.getForInstance(targetInstance, fn, {
                 syncContextFn: () => { restoreCtx && restoreCtx(); },
                 customData: { pipes: [...(pipes || []), ...(meta.pipes || [])].sort((a, b) => a.priority - b.priority) },
             });
-            infact.silent(!!silent);
+            infact.silent(false);
             return ((...args) => {
                 return instance.handler(...args);
             });
@@ -148,7 +134,9 @@ function getCallableFn(targetInstance, fn, restoreCtx, pipes, silent) {
         if (typeof fn === 'function') {
             return fn;
         }
-        throw panic(`getCallableFn failed for "${mate.getConstructor(targetInstance).name}" because the passed arg is not a Function nor TClassFunction`);
+        const e = new Error(`getCallableFn failed for "${mate.getConstructor(targetInstance).name}" because the passed arg is not a Function nor TClassFunction`);
+        logger.error(e);
+        throw e;
     });
 }
 
@@ -239,7 +227,7 @@ function bindControllerMethods(options) {
                             const { restoreCtx } = eventCore.useEventContext();
                             const targetInstance = yield getInstance();
                             restoreCtx();
-                            return (yield getCallableFn(targetInstance, handler, restoreCtx, pipes, options.silent))(...args);
+                            return (yield getCallableFn(targetInstance, handler, restoreCtx, pipes, options.logger))(...args);
                         }));
                     }
                     else {
@@ -275,7 +263,6 @@ function bindControllerMethods(options) {
                 yield adapter.bindHandler({
                     prefix,
                     fakeInstance,
-                    silent: opts.silent,
                     getInstance,
                     registerEventScope: (scopeId) => {
                         const infact = getMoostInfact();
@@ -286,7 +273,7 @@ function bindControllerMethods(options) {
                     handlers: methodMeta.handlers,
                     getIterceptorHandler,
                     resolveArgs,
-                    logHandler: opts.silent ? () => { } : (eventName) => log(`• ${eventName} ${'' + '' + ''}→ ${classConstructor.name}.${''}${method}${''}()`),
+                    logHandler: (eventName) => options.logger.info(`• ${eventName} ${'' + '' + ''}→ ${classConstructor.name}.${''}${method}${''}()`),
                 });
             }
         }
@@ -368,6 +355,14 @@ function Const(value, label) {
 function ConstFactory(factory, label) {
     return Resolve(() => __awaiter(this, void 0, void 0, function* () { return yield factory(); }), label);
 }
+/**
+ * Resolves event logger from event context
+ * @param topic
+ * @returns Resolver to '@wooksjs/event-core' (EventLogger)
+ */
+function InjectEventLogger(topic) {
+    return Resolve(() => eventCore.useEventLogger(topic));
+}
 function fillLabel(target, key, index, name) {
     if (name) {
         const meta = getMoostMate().read(target, key);
@@ -563,6 +558,17 @@ function getMoostValido() {
     return valido;
 }
 
+function getDefaultLogger(topic) {
+    return new logger.ProstoLogger({
+        level: 4,
+        transports: [
+            logger.createConsoleTransort({
+                format: logger.coloredConsole,
+            }),
+        ],
+    }, topic);
+}
+
 class Moost {
     constructor(options) {
         this.options = options;
@@ -571,9 +577,16 @@ class Moost {
         this.adapters = [];
         this.provide = infact.createProvideRegistry([infact.Infact, getMoostInfact], [mate.Mate, getMoostMate], [valido$1.Valido, getMoostValido]);
         this.unregisteredControllers = [];
-        if (options === null || options === void 0 ? void 0 : options.silent) {
-            getMoostInfact().silent(options === null || options === void 0 ? void 0 : options.silent);
+        this.logger = (options === null || options === void 0 ? void 0 : options.logger) || getDefaultLogger('moost');
+        getMoostInfact().setLogger(this.getLogger('infact'));
+        // const mate = getMoostMate()
+        // Object.assign(mate, { logger: this.getLogger('mate') })
+    }
+    getLogger(topic) {
+        if (this.logger instanceof logger.ProstoLogger) {
+            return this.logger.createTopic(topic);
         }
+        return this.logger;
     }
     adapter(a) {
         this.adapters.push(a);
@@ -601,6 +614,8 @@ class Moost {
     bindControllers() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            const infact = getMoostInfact();
+            infact.setLogger(this.logger);
             const meta = getMoostMate();
             const thisMeta = meta.read(this);
             const provide = Object.assign(Object.assign({}, ((thisMeta === null || thisMeta === void 0 ? void 0 : thisMeta.provide) || {})), this.provide);
@@ -611,10 +626,10 @@ class Moost {
         });
     }
     bindController(controller, provide, globalPrefix, replaceOwnPrefix) {
-        var _a, _b;
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const meta = getMoostMate();
-            const classMeta = meta.read(controller);
+            const mate$1 = getMoostMate();
+            const classMeta = mate$1.read(controller);
             const infact = getMoostInfact();
             const isControllerConsructor = mate.isConstructor(controller);
             const pipes = [...this.pipes, ...((classMeta === null || classMeta === void 0 ? void 0 : classMeta.pipes) || [])].sort((a, b) => a.priority - b.priority);
@@ -629,12 +644,11 @@ class Moost {
             }
             // getInstance - instance factory for resolving SINGLETON and FOR_EVENT instance
             const getInstance = instance ? () => Promise.resolve(instance) : () => __awaiter(this, void 0, void 0, function* () {
-                var _c, _d;
                 // if (!instance) {
-                infact.silent(((_c = this.options) === null || _c === void 0 ? void 0 : _c.silent) || 'logs');
+                infact.silent(true);
                 const { restoreCtx } = eventCore.useEventContext();
                 const instance = yield infact.get(controller, Object.assign(Object.assign({}, infactOpts), { syncContextFn: restoreCtx }));
-                infact.silent(!!((_d = this.options) === null || _d === void 0 ? void 0 : _d.silent));
+                infact.silent(false);
                 // }
                 return instance;
             });
@@ -643,15 +657,15 @@ class Moost {
                 getInstance,
                 classConstructor,
                 adapters: this.adapters,
-                silent: !!((_a = this.options) === null || _a === void 0 ? void 0 : _a.silent),
                 globalPrefix,
                 replaceOwnPrefix,
                 interceptors: [...this.interceptors],
                 pipes,
                 provide: (classMeta === null || classMeta === void 0 ? void 0 : classMeta.provide) || {},
+                logger: this.logger,
             });
             if (classMeta && classMeta.importController) {
-                const prefix = typeof replaceOwnPrefix === 'string' ? replaceOwnPrefix : (_b = classMeta === null || classMeta === void 0 ? void 0 : classMeta.controller) === null || _b === void 0 ? void 0 : _b.prefix;
+                const prefix = typeof replaceOwnPrefix === 'string' ? replaceOwnPrefix : (_a = classMeta === null || classMeta === void 0 ? void 0 : classMeta.controller) === null || _a === void 0 ? void 0 : _a.prefix;
                 const mergedProvide = Object.assign(Object.assign({}, provide), ((classMeta === null || classMeta === void 0 ? void 0 : classMeta.provide) || {}));
                 for (const ic of classMeta.importController) {
                     if (ic.typeResolver) {
@@ -830,6 +844,7 @@ exports.Id = Id;
 exports.ImportController = ImportController;
 exports.Inherit = Inherit;
 exports.Inject = Inject;
+exports.InjectEventLogger = InjectEventLogger;
 exports.Injectable = Injectable;
 exports.Intercept = Intercept;
 exports.InterceptorHandler = InterceptorHandler;

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 import { Infact } from '@prostojs/infact';
 import { Mate } from '@prostojs/mate';
+import { TConsoleBase } from '@prostojs/logger';
 import { TProvideFn } from '@prostojs/infact';
 import { TProvideRegistry } from '@prostojs/infact';
 import { TValidoDtoOptions } from '@prostojs/valido';
@@ -83,6 +84,13 @@ export declare function Inject(type: string | TClassConstructor): ParameterDecor
  */
 export declare function Injectable(scope?: true | TInjectableScope): ClassDecorator;
 
+/**
+ * Resolves event logger from event context
+ * @param topic
+ * @returns Resolver to '@wooksjs/event-core' (EventLogger)
+ */
+export declare function InjectEventLogger(topic?: string): ParameterDecorator & PropertyDecorator;
+
 export declare function Intercept(handler: TCallableClassFunction<TInterceptorFn>, priority?: TInterceptorPriority): ClassDecorator & MethodDecorator;
 
 export declare class InterceptorHandler {
@@ -113,12 +121,14 @@ export declare function Label(value: string): MethodDecorator & ClassDecorator &
 
 export declare class Moost {
     protected options?: TMoostOptions | undefined;
+    protected logger: TConsoleBase;
     protected pipes: TPipeData[];
     protected interceptors: TInterceptorData[];
     protected adapters: TMoostAdapter<TAny>[];
     protected provide: TProvideRegistry;
     protected unregisteredControllers: (TObject | TFunction)[];
     constructor(options?: TMoostOptions | undefined);
+    getLogger(topic: string): TConsoleBase;
     adapter<T extends object, A extends TMoostAdapter<T>>(a: A): A;
     init(): Promise<void>;
     protected bindControllers(): Promise<void>;
@@ -267,7 +277,6 @@ export declare interface TMoostAdapterOptions<H extends object, T extends object
     prefix: string;
     fakeInstance: T;
     getInstance: () => Promise<T>;
-    silent: boolean;
     method: keyof T;
     handlers: TMoostHandler<H>[];
     getIterceptorHandler: () => Promise<InterceptorHandler>;
@@ -300,7 +309,7 @@ export declare interface TMoostMetadata extends TCommonMetaFields, TCommonMoostM
 
 export declare interface TMoostOptions {
     globalPrefix?: string;
-    silent?: boolean;
+    logger?: TConsoleBase;
 }
 
 export declare interface TMoostParamsMetadata extends TCommonMetaFields, TCommonMoostMeta {

package/dist/index.mjs

@@ -1,7 +1,8 @@
 import { Mate, getConstructor, isConstructor } from '@prostojs/mate';
 import { Infact, createProvideRegistry } from '@prostojs/infact';
-import { useEventId, useEventContext, useRouteParams } from '@wooksjs/event-core';
+import { useEventId, useEventContext, useRouteParams, useEventLogger } from '@wooksjs/event-core';
 import { validoIsTypeOf, validoIsString, validoIsNumber, validoIsBoolean, Valido } from '@prostojs/valido';
+import { ProstoLogger, createConsoleTransort, coloredConsole } from '@prostojs/logger';
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -112,33 +113,18 @@ function getParentProps(constructor) {
     return [];
 }
 
-const banner = () => `[${"moost"}][${new Date().toISOString().replace('T', ' ').replace(/\.\d{3}z$/i, '')}] `;
-
-/* istanbul ignore file */
-function log(text) {
-    console.log('' + '' + banner() + text + '');
-}
-function logError(error) {
-    console.error('' + '' + banner() + error + '');
-}
-
-function panic(error) {
-    logError(error);
-    return new Error(error);
-}
-
-function getCallableFn(targetInstance, fn, restoreCtx, pipes, silent) {
+function getCallableFn(targetInstance, fn, restoreCtx, pipes, logger) {
     return __awaiter(this, void 0, void 0, function* () {
         const mate = getMoostMate();
         const meta = mate.read(fn);
         if (meta === null || meta === void 0 ? void 0 : meta.injectable) {
             const infact = getMoostInfact();
-            infact.silent(silent || (meta.injectable === 'FOR_EVENT' ? 'logs' : false));
+            infact.silent(true);
             const instance = yield infact.getForInstance(targetInstance, fn, {
                 syncContextFn: () => { restoreCtx && restoreCtx(); },
                 customData: { pipes: [...(pipes || []), ...(meta.pipes || [])].sort((a, b) => a.priority - b.priority) },
             });
-            infact.silent(!!silent);
+            infact.silent(false);
             return ((...args) => {
                 return instance.handler(...args);
             });
@@ -146,7 +132,9 @@ function getCallableFn(targetInstance, fn, restoreCtx, pipes, silent) {
         if (typeof fn === 'function') {
             return fn;
         }
-        throw panic(`getCallableFn failed for "${getConstructor(targetInstance).name}" because the passed arg is not a Function nor TClassFunction`);
+        const e = new Error(`getCallableFn failed for "${getConstructor(targetInstance).name}" because the passed arg is not a Function nor TClassFunction`);
+        logger.error(e);
+        throw e;
     });
 }
 
@@ -237,7 +225,7 @@ function bindControllerMethods(options) {
                             const { restoreCtx } = useEventContext();
                             const targetInstance = yield getInstance();
                             restoreCtx();
-                            return (yield getCallableFn(targetInstance, handler, restoreCtx, pipes, options.silent))(...args);
+                            return (yield getCallableFn(targetInstance, handler, restoreCtx, pipes, options.logger))(...args);
                         }));
                     }
                     else {
@@ -273,7 +261,6 @@ function bindControllerMethods(options) {
                 yield adapter.bindHandler({
                     prefix,
                     fakeInstance,
-                    silent: opts.silent,
                     getInstance,
                     registerEventScope: (scopeId) => {
                         const infact = getMoostInfact();
@@ -284,7 +271,7 @@ function bindControllerMethods(options) {
                     handlers: methodMeta.handlers,
                     getIterceptorHandler,
                     resolveArgs,
-                    logHandler: opts.silent ? () => { } : (eventName) => log(`• ${eventName} ${'' + '' + ''}→ ${classConstructor.name}.${''}${method}${''}()`),
+                    logHandler: (eventName) => options.logger.info(`• ${eventName} ${'' + '' + ''}→ ${classConstructor.name}.${''}${method}${''}()`),
                 });
             }
         }
@@ -366,6 +353,14 @@ function Const(value, label) {
 function ConstFactory(factory, label) {
     return Resolve(() => __awaiter(this, void 0, void 0, function* () { return yield factory(); }), label);
 }
+/**
+ * Resolves event logger from event context
+ * @param topic
+ * @returns Resolver to '@wooksjs/event-core' (EventLogger)
+ */
+function InjectEventLogger(topic) {
+    return Resolve(() => useEventLogger(topic));
+}
 function fillLabel(target, key, index, name) {
     if (name) {
         const meta = getMoostMate().read(target, key);
@@ -561,6 +556,17 @@ function getMoostValido() {
     return valido;
 }
 
+function getDefaultLogger(topic) {
+    return new ProstoLogger({
+        level: 4,
+        transports: [
+            createConsoleTransort({
+                format: coloredConsole,
+            }),
+        ],
+    }, topic);
+}
+
 class Moost {
     constructor(options) {
         this.options = options;
@@ -569,9 +575,16 @@ class Moost {
         this.adapters = [];
         this.provide = createProvideRegistry([Infact, getMoostInfact], [Mate, getMoostMate], [Valido, getMoostValido]);
         this.unregisteredControllers = [];
-        if (options === null || options === void 0 ? void 0 : options.silent) {
-            getMoostInfact().silent(options === null || options === void 0 ? void 0 : options.silent);
+        this.logger = (options === null || options === void 0 ? void 0 : options.logger) || getDefaultLogger('moost');
+        getMoostInfact().setLogger(this.getLogger('infact'));
+        // const mate = getMoostMate()
+        // Object.assign(mate, { logger: this.getLogger('mate') })
+    }
+    getLogger(topic) {
+        if (this.logger instanceof ProstoLogger) {
+            return this.logger.createTopic(topic);
         }
+        return this.logger;
     }
     adapter(a) {
         this.adapters.push(a);
@@ -599,6 +612,8 @@ class Moost {
     bindControllers() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            const infact = getMoostInfact();
+            infact.setLogger(this.logger);
             const meta = getMoostMate();
             const thisMeta = meta.read(this);
             const provide = Object.assign(Object.assign({}, ((thisMeta === null || thisMeta === void 0 ? void 0 : thisMeta.provide) || {})), this.provide);
@@ -609,10 +624,10 @@ class Moost {
         });
     }
     bindController(controller, provide, globalPrefix, replaceOwnPrefix) {
-        var _a, _b;
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const meta = getMoostMate();
-            const classMeta = meta.read(controller);
+            const mate = getMoostMate();
+            const classMeta = mate.read(controller);
             const infact = getMoostInfact();
             const isControllerConsructor = isConstructor(controller);
             const pipes = [...this.pipes, ...((classMeta === null || classMeta === void 0 ? void 0 : classMeta.pipes) || [])].sort((a, b) => a.priority - b.priority);
@@ -627,12 +642,11 @@ class Moost {
             }
             // getInstance - instance factory for resolving SINGLETON and FOR_EVENT instance
             const getInstance = instance ? () => Promise.resolve(instance) : () => __awaiter(this, void 0, void 0, function* () {
-                var _c, _d;
                 // if (!instance) {
-                infact.silent(((_c = this.options) === null || _c === void 0 ? void 0 : _c.silent) || 'logs');
+                infact.silent(true);
                 const { restoreCtx } = useEventContext();
                 const instance = yield infact.get(controller, Object.assign(Object.assign({}, infactOpts), { syncContextFn: restoreCtx }));
-                infact.silent(!!((_d = this.options) === null || _d === void 0 ? void 0 : _d.silent));
+                infact.silent(false);
                 // }
                 return instance;
             });
@@ -641,15 +655,15 @@ class Moost {
                 getInstance,
                 classConstructor,
                 adapters: this.adapters,
-                silent: !!((_a = this.options) === null || _a === void 0 ? void 0 : _a.silent),
                 globalPrefix,
                 replaceOwnPrefix,
                 interceptors: [...this.interceptors],
                 pipes,
                 provide: (classMeta === null || classMeta === void 0 ? void 0 : classMeta.provide) || {},
+                logger: this.logger,
             });
             if (classMeta && classMeta.importController) {
-                const prefix = typeof replaceOwnPrefix === 'string' ? replaceOwnPrefix : (_b = classMeta === null || classMeta === void 0 ? void 0 : classMeta.controller) === null || _b === void 0 ? void 0 : _b.prefix;
+                const prefix = typeof replaceOwnPrefix === 'string' ? replaceOwnPrefix : (_a = classMeta === null || classMeta === void 0 ? void 0 : classMeta.controller) === null || _a === void 0 ? void 0 : _a.prefix;
                 const mergedProvide = Object.assign(Object.assign({}, provide), ((classMeta === null || classMeta === void 0 ? void 0 : classMeta.provide) || {}));
                 for (const ic of classMeta.importController) {
                     if (ic.typeResolver) {
@@ -819,4 +833,4 @@ const validatePipe = (opts) => {
     return pipe;
 };
 
-export { Circular, Const, ConstFactory, Controller, Dto, Id, ImportController, Inherit, Inject, Injectable, Intercept, InterceptorHandler, IsArray, IsBoolean, IsNumber, IsString, IsTypeOf, Label, Moost, Nullable, Optional, Param, Params, Provide, Required, Resolve, TInterceptorPriority, TPipePriority, Validate, genericTypesCastPipe, getMoostInfact, getMoostMate, getNewMoostInfact, resolvePipe, validatePipe };
+export { Circular, Const, ConstFactory, Controller, Dto, Id, ImportController, Inherit, Inject, InjectEventLogger, Injectable, Intercept, InterceptorHandler, IsArray, IsBoolean, IsNumber, IsString, IsTypeOf, Label, Moost, Nullable, Optional, Param, Params, Provide, Required, Resolve, TInterceptorPriority, TPipePriority, Validate, genericTypesCastPipe, getMoostInfact, getMoostMate, getNewMoostInfact, resolvePipe, validatePipe };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "moost",
-  "version": "0.2.19",
+  "version": "0.2.21",
   "description": "moost",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -22,11 +22,12 @@
     "prostojs"
   ],
   "dependencies": {
-    "@prostojs/infact": "^0.1.8",
-    "@prostojs/mate": "^0.1.13",
+    "@prostojs/infact": "^0.1.11",
+    "@prostojs/mate": "^0.1.14",
+    "@prostojs/logger": "^0.3.2",
     "@prostojs/valido": "^0.0.2",
-    "@wooksjs/event-core": "^0.2.12",
-    "wooks": "^0.2.12"
+    "@wooksjs/event-core": "^0.2.14",
+    "wooks": "^0.2.14"
   },
   "author": "Artem Maltsev",
   "license": "MIT",