From e09c62dbc207fc6311d67ce286cee5c4fb0d4437 Mon Sep 17 00:00:00 2001
From: Wessel T <discord@go2it.eu>
Date: Wed, 8 May 2019 20:18:51 +0200
Subject: [PATCH] types

---
 __test__/main.js       |  2 +-
 lib/pikmin/bindings.js |  8 ++++----
 lib/pikmin/instance.js | 14 +++++++-------
 package.json           |  3 ++-
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/__test__/main.js b/__test__/main.js
index 7db2840..71821b6 100644
--- a/__test__/main.js
+++ b/__test__/main.js
@@ -9,7 +9,7 @@ const pikmin = new Pikmin.instance({
   ]
 });
 
-pikmin.addTransport(new Pikmin.ConsoleTransport({ process: process, name: 'error', format: `${Pikmin.colors.red('%l')}`, defaults: {} }));
+pikmin.addTransport(new Pikmin.ConsoleTransport({ process: process, name: 'error', format: `${Pikmin.colors.red('%l')} `, defaults: {} }));
 Pikmin.bind(pikmin, console);
 
 pikmin.info(Symbol.iterator);
diff --git a/lib/pikmin/bindings.js b/lib/pikmin/bindings.js
index 1761197..a8739c8 100644
--- a/lib/pikmin/bindings.js
+++ b/lib/pikmin/bindings.js
@@ -6,11 +6,11 @@ exports.bind = (logger, log = console, specific = false) => {
   if (log && !specific) log.pikmin = {};
   
   if (type(logger) === 2) {
-    if (!logger.name && !logger.transports && !logger.log) throw new PikminError('The logger you\'ve provided isn\'t valid');
+    if (!logger.name && !logger.transports && !logger.__log__) throw new PikminError('The logger you\'ve provided isn\'t valid');
 
     Pikmin.loggers.get(logger.name).__bound__ = log;
-    if (log && !specific) log.pikmin = Object.assign(log.pikmin, logger.log);
-    else if (specific) log = Object.assign(log, logger.log);
+    if (log && !specific) log.pikmin = Object.assign(log.pikmin, logger.__log__);
+    else if (specific) log = Object.assign(log, logger.__log__);
   } else {
     if (!Pikmin.loggers.has(logger)) throw new PikminError('The logger you\'ve provided isn\'t valid');
     
@@ -24,7 +24,7 @@ exports.bind = (logger, log = console, specific = false) => {
 
 exports.unbind = (logger, global = true) => {
   if (type(logger) === 2) {
-    if (!logger.name && !logger.transports && !logger.log) throw new PikminError('The logger you\'ve provided isn\'t valid');
+    if (!logger.name && !logger.transports && !logger.__log__) throw new PikminError('The logger you\'ve provided isn\'t valid');
 
     const log = Pikmin.loggers.get(logger.name);
     if (global && log.__bound__) {
diff --git a/lib/pikmin/instance.js b/lib/pikmin/instance.js
index 6096116..e9129b1 100644
--- a/lib/pikmin/instance.js
+++ b/lib/pikmin/instance.js
@@ -14,9 +14,9 @@ module.exports = class PikminInstance {
    * @returns {ThisType} The pikmin instance created
    */
   constructor(options = { autogen: false }) {
-    this.log = {};
+    this.__log__ = {};
     this.name = this._stringify(options.name || 'main');
-    this.baseFormat = this._stringify(options.format || '[%h:%m:%s] %l ->');
+    this.baseFormat = options.format !== null ? this._stringify(options.format || '[%h:%m:%s] %l -> ') : '';
     this.transports = [];
 
     if (type(this.name) !== 0) throw new PikminError(`"options.name" must be type of string but received type ${typeof this.name}`);
@@ -41,7 +41,7 @@ module.exports = class PikminInstance {
           this.transports.push(transport);
           if (transport.name) {
             this[transport.name] = (msg, options) => this._print(msg, Object.assign(transport.defaults, options), transport.name, transport.format || this.baseFormat);
-            this.log[transport.name] = (msg, options) => this._print(msg, Object.assign(transport.defaults, options), transport.name, transport.format || this.baseFormat);
+            this.__log__[transport.name] = (msg, options) => this._print(msg, Object.assign(transport.defaults, options), transport.name, transport.format || this.baseFormat);
           } else transport.permanent = true; 
         } catch(ex) {
           throw new PikminError(`Failed to write to transporter:\r\n${ex}`);
@@ -51,7 +51,7 @@ module.exports = class PikminInstance {
       throw new PikminError(ex);
     }
 
-    Pikmin.loggers.set(this.name, this.log);
+    Pikmin.loggers.set(this.name, this.__log__);
   }
 
   addTransport(transport, options = { autogen: false }) {
@@ -66,13 +66,13 @@ module.exports = class PikminInstance {
       this.transports.push(transport);
       if (transport.name) {
         this[transport.name] = (msg, opt) => this._print(msg, Object.assign(transport.defaults, opt), transport.name, transport.format || this.baseFormat,);
-        this.log[transport.name] = (msg, opt) => this._print(msg, Object.assign(transport.defaults, opt), transport.name, transport.format || this.baseFormat);
+        this.__log__[transport.name] = (msg, opt) => this._print(msg, Object.assign(transport.defaults, opt), transport.name, transport.format || this.baseFormat);
       } else transport.permanent = true; 
     } catch(ex) {
       throw new PikminError(`Failed to write to transporter:\r\n${ex}`);
     }
     
-    Pikmin.loggers.set(this.name, this.log);
+    Pikmin.loggers.set(this.name, this.__log__);
   }
 
   _print(msg, options = {}, lvl, starter = this.baseFormat) {
@@ -91,7 +91,7 @@ module.exports = class PikminInstance {
           if ([ 2, 5 ].some((v) => type(msg) === v)) m = inspect(msg, false, null, !c);
         }
 
-        v.append(options, `${this._format(starter, lvl, c)} ${m}`);
+        v.append(options, `${this._format(starter, lvl, c)}${m}`);
       });
   }
 
diff --git a/package.json b/package.json
index a8b88ce..9ff86b2 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,8 @@
   },
   "files": [
     "lib/",
-    "LICENSE"
+    "LICENSE",
+    "index.d.ts"
   ],
   "scripts": {
     "fix": "eslint --fix --quiet --color lib/*",