diff --git a/dist/beautylog.classes.ora.d.ts b/dist/beautylog.classes.ora.d.ts index 6af23cb..441b0b2 100644 --- a/dist/beautylog.classes.ora.d.ts +++ b/dist/beautylog.classes.ora.d.ts @@ -1,4 +1,4 @@ -export declare let isOraActive: boolean; +export declare let oraActive: boolean; export declare let activeOra: Ora; export declare class Ora { private _oraObject; @@ -9,6 +9,7 @@ export declare class Ora { end(): void; endOk(textArg: any): void; endError(textArg: any): void; + pause(): void; stop(): void; log(logText: string, logType: string): void; } diff --git a/dist/beautylog.classes.ora.js b/dist/beautylog.classes.ora.js index 95857b8..0166d96 100644 --- a/dist/beautylog.classes.ora.js +++ b/dist/beautylog.classes.ora.js @@ -2,7 +2,7 @@ /// var plugins = require("./beautylog.plugins"); var beautylog_log_helpers_1 = require("./beautylog.log.helpers"); -exports.isOraActive = false; // when an Ora is active (e.g. start()) this is true; +exports.oraActive = false; // when an Ora is active (e.g. start()) this is true; var Ora = (function () { function Ora(textArg, colorArg, startArg) { if (startArg === void 0) { startArg = false; } @@ -23,7 +23,7 @@ var Ora = (function () { if (colorArg) this._oraObject.color = colorArg; exports.activeOra = this; - exports.isOraActive = true; + exports.oraActive = true; this._oraObject.start(); }; ; @@ -31,7 +31,7 @@ var Ora = (function () { this._oraObject.stop(); this._oraObject.clear(); exports.activeOra = undefined; - exports.isOraActive = false; + exports.oraActive = false; }; Ora.prototype.endOk = function (textArg) { this.end(); @@ -43,6 +43,9 @@ var Ora = (function () { beautylog_log_helpers_1.logNode(textArg, "error"); }; ; + Ora.prototype.pause = function () { + this._oraObject.stop(); + }; Ora.prototype.stop = function () { this.end(); }; @@ -56,4 +59,4 @@ var Ora = (function () { }()); exports.Ora = Ora; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImJlYXV0eWxvZy5jbGFzc2VzLm9yYS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsNENBQTRDO0FBQzVDLElBQVksT0FBTyxXQUFNLHFCQUFxQixDQUFDLENBQUE7QUFDL0Msc0NBQXNCLHlCQUF5QixDQUFDLENBQUE7QUFFckMsbUJBQVcsR0FBVyxLQUFLLENBQUMsQ0FBQyxxREFBcUQ7QUFHN0Y7SUFHSSxhQUFZLE9BQWMsRUFBQyxRQUFlLEVBQUMsUUFBd0I7UUFBeEIsd0JBQXdCLEdBQXhCLGdCQUF3QjtRQUMvRCxJQUFJLENBQUMsVUFBVSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUM7WUFDMUIsT0FBTyxFQUFDLE1BQU07WUFDZCxJQUFJLEVBQUMsT0FBTztZQUNaLEtBQUssRUFBQyxRQUFRO1NBQ2pCLENBQUMsQ0FBQztRQUVILFFBQVEsR0FBRyxJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssRUFBRSxHQUFHLEtBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNqRCxDQUFDO0lBQ0Qsa0JBQUksR0FBSixVQUFLLE9BQU87UUFDUixJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksR0FBRyxPQUFPLENBQUM7SUFDbkMsQ0FBQzs7SUFFRCxtQkFBSyxHQUFMLFVBQU0sT0FBZSxFQUFDLFFBQWdCO1FBQ2xDLEVBQUUsQ0FBQSxDQUFDLE9BQU8sQ0FBQztZQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxHQUFHLE9BQU8sQ0FBQztRQUMzQyxFQUFFLENBQUEsQ0FBQyxRQUFRLENBQUM7WUFBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssR0FBRyxRQUFRLENBQUM7UUFDOUMsaUJBQVMsR0FBRyxJQUFJLENBQUM7UUFDakIsbUJBQVcsR0FBRyxJQUFJLENBQUM7UUFDbkIsSUFBSSxDQUFDLFVBQVUsQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUM1QixDQUFDOztJQUNELGlCQUFHLEdBQUg7UUFDSSxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksRUFBRSxDQUFDO1FBQ3ZCLElBQUksQ0FBQyxVQUFVLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDeEIsaUJBQVMsR0FBRyxTQUFTLENBQUM7UUFDdEIsbUJBQVcsR0FBRyxLQUFLLENBQUM7SUFDeEIsQ0FBQztJQUNELG1CQUFLLEdBQUwsVUFBTSxPQUFPO1FBQ1QsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDO1FBQ1gsK0JBQU8sQ0FBQyxPQUFPLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDMUIsQ0FBQzs7SUFDRCxzQkFBUSxHQUFSLFVBQVMsT0FBTztRQUNaLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQztRQUNYLCtCQUFPLENBQUMsT0FBTyxFQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQzdCLENBQUM7O0lBQ0Qsa0JBQUksR0FBSjtRQUNJLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQztJQUNmLENBQUM7SUFFRCxzQ0FBc0M7SUFDdEMsaUJBQUcsR0FBSCxVQUFJLE9BQWMsRUFBQyxPQUFjO1FBQzdCLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUNaLCtCQUFPLENBQUMsT0FBTyxFQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ3pCLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUNqQixDQUFDO0lBQ0wsVUFBQztBQUFELENBL0NBLEFBK0NDLElBQUE7QUEvQ1ksV0FBRyxNQStDZixDQUFBIiwiZmlsZSI6ImJlYXV0eWxvZy5jbGFzc2VzLm9yYS5qcyIsInNvdXJjZXNDb250ZW50IjpbIi8vLyA8cmVmZXJlbmNlIHBhdGg9XCIuL3R5cGluZ3MvbWFpbi5kLnRzXCIgLz5cclxuaW1wb3J0ICogYXMgcGx1Z2lucyBmcm9tIFwiLi9iZWF1dHlsb2cucGx1Z2luc1wiO1xyXG5pbXBvcnQge2xvZ05vZGV9IGZyb20gXCIuL2JlYXV0eWxvZy5sb2cuaGVscGVyc1wiO1xyXG5cclxuZXhwb3J0IGxldCBpc09yYUFjdGl2ZTpib29sZWFuID0gZmFsc2U7IC8vIHdoZW4gYW4gT3JhIGlzIGFjdGl2ZSAoZS5nLiBzdGFydCgpKSB0aGlzIGlzIHRydWU7XHJcbmV4cG9ydCBsZXQgYWN0aXZlT3JhOk9yYTsgLy9wb2ludHMgdG8gdGhlIGN1cnJlbnRseSBhY3RpdmUgT3JhIG9iamVjdFxyXG5cclxuZXhwb3J0IGNsYXNzIE9yYSB7XHJcbiAgICBwcml2YXRlIF9vcmFPYmplY3Q7XHJcbiAgICBzdGF0ZTpzdHJpbmc7XHJcbiAgICBjb25zdHJ1Y3Rvcih0ZXh0QXJnOnN0cmluZyxjb2xvckFyZzpzdHJpbmcsc3RhcnRBcmc6Ym9vbGVhbiA9IGZhbHNlKXtcclxuICAgICAgICB0aGlzLl9vcmFPYmplY3QgPSBwbHVnaW5zLm9yYSh7XHJcbiAgICAgICAgICAgIHNwaW5uZXI6XCJkb3RzXCIsXHJcbiAgICAgICAgICAgIHRleHQ6dGV4dEFyZyxcclxuICAgICAgICAgICAgY29sb3I6Y29sb3JBcmdcclxuICAgICAgICB9KTtcclxuICAgICAgICBcclxuICAgICAgICBzdGFydEFyZyA/IHRoaXMuX29yYU9iamVjdC5zdGFydCgpIDogdm9pZCgwKTtcclxuICAgIH1cclxuICAgIHRleHQodGV4dEFyZyl7XHJcbiAgICAgICAgdGhpcy5fb3JhT2JqZWN0LnRleHQgPSB0ZXh0QXJnO1xyXG4gICAgfTtcclxuICAgIFxyXG4gICAgc3RhcnQodGV4dEFyZz86c3RyaW5nLGNvbG9yQXJnPzpzdHJpbmcpe1xyXG4gICAgICAgIGlmKHRleHRBcmcpIHRoaXMuX29yYU9iamVjdC50ZXh0ID0gdGV4dEFyZztcclxuICAgICAgICBpZihjb2xvckFyZykgdGhpcy5fb3JhT2JqZWN0LmNvbG9yID0gY29sb3JBcmc7XHJcbiAgICAgICAgYWN0aXZlT3JhID0gdGhpcztcclxuICAgICAgICBpc09yYUFjdGl2ZSA9IHRydWU7XHJcbiAgICAgICAgdGhpcy5fb3JhT2JqZWN0LnN0YXJ0KCk7XHJcbiAgICB9O1xyXG4gICAgZW5kKCl7XHJcbiAgICAgICAgdGhpcy5fb3JhT2JqZWN0LnN0b3AoKTtcclxuICAgICAgICB0aGlzLl9vcmFPYmplY3QuY2xlYXIoKTtcclxuICAgICAgICBhY3RpdmVPcmEgPSB1bmRlZmluZWQ7XHJcbiAgICAgICAgaXNPcmFBY3RpdmUgPSBmYWxzZTtcclxuICAgIH1cclxuICAgIGVuZE9rKHRleHRBcmcpe1xyXG4gICAgICAgIHRoaXMuZW5kKCk7XHJcbiAgICAgICAgbG9nTm9kZSh0ZXh0QXJnLFwib2tcIik7XHJcbiAgICB9O1xyXG4gICAgZW5kRXJyb3IodGV4dEFyZyl7XHJcbiAgICAgICAgdGhpcy5lbmQoKTtcclxuICAgICAgICBsb2dOb2RlKHRleHRBcmcsXCJlcnJvclwiKTtcclxuICAgIH07XHJcbiAgICBzdG9wKCl7IC8vIGFsaWFzIGZvciBlbmRcclxuICAgICAgICB0aGlzLmVuZCgpO1xyXG4gICAgfVxyXG4gICAgXHJcbiAgICAvLyBsb2cgbWV0aG9kcyB0aGF0IHBsYXkgbmljZSB3aXRoIG9yYVxyXG4gICAgbG9nKGxvZ1RleHQ6c3RyaW5nLGxvZ1R5cGU6c3RyaW5nKXtcclxuICAgICAgICB0aGlzLnN0b3AoKTtcclxuICAgICAgICBsb2dOb2RlKGxvZ1RleHQsbG9nVHlwZSk7XHJcbiAgICAgICAgdGhpcy5zdGFydCgpO1xyXG4gICAgfVxyXG59Il19 +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImJlYXV0eWxvZy5jbGFzc2VzLm9yYS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsNENBQTRDO0FBQzVDLElBQVksT0FBTyxXQUFNLHFCQUFxQixDQUFDLENBQUE7QUFDL0Msc0NBQXNCLHlCQUF5QixDQUFDLENBQUE7QUFFckMsaUJBQVMsR0FBVyxLQUFLLENBQUMsQ0FBQyxxREFBcUQ7QUFHM0Y7SUFHSSxhQUFZLE9BQWMsRUFBQyxRQUFlLEVBQUMsUUFBd0I7UUFBeEIsd0JBQXdCLEdBQXhCLGdCQUF3QjtRQUMvRCxJQUFJLENBQUMsVUFBVSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUM7WUFDMUIsT0FBTyxFQUFDLE1BQU07WUFDZCxJQUFJLEVBQUMsT0FBTztZQUNaLEtBQUssRUFBQyxRQUFRO1NBQ2pCLENBQUMsQ0FBQztRQUVILFFBQVEsR0FBRyxJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssRUFBRSxHQUFHLEtBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNqRCxDQUFDO0lBQ0Qsa0JBQUksR0FBSixVQUFLLE9BQU87UUFDUixJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksR0FBRyxPQUFPLENBQUM7SUFDbkMsQ0FBQzs7SUFFRCxtQkFBSyxHQUFMLFVBQU0sT0FBZSxFQUFDLFFBQWdCO1FBQ2xDLEVBQUUsQ0FBQSxDQUFDLE9BQU8sQ0FBQztZQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxHQUFHLE9BQU8sQ0FBQztRQUMzQyxFQUFFLENBQUEsQ0FBQyxRQUFRLENBQUM7WUFBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssR0FBRyxRQUFRLENBQUM7UUFDOUMsaUJBQVMsR0FBRyxJQUFJLENBQUM7UUFDakIsaUJBQVMsR0FBRyxJQUFJLENBQUM7UUFDakIsSUFBSSxDQUFDLFVBQVUsQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUM1QixDQUFDOztJQUNELGlCQUFHLEdBQUg7UUFDSSxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksRUFBRSxDQUFDO1FBQ3ZCLElBQUksQ0FBQyxVQUFVLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDeEIsaUJBQVMsR0FBRyxTQUFTLENBQUM7UUFDdEIsaUJBQVMsR0FBRyxLQUFLLENBQUM7SUFDdEIsQ0FBQztJQUNELG1CQUFLLEdBQUwsVUFBTSxPQUFPO1FBQ1QsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDO1FBQ1gsK0JBQU8sQ0FBQyxPQUFPLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDMUIsQ0FBQzs7SUFDRCxzQkFBUSxHQUFSLFVBQVMsT0FBTztRQUNaLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQztRQUNYLCtCQUFPLENBQUMsT0FBTyxFQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQzdCLENBQUM7O0lBQ0QsbUJBQUssR0FBTDtRQUNJLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDM0IsQ0FBQztJQUNELGtCQUFJLEdBQUo7UUFDSSxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUM7SUFDZixDQUFDO0lBRUQsc0NBQXNDO0lBQ3RDLGlCQUFHLEdBQUgsVUFBSSxPQUFjLEVBQUMsT0FBYztRQUM3QixJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDWiwrQkFBTyxDQUFDLE9BQU8sRUFBQyxPQUFPLENBQUMsQ0FBQztRQUN6QixJQUFJLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDakIsQ0FBQztJQUNMLFVBQUM7QUFBRCxDQWxEQSxBQWtEQyxJQUFBO0FBbERZLFdBQUcsTUFrRGYsQ0FBQSIsImZpbGUiOiJiZWF1dHlsb2cuY2xhc3Nlcy5vcmEuanMiLCJzb3VyY2VzQ29udGVudCI6WyIvLy8gPHJlZmVyZW5jZSBwYXRoPVwiLi90eXBpbmdzL21haW4uZC50c1wiIC8+XHJcbmltcG9ydCAqIGFzIHBsdWdpbnMgZnJvbSBcIi4vYmVhdXR5bG9nLnBsdWdpbnNcIjtcclxuaW1wb3J0IHtsb2dOb2RlfSBmcm9tIFwiLi9iZWF1dHlsb2cubG9nLmhlbHBlcnNcIjtcclxuXHJcbmV4cG9ydCBsZXQgb3JhQWN0aXZlOmJvb2xlYW4gPSBmYWxzZTsgLy8gd2hlbiBhbiBPcmEgaXMgYWN0aXZlIChlLmcuIHN0YXJ0KCkpIHRoaXMgaXMgdHJ1ZTtcclxuZXhwb3J0IGxldCBhY3RpdmVPcmE6T3JhOyAvL3BvaW50cyB0byB0aGUgY3VycmVudGx5IGFjdGl2ZSBPcmEgb2JqZWN0XHJcblxyXG5leHBvcnQgY2xhc3MgT3JhIHtcclxuICAgIHByaXZhdGUgX29yYU9iamVjdDtcclxuICAgIHN0YXRlOnN0cmluZztcclxuICAgIGNvbnN0cnVjdG9yKHRleHRBcmc6c3RyaW5nLGNvbG9yQXJnOnN0cmluZyxzdGFydEFyZzpib29sZWFuID0gZmFsc2Upe1xyXG4gICAgICAgIHRoaXMuX29yYU9iamVjdCA9IHBsdWdpbnMub3JhKHtcclxuICAgICAgICAgICAgc3Bpbm5lcjpcImRvdHNcIixcclxuICAgICAgICAgICAgdGV4dDp0ZXh0QXJnLFxyXG4gICAgICAgICAgICBjb2xvcjpjb2xvckFyZ1xyXG4gICAgICAgIH0pO1xyXG4gICAgICAgIFxyXG4gICAgICAgIHN0YXJ0QXJnID8gdGhpcy5fb3JhT2JqZWN0LnN0YXJ0KCkgOiB2b2lkKDApO1xyXG4gICAgfVxyXG4gICAgdGV4dCh0ZXh0QXJnKXtcclxuICAgICAgICB0aGlzLl9vcmFPYmplY3QudGV4dCA9IHRleHRBcmc7XHJcbiAgICB9O1xyXG4gICAgXHJcbiAgICBzdGFydCh0ZXh0QXJnPzpzdHJpbmcsY29sb3JBcmc/OnN0cmluZyl7XHJcbiAgICAgICAgaWYodGV4dEFyZykgdGhpcy5fb3JhT2JqZWN0LnRleHQgPSB0ZXh0QXJnO1xyXG4gICAgICAgIGlmKGNvbG9yQXJnKSB0aGlzLl9vcmFPYmplY3QuY29sb3IgPSBjb2xvckFyZztcclxuICAgICAgICBhY3RpdmVPcmEgPSB0aGlzO1xyXG4gICAgICAgIG9yYUFjdGl2ZSA9IHRydWU7XHJcbiAgICAgICAgdGhpcy5fb3JhT2JqZWN0LnN0YXJ0KCk7XHJcbiAgICB9O1xyXG4gICAgZW5kKCl7XHJcbiAgICAgICAgdGhpcy5fb3JhT2JqZWN0LnN0b3AoKTtcclxuICAgICAgICB0aGlzLl9vcmFPYmplY3QuY2xlYXIoKTtcclxuICAgICAgICBhY3RpdmVPcmEgPSB1bmRlZmluZWQ7XHJcbiAgICAgICAgb3JhQWN0aXZlID0gZmFsc2U7XHJcbiAgICB9XHJcbiAgICBlbmRPayh0ZXh0QXJnKXtcclxuICAgICAgICB0aGlzLmVuZCgpO1xyXG4gICAgICAgIGxvZ05vZGUodGV4dEFyZyxcIm9rXCIpO1xyXG4gICAgfTtcclxuICAgIGVuZEVycm9yKHRleHRBcmcpe1xyXG4gICAgICAgIHRoaXMuZW5kKCk7XHJcbiAgICAgICAgbG9nTm9kZSh0ZXh0QXJnLFwiZXJyb3JcIik7XHJcbiAgICB9O1xyXG4gICAgcGF1c2UoKXtcclxuICAgICAgICB0aGlzLl9vcmFPYmplY3Quc3RvcCgpO1xyXG4gICAgfVxyXG4gICAgc3RvcCgpeyAvLyBhbGlhcyBmb3IgZW5kXHJcbiAgICAgICAgdGhpcy5lbmQoKTtcclxuICAgIH1cclxuICAgIFxyXG4gICAgLy8gbG9nIG1ldGhvZHMgdGhhdCBwbGF5IG5pY2Ugd2l0aCBvcmFcclxuICAgIGxvZyhsb2dUZXh0OnN0cmluZyxsb2dUeXBlOnN0cmluZyl7XHJcbiAgICAgICAgdGhpcy5zdG9wKCk7XHJcbiAgICAgICAgbG9nTm9kZShsb2dUZXh0LGxvZ1R5cGUpO1xyXG4gICAgICAgIHRoaXMuc3RhcnQoKTtcclxuICAgIH1cclxufSJdfQ== diff --git a/dist/beautylog.console.d.ts b/dist/beautylog.console.d.ts new file mode 100644 index 0000000..2abbe66 --- /dev/null +++ b/dist/beautylog.console.d.ts @@ -0,0 +1,8 @@ +/** + * routes the console to got through beautylog, so beautylog can take action before things are logged to console. + */ +export declare let route: (statusArg: boolean) => void; +export declare let beautyConsole: { + log2: (message?: any, ...optionalParams: any[]) => void; + log: (logArg: any) => void; +}; diff --git a/dist/beautylog.console.js b/dist/beautylog.console.js new file mode 100644 index 0000000..04580fb --- /dev/null +++ b/dist/beautylog.console.js @@ -0,0 +1,29 @@ +"use strict"; +var beautylog_classes_ora_1 = require("./beautylog.classes.ora"); +var nativeLog = console.log; +/** + * routes the console to got through beautylog, so beautylog can take action before things are logged to console. + */ +exports.route = function (statusArg) { + if (statusArg == true) { + console.log = exports.beautyConsole.log; + } + else { + console.log = nativeLog; + } +}; +exports.beautyConsole = { + log2: nativeLog, + log: function (logArg) { + if (beautylog_classes_ora_1.oraActive) { + beautylog_classes_ora_1.activeOra.pause(); + nativeLog.apply(nativeLog, arguments); + beautylog_classes_ora_1.activeOra.start(); + } + else { + nativeLog.apply(nativeLog, arguments); + } + } +}; + +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImJlYXV0eWxvZy5jb25zb2xlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFFQSxzQ0FBa0MseUJBQXlCLENBQUMsQ0FBQTtBQUM1RCxJQUFJLFNBQVMsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDO0FBRTVCOztHQUVHO0FBQ1EsYUFBSyxHQUFHLFVBQVMsU0FBaUI7SUFDekMsRUFBRSxDQUFBLENBQUMsU0FBUyxJQUFJLElBQUksQ0FBQyxDQUFBLENBQUM7UUFDbEIsT0FBTyxDQUFDLEdBQUcsR0FBRyxxQkFBYSxDQUFDLEdBQUcsQ0FBQztJQUNwQyxDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDSixPQUFPLENBQUMsR0FBRyxHQUFHLFNBQVMsQ0FBQztJQUM1QixDQUFDO0FBRUwsQ0FBQyxDQUFBO0FBRVUscUJBQWEsR0FBRztJQUN2QixJQUFJLEVBQUUsU0FBUztJQUNmLEdBQUcsRUFBRSxVQUFTLE1BQVU7UUFDcEIsRUFBRSxDQUFBLENBQUMsaUNBQVMsQ0FBQyxDQUFBLENBQUM7WUFDVixpQ0FBUyxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ2xCLFNBQVMsQ0FBQyxLQUFLLENBQUMsU0FBUyxFQUFFLFNBQVMsQ0FBQyxDQUFDO1lBQ3RDLGlDQUFTLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDdEIsQ0FBQztRQUFDLElBQUksQ0FBQyxDQUFDO1lBQ0osU0FBUyxDQUFDLEtBQUssQ0FBQyxTQUFTLEVBQUUsU0FBUyxDQUFDLENBQUM7UUFDMUMsQ0FBQztJQUNMLENBQUM7Q0FDSixDQUFBIiwiZmlsZSI6ImJlYXV0eWxvZy5jb25zb2xlLmpzIiwic291cmNlc0NvbnRlbnQiOlsiLy8vIDxyZWZlcmVuY2UgcGF0aD1cIi4vdHlwaW5ncy9tYWluLmQudHNcIiAvPlxyXG5pbXBvcnQgcGx1Z2lucyA9IHJlcXVpcmUoXCIuL2JlYXV0eWxvZy5wbHVnaW5zXCIpO1xyXG5pbXBvcnQge2FjdGl2ZU9yYSxvcmFBY3RpdmV9IGZyb20gXCIuL2JlYXV0eWxvZy5jbGFzc2VzLm9yYVwiO1xyXG5sZXQgbmF0aXZlTG9nID0gY29uc29sZS5sb2c7XHJcblxyXG4vKipcclxuICogcm91dGVzIHRoZSBjb25zb2xlIHRvIGdvdCB0aHJvdWdoIGJlYXV0eWxvZywgc28gYmVhdXR5bG9nIGNhbiB0YWtlIGFjdGlvbiBiZWZvcmUgdGhpbmdzIGFyZSBsb2dnZWQgdG8gY29uc29sZS5cclxuICovXHJcbmV4cG9ydCBsZXQgcm91dGUgPSBmdW5jdGlvbihzdGF0dXNBcmc6Ym9vbGVhbil7XHJcbiAgICBpZihzdGF0dXNBcmcgPT0gdHJ1ZSl7XHJcbiAgICAgICAgY29uc29sZS5sb2cgPSBiZWF1dHlDb25zb2xlLmxvZztcclxuICAgIH0gZWxzZSB7XHJcbiAgICAgICAgY29uc29sZS5sb2cgPSBuYXRpdmVMb2c7XHJcbiAgICB9XHJcbiAgICBcclxufVxyXG5cclxuZXhwb3J0IGxldCBiZWF1dHlDb25zb2xlID0ge1xyXG4gICAgbG9nMjogbmF0aXZlTG9nLFxyXG4gICAgbG9nOiBmdW5jdGlvbihsb2dBcmc6YW55KXtcclxuICAgICAgICBpZihvcmFBY3RpdmUpe1xyXG4gICAgICAgICAgICBhY3RpdmVPcmEucGF1c2UoKTtcclxuICAgICAgICAgICAgbmF0aXZlTG9nLmFwcGx5KG5hdGl2ZUxvZywgYXJndW1lbnRzKTtcclxuICAgICAgICAgICAgYWN0aXZlT3JhLnN0YXJ0KCk7XHJcbiAgICAgICAgfSBlbHNlIHtcclxuICAgICAgICAgICAgbmF0aXZlTG9nLmFwcGx5KG5hdGl2ZUxvZywgYXJndW1lbnRzKTtcclxuICAgICAgICB9XHJcbiAgICB9XHJcbn0iXX0= diff --git a/dist/beautylog.log.helpers.js b/dist/beautylog.log.helpers.js index 88dc5d2..4bbae97 100644 --- a/dist/beautylog.log.helpers.js +++ b/dist/beautylog.log.helpers.js @@ -1,7 +1,7 @@ /// "use strict"; var plugins = require("./beautylog.plugins"); -var beautylog_classes_ora_1 = require("./beautylog.classes.ora"); +var beautylog_console_1 = require("./beautylog.console"); var localBl = { dirPrefix: plugins.clc.bgXterm(39).xterm(231).bold(' DIR ') + ' ', errorPrefix: ' Error: '.bgRed.white.bold + ' ', @@ -22,12 +22,7 @@ exports.log = function (logText, logType) { if (logType === void 0) { logType = 'normal'; } switch (plugins.smartenv.getEnv().runtimeEnv) { case "node": - if (beautylog_classes_ora_1.isOraActive) { - beautylog_classes_ora_1.activeOra.log(logText, logType); - } - else { - exports.logNode(logText, logType); - } + exports.logNode(logText, logType); break; case "browser": logBrowser(logText, logType); @@ -69,7 +64,7 @@ exports.logNode = function (logText, logType) { console.log(('unknown logType for "' + logText + '"').red.bold); break; } - console.log(logText); + beautylog_console_1.beautyConsole.log(logText); return true; } catch (error) { @@ -109,4 +104,4 @@ var logBrowser = function (logText, logType) { } }; -//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["beautylog.log.helpers.ts"],"names":[],"mappings":"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","file":"beautylog.log.helpers.js","sourcesContent":["/// <reference path=\"./typings/main.d.ts\" />\r\n\r\nimport plugins = require(\"./beautylog.plugins\");\r\nimport {isOraActive,activeOra} from \"./beautylog.classes.ora\";\r\n\r\nvar localBl = {\r\n    dirPrefix: plugins.clc.bgXterm(39).xterm(231).bold(' DIR ') + ' ',\r\n    errorPrefix: ' Error: '.bgRed.white.bold + ' ',\r\n    infoPrefix: plugins.clc.bgXterm(198).xterm(231).bold(' INFO ') + ' ',\r\n    normalPrefix: ' Log: '.bgCyan.white.bold + ' ',\r\n    okPrefix: ' '.bgGreen + ' OK! '.bgBlack.green.bold + ' ',\r\n    successPrefix: ' Success: '.bgGreen.white.bold + ' ',\r\n    warnPrefix: ' '.bgYellow + ' Warn: '.bgBlack.yellow.bold + ' '\r\n};\r\n\r\n/**\r\n *\r\n * @param logText\r\n * @param logType\r\n * @returns {boolean}\r\n */\r\nexport let log = function(logText:string = 'empty log', logType:string = 'normal') {\r\n    switch(plugins.smartenv.getEnv().runtimeEnv) {\r\n    case \"node\":\r\n        if (isOraActive){\r\n            activeOra.log(logText,logType);\r\n        } else {\r\n            logNode(logText,logType);\r\n        }\r\n        break;\r\n    case \"browser\":\r\n        logBrowser(logText,logType);\r\n        break;\r\n    default:\r\n        console.log(\"something is strange about the platform in which you try to use beautylog\");\r\n        break;\r\n}\r\n};\r\n\r\nexport let logNode = function(logText:string,logType:string){\r\n    try {\r\n        switch (logType) {\r\n            case 'dir':\r\n                logText = localBl.dirPrefix + plugins.clc.xterm(26)(logText);\r\n                break;\r\n            case 'error':\r\n                logText = localBl.errorPrefix + logText.red.bold;\r\n                break;\r\n            case 'info':\r\n                logText = localBl.infoPrefix + plugins.clc.xterm(198)(logText);\r\n                break;\r\n            case 'normal':\r\n                logText = localBl.normalPrefix + logText.cyan.bold;\r\n                break;\r\n            case 'ok':\r\n                logText = localBl.okPrefix + logText.bold;\r\n                break;\r\n            case 'success':\r\n                logText = localBl.successPrefix + logText.green.bold;\r\n                break;\r\n            case 'warn':\r\n                logText = localBl.warnPrefix + logText.bold;\r\n                break;\r\n            case 'log':\r\n                logText = localBl.normalPrefix + logText.blue.bold;\r\n                break;\r\n            default:\r\n                logText.blue.bold;\r\n                console.log(('unknown logType for \"' + logText + '\"').red.bold);\r\n                break;\r\n        }\r\n        console.log(logText);\r\n        return true;\r\n    }\r\n    catch (error) {\r\n        console.log(localBl.errorPrefix + 'You seem to have tried logging something strange'.red.bold + error);\r\n        return false;\r\n    }\r\n}\r\n\r\nlet logBrowser = function(logText,logType){\r\n    switch (logType) {\r\n            case 'dir':\r\n                logText = localBl.dirPrefix + plugins.clc.xterm(26)(logText);\r\n                break;\r\n            case 'error':\r\n                logText = localBl.errorPrefix + logText.red.bold;\r\n                break;\r\n            case 'info':\r\n                console.log('%c Info: %c ' + logText,'background:#EC407A;color:#ffffff;','color:#EC407A;');\r\n                break;\r\n            case 'normal':\r\n                logText = localBl.normalPrefix + logText.cyan.bold;\r\n                break;\r\n            case 'ok':\r\n                console.log('%c OK: %c ' + logText,\"background:#000000;color:#8BC34A;\",\"color:#000000;\");\r\n                break;\r\n            case 'success':\r\n                console.log('%c Success: %c ' + logText,\"background:#8BC34A;color:#ffffff;\",\"color:#8BC34A;\");\r\n                break;\r\n            case 'warn':\r\n                console.log('%c Warn: %c ' + logText,\"background:#000000;color:#FB8C00;\",\"color:#000000;\");\r\n                break;\r\n            case 'log':\r\n                console.log('%c Log: %c ' + logText,\"background:#42A5F5;color:#ffffff\",\"color:#42A5F5;\");\r\n                break;\r\n            default:\r\n                console.log('unknown logType for \"' + logText + '\"');\r\n                break;\r\n        }\r\n};"]} +//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["beautylog.log.helpers.ts"],"names":[],"mappings":"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","file":"beautylog.log.helpers.js","sourcesContent":["/// <reference path=\"./typings/main.d.ts\" />\r\n\r\nimport * as plugins from \"./beautylog.plugins\";\r\nimport {beautyConsole} from \"./beautylog.console\";\r\n\r\nvar localBl = {\r\n    dirPrefix: plugins.clc.bgXterm(39).xterm(231).bold(' DIR ') + ' ',\r\n    errorPrefix: ' Error: '.bgRed.white.bold + ' ',\r\n    infoPrefix: plugins.clc.bgXterm(198).xterm(231).bold(' INFO ') + ' ',\r\n    normalPrefix: ' Log: '.bgCyan.white.bold + ' ',\r\n    okPrefix: ' '.bgGreen + ' OK! '.bgBlack.green.bold + ' ',\r\n    successPrefix: ' Success: '.bgGreen.white.bold + ' ',\r\n    warnPrefix: ' '.bgYellow + ' Warn: '.bgBlack.yellow.bold + ' '\r\n};\r\n\r\n/**\r\n *\r\n * @param logText\r\n * @param logType\r\n * @returns {boolean}\r\n */\r\nexport let log = function(logText:string = 'empty log', logType:string = 'normal') {\r\n    switch(plugins.smartenv.getEnv().runtimeEnv) {\r\n    case \"node\":\r\n        logNode(logText,logType);\r\n        break;\r\n    case \"browser\":\r\n        logBrowser(logText,logType);\r\n        break;\r\n    default:\r\n        console.log(\"something is strange about the platform in which you try to use beautylog\");\r\n        break;\r\n}\r\n};\r\n\r\nexport let logNode = function(logText:string,logType:string){\r\n    try {\r\n        switch (logType) {\r\n            case 'dir':\r\n                logText = localBl.dirPrefix + plugins.clc.xterm(26)(logText);\r\n                break;\r\n            case 'error':\r\n                logText = localBl.errorPrefix + logText.red.bold;\r\n                break;\r\n            case 'info':\r\n                logText = localBl.infoPrefix + plugins.clc.xterm(198)(logText);\r\n                break;\r\n            case 'normal':\r\n                logText = localBl.normalPrefix + logText.cyan.bold;\r\n                break;\r\n            case 'ok':\r\n                logText = localBl.okPrefix + logText.bold;\r\n                break;\r\n            case 'success':\r\n                logText = localBl.successPrefix + logText.green.bold;\r\n                break;\r\n            case 'warn':\r\n                logText = localBl.warnPrefix + logText.bold;\r\n                break;\r\n            case 'log':\r\n                logText = localBl.normalPrefix + logText.blue.bold;\r\n                break;\r\n            default:\r\n                logText.blue.bold;\r\n                console.log(('unknown logType for \"' + logText + '\"').red.bold);\r\n                break;\r\n        }\r\n        beautyConsole.log(logText);\r\n        return true;\r\n    }\r\n    catch (error) {\r\n        console.log(localBl.errorPrefix + 'You seem to have tried logging something strange'.red.bold + error);\r\n        return false;\r\n    }\r\n}\r\n\r\nlet logBrowser = function(logText,logType){\r\n    switch (logType) {\r\n            case 'dir':\r\n                logText = localBl.dirPrefix + plugins.clc.xterm(26)(logText);\r\n                break;\r\n            case 'error':\r\n                logText = localBl.errorPrefix + logText.red.bold;\r\n                break;\r\n            case 'info':\r\n                console.log('%c Info: %c ' + logText,'background:#EC407A;color:#ffffff;','color:#EC407A;');\r\n                break;\r\n            case 'normal':\r\n                logText = localBl.normalPrefix + logText.cyan.bold;\r\n                break;\r\n            case 'ok':\r\n                console.log('%c OK: %c ' + logText,\"background:#000000;color:#8BC34A;\",\"color:#000000;\");\r\n                break;\r\n            case 'success':\r\n                console.log('%c Success: %c ' + logText,\"background:#8BC34A;color:#ffffff;\",\"color:#8BC34A;\");\r\n                break;\r\n            case 'warn':\r\n                console.log('%c Warn: %c ' + logText,\"background:#000000;color:#FB8C00;\",\"color:#000000;\");\r\n                break;\r\n            case 'log':\r\n                console.log('%c Log: %c ' + logText,\"background:#42A5F5;color:#ffffff\",\"color:#42A5F5;\");\r\n                break;\r\n            default:\r\n                console.log('unknown logType for \"' + logText + '\"');\r\n                break;\r\n        }\r\n};"]} diff --git a/dist/index.js b/dist/index.js index 83b0a50..3c08539 100644 --- a/dist/index.js +++ b/dist/index.js @@ -16,4 +16,4 @@ exports.ok = BeautylogLog.ok; exports.success = BeautylogLog.success; exports.warn = BeautylogLog.warn; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDRDQUE0Qzs7QUFHNUMsSUFBWSxZQUFZLFdBQU0saUJBQWlCLENBQUMsQ0FBQTtBQUNoRCxJQUFZLGVBQWUsV0FBTSxvQkFFakMsQ0FBQyxDQUZvRDtBQUVyRCx3Q0FBb0IsMkJBQTJCLENBQUM7QUFBeEMsZ0RBQXdDO0FBQ2hELHNDQUFrQix5QkFBeUIsQ0FBQztBQUFwQywwQ0FBb0M7QUFFakMsV0FBRyxHQUFJLFlBQVksQ0FBQyxHQUFHLENBQUM7QUFDeEIsYUFBSyxHQUFJLFlBQVksQ0FBQyxLQUFLLENBQUM7QUFDNUIsY0FBTSxHQUFJLGVBQWUsQ0FBQyxNQUFNLENBQUM7QUFDakMsa0JBQVUsR0FBSSxlQUFlLENBQUMsVUFBVSxDQUFDO0FBQ3pDLFlBQUksR0FBSSxZQUFZLENBQUMsSUFBSSxDQUFDO0FBQzFCLFdBQUcsR0FBSSxZQUFZLENBQUMsR0FBRyxDQUFDO0FBQ3hCLFVBQUUsR0FBSSxZQUFZLENBQUMsRUFBRSxDQUFDO0FBQ3RCLGVBQU8sR0FBSSxZQUFZLENBQUMsT0FBTyxDQUFDO0FBQ2hDLFlBQUksR0FBSSxZQUFZLENBQUMsSUFBSSxDQUFDIiwiZmlsZSI6ImluZGV4LmpzIiwic291cmNlc0NvbnRlbnQiOlsiLy8vIDxyZWZlcmVuY2UgcGF0aD1cIi4vdHlwaW5ncy9tYWluLmQudHNcIiAvPlxyXG5cclxuaW1wb3J0ICogYXMgcGx1Z2lucyBmcm9tIFwiLi9iZWF1dHlsb2cucGx1Z2luc1wiO1xyXG5pbXBvcnQgKiBhcyBCZWF1dHlsb2dMb2cgZnJvbSBcIi4vYmVhdXR5bG9nLmxvZ1wiO1xyXG5pbXBvcnQgKiBhcyBCZWF1dHlsb2dGaWdsZXQgZnJvbSBcIi4vYmVhdXR5bG9nLmZpZ2xldFwiXHJcblxyXG5leHBvcnQge1RhYmxlfSBmcm9tIFwiLi9iZWF1dHlsb2cuY2xhc3Nlcy50YWJsZVwiO1xyXG5leHBvcnQge09yYX0gZnJvbSBcIi4vYmVhdXR5bG9nLmNsYXNzZXMub3JhXCI7XHJcblxyXG5leHBvcnQgbGV0IGRpciA9ICBCZWF1dHlsb2dMb2cuZGlyO1xyXG5leHBvcnQgbGV0IGVycm9yID0gIEJlYXV0eWxvZ0xvZy5lcnJvcjtcclxuZXhwb3J0IGxldCBmaWdsZXQgPSAgQmVhdXR5bG9nRmlnbGV0LmZpZ2xldDtcclxuZXhwb3J0IGxldCBmaWdsZXRTeW5jID0gIEJlYXV0eWxvZ0ZpZ2xldC5maWdsZXRTeW5jO1xyXG5leHBvcnQgbGV0IGluZm8gPSAgQmVhdXR5bG9nTG9nLmluZm87XHJcbmV4cG9ydCBsZXQgbG9nID0gIEJlYXV0eWxvZ0xvZy5sb2c7XHJcbmV4cG9ydCBsZXQgb2sgPSAgQmVhdXR5bG9nTG9nLm9rO1xyXG5leHBvcnQgbGV0IHN1Y2Nlc3MgPSAgQmVhdXR5bG9nTG9nLnN1Y2Nlc3M7XHJcbmV4cG9ydCBsZXQgd2FybiA9ICBCZWF1dHlsb2dMb2cud2FybjtcclxuIl19 +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDRDQUE0Qzs7QUFHNUMsSUFBWSxZQUFZLFdBQU0saUJBQWlCLENBQUMsQ0FBQTtBQUNoRCxJQUFZLGVBQWUsV0FBTSxvQkFDakMsQ0FBQyxDQURvRDtBQUdyRCx3Q0FBb0IsMkJBQTJCLENBQUM7QUFBeEMsZ0RBQXdDO0FBQ2hELHNDQUFrQix5QkFBeUIsQ0FBQztBQUFwQywwQ0FBb0M7QUFFakMsV0FBRyxHQUFJLFlBQVksQ0FBQyxHQUFHLENBQUM7QUFDeEIsYUFBSyxHQUFJLFlBQVksQ0FBQyxLQUFLLENBQUM7QUFDNUIsY0FBTSxHQUFJLGVBQWUsQ0FBQyxNQUFNLENBQUM7QUFDakMsa0JBQVUsR0FBSSxlQUFlLENBQUMsVUFBVSxDQUFDO0FBQ3pDLFlBQUksR0FBSSxZQUFZLENBQUMsSUFBSSxDQUFDO0FBQzFCLFdBQUcsR0FBSSxZQUFZLENBQUMsR0FBRyxDQUFDO0FBQ3hCLFVBQUUsR0FBSSxZQUFZLENBQUMsRUFBRSxDQUFDO0FBQ3RCLGVBQU8sR0FBSSxZQUFZLENBQUMsT0FBTyxDQUFDO0FBQ2hDLFlBQUksR0FBSSxZQUFZLENBQUMsSUFBSSxDQUFDIiwiZmlsZSI6ImluZGV4LmpzIiwic291cmNlc0NvbnRlbnQiOlsiLy8vIDxyZWZlcmVuY2UgcGF0aD1cIi4vdHlwaW5ncy9tYWluLmQudHNcIiAvPlxyXG5cclxuaW1wb3J0ICogYXMgcGx1Z2lucyBmcm9tIFwiLi9iZWF1dHlsb2cucGx1Z2luc1wiO1xyXG5pbXBvcnQgKiBhcyBCZWF1dHlsb2dMb2cgZnJvbSBcIi4vYmVhdXR5bG9nLmxvZ1wiO1xyXG5pbXBvcnQgKiBhcyBCZWF1dHlsb2dGaWdsZXQgZnJvbSBcIi4vYmVhdXR5bG9nLmZpZ2xldFwiXHJcbmltcG9ydCAqIGFzIEJlYXV0eWxvZ0NvbnNvbGUgZnJvbSBcIi4vYmVhdXR5bG9nLmNvbnNvbGVcIjtcclxuXHJcbmV4cG9ydCB7VGFibGV9IGZyb20gXCIuL2JlYXV0eWxvZy5jbGFzc2VzLnRhYmxlXCI7XHJcbmV4cG9ydCB7T3JhfSBmcm9tIFwiLi9iZWF1dHlsb2cuY2xhc3Nlcy5vcmFcIjtcclxuXHJcbmV4cG9ydCBsZXQgZGlyID0gIEJlYXV0eWxvZ0xvZy5kaXI7XHJcbmV4cG9ydCBsZXQgZXJyb3IgPSAgQmVhdXR5bG9nTG9nLmVycm9yO1xyXG5leHBvcnQgbGV0IGZpZ2xldCA9ICBCZWF1dHlsb2dGaWdsZXQuZmlnbGV0O1xyXG5leHBvcnQgbGV0IGZpZ2xldFN5bmMgPSAgQmVhdXR5bG9nRmlnbGV0LmZpZ2xldFN5bmM7XHJcbmV4cG9ydCBsZXQgaW5mbyA9ICBCZWF1dHlsb2dMb2cuaW5mbztcclxuZXhwb3J0IGxldCBsb2cgPSAgQmVhdXR5bG9nTG9nLmxvZztcclxuZXhwb3J0IGxldCBvayA9ICBCZWF1dHlsb2dMb2cub2s7XHJcbmV4cG9ydCBsZXQgc3VjY2VzcyA9ICBCZWF1dHlsb2dMb2cuc3VjY2VzcztcclxuZXhwb3J0IGxldCB3YXJuID0gIEJlYXV0eWxvZ0xvZy53YXJuO1xyXG4iXX0= diff --git a/ts/beautylog.classes.ora.ts b/ts/beautylog.classes.ora.ts index 84bde71..2a406f3 100644 --- a/ts/beautylog.classes.ora.ts +++ b/ts/beautylog.classes.ora.ts @@ -2,7 +2,7 @@ import * as plugins from "./beautylog.plugins"; import {logNode} from "./beautylog.log.helpers"; -export let isOraActive:boolean = false; // when an Ora is active (e.g. start()) this is true; +export let oraActive:boolean = false; // when an Ora is active (e.g. start()) this is true; export let activeOra:Ora; //points to the currently active Ora object export class Ora { @@ -25,14 +25,14 @@ export class Ora { if(textArg) this._oraObject.text = textArg; if(colorArg) this._oraObject.color = colorArg; activeOra = this; - isOraActive = true; + oraActive = true; this._oraObject.start(); }; end(){ this._oraObject.stop(); this._oraObject.clear(); activeOra = undefined; - isOraActive = false; + oraActive = false; } endOk(textArg){ this.end(); @@ -42,6 +42,9 @@ export class Ora { this.end(); logNode(textArg,"error"); }; + pause(){ + this._oraObject.stop(); + } stop(){ // alias for end this.end(); } diff --git a/ts/beautylog.console.ts b/ts/beautylog.console.ts new file mode 100644 index 0000000..ed851ed --- /dev/null +++ b/ts/beautylog.console.ts @@ -0,0 +1,29 @@ +/// +import plugins = require("./beautylog.plugins"); +import {activeOra,oraActive} from "./beautylog.classes.ora"; +let nativeLog = console.log; + +/** + * routes the console to got through beautylog, so beautylog can take action before things are logged to console. + */ +export let route = function(statusArg:boolean){ + if(statusArg == true){ + console.log = beautyConsole.log; + } else { + console.log = nativeLog; + } + +} + +export let beautyConsole = { + log2: nativeLog, + log: function(logArg:any){ + if(oraActive){ + activeOra.pause(); + nativeLog.apply(nativeLog, arguments); + activeOra.start(); + } else { + nativeLog.apply(nativeLog, arguments); + } + } +} \ No newline at end of file diff --git a/ts/beautylog.log.helpers.ts b/ts/beautylog.log.helpers.ts index 39b8655..91c7265 100644 --- a/ts/beautylog.log.helpers.ts +++ b/ts/beautylog.log.helpers.ts @@ -1,7 +1,7 @@ /// -import plugins = require("./beautylog.plugins"); -import {isOraActive,activeOra} from "./beautylog.classes.ora"; +import * as plugins from "./beautylog.plugins"; +import {beautyConsole} from "./beautylog.console"; var localBl = { dirPrefix: plugins.clc.bgXterm(39).xterm(231).bold(' DIR ') + ' ', @@ -22,11 +22,7 @@ var localBl = { export let log = function(logText:string = 'empty log', logType:string = 'normal') { switch(plugins.smartenv.getEnv().runtimeEnv) { case "node": - if (isOraActive){ - activeOra.log(logText,logType); - } else { - logNode(logText,logType); - } + logNode(logText,logType); break; case "browser": logBrowser(logText,logType); @@ -69,7 +65,7 @@ export let logNode = function(logText:string,logType:string){ console.log(('unknown logType for "' + logText + '"').red.bold); break; } - console.log(logText); + beautyConsole.log(logText); return true; } catch (error) { diff --git a/ts/index.ts b/ts/index.ts index b76da57..002b680 100644 --- a/ts/index.ts +++ b/ts/index.ts @@ -3,6 +3,7 @@ import * as plugins from "./beautylog.plugins"; import * as BeautylogLog from "./beautylog.log"; import * as BeautylogFiglet from "./beautylog.figlet" +import * as BeautylogConsole from "./beautylog.console"; export {Table} from "./beautylog.classes.table"; export {Ora} from "./beautylog.classes.ora";