util: move .decorateErrorStack to internal/util

Move the method that was added in commit 8ca412b from earlier this month
from lib/util.js to lib/internal/util.js.
Avoids exposing a method that we may not wish to expose just yet, seeing
how it relies on implementation details.
PR-URL: #4026
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>

Author: bnoordhuis

lib/internal/util.js

@@ -57,3 +57,21 @@ exports._deprecate = function(fn, msg) {
 
 returndeprecated;
 };
+
+exports.decorateErrorStack=functiondecorateErrorStack(err){
+if(!(exports.isError(err)&&err.stack))
+return;
+
+constarrow=exports.getHiddenValue(err,'arrowMessage');
+
+if(arrow)
+err.stack=arrow+err.stack;
+};
+
+exports.isError=functionisError(e){
+returnexports.objectToString(e)==='[object Error]'||einstanceofError;
+};
+
+exports.objectToString=functionobjectToString(o){
+returnObject.prototype.toString.call(o);
+};

lib/repl.js

@@ -22,6 +22,7 @@
 'use strict';
 
 constinternalModule=require('internal/module');
+constinternalUtil=require('internal/util');
 constutil=require('util');
 constinherits=util.inherits;
 constStream=require('stream');
@@ -276,7 +277,7 @@ function REPLServer(prompt,
 self._domain.on('error',function(e){
 debug('domain error');
 consttop=replMap.get(self);
-util.decorateErrorStack(e);
+internalUtil.decorateErrorStack(e);
 top.outputStream.write((e.stack||e)+'\n');
 top.lineParser.reset();
 top.bufferedCommand='';

lib/util.js

@@ -5,6 +5,9 @@ const Buffer = require('buffer').Buffer;
 constinternalUtil=require('internal/util');
 constbinding=process.binding('util');
 
+constisError=internalUtil.isError;
+constobjectToString=internalUtil.objectToString;
+
 varDebug;
 
 constformatRegExp=/%[sdj%]/g;
@@ -680,9 +683,6 @@ function isDate(d) {
 }
 exports.isDate=isDate;
 
-functionisError(e){
-returnobjectToString(e)==='[object Error]'||einstanceofError;
-}
 exports.isError=isError;
 
 functionisFunction(arg){
@@ -698,10 +698,6 @@ exports.isPrimitive = isPrimitive;
 
 exports.isBuffer=Buffer.isBuffer;
 
-functionobjectToString(o){
-returnObject.prototype.toString.call(o);
-}
-
 
 functionpad(n){
 returnn<10 ? '0'+n.toString(10) : n.toString(10);
@@ -883,14 +879,3 @@ exports._exceptionWithHostPort = function(err,
 }
 returnex;
 };
-
-
-exports.decorateErrorStack=function(err){
-if(!(isError(err)&&err.stack))
-return;
-
-constarrow=internalUtil.getHiddenValue(err,'arrowMessage');
-
-if(arrow)
-err.stack=arrow+err.stack;
-};

test/parallel/test-util-decorate-error-stack.js

@@ -1,18 +1,19 @@
+// Flags: --expose_internals
 'use strict';
 constcommon=require('../common');
 constassert=require('assert');
-constutil=require('util');
+constinternalUtil=require('internal/util');
 
 assert.doesNotThrow(function(){
-util.decorateErrorStack();
-util.decorateErrorStack(null);
-util.decorateErrorStack(1);
-util.decorateErrorStack(true);
+internalUtil.decorateErrorStack();
+internalUtil.decorateErrorStack(null);
+internalUtil.decorateErrorStack(1);
+internalUtil.decorateErrorStack(true);
 });
 
 // Verify that a stack property is not added to non-Errors
 constobj={};
-util.decorateErrorStack(obj);
+internalUtil.decorateErrorStack(obj);
 assert.strictEqual(obj.stack,undefined);
 
 // Verify that the stack is decorated when possible
@@ -23,13 +24,13 @@ try {
 }catch(e){
 err=e;
 assert(!/varfoobar;/.test(err.stack));
-util.decorateErrorStack(err);
+internalUtil.decorateErrorStack(err);
 }
 
 assert(/varfoobar;/.test(err.stack));
 
 // Verify that the stack is unchanged when there is no arrow message
 err=newError('foo');
 constoriginalStack=err.stack;
-util.decorateErrorStack(err);
+internalUtil.decorateErrorStack(err);
 assert.strictEqual(originalStack,err.stack);