url: provide pathToFileURL and fileURLToPath

PR-URL: https://github.com/nodejs/node/pull/22506
Reviewed-By: John-David Dalton <john.david.dalton@gmail.com>
Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Bradley Farias <bradley.meck@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>

1 files changed, 50 insertions, 50 deletions

diff --git a/lib/fs.js b/lib/fs.js
index e1fb2c022f..3302cfe0bf 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -54,7 +54,7 @@ const {
 
 const { FSReqCallback, statValues } = binding;
 const internalFS = require('internal/fs/utils');
-const { getPathFromURL } = require('internal/url');
+const { toPathIfFileURL } = require('internal/url');
 const internalUtil = require('internal/util');
 const {
   copyObject,
@@ -177,7 +177,7 @@ function access(path, mode, callback) {
     mode = F_OK;
   }
 
-  path = getPathFromURL(path);
+  path = toPathIfFileURL(path);
   validatePath(path);
 
   mode = mode | 0;
@@ -187,7 +187,7 @@ function access(path, mode, callback) {
 }
 
 function accessSync(path, mode) {
-  path = getPathFromURL(path);
+  path = toPathIfFileURL(path);
   validatePath(path);
 
   if (mode === undefined)
@@ -297,7 +297,7 @@ function readFile(path, options, callback) {
     return;
   }
 
-  path = getPathFromURL(path);
+  path = toPathIfFileURL(path);
   validatePath(path);
   binding.open(pathModule.toNamespacedPath(path),
                stringToFlags(options.flag || 'r'),
@@ -409,7 +409,7 @@ function closeSync(fd) {
 }
 
 function open(path, flags, mode, callback) {
-  path = getPathFromURL(path);
+  path = toPathIfFileURL(path);
   validatePath(path);
   const flagsNumber = stringToFlags(flags);
   if (arguments.length < 4) {
@@ -431,7 +431,7 @@ function open(path, flags, mode, callback) {
 
 
 function openSync(path, flags, mode) {
-  path = getPathFromURL(path);
+  path = toPathIfFileURL(path);
   validatePath(path);
   const flagsNumber = stringToFlags(flags);
   mode = validateMode(mode, 'mode', 0o666);
@@ -587,9 +587,9 @@ function writeSync(fd, buffer, offset, length, position) {
 
 function rename(oldPath, newPath, callback) {
   callback = makeCallback(callback);
-  oldPath = getPathFromURL(oldPath);
+  oldPath = toPathIfFileURL(oldPath);
   validatePath(oldPath, 'oldPath');
-  newPath = getPathFromURL(newPath);
+  newPath = toPathIfFileURL(newPath);
   validatePath(newPath, 'newPath');
   const req = new FSReqCallback();
   req.oncomplete = callback;
@@ -599,9 +599,9 @@ function rename(oldPath, newPath, callback) {
 }
 
 function renameSync(oldPath, newPath) {
-  oldPath = getPathFromURL(oldPath);
+  oldPath = toPathIfFileURL(oldPath);
   validatePath(oldPath, 'oldPath');
-  newPath = getPathFromURL(newPath);
+  newPath = toPathIfFileURL(newPath);
   validatePath(newPath, 'newPath');
   const ctx = { path: oldPath, dest: newPath };
   binding.rename(pathModule.toNamespacedPath(oldPath),
@@ -680,7 +680,7 @@ function ftruncateSync(fd, len = 0) {
 
 function rmdir(path, callback) {
   callback = makeCallback(callback);
-  path = getPathFromURL(path);
+  path = toPathIfFileURL(path);
   validatePath(path);
   const req = new FSReqCallback();
   req.oncomplete = callback;
@@ -688,7 +688,7 @@ function rmdir(path, callback) {
 }
 
 function rmdirSync(path) {
-  path = getPathFromURL(path);
+  path = toPathIfFileURL(path);
   validatePath(path);
   const ctx = { path };
   binding.rmdir(pathModule.toNamespacedPath(path), undefined, ctx);
@@ -735,7 +735,7 @@ function mkdir(path, options, callback) {
     mode = 0o777
   } = options || {};
   callback = makeCallback(callback);
-  path = getPathFromURL(path);
+  path = toPathIfFileURL(path);
 
   validatePath(path);
   if (typeof recursive !== 'boolean')
@@ -751,7 +751,7 @@ function mkdirSync(path, options) {
   if (typeof options === 'number' || typeof options === 'string') {
     options = { mode: options };
   }
-  path = getPathFromURL(path);
+  path = toPathIfFileURL(path);
   const {
     recursive = false,
     mode = 0o777
@@ -771,7 +771,7 @@ function mkdirSync(path, options) {
 function readdir(path, options, callback) {
   callback = makeCallback(typeof options === 'function' ? options : callback);
   options = getOptions(options, {});
-  path = getPathFromURL(path);
+  path = toPathIfFileURL(path);
   validatePath(path);
 
   const req = new FSReqCallback();
@@ -792,7 +792,7 @@ function readdir(path, options, callback) {
 
 function readdirSync(path, options) {
   options = getOptions(options, {});
-  path = getPathFromURL(path);
+  path = toPathIfFileURL(path);
   validatePath(path);
   const ctx = { path };
   const result = binding.readdir(pathModule.toNamespacedPath(path),
@@ -819,7 +819,7 @@ function lstat(path, options, callback) {
     options = {};
   }
   callback = makeStatsCallback(callback);
-  path = getPathFromURL(path);
+  path = toPathIfFileURL(path);
   validatePath(path);
   const req = new FSReqCallback(options.bigint);
   req.oncomplete = callback;
@@ -832,7 +832,7 @@ function stat(path, options, callback) {
     options = {};
   }
   callback = makeStatsCallback(callback);
-  path = getPathFromURL(path);
+  path = toPathIfFileURL(path);
   validatePath(path);
   const req = new FSReqCallback(options.bigint);
   req.oncomplete = callback;
@@ -848,7 +848,7 @@ function fstatSync(fd, options = {}) {
 }
 
 function lstatSync(path, options = {}) {
-  path = getPathFromURL(path);
+  path = toPathIfFileURL(path);
   validatePath(path);
   const ctx = { path };
   const stats = binding.lstat(pathModule.toNamespacedPath(path),
@@ -858,7 +858,7 @@ function lstatSync(path, options = {}) {
 }
 
 function statSync(path, options = {}) {
-  path = getPathFromURL(path);
+  path = toPathIfFileURL(path);
   validatePath(path);
   const ctx = { path };
   const stats = binding.stat(pathModule.toNamespacedPath(path),
@@ -870,7 +870,7 @@ function statSync(path, options = {}) {
 function readlink(path, options, callback) {
   callback = makeCallback(typeof options === 'function' ? options : callback);
   options = getOptions(options, {});
-  path = getPathFromURL(path);
+  path = toPathIfFileURL(path);
   validatePath(path, 'oldPath');
   const req = new FSReqCallback();
   req.oncomplete = callback;
@@ -879,7 +879,7 @@ function readlink(path, options, callback) {
 
 function readlinkSync(path, options) {
   options = getOptions(options, {});
-  path = getPathFromURL(path);
+  path = toPathIfFileURL(path);
   validatePath(path, 'oldPath');
   const ctx = { path };
   const result = binding.readlink(pathModule.toNamespacedPath(path),
@@ -892,8 +892,8 @@ function symlink(target, path, type_, callback_) {
   const type = (typeof type_ === 'string' ? type_ : null);
   const callback = makeCallback(arguments[arguments.length - 1]);
 
-  target = getPathFromURL(target);
-  path = getPathFromURL(path);
+  target = toPathIfFileURL(target);
+  path = toPathIfFileURL(path);
   validatePath(target, 'target');
   validatePath(path);
 
@@ -907,8 +907,8 @@ function symlink(target, path, type_, callback_) {
 
 function symlinkSync(target, path, type) {
   type = (typeof type === 'string' ? type : null);
-  target = getPathFromURL(target);
-  path = getPathFromURL(path);
+  target = toPathIfFileURL(target);
+  path = toPathIfFileURL(path);
   validatePath(target, 'target');
   validatePath(path);
   const flags = stringToSymlinkType(type);
@@ -923,8 +923,8 @@ function symlinkSync(target, path, type) {
 function link(existingPath, newPath, callback) {
   callback = makeCallback(callback);
 
-  existingPath = getPathFromURL(existingPath);
-  newPath = getPathFromURL(newPath);
+  existingPath = toPathIfFileURL(existingPath);
+  newPath = toPathIfFileURL(newPath);
   validatePath(existingPath, 'existingPath');
   validatePath(newPath, 'newPath');
 
@@ -937,8 +937,8 @@ function link(existingPath, newPath, callback) {
 }
 
 function linkSync(existingPath, newPath) {
-  existingPath = getPathFromURL(existingPath);
-  newPath = getPathFromURL(newPath);
+  existingPath = toPathIfFileURL(existingPath);
+  newPath = toPathIfFileURL(newPath);
   validatePath(existingPath, 'existingPath');
   validatePath(newPath, 'newPath');
 
@@ -952,7 +952,7 @@ function linkSync(existingPath, newPath) {
 
 function unlink(path, callback) {
   callback = makeCallback(callback);
-  path = getPathFromURL(path);
+  path = toPathIfFileURL(path);
   validatePath(path);
   const req = new FSReqCallback();
   req.oncomplete = callback;
@@ -960,7 +960,7 @@ function unlink(path, callback) {
 }
 
 function unlinkSync(path) {
-  path = getPathFromURL(path);
+  path = toPathIfFileURL(path);
   validatePath(path);
   const ctx = { path };
   binding.unlink(pathModule.toNamespacedPath(path), undefined, ctx);
@@ -1018,7 +1018,7 @@ function lchmodSync(path, mode) {
 
 
 function chmod(path, mode, callback) {
-  path = getPathFromURL(path);
+  path = toPathIfFileURL(path);
   validatePath(path);
   mode = validateMode(mode, 'mode');
   callback = makeCallback(callback);
@@ -1029,7 +1029,7 @@ function chmod(path, mode, callback) {
 }
 
 function chmodSync(path, mode) {
-  path = getPathFromURL(path);
+  path = toPathIfFileURL(path);
   validatePath(path);
   mode = validateMode(mode, 'mode');
 
@@ -1040,7 +1040,7 @@ function chmodSync(path, mode) {
 
 function lchown(path, uid, gid, callback) {
   callback = makeCallback(callback);
-  path = getPathFromURL(path);
+  path = toPathIfFileURL(path);
   validatePath(path);
   validateUint32(uid, 'uid');
   validateUint32(gid, 'gid');
@@ -1050,7 +1050,7 @@ function lchown(path, uid, gid, callback) {
 }
 
 function lchownSync(path, uid, gid) {
-  path = getPathFromURL(path);
+  path = toPathIfFileURL(path);
   validatePath(path);
   validateUint32(uid, 'uid');
   validateUint32(gid, 'gid');
@@ -1081,7 +1081,7 @@ function fchownSync(fd, uid, gid) {
 
 function chown(path, uid, gid, callback) {
   callback = makeCallback(callback);
-  path = getPathFromURL(path);
+  path = toPathIfFileURL(path);
   validatePath(path);
   validateUint32(uid, 'uid');
   validateUint32(gid, 'gid');
@@ -1092,7 +1092,7 @@ function chown(path, uid, gid, callback) {
 }
 
 function chownSync(path, uid, gid) {
-  path = getPathFromURL(path);
+  path = toPathIfFileURL(path);
   validatePath(path);
   validateUint32(uid, 'uid');
   validateUint32(gid, 'gid');
@@ -1103,7 +1103,7 @@ function chownSync(path, uid, gid) {
 
 function utimes(path, atime, mtime, callback) {
   callback = makeCallback(callback);
-  path = getPathFromURL(path);
+  path = toPathIfFileURL(path);
   validatePath(path);
 
   const req = new FSReqCallback();
@@ -1115,7 +1115,7 @@ function utimes(path, atime, mtime, callback) {
 }
 
 function utimesSync(path, atime, mtime) {
-  path = getPathFromURL(path);
+  path = toPathIfFileURL(path);
   validatePath(path);
   const ctx = { path };
   binding.utimes(pathModule.toNamespacedPath(path),
@@ -1282,7 +1282,7 @@ function watch(filename, options, listener) {
 const statWatchers = new Map();
 
 function watchFile(filename, options, listener) {
-  filename = getPathFromURL(filename);
+  filename = toPathIfFileURL(filename);
   validatePath(filename);
   filename = pathModule.resolve(filename);
   let stat;
@@ -1321,7 +1321,7 @@ function watchFile(filename, options, listener) {
 }
 
 function unwatchFile(filename, listener) {
-  filename = getPathFromURL(filename);
+  filename = toPathIfFileURL(filename);
   validatePath(filename);
   filename = pathModule.resolve(filename);
   const stat = statWatchers.get(filename);
@@ -1393,7 +1393,7 @@ function realpathSync(p, options) {
     options = emptyObj;
   else
     options = getOptions(options, emptyObj);
-  p = getPathFromURL(p);
+  p = toPathIfFileURL(p);
   if (typeof p !== 'string') {
     p += '';
   }
@@ -1525,7 +1525,7 @@ function realpathSync(p, options) {
 
 realpathSync.native = function(path, options) {
   options = getOptions(options, {});
-  path = getPathFromURL(path);
+  path = toPathIfFileURL(path);
   validatePath(path);
   const ctx = { path };
   const result = binding.realpath(path, options.encoding, undefined, ctx);
@@ -1540,7 +1540,7 @@ function realpath(p, options, callback) {
     options = emptyObj;
   else
     options = getOptions(options, emptyObj);
-  p = getPathFromURL(p);
+  p = toPathIfFileURL(p);
   if (typeof p !== 'string') {
     p += '';
   }
@@ -1667,7 +1667,7 @@ function realpath(p, options, callback) {
 realpath.native = function(path, options, callback) {
   callback = makeCallback(callback || options);
   options = getOptions(options, {});
-  path = getPathFromURL(path);
+  path = toPathIfFileURL(path);
   validatePath(path);
   const req = new FSReqCallback();
   req.oncomplete = callback;
@@ -1710,8 +1710,8 @@ function copyFile(src, dest, flags, callback) {
     throw new ERR_INVALID_CALLBACK();
   }
 
-  src = getPathFromURL(src);
-  dest = getPathFromURL(dest);
+  src = toPathIfFileURL(src);
+  dest = toPathIfFileURL(dest);
   validatePath(src, 'src');
   validatePath(dest, 'dest');
 
@@ -1725,8 +1725,8 @@ function copyFile(src, dest, flags, callback) {
 
 
 function copyFileSync(src, dest, flags) {
-  src = getPathFromURL(src);
-  dest = getPathFromURL(dest);
+  src = toPathIfFileURL(src);
+  dest = toPathIfFileURL(dest);
   validatePath(src, 'src');
   validatePath(dest, 'dest');