Revert "fs: convert to string if input path is buffer"

This reverts commit f7175b0.

Author: himself65

lib/fs.js

@@ -83,7 +83,7 @@ const {
   FSReqCallback,
   statValues,
 } = binding;
-const { toPathIfFileURLOrBuffer } = require('internal/url');
+const { toPathIfFileURL } = require('internal/url');
 const {
   customPromisifyArgs: kCustomPromisifyArgsSymbol,
   getLazy,
@@ -1765,7 +1765,7 @@ function symlink(target, path, type, callback) {
         callback(new ERR_ACCESS_DENIED('relative symbolic link target'));
         return;
       }
-    } else if (typeof target !== 'string' || !isAbsolute(toPathIfFileURLOrBuffer(target))) {
+    } else if (typeof target !== 'string' || !isAbsolute(toPathIfFileURL(target))) {
       callback(new ERR_ACCESS_DENIED('relative symbolic link target'));
       return;
     }
@@ -1839,7 +1839,7 @@ function symlinkSync(target, path, type) {
       if (!isAbsolute(BufferToString(target))) {
         throw new ERR_ACCESS_DENIED('relative symbolic link target');
       }
-    } else if (typeof target !== 'string' || !isAbsolute(toPathIfFileURLOrBuffer(target))) {
+    } else if (typeof target !== 'string' || !isAbsolute(toPathIfFileURL(target))) {
       throw new ERR_ACCESS_DENIED('relative symbolic link target');
     }
   }
