diff --git a/package-lock.json b/package-lock.json --- a/package-lock.json +++ b/package-lock.json @@ -77,9 +77,10 @@ "dev": true }, "dojo": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/dojo/-/dojo-1.13.0.tgz", - "integrity": "sha512-mGoGvsXAbPkUrBnxCoO7m6CFH8jvWq7rAL7fP7jrhJEOyswA/bZwWdXwEH0ovs68t8S0+xOpV/3V7addYbaiAA==" + "version": "1.14.2", + "resolved": "https://registry.npmjs.org/dojo/-/dojo-1.14.2.tgz", + "integrity": "sha512-TI+Ytgfh/VfmHWERp45Jte6NFMdoJTPsvUP/uzJUvAXET8FP2h442LePWWJ/q/xZ4V0V8OtdJhx8It/GB+Zbxg==", + "dev": true }, "duplexer": { "version": "0.1.1", diff --git a/package.json b/package.json --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "publishConfig": { "access": "public" }, - "dependencies": { + "peerDependencies": { "dojo": "^1.10.0" }, "devDependencies": { @@ -24,7 +24,8 @@ "tape": "latest", "@types/tape": "latest", "requirejs": "latest", - "faucet": "latest" + "faucet": "latest", + "dojo": "^1.10.0" }, "types": "main.d.ts" } diff --git a/src/ts/log/writers/ConsoleWriter.ts b/src/ts/log/writers/ConsoleWriter.ts --- a/src/ts/log/writers/ConsoleWriter.ts +++ b/src/ts/log/writers/ConsoleWriter.ts @@ -1,12 +1,13 @@ import { IObservable, IDestroyable, ICancellation } from "../../interfaces"; +import { TraceEvent, LogLevel, WarnLevel, DebugLevel } from "../TraceSource"; import { Cancellation } from "../../Cancellation"; -import { TraceEvent, LogLevel, WarnLevel } from "../TraceSource"; +import { destroy } from "../../safe"; export class ConsoleWriter implements IDestroyable { readonly _subscriptions = new Array(); writeEvents(source: IObservable, ct: ICancellation = Cancellation.none) { - var subscription = source.on(this.writeEvent.bind(this)); + const subscription = source.on(this.writeEvent.bind(this)); if (ct.isSupported()) { ct.register(subscription.destroy.bind(subscription)); } @@ -14,16 +15,22 @@ export class ConsoleWriter implements ID } writeEvent(next: TraceEvent) { - if (next.level >= LogLevel) { + if (next.level >= DebugLevel) { + // tslint:disable-next-line + console.debug(next.source.id.toString(), next.arg); + } else if (next.level >= LogLevel) { + // tslint:disable-next-line console.log(next.source.id.toString(), next.arg); - } else if(next.level >= WarnLevel) { + } else if (next.level >= WarnLevel) { + // tslint:disable-next-line console.warn(next.source.id.toString(), next.arg); } else { + // tslint:disable-next-line console.error(next.source.id.toString(), next.arg); } } destroy() { - this._subscriptions.forEach(x => x.destroy()); + this._subscriptions.forEach(destroy); } -} \ No newline at end of file +}