metro-file-map 0.84.3 → 0.85.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metro-file-map",
-  "version": "0.84.3",
+  "version": "0.85.0",
   "description": "[Experimental] - 🚇 File crawling, watching and mapping for Metro",
   "main": "src/index.js",
   "exports": {
@@ -10,7 +10,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/facebook/metro.git",
+    "url": "git+https://github.com/react/metro.git",
     "directory": "packages/metro-file-map"
   },
   "scripts": {
@@ -33,6 +33,6 @@
     "slash": "^3.0.0"
   },
   "engines": {
-    "node": "^20.19.4 || ^22.13.0 || ^24.3.0 || >= 25.0.0"
+    "node": "^22.13.0 || ^24.3.0 || >= 26.0.0"
   }
 }

package/src/Watcher.d.ts

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @noformat
- * @generated SignedSource<<25fee66c7d26ad53cdd5bbab454fe50b>>
+ * @generated SignedSource<<7e33ffd7eec05b9c9c072189d2ed3ec2>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro-file-map/src/Watcher.js
@@ -30,7 +30,6 @@ type WatcherOptions = {
   console: Console;
   enableSymlinks: boolean;
   extensions: ReadonlyArray<string>;
-  forceNodeFilesystemAPI: boolean;
   healthCheckFilePrefix: string;
   ignoreForCrawl: (filePath: string) => boolean;
   ignorePatternForWatch: RegExp;

package/src/Watcher.js

@@ -103,7 +103,6 @@ class Watcher extends _events.default {
       console: options.console,
       includeSymlinks: options.enableSymlinks,
       extensions: options.extensions,
-      forceNodeFilesystemAPI: options.forceNodeFilesystemAPI,
       ignore: ignoreForCrawl,
       onStatus: (status) => {
         this.emit("status", status);

package/src/Watcher.js.flow

@@ -49,7 +49,6 @@ type WatcherOptions = {
   console: Console,
   enableSymlinks: boolean,
   extensions: ReadonlyArray<string>,
-  forceNodeFilesystemAPI: boolean,
   healthCheckFilePrefix: string,
   ignoreForCrawl: (filePath: string) => boolean,
   ignorePatternForWatch: RegExp,
@@ -72,11 +71,13 @@ export type HealthCheckResult =
 export class Watcher extends EventEmitter {
   #activeWatcher: ?string;
   #backends: ReadonlyArray<WatcherBackend> = [];
-  +#instanceId: number;
+  readonly #instanceId: number;
   #nextHealthCheckId: number = 0;
-  +#options: WatcherOptions;
-  +#pendingHealthChecks: Map</* basename */ string, /* resolve */ () => void> =
-    new Map();
+  readonly #options: WatcherOptions;
+  readonly #pendingHealthChecks: Map<
+    /* basename */ string,
+    /* resolve */ () => void,
+  > = new Map();
 
   constructor(options: WatcherOptions) {
     super();
@@ -131,7 +132,6 @@ export class Watcher extends EventEmitter {
       console: options.console,
       includeSymlinks: options.enableSymlinks,
       extensions: options.extensions,
-      forceNodeFilesystemAPI: options.forceNodeFilesystemAPI,
       ignore: ignoreForCrawl,
       onStatus: status => {
         this.emit('status', status);

package/src/cache/DiskCacheManager.js.flow

@@ -42,8 +42,8 @@ const DEFAULT_DIRECTORY = tmpdir();
 const DEFAULT_AUTO_SAVE_DEBOUNCE_MS = 5000;
 
 export class DiskCacheManager implements CacheManager {
-  +#autoSaveOpts: ?AutoSaveOptions;
-  +#cachePath: string;
+  readonly #autoSaveOpts: ?AutoSaveOptions;
+  readonly #cachePath: string;
   #debounceTimeout: ?Timeout = null;
   #writePromise: Promise<void> = Promise.resolve();
   #hasUnwrittenChanges: boolean = false;

package/src/crawlers/node/index.js

@@ -5,12 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = nodeCrawl;
 var _RootPathUtils = require("../../lib/RootPathUtils");
-var _hasNativeFindSupport = _interopRequireDefault(
-  require("./hasNativeFindSupport"),
-);
-var _child_process = require("child_process");
 var fs = _interopRequireWildcard(require("graceful-fs"));
-var _os = require("os");
 var path = _interopRequireWildcard(require("path"));
 function _interopRequireWildcard(e, t) {
   if ("function" == typeof WeakMap)
@@ -39,10 +34,6 @@ function _interopRequireWildcard(e, t) {
     return f;
   })(e, t);
 }
-function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : { default: e };
-}
-const debug = require("debug")("Metro:NodeCrawler");
 function find(
   roots,
   extensions,
@@ -115,68 +106,11 @@ function find(
     callback(result);
   }
 }
-function findNative(
-  roots,
-  extensions,
-  ignore,
-  includeSymlinks,
-  rootDir,
-  console,
-  callback,
-) {
-  const extensionClause = extensions.length
-    ? `( ${extensions.map((ext) => `-iname *.${ext}`).join(" -o ")} )`
-    : "";
-  const expression = `( ( -type f ${extensionClause} ) ${includeSymlinks ? "-o -type l " : ""})`;
-  const pathUtils = new _RootPathUtils.RootPathUtils(rootDir);
-  const child = (0, _child_process.spawn)(
-    "find",
-    roots.concat(expression.split(" ")),
-  );
-  let stdout = "";
-  if (child.stdout == null) {
-    throw new Error(
-      "stdout is null - this should never happen. Please open up an issue at https://github.com/facebook/metro",
-    );
-  }
-  child.stdout.setEncoding("utf-8");
-  child.stdout.on("data", (data) => (stdout += data));
-  child.stdout.on("close", () => {
-    const lines = stdout
-      .trim()
-      .split("\n")
-      .filter((x) => !ignore(x));
-    const result = new Map();
-    let count = lines.length;
-    if (!count) {
-      callback(new Map());
-    } else {
-      lines.forEach((path) => {
-        fs.lstat(path, (err, stat) => {
-          if (!err && stat) {
-            result.set(pathUtils.absoluteToNormal(path), [
-              stat.mtime.getTime(),
-              stat.size,
-              0,
-              null,
-              stat.isSymbolicLink() ? 1 : 0,
-              null,
-            ]);
-          }
-          if (--count === 0) {
-            callback(result);
-          }
-        });
-      });
-    }
-  });
-}
 async function nodeCrawl(options) {
   const {
     console,
     previousState,
     extensions,
-    forceNodeFilesystemAPI,
     ignore,
     rootDir,
     includeSymlinks,
@@ -187,11 +121,6 @@ async function nodeCrawl(options) {
   } = options;
   abortSignal?.throwIfAborted();
   perfLogger?.point("nodeCrawl_start");
-  const useNativeFind =
-    !forceNodeFilesystemAPI &&
-    (0, _os.platform)() !== "win32" &&
-    (await (0, _hasNativeFindSupport.default)());
-  debug("Using system find: %s", useNativeFind);
   return new Promise((resolve, reject) => {
     const callback = (fileData) => {
       const difference = previousState.fileSystem.getDifference(fileData, {
@@ -205,26 +134,14 @@ async function nodeCrawl(options) {
       }
       resolve(difference);
     };
-    if (useNativeFind) {
-      findNative(
-        roots,
-        extensions,
-        ignore,
-        includeSymlinks,
-        rootDir,
-        console,
-        callback,
-      );
-    } else {
-      find(
-        roots,
-        extensions,
-        ignore,
-        includeSymlinks,
-        rootDir,
-        console,
-        callback,
-      );
-    }
+    find(
+      roots,
+      extensions,
+      ignore,
+      includeSymlinks,
+      rootDir,
+      console,
+      callback,
+    );
   });
 }

package/src/crawlers/node/index.js.flow

@@ -18,15 +18,9 @@ import type {
 } from '../../flow-types';
 
 import {RootPathUtils} from '../../lib/RootPathUtils';
-import hasNativeFindSupport from './hasNativeFindSupport';
-import {spawn} from 'child_process';
 import * as fs from 'graceful-fs';
-import {platform} from 'os';
 import * as path from 'path';
 
-// eslint-disable-next-line import/no-commonjs
-const debug = require('debug')('Metro:NodeCrawler');
-
 type Callback = (result: FileData) => void;
 
 function find(
@@ -106,70 +100,6 @@ function find(
   }
 }
 
-function findNative(
-  roots: ReadonlyArray<string>,
-  extensions: ReadonlyArray<string>,
-  ignore: IgnoreMatcher,
-  includeSymlinks: boolean,
-  rootDir: string,
-  console: Console,
-  callback: Callback,
-): void {
-  // Examples:
-  // ( ( -type f ( -iname *.js ) ) )
-  // ( ( -type f ( -iname *.js -o -iname *.ts ) ) )
-  // ( ( -type f ( -iname *.js ) ) -o -type l )
-  // ( ( -type f ) -o -type l )
-  const extensionClause = extensions.length
-    ? `( ${extensions.map(ext => `-iname *.${ext}`).join(' -o ')} )`
-    : ''; // Empty inner expressions eg "( )" are not allowed
-  const expression = `( ( -type f ${extensionClause} ) ${
-    includeSymlinks ? '-o -type l ' : ''
-  })`;
-
-  const pathUtils = new RootPathUtils(rootDir);
-
-  const child = spawn('find', roots.concat(expression.split(' ')));
-  let stdout = '';
-  if (child.stdout == null) {
-    throw new Error(
-      'stdout is null - this should never happen. Please open up an issue at https://github.com/facebook/metro',
-    );
-  }
-  child.stdout.setEncoding('utf-8');
-  child.stdout.on('data', data => (stdout += data));
-
-  child.stdout.on('close', () => {
-    const lines = stdout
-      .trim()
-      .split('\n')
-      .filter(x => !ignore(x));
-    const result: FileData = new Map();
-    let count = lines.length;
-    if (!count) {
-      callback(new Map());
-    } else {
-      lines.forEach(path => {
-        fs.lstat(path, (err, stat) => {
-          if (!err && stat) {
-            result.set(pathUtils.absoluteToNormal(path), [
-              stat.mtime.getTime(),
-              stat.size,
-              0,
-              null,
-              stat.isSymbolicLink() ? 1 : 0,
-              null,
-            ]);
-          }
-          if (--count === 0) {
-            callback(result);
-          }
-        });
-      });
-    }
-  });
-}
-
 export default async function nodeCrawl(
   options: CrawlerOptions,
 ): Promise<CrawlResult> {
@@ -177,7 +107,6 @@ export default async function nodeCrawl(
     console,
     previousState,
     extensions,
-    forceNodeFilesystemAPI,
     ignore,
     rootDir,
     includeSymlinks,
@@ -190,12 +119,6 @@ export default async function nodeCrawl(
   abortSignal?.throwIfAborted();
 
   perfLogger?.point('nodeCrawl_start');
-  const useNativeFind =
-    !forceNodeFilesystemAPI &&
-    platform() !== 'win32' &&
-    (await hasNativeFindSupport());
-
-  debug('Using system find: %s', useNativeFind);
 
   return new Promise((resolve, reject) => {
     const callback: Callback = fileData => {
@@ -214,26 +137,14 @@ export default async function nodeCrawl(
       resolve(difference);
     };
 
-    if (useNativeFind) {
-      findNative(
-        roots,
-        extensions,
-        ignore,
-        includeSymlinks,
-        rootDir,
-        console,
-        callback,
-      );
-    } else {
-      find(
-        roots,
-        extensions,
-        ignore,
-        includeSymlinks,
-        rootDir,
-        console,
-        callback,
-      );
-    }
+    find(
+      roots,
+      extensions,
+      ignore,
+      includeSymlinks,
+      rootDir,
+      console,
+      callback,
+    );
   });
 }

package/src/flow-types.d.ts

@@ -6,7 +6,7 @@
  *
  * @noformat
  * @oncall react_native
- * @generated SignedSource<<b3646c81d37188726a1fc27777dcbede>>
+ * @generated SignedSource<<6ff16bb65883df0a1cb70e6ca94461eb>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro-file-map/src/flow-types.js
@@ -22,7 +22,6 @@ export type BuildParameters = Readonly<{
   computeSha1: boolean;
   enableSymlinks: boolean;
   extensions: ReadonlyArray<string>;
-  forceNodeFilesystemAPI: boolean;
   ignorePattern: RegExp;
   plugins: ReadonlyArray<InputFileMapPlugin>;
   retainAllFiles: boolean;
@@ -95,7 +94,6 @@ export type CrawlerOptions = {
   computeSha1: boolean;
   console: Console;
   extensions: ReadonlyArray<string>;
-  forceNodeFilesystemAPI: boolean;
   ignore: IgnoreMatcher;
   includeSymlinks: boolean;
   perfLogger?: null | undefined | PerfLogger;
@@ -192,12 +190,12 @@ export interface FileMapPlugin<
 }
 export type InputFileMapPlugin = FileMapPlugin<
   /**
-   * > 235 | export type InputFileMapPlugin = FileMapPlugin<empty, empty>;
+   * > 233 | export type InputFileMapPlugin = FileMapPlugin<empty, empty>;
    *       |                                                ^^^^^ Unsupported feature: Translating "empty type" is currently not supported.
    **/
   any,
   /**
-   * > 235 | export type InputFileMapPlugin = FileMapPlugin<empty, empty>;
+   * > 233 | export type InputFileMapPlugin = FileMapPlugin<empty, empty>;
    *       |                                                       ^^^^^ Unsupported feature: Translating "empty type" is currently not supported.
    **/
   any

package/src/flow-types.js.flow

@@ -19,7 +19,6 @@ export type BuildParameters = Readonly<{
   computeSha1: boolean,
   enableSymlinks: boolean,
   extensions: ReadonlyArray<string>,
-  forceNodeFilesystemAPI: boolean,
   ignorePattern: RegExp,
   plugins: ReadonlyArray<InputFileMapPlugin>,
   retainAllFiles: boolean,
@@ -114,7 +113,6 @@ export type CrawlerOptions = {
   computeSha1: boolean,
   console: Console,
   extensions: ReadonlyArray<string>,
-  forceNodeFilesystemAPI: boolean,
   ignore: IgnoreMatcher,
   includeSymlinks: boolean,
   perfLogger?: ?PerfLogger,
@@ -171,8 +169,8 @@ export type DuplicatesSet = Map<string, /* type */ number>;
 export type DuplicatesIndex = Map<string, Map<string, DuplicatesSet>>;
 
 export type FileMapPluginInitOptions<
-  +SerializableState,
-  +PerFileData = void,
+  out SerializableState,
+  out PerFileData = void,
 > = Readonly<{
   files: Readonly<{
     fileIterator(
@@ -183,13 +181,13 @@ export type FileMapPluginInitOptions<
     ): Iterable<{
       baseName: string,
       canonicalPath: string,
-      +pluginData: ?PerFileData,
+      readonly pluginData: ?PerFileData,
     }>,
     lookup(
       mixedPath: string,
     ):
       | {exists: false}
-      | {exists: true, type: 'f', +pluginData: PerFileData}
+      | {exists: true, type: 'f', readonly pluginData: PerFileData}
       | {exists: true, type: 'd'},
   }>,
   pluginState: ?SerializableState,
@@ -214,10 +212,10 @@ export type V8Serializable =
   | Readonly<{[key: string]: V8Serializable}>;
 
 export interface FileMapPlugin<
-  -SerializableState extends void | V8Serializable = void | V8Serializable,
-  -PerFileData extends void | V8Serializable = void | V8Serializable,
+  in SerializableState extends void | V8Serializable = void | V8Serializable,
+  in PerFileData extends void | V8Serializable = void | V8Serializable,
 > {
-  +name: string;
+  readonly name: string;
   initialize(
     initOptions: FileMapPluginInitOptions<SerializableState, PerFileData>,
   ): Promise<void>;
@@ -461,13 +459,13 @@ export interface FileSystemListener {
   fileRemoved(canonicalPath: CanonicalPath, data: FileMetadata): void;
 }
 
-export interface ReadonlyFileSystemChanges<+T = FileMetadata> {
-  +addedDirectories: Iterable<CanonicalPath>;
-  +removedDirectories: Iterable<CanonicalPath>;
+export interface ReadonlyFileSystemChanges<out T = FileMetadata> {
+  readonly addedDirectories: Iterable<CanonicalPath>;
+  readonly removedDirectories: Iterable<CanonicalPath>;
 
-  +addedFiles: Iterable<Readonly<[CanonicalPath, T]>>;
-  +modifiedFiles: Iterable<Readonly<[CanonicalPath, T]>>;
-  +removedFiles: Iterable<Readonly<[CanonicalPath, T]>>;
+  readonly addedFiles: Iterable<Readonly<[CanonicalPath, T]>>;
+  readonly modifiedFiles: Iterable<Readonly<[CanonicalPath, T]>>;
+  readonly removedFiles: Iterable<Readonly<[CanonicalPath, T]>>;
 }
 
 export interface MutableFileSystem extends FileSystem {

package/src/index.d.ts

@@ -6,7 +6,7 @@
  *
  * @noformat
  * @oncall react_native
- * @generated SignedSource<<806d228988308075b7a911c3dfb513d3>>
+ * @generated SignedSource<<220686ad19cc94bec3b8d89f49fa6304>>
  *
  * This file was translated from Flow by scripts/generateTypeScriptDefinitions.js
  * Original file: packages/metro-file-map/src/index.js
@@ -49,7 +49,6 @@ export type InputOptions = Readonly<{
   computeSha1?: null | undefined | boolean;
   enableSymlinks?: null | undefined | boolean;
   extensions: ReadonlyArray<string>;
-  forceNodeFilesystemAPI?: null | undefined | boolean;
   ignorePattern?: null | undefined | RegExp;
   plugins?: ReadonlyArray<InputFileMapPlugin>;
   retainAllFiles: boolean;

package/src/index.js

@@ -164,7 +164,6 @@ class FileMap extends _events.default {
       computeSha1: options.computeSha1 || false,
       enableSymlinks: options.enableSymlinks || false,
       extensions: options.extensions,
-      forceNodeFilesystemAPI: !!options.forceNodeFilesystemAPI,
       ignorePattern,
       plugins,
       retainAllFiles: options.retainAllFiles,
@@ -335,7 +334,6 @@ class FileMap extends _events.default {
       computeSha1,
       enableSymlinks,
       extensions,
-      forceNodeFilesystemAPI,
       ignorePattern,
       retainAllFiles,
       roots,
@@ -349,7 +347,6 @@ class FileMap extends _events.default {
       console: this.#console,
       enableSymlinks,
       extensions,
-      forceNodeFilesystemAPI,
       healthCheckFilePrefix: this.#options.healthCheck.filePrefix,
       ignoreForCrawl: (filePath) => {
         const ignoreMatched = ignorePattern.test(filePath);

package/src/index.js.flow

@@ -78,7 +78,6 @@ export type InputOptions = Readonly<{
   computeSha1?: ?boolean,
   enableSymlinks?: ?boolean,
   extensions: ReadonlyArray<string>,
-  forceNodeFilesystemAPI?: ?boolean,
   ignorePattern?: ?RegExp,
   plugins?: ReadonlyArray<InputFileMapPlugin>,
   retainAllFiles: boolean,
@@ -249,18 +248,18 @@ const WATCHMAN_REQUIRED_CAPABILITIES = [
  */
 export default class FileMap extends EventEmitter {
   #buildPromise: ?Promise<BuildResult>;
-  +#cacheManager: CacheManager;
+  readonly #cacheManager: CacheManager;
   #canUseWatchmanPromise: Promise<boolean>;
   #changeID: number;
   #changeInterval: ?IntervalID;
-  +#console: Console;
-  +#crawlerAbortController: AbortController;
-  +#fileProcessor: FileProcessor;
+  readonly #console: Console;
+  readonly #crawlerAbortController: AbortController;
+  readonly #fileProcessor: FileProcessor;
   #healthCheckInterval: ?IntervalID;
-  +#options: InternalOptions;
-  +#pathUtils: RootPathUtils;
-  +#plugins: ReadonlyArray<IndexedPlugin>;
-  +#startupPerfLogger: ?PerfLogger;
+  readonly #options: InternalOptions;
+  readonly #pathUtils: RootPathUtils;
+  readonly #plugins: ReadonlyArray<IndexedPlugin>;
+  readonly #startupPerfLogger: ?PerfLogger;
   #watcher: ?Watcher;
 
   static create(options: InputOptions): FileMap {
@@ -318,7 +317,6 @@ export default class FileMap extends EventEmitter {
       computeSha1: options.computeSha1 || false,
       enableSymlinks: options.enableSymlinks || false,
       extensions: options.extensions,
-      forceNodeFilesystemAPI: !!options.forceNodeFilesystemAPI,
       ignorePattern,
       plugins,
       retainAllFiles: options.retainAllFiles,
@@ -515,7 +513,6 @@ export default class FileMap extends EventEmitter {
       computeSha1,
       enableSymlinks,
       extensions,
-      forceNodeFilesystemAPI,
       ignorePattern,
       retainAllFiles,
       roots,
@@ -530,7 +527,6 @@ export default class FileMap extends EventEmitter {
       console: this.#console,
       enableSymlinks,
       extensions,
-      forceNodeFilesystemAPI,
       healthCheckFilePrefix: this.#options.healthCheck.filePrefix,
       // TODO: Refactor out the two different ignore strategies here.
       ignoreForCrawl: filePath => {

package/src/lib/FileProcessor.js.flow

@@ -40,8 +40,8 @@ type ProcessFileRequest = Readonly<{
 }>;
 
 interface AsyncWorker {
-  +processFile: WorkerMessage => Promise<WorkerMetadata>;
-  +end: () => Promise<void>;
+  readonly processFile: WorkerMessage => Promise<WorkerMetadata>;
+  readonly end: () => Promise<void>;
 }
 
 interface MaybeCodedError extends Error {

package/src/lib/FileSystemChangeAggregator.js.flow

@@ -18,16 +18,16 @@ import type {
 
 export class FileSystemChangeAggregator implements FileSystemListener {
   // Mutually exclusive with removedDirectories
-  +#addedDirectories: Set<CanonicalPath> = new Set();
+  readonly #addedDirectories: Set<CanonicalPath> = new Set();
   // Mutually exclusive with addedDirectories
-  +#removedDirectories: Set<CanonicalPath> = new Set();
+  readonly #removedDirectories: Set<CanonicalPath> = new Set();
 
   // Mutually exclusive with modified and removed files
-  +#addedFiles: Map<CanonicalPath, FileMetadata> = new Map();
+  readonly #addedFiles: Map<CanonicalPath, FileMetadata> = new Map();
   // Mutually exclusive with added and removed files
-  +#modifiedFiles: Map<CanonicalPath, FileMetadata> = new Map();
+  readonly #modifiedFiles: Map<CanonicalPath, FileMetadata> = new Map();
   // Mutually exclusive with added and modified files
-  +#removedFiles: Map<CanonicalPath, FileMetadata> = new Map();
+  readonly #removedFiles: Map<CanonicalPath, FileMetadata> = new Map();
 
   // Removed files must be paired with the file's metadata the last time it was
   // observable by consumers - ie, immediately *before* this batch. To report
@@ -36,7 +36,7 @@ export class FileSystemChangeAggregator implements FileSystemListener {
   // re-added, modified and removed again, we still have the initial metadata.
   // This is particularly important if, say, a regular file is replaced by a
   // symlink, or vice-versa.
-  +#initialMetadata: Map<CanonicalPath, FileMetadata> = new Map();
+  readonly #initialMetadata: Map<CanonicalPath, FileMetadata> = new Map();
 
   directoryAdded(canonicalPath: CanonicalPath): void {
     // Only add to newDirectories if this directory wasn't previously removed

package/src/lib/RootPathUtils.js

@@ -40,6 +40,8 @@ const UP_FRAGMENT_SEP = ".." + path.sep;
 const SEP_UP_FRAGMENT = path.sep + "..";
 const UP_FRAGMENT_SEP_LENGTH = UP_FRAGMENT_SEP.length;
 const CURRENT_FRAGMENT = "." + path.sep;
+const IS_WIN32 = path.sep === "\\";
+const ROOT_BASE_IDX = IS_WIN32 ? 0 : 1;
 class RootPathUtils {
   #rootDir;
   #rootDirnames;
@@ -114,6 +116,8 @@ class RootPathUtils {
     const right = pos === 0 ? normalPath : normalPath.slice(pos);
     if (right.length === 0) {
       return left;
+    } else if (IS_WIN32 && pos > this.#rootDepth * UP_FRAGMENT_SEP_LENGTH) {
+      return right;
     }
     if (i === this.#rootDepth) {
       return left + right;
@@ -152,7 +156,9 @@ class RootPathUtils {
         normalPath,
       };
     }
-    const left = normalPath + path.sep;
+    const left = normalPath.endsWith(path.sep)
+      ? normalPath
+      : normalPath + path.sep;
     const rawPath = left + relativePath;
     if (normalPath === ".." || normalPath.endsWith(SEP_UP_FRAGMENT)) {
       const collapsed = this.#tryCollapseIndirectionsInSuffix(rawPath, 0, 0);
@@ -230,7 +236,7 @@ class RootPathUtils {
           collapsedSegments,
         };
       }
-      if (totalUpIndirections < this.#rootParts.length - 1) {
+      if (totalUpIndirections < this.#rootParts.length - ROOT_BASE_IDX) {
         totalUpIndirections++;
       }
       if (nextIndirection !== pos + 1 || fullPath[pos] !== ".") {