module: use validateString in modules/cjs

ZYSzys · BethGriggs · commit 229f901a0f97 · 2019-02-12T19:12:54.000Z
PR-URL: #24863 Refs: #22101 Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
diff --git a/lib/internal/modules/cjs/helpers.js b/lib/internal/modules/cjs/helpers.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { ERR_INVALID_ARG_TYPE } = require('internal/errors').codes;
+const { validateString } = require('internal/validators');
 
 const {
   CHAR_LINE_FEED,
@@ -26,18 +26,14 @@ function makeRequireFunction(mod) {
   }
 
   function resolve(request, options) {
-    if (typeof request !== 'string') {
-      throw new ERR_INVALID_ARG_TYPE('request', 'string', request);
-    }
+    validateString(request, 'request');
     return Module._resolveFilename(request, mod, false, options);
   }
 
   require.resolve = resolve;
 
   function paths(request) {
-    if (typeof request !== 'string') {
-      throw new ERR_INVALID_ARG_TYPE('request', 'string', request);
-    }
+    validateString(request, 'request');
     return Module._resolveLookupPaths(request, mod, true);
   }
 
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
@@ -47,10 +47,10 @@ const preserveSymlinksMain = getOptionValue('--preserve-symlinks-main');
 const experimentalModules = getOptionValue('--experimental-modules');
 
 const {
-  ERR_INVALID_ARG_TYPE,
   ERR_INVALID_ARG_VALUE,
   ERR_REQUIRE_ESM
 } = require('internal/errors').codes;
+const { validateString } = require('internal/validators');
 
 module.exports = Module;
 
@@ -629,9 +629,7 @@ Module.prototype.load = function(filename) {
 // Loads a module at the given file path. Returns that module's
 // `exports` property.
 Module.prototype.require = function(id) {
-  if (typeof id !== 'string') {
-    throw new ERR_INVALID_ARG_TYPE('id', 'string', id);
-  }
+  validateString(id, 'id');
   if (id === '') {
     throw new ERR_INVALID_ARG_VALUE('id', id,
                                     'must be a non-empty string');
