[[CHORE]] Update some things to ES6

telefonicaid · May 6, 2017 · e8bd06e · e8bd06e
1 parent a2db9aa
commit e8bd06e
Show file tree

Hide file tree

Showing 5 changed files with 561 additions and 230 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -1,9 +1,10 @@
 {
   "env": {
-    "node": true
+    "node": true,
+    "es6": true
   },
   "rules": {
     "no-use-before-define": [2, "nofunc"], //latedef in jshint
     "quotes": [2, "single"]
   }
-}
+}
diff --git a/lib/formatters.js b/lib/formatters.js
@@ -92,10 +92,8 @@ function formatDevTrace(level, context, message, args, err) {
 
   if (isErrorLoggingWithoutMessage) {
     str += colorize(colors.gray, serializeErr(err).toString(printStack).substr(mainMessage.length));
-  } else {
-    if (err) {
-      str += '\n' + colorize(colors.gray, serializeErr(err).toString(printStack));
-    }
+  } else if (err) {
+    str += '\n' + colorize(colors.gray, serializeErr(err).toString(printStack));
   }
 
   var localContext = omit(context, formatDevTrace.omit);
@@ -116,9 +114,7 @@ formatDevTrace.omit = [];
 function colorize(color, str) {
   return str
       .split('\n')
-      .map(function(part) {
-        return color(part);
-      })
+      .map(part => color(part))
       .join('\n');
 }
 
@@ -194,17 +190,12 @@ function formatJsonTrace(level, context, message, args, err) {
 
 formatJsonTrace.stringify = stringify;
 formatJsonTrace.toObject = function toObject(level, context, message, args, err) {
-  var log = {},
-      printStack = API.stacktracesWith.indexOf(level) > -1;
-
-  for (var attrname in context) {
-    log[attrname] = context[attrname];
-  }
-
-  log.time = new Date();
-  log.lvl = level;
-  log.err = err && serializeErr(err).toObject(printStack);
-  log.msg = util.format.apply(global, [message].concat(args));
+  const printStack = API.stacktracesWith.indexOf(level) > -1;
 
-  return log;
+  return Object.assign({}, context, {
+    time: new Date().toISOString(),
+    lvl: level,
+    err: err && serializeErr(err).toObject(printStack),
+    msg: util.format(message, ...args)
+  });
 };
diff --git a/lib/logops.js b/lib/logops.js
@@ -64,7 +64,7 @@ function logWrap(level) {
     args = Array.prototype.slice.call(arguments, 2);
   } else {
     // log.<level>(fields, msg, ...)
-    context = merge(API.getContext(), arguments[1]);
+    context = Object.assign({}, API.getContext(), arguments[1]);
     message = arguments[2];
     args = Array.prototype.slice.call(arguments, 3);
   }
@@ -73,25 +73,6 @@ function logWrap(level) {
   API.stream.write(trace + '\n');
 }
 
-/**
- * Merges accesible properties in two objects.
- * obj2 takes precedence when common properties are found
- *
- * @param {Object} obj1
- * @param {Object} obj2
- * @returns {{}} The merged, new, object
- */
-function merge(obj1, obj2) {
-  var res = {}, attrname;
-  for (attrname in obj1) {
-    res[attrname] = obj1[attrname];
-  }
-  for (attrname in obj2) {
-    res[attrname] = obj2[attrname];
-  }
-  return res;
-}
-
 /**
  * Sets the enabled logging level.
  * All the disabled logging methods are replaced by a noop,

diff --git a/package.json b/package.json
@@ -33,15 +33,15 @@
     "chai": "^3.0.0",
     "conventional-changelog-cli": "^1.1.0",
     "coveralls": "^2.11.2",
-    "eslint": "^2.2.0",
+    "eslint": "^3.19.0",
     "istanbul": "^0.4.0",
     "jscs": "^3.0.3",
-    "mocha": "^2.2.5",
+    "mocha": "^3.3.0",
     "release-it": "^2.3.1",
-    "sinon": "^1.15.0",
+    "sinon": "^2.2.0",
     "sinon-chai": "^2.8.0",
-    "tslint": "^3.14.0",
-    "tslint-config-typings": "^0.2.3",
+    "tslint": "^5.2.0",
+    "tslint-config-typings": "^0.3.1",
     "typescript": "^2.0.3"
   },
   "keywords": [