diff --git a/dist/beautylog.classes.d.ts b/dist/beautylog.classes.d.ts deleted file mode 100644 index 283e56d..0000000 --- a/dist/beautylog.classes.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { Table } from "./beautylog.classes.table"; -import { Ora } from "./beautylog.classes.ora"; -export declare let table: (tableTypeArg: string, tableHeadArrayArg?: string[]) => Table; -export declare let ora: (textArg: string, colorArg: string, startArg?: boolean) => Ora; diff --git a/dist/beautylog.classes.js b/dist/beautylog.classes.js deleted file mode 100644 index b4527f0..0000000 --- a/dist/beautylog.classes.js +++ /dev/null @@ -1,12 +0,0 @@ -/// -"use strict"; -var beautylog_classes_table_1 = require("./beautylog.classes.table"); -var beautylog_classes_ora_1 = require("./beautylog.classes.ora"); -exports.table = function (tableTypeArg, tableHeadArrayArg) { - return new beautylog_classes_table_1.Table(tableTypeArg, tableHeadArrayArg); -}; -exports.ora = function (textArg, colorArg, startArg) { - return new beautylog_classes_ora_1.Ora(textArg, colorArg, startArg); -}; - -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImJlYXV0eWxvZy5jbGFzc2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDRDQUE0Qzs7QUFFNUMsd0NBQW9CLDJCQUEyQixDQUFDLENBQUE7QUFDaEQsc0NBQWtCLHlCQUF5QixDQUFDLENBQUE7QUFFakMsYUFBSyxHQUFHLFVBQVMsWUFBbUIsRUFBQyxpQkFBMkI7SUFDdkUsTUFBTSxDQUFDLElBQUksK0JBQUssQ0FBQyxZQUFZLEVBQUMsaUJBQWlCLENBQUMsQ0FBQztBQUNyRCxDQUFDLENBQUE7QUFFVSxXQUFHLEdBQUcsVUFBUyxPQUFjLEVBQUMsUUFBZSxFQUFDLFFBQWlCO0lBQ3RFLE1BQU0sQ0FBQyxJQUFJLDJCQUFHLENBQUMsT0FBTyxFQUFDLFFBQVEsRUFBQyxRQUFRLENBQUMsQ0FBQztBQUM5QyxDQUFDLENBQUEiLCJmaWxlIjoiYmVhdXR5bG9nLmNsYXNzZXMuanMiLCJzb3VyY2VzQ29udGVudCI6WyIvLy8gPHJlZmVyZW5jZSBwYXRoPVwiLi90eXBpbmdzL21haW4uZC50c1wiIC8+XHJcblxyXG5pbXBvcnQge1RhYmxlfSBmcm9tIFwiLi9iZWF1dHlsb2cuY2xhc3Nlcy50YWJsZVwiO1xyXG5pbXBvcnQge09yYX0gZnJvbSBcIi4vYmVhdXR5bG9nLmNsYXNzZXMub3JhXCI7XHJcblxyXG5leHBvcnQgbGV0IHRhYmxlID0gZnVuY3Rpb24odGFibGVUeXBlQXJnOnN0cmluZyx0YWJsZUhlYWRBcnJheUFyZz86c3RyaW5nW10pe1xyXG4gICAgcmV0dXJuIG5ldyBUYWJsZSh0YWJsZVR5cGVBcmcsdGFibGVIZWFkQXJyYXlBcmcpO1xyXG59XHJcblxyXG5leHBvcnQgbGV0IG9yYSA9IGZ1bmN0aW9uKHRleHRBcmc6c3RyaW5nLGNvbG9yQXJnOnN0cmluZyxzdGFydEFyZz86Ym9vbGVhbil7XHJcbiAgICByZXR1cm4gbmV3IE9yYSh0ZXh0QXJnLGNvbG9yQXJnLHN0YXJ0QXJnKTtcclxufSJdfQ== diff --git a/dist/index.d.ts b/dist/index.d.ts index 9d1f082..1159ff9 100644 --- a/dist/index.d.ts +++ b/dist/index.d.ts @@ -1,5 +1,5 @@ -import { Ora } from "./beautylog.classes.ora"; -import { Table } from "./beautylog.classes.table"; +export { Table } from "./beautylog.classes.table"; +export { Ora } from "./beautylog.classes.ora"; export declare let dir: (logText: any) => void; export declare let error: (logText: any) => void; export declare let figlet: (textArg: string, optionsArg?: any) => any; @@ -7,7 +7,5 @@ export declare let figletSync: (textArg: string, optionsArg?: any) => boolean; export declare let info: (logText: any) => void; export declare let log: (logText?: string, logType?: string) => void; export declare let ok: (logText: any) => void; -export declare let ora: (textArg: string, colorArg: string, startArg?: boolean) => Ora; export declare let success: (logText: any) => void; -export declare let table: (tableTypeArg: string, tableHeadArrayArg?: string[]) => Table; export declare let warn: (logText: any) => void; diff --git a/dist/index.js b/dist/index.js index 6707eb0..83b0a50 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1,8 +1,11 @@ /// "use strict"; -var classes = require("./beautylog.classes"); var BeautylogLog = require("./beautylog.log"); var BeautylogFiglet = require("./beautylog.figlet"); +var beautylog_classes_table_1 = require("./beautylog.classes.table"); +exports.Table = beautylog_classes_table_1.Table; +var beautylog_classes_ora_1 = require("./beautylog.classes.ora"); +exports.Ora = beautylog_classes_ora_1.Ora; exports.dir = BeautylogLog.dir; exports.error = BeautylogLog.error; exports.figlet = BeautylogFiglet.figlet; @@ -10,9 +13,7 @@ exports.figletSync = BeautylogFiglet.figletSync; exports.info = BeautylogLog.info; exports.log = BeautylogLog.log; exports.ok = BeautylogLog.ok; -exports.ora = classes.ora; exports.success = BeautylogLog.success; -exports.table = classes.table; exports.warn = BeautylogLog.warn; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDRDQUE0Qzs7QUFHNUMsSUFBWSxPQUFPLFdBQU0scUJBQXFCLENBQUMsQ0FBQTtBQUMvQyxJQUFZLFlBQVksV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBQ2hELElBQVksZUFBZSxXQUFNLG9CQUVqQyxDQUFDLENBRm9EO0FBSzFDLFdBQUcsR0FBSSxZQUFZLENBQUMsR0FBRyxDQUFDO0FBQ3hCLGFBQUssR0FBSSxZQUFZLENBQUMsS0FBSyxDQUFDO0FBQzVCLGNBQU0sR0FBSSxlQUFlLENBQUMsTUFBTSxDQUFDO0FBQ2pDLGtCQUFVLEdBQUksZUFBZSxDQUFDLFVBQVUsQ0FBQztBQUN6QyxZQUFJLEdBQUksWUFBWSxDQUFDLElBQUksQ0FBQztBQUMxQixXQUFHLEdBQUksWUFBWSxDQUFDLEdBQUcsQ0FBQztBQUN4QixVQUFFLEdBQUksWUFBWSxDQUFDLEVBQUUsQ0FBQztBQUN0QixXQUFHLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQztBQUNsQixlQUFPLEdBQUksWUFBWSxDQUFDLE9BQU8sQ0FBQztBQUNoQyxhQUFLLEdBQUksT0FBTyxDQUFDLEtBQUssQ0FBQztBQUN2QixZQUFJLEdBQUksWUFBWSxDQUFDLElBQUksQ0FBQyIsImZpbGUiOiJpbmRleC5qcyIsInNvdXJjZXNDb250ZW50IjpbIi8vLyA8cmVmZXJlbmNlIHBhdGg9XCIuL3R5cGluZ3MvbWFpbi5kLnRzXCIgLz5cclxuXHJcbmltcG9ydCAqIGFzIHBsdWdpbnMgZnJvbSBcIi4vYmVhdXR5bG9nLnBsdWdpbnNcIjtcclxuaW1wb3J0ICogYXMgY2xhc3NlcyBmcm9tIFwiLi9iZWF1dHlsb2cuY2xhc3Nlc1wiO1xyXG5pbXBvcnQgKiBhcyBCZWF1dHlsb2dMb2cgZnJvbSBcIi4vYmVhdXR5bG9nLmxvZ1wiO1xyXG5pbXBvcnQgKiBhcyBCZWF1dHlsb2dGaWdsZXQgZnJvbSBcIi4vYmVhdXR5bG9nLmZpZ2xldFwiXHJcblxyXG5pbXBvcnQge09yYX0gZnJvbSBcIi4vYmVhdXR5bG9nLmNsYXNzZXMub3JhXCI7XHJcbmltcG9ydCB7VGFibGV9IGZyb20gXCIuL2JlYXV0eWxvZy5jbGFzc2VzLnRhYmxlXCI7XHJcblxyXG5leHBvcnQgbGV0IGRpciA9ICBCZWF1dHlsb2dMb2cuZGlyO1xyXG5leHBvcnQgbGV0IGVycm9yID0gIEJlYXV0eWxvZ0xvZy5lcnJvcjtcclxuZXhwb3J0IGxldCBmaWdsZXQgPSAgQmVhdXR5bG9nRmlnbGV0LmZpZ2xldDtcclxuZXhwb3J0IGxldCBmaWdsZXRTeW5jID0gIEJlYXV0eWxvZ0ZpZ2xldC5maWdsZXRTeW5jO1xyXG5leHBvcnQgbGV0IGluZm8gPSAgQmVhdXR5bG9nTG9nLmluZm87XHJcbmV4cG9ydCBsZXQgbG9nID0gIEJlYXV0eWxvZ0xvZy5sb2c7XHJcbmV4cG9ydCBsZXQgb2sgPSAgQmVhdXR5bG9nTG9nLm9rO1xyXG5leHBvcnQgbGV0IG9yYSA9IGNsYXNzZXMub3JhO1xyXG5leHBvcnQgbGV0IHN1Y2Nlc3MgPSAgQmVhdXR5bG9nTG9nLnN1Y2Nlc3M7XHJcbmV4cG9ydCBsZXQgdGFibGUgPSAgY2xhc3Nlcy50YWJsZTtcclxuZXhwb3J0IGxldCB3YXJuID0gIEJlYXV0eWxvZ0xvZy53YXJuO1xyXG4iXX0= +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDRDQUE0Qzs7QUFHNUMsSUFBWSxZQUFZLFdBQU0saUJBQWlCLENBQUMsQ0FBQTtBQUNoRCxJQUFZLGVBQWUsV0FBTSxvQkFFakMsQ0FBQyxDQUZvRDtBQUVyRCx3Q0FBb0IsMkJBQTJCLENBQUM7QUFBeEMsZ0RBQXdDO0FBQ2hELHNDQUFrQix5QkFBeUIsQ0FBQztBQUFwQywwQ0FBb0M7QUFFakMsV0FBRyxHQUFJLFlBQVksQ0FBQyxHQUFHLENBQUM7QUFDeEIsYUFBSyxHQUFJLFlBQVksQ0FBQyxLQUFLLENBQUM7QUFDNUIsY0FBTSxHQUFJLGVBQWUsQ0FBQyxNQUFNLENBQUM7QUFDakMsa0JBQVUsR0FBSSxlQUFlLENBQUMsVUFBVSxDQUFDO0FBQ3pDLFlBQUksR0FBSSxZQUFZLENBQUMsSUFBSSxDQUFDO0FBQzFCLFdBQUcsR0FBSSxZQUFZLENBQUMsR0FBRyxDQUFDO0FBQ3hCLFVBQUUsR0FBSSxZQUFZLENBQUMsRUFBRSxDQUFDO0FBQ3RCLGVBQU8sR0FBSSxZQUFZLENBQUMsT0FBTyxDQUFDO0FBQ2hDLFlBQUksR0FBSSxZQUFZLENBQUMsSUFBSSxDQUFDIiwiZmlsZSI6ImluZGV4LmpzIiwic291cmNlc0NvbnRlbnQiOlsiLy8vIDxyZWZlcmVuY2UgcGF0aD1cIi4vdHlwaW5ncy9tYWluLmQudHNcIiAvPlxyXG5cclxuaW1wb3J0ICogYXMgcGx1Z2lucyBmcm9tIFwiLi9iZWF1dHlsb2cucGx1Z2luc1wiO1xyXG5pbXBvcnQgKiBhcyBCZWF1dHlsb2dMb2cgZnJvbSBcIi4vYmVhdXR5bG9nLmxvZ1wiO1xyXG5pbXBvcnQgKiBhcyBCZWF1dHlsb2dGaWdsZXQgZnJvbSBcIi4vYmVhdXR5bG9nLmZpZ2xldFwiXHJcblxyXG5leHBvcnQge1RhYmxlfSBmcm9tIFwiLi9iZWF1dHlsb2cuY2xhc3Nlcy50YWJsZVwiO1xyXG5leHBvcnQge09yYX0gZnJvbSBcIi4vYmVhdXR5bG9nLmNsYXNzZXMub3JhXCI7XHJcblxyXG5leHBvcnQgbGV0IGRpciA9ICBCZWF1dHlsb2dMb2cuZGlyO1xyXG5leHBvcnQgbGV0IGVycm9yID0gIEJlYXV0eWxvZ0xvZy5lcnJvcjtcclxuZXhwb3J0IGxldCBmaWdsZXQgPSAgQmVhdXR5bG9nRmlnbGV0LmZpZ2xldDtcclxuZXhwb3J0IGxldCBmaWdsZXRTeW5jID0gIEJlYXV0eWxvZ0ZpZ2xldC5maWdsZXRTeW5jO1xyXG5leHBvcnQgbGV0IGluZm8gPSAgQmVhdXR5bG9nTG9nLmluZm87XHJcbmV4cG9ydCBsZXQgbG9nID0gIEJlYXV0eWxvZ0xvZy5sb2c7XHJcbmV4cG9ydCBsZXQgb2sgPSAgQmVhdXR5bG9nTG9nLm9rO1xyXG5leHBvcnQgbGV0IHN1Y2Nlc3MgPSAgQmVhdXR5bG9nTG9nLnN1Y2Nlc3M7XHJcbmV4cG9ydCBsZXQgd2FybiA9ICBCZWF1dHlsb2dMb2cud2FybjtcclxuIl19 diff --git a/test/test.js b/test/test.js index d2603e4..8c139f2 100644 --- a/test/test.js +++ b/test/test.js @@ -49,7 +49,7 @@ describe("beautylog", function () { describe(".ora(text,color)", function () { it("should display, update, and end a message", function (done) { this.timeout(10000); - var testOra = beautylog.ora("This is a test text", "green", true); + var testOra = new beautylog.Ora("This is a test text", "green", true); setTimeout(function () { testOra.text("updated text!"); testOra.log("an intermediate log message", "info"); @@ -61,7 +61,7 @@ describe("beautylog", function () { }); it("should display an error message when ended with error", function (done) { this.timeout(10000); - var testOra = beautylog.ora("This is another test text", "green"); + var testOra = new beautylog.Ora("This is another test text", "green"); setTimeout(function () { testOra.endError("Allright, ora displays an error!"); done(); @@ -78,15 +78,15 @@ describe("beautylog", function () { beautylog.warn('beautylog.warn(), with normal logText, without logType'); }); }); - describe(".table", function () { + describe(".Table", function () { it("should print a nice table", function () { (function () { - var testTable1 = beautylog.table("checks"); + var testTable1 = new beautylog.Table("checks"); testTable1.push(['check1', 'success']); testTable1.push(['check2', 'error']); testTable1.push(['check3', 'error']); testTable1.print(); - var testTable2 = beautylog.table("custom", ["Column1".red, "Column2".blue, "Column3".cyan]); + var testTable2 = new beautylog.Table("custom", ["Column1".red, "Column2".blue, "Column3".cyan]); testTable2.push(["Hey", "this", "works"]); testTable2.print(); })(); @@ -94,4 +94,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 = 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 = 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 = 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 = 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                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 0a98146..a5971b2 100644 --- a/test/test.ts +++ b/test/test.ts @@ -49,7 +49,7 @@ describe("beautylog",function(){ describe(".ora(text,color)",function(){ it("should display, update, and end a message",function(done){ this.timeout(10000); - let testOra = beautylog.ora("This is a test text","green",true); + let testOra = new beautylog.Ora("This is a test text","green",true); setTimeout(function(){ testOra.text("updated text!"); testOra.log("an intermediate log message","info"); @@ -61,7 +61,7 @@ describe("beautylog",function(){ }); it("should display an error message when ended with error",function(done){ this.timeout(10000); - let testOra = beautylog.ora("This is another test text","green"); + let testOra = new beautylog.Ora("This is another test text","green"); setTimeout(function(){ testOra.endError("Allright, ora displays an error!"); done(); @@ -78,16 +78,16 @@ describe("beautylog",function(){ beautylog.warn('beautylog.warn(), with normal logText, without logType'); }); }); - describe(".table",function(){ + describe(".Table",function(){ it("should print a nice table",function(){ (function(){ - var testTable1 = beautylog.table("checks"); + var testTable1 = new beautylog.Table("checks"); testTable1.push(['check1','success']); testTable1.push(['check2','error']); testTable1.push(['check3','error']); testTable1.print(); - var testTable2 = beautylog.table("custom",["Column1".red,"Column2".blue,"Column3".cyan]); + var testTable2 = new beautylog.Table("custom",["Column1".red,"Column2".blue,"Column3".cyan]); testTable2.push(["Hey","this","works"]); testTable2.print(); })(); diff --git a/ts/beautylog.classes.ts b/ts/beautylog.classes.ts deleted file mode 100644 index f54059b..0000000 --- a/ts/beautylog.classes.ts +++ /dev/null @@ -1,12 +0,0 @@ -/// - -import {Table} from "./beautylog.classes.table"; -import {Ora} from "./beautylog.classes.ora"; - -export let table = function(tableTypeArg:string,tableHeadArrayArg?:string[]){ - return new Table(tableTypeArg,tableHeadArrayArg); -} - -export let ora = function(textArg:string,colorArg:string,startArg?:boolean){ - return new Ora(textArg,colorArg,startArg); -} \ No newline at end of file diff --git a/ts/index.ts b/ts/index.ts index d3317ad..b76da57 100644 --- a/ts/index.ts +++ b/ts/index.ts @@ -1,12 +1,11 @@ /// import * as plugins from "./beautylog.plugins"; -import * as classes from "./beautylog.classes"; import * as BeautylogLog from "./beautylog.log"; import * as BeautylogFiglet from "./beautylog.figlet" -import {Ora} from "./beautylog.classes.ora"; -import {Table} from "./beautylog.classes.table"; +export {Table} from "./beautylog.classes.table"; +export {Ora} from "./beautylog.classes.ora"; export let dir = BeautylogLog.dir; export let error = BeautylogLog.error; @@ -15,7 +14,5 @@ export let figletSync = BeautylogFiglet.figletSync; export let info = BeautylogLog.info; export let log = BeautylogLog.log; export let ok = BeautylogLog.ok; -export let ora = classes.ora; export let success = BeautylogLog.success; -export let table = classes.table; export let warn = BeautylogLog.warn;