diff options
author | ZYSzys <17367077526@163.com> | 2018-12-06 16:22:34 +0800 |
---|---|---|
committer | Rich Trott <rtrott@gmail.com> | 2018-12-10 09:48:49 -0800 |
commit | d695a019ae44da50e5d54e9fa8a42a3ae0abe3cd (patch) | |
tree | 028fd4b66c8ea3d4a919830c49e3fd43860d0046 /lib | |
parent | a91293d4d9ab403046ab5eb022332e4e3d249bd3 (diff) | |
download | android-node-v8-d695a019ae44da50e5d54e9fa8a42a3ae0abe3cd.tar.gz android-node-v8-d695a019ae44da50e5d54e9fa8a42a3ae0abe3cd.tar.bz2 android-node-v8-d695a019ae44da50e5d54e9fa8a42a3ae0abe3cd.zip |
module: use validateString in modules/esm
PR-URL: https://github.com/nodejs/node/pull/24868
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/internal/modules/esm/loader.js | 6 | ||||
-rw-r--r-- | lib/internal/modules/esm/module_map.js | 13 |
2 files changed, 7 insertions, 12 deletions
diff --git a/lib/internal/modules/esm/loader.js b/lib/internal/modules/esm/loader.js index 60f1e31f94..820b593446 100644 --- a/lib/internal/modules/esm/loader.js +++ b/lib/internal/modules/esm/loader.js @@ -1,7 +1,6 @@ 'use strict'; const { - ERR_INVALID_ARG_TYPE, ERR_INVALID_RETURN_PROPERTY, ERR_INVALID_RETURN_PROPERTY_VALUE, ERR_INVALID_RETURN_VALUE, @@ -9,6 +8,7 @@ const { 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 index f4786f8e9e..a9d0c23c0e 100644 --- a/lib/internal/modules/esm/module_map.js +++ b/lib/internal/modules/esm/module_map.js @@ -4,19 +4,16 @@ 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); } @@ -24,9 +21,7 @@ class ModuleMap extends SafeMap { 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); } } |