url: backport non-major changes from #46904

PR-URL: #46904 Backport-PR-URL: #48345 Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]>
nodejs · Jul 12, 2023 · f495cb6 · f495cb6
1 parent aa4f485
commit f495cb6
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
@@ -79,7 +79,7 @@ const { BuiltinModule } = require('internal/bootstrap/loaders');
 const {
   maybeCacheSourceMap,
 } = require('internal/source_map/source_map_cache');
-const { pathToFileURL, fileURLToPath, isURLInstance } = require('internal/url');
+const { pathToFileURL, fileURLToPath, isURL } = require('internal/url');
 const {
   deprecate,
   emitExperimentalWarning,
@@ -1363,7 +1363,7 @@ const createRequireError = 'must be a file URL object, file URL string, or ' +
 function createRequire(filename) {
   let filepath;
 
-  if (isURLInstance(filename) ||
+  if (isURL(filename) ||
       (typeof filename === 'string' && !path.isAbsolute(filename))) {
     try {
       filepath = fileURLToPath(filename);

diff --git a/lib/internal/modules/esm/loader.js b/lib/internal/modules/esm/loader.js
@@ -31,7 +31,7 @@ const {
   ERR_INVALID_RETURN_VALUE,
   ERR_UNKNOWN_MODULE_FORMAT,
 } = require('internal/errors').codes;
-const { pathToFileURL, isURLInstance, URL } = require('internal/url');
+const { pathToFileURL, isURL, URL } = require('internal/url');
 const { emitExperimentalWarning } = require('internal/util');
 const {
   isAnyArrayBuffer,
@@ -789,7 +789,7 @@ class ESMLoader {
     if (
       !isMain &&
       typeof parentURL !== 'string' &&
-      !isURLInstance(parentURL)
+      !isURL(parentURL)
     ) {
       throw new ERR_INVALID_ARG_TYPE(
         'parentURL',

diff --git a/lib/internal/url.js b/lib/internal/url.js
@@ -557,6 +557,15 @@ ObjectDefineProperties(URLSearchParams.prototype, {
   },
 });
 
+/**
+ * Checks if a value has the shape of a WHATWG URL object.
+ *
+ * Using a symbol or instanceof would not be able to recognize URL objects
+ * coming from other implementations (e.g. in Electron), so instead we are
+ * checking some well known properties for a lack of a better test.
+ * @param {*} self
+ * @returns {self is URL}
+ */
 function isURL(self) {
   return self != null && ObjectPrototypeHasOwnProperty(self, context);
 }
@@ -1235,7 +1244,7 @@ function getPathFromURLPosix(url) {
 function fileURLToPath(path) {
   if (typeof path === 'string')
     path = new URL(path);
-  else if (!isURLInstance(path))
+  else if (!isURL(path))
     throw new ERR_INVALID_ARG_TYPE('path', ['string', 'URL'], path);
   if (path.protocol !== 'file:')
     throw new ERR_INVALID_URL_SCHEME('file');
@@ -1311,12 +1320,8 @@ function pathToFileURL(filepath) {
   return outURL;
 }
 
-function isURLInstance(fileURLOrPath) {
-  return fileURLOrPath != null && fileURLOrPath.href && fileURLOrPath.origin;
-}
-
 function toPathIfFileURL(fileURLOrPath) {
-  if (!isURLInstance(fileURLOrPath))
+  if (!isURL(fileURLOrPath))
     return fileURLOrPath;
   return fileURLToPath(fileURLOrPath);
 }
@@ -1326,7 +1331,6 @@ module.exports = {
   fileURLToPath,
   pathToFileURL,
   toPathIfFileURL,
-  isURLInstance,
   URL,
   URLSearchParams,
   domainToASCII,

diff --git a/lib/internal/worker.js b/lib/internal/worker.js
@@ -55,7 +55,7 @@ const {
   WritableWorkerStdio,
 } = workerIo;
 const { deserializeError } = require('internal/error_serdes');
-const { fileURLToPath, isURLInstance, pathToFileURL } = require('internal/url');
+const { fileURLToPath, isURL, pathToFileURL } = require('internal/url');
 const { kEmptyObject } = require('internal/util');
 const { validateArray, validateString } = require('internal/validators');
 
@@ -145,13 +145,13 @@ class Worker extends EventEmitter {
       }
       url = null;
       doEval = 'classic';
-    } else if (isURLInstance(filename) && filename.protocol === 'data:') {
+    } else if (isURL(filename) && filename.protocol === 'data:') {
       url = null;
       doEval = 'module';
       filename = `import ${JSONStringify(`${filename}`)}`;
     } else {
       doEval = false;
-      if (isURLInstance(filename)) {
+      if (isURL(filename)) {
         url = filename;
         filename = fileURLToPath(filename);
       } else if (typeof filename !== 'string') {