diff --git a/index.js b/index.js index 3462bf6..12d980c 100644 --- a/index.js +++ b/index.js @@ -1,15 +1,46 @@ /// +var ConsoleTable = (function () { + function ConsoleTable(tableType) { + switch (tableType) { + case "checks": + this.tableHead = ['Check Item:'.cyan, 'Status:'.cyan]; + break; + default: + break; + } + this.rows = []; + this.type = tableType; + } + ConsoleTable.prototype.push = function (row) { + this.rows.push(row); + }; + ConsoleTable.prototype.print = function () { + var table = new BeautylogOsTable.cliTable({ + head: this.tableHead, + colWidths: [20, 20] + }); + for (var row in this.rows) { + if (this.rows[row][1] == "success") { + this.rows[row][1] = ' '.bgGreen + ' ' + this.rows[row][1]; + } + else if (this.rows[row][1] == "error") { + this.rows[row][1] = ' '.bgRed + ' ' + this.rows[row][1]; + } + table.push(this.rows[row]); + } + ; + console.log(table.toString()); + }; + return ConsoleTable; +})(); +/// var BeautylogOS; (function (BeautylogOS) { function init() { var colors = require("colors"); var clc = require("cli-color"); - var beautylogOS = {}; - /** - * object to append to all locally used params - * @type {{}} - */ - var localBl; + var beautylogOS = {}; //object to append to all public facing functions + var localBl; // object to append to all private params and functions localBl = {}; localBl.dirPrefix = clc.bgXterm(39).xterm(231).bold(' DIR ') + ' '; localBl.errorPrefix = ' Error: '.bgRed.white.bold + ' '; @@ -110,11 +141,26 @@ var BeautylogOS; beautylogOS.warn = function (logText) { return beautylogOS.log(logText, 'warn'); }; + beautylogOS.table = BeautylogOsTable.init(); return beautylogOS; } BeautylogOS.init = init; })(BeautylogOS || (BeautylogOS = {})); /// +var BeautylogOsTable; +(function (BeautylogOsTable) { + function init() { + BeautylogOsTable.cliTable = require("cli-table2"); + var beautylogOsTable = {}; + beautylogOsTable.new = function (type) { + var newConsoleTable = new ConsoleTable(type); + return newConsoleTable; + }; + return beautylogOsTable; + } + BeautylogOsTable.init = init; +})(BeautylogOsTable || (BeautylogOsTable = {})); +/// var BeautylogBrowser; (function (BeautylogBrowser) { function init() { @@ -139,8 +185,10 @@ var BeautylogBrowser; BeautylogBrowser.init = init; })(BeautylogBrowser || (BeautylogBrowser = {})); /// -/// -/// +/// +/// +/// +/// var beautylog = function (logPlatform) { if (logPlatform === void 0) { logPlatform = "os"; } switch (logPlatform) { diff --git a/package.json b/package.json index ef10f33..09d6d89 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "homepage": "https://github.com/pushrocks/beautylog", "dependencies": { "cli-color": "^1.1.0", + "cli-table2": "^0.1.9", "colors": "1.1.2" } } diff --git a/test.js b/test.js index b2a3c74..e700c10 100644 --- a/test.js +++ b/test.js @@ -1,7 +1,7 @@ /// var beautyLogOs = require('./index.js')("os"); var beautyLogBrowser = require("./index.js")("browser"); -console.log('*** start test ***'); +console.log('*** start OS console test ***'); console.log(''); console.log('declarative function calls:'); beautyLogOs.log('beautylog.log(), with normal logText, without logType'); @@ -21,6 +21,14 @@ beautyLogOs.log('beautylog.log(), with normal logText, with logType "ok"', 'ok') beautyLogOs.log('beautylog.log(), with normal logText, with logType "success"', 'success'); beautyLogOs.log('beautylog.log(), with normal logText, with logType "warn"', 'warn'); console.log(''); -console.log('*** end test ***'); -console.log("start test of beautylog browser module (Might look weird in is console...)"); +console.log('*** end OS console test ***'); +console.log("*** start browser console test (Might look weird in OS console and travis log...) ***"); beautyLogBrowser.log("hello"); +console.log("*** end browser console test ***"); +console.log("*** start table test ***"); +var testTable = beautyLogOs.table.new("checks"); +testTable.push(['check1', 'success']); +testTable.push(['check2', 'error']); +testTable.push(['check3', 'error']); +testTable.print(); +console.log("*** end table test ***"); diff --git a/ts/beautylog.classes.js b/ts/beautylog.classes.js index 8093cfd..ed75157 100644 --- a/ts/beautylog.classes.js +++ b/ts/beautylog.classes.js @@ -1,9 +1,35 @@ /// var ConsoleTable = (function () { - function ConsoleTable() { + function ConsoleTable(tableType) { + switch (tableType) { + case "checks": + this.tableHead = ['Check Item:'.cyan, 'Status:'.cyan]; + break; + default: + break; + } + this.rows = []; + this.type = tableType; } + ConsoleTable.prototype.push = function (row) { + this.rows.push(row); + }; ConsoleTable.prototype.print = function () { - alert(this.name + " moved " + meters + "m."); + var table = new BeautylogOsTable.cliTable({ + head: this.tableHead, + colWidths: [20, 20] + }); + for (var row in this.rows) { + if (this.rows[row][1] == "success") { + this.rows[row][1] = ' '.bgGreen + ' ' + this.rows[row][1]; + } + else if (this.rows[row][1] == "error") { + this.rows[row][1] = ' '.bgRed + ' ' + this.rows[row][1]; + } + table.push(this.rows[row]); + } + ; + console.log(table.toString()); }; return ConsoleTable; })(); diff --git a/ts/beautylog.classes.js.map b/ts/beautylog.classes.js.map index f2a2528..d399cac 100644 --- a/ts/beautylog.classes.js.map +++ b/ts/beautylog.classes.js.map @@ -1 +1 @@ -{"version":3,"file":"beautylog.classes.js","sourceRoot":"","sources":["beautylog.classes.ts"],"names":["ConsoleTable","ConsoleTable.constructor","ConsoleTable.print"],"mappings":"AAAA,mCAAmC;AACnC;IAEIA;IAAeC,CAACA;IAChBD,4BAAKA,GAALA;QACIE,KAAKA,CAACA,IAAIA,CAACA,IAAIA,GAAGA,SAASA,GAAGA,MAAMA,GAAGA,IAAIA,CAACA,CAACA;IACjDA,CAACA;IACLF,mBAACA;AAADA,CAACA,AAND,IAMC"} \ No newline at end of file +{"version":3,"file":"beautylog.classes.js","sourceRoot":"","sources":["beautylog.classes.ts"],"names":["ConsoleTable","ConsoleTable.constructor","ConsoleTable.push","ConsoleTable.print"],"mappings":"AAAA,mCAAmC;AAEnC;IAIIA,sBAAYA,SAAgBA;QACxBC,MAAMA,CAACA,CAACA,SAASA,CAACA,CAACA,CAACA;YAChBA,KAAKA,QAAQA;gBACTA,IAAIA,CAACA,SAASA,GAAGA,CAACA,aAAaA,CAACA,IAAIA,EAACA,SAASA,CAACA,IAAIA,CAACA,CAACA;gBACrDA,KAAKA,CAACA;YACVA;gBACIA,KAAKA,CAACA;QACdA,CAACA;QACDA,IAAIA,CAACA,IAAIA,GAAGA,EAAEA,CAACA;QACfA,IAAIA,CAACA,IAAIA,GAAGA,SAASA,CAACA;IAC1BA,CAACA;IACDD,2BAAIA,GAAJA,UAAKA,GAAYA;QACbE,IAAIA,CAACA,IAAIA,CAACA,IAAIA,CAACA,GAAGA,CAACA,CAACA;IACxBA,CAACA;IACDF,4BAAKA,GAALA;QACIG,IAAIA,KAAKA,GAAGA,IAAIA,gBAAgBA,CAACA,QAAQA,CAACA;YACtCA,IAAIA,EAAEA,IAAIA,CAACA,SAASA;YACpBA,SAASA,EAAEA,CAACA,EAAEA,EAAEA,EAAEA,CAACA;SACtBA,CAACA,CAACA;QACHA,GAAGA,CAACA,CAACA,GAAGA,CAACA,GAAGA,IAAIA,IAAIA,CAACA,IAAIA,CAACA,CAAAA,CAACA;YACvBA,EAAEA,CAAAA,CAACA,IAAIA,CAACA,IAAIA,CAACA,GAAGA,CAACA,CAACA,CAACA,CAACA,IAAIA,SAASA,CAACA,CAAAA,CAACA;gBAC/BA,IAAIA,CAACA,IAAIA,CAACA,GAAGA,CAACA,CAACA,CAACA,CAACA,GAAGA,GAAGA,CAACA,OAAOA,GAAGA,GAAGA,GAAGA,IAAIA,CAACA,IAAIA,CAACA,GAAGA,CAACA,CAACA,CAACA,CAACA,CAACA;YAC9DA,CAACA;YAACA,IAAIA,CAACA,EAAEA,CAACA,CAACA,IAAIA,CAACA,IAAIA,CAACA,GAAGA,CAACA,CAACA,CAACA,CAACA,IAAIA,OAAOA,CAACA,CAACA,CAACA;gBACtCA,IAAIA,CAACA,IAAIA,CAACA,GAAGA,CAACA,CAACA,CAACA,CAACA,GAAGA,GAAGA,CAACA,KAAKA,GAAGA,GAAGA,GAAGA,IAAIA,CAACA,IAAIA,CAACA,GAAGA,CAACA,CAACA,CAACA,CAACA,CAACA;YAC5DA,CAACA;YACDA,KAAKA,CAACA,IAAIA,CAACA,IAAIA,CAACA,IAAIA,CAACA,GAAGA,CAACA,CAACA,CAACA;QAC/BA,CAACA;QAAAA,CAACA;QACFA,OAAOA,CAACA,GAAGA,CAACA,KAAKA,CAACA,QAAQA,EAAEA,CAACA,CAACA;IAClCA,CAACA;IACLH,mBAACA;AAADA,CAACA,AAjCD,IAiCC"} \ No newline at end of file diff --git a/ts/beautylog.classes.ts b/ts/beautylog.classes.ts index ff0aef9..7bbca91 100644 --- a/ts/beautylog.classes.ts +++ b/ts/beautylog.classes.ts @@ -1,8 +1,36 @@ /// + class ConsoleTable { - rows:[]; - constructor() {} - print() { - alert(this.name + " moved " + meters + "m."); + tableHead:string[]; + rows; + type:string; + constructor(tableType:string) { + switch (tableType) { + case "checks": + this.tableHead = ['Check Item:'.cyan,'Status:'.cyan]; + break; + default: + break; + } + this.rows = []; + this.type = tableType; } -} \ No newline at end of file + push(row:string[]){ + this.rows.push(row); + } + print() { + var table = new BeautylogOsTable.cliTable({ + head: this.tableHead, + colWidths: [20, 20] + }); + for (var row in this.rows){ + if(this.rows[row][1] == "success"){ + this.rows[row][1] = ' '.bgGreen + ' ' + this.rows[row][1]; + } else if (this.rows[row][1] == "error") { + this.rows[row][1] = ' '.bgRed + ' ' + this.rows[row][1]; + } + table.push(this.rows[row]); + }; + console.log(table.toString()); + } +} diff --git a/ts/beautylog.os.js b/ts/beautylog.os.js index 049500c..b3ccbc5 100644 --- a/ts/beautylog.os.js +++ b/ts/beautylog.os.js @@ -4,12 +4,8 @@ var BeautylogOS; function init() { var colors = require("colors"); var clc = require("cli-color"); - var beautylogOS = {}; - /** - * object to append to all locally used params - * @type {{}} - */ - var localBl; + var beautylogOS = {}; //object to append to all public facing functions + var localBl; // object to append to all private params and functions localBl = {}; localBl.dirPrefix = clc.bgXterm(39).xterm(231).bold(' DIR ') + ' '; localBl.errorPrefix = ' Error: '.bgRed.white.bold + ' '; @@ -110,6 +106,7 @@ var BeautylogOS; beautylogOS.warn = function (logText) { return beautylogOS.log(logText, 'warn'); }; + beautylogOS.table = BeautylogOsTable.init(); return beautylogOS; } BeautylogOS.init = init; diff --git a/ts/beautylog.os.js.map b/ts/beautylog.os.js.map index 152bf12..db7c886 100644 --- a/ts/beautylog.os.js.map +++ b/ts/beautylog.os.js.map @@ -1 +1 @@ -{"version":3,"file":"beautylog.os.js","sourceRoot":"","sources":["beautylog.os.ts"],"names":["BeautylogOS","BeautylogOS.init"],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"beautylog.os.js","sourceRoot":"","sources":["beautylog.os.ts"],"names":["BeautylogOS","BeautylogOS.init"],"mappings":"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"} \ No newline at end of file diff --git a/ts/beautylog.os.table.js b/ts/beautylog.os.table.js index 7f4ff92..5882f1f 100644 --- a/ts/beautylog.os.table.js +++ b/ts/beautylog.os.table.js @@ -1 +1,15 @@ +/// +var BeautylogOsTable; +(function (BeautylogOsTable) { + function init() { + BeautylogOsTable.cliTable = require("cli-table2"); + var beautylogOsTable = {}; + beautylogOsTable.new = function (type) { + var newConsoleTable = new ConsoleTable(type); + return newConsoleTable; + }; + return beautylogOsTable; + } + BeautylogOsTable.init = init; +})(BeautylogOsTable || (BeautylogOsTable = {})); //# sourceMappingURL=beautylog.os.table.js.map \ No newline at end of file diff --git a/ts/beautylog.os.table.js.map b/ts/beautylog.os.table.js.map index af0e65f..0598313 100644 --- a/ts/beautylog.os.table.js.map +++ b/ts/beautylog.os.table.js.map @@ -1 +1 @@ -{"version":3,"file":"beautylog.os.table.js","sourceRoot":"","sources":["beautylog.os.table.ts"],"names":[],"mappings":"AAEC"} \ No newline at end of file +{"version":3,"file":"beautylog.os.table.js","sourceRoot":"","sources":["beautylog.os.table.ts"],"names":["BeautylogOsTable","BeautylogOsTable.init"],"mappings":"AAAA,mCAAmC;AACnC,IAAO,gBAAgB,CAYtB;AAZD,WAAO,gBAAgB,EAAC,CAAC;IAErBA;QACIC,yBAAQA,GAAIA,OAAOA,CAACA,YAAYA,CAACA,CAACA;QAClCA,IAAIA,gBAAgBA,GAAOA,EAAEA,CAACA;QAE9BA,gBAAgBA,CAACA,GAAGA,GAAGA,UAASA,IAAWA;YACvC,IAAI,eAAe,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;YAC7C,MAAM,CAAC,eAAe,CAAC;QAC3B,CAAC,CAACA;QACFA,MAAMA,CAACA,gBAAgBA,CAACA;IAC5BA,CAACA;IATeD,qBAAIA,OASnBA,CAAAA;AACLA,CAACA,EAZM,gBAAgB,KAAhB,gBAAgB,QAYtB"} \ No newline at end of file diff --git a/ts/beautylog.os.table.ts b/ts/beautylog.os.table.ts index e22163f..b5f1ce3 100644 --- a/ts/beautylog.os.table.ts +++ b/ts/beautylog.os.table.ts @@ -1,3 +1,14 @@ +/// module BeautylogOsTable { + export var cliTable; + export function init() { + cliTable = require("cli-table2"); + var beautylogOsTable:any = {}; + beautylogOsTable.new = function(type:string) { + var newConsoleTable = new ConsoleTable(type); + return newConsoleTable; + }; + return beautylogOsTable; + } } \ No newline at end of file diff --git a/ts/beautylog.os.ts b/ts/beautylog.os.ts index e03731b..d2539f2 100644 --- a/ts/beautylog.os.ts +++ b/ts/beautylog.os.ts @@ -4,12 +4,9 @@ module BeautylogOS { var colors = require("colors"); var clc = require("cli-color"); - var beautylogOS:any = {}; - /** - * object to append to all locally used params - * @type {{}} - */ - var localBl:any; + var beautylogOS:any = {}; //object to append to all public facing functions + var localBl:any; // object to append to all private params and functions + localBl = {}; localBl.dirPrefix = clc.bgXterm(39).xterm(231).bold(' DIR ') + ' '; localBl.errorPrefix = ' Error: '.bgRed.white.bold + ' '; @@ -119,6 +116,8 @@ module BeautylogOS { return beautylogOS.log(logText, 'warn'); }; + beautylogOS.table = BeautylogOsTable.init(); + return beautylogOS; } } \ No newline at end of file diff --git a/ts/index.js b/ts/index.js index d49f7f5..cc2e50e 100644 --- a/ts/index.js +++ b/ts/index.js @@ -1,6 +1,7 @@ /// /// /// +/// /// var beautylog = function (logPlatform) { if (logPlatform === void 0) { logPlatform = "os"; } diff --git a/ts/index.js.map b/ts/index.js.map index 7faeada..f703661 100644 --- a/ts/index.js.map +++ b/ts/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,2CAA2C;AAC3C,+CAA+C;AAC/C,0CAA0C;AAC1C,+CAA+C;AAE/C,IAAI,SAAS,GAAG,UAAS,WAAyB;IAAzB,2BAAyB,GAAzB,kBAAyB;IAC9C,MAAM,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;QAClB,KAAK,IAAI;YACL,IAAI,WAAW,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC;YACrC,MAAM,CAAC,WAAW,CAAC;YACnB,KAAK,CAAC;QACV,KAAK,SAAS;YACV,IAAI,gBAAgB,GAAG,gBAAgB,CAAC,IAAI,EAAE,CAAC;YAC/C,MAAM,CAAC,gBAAgB,CAAC;YACxB,KAAK,CAAC;QACV;YACI,OAAO,CAAC,GAAG,CAAC,0DAA0D,CAAC,CAAC;YACxE,KAAK,CAAC;IACd,CAAC;AACL,CAAC,CAAC;AACF,MAAM,CAAC,OAAO,GAAG,SAAS,CAAC"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,2CAA2C;AAC3C,+CAA+C;AAC/C,0CAA0C;AAC1C,gDAAgD;AAChD,+CAA+C;AAE/C,IAAI,SAAS,GAAG,UAAS,WAAyB;IAAzB,2BAAyB,GAAzB,kBAAyB;IAC9C,MAAM,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;QAClB,KAAK,IAAI;YACL,IAAI,WAAW,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC;YACrC,MAAM,CAAC,WAAW,CAAC;YACnB,KAAK,CAAC;QACV,KAAK,SAAS;YACV,IAAI,gBAAgB,GAAG,gBAAgB,CAAC,IAAI,EAAE,CAAC;YAC/C,MAAM,CAAC,gBAAgB,CAAC;YACxB,KAAK,CAAC;QACV;YACI,OAAO,CAAC,GAAG,CAAC,0DAA0D,CAAC,CAAC;YACxE,KAAK,CAAC;IACd,CAAC;AACL,CAAC,CAAC;AACF,MAAM,CAAC,OAAO,GAAG,SAAS,CAAC"} \ No newline at end of file diff --git a/ts/index.ts b/ts/index.ts index 57a6f40..1724b00 100644 --- a/ts/index.ts +++ b/ts/index.ts @@ -1,6 +1,7 @@ /// /// /// +/// /// var beautylog = function(logPlatform:string = "os") { diff --git a/ts/test.js b/ts/test.js index 28cee84..a6614b3 100644 --- a/ts/test.js +++ b/ts/test.js @@ -1,7 +1,7 @@ /// var beautyLogOs = require('./index.js')("os"); var beautyLogBrowser = require("./index.js")("browser"); -console.log('*** start test ***'); +console.log('*** start OS console test ***'); console.log(''); console.log('declarative function calls:'); beautyLogOs.log('beautylog.log(), with normal logText, without logType'); @@ -21,7 +21,15 @@ beautyLogOs.log('beautylog.log(), with normal logText, with logType "ok"', 'ok') beautyLogOs.log('beautylog.log(), with normal logText, with logType "success"', 'success'); beautyLogOs.log('beautylog.log(), with normal logText, with logType "warn"', 'warn'); console.log(''); -console.log('*** end test ***'); -console.log("start test of beautylog browser module (Might look weird in is console...)"); +console.log('*** end OS console test ***'); +console.log("*** start browser console test (Might look weird in OS console and travis log...) ***"); beautyLogBrowser.log("hello"); +console.log("*** end browser console test ***"); +console.log("*** start table test ***"); +var testTable = beautyLogOs.table.new("checks"); +testTable.push(['check1', 'success']); +testTable.push(['check2', 'error']); +testTable.push(['check3', 'error']); +testTable.print(); +console.log("*** end table test ***"); //# sourceMappingURL=test.js.map \ No newline at end of file diff --git a/ts/test.js.map b/ts/test.js.map index 5f957d1..f80a192 100644 --- a/ts/test.js.map +++ b/ts/test.js.map @@ -1 +1 @@ -{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":"AAAA,2CAA2C;AAC3C,IAAI,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC;AAC9C,IAAI,gBAAgB,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC,CAAC;AAExD,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;AAClC,OAAO,CAAC,GAAG,CAAE,EAAE,CAAC,CAAC;AAEjB,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;AAC3C,WAAW,CAAC,GAAG,CAAC,uDAAuD,CAAC,CAAC;AACzE,WAAW,CAAC,GAAG,CAAC,uDAAuD,CAAC,CAAC;AACzE,WAAW,CAAC,KAAK,CAAC,yDAAyD,CAAC,CAAC;AAC7E,WAAW,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;AAC1E,WAAW,CAAC,EAAE,CAAC,sDAAsD,CAAC,CAAC;AACvE,WAAW,CAAC,OAAO,CAAC,2DAA2D,CAAC,CAAC;AACjF,WAAW,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAC;AAE3E,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AAEhB,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAC/B,WAAW,CAAC,GAAG,CAAC,uDAAuD,CAAC,CAAC;AACzE,WAAW,CAAC,GAAG,CAAC,0DAA0D,EAAC,KAAK,CAAC,CAAC;AAClF,WAAW,CAAC,GAAG,CAAC,4DAA4D,EAAC,OAAO,CAAC,CAAC;AACtF,WAAW,CAAC,GAAG,CAAC,2DAA2D,EAAC,MAAM,CAAC,CAAC;AACpF,WAAW,CAAC,GAAG,CAAC,yDAAyD,EAAC,IAAI,CAAC,CAAC;AAChF,WAAW,CAAC,GAAG,CAAC,8DAA8D,EAAC,SAAS,CAAC,CAAC;AAC1F,WAAW,CAAC,GAAG,CAAC,2DAA2D,EAAC,MAAM,CAAC,CAAC;AAEpF,OAAO,CAAC,GAAG,CAAE,EAAE,CAAC,CAAC;AACjB,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;AAEhC,OAAO,CAAC,GAAG,CAAC,4EAA4E,CAAC,CAAC;AAC1F,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC"} \ No newline at end of file +{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":"AAAA,2CAA2C;AAC3C,IAAI,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC;AAC9C,IAAI,gBAAgB,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC,CAAC;AAExD,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;AAC7C,OAAO,CAAC,GAAG,CAAE,EAAE,CAAC,CAAC;AAEjB,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;AAC3C,WAAW,CAAC,GAAG,CAAC,uDAAuD,CAAC,CAAC;AACzE,WAAW,CAAC,GAAG,CAAC,uDAAuD,CAAC,CAAC;AACzE,WAAW,CAAC,KAAK,CAAC,yDAAyD,CAAC,CAAC;AAC7E,WAAW,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;AAC1E,WAAW,CAAC,EAAE,CAAC,sDAAsD,CAAC,CAAC;AACvE,WAAW,CAAC,OAAO,CAAC,2DAA2D,CAAC,CAAC;AACjF,WAAW,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAC;AAE3E,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AAEhB,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAC/B,WAAW,CAAC,GAAG,CAAC,uDAAuD,CAAC,CAAC;AACzE,WAAW,CAAC,GAAG,CAAC,0DAA0D,EAAC,KAAK,CAAC,CAAC;AAClF,WAAW,CAAC,GAAG,CAAC,4DAA4D,EAAC,OAAO,CAAC,CAAC;AACtF,WAAW,CAAC,GAAG,CAAC,2DAA2D,EAAC,MAAM,CAAC,CAAC;AACpF,WAAW,CAAC,GAAG,CAAC,yDAAyD,EAAC,IAAI,CAAC,CAAC;AAChF,WAAW,CAAC,GAAG,CAAC,8DAA8D,EAAC,SAAS,CAAC,CAAC;AAC1F,WAAW,CAAC,GAAG,CAAC,2DAA2D,EAAC,MAAM,CAAC,CAAC;AAEpF,OAAO,CAAC,GAAG,CAAE,EAAE,CAAC,CAAC;AACjB,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;AAE3C,OAAO,CAAC,GAAG,CAAC,uFAAuF,CAAC,CAAC;AACrG,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AAC9B,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;AAEhD,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;AACxC,IAAI,SAAS,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAChD,SAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAC,SAAS,CAAC,CAAC,CAAC;AACrC,SAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAC,OAAO,CAAC,CAAC,CAAC;AACnC,SAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAC,OAAO,CAAC,CAAC,CAAC;AACnC,SAAS,CAAC,KAAK,EAAE,CAAC;AAClB,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC"} \ No newline at end of file diff --git a/ts/test.ts b/ts/test.ts index 61b77df..798f40c 100644 --- a/ts/test.ts +++ b/ts/test.ts @@ -2,7 +2,7 @@ var beautyLogOs = require('./index.js')("os"); var beautyLogBrowser = require("./index.js")("browser"); -console.log('*** start test ***'); +console.log('*** start OS console test ***'); console.log (''); console.log('declarative function calls:'); @@ -26,7 +26,16 @@ beautyLogOs.log('beautylog.log(), with normal logText, with logType "success"',' beautyLogOs.log('beautylog.log(), with normal logText, with logType "warn"','warn'); console.log (''); -console.log('*** end test ***'); +console.log('*** end OS console test ***'); -console.log("start test of beautylog browser module (Might look weird in is console...)"); -beautyLogBrowser.log("hello"); \ No newline at end of file +console.log("*** start browser console test (Might look weird in OS console and travis log...) ***"); +beautyLogBrowser.log("hello"); +console.log("*** end browser console test ***"); + +console.log("*** start table test ***"); +var testTable = beautyLogOs.table.new("checks"); +testTable.push(['check1','success']); +testTable.push(['check2','error']); +testTable.push(['check3','error']); +testTable.print(); +console.log("*** end table test ***"); \ No newline at end of file