@zajno/common 2.7.0 → 2.7.2

package/esm/logger/manager.js

@@ -1,46 +1,72 @@
 import { Getter } from '../types/getter.js';
 import { CONSOLE } from './console.js';
 import { ProxyLogger } from './proxy.js';
+import { batchLoggers } from './batch.js';
 export class LoggersManager {
+    /** Storage for instances created by this manager */
     _managed = new Set();
+    /** Storage for all attached instances. */
     _all = new Set();
+    /** Current main mode. */
     _mode = false;
+    /** Additionally attached logger destinations (e.g. for analytics) */
+    _destinations = [];
     get mode() { return this._mode; }
     /** Creates and attaches an logger instance created from the current mode  */
     create(name, mode = undefined) {
-        const result = this._createImplementation(mode);
+        const impl = this._createImplementation(mode);
+        const result = batchLoggers(impl, ...this._destinations);
         const proxy = new ProxyLogger(result, name);
         this._managed.add(proxy);
         this._all.add(proxy);
         return proxy;
     }
-    /** Attaches existing instance, optionally adds name prefix to it */
+    /** Attaches existing instance, optionally adds name prefix to it.
+     *
+     * Useful when it's needed to enable/disable independent logger when this manager's mode changes.
+     *
+     * @returns - The attached logger instance wrapped in a ProxyLogger.
+    */
     attach(instance, name) {
         const proxy = new ProxyLogger(instance, name);
         this._all.add(proxy);
-        return true;
+        this._updateAll(this._mode);
+        return proxy;
+    }
+    /**
+     * Adds a destination to the logger manager.
+     *
+     * This is useful for analytics or other purposes where you want to log to multiple destinations.
+     *
+     * @param target - Target logger instance that will recieve all logs disregarding current active mode.
+     * @param name - An optional name for the destination (prepended to every log message).
+     * @returns - A function to remove the destination.
+     */
+    addDestination(target, name) {
+        const proxy = new ProxyLogger(target, name);
+        this._destinations.push(proxy);
+        this._updateAll(this._mode);
+        return () => {
+            const index = this._destinations.findIndex((d) => d === proxy);
+            if (index !== -1) {
+                this._destinations.splice(index, 1);
+                this._updateAll(this._mode);
+            }
+        };
     }
-    /** Sets the current mode if changed. All internally created loggers implementation will be overridden with a new implementation according to the new mode.  */
+    /**
+     * Sets the current mode if changed, for all attached instances.
+     *
+     * All internally created loggers implementation will be overridden with a new implementation according to the new mode.
+     *
+     * The rest just attached loggers will be just enabled/disabled based on input mode.
+     * */
     setMode(mode) {
         if (this._mode === mode) {
             return;
         }
         this._mode = mode || false;
-        if (!this._mode) {
-            for (const l of this._all) {
-                l.disable();
-            }
-        }
-        else {
-            for (const l of this._all) {
-                if (this._managed.has(l)) {
-                    l.setLogger(this._createImplementation());
-                }
-                else {
-                    l.enable();
-                }
-            }
-        }
+        this._updateAll(this._mode);
     }
     recognize(instance) {
         const result = this._findInstance(instance);
@@ -59,6 +85,30 @@ export class LoggersManager {
         }
         return true;
     }
+    _updateAll(mode) {
+        if (!mode) {
+            for (const l of this._all) {
+                l.disable();
+            }
+            return;
+        }
+        // implementation is shared for all attached loggers
+        const impl = this._createImplementation();
+        if (!impl && this._destinations.length === 0) {
+            // ending up with missing implementation
+            this._updateAll(false);
+            return;
+        }
+        const result = batchLoggers(impl, ...this._destinations);
+        for (const l of this._all) {
+            if (this._managed.has(l)) {
+                l.setLogger(result);
+            }
+            else {
+                l.enable();
+            }
+        }
+    }
     _findInstance(instance) {
         if (!(instance instanceof ProxyLogger)) {
             return false;
@@ -77,7 +127,7 @@ export class LoggersManager {
                 return null;
             }
             default: {
-                return Getter.getValue(mode);
+                return Getter.toValue(mode);
             }
         }
     }

package/esm/logger/manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../src/logger/manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../src/logger/manager.ts"],"names":[],"mappings":"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"}

package/esm/logger/named.js

@@ -1,28 +1,32 @@
-export const EMPTY_FUNCTION = () => { };
+import { EMPTY_FUNCTION } from './empty.js';
 export class NamedLogger {
     log = EMPTY_FUNCTION;
     warn = EMPTY_FUNCTION;
     error = EMPTY_FUNCTION;
     _name = null;
+    _enabled = false;
     get name() { return this._name; }
     constructor(name) {
         this._name = name || null;
         this.disable();
     }
+    get isEnabled() { return this._enabled; }
     enable(overrideName = null) {
         this._name = overrideName || this._name;
+        this._enabled = true;
         this.log = this._name
             ? (...args) => this.implementation.log(this._name, ...args)
-            : this.implementation.log;
+            : this.implementation.log.bind(this.implementation);
         this.warn = this._name
             ? (...args) => this.implementation.warn(this._name, ...args)
-            : this.implementation.warn;
+            : this.implementation.warn.bind(this.implementation);
         this.error = this._name
             ? (...args) => this.implementation.error(this._name, ...args)
-            : this.implementation.error;
+            : this.implementation.error.bind(this.implementation);
         return this;
     }
     disable() {
+        this._enabled = false;
         this.log = EMPTY_FUNCTION;
         this.warn = EMPTY_FUNCTION;
         this.error = EMPTY_FUNCTION;

package/esm/logger/named.js.map

@@ -1 +1 @@
-{"version":3,"file":"named.js","sourceRoot":"","sources":["../../../src/logger/named.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,EAAE,GAAe,CAAC,CAAC;AAEpD,MAAM,OAAgB,WAAW;IACtB,GAAG,GAAmB,cAAc,CAAC;IACrC,IAAI,GAAmB,cAAc,CAAC;IACtC,KAAK,GAAmB,cAAc,CAAC;IAEtC,KAAK,GAAkB,IAAI,CAAC;IAEpC,IAAI,IAAI,KAAK,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAIjC,YAAY,IAAa;QACrB,IAAI,CAAC,KAAK,GAAG,IAAI,IAAI,IAAI,CAAC;QAC1B,IAAI,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC;IAED,MAAM,CAAC,eAA8B,IAAI;QACrC,IAAI,CAAC,KAAK,GAAG,YAAY,IAAI,IAAI,CAAC,KAAK,CAAC;QAExC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK;YACjB,CAAC,CAAC,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC;YAC3D,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC;QAE9B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK;YAClB,CAAC,CAAC,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC;YAC5D,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;QAE/B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK;YACnB,CAAC,CAAC,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC;YAC7D,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC;QAEhC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO;QACH,IAAI,CAAC,GAAG,GAAG,cAAc,CAAC;QAC1B,IAAI,CAAC,IAAI,GAAG,cAAc,CAAC;QAC3B,IAAI,CAAC,KAAK,GAAG,cAAc,CAAC;QAE5B,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ"}
+{"version":3,"file":"named.js","sourceRoot":"","sources":["../../../src/logger/named.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAG5C,MAAM,OAAgB,WAAW;IACtB,GAAG,GAAmB,cAAc,CAAC;IACrC,IAAI,GAAmB,cAAc,CAAC;IACtC,KAAK,GAAmB,cAAc,CAAC;IAEtC,KAAK,GAAkB,IAAI,CAAC;IAC5B,QAAQ,GAAG,KAAK,CAAC;IAEzB,IAAI,IAAI,KAAK,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAEjC,YAAY,IAAa;QACrB,IAAI,CAAC,KAAK,GAAG,IAAI,IAAI,IAAI,CAAC;QAC1B,IAAI,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC;IAGD,IAAW,SAAS,KAAK,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEhD,MAAM,CAAC,eAA8B,IAAI;QACrC,IAAI,CAAC,KAAK,GAAG,YAAY,IAAI,IAAI,CAAC,KAAK,CAAC;QACxC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QAErB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK;YACjB,CAAC,CAAC,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC;YAC3D,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAExD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK;YAClB,CAAC,CAAC,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC;YAC5D,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAEzD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK;YACnB,CAAC,CAAC,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC;YAC7D,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAE1D,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO;QACH,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QAEtB,IAAI,CAAC,GAAG,GAAG,cAAc,CAAC;QAC1B,IAAI,CAAC,IAAI,GAAG,cAAc,CAAC;QAC3B,IAAI,CAAC,KAAK,GAAG,cAAc,CAAC;QAE5B,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ"}

package/esm/logger/provider.js

@@ -0,0 +1,29 @@
+import { Loggable } from './loggable.js';
+/** Logger instance holder, for re-usability */
+export class LoggerProvider extends Loggable {
+    _factory = null;
+    constructor(nameFormatter, logger) {
+        super(logger);
+        if (nameFormatter) {
+            this.getLoggerName = nameFormatter;
+        }
+    }
+    // changing visibility to public
+    get logger() {
+        return super.logger;
+    }
+    get factory() {
+        return this._factory;
+    }
+    setLoggerFactory(factory, ...args) {
+        this._factory = factory;
+        return super.setLoggerFactory(factory, ...args);
+    }
+    createLogger(...args) {
+        if (!this._factory) {
+            return null;
+        }
+        return this._createLogger(this._factory, ...args);
+    }
+}
+//# sourceMappingURL=provider.js.map

package/esm/logger/provider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../src/logger/provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAIzC,+CAA+C;AAC/C,MAAM,OAAO,cAAe,SAAQ,QAAQ;IAEhC,QAAQ,GAA0B,IAAI,CAAC;IAE/C,YAAY,aAAoD,EAAE,MAAgB;QAC9E,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,aAAa,EAAE,CAAC;YAChB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACvC,CAAC;IACL,CAAC;IAED,gCAAgC;IAChC,IAAW,MAAM;QACb,OAAO,KAAK,CAAC,MAAM,CAAC;IACxB,CAAC;IAED,IAAW,OAAO;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAEM,gBAAgB,CAAC,OAA8B,EAAE,GAAG,IAAgC;QACvF,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,OAAO,KAAK,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IACpD,CAAC;IAEM,YAAY,CAAC,GAAG,IAAgC;QACnD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,CAAC;IACtD,CAAC;CACJ"}

package/esm/logger/proxy.js

@@ -1,9 +1,5 @@
-import { EMPTY_FUNCTION, NamedLogger } from './named.js';
-export const EMPTY_LOGGER = {
-    log: EMPTY_FUNCTION,
-    warn: EMPTY_FUNCTION,
-    error: EMPTY_FUNCTION,
-};
+import { NamedLogger } from './named.js';
+import { EMPTY_LOGGER } from './empty.js';
 export class ProxyLogger extends NamedLogger {
     get implementation() { return this._logger || EMPTY_LOGGER; }
     _logger = null;

package/esm/logger/proxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../src/logger/proxy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzD,MAAM,CAAC,MAAM,YAAY,GAAY;IACjC,GAAG,EAAE,cAAc;IACnB,IAAI,EAAE,cAAc;IACpB,KAAK,EAAE,cAAc;CACxB,CAAC;AAEF,MAAM,OAAO,WAAY,SAAQ,WAAW;IAExC,IAAc,cAAc,KAAK,OAAO,IAAI,CAAC,OAAO,IAAI,YAAY,CAAC,CAAC,CAAC;IAE/D,OAAO,GAAmB,IAAI,CAAC;IAEvC,YAAY,MAAkC,EAAE,OAA2B,SAAS;QAChF,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC3B,CAAC;IAEM,SAAS,CAAC,MAAkC;QAC/C,IAAI,CAAC,OAAO,GAAG,MAAM,IAAI,IAAI,CAAC;QAC9B,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,EAAE,CAAC;QAClB,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,OAAO,EAAE,CAAC;QACnB,CAAC;IACL,CAAC;CACJ"}
+{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../src/logger/proxy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,MAAM,OAAO,WAAY,SAAQ,WAAW;IAExC,IAAc,cAAc,KAAK,OAAO,IAAI,CAAC,OAAO,IAAI,YAAY,CAAC,CAAC,CAAC;IAE/D,OAAO,GAAmB,IAAI,CAAC;IAEvC,YAAY,MAAkC,EAAE,OAA2B,SAAS;QAChF,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC3B,CAAC;IAEM,SAAS,CAAC,MAAkC;QAC/C,IAAI,CAAC,OAAO,GAAG,MAAM,IAAI,IAAI,CAAC;QAC9B,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,EAAE,CAAC;QAClB,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,OAAO,EAAE,CAAC;QACnB,CAAC;IACL,CAAC;CACJ"}

package/esm/logger/types.js

@@ -0,0 +1,6 @@
+export const LogLevels = {
+    log: 1,
+    warn: 2,
+    error: 3,
+};
+//# sourceMappingURL=types.js.map

package/esm/logger/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/logger/types.ts"],"names":[],"mappings":"AAiBA,MAAM,CAAC,MAAM,SAAS,GAAG;IACrB,GAAG,EAAE,CAAC;IACN,IAAI,EAAE,CAAC;IACP,KAAK,EAAE,CAAC;CACsC,CAAC"}

package/esm/models/LogicModel.js

@@ -1,17 +1,19 @@
 import { ExclusiveLoadingError, LoadingModel, withLoading } from './Loading.js';
 import { Getter } from '../types/index.js';
 import { PromiseExtended } from '../structures/promiseExtended.js';
-import { createLogger } from '../logger/shared.js';
-export class LogicModel {
+import { Loggable } from '../logger/loggable.js';
+export class LogicModel extends Loggable {
     _loading;
     get isLoading() { return this._loading.isLoading; }
-    logger;
     _namedRunners = new Map();
     _runningActionNames = new Set();
-    constructor(name, useFirstInit = true) {
-        this.logger = createLogger(`[${name || this.constructor.name}]`);
+    constructor(useFirstInit = true) {
+        super();
         this._loading = this.pureConstructLoadingModel(useFirstInit);
     }
+    getLoggerName(name) {
+        return `[${name || this.constructor.name}]`;
+    }
     pureConstructLoadingModel(useFirstInit) {
         return new LoadingModel(useFirstInit);
     }
@@ -19,7 +21,7 @@ export class LogicModel {
         const started = Date.now();
         const name = options.name;
         if (name && !options.noLogs) {
-            this.logger.log(`runAction "${name}" started...`);
+            this.logger?.log(`runAction "${name}" started...`);
         }
         const runner = async () => {
             const { exclusive = false, noLoading = false, join } = options;
@@ -29,13 +31,13 @@ export class LogicModel {
                 if (existingRunner != null) {
                     if (join === 'cancel') {
                         if (!options.noLogs) {
-                            this.logger.warn(`runAction "${name}" has been skipped because another instance of it is in progress`);
+                            this.logger?.warn(`runAction "${name}" has been skipped because another instance of it is in progress`);
                         }
                         return undefined;
                     }
                     else if (join === 'merge') {
                         if (!options.noLogs) {
-                            this.logger.log(`runAction "${name}" merging with existing instance...`);
+                            this.logger?.log(`runAction "${name}" merging with existing instance...`);
                         }
                         return existingRunner;
                     }
@@ -54,7 +56,7 @@ export class LogicModel {
                             if (exclusive === 'throw') {
                                 throw new ExclusiveLoadingError(message, storedName);
                             }
-                            this.logger.warn(message);
+                            this.logger?.warn(message);
                             return undefined;
                         }
                         result = resultWithLoading.result;
@@ -63,7 +65,7 @@ export class LogicModel {
                         result = await worker();
                     }
                     if (name && !options.noLogs) {
-                        this.logger.log(`runAction "${storedName}" succeed in ${Date.now() - started}ms`);
+                        this.logger?.log(`runAction "${storedName}" succeed in ${Date.now() - started}ms`);
                     }
                     return result;
                 }
@@ -85,7 +87,7 @@ export class LogicModel {
         };
         return ActionResult.expectExclusive(PromiseExtended.run(runner))
             .onError(data => {
-            this.logger.error(...formatError({
+            this.logger?.error(...formatError({
                 name,
                 err: data.source,
                 errorCtx,

package/esm/models/LogicModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"LogicModel.js","sourceRoot":"","sources":["../../../src/models/LogicModel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"LogicModel.js","sourceRoot":"","sources":["../../../src/models/LogicModel.ts"],"names":[],"mappings":"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"}

package/esm/observing/event.js

@@ -1,24 +1,11 @@
 import { forEachAsync } from '../async/arrays.js';
-import { createLogger } from '../logger/shared.js';
 import { catchPromise } from '../functions/safe.js';
-export class Event {
+import { Loggable } from '../logger/loggable.js';
+export class Event extends Loggable {
     _handlers = [];
-    _logger = null;
-    constructor(withDefaultLogger = true) {
-        if (withDefaultLogger) {
-            this.withLogger('');
-        }
-    }
     get isEmpty() { return this._handlers.length === 0; }
-    withLogger(loggerOrName) {
-        if (loggerOrName == null) {
-            this._logger = null;
-            return this;
-        }
-        this._logger = typeof loggerOrName === 'string'
-            ? createLogger(`[Event:${loggerOrName || '?'}]`)
-            : loggerOrName;
-        return this;
+    getLoggerName(name) {
+        return `[Event:${name || '?'}]`;
     }
     /** Clears handlers list */
     resetHandlers = () => {
@@ -76,7 +63,7 @@ export class Event {
         return this;
     }
     logError(data, cb, err) {
-        this._logger?.error(`[Event.${typeof data}] Handler ${cb.name} thrown an exception: `, err);
+        this.logger?.error(`type:${typeof data} Handler ${cb.name} thrown an exception: `, err);
     }
 }
 export function oneTimeSubscription(e, filter) {

package/esm/observing/event.js.map

@@ -1 +1 @@
-{"version":3,"file":"event.js","sourceRoot":"","sources":["../../../src/observing/event.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"event.js","sourceRoot":"","sources":["../../../src/observing/event.ts"],"names":[],"mappings":"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"}

package/esm/observing/progressTracker.js

@@ -1,9 +1,8 @@
-import * as DateHelpers from '../dates/index.js';
-import * as MathHelpers from '../math/index.js';
-import logger from '../logger/shared.js';
+import { decomposeMs } from '../dates/decompose.js';
+import { arrayAverage } from '../math/arrays.js';
 import { Event } from './event.js';
 export class ProgressTracker {
-    log;
+    logger;
     _firstTimestamp = Date.now();
     _lastTimestamp = null;
     _lastCompleted = null;
@@ -12,18 +11,13 @@ export class ProgressTracker {
     _currentProgress = 0;
     _deltas = [];
     _changed = new Event();
-    constructor(log = true) {
-        this.log = log;
+    constructor(logger) {
+        this.logger = logger;
     }
     get changed() { return this._changed.expose(); }
     get total() { return this._total; }
     get completed() { return this._completed; }
     get current() { return this._currentProgress; }
-    get logger() {
-        return this.log === true
-            ? logger
-            : (this.log || null);
-    }
     setTotal(total) {
         this._total = total;
         return this;
@@ -47,10 +41,10 @@ export class ProgressTracker {
         }
         this._currentProgress = Math.floor(completed / (total || 100) * 100);
         const itemsLeft = total - completed;
-        const leftProgressTime = itemsLeft * (MathHelpers.arrayAverage(this._deltas, true) || 1000);
+        const leftProgressTime = itemsLeft * (arrayAverage(this._deltas, true) || 1000);
         this._lastTimestamp = Date.now();
         const totalElapsedMs = this._lastTimestamp - this._firstTimestamp;
-        if (this.log) {
+        if (this.logger) {
             const totalElapsed = msToString(totalElapsedMs);
             const totalEstimated = msToString(leftProgressTime);
             this.logger.log(`Progress: ${completed}/${total} ${totalElapsed}/${totalEstimated} => ${this._currentProgress}%`);
@@ -65,7 +59,7 @@ export class ProgressTracker {
     }
 }
 function msToString(ms) {
-    const decs = DateHelpers.decomposeMs(ms, 'second', 'minute', 'hour');
+    const decs = decomposeMs(ms, 'second', 'minute', 'hour');
     const nf = (n) => n.toString().padStart(2, '0');
     return `${nf(decs.hour)}:${nf(decs.minute)}:${nf(decs.second)}`;
 }

package/esm/observing/progressTracker.js.map

@@ -1 +1 @@
-{"version":3,"file":"progressTracker.js","sourceRoot":"","sources":["../../../src/observing/progressTracker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"progressTracker.js","sourceRoot":"","sources":["../../../src/observing/progressTracker.ts"],"names":[],"mappings":"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"}

package/esm/structures/promiseCache.js

@@ -1,5 +1,5 @@
 import { ThrottleProcessor } from '../functions/throttle.js';
-import { createLogger } from '../logger/shared.js';
+import { Loggable } from '../logger/loggable.js';
 import { Model } from '../models/Model.js';
 export var DeferredGetter;
 (function (DeferredGetter) {
@@ -18,7 +18,7 @@ const BATCHING_DELAY = 200;
  *  - batching of fetches.
  *  - auto-invalidation of cached items.
 */
-export class PromiseCache {
+export class PromiseCache extends Loggable {
     fetcher;
     keyAdapter;
     keyParser;
@@ -30,9 +30,9 @@ export class PromiseCache {
     _batch = null;
     _invalidationTimeMs = null;
     _keepInstanceDuringInvalidation = false;
-    _logger = null;
     _version = 0;
     constructor(fetcher, keyAdapter, keyParser) {
+        super();
         this.fetcher = fetcher;
         this.keyAdapter = keyAdapter;
         this.keyParser = keyParser;
@@ -66,14 +66,8 @@ export class PromiseCache {
         }
         return this.keyAdapter(k);
     }
-    useLogger(nameOrLogger) {
-        if (nameOrLogger != null && typeof nameOrLogger !== 'string') {
-            this._logger = nameOrLogger;
-        }
-        else {
-            this._logger = createLogger(`[PromiseCache:${nameOrLogger || '?'}]`);
-        }
-        return this;
+    getLoggerName(name) {
+        return `[PromiseCache:${name || '?'}]`;
     }
     /**
      * Provide a fetcher function that takes multiple ids and returns multiple results at once. Will be called with a slight delay to allow multiple ids to be collected.
@@ -120,7 +114,7 @@ export class PromiseCache {
         // make sure current item is hooked here from the cache (required by observers)
         const item = this._itemsCache.get(key);
         if (isInvalid) {
-            this._logger?.log(key, 'item is invalidated');
+            this.logger?.log(key, 'item is invalidated');
         }
         return {
             item: (isInvalid && !this._keepInstanceDuringInvalidation) ? undefined : item,
@@ -134,19 +128,19 @@ export class PromiseCache {
             // spin fetch
             this.get(id);
         }
-        this._logger?.log(key, 'getCurrent: returns', item);
+        this.logger?.log(key, 'getCurrent: returns', item);
         return item;
     }
     get(id) {
         const { item, key, isInvalid } = this._getCurrent(id);
         // return cached item if it's not invalidated
         if (item !== undefined && !isInvalid) {
-            this._logger?.log(key, 'get: item resolved to', item, isInvalid ? '(invalidated)' : '');
+            this.logger?.log(key, 'get: item resolved to', item, isInvalid ? '(invalidated)' : '');
             return Promise.resolve(item);
         }
         let promise = this._fetchCache.get(key);
         if (promise != null) {
-            this._logger?.log(key, 'get: item resolved to <promise>');
+            this.logger?.log(key, 'get: item resolved to <promise>');
             return promise;
         }
         this.setStatus(key, true);
@@ -166,7 +160,7 @@ export class PromiseCache {
                 return res;
             }
             if (this._fetchCache.get(key) != null) {
-                this._logger?.log(key, 'item\'s <promise> resolved to', res);
+                this.logger?.log(key, 'item\'s <promise> resolved to', res);
                 res = this.prepareResult(res);
                 this.storeResult(key, res);
             }
@@ -177,7 +171,7 @@ export class PromiseCache {
                 this.onFetchComplete(key);
             }
             else {
-                this._logger?.log(key, 'skipping item\'s resolve due to version change ("clear()" has been called)');
+                this.logger?.log(key, 'skipping item\'s resolve due to version change ("clear()" has been called)');
             }
         }
     };
@@ -236,7 +230,7 @@ export class PromiseCache {
     }
     /** @override */
     setStatus(key, status) {
-        this._logger?.log(key, 'status update:', status);
+        this.logger?.log(key, 'status update:', status);
         this._itemsStatus.set(key, status);
     }
     /** @override */
@@ -265,7 +259,7 @@ export class PromiseCache {
     /** @pure */
     async tryFetchInBatch(id) {
         const fetchWrap = () => this.fetcher(id).catch(err => {
-            this._logger?.warn('fetcher failed', id, err);
+            this.logger?.warn('fetcher failed', id, err);
             return null;
         });
         if (!this._batch) {
@@ -273,7 +267,7 @@ export class PromiseCache {
         }
         const res = await this._batch.push(id)
             .catch(err => {
-            this._logger?.warn('batch fetch failed', id, err);
+            this.logger?.warn('batch fetch failed', id, err);
             return null;
         });
         if (!res || !res.result || res.result[res.index] === undefined) {