fixup!

Author: BridgeAR

lib/assert.js

@@ -27,7 +27,6 @@ const {
   ArrayPrototypePush,
   ArrayPrototypeSlice,
   Error,
-  ErrorPrototypeToString,
   NumberIsNaN,
   ObjectAssign,
   ObjectDefineProperty,
@@ -54,7 +53,7 @@ const {
   },
 } = require('internal/errors');
 const AssertionError = require('internal/assert/assertion_error');
-const { inspect, format } = require('internal/util/inspect');
+const { inspect } = require('internal/util/inspect');
 const {
   isPromise,
   isRegExp,
@@ -144,8 +143,6 @@ function Assert(options) {
 // they lose their `this` context and will use default behavior instead of the
 // instance's custom options.
 
-// See `internal/assert/utils.js` for MessageFactory/MessageTuple/InnerFailOptions typedefs
-
 /**
  * Throws an AssertionError with the given message.
  * @param {any | Error} [message]
@@ -186,7 +183,7 @@ assert.AssertionError = AssertionError;
  * @returns {void}
  */
 function assert(...args) {
-  innerOk(assert, args.length, ...args);
+  innerOk(assert, ...args);
 }
 
 /**
@@ -197,7 +194,7 @@ function assert(...args) {
  * @returns {void}
  */
 Assert.prototype.ok = function ok(...args) {
-  innerOk(ok, args.length, ...args);
+  innerOk(ok, ...args);
 };
 
 /**
@@ -882,7 +879,7 @@ Assert.prototype.doesNotMatch = function doesNotMatch(string, regexp, ...message
  * @returns {void}
  */
 function strict(...args) {
-  innerOk(strict, args.length, ...args);
+  innerOk(strict, ...args);
 }
 
 ArrayPrototypeForEach([

lib/internal/assert/utils.js

@@ -9,7 +9,10 @@ const {
 } = primordials;
 
 const {
-  codes: { ERR_AMBIGUOUS_ARGUMENT, ERR_INVALID_ARG_TYPE },
+  codes: {
+    ERR_AMBIGUOUS_ARGUMENT,
+    ERR_INVALID_ARG_TYPE,
+  },
   isErrorStackTraceLimitWritable,
 } = require('internal/errors');
 const AssertionError = require('internal/assert/assertion_error');
@@ -41,7 +44,6 @@ const escapeFn = (str) => meta[StringPrototypeCharCodeAt(str, 0)];
  * It is invoked only when the assertion fails.
  *
  * Other return values than a string are ignored.
- *
  * @callback MessageFactory
  * @param {any} actual
  * @param {any} expected
@@ -59,20 +61,19 @@ const escapeFn = (str) => meta[StringPrototypeCharCodeAt(str, 0)];
  *
  * Additional elements after [Error] or [MessageFactory] are rejected with ERR_AMBIGUOUS_ARGUMENT.
  * A first element that is neither string, Error nor function is rejected with ERR_INVALID_ARG_TYPE.
- *
  * @typedef {[] | [string] | [string, ...any[]] | [Error] | [MessageFactory]} MessageTuple
  */
 
 /**
  * Options consumed by innerFail to construct and throw the AssertionError.
  * @typedef {object} InnerFailOptions
- * @property {any} actual
- * @property {any} expected
- * @property {MessageTuple} message
- * @property {string} operator
- * @property {Function} stackStartFn
- * @property {'simple' | 'full'} [diff]
- * @property {boolean} [generatedMessage]
+ * @property {any} actual Actual value
+ * @property {any} expected Expected value
+ * @property {MessageTuple} message Message
+ * @property {string} operator Operator
+ * @property {Function} stackStartFn Stack start function
+ * @property {'simple' | 'full'} [diff] Diff mode
+ * @property {boolean} [generatedMessage] Generated message
  */
 
 function getErrMessage(fn) {
@@ -148,31 +149,25 @@ function innerFail(obj) {
 /**
  * Internal ok handler delegating to innerFail for message handling.
  * @param {Function} fn
- * @param {number} argLen
- * @param {any} value
- * @param {...any} message
+ * @param {...any} args
  */
-function innerOk(fn, argLen, value, ...message) {
-  if (!value) {
+function innerOk(fn, ...args) {
+  if (!args[0]) {
     let generatedMessage = false;
-    /** @type {any[]} */
     let messageArgs;
 
-    if (argLen === 0) {
+    if (args.length === 0) {
       generatedMessage = true;
       messageArgs = ['No value argument passed to `assert.ok()`'];
-    } else if (message.length === 0 || message[0] == null) {
+    } else if (args.length === 1 || args[1] == null) {
       generatedMessage = true;
       messageArgs = [getErrMessage(fn)];
-    } else if (typeof message[0] === 'string' || isError(message[0]) || typeof message[0] === 'function') {
-      messageArgs = message;
     } else {
-      // Accept any other type as custom message for assert.ok()
-      messageArgs = [String(message[0])];
+      messageArgs = args.slice(1);
     }
 
     innerFail({
-      actual: value,
+      actual: args[0],
       expected: true,
       message: messageArgs,
       operator: '==',

lib/internal/test_runner/test.js

@@ -333,7 +333,7 @@ class TestContext {
           if (plan !== null) {
             plan.count();
           }
-          innerOk(ok, args.length, ...args);
+          innerOk(ok, ...args);
         }
 
         assert.ok = ok;

test/parallel/test-assert.js

@@ -904,10 +904,9 @@ test('Additional asserts', () => {
   assert.throws(
     () => assert(false, Symbol('foo')),
     {
-      code: 'ERR_ASSERTION',
-      constructor: assert.AssertionError,
-      generatedMessage: false,
-      message: 'Symbol(foo)'
+      code: 'ERR_INVALID_ARG_TYPE',
+      constructor: TypeError,
+      message: /"message" argument.+Symbol\(foo\)/
     }
   );