@@ -2670,7 +2670,7 @@ if (isWindows) {
  */
 function realpathSync(p, options) {
   options = getOptions(options);
-  p = toPathIfFileURLOrBuffer(p);
+  p = toPathIfFileURL(p);
   if (typeof p !== 'string') {
     p += '';
   }
@@ -2830,7 +2830,7 @@ function realpath(p, options, callback) {
     validateFunction(callback, 'cb');
   }
   options = getOptions(options);
-  p = toPathIfFileURLOrBuffer(p);
+  p = toPathIfFileURL(p);
 
   if (typeof p !== 'string') {
     p += '';

lib/internal/fs/glob.js

@@ -38,7 +38,7 @@ const {
   hideStackFrames,
 } = require('internal/errors');
 const assert = require('internal/assert');
-const { toPathIfFileURLOrBuffer } = require('internal/url');
+const { toPathIfFileURL } = require('internal/url');
 
 let minimatch;
 function lazyMinimatch() {
@@ -269,7 +269,7 @@ class Glob {
   constructor(pattern, options = kEmptyObject) {
     validateObject(options, 'options');
     const { exclude, cwd, withFileTypes } = options;
-    this.#root = toPathIfFileURLOrBuffer(cwd) ?? '.';
+    this.#root = toPathIfFileURL(cwd) ?? '.';
     this.#withFileTypes = !!withFileTypes;
     if (exclude != null) {
       validateStringArrayOrFunction(exclude, 'options.exclude');

lib/internal/fs/promises.js

@@ -89,7 +89,7 @@ const {
 } = require('internal/validators');
 const pathModule = require('path');
 const { isAbsolute } = pathModule;
-const { toPathIfFileURLOrBuffer } = require('internal/url');
+const { toPathIfFileURL } = require('internal/url');
 const {
   getLazy,
   kEmptyObject,
@@ -997,7 +997,7 @@ async function symlink(target, path, type) {
       if (!isAbsolute(BufferToString(target))) {
         throw new ERR_ACCESS_DENIED('relative symbolic link target');
       }
-    } else if (typeof target !== 'string' || !isAbsolute(toPathIfFileURLOrBuffer(target))) {
+    } else if (typeof target !== 'string' || !isAbsolute(toPathIfFileURL(target))) {
       throw new ERR_ACCESS_DENIED('relative symbolic link target');
     }
   }

lib/internal/fs/streams.js

@@ -38,7 +38,7 @@ const {
   validatePath,
 } = require('internal/fs/utils');
 const { Readable, Writable, finished } = require('stream');
-const { toPathIfFileURLOrBuffer } = require('internal/url');
+const { toPathIfFileURL } = require('internal/url');
 const kIoDone = Symbol('kIoDone');
 const kIsPerformingIO = Symbol('kIsPerformingIO');
 
@@ -178,7 +178,7 @@ function ReadStream(path, options) {
     validateFunction(this[kFs].open, 'options.fs.open');
 
     // Path will be ignored when fd is specified, so it can be falsy
-    this.path = toPathIfFileURLOrBuffer(path);
+    this.path = toPathIfFileURL(path);
     this.flags = options.flags === undefined ? 'r' : options.flags;
     this.mode = options.mode === undefined ? 0o666 : options.mode;
 
@@ -330,7 +330,7 @@ function WriteStream(path, options) {
     validateFunction(this[kFs].open, 'options.fs.open');
 
     // Path will be ignored when fd is specified, so it can be falsy
-    this.path = toPathIfFileURLOrBuffer(path);
+    this.path = toPathIfFileURL(path);
     this.flags = options.flags === undefined ? 'w' : options.flags;
     this.mode = options.mode === undefined ? 0o666 : options.mode;
 

lib/internal/fs/utils.js

@@ -50,7 +50,7 @@ const {
   deprecate,
   isWindows,
 } = require('internal/util');
-const { toPathIfFileURLOrBuffer } = require('internal/url');
+const { toPathIfFileURL } = require('internal/url');
 const {
   validateAbortSignal,
   validateBoolean,
@@ -719,8 +719,8 @@ const validatePath = hideStackFrames((path, propName = 'path') => {
   );
 });
 
-const getValidatedPath = hideStackFrames((fileURLOrPathOrBuffer, propName = 'path') => {
-  const path = toPathIfFileURLOrBuffer(fileURLOrPathOrBuffer);
+const getValidatedPath = hideStackFrames((fileURLOrPath, propName = 'path') => {
+  const path = toPathIfFileURL(fileURLOrPath);
   validatePath(path, propName);
   return path;
 });

lib/internal/test_runner/mock/mock.js

@@ -36,7 +36,7 @@ const {
   fileURLToPath,
   isURL,
   pathToFileURL,
-  toPathIfFileURLOrBuffer,
+  toPathIfFileURL,
   URL,
 } = require('internal/url');
 const {
@@ -210,7 +210,7 @@ class MockModuleContext {
       defaultExport,
       hasDefaultExport,
       namedExports,
-      caller: toPathIfFileURLOrBuffer(caller),
+      caller: toPathIfFileURL(caller),
     };
 
     sharedState.mockMap.set(baseURL, config);

lib/internal/url.js

@@ -1670,18 +1670,10 @@ function pathToFileURL(filepath, options = kEmptyObject) {
   return new URL(resolved, undefined, windows ? kCreateURLFromWindowsPathSymbol : kCreateURLFromPosixPathSymbol);
 }
 
-/**
- * @param fileURLOrPathOrBuffer
- * @returns {string}
- */
-function toPathIfFileURLOrBuffer(fileURLOrPathOrBuffer) {
-  if (!isURL(fileURLOrPathOrBuffer)) {
-    if (Buffer.isBuffer(fileURLOrPathOrBuffer)) {
-      return fileURLOrPathOrBuffer.toString();
-    }
-    return fileURLOrPathOrBuffer;
-  }
-  return fileURLToPath(fileURLOrPathOrBuffer);
+function toPathIfFileURL(fileURLOrPath) {
+  if (!isURL(fileURLOrPath))
+    return fileURLOrPath;
+  return fileURLToPath(fileURLOrPath);
 }
 
 /**
@@ -1698,7 +1690,7 @@ module.exports = {
   fileURLToPath,
   fileURLToPathBuffer,
   pathToFileURL,
-  toPathIfFileURLOrBuffer,
+  toPathIfFileURL,
   installObjectURLMethods,
   URL,
   URLPattern,