src: internal/messages.js code cleanup

jasnell · Jan 7, 2016 · Jan 8, 2016 · Jan 8, 2016 · Jan 8, 2016 · Jan 8, 2016
commit 42b7c7f17ad4570b0054211b8c104e29552461d6
diff --git a/lib/internal/messages.js b/lib/internal/messages.js
@@ -62,11 +62,7 @@ function replacement(msg, values) {
   return msg;
 }
 
-function template(message, args, id) {
-  return `${replacement(message, args)} (${id})`;
-}
-
-// I18N(key[, ... args])
+// I18N(key[, ...args])
 // Returns: string
 function message() {
   const key = arguments[0];
@@ -95,7 +91,7 @@ class MTypeError extends TypeError {
     const args = [];
     for (let n = 1; n < arguments.length; n++)
       args.push(arguments[n]);
-    super(template(msg(key), args, _id));
+    super(`${replacement(msg(key), args)} (${_id})`);
     Error.captureStackTrace(this, MTypeError);
     this.key = _id;
     this.args = args;
@@ -108,7 +104,7 @@ class MRangeError extends RangeError {
     const args = [];
     for (let n = 1; n < arguments.length; n++)
       args.push(arguments[n]);
-    super(template(msg(key), args, _id));
+    super(`${replacement(msg(key), args)} (${_id})`);
     Error.captureStackTrace(this, MRangeError);
     this.key = _id;
     this.args = args;
@@ -121,7 +117,7 @@ class MError extends Error {
     const args = [];
     for (let n = 1; n < arguments.length; n++)
       args.push(arguments[n]);
-    super(template(msg(key), args, _id));
+    super(`${replacement(msg(key), args)} (${_id})`);
     Error.captureStackTrace(this, MError);
     this.key = _id;
     this.args = args;
@@ -144,7 +140,7 @@ message.log = function() {
   const args = [];
   for (let n = 1; n < arguments.length; n++)
     args.push(arguments[n]);
-  console.log(template(msg(key), args, id(key)));
+  console.log(`${replacement(msg(key), args)} (${id(key)})`);
 };
 
 // I18N.error(key[, ... args])
@@ -154,18 +150,25 @@ message.error = function() {
   const args = [];
   for (let n = 1; n < arguments.length; n++)
     args.push(arguments[n]);
-  console.error(template(msg(key), args, id(key)));
+  console.error(`${replacement(msg(key), args)} (${id(key)})`);
 };
 
+// this is an externalized string aware version of util.debuglog that
+// ensures that the string resolution and expansion only happens if
+// debug is enabled.
 const debugs = {};
 const debugEnviron = process.env.NODE_DEBUG || '';
 message.debuglog = function(set) {
   set = set.toUpperCase();
   if (!debugs[set]) {
     if (new RegExp(`\\b${set}\\b`, 'i').test(debugEnviron)) {
       var pid = process.pid;
-      debugs[set] = function(key, ...args) {
-        console.error(`${set} ${pid}: ${template(msg(key), args, id(key))}`);
+      debugs[set] = function() {
+        const key = arguments[0];
+        const args = [];
+        for (let n = 1; n < arguments.length; n++)
+          args.push(arguments[n]);
+        console.error(`${set} ${pid}: ${replacement(msg(key), args)}`);
       };
     } else {
       debugs[set] = function() {};