From b319ec41f02e469d84745eb8a7be7b41e565d379 Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Tue, 17 May 2016 00:24:56 +0200 Subject: [PATCH] normal log function now respects an active Ora. --- dist/beautylog.classes.ora.d.ts | 2 ++ dist/beautylog.classes.ora.js | 15 ++++++++++----- dist/beautylog.log.helpers.d.ts | 1 + dist/beautylog.log.helpers.js | 12 +++++++++--- test/test.js | 3 ++- test/test.ts | 1 + ts/beautylog.classes.ora.ts | 15 +++++++++++---- ts/beautylog.log.helpers.ts | 9 +++++++-- 8 files changed, 43 insertions(+), 15 deletions(-) diff --git a/dist/beautylog.classes.ora.d.ts b/dist/beautylog.classes.ora.d.ts index 9e49c9f..6af23cb 100644 --- a/dist/beautylog.classes.ora.d.ts +++ b/dist/beautylog.classes.ora.d.ts @@ -1,3 +1,5 @@ +export declare let isOraActive: boolean; +export declare let activeOra: Ora; export declare class Ora { private _oraObject; state: string; diff --git a/dist/beautylog.classes.ora.js b/dist/beautylog.classes.ora.js index feabf9a..95857b8 100644 --- a/dist/beautylog.classes.ora.js +++ b/dist/beautylog.classes.ora.js @@ -1,7 +1,8 @@ "use strict"; /// var plugins = require("./beautylog.plugins"); -var log = require("./beautylog.log"); +var beautylog_log_helpers_1 = require("./beautylog.log.helpers"); +exports.isOraActive = 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; } @@ -21,21 +22,25 @@ var Ora = (function () { this._oraObject.text = textArg; if (colorArg) this._oraObject.color = colorArg; + exports.activeOra = this; + exports.isOraActive = true; this._oraObject.start(); }; ; Ora.prototype.end = function () { this._oraObject.stop(); this._oraObject.clear(); + exports.activeOra = undefined; + exports.isOraActive = false; }; Ora.prototype.endOk = function (textArg) { this.end(); - log.ok(textArg); + beautylog_log_helpers_1.logNode(textArg, "ok"); }; ; Ora.prototype.endError = function (textArg) { this.end(); - log.error(textArg); + beautylog_log_helpers_1.logNode(textArg, "error"); }; ; Ora.prototype.stop = function () { @@ -44,11 +49,11 @@ var Ora = (function () { // log methods that play nice with ora Ora.prototype.log = function (logText, logType) { this.stop(); - log.log(logText, logType); + beautylog_log_helpers_1.logNode(logText, logType); this.start(); }; return Ora; }()); exports.Ora = Ora; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImJlYXV0eWxvZy5jbGFzc2VzLm9yYS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsNENBQTRDO0FBQzVDLElBQVksT0FBTyxXQUFNLHFCQUFxQixDQUFDLENBQUE7QUFDL0MsSUFBWSxHQUFHLFdBQU0saUJBQWlCLENBQUMsQ0FBQTtBQUV2QztJQUdJLGFBQVksT0FBYyxFQUFDLFFBQWUsRUFBQyxRQUF3QjtRQUF4Qix3QkFBd0IsR0FBeEIsZ0JBQXdCO1FBQy9ELElBQUksQ0FBQyxVQUFVLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQztZQUMxQixPQUFPLEVBQUMsTUFBTTtZQUNkLElBQUksRUFBQyxPQUFPO1lBQ1osS0FBSyxFQUFDLFFBQVE7U0FDakIsQ0FBQyxDQUFDO1FBRUgsUUFBUSxHQUFHLElBQUksQ0FBQyxVQUFVLENBQUMsS0FBSyxFQUFFLEdBQUcsS0FBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ2pELENBQUM7SUFDRCxrQkFBSSxHQUFKLFVBQUssT0FBTztRQUNSLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxHQUFHLE9BQU8sQ0FBQztJQUNuQyxDQUFDOztJQUVELG1CQUFLLEdBQUwsVUFBTSxPQUFlLEVBQUMsUUFBZ0I7UUFDbEMsRUFBRSxDQUFBLENBQUMsT0FBTyxDQUFDO1lBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxJQUFJLEdBQUcsT0FBTyxDQUFDO1FBQzNDLEVBQUUsQ0FBQSxDQUFDLFFBQVEsQ0FBQztZQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsS0FBSyxHQUFHLFFBQVEsQ0FBQztRQUM5QyxJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQzVCLENBQUM7O0lBQ0QsaUJBQUcsR0FBSDtRQUNJLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDdkIsSUFBSSxDQUFDLFVBQVUsQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUM1QixDQUFDO0lBQ0QsbUJBQUssR0FBTCxVQUFNLE9BQU87UUFDVCxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUM7UUFDWCxHQUFHLENBQUMsRUFBRSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3BCLENBQUM7O0lBQ0Qsc0JBQVEsR0FBUixVQUFTLE9BQU87UUFDWixJQUFJLENBQUMsR0FBRyxFQUFFLENBQUM7UUFDWCxHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3ZCLENBQUM7O0lBQ0Qsa0JBQUksR0FBSjtRQUNJLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQztJQUNmLENBQUM7SUFFRCxzQ0FBc0M7SUFDdEMsaUJBQUcsR0FBSCxVQUFJLE9BQWMsRUFBQyxPQUFjO1FBQzdCLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUNaLEdBQUcsQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ3pCLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUNqQixDQUFDO0lBQ0wsVUFBQztBQUFELENBM0NBLEFBMkNDLElBQUE7QUEzQ1ksV0FBRyxNQTJDZixDQUFBIiwiZmlsZSI6ImJlYXV0eWxvZy5jbGFzc2VzLm9yYS5qcyIsInNvdXJjZXNDb250ZW50IjpbIi8vLyA8cmVmZXJlbmNlIHBhdGg9XCIuL3R5cGluZ3MvbWFpbi5kLnRzXCIgLz5cclxuaW1wb3J0ICogYXMgcGx1Z2lucyBmcm9tIFwiLi9iZWF1dHlsb2cucGx1Z2luc1wiO1xyXG5pbXBvcnQgKiBhcyBsb2cgZnJvbSBcIi4vYmVhdXR5bG9nLmxvZ1wiO1xyXG5cclxuZXhwb3J0IGNsYXNzIE9yYSB7XHJcbiAgICBwcml2YXRlIF9vcmFPYmplY3Q7XHJcbiAgICBzdGF0ZTpzdHJpbmc7XHJcbiAgICBjb25zdHJ1Y3Rvcih0ZXh0QXJnOnN0cmluZyxjb2xvckFyZzpzdHJpbmcsc3RhcnRBcmc6Ym9vbGVhbiA9IGZhbHNlKXtcclxuICAgICAgICB0aGlzLl9vcmFPYmplY3QgPSBwbHVnaW5zLm9yYSh7XHJcbiAgICAgICAgICAgIHNwaW5uZXI6XCJkb3RzXCIsXHJcbiAgICAgICAgICAgIHRleHQ6dGV4dEFyZyxcclxuICAgICAgICAgICAgY29sb3I6Y29sb3JBcmdcclxuICAgICAgICB9KTtcclxuICAgICAgICBcclxuICAgICAgICBzdGFydEFyZyA/IHRoaXMuX29yYU9iamVjdC5zdGFydCgpIDogdm9pZCgwKTtcclxuICAgIH1cclxuICAgIHRleHQodGV4dEFyZyl7XHJcbiAgICAgICAgdGhpcy5fb3JhT2JqZWN0LnRleHQgPSB0ZXh0QXJnO1xyXG4gICAgfTtcclxuICAgIFxyXG4gICAgc3RhcnQodGV4dEFyZz86c3RyaW5nLGNvbG9yQXJnPzpzdHJpbmcpe1xyXG4gICAgICAgIGlmKHRleHRBcmcpIHRoaXMuX29yYU9iamVjdC50ZXh0ID0gdGV4dEFyZztcclxuICAgICAgICBpZihjb2xvckFyZykgdGhpcy5fb3JhT2JqZWN0LmNvbG9yID0gY29sb3JBcmc7XHJcbiAgICAgICAgdGhpcy5fb3JhT2JqZWN0LnN0YXJ0KCk7XHJcbiAgICB9O1xyXG4gICAgZW5kKCl7XHJcbiAgICAgICAgdGhpcy5fb3JhT2JqZWN0LnN0b3AoKTtcclxuICAgICAgICB0aGlzLl9vcmFPYmplY3QuY2xlYXIoKTtcclxuICAgIH1cclxuICAgIGVuZE9rKHRleHRBcmcpe1xyXG4gICAgICAgIHRoaXMuZW5kKCk7XHJcbiAgICAgICAgbG9nLm9rKHRleHRBcmcpO1xyXG4gICAgfTtcclxuICAgIGVuZEVycm9yKHRleHRBcmcpe1xyXG4gICAgICAgIHRoaXMuZW5kKCk7XHJcbiAgICAgICAgbG9nLmVycm9yKHRleHRBcmcpO1xyXG4gICAgfTtcclxuICAgIHN0b3AoKXsgLy8gYWxpYXMgZm9yIGVuZFxyXG4gICAgICAgIHRoaXMuZW5kKCk7XHJcbiAgICB9XHJcbiAgICBcclxuICAgIC8vIGxvZyBtZXRob2RzIHRoYXQgcGxheSBuaWNlIHdpdGggb3JhXHJcbiAgICBsb2cobG9nVGV4dDpzdHJpbmcsbG9nVHlwZTpzdHJpbmcpe1xyXG4gICAgICAgIHRoaXMuc3RvcCgpO1xyXG4gICAgICAgIGxvZy5sb2cobG9nVGV4dCxsb2dUeXBlKTtcclxuICAgICAgICB0aGlzLnN0YXJ0KCk7XHJcbiAgICB9XHJcbn0iXX0= +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImJlYXV0eWxvZy5jbGFzc2VzLm9yYS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsNENBQTRDO0FBQzVDLElBQVksT0FBTyxXQUFNLHFCQUFxQixDQUFDLENBQUE7QUFDL0Msc0NBQXNCLHlCQUF5QixDQUFDLENBQUE7QUFFckMsbUJBQVcsR0FBVyxLQUFLLENBQUMsQ0FBQyxxREFBcUQ7QUFHN0Y7SUFHSSxhQUFZLE9BQWMsRUFBQyxRQUFlLEVBQUMsUUFBd0I7UUFBeEIsd0JBQXdCLEdBQXhCLGdCQUF3QjtRQUMvRCxJQUFJLENBQUMsVUFBVSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUM7WUFDMUIsT0FBTyxFQUFDLE1BQU07WUFDZCxJQUFJLEVBQUMsT0FBTztZQUNaLEtBQUssRUFBQyxRQUFRO1NBQ2pCLENBQUMsQ0FBQztRQUVILFFBQVEsR0FBRyxJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssRUFBRSxHQUFHLEtBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNqRCxDQUFDO0lBQ0Qsa0JBQUksR0FBSixVQUFLLE9BQU87UUFDUixJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksR0FBRyxPQUFPLENBQUM7SUFDbkMsQ0FBQzs7SUFFRCxtQkFBSyxHQUFMLFVBQU0sT0FBZSxFQUFDLFFBQWdCO1FBQ2xDLEVBQUUsQ0FBQSxDQUFDLE9BQU8sQ0FBQztZQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxHQUFHLE9BQU8sQ0FBQztRQUMzQyxFQUFFLENBQUEsQ0FBQyxRQUFRLENBQUM7WUFBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssR0FBRyxRQUFRLENBQUM7UUFDOUMsaUJBQVMsR0FBRyxJQUFJLENBQUM7UUFDakIsbUJBQVcsR0FBRyxJQUFJLENBQUM7UUFDbkIsSUFBSSxDQUFDLFVBQVUsQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUM1QixDQUFDOztJQUNELGlCQUFHLEdBQUg7UUFDSSxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksRUFBRSxDQUFDO1FBQ3ZCLElBQUksQ0FBQyxVQUFVLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDeEIsaUJBQVMsR0FBRyxTQUFTLENBQUM7UUFDdEIsbUJBQVcsR0FBRyxLQUFLLENBQUM7SUFDeEIsQ0FBQztJQUNELG1CQUFLLEdBQUwsVUFBTSxPQUFPO1FBQ1QsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDO1FBQ1gsK0JBQU8sQ0FBQyxPQUFPLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDMUIsQ0FBQzs7SUFDRCxzQkFBUSxHQUFSLFVBQVMsT0FBTztRQUNaLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQztRQUNYLCtCQUFPLENBQUMsT0FBTyxFQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQzdCLENBQUM7O0lBQ0Qsa0JBQUksR0FBSjtRQUNJLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQztJQUNmLENBQUM7SUFFRCxzQ0FBc0M7SUFDdEMsaUJBQUcsR0FBSCxVQUFJLE9BQWMsRUFBQyxPQUFjO1FBQzdCLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUNaLCtCQUFPLENBQUMsT0FBTyxFQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ3pCLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUNqQixDQUFDO0lBQ0wsVUFBQztBQUFELENBL0NBLEFBK0NDLElBQUE7QUEvQ1ksV0FBRyxNQStDZixDQUFBIiwiZmlsZSI6ImJlYXV0eWxvZy5jbGFzc2VzLm9yYS5qcyIsInNvdXJjZXNDb250ZW50IjpbIi8vLyA8cmVmZXJlbmNlIHBhdGg9XCIuL3R5cGluZ3MvbWFpbi5kLnRzXCIgLz5cclxuaW1wb3J0ICogYXMgcGx1Z2lucyBmcm9tIFwiLi9iZWF1dHlsb2cucGx1Z2luc1wiO1xyXG5pbXBvcnQge2xvZ05vZGV9IGZyb20gXCIuL2JlYXV0eWxvZy5sb2cuaGVscGVyc1wiO1xyXG5cclxuZXhwb3J0IGxldCBpc09yYUFjdGl2ZTpib29sZWFuID0gZmFsc2U7IC8vIHdoZW4gYW4gT3JhIGlzIGFjdGl2ZSAoZS5nLiBzdGFydCgpKSB0aGlzIGlzIHRydWU7XHJcbmV4cG9ydCBsZXQgYWN0aXZlT3JhOk9yYTsgLy9wb2ludHMgdG8gdGhlIGN1cnJlbnRseSBhY3RpdmUgT3JhIG9iamVjdFxyXG5cclxuZXhwb3J0IGNsYXNzIE9yYSB7XHJcbiAgICBwcml2YXRlIF9vcmFPYmplY3Q7XHJcbiAgICBzdGF0ZTpzdHJpbmc7XHJcbiAgICBjb25zdHJ1Y3Rvcih0ZXh0QXJnOnN0cmluZyxjb2xvckFyZzpzdHJpbmcsc3RhcnRBcmc6Ym9vbGVhbiA9IGZhbHNlKXtcclxuICAgICAgICB0aGlzLl9vcmFPYmplY3QgPSBwbHVnaW5zLm9yYSh7XHJcbiAgICAgICAgICAgIHNwaW5uZXI6XCJkb3RzXCIsXHJcbiAgICAgICAgICAgIHRleHQ6dGV4dEFyZyxcclxuICAgICAgICAgICAgY29sb3I6Y29sb3JBcmdcclxuICAgICAgICB9KTtcclxuICAgICAgICBcclxuICAgICAgICBzdGFydEFyZyA/IHRoaXMuX29yYU9iamVjdC5zdGFydCgpIDogdm9pZCgwKTtcclxuICAgIH1cclxuICAgIHRleHQodGV4dEFyZyl7XHJcbiAgICAgICAgdGhpcy5fb3JhT2JqZWN0LnRleHQgPSB0ZXh0QXJnO1xyXG4gICAgfTtcclxuICAgIFxyXG4gICAgc3RhcnQodGV4dEFyZz86c3RyaW5nLGNvbG9yQXJnPzpzdHJpbmcpe1xyXG4gICAgICAgIGlmKHRleHRBcmcpIHRoaXMuX29yYU9iamVjdC50ZXh0ID0gdGV4dEFyZztcclxuICAgICAgICBpZihjb2xvckFyZykgdGhpcy5fb3JhT2JqZWN0LmNvbG9yID0gY29sb3JBcmc7XHJcbiAgICAgICAgYWN0aXZlT3JhID0gdGhpcztcclxuICAgICAgICBpc09yYUFjdGl2ZSA9IHRydWU7XHJcbiAgICAgICAgdGhpcy5fb3JhT2JqZWN0LnN0YXJ0KCk7XHJcbiAgICB9O1xyXG4gICAgZW5kKCl7XHJcbiAgICAgICAgdGhpcy5fb3JhT2JqZWN0LnN0b3AoKTtcclxuICAgICAgICB0aGlzLl9vcmFPYmplY3QuY2xlYXIoKTtcclxuICAgICAgICBhY3RpdmVPcmEgPSB1bmRlZmluZWQ7XHJcbiAgICAgICAgaXNPcmFBY3RpdmUgPSBmYWxzZTtcclxuICAgIH1cclxuICAgIGVuZE9rKHRleHRBcmcpe1xyXG4gICAgICAgIHRoaXMuZW5kKCk7XHJcbiAgICAgICAgbG9nTm9kZSh0ZXh0QXJnLFwib2tcIik7XHJcbiAgICB9O1xyXG4gICAgZW5kRXJyb3IodGV4dEFyZyl7XHJcbiAgICAgICAgdGhpcy5lbmQoKTtcclxuICAgICAgICBsb2dOb2RlKHRleHRBcmcsXCJlcnJvclwiKTtcclxuICAgIH07XHJcbiAgICBzdG9wKCl7IC8vIGFsaWFzIGZvciBlbmRcclxuICAgICAgICB0aGlzLmVuZCgpO1xyXG4gICAgfVxyXG4gICAgXHJcbiAgICAvLyBsb2cgbWV0aG9kcyB0aGF0IHBsYXkgbmljZSB3aXRoIG9yYVxyXG4gICAgbG9nKGxvZ1RleHQ6c3RyaW5nLGxvZ1R5cGU6c3RyaW5nKXtcclxuICAgICAgICB0aGlzLnN0b3AoKTtcclxuICAgICAgICBsb2dOb2RlKGxvZ1RleHQsbG9nVHlwZSk7XHJcbiAgICAgICAgdGhpcy5zdGFydCgpO1xyXG4gICAgfVxyXG59Il19 diff --git a/dist/beautylog.log.helpers.d.ts b/dist/beautylog.log.helpers.d.ts index a8dd3a4..3187be5 100644 --- a/dist/beautylog.log.helpers.d.ts +++ b/dist/beautylog.log.helpers.d.ts @@ -5,3 +5,4 @@ * @returns {boolean} */ export declare let log: (logText?: string, logType?: string) => void; +export declare let logNode: (logText: string, logType: string) => boolean; diff --git a/dist/beautylog.log.helpers.js b/dist/beautylog.log.helpers.js index c8fb3f5..88dc5d2 100644 --- a/dist/beautylog.log.helpers.js +++ b/dist/beautylog.log.helpers.js @@ -1,6 +1,7 @@ /// "use strict"; var plugins = require("./beautylog.plugins"); +var beautylog_classes_ora_1 = require("./beautylog.classes.ora"); var localBl = { dirPrefix: plugins.clc.bgXterm(39).xterm(231).bold(' DIR ') + ' ', errorPrefix: ' Error: '.bgRed.white.bold + ' ', @@ -21,7 +22,12 @@ exports.log = function (logText, logType) { if (logType === void 0) { logType = 'normal'; } switch (plugins.smartenv.getEnv().runtimeEnv) { case "node": - logNode(logText, logType); + if (beautylog_classes_ora_1.isOraActive) { + beautylog_classes_ora_1.activeOra.log(logText, logType); + } + else { + exports.logNode(logText, logType); + } break; case "browser": logBrowser(logText, logType); @@ -31,7 +37,7 @@ exports.log = function (logText, logType) { break; } }; -var logNode = function (logText, logType) { +exports.logNode = function (logText, logType) { try { switch (logType) { case 'dir': @@ -103,4 +109,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\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\nlet 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 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};"]} diff --git a/test/test.js b/test/test.js index 8c139f2..083012d 100644 --- a/test/test.js +++ b/test/test.js @@ -53,6 +53,7 @@ describe("beautylog", function () { setTimeout(function () { testOra.text("updated text!"); testOra.log("an intermediate log message", "info"); + beautylog.info("another log message that uses the normal log function"); setTimeout(function () { testOra.endOk("Allright, ora works!"); done(); @@ -94,4 +95,4 @@ describe("beautylog", function () { }); }); -//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["test.ts"],"names":[],"mappings":"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","file":"test.js","sourcesContent":["/// <reference path=\"../ts/typings/main.d.ts\" />\r\nimport beautylog = require('../dist/index.js');\r\n\r\ndescribe(\"beautylog\",function(){\r\n    describe(\".log(message,logtype)\",function(){\r\n        it(\"should log cyan text\",function(){\r\n            beautylog.log('beautylog.log(), with normal logText, without logType');\r\n        });\r\n        it(\"should print different log types dependent on logType\",function(){\r\n            beautylog.log('beautylog.log(), with normal logText, without logType');\r\n            beautylog.log('beautylog.log(), with normal logText, with logType \"dir\"','dir');\r\n            beautylog.log('beautylog.log(), with normal logText, with logType \"error\"','error');\r\n            beautylog.log('beautylog.log(), with normal logText, with logType \"info\"','info');\r\n            beautylog.log('beautylog.log(), with normal logText, with logType \"ok\"','ok');\r\n            beautylog.log('beautylog.log(), with normal logText, with logType \"success\"','success');\r\n            beautylog.log('beautylog.log(), with normal logText, with logType \"warn\"','warn');\r\n        });\r\n    });\r\n    describe(\".dir(message)\",function(){\r\n        it(\"should print a blue Dir message\",function(){\r\n            beautylog.dir('beautylog.dir(), with normal logText, without logType');\r\n        })\r\n    })\r\n    describe(\".error(message)\",function(){\r\n        it(\"should print a red error message\",function(){\r\n            beautylog.error('beautylog.error(), with normal logText, without logType');\r\n        });\r\n    });\r\n    describe(\".figlet\",function(){\r\n        it(\"should print nice fonts to console in yellow\",function(done){\r\n            beautylog.figlet(\"Async!\",{font:\"Star Wars\",color:\"yellow\"}).then(done);\r\n        })\r\n    });\r\n    describe(\".figletSync\",function(){\r\n        it(\"should print nice fonts to console in yellow\",function(){\r\n            beautylog.figletSync(\"Sync!\",{font:\"Star Wars\",color:\"blue\"});\r\n        })\r\n    });\r\n    describe(\".info(message)\",function(){\r\n        it(\"should display a purple info message\",function(){\r\n            beautylog.info('beautylog.dir(), with normal logText, without logType');\r\n        });\r\n    });\r\n    describe(\".ok(message)\",function(){\r\n        it(\"should display a green ok message\",function(){\r\n            beautylog.ok('beautylog.ok(), with normal logText, without logType');\r\n        });\r\n    });\r\n    describe(\".ora(text,color)\",function(){\r\n        it(\"should display, update, and end a message\",function(done){\r\n            this.timeout(10000);\r\n            let testOra = new beautylog.Ora(\"This is a test text\",\"green\",true);\r\n            setTimeout(function(){\r\n                testOra.text(\"updated text!\");\r\n                testOra.log(\"an intermediate log message\",\"info\");\r\n                setTimeout(function(){\r\n                    testOra.endOk(\"Allright, ora works!\");\r\n                    done();\r\n                },2000);\r\n            },2000)\r\n        });\r\n        it(\"should display an error message when ended with error\",function(done){\r\n            this.timeout(10000);\r\n            let testOra = new beautylog.Ora(\"This is another test text\",\"green\");\r\n            setTimeout(function(){\r\n                testOra.endError(\"Allright, ora displays an error!\");\r\n                done();\r\n            },2000)\r\n        });\r\n    });\r\n    describe(\".success(message)\",function(){\r\n        it(\"should display an orange warn message\",function(){\r\n            beautylog.success('beautylog.success(), with normal logText, without logType');\r\n        })\r\n    });\r\n    describe(\".warn\",function(){\r\n        it(\"should display a orange warn message\",function(){\r\n            beautylog.warn('beautylog.warn(), with normal logText, without logType');\r\n        });\r\n    });\r\n    describe(\".Table\",function(){\r\n        it(\"should print a nice table\",function(){\r\n            (function(){\r\n                var testTable1 = new beautylog.Table(\"checks\");\r\n                testTable1.push(['check1','success']);\r\n                testTable1.push(['check2','error']);\r\n                testTable1.push(['check3','error']);\r\n                testTable1.print();\r\n\r\n                var testTable2 = new beautylog.Table(\"custom\",[\"Column1\".red,\"Column2\".blue,\"Column3\".cyan]);\r\n                testTable2.push([\"Hey\",\"this\",\"works\"]);\r\n                testTable2.print();\r\n            })();\r\n        });\r\n    });\r\n});\r\n\r\n\r\n"]} +//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["test.ts"],"names":[],"mappings":"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","file":"test.js","sourcesContent":["/// <reference path=\"../ts/typings/main.d.ts\" />\r\nimport beautylog = require('../dist/index.js');\r\n\r\ndescribe(\"beautylog\",function(){\r\n    describe(\".log(message,logtype)\",function(){\r\n        it(\"should log cyan text\",function(){\r\n            beautylog.log('beautylog.log(), with normal logText, without logType');\r\n        });\r\n        it(\"should print different log types dependent on logType\",function(){\r\n            beautylog.log('beautylog.log(), with normal logText, without logType');\r\n            beautylog.log('beautylog.log(), with normal logText, with logType \"dir\"','dir');\r\n            beautylog.log('beautylog.log(), with normal logText, with logType \"error\"','error');\r\n            beautylog.log('beautylog.log(), with normal logText, with logType \"info\"','info');\r\n            beautylog.log('beautylog.log(), with normal logText, with logType \"ok\"','ok');\r\n            beautylog.log('beautylog.log(), with normal logText, with logType \"success\"','success');\r\n            beautylog.log('beautylog.log(), with normal logText, with logType \"warn\"','warn');\r\n        });\r\n    });\r\n    describe(\".dir(message)\",function(){\r\n        it(\"should print a blue Dir message\",function(){\r\n            beautylog.dir('beautylog.dir(), with normal logText, without logType');\r\n        })\r\n    })\r\n    describe(\".error(message)\",function(){\r\n        it(\"should print a red error message\",function(){\r\n            beautylog.error('beautylog.error(), with normal logText, without logType');\r\n        });\r\n    });\r\n    describe(\".figlet\",function(){\r\n        it(\"should print nice fonts to console in yellow\",function(done){\r\n            beautylog.figlet(\"Async!\",{font:\"Star Wars\",color:\"yellow\"}).then(done);\r\n        })\r\n    });\r\n    describe(\".figletSync\",function(){\r\n        it(\"should print nice fonts to console in yellow\",function(){\r\n            beautylog.figletSync(\"Sync!\",{font:\"Star Wars\",color:\"blue\"});\r\n        })\r\n    });\r\n    describe(\".info(message)\",function(){\r\n        it(\"should display a purple info message\",function(){\r\n            beautylog.info('beautylog.dir(), with normal logText, without logType');\r\n        });\r\n    });\r\n    describe(\".ok(message)\",function(){\r\n        it(\"should display a green ok message\",function(){\r\n            beautylog.ok('beautylog.ok(), with normal logText, without logType');\r\n        });\r\n    });\r\n    describe(\".ora(text,color)\",function(){\r\n        it(\"should display, update, and end a message\",function(done){\r\n            this.timeout(10000);\r\n            let testOra = new beautylog.Ora(\"This is a test text\",\"green\",true);\r\n            setTimeout(function(){\r\n                testOra.text(\"updated text!\");\r\n                testOra.log(\"an intermediate log message\",\"info\");\r\n                beautylog.info(\"another log message that uses the normal log function\");\r\n                setTimeout(function(){\r\n                    testOra.endOk(\"Allright, ora works!\");\r\n                    done();\r\n                },2000);\r\n            },2000)\r\n        });\r\n        it(\"should display an error message when ended with error\",function(done){\r\n            this.timeout(10000);\r\n            let testOra = new beautylog.Ora(\"This is another test text\",\"green\");\r\n            setTimeout(function(){\r\n                testOra.endError(\"Allright, ora displays an error!\");\r\n                done();\r\n            },2000)\r\n        });\r\n    });\r\n    describe(\".success(message)\",function(){\r\n        it(\"should display an orange warn message\",function(){\r\n            beautylog.success('beautylog.success(), with normal logText, without logType');\r\n        })\r\n    });\r\n    describe(\".warn\",function(){\r\n        it(\"should display a orange warn message\",function(){\r\n            beautylog.warn('beautylog.warn(), with normal logText, without logType');\r\n        });\r\n    });\r\n    describe(\".Table\",function(){\r\n        it(\"should print a nice table\",function(){\r\n            (function(){\r\n                var testTable1 = new beautylog.Table(\"checks\");\r\n                testTable1.push(['check1','success']);\r\n                testTable1.push(['check2','error']);\r\n                testTable1.push(['check3','error']);\r\n                testTable1.print();\r\n\r\n                var testTable2 = new beautylog.Table(\"custom\",[\"Column1\".red,\"Column2\".blue,\"Column3\".cyan]);\r\n                testTable2.push([\"Hey\",\"this\",\"works\"]);\r\n                testTable2.print();\r\n            })();\r\n        });\r\n    });\r\n});\r\n\r\n\r\n"]} diff --git a/test/test.ts b/test/test.ts index a5971b2..8535567 100644 --- a/test/test.ts +++ b/test/test.ts @@ -53,6 +53,7 @@ describe("beautylog",function(){ setTimeout(function(){ testOra.text("updated text!"); testOra.log("an intermediate log message","info"); + beautylog.info("another log message that uses the normal log function"); setTimeout(function(){ testOra.endOk("Allright, ora works!"); done(); diff --git a/ts/beautylog.classes.ora.ts b/ts/beautylog.classes.ora.ts index 7f1fa04..84bde71 100644 --- a/ts/beautylog.classes.ora.ts +++ b/ts/beautylog.classes.ora.ts @@ -1,6 +1,9 @@ /// import * as plugins from "./beautylog.plugins"; -import * as log from "./beautylog.log"; +import {logNode} from "./beautylog.log.helpers"; + +export let isOraActive: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 { private _oraObject; @@ -21,19 +24,23 @@ export class Ora { start(textArg?:string,colorArg?:string){ if(textArg) this._oraObject.text = textArg; if(colorArg) this._oraObject.color = colorArg; + activeOra = this; + isOraActive = true; this._oraObject.start(); }; end(){ this._oraObject.stop(); this._oraObject.clear(); + activeOra = undefined; + isOraActive = false; } endOk(textArg){ this.end(); - log.ok(textArg); + logNode(textArg,"ok"); }; endError(textArg){ this.end(); - log.error(textArg); + logNode(textArg,"error"); }; stop(){ // alias for end this.end(); @@ -42,7 +49,7 @@ export class Ora { // log methods that play nice with ora log(logText:string,logType:string){ this.stop(); - log.log(logText,logType); + logNode(logText,logType); this.start(); } } \ No newline at end of file diff --git a/ts/beautylog.log.helpers.ts b/ts/beautylog.log.helpers.ts index 81f7773..39b8655 100644 --- a/ts/beautylog.log.helpers.ts +++ b/ts/beautylog.log.helpers.ts @@ -1,6 +1,7 @@ /// import plugins = require("./beautylog.plugins"); +import {isOraActive,activeOra} from "./beautylog.classes.ora"; var localBl = { dirPrefix: plugins.clc.bgXterm(39).xterm(231).bold(' DIR ') + ' ', @@ -21,7 +22,11 @@ var localBl = { export let log = function(logText:string = 'empty log', logType:string = 'normal') { switch(plugins.smartenv.getEnv().runtimeEnv) { case "node": - logNode(logText,logType); + if (isOraActive){ + activeOra.log(logText,logType); + } else { + logNode(logText,logType); + } break; case "browser": logBrowser(logText,logType); @@ -32,7 +37,7 @@ export let log = function(logText:string = 'empty log', logType:string = 'normal } }; -let logNode = function(logText:string,logType:string){ +export let logNode = function(logText:string,logType:string){ try { switch (logType) { case 'dir':