assert: better enforce and range calls.

Author: chjj

lib/assert.js

@@ -152,7 +152,7 @@ function throws(func, expected, message) {
   let thrown = false;
   let err = null;
 
-  enforce(typeof func === 'function', 'func', 'function', throws);
+  enforce(typeof func === 'function', 'func', 'function');
 
   try {
     func();
@@ -192,7 +192,7 @@ function doesNotThrow(func, expected, message) {
   let thrown = false;
   let err = null;
 
-  enforce(typeof func === 'function', 'func', 'function', doesNotThrow);
+  enforce(typeof func === 'function', 'func', 'function');
 
   try {
     func();
@@ -235,7 +235,7 @@ async function rejects(func, expected, message) {
   let err = null;
 
   if (typeof func !== 'function')
-    enforce(isPromise(func), 'func', 'promise', rejects);
+    enforce(isPromise(func), 'func', 'promise');
 
   try {
     if (isPromise(func))
@@ -279,7 +279,7 @@ async function doesNotReject(func, expected, message) {
   let err = null;
 
   if (typeof func !== 'function')
-    enforce(isPromise(func), 'func', 'promise', doesNotReject);
+    enforce(isPromise(func), 'func', 'promise');
 
   try {
     if (isPromise(func))
@@ -380,8 +380,8 @@ function bufferEqual(actual, expected, enc, message) {
 
   expected = bufferize(actual, expected, enc);
 
-  enforce(isBuffer(actual), 'actual', 'buffer', bufferEqual);
-  enforce(isBuffer(expected), 'expected', 'buffer', bufferEqual);
+  enforce(isBuffer(actual), 'actual', 'buffer');
+  enforce(isBuffer(expected), 'expected', 'buffer');
 
   if (actual !== expected && !actual.equals(expected)) {
     if (isError(message))
@@ -408,8 +408,8 @@ function notBufferEqual(actual, expected, enc, message) {
 
   expected = bufferize(actual, expected, enc);
 
-  enforce(isBuffer(actual), 'actual', 'buffer', notBufferEqual);
-  enforce(isBuffer(expected), 'expected', 'buffer', notBufferEqual);
+  enforce(isBuffer(actual), 'actual', 'buffer');
+  enforce(isBuffer(expected), 'expected', 'buffer');
 
   if (actual === expected || actual.equals(expected)) {
     if (isError(message))
@@ -425,20 +425,39 @@ function notBufferEqual(actual, expected, enc, message) {
   }
 }
 
-function enforce(value, name, type, func) {
+function enforce(value, name, type) {
   if (!value) {
-    const err = new TypeError(`"${name}" must be a(n) ${type}.`);
+    let msg;
+
+    if (name == null) {
+      msg = 'Invalid type for parameter.';
+    } else {
+      if (type == null)
+        msg = `Invalid type for "${name}".`;
+      else
+        msg = `"${name}" must be a(n) ${type}.`;
+    }
+
+    const err = new TypeError(msg);
+
     if (Error.captureStackTrace)
-      Error.captureStackTrace(err, func || enforce);
+      Error.captureStackTrace(err, enforce);
+
     throw err;
   }
 }
 
-function range(value, name, func) {
+function range(value, name) {
   if (!value) {
-    const err = new RangeError(`"${name}" is out of range.`);
+    const msg = name != null
+      ? `"${name}" is out of range.`
+      : 'Parameter is out of range.';
+
+    const err = new RangeError(msg);
+
     if (Error.captureStackTrace)
-      Error.captureStackTrace(err, func || range);
+      Error.captureStackTrace(err, range);
+
     throw err;
   }
 }