From 873e2f270fa67c701d59bc99f0f815f1f69b2316 Mon Sep 17 00:00:00 2001 From: James M Snell Date: Sat, 10 Jun 2017 20:31:51 -0700 Subject: [PATCH] errors: add missing ERR_ prefix on util.callbackify error The `FALSY_VALUE_REJECTION` error code added by https://github.com/nodejs/node/pull/12712 did not have the `ERR_` prefix, nor was it added to the errors.md documentation. Add the prefix in for consistency. PR-URL: https://github.com/nodejs/node/pull/13604 Reviewed-By: Luigi Pinca Reviewed-By: Timothy Gu Reviewed-By: Gibson Fahnestock Reviewed-By: Anna Henningsen Reviewed-By: Refael Ackermann Reviewed-By: Colin Ihrig Reviewed-By: Benjamin Gruenbaum --- doc/api/errors.md | 6 ++++++ lib/internal/errors.js | 2 +- lib/util.js | 2 +- test/parallel/test-util-callbackify.js | 6 +++--- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/doc/api/errors.md b/doc/api/errors.md index c72f6589892ba0..46b60eb76c1f26 100644 --- a/doc/api/errors.md +++ b/doc/api/errors.md @@ -576,6 +576,12 @@ The `ERR_CONSOLE_WRITABLE_STREAM` error code is thrown when `Console` is instantiated without `stdout` stream or when `stdout` or `stderr` streams are not writable. + +### ERR_FALSY_VALUE_REJECTION + +The `ERR_FALSY_VALUE_REJECTION` error code is used by the `util.callbackify()` +API when a callbackified `Promise` is rejected with a falsy value (e.g. `null`). + ### ERR_INDEX_OUT_OF_RANGE diff --git a/lib/internal/errors.js b/lib/internal/errors.js index 957262f008fefa..c700d3d7d54699 100644 --- a/lib/internal/errors.js +++ b/lib/internal/errors.js @@ -115,6 +115,7 @@ E('ERR_ASSERTION', (msg) => msg); E('ERR_CONSOLE_WRITABLE_STREAM', (name) => `Console expects a writable stream instance for ${name}`); E('ERR_CPU_USAGE', (errMsg) => `Unable to obtain cpu usage ${errMsg}`); +E('ERR_FALSY_VALUE_REJECTION', 'Promise was rejected with falsy value'); E('ERR_HTTP_HEADERS_SENT', 'Cannot render headers after they are sent to the client'); E('ERR_HTTP_INVALID_CHAR', 'Invalid character in statusMessage.'); @@ -166,7 +167,6 @@ E('ERR_SOCKET_BAD_PORT', 'Port should be > 0 and < 65536'); E('ERR_SOCKET_DGRAM_NOT_RUNNING', 'Not running'); E('ERR_V8BREAKITERATOR', 'full ICU data not installed. ' + 'See https://github.com/nodejs/node/wiki/Intl'); -E('FALSY_VALUE_REJECTION', 'Promise was rejected with falsy value'); // Add new errors from here... function invalidArgType(name, expected, actual) { diff --git a/lib/util.js b/lib/util.js index 11dd521668ddba..921a684d50c2fb 100644 --- a/lib/util.js +++ b/lib/util.js @@ -1054,7 +1054,7 @@ function callbackifyOnRejected(reason, cb) { // occurred", we error-wrap so the callback consumer can distinguish between // "the promise rejected with null" or "the promise fulfilled with undefined". if (!reason) { - const newReason = new errors.Error('FALSY_VALUE_REJECTION'); + const newReason = new errors.Error('ERR_FALSY_VALUE_REJECTION'); newReason.reason = reason; reason = newReason; Error.captureStackTrace(reason, callbackifyOnRejected); diff --git a/test/parallel/test-util-callbackify.js b/test/parallel/test-util-callbackify.js index fa793d4a7faccb..8bbc0fd36e970a 100644 --- a/test/parallel/test-util-callbackify.js +++ b/test/parallel/test-util-callbackify.js @@ -79,7 +79,7 @@ const values = [ if (err instanceof Error) { if ('reason' in err) { assert(!value); - assert.strictEqual(err.code, 'FALSY_VALUE_REJECTION'); + assert.strictEqual(err.code, 'ERR_FALSY_VALUE_REJECTION'); assert.strictEqual(err.reason, value); } else { assert.strictEqual(String(value).endsWith(err.message), true); @@ -100,7 +100,7 @@ const values = [ if (err instanceof Error) { if ('reason' in err) { assert(!value); - assert.strictEqual(err.code, 'FALSY_VALUE_REJECTION'); + assert.strictEqual(err.code, 'ERR_FALSY_VALUE_REJECTION'); assert.strictEqual(err.reason, value); } else { assert.strictEqual(String(value).endsWith(err.message), true); @@ -125,7 +125,7 @@ const values = [ if (err instanceof Error) { if ('reason' in err) { assert(!value); - assert.strictEqual(err.code, 'FALSY_VALUE_REJECTION'); + assert.strictEqual(err.code, 'ERR_FALSY_VALUE_REJECTION'); assert.strictEqual(err.reason, value); } else { assert.strictEqual(String(value).endsWith(err.message), true);