From a793cf401d7e02be76ea008604c3dc5ddef1fe11 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Sat, 22 Apr 2023 12:29:27 +0200 Subject: [PATCH] esm: rename `URLCanParse` to be consistent MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/47668 Reviewed-By: Michaƫl Zasso Reviewed-By: Jacob Smith Reviewed-By: Matthew Aitken Reviewed-By: Yagiz Nizipli Reviewed-By: Luigi Pinca Reviewed-By: James M Snell --- lib/internal/modules/esm/hooks.js | 6 +++--- lib/internal/modules/esm/resolve.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/internal/modules/esm/hooks.js b/lib/internal/modules/esm/hooks.js index df6016914f8a7e..e6927903b7f0e7 100644 --- a/lib/internal/modules/esm/hooks.js +++ b/lib/internal/modules/esm/hooks.js @@ -34,7 +34,7 @@ const { } = require('internal/errors').codes; const { exitCodes: { kUnfinishedTopLevelAwait } } = internalBinding('errors'); const { URL } = require('internal/url'); -const { canParse: urlCanParse } = internalBinding('url'); +const { canParse: URLCanParse } = internalBinding('url'); const { receiveMessageOnPort } = require('worker_threads'); const { isAnyArrayBuffer, @@ -274,7 +274,7 @@ class Hooks { // Avoid expensive URL instantiation for known-good URLs if (!this.#validatedUrls.has(url)) { // No need to convert to string, since the type is already validated - if (!urlCanParse(url)) { + if (!URLCanParse(url)) { throw new ERR_INVALID_RETURN_PROPERTY_VALUE( 'a URL string', hookErrIdentifier, @@ -354,7 +354,7 @@ class Hooks { // Avoid expensive URL instantiation for known-good URLs if (!this.#validatedUrls.has(nextUrl)) { // No need to convert to string, since the type is already validated - if (!urlCanParse(nextUrl)) { + if (!URLCanParse(nextUrl)) { throw new ERR_INVALID_ARG_VALUE( `${hookErrIdentifier} url`, nextUrl, diff --git a/lib/internal/modules/esm/resolve.js b/lib/internal/modules/esm/resolve.js index e77effbf9b017d..21703d63f6aa41 100644 --- a/lib/internal/modules/esm/resolve.js +++ b/lib/internal/modules/esm/resolve.js @@ -38,7 +38,7 @@ const experimentalNetworkImports = getOptionValue('--experimental-network-imports'); const typeFlag = getOptionValue('--input-type'); const { URL, pathToFileURL, fileURLToPath, isURL, toPathIfFileURL } = require('internal/url'); -const { canParse: canParseURL } = internalBinding('url'); +const { canParse: URLCanParse } = internalBinding('url'); const { ERR_INPUT_TYPE_NOT_ALLOWED, ERR_INVALID_ARG_TYPE, @@ -328,7 +328,7 @@ function resolvePackageTargetString( if (internal && !StringPrototypeStartsWith(target, '../') && !StringPrototypeStartsWith(target, '/')) { // No need to convert target to string, since it's already presumed to be - if (!canParseURL(target)) { + if (!URLCanParse(target)) { const exportTarget = pattern ? RegExpPrototypeSymbolReplace(patternRegEx, target, () => subpath) : target + subpath;