fs: port errors to new system

targos · Feb 27, 2018 · Feb 27, 2018 · Feb 27, 2018 · Feb 27, 2018 · Feb 27, 2018
commit a6b8a2587e9df6a5a3e6cdc7ed3e8615cc4138fb
diff --git a/lib/fs.js b/lib/fs.js
@@ -35,6 +35,11 @@ const binding = process.binding('fs');
 const fs = exports;
 const { Buffer } = require('buffer');
 const errors = require('internal/errors');
+const {
+  ERR_INVALID_ARG_TYPE,
+  ERR_INVALID_CALLBACK,
+  ERR_OUT_OF_RANGE
+} = errors.codes;
 const { Readable, Writable } = require('stream');
 const EventEmitter = require('events');
 const { FSReqWrap, statValues } = binding;
@@ -109,15 +114,15 @@ function maybeCallback(cb) {
   if (typeof cb === 'function')
     return cb;
 
-  throw new errors.TypeError('ERR_INVALID_CALLBACK');
+  throw new ERR_INVALID_CALLBACK();
 }
 
 // Ensure that callbacks run in the global context. Only use this function
 // for callbacks that are passed to the binding layer, callbacks that are
 // invoked from JS already run in the proper scope.
 function makeCallback(cb) {
   if (typeof cb !== 'function') {
-    throw new errors.TypeError('ERR_INVALID_CALLBACK');
+    throw new ERR_INVALID_CALLBACK();
   }
 
   return function(...args) {
@@ -130,7 +135,7 @@ function makeCallback(cb) {
 // transformed anyway.
 function makeStatsCallback(cb) {
   if (typeof cb !== 'function') {
-    throw new errors.TypeError('ERR_INVALID_CALLBACK');
+    throw new ERR_INVALID_CALLBACK();
   }
 
   return function(err) {
@@ -1000,7 +1005,7 @@ fs.fchmod = function(fd, mode, callback) {
   validateUint32(mode, 'mode');
   // values for mode < 0 are already checked via the validateUint32 function
   if (mode > 0o777)
-    throw new errors.RangeError('ERR_OUT_OF_RANGE', 'mode');
+    throw new ERR_OUT_OF_RANGE('mode');
 
   const req = new FSReqWrap();
   req.oncomplete = makeCallback(callback);
@@ -1012,7 +1017,7 @@ fs.fchmodSync = function(fd, mode) {
   validateUint32(fd, 'fd');
   validateUint32(mode, 'mode');
   if (mode < 0 || mode > 0o777)
-    throw new errors.RangeError('ERR_OUT_OF_RANGE', 'mode');
+    throw new ERR_OUT_OF_RANGE('mode');
   const ctx = {};
   binding.fchmod(fd, mode, undefined, ctx);
   handleErrorFromBinding(ctx);
@@ -1457,10 +1462,7 @@ fs.watchFile = function(filename, options, listener) {
   }
 
   if (typeof listener !== 'function') {
-    throw new errors.TypeError('ERR_INVALID_ARG_TYPE',
-                               'listener',
-                               'Function',
-                               listener);
+    throw new ERR_INVALID_ARG_TYPE('listener', 'Function', listener);
   }
 
   stat = statWatchers.get(filename);
@@ -1835,10 +1837,7 @@ fs.mkdtemp = function(prefix, options, callback) {
   callback = makeCallback(typeof options === 'function' ? options : callback);
   options = getOptions(options, {});
   if (!prefix || typeof prefix !== 'string') {
-    throw new errors.TypeError('ERR_INVALID_ARG_TYPE',
-                               'prefix',
-                               'string',
-                               prefix);
+    throw new ERR_INVALID_ARG_TYPE('prefix', 'string', prefix);
   }
   nullCheck(prefix, 'prefix');
   var req = new FSReqWrap();
@@ -1850,10 +1849,7 @@ fs.mkdtemp = function(prefix, options, callback) {
 fs.mkdtempSync = function(prefix, options) {
   options = getOptions(options, {});
   if (!prefix || typeof prefix !== 'string') {
-    throw new errors.TypeError('ERR_INVALID_ARG_TYPE',
-                               'prefix',
-                               'string',
-                               prefix);
+    throw new ERR_INVALID_ARG_TYPE('prefix', 'string', prefix);
   }
   nullCheck(prefix, 'prefix');
   const path = `${prefix}XXXXXX`;
@@ -1876,7 +1872,7 @@ fs.copyFile = function(src, dest, flags, callback) {
     callback = flags;
     flags = 0;
   } else if (typeof callback !== 'function') {
-    throw new errors.TypeError('ERR_INVALID_CALLBACK');
+    throw new ERR_INVALID_CALLBACK();
   }
 
   src = getPathFromURL(src);
@@ -1951,26 +1947,17 @@ function ReadStream(path, options) {
 
   if (this.start !== undefined) {
     if (typeof this.start !== 'number') {
-      throw new errors.TypeError('ERR_INVALID_ARG_TYPE',
-                                 'start',
-                                 'number',
-                                 this.start);
+      throw new ERR_INVALID_ARG_TYPE('start', 'number', this.start);
     }
     if (this.end === undefined) {
       this.end = Infinity;
     } else if (typeof this.end !== 'number') {
-      throw new errors.TypeError('ERR_INVALID_ARG_TYPE',
-                                 'end',
-                                 'number',
-                                 this.end);
+      throw new ERR_INVALID_ARG_TYPE('end', 'number', this.end);
     }
 
     if (this.start > this.end) {
       const errVal = `{start: ${this.start}, end: ${this.end}}`;
-      throw new errors.RangeError('ERR_OUT_OF_RANGE',
-                                  'start',
-                                  '<= "end"',
-                                  errVal);
+      throw new ERR_OUT_OF_RANGE('start', '<= "end"', errVal);
     }
 
     this.pos = this.start;
@@ -2113,17 +2100,11 @@ function WriteStream(path, options) {
 
   if (this.start !== undefined) {
     if (typeof this.start !== 'number') {
-      throw new errors.TypeError('ERR_INVALID_ARG_TYPE',
-                                 'start',
-                                 'number',
-                                 this.start);
+      throw new ERR_INVALID_ARG_TYPE('start', 'number', this.start);
     }
     if (this.start < 0) {
       const errVal = `{start: ${this.start}}`;
-      throw new errors.RangeError('ERR_OUT_OF_RANGE',
-                                  'start',
-                                  '>= 0',
-                                  errVal);
+      throw new ERR_OUT_OF_RANGE('start', '>= 0', errVal);
     }
 
     this.pos = this.start;
@@ -2164,10 +2145,7 @@ WriteStream.prototype.open = function() {
 
 WriteStream.prototype._write = function(data, encoding, cb) {
   if (!(data instanceof Buffer)) {
-    const err = new errors.TypeError('ERR_INVALID_ARG_TYPE',
-                                     'data',
-                                     'Buffer',
-                                     data);
+    const err = new ERR_INVALID_ARG_TYPE('data', 'Buffer', data);
     return this.emit('error', err);
   }