module: use validateString in modules/esm

PR-URL: #24868 Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Trivikram Kamat <[email protected]>
nodejs · Dec 17, 2018 · 25dae6c · 25dae6c
1 parent 1f61c89
commit 25dae6c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/lib/internal/modules/esm/loader.js b/lib/internal/modules/esm/loader.js
@@ -1,14 +1,14 @@
 'use strict';
 
 const {
-  ERR_INVALID_ARG_TYPE,
   ERR_INVALID_RETURN_PROPERTY,
   ERR_INVALID_RETURN_PROPERTY_VALUE,
   ERR_INVALID_RETURN_VALUE,
   ERR_MISSING_DYNAMIC_INSTANTIATE_HOOK,
   ERR_UNKNOWN_MODULE_FORMAT
 } = require('internal/errors').codes;
 const { URL } = require('url');
+const { validateString } = require('internal/validators');
 const ModuleMap = require('internal/modules/esm/module_map');
 const ModuleJob = require('internal/modules/esm/module_job');
 const defaultResolve = require('internal/modules/esm/default_resolve');
@@ -52,8 +52,8 @@ class Loader {
 
   async resolve(specifier, parentURL) {
     const isMain = parentURL === undefined;
-    if (!isMain && typeof parentURL !== 'string')
-      throw new ERR_INVALID_ARG_TYPE('parentURL', 'string', parentURL);
+    if (!isMain)
+      validateString(parentURL, 'parentURL');
 
     const resolved = await this._resolve(specifier, parentURL, defaultResolve);
 

diff --git a/lib/internal/modules/esm/module_map.js b/lib/internal/modules/esm/module_map.js
@@ -4,29 +4,24 @@ const ModuleJob = require('internal/modules/esm/module_job');
 const { SafeMap } = require('internal/safe_globals');
 const debug = require('util').debuglog('esm');
 const { ERR_INVALID_ARG_TYPE } = require('internal/errors').codes;
+const { validateString } = require('internal/validators');
 
 // Tracks the state of the loader-level module cache
 class ModuleMap extends SafeMap {
   get(url) {
-    if (typeof url !== 'string') {
-      throw new ERR_INVALID_ARG_TYPE('url', 'string', url);
-    }
+    validateString(url, 'url');
     return super.get(url);
   }
   set(url, job) {
-    if (typeof url !== 'string') {
-      throw new ERR_INVALID_ARG_TYPE('url', 'string', url);
-    }
+    validateString(url, 'url');
     if (job instanceof ModuleJob !== true) {
       throw new ERR_INVALID_ARG_TYPE('job', 'ModuleJob', job);
     }
     debug(`Storing ${url} in ModuleMap`);
     return super.set(url, job);
   }
   has(url) {
-    if (typeof url !== 'string') {
-      throw new ERR_INVALID_ARG_TYPE('url', 'string', url);
-    }
+    validateString(url, 'url');
     return super.has(url);
   }
 }