lib: port remaining errors to new system

PR-URL: https://github.com/nodejs/node/pull/19137
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>

1 files changed, 19 insertions, 14 deletions

diff --git a/lib/internal/encoding.js b/lib/internal/encoding.js
index fc8ac555fc..1846fc5527 100644
--- a/lib/internal/encoding.js
+++ b/lib/internal/encoding.js
@@ -3,7 +3,13 @@
 // An implementation of the WHATWG Encoding Standard
 // https://encoding.spec.whatwg.org
 
-const errors = require('internal/errors');
+const {
+  ERR_ENCODING_INVALID_ENCODED_DATA,
+  ERR_ENCODING_NOT_SUPPORTED,
+  ERR_INVALID_ARG_TYPE,
+  ERR_INVALID_THIS,
+  ERR_NO_ICU
+} = require('internal/errors').codes;
 const kHandle = Symbol('handle');
 const kFlags = Symbol('flags');
 const kEncoding = Symbol('encoding');
@@ -35,17 +41,17 @@ function lazyBuffer() {
 
 function validateEncoder(obj) {
   if (obj == null || obj[kEncoder] !== true)
-    throw new errors.TypeError('ERR_INVALID_THIS', 'TextEncoder');
+    throw new ERR_INVALID_THIS('TextEncoder');
 }
 
 function validateDecoder(obj) {
   if (obj == null || obj[kDecoder] !== true)
-    throw new errors.TypeError('ERR_INVALID_THIS', 'TextDecoder');
+    throw new ERR_INVALID_THIS('TextDecoder');
 }
 
 function validateArgument(prop, expected, propName, expectedName) {
   if (typeof prop !== expected)
-    throw new errors.Error('ERR_INVALID_ARG_TYPE', propName, expectedName);
+    throw new ERR_INVALID_ARG_TYPE(propName, expectedName);
 }
 
 const CONVERTER_FLAGS_FLUSH = 0x1;
@@ -360,7 +366,7 @@ function makeTextDecoderICU() {
 
       const enc = getEncodingFromLabel(encoding);
       if (enc === undefined)
-        throw new errors.RangeError('ERR_ENCODING_NOT_SUPPORTED', encoding);
+        throw new ERR_ENCODING_NOT_SUPPORTED(encoding);
 
       var flags = 0;
       if (options !== null) {
@@ -370,7 +376,7 @@ function makeTextDecoderICU() {
 
       const handle = getConverter(enc, flags);
       if (handle === undefined)
-        throw new errors.Error('ERR_ENCODING_NOT_SUPPORTED', encoding);
+        throw new ERR_ENCODING_NOT_SUPPORTED(encoding);
 
       this[kDecoder] = true;
       this[kHandle] = handle;
@@ -384,8 +390,8 @@ function makeTextDecoderICU() {
       if (isArrayBuffer(input)) {
         input = lazyBuffer().from(input);
       } else if (!isArrayBufferView(input)) {
-        throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'input',
-                                   ['ArrayBuffer', 'ArrayBufferView']);
+        throw new ERR_INVALID_ARG_TYPE('input',
+                                       ['ArrayBuffer', 'ArrayBufferView']);
       }
       validateArgument(options, 'object', 'options', 'Object');
 
@@ -395,8 +401,7 @@ function makeTextDecoderICU() {
 
       const ret = _decode(this[kHandle], input, flags);
       if (typeof ret === 'number') {
-        const err = new errors.TypeError('ERR_ENCODING_INVALID_ENCODED_DATA',
-                                         this.encoding);
+        const err = new ERR_ENCODING_INVALID_ENCODED_DATA(this.encoding);
         err.errno = ret;
         throw err;
       }
@@ -428,12 +433,12 @@ function makeTextDecoderJS() {
 
       const enc = getEncodingFromLabel(encoding);
       if (enc === undefined || !hasConverter(enc))
-        throw new errors.RangeError('ERR_ENCODING_NOT_SUPPORTED', encoding);
+        throw new ERR_ENCODING_NOT_SUPPORTED(encoding);
 
       var flags = 0;
       if (options !== null) {
         if (options.fatal) {
-          throw new errors.TypeError('ERR_NO_ICU', '"fatal" option');
+          throw new ERR_NO_ICU('"fatal" option');
         }
         flags |= options.ignoreBOM ? CONVERTER_FLAGS_IGNORE_BOM : 0;
       }
@@ -454,8 +459,8 @@ function makeTextDecoderJS() {
         input = lazyBuffer().from(input.buffer, input.byteOffset,
                                   input.byteLength);
       } else {
-        throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'input',
-                                   ['ArrayBuffer', 'ArrayBufferView']);
+        throw new ERR_INVALID_ARG_TYPE('input',
+                                       ['ArrayBuffer', 'ArrayBufferView']);
       }
       validateArgument(options, 'object', 'options', 'Object');