@zenfs/core 1.3.4 → 1.3.6

package/dist/config.d.ts

@@ -1,5 +1,4 @@
 import type { Backend, BackendConfiguration, FilesystemOf, SharedConfig } from './backends/backend.js';
-import type { AbsolutePath } from './emulation/path.js';
 /**
  * Configuration for a specific mount point
  */
@@ -9,8 +8,11 @@ export type MountConfiguration<T extends Backend> = FilesystemOf<T> | BackendCon
  * @see MountConfiguration
  */
 export declare function resolveMountConfig<T extends Backend>(configuration: MountConfiguration<T>, _depth?: number): Promise<FilesystemOf<T>>;
+/**
+ * An object mapping mount points to backends
+ */
 export interface ConfigMounts {
-    [K: AbsolutePath]: Backend;
+    [K: string]: Backend;
 }
 /**
  * Configuration
@@ -20,7 +22,7 @@ export interface Configuration<T extends ConfigMounts> extends SharedConfig {
      * An object mapping mount points to mount configuration
      */
     mounts: {
-        [K in keyof T & AbsolutePath]: MountConfiguration<T[K]>;
+        [K in keyof T]: MountConfiguration<T[K]>;
     };
     /**
      * The uid to use

package/dist/config.js

@@ -96,10 +96,8 @@ export async function configure(configuration) {
     if (configuration.mounts) {
         const toMount = [];
         let unmountRoot = false;
-        for (const [point, mountConfig] of Object.entries(configuration.mounts)) {
-            if (!point.startsWith('/')) {
-                throw new ErrnoError(Errno.EINVAL, 'Mount points must have absolute paths');
-            }
+        for (const [_point, mountConfig] of Object.entries(configuration.mounts)) {
+            const point = _point.startsWith('/') ? _point : '/' + _point;
             if (isBackendConfig(mountConfig)) {
                 mountConfig.disableAsyncCache ?? (mountConfig.disableAsyncCache = configuration.disableAsyncCache || false);
             }

package/dist/emulation/cache.d.ts

@@ -7,26 +7,30 @@ export declare class Cache<T> {
     isEnabled: boolean;
     protected sync: Map<string, T>;
     protected async: Map<string, Promise<T>>;
+    /**
+     * Whether the data exists in the cache
+     */
+    has(path: string): boolean;
     /**
      * Gets data from the cache, if is exists and the cache is enabled.
      */
-    getSync(path: string): T | undefined;
+    get(path: string): T | undefined;
     /**
      * Adds data if the cache is enabled
      */
-    setSync(path: string, value: T): void;
+    set(path: string, value: T): void;
     /**
-     * Clears the cache if it is enabled
+     * Whether the data exists in the cache
      */
-    clearSync(): void;
+    hasAsync(path: string): boolean;
     /**
      * Gets data from the cache, if it exists and the cache is enabled.
      */
-    get(path: string): Promise<T> | undefined;
+    getAsync(path: string): Promise<T> | undefined;
     /**
      * Adds data if the cache is enabled
      */
-    set(path: string, value: Promise<T>): void;
+    setAsync(path: string, value: Promise<T>): void;
     /**
      * Clears the cache if it is enabled
      */

package/dist/emulation/cache.js

@@ -9,10 +9,16 @@ export class Cache {
         this.sync = new Map();
         this.async = new Map();
     }
+    /**
+     * Whether the data exists in the cache
+     */
+    has(path) {
+        return this.isEnabled && this.sync.has(path);
+    }
     /**
      * Gets data from the cache, if is exists and the cache is enabled.
      */
-    getSync(path) {
+    get(path) {
         if (!this.isEnabled)
             return;
         return this.sync.get(path);
@@ -20,24 +26,22 @@ export class Cache {
     /**
      * Adds data if the cache is enabled
      */
-    setSync(path, value) {
+    set(path, value) {
         if (!this.isEnabled)
             return;
         this.sync.set(path, value);
         this.async.set(path, Promise.resolve(value));
     }
     /**
-     * Clears the cache if it is enabled
+     * Whether the data exists in the cache
      */
-    clearSync() {
-        if (!this.isEnabled)
-            return;
-        this.sync.clear();
+    hasAsync(path) {
+        return this.isEnabled && this.async.has(path);
     }
     /**
      * Gets data from the cache, if it exists and the cache is enabled.
      */
-    get(path) {
+    getAsync(path) {
         if (!this.isEnabled)
             return;
         return this.async.get(path);
@@ -45,7 +49,7 @@ export class Cache {
     /**
      * Adds data if the cache is enabled
      */
-    set(path, value) {
+    setAsync(path, value) {
         if (!this.isEnabled)
             return;
         this.async.set(path, value);
@@ -57,6 +61,7 @@ export class Cache {
     clear() {
         if (!this.isEnabled)
             return;
+        this.sync.clear();
         this.async.clear();
     }
 }

package/dist/emulation/promises.js

@@ -56,7 +56,7 @@ import * as cache from './cache.js';
 import { config } from './config.js';
 import * as constants from './constants.js';
 import { Dir, Dirent } from './dir.js';
-import { dirname, join, parse } from './path.js';
+import { dirname, join, parse, resolve } from './path.js';
 import { _statfs, fd2file, fdMap, file2fd, fixError, resolveMount } from './shared.js';
 import { ReadStream, WriteStream } from './streams.js';
 import { FSWatcher, emitChange } from './watchers.js';
@@ -360,6 +360,7 @@ export async function rename(oldPath, newPath) {
         if (src.mountPoint == dst.mountPoint) {
             await src.fs.rename(src.path, dst.path);
             emitChange('rename', oldPath.toString());
+            emitChange('change', newPath.toString());
             return;
         }
         await writeFile(newPath, await readFile(oldPath));
@@ -435,7 +436,7 @@ export async function unlink(path) {
     path = normalizePath(path);
     const { fs, path: resolved } = resolveMount(path);
     try {
-        if (config.checkAccess && !(await (cache.stats.get(path) || fs.stat(resolved))).hasAccess(constants.W_OK)) {
+        if (config.checkAccess && !(await (cache.stats.getAsync(path) || fs.stat(resolved))).hasAccess(constants.W_OK)) {
             throw ErrnoError.With('EACCES', resolved, 'unlink');
         }
         await fs.unlink(resolved);
@@ -583,7 +584,7 @@ export async function rmdir(path) {
     path = await realpath(path);
     const { fs, path: resolved } = resolveMount(path);
     try {
-        const stats = await (cache.stats.get(path) || fs.stat(resolved));
+        const stats = await (cache.stats.getAsync(path) || fs.stat(resolved));
         if (!stats) {
             throw ErrnoError.With('ENOENT', path, 'rmdir');
         }
@@ -642,8 +643,8 @@ export async function readdir(path, options) {
         throw fixError(e, { [resolved]: path });
     };
     const { fs, path: resolved } = resolveMount(path);
-    const _stats = cache.stats.get(path) || fs.stat(resolved).catch(handleError);
-    cache.stats.set(path, _stats);
+    const _stats = cache.stats.getAsync(path) || fs.stat(resolved).catch(handleError);
+    cache.stats.setAsync(path, _stats);
     const stats = await _stats;
     if (!stats) {
         throw ErrnoError.With('ENOENT', path, 'readdir');
@@ -659,8 +660,8 @@ export async function readdir(path, options) {
     const addEntry = async (entry) => {
         let entryStats;
         if (options?.recursive || options?.withFileTypes) {
-            const _entryStats = cache.stats.get(join(path, entry)) || fs.stat(join(resolved, entry)).catch(handleError);
-            cache.stats.set(join(path, entry), _entryStats);
+            const _entryStats = cache.stats.getAsync(join(path, entry)) || fs.stat(join(resolved, entry)).catch(handleError);
+            cache.stats.setAsync(join(path, entry), _entryStats);
             entryStats = await _entryStats;
         }
         if (options?.withFileTypes) {
@@ -880,17 +881,23 @@ export async function lutimes(path, atime, mtime) {
 lutimes;
 export async function realpath(path, options) {
     path = normalizePath(path);
+    if (cache.paths.hasAsync(path))
+        return cache.paths.getAsync(path);
     const { base, dir } = parse(path);
-    const lpath = join(dir == '/' ? '/' : await (cache.paths.get(dir) || realpath(dir)), base);
-    const { fs, path: resolvedPath, mountPoint } = resolveMount(lpath);
+    const realDir = dir == '/' ? '/' : await (cache.paths.getAsync(dir) || realpath(dir));
+    const lpath = join(realDir, base);
+    const { fs, path: resolvedPath } = resolveMount(lpath);
     try {
-        const _stats = cache.stats.get(lpath) || fs.stat(resolvedPath);
-        cache.stats.set(lpath, _stats);
+        const _stats = cache.stats.getAsync(lpath) || fs.stat(resolvedPath);
+        cache.stats.setAsync(lpath, _stats);
         if (!(await _stats).isSymbolicLink()) {
+            cache.paths.set(path, lpath);
             return lpath;
         }
-        const target = mountPoint + (await readlink(lpath));
-        return await (cache.paths.get(target) || realpath(target));
+        const target = resolve(realDir, await readlink(lpath));
+        const real = cache.paths.getAsync(target) || realpath(target);
+        cache.paths.setAsync(path, real);
+        return await real;
     }
     catch (e) {
         if (e.code == 'ENOENT') {
@@ -945,7 +952,7 @@ access;
  */
 export async function rm(path, options) {
     path = normalizePath(path);
-    const stats = await (cache.stats.get(path) ||
+    const stats = await (cache.stats.getAsync(path) ||
         stat(path).catch((error) => {
             if (error.code == 'ENOENT' && options?.force)
                 return undefined;
@@ -954,7 +961,7 @@ export async function rm(path, options) {
     if (!stats) {
         return;
     }
-    cache.stats.setSync(path, stats);
+    cache.stats.set(path, stats);
     switch (stats.mode & constants.S_IFMT) {
         case constants.S_IFDIR:
             if (options?.recursive) {
@@ -966,10 +973,10 @@ export async function rm(path, options) {
             break;
         case constants.S_IFREG:
         case constants.S_IFLNK:
-            await unlink(path);
-            break;
         case constants.S_IFBLK:
         case constants.S_IFCHR:
+            await unlink(path);
+            break;
         case constants.S_IFIFO:
         case constants.S_IFSOCK:
         default:

package/dist/emulation/shared.js

@@ -4,6 +4,7 @@ import { Errno, ErrnoError } from '../error.js';
 import { normalizePath } from '../utils.js';
 import { resolve } from './path.js';
 import { size_max } from './constants.js';
+import { paths as pathCache } from './cache.js';
 // descriptors
 export const fdMap = new Map();
 let nextFd = 100;
@@ -37,6 +38,7 @@ export function mount(mountPoint, fs) {
         throw new ErrnoError(Errno.EINVAL, 'Mount point ' + mountPoint + ' is already in use.');
     }
     mounts.set(mountPoint, fs);
+    pathCache.clear();
 }
 /**
  * Unmounts the file system at `mountPoint`.
@@ -50,6 +52,7 @@ export function umount(mountPoint) {
         throw new ErrnoError(Errno.EINVAL, 'Mount point ' + mountPoint + ' is already unmounted.');
     }
     mounts.delete(mountPoint);
+    pathCache.clear();
 }
 /**
  * Gets the internal `FileSystem` for the path, then returns it along with the path relative to the FS' root

package/dist/emulation/sync.js

@@ -54,7 +54,7 @@ import * as cache from './cache.js';
 import { config } from './config.js';
 import * as constants from './constants.js';
 import { Dir, Dirent } from './dir.js';
-import { dirname, join, parse } from './path.js';
+import { dirname, join, parse, resolve } from './path.js';
 import { _statfs, fd2file, fdMap, file2fd, fixError, resolveMount } from './shared.js';
 import { emitChange } from './watchers.js';
 export function renameSync(oldPath, newPath) {
@@ -69,6 +69,7 @@ export function renameSync(oldPath, newPath) {
         if (oldMount === newMount) {
             oldMount.fs.renameSync(oldMount.path, newMount.path);
             emitChange('rename', oldPath.toString());
+            emitChange('change', newPath.toString());
             return;
         }
         writeFileSync(newPath, readFileSync(oldPath));
@@ -147,7 +148,7 @@ export function unlinkSync(path) {
     path = normalizePath(path);
     const { fs, path: resolved } = resolveMount(path);
     try {
-        if (config.checkAccess && !(cache.stats.getSync(path) || fs.statSync(resolved)).hasAccess(constants.W_OK)) {
+        if (config.checkAccess && !(cache.stats.get(path) || fs.statSync(resolved)).hasAccess(constants.W_OK)) {
             throw ErrnoError.With('EACCES', resolved, 'unlink');
         }
         fs.unlinkSync(resolved);
@@ -393,7 +394,7 @@ export function rmdirSync(path) {
     path = normalizePath(path);
     const { fs, path: resolved } = resolveMount(realpathSync(path));
     try {
-        const stats = cache.stats.getSync(path) || fs.statSync(resolved);
+        const stats = cache.stats.get(path) || fs.statSync(resolved);
         if (!stats.isDirectory()) {
             throw ErrnoError.With('ENOTDIR', resolved, 'rmdir');
         }
@@ -446,8 +447,8 @@ export function readdirSync(path, options) {
     const { fs, path: resolved } = resolveMount(realpathSync(path));
     let entries;
     try {
-        const stats = cache.stats.getSync(path) || fs.statSync(resolved);
-        cache.stats.setSync(path, stats);
+        const stats = cache.stats.get(path) || fs.statSync(resolved);
+        cache.stats.set(path, stats);
         if (config.checkAccess && !stats.hasAccess(constants.R_OK)) {
             throw ErrnoError.With('EACCES', resolved, 'readdir');
         }
@@ -462,8 +463,8 @@ export function readdirSync(path, options) {
     // Iterate over entries and handle recursive case if needed
     const values = [];
     for (const entry of entries) {
-        const entryStat = cache.stats.getSync(join(path, entry)) || fs.statSync(join(resolved, entry));
-        cache.stats.setSync(join(path, entry), entryStat);
+        const entryStat = cache.stats.get(join(path, entry)) || fs.statSync(join(resolved, entry));
+        cache.stats.set(join(path, entry), entryStat);
         if (options?.withFileTypes) {
             values.push(new Dirent(entry, entryStat));
         }
@@ -489,7 +490,7 @@ export function readdirSync(path, options) {
         }
     }
     if (!options?._isIndirect) {
-        cache.stats.clearSync();
+        cache.stats.clear();
     }
     return values;
 }
@@ -592,16 +593,23 @@ export function lutimesSync(path, atime, mtime) {
 lutimesSync;
 export function realpathSync(path, options) {
     path = normalizePath(path);
+    if (cache.paths.has(path))
+        return cache.paths.get(path);
     const { base, dir } = parse(path);
-    const lpath = join(dir == '/' ? '/' : cache.paths.getSync(dir) || realpathSync(dir), base);
-    const { fs, path: resolvedPath, mountPoint } = resolveMount(lpath);
+    const realDir = dir == '/' ? '/' : cache.paths.get(dir) || realpathSync(dir);
+    const lpath = join(realDir, base);
+    const { fs, path: resolvedPath } = resolveMount(lpath);
     try {
-        const stats = fs.statSync(resolvedPath);
+        const stats = cache.stats.get(lpath) || fs.statSync(resolvedPath);
+        cache.stats.set(lpath, stats);
         if (!stats.isSymbolicLink()) {
+            cache.paths.set(path, lpath);
             return lpath;
         }
-        const target = mountPoint + readlinkSync(lpath, options).toString();
-        return cache.paths.getSync(target) || realpathSync(target);
+        const target = resolve(realDir, readlinkSync(lpath, options).toString());
+        const real = cache.paths.get(target) || realpathSync(target);
+        cache.paths.set(path, real);
+        return real;
     }
     catch (e) {
         if (e.code == 'ENOENT') {
@@ -627,7 +635,7 @@ export function rmSync(path, options) {
     path = normalizePath(path);
     let stats;
     try {
-        stats = cache.stats.getSync(path) || statSync(path);
+        stats = cache.stats.get(path) || statSync(path);
     }
     catch (error) {
         if (error.code != 'ENOENT' || !options?.force)
@@ -636,7 +644,7 @@ export function rmSync(path, options) {
     if (!stats) {
         return;
     }
-    cache.stats.setSync(path, stats);
+    cache.stats.set(path, stats);
     switch (stats.mode & constants.S_IFMT) {
         case constants.S_IFDIR:
             if (options?.recursive) {
@@ -648,18 +656,18 @@ export function rmSync(path, options) {
             break;
         case constants.S_IFREG:
         case constants.S_IFLNK:
-            unlinkSync(path);
-            break;
         case constants.S_IFBLK:
         case constants.S_IFCHR:
+            unlinkSync(path);
+            break;
         case constants.S_IFIFO:
         case constants.S_IFSOCK:
         default:
-            cache.stats.clearSync();
+            cache.stats.clear();
             throw new ErrnoError(Errno.EPERM, 'File type not supported', path, 'rm');
     }
     if (!options?._isIndirect) {
-        cache.stats.clearSync();
+        cache.stats.clear();
     }
 }
 rmSync;

package/dist/stats.js

@@ -109,10 +109,8 @@ export class StatsCommon {
      * @internal
      */
     hasAccess(mode) {
-        if (credentials.euid === 0 || credentials.egid === 0) {
-            // Running as root
+        if (this.isSymbolicLink() || credentials.euid === 0 || credentials.egid === 0)
             return true;
-        }
         let perm = 0;
         // Owner permissions
         if (credentials.uid === this.uid) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zenfs/core",
-	"version": "1.3.4",
+	"version": "1.3.6",
 	"description": "A filesystem, anywhere",
 	"funding": {
 		"type": "individual",
@@ -74,10 +74,12 @@
 		"@types/readable-stream": "^4.0.10",
 		"buffer": "^6.0.3",
 		"eventemitter3": "^5.0.1",
-		"minimatch": "^9.0.3",
 		"readable-stream": "^4.5.2",
 		"utilium": "^1.0.0"
 	},
+	"optionalDependencies": {
+		"minimatch": "^9.0.3"
+	},
 	"devDependencies": {
 		"@eslint/js": "^9.8.0",
 		"@types/eslint__js": "^8.42.3",

package/readme.md

@@ -64,6 +64,8 @@ await configure({
 };
 ```
 
+Note that while you aren't required to use absolute paths for the keys of `mounts`, it is a good practice to do so.
+
 > [!TIP]
 > When configuring a mount point, you can pass in
 >

package/scripts/make-index.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 import { readdirSync, statSync, writeFileSync } from 'node:fs';
-import { minimatch } from 'minimatch';
-import { join, relative, resolve } from 'node:path/posix';
+import _path from 'node:path/posix';
 import { parseArgs } from 'node:util';
 
 const { values: options, positionals } = parseArgs({
@@ -37,6 +36,24 @@ if (options.quiet && options.verbose) {
 	process.exit();
 }
 
+let matchesGlob = _path.matchesGlob;
+
+if (matchesGlob && options.verbose) {
+	console.debug('[debug] path.matchesGlob is available.');
+}
+
+if (!matchesGlob) {
+	console.warn('Warning: path.matchesGlob is not available, falling back to minimatch. (Node 20.17.0+ or 22.5.0+ needed)');
+
+	try {
+		const { minimatch } = await import('minimatch');
+		matchesGlob = minimatch;
+	} catch {
+		console.error('Fatal error: Failed to fall back to minimatch (is it installed?)');
+		process.exit(1);
+	}
+}
+
 function fixSlash(path) {
 	return path.replaceAll('\\', '/');
 }
@@ -71,7 +88,7 @@ const entries = new Map();
 
 function computeEntries(path) {
 	try {
-		if (options.ignore.some(pattern => minimatch(path, pattern))) {
+		if (options.ignore.some(pattern => matchesGlob(path, pattern))) {
 			if (!options.quiet) console.log(`${color('yellow', 'skip')} ${path}`);
 			return;
 		}
@@ -79,7 +96,7 @@ function computeEntries(path) {
 		const stats = statSync(path);
 
 		if (stats.isFile()) {
-			entries.set('/' + relative(resolvedRoot, path), stats);
+			entries.set('/' + _path.relative(resolvedRoot, path), stats);
 			if (options.verbose) {
 				console.log(`${color('green', 'file')} ${path}`);
 			}
@@ -87,9 +104,9 @@ function computeEntries(path) {
 		}
 
 		for (const file of readdirSync(path)) {
-			computeEntries(join(path, file));
+			computeEntries(_path.join(path, file));
 		}
-		entries.set('/' + relative(resolvedRoot, path), stats);
+		entries.set('/' + _path.relative(resolvedRoot, path), stats);
 		if (options.verbose) {
 			console.log(`${color('bright_green', ' dir')} ${path}`);
 		}
@@ -102,7 +119,7 @@ function computeEntries(path) {
 
 computeEntries(resolvedRoot);
 if (!options.quiet) {
-	console.log('Generated listing for ' + fixSlash(resolve(root)));
+	console.log('Generated listing for ' + fixSlash(_path.resolve(root)));
 }
 
 const index = {

package/src/config.ts

@@ -5,7 +5,6 @@ import { DeviceFS } from './devices.js';
 import * as cache from './emulation/cache.js';
 import { config } from './emulation/config.js';
 import * as fs from './emulation/index.js';
-import type { AbsolutePath } from './emulation/path.js';
 import { Errno, ErrnoError } from './error.js';
 import { FileSystem } from './filesystem.js';
 
@@ -68,8 +67,11 @@ export async function resolveMountConfig<T extends Backend>(configuration: Mount
 	return mount;
 }
 
+/**
+ * An object mapping mount points to backends
+ */
 export interface ConfigMounts {
-	[K: AbsolutePath]: Backend;
+	[K: string]: Backend;
 }
 
 /**
@@ -79,7 +81,7 @@ export interface Configuration<T extends ConfigMounts> extends SharedConfig {
 	/**
 	 * An object mapping mount points to mount configuration
 	 */
-	mounts: { [K in keyof T & AbsolutePath]: MountConfiguration<T[K]> };
+	mounts: { [K in keyof T]: MountConfiguration<T[K]> };
 
 	/**
 	 * The uid to use
@@ -200,10 +202,8 @@ export async function configure<T extends ConfigMounts>(configuration: Partial<C
 		const toMount: [string, FileSystem][] = [];
 		let unmountRoot = false;
 
-		for (const [point, mountConfig] of Object.entries(configuration.mounts)) {
-			if (!point.startsWith('/')) {
-				throw new ErrnoError(Errno.EINVAL, 'Mount points must have absolute paths');
-			}
+		for (const [_point, mountConfig] of Object.entries(configuration.mounts)) {
+			const point = _point.startsWith('/') ? _point : '/' + _point;
 
 			if (isBackendConfig(mountConfig)) {
 				mountConfig.disableAsyncCache ??= configuration.disableAsyncCache || false;

package/src/emulation/cache.ts

@@ -13,10 +13,17 @@ export class Cache<T> {
 
 	protected async = new Map<string, Promise<T>>();
 
+	/**
+	 * Whether the data exists in the cache
+	 */
+	has(path: string): boolean {
+		return this.isEnabled && this.sync.has(path);
+	}
+
 	/**
 	 * Gets data from the cache, if is exists and the cache is enabled.
 	 */
-	getSync(path: string): T | undefined {
+	get(path: string): T | undefined {
 		if (!this.isEnabled) return;
 
 		return this.sync.get(path);
@@ -25,7 +32,7 @@ export class Cache<T> {
 	/**
 	 * Adds data if the cache is enabled
 	 */
-	setSync(path: string, value: T): void {
+	set(path: string, value: T): void {
 		if (!this.isEnabled) return;
 
 		this.sync.set(path, value);
@@ -33,18 +40,16 @@ export class Cache<T> {
 	}
 
 	/**
-	 * Clears the cache if it is enabled
+	 * Whether the data exists in the cache
 	 */
-	clearSync(): void {
-		if (!this.isEnabled) return;
-
-		this.sync.clear();
+	hasAsync(path: string): boolean {
+		return this.isEnabled && this.async.has(path);
 	}
 
 	/**
 	 * Gets data from the cache, if it exists and the cache is enabled.
 	 */
-	get(path: string): Promise<T> | undefined {
+	getAsync(path: string): Promise<T> | undefined {
 		if (!this.isEnabled) return;
 
 		return this.async.get(path);
@@ -53,7 +58,7 @@ export class Cache<T> {
 	/**
 	 * Adds data if the cache is enabled
 	 */
-	set(path: string, value: Promise<T>): void {
+	setAsync(path: string, value: Promise<T>): void {
 		if (!this.isEnabled) return;
 
 		this.async.set(path, value);
@@ -65,7 +70,7 @@ export class Cache<T> {
 	 */
 	clear(): void {
 		if (!this.isEnabled) return;
-
+		this.sync.clear();
 		this.async.clear();
 	}
 }

package/src/emulation/promises.ts

@@ -16,7 +16,7 @@ import * as cache from './cache.js';
 import { config } from './config.js';
 import * as constants from './constants.js';
 import { Dir, Dirent } from './dir.js';
-import { dirname, join, parse } from './path.js';
+import { dirname, join, parse, resolve } from './path.js';
 import { _statfs, fd2file, fdMap, file2fd, fixError, resolveMount, type InternalOptions, type ReaddirOptions } from './shared.js';
 import { ReadStream, WriteStream } from './streams.js';
 import { FSWatcher, emitChange } from './watchers.js';
@@ -395,6 +395,7 @@ export async function rename(oldPath: fs.PathLike, newPath: fs.PathLike): Promis
 		if (src.mountPoint == dst.mountPoint) {
 			await src.fs.rename(src.path, dst.path);
 			emitChange('rename', oldPath.toString());
+			emitChange('change', newPath.toString());
 			return;
 		}
 		await writeFile(newPath, await readFile(oldPath));
@@ -471,7 +472,7 @@ export async function unlink(path: fs.PathLike): Promise<void> {
 	path = normalizePath(path);
 	const { fs, path: resolved } = resolveMount(path);
 	try {
-		if (config.checkAccess && !(await (cache.stats.get(path) || fs.stat(resolved))).hasAccess(constants.W_OK)) {
+		if (config.checkAccess && !(await (cache.stats.getAsync(path) || fs.stat(resolved))).hasAccess(constants.W_OK)) {
 			throw ErrnoError.With('EACCES', resolved, 'unlink');
 		}
 		await fs.unlink(resolved);
@@ -623,7 +624,7 @@ export async function rmdir(path: fs.PathLike): Promise<void> {
 	path = await realpath(path);
 	const { fs, path: resolved } = resolveMount(path);
 	try {
-		const stats = await (cache.stats.get(path) || fs.stat(resolved));
+		const stats = await (cache.stats.getAsync(path) || fs.stat(resolved));
 		if (!stats) {
 			throw ErrnoError.With('ENOENT', path, 'rmdir');
 		}
@@ -718,8 +719,8 @@ export async function readdir(
 
 	const { fs, path: resolved } = resolveMount(path);
 
-	const _stats = cache.stats.get(path) || fs.stat(resolved).catch(handleError);
-	cache.stats.set(path, _stats);
+	const _stats = cache.stats.getAsync(path) || fs.stat(resolved).catch(handleError);
+	cache.stats.setAsync(path, _stats);
 	const stats = await _stats;
 
 	if (!stats) {
@@ -740,8 +741,8 @@ export async function readdir(
 	const addEntry = async (entry: string) => {
 		let entryStats: Stats | undefined;
 		if (options?.recursive || options?.withFileTypes) {
-			const _entryStats = cache.stats.get(join(path, entry)) || fs.stat(join(resolved, entry)).catch(handleError);
-			cache.stats.set(join(path, entry), _entryStats);
+			const _entryStats = cache.stats.getAsync(join(path, entry)) || fs.stat(join(resolved, entry)).catch(handleError);
+			cache.stats.setAsync(join(path, entry), _entryStats);
 			entryStats = await _entryStats;
 		}
 		if (options?.withFileTypes) {
@@ -891,20 +892,25 @@ export async function realpath(path: fs.PathLike, options: fs.BufferEncodingOpti
 export async function realpath(path: fs.PathLike, options?: fs.EncodingOption | BufferEncoding): Promise<string>;
 export async function realpath(path: fs.PathLike, options?: fs.EncodingOption | BufferEncoding | fs.BufferEncodingOption): Promise<string | Buffer> {
 	path = normalizePath(path);
+	if (cache.paths.hasAsync(path)) return cache.paths.getAsync(path)!;
 	const { base, dir } = parse(path);
-	const lpath = join(dir == '/' ? '/' : await (cache.paths.get(dir) || realpath(dir)), base);
-	const { fs, path: resolvedPath, mountPoint } = resolveMount(lpath);
+	const realDir = dir == '/' ? '/' : await (cache.paths.getAsync(dir) || realpath(dir));
+	const lpath = join(realDir, base);
+	const { fs, path: resolvedPath } = resolveMount(lpath);
 
 	try {
-		const _stats = cache.stats.get(lpath) || fs.stat(resolvedPath);
-		cache.stats.set(lpath, _stats);
+		const _stats = cache.stats.getAsync(lpath) || fs.stat(resolvedPath);
+		cache.stats.setAsync(lpath, _stats);
 		if (!(await _stats).isSymbolicLink()) {
+			cache.paths.set(path, lpath);
 			return lpath;
 		}
 
-		const target = mountPoint + (await readlink(lpath));
+		const target = resolve(realDir, await readlink(lpath));
 
-		return await (cache.paths.get(target) || realpath(target));
+		const real = cache.paths.getAsync(target) || realpath(target);
+		cache.paths.setAsync(path, real);
+		return await real;
 	} catch (e) {
 		if ((e as ErrnoError).code == 'ENOENT') {
 			return path;
@@ -968,7 +974,7 @@ access satisfies typeof promises.access;
 export async function rm(path: fs.PathLike, options?: fs.RmOptions & InternalOptions) {
 	path = normalizePath(path);
 
-	const stats = await (cache.stats.get(path) ||
+	const stats = await (cache.stats.getAsync(path) ||
 		stat(path).catch((error: ErrnoError) => {
 			if (error.code == 'ENOENT' && options?.force) return undefined;
 			throw error;
@@ -978,7 +984,7 @@ export async function rm(path: fs.PathLike, options?: fs.RmOptions & InternalOpt
 		return;
 	}
 
-	cache.stats.setSync(path, stats);
+	cache.stats.set(path, stats);
 
 	switch (stats.mode & constants.S_IFMT) {
 		case constants.S_IFDIR:
@@ -992,10 +998,10 @@ export async function rm(path: fs.PathLike, options?: fs.RmOptions & InternalOpt
 			break;
 		case constants.S_IFREG:
 		case constants.S_IFLNK:
-			await unlink(path);
-			break;
 		case constants.S_IFBLK:
 		case constants.S_IFCHR:
+			await unlink(path);
+			break;
 		case constants.S_IFIFO:
 		case constants.S_IFSOCK:
 		default:

package/src/emulation/shared.ts

@@ -8,6 +8,7 @@ import type { FileSystem } from '../filesystem.js';
 import { normalizePath } from '../utils.js';
 import { resolve, type AbsolutePath } from './path.js';
 import { size_max } from './constants.js';
+import { paths as pathCache } from './cache.js';
 
 // descriptors
 export const fdMap: Map<number, File> = new Map();
@@ -47,6 +48,7 @@ export function mount(mountPoint: string, fs: FileSystem): void {
 		throw new ErrnoError(Errno.EINVAL, 'Mount point ' + mountPoint + ' is already in use.');
 	}
 	mounts.set(mountPoint, fs);
+	pathCache.clear();
 }
 
 /**
@@ -61,6 +63,7 @@ export function umount(mountPoint: string): void {
 		throw new ErrnoError(Errno.EINVAL, 'Mount point ' + mountPoint + ' is already unmounted.');
 	}
 	mounts.delete(mountPoint);
+	pathCache.clear();
 }
 
 /**

package/src/emulation/sync.ts

@@ -10,7 +10,7 @@ import * as cache from './cache.js';
 import { config } from './config.js';
 import * as constants from './constants.js';
 import { Dir, Dirent } from './dir.js';
-import { dirname, join, parse } from './path.js';
+import { dirname, join, parse, resolve } from './path.js';
 import { _statfs, fd2file, fdMap, file2fd, fixError, resolveMount, type InternalOptions, type ReaddirOptions } from './shared.js';
 import { emitChange } from './watchers.js';
 
@@ -26,6 +26,7 @@ export function renameSync(oldPath: fs.PathLike, newPath: fs.PathLike): void {
 		if (oldMount === newMount) {
 			oldMount.fs.renameSync(oldMount.path, newMount.path);
 			emitChange('rename', oldPath.toString());
+			emitChange('change', newPath.toString());
 			return;
 		}
 
@@ -106,7 +107,7 @@ export function unlinkSync(path: fs.PathLike): void {
 	path = normalizePath(path);
 	const { fs, path: resolved } = resolveMount(path);
 	try {
-		if (config.checkAccess && !(cache.stats.getSync(path) || fs.statSync(resolved)).hasAccess(constants.W_OK)) {
+		if (config.checkAccess && !(cache.stats.get(path) || fs.statSync(resolved)).hasAccess(constants.W_OK)) {
 			throw ErrnoError.With('EACCES', resolved, 'unlink');
 		}
 		fs.unlinkSync(resolved);
@@ -386,7 +387,7 @@ export function rmdirSync(path: fs.PathLike): void {
 	path = normalizePath(path);
 	const { fs, path: resolved } = resolveMount(realpathSync(path));
 	try {
-		const stats = cache.stats.getSync(path) || fs.statSync(resolved);
+		const stats = cache.stats.get(path) || fs.statSync(resolved);
 		if (!stats.isDirectory()) {
 			throw ErrnoError.With('ENOTDIR', resolved, 'rmdir');
 		}
@@ -459,8 +460,8 @@ export function readdirSync(
 	const { fs, path: resolved } = resolveMount(realpathSync(path));
 	let entries: string[];
 	try {
-		const stats = cache.stats.getSync(path) || fs.statSync(resolved);
-		cache.stats.setSync(path, stats);
+		const stats = cache.stats.get(path) || fs.statSync(resolved);
+		cache.stats.set(path, stats);
 		if (config.checkAccess && !stats.hasAccess(constants.R_OK)) {
 			throw ErrnoError.With('EACCES', resolved, 'readdir');
 		}
@@ -475,8 +476,8 @@ export function readdirSync(
 	// Iterate over entries and handle recursive case if needed
 	const values: (string | Dirent | Buffer)[] = [];
 	for (const entry of entries) {
-		const entryStat = cache.stats.getSync(join(path, entry)) || fs.statSync(join(resolved, entry));
-		cache.stats.setSync(join(path, entry), entryStat);
+		const entryStat = cache.stats.get(join(path, entry)) || fs.statSync(join(resolved, entry));
+		cache.stats.set(join(path, entry), entryStat);
 
 		if (options?.withFileTypes) {
 			values.push(new Dirent(entry, entryStat));
@@ -500,7 +501,7 @@ export function readdirSync(
 	}
 
 	if (!options?._isIndirect) {
-		cache.stats.clearSync();
+		cache.stats.clear();
 	}
 	return values as string[] | Dirent[] | Buffer[];
 }
@@ -621,18 +622,24 @@ export function realpathSync(path: fs.PathLike, options: fs.BufferEncodingOption
 export function realpathSync(path: fs.PathLike, options?: fs.EncodingOption): string;
 export function realpathSync(path: fs.PathLike, options?: fs.EncodingOption | fs.BufferEncodingOption): string | Buffer {
 	path = normalizePath(path);
+	if (cache.paths.has(path)) return cache.paths.get(path)!;
 	const { base, dir } = parse(path);
-	const lpath = join(dir == '/' ? '/' : cache.paths.getSync(dir) || realpathSync(dir), base);
-	const { fs, path: resolvedPath, mountPoint } = resolveMount(lpath);
+	const realDir = dir == '/' ? '/' : cache.paths.get(dir) || realpathSync(dir);
+	const lpath = join(realDir, base);
+	const { fs, path: resolvedPath } = resolveMount(lpath);
 
 	try {
-		const stats = fs.statSync(resolvedPath);
+		const stats = cache.stats.get(lpath) || fs.statSync(resolvedPath);
+		cache.stats.set(lpath, stats);
 		if (!stats.isSymbolicLink()) {
+			cache.paths.set(path, lpath);
 			return lpath;
 		}
 
-		const target = mountPoint + readlinkSync(lpath, options).toString();
-		return cache.paths.getSync(target) || realpathSync(target);
+		const target = resolve(realDir, readlinkSync(lpath, options).toString());
+		const real = cache.paths.get(target) || realpathSync(target);
+		cache.paths.set(path, real);
+		return real;
 	} catch (e) {
 		if ((e as ErrnoError).code == 'ENOENT') {
 			return path;
@@ -659,7 +666,7 @@ export function rmSync(path: fs.PathLike, options?: fs.RmOptions & InternalOptio
 
 	let stats: Stats | undefined;
 	try {
-		stats = cache.stats.getSync(path) || statSync(path);
+		stats = cache.stats.get(path) || statSync(path);
 	} catch (error) {
 		if ((error as ErrnoError).code != 'ENOENT' || !options?.force) throw error;
 	}
@@ -668,7 +675,7 @@ export function rmSync(path: fs.PathLike, options?: fs.RmOptions & InternalOptio
 		return;
 	}
 
-	cache.stats.setSync(path, stats);
+	cache.stats.set(path, stats);
 
 	switch (stats.mode & constants.S_IFMT) {
 		case constants.S_IFDIR:
@@ -682,19 +689,19 @@ export function rmSync(path: fs.PathLike, options?: fs.RmOptions & InternalOptio
 			break;
 		case constants.S_IFREG:
 		case constants.S_IFLNK:
-			unlinkSync(path);
-			break;
 		case constants.S_IFBLK:
 		case constants.S_IFCHR:
+			unlinkSync(path);
+			break;
 		case constants.S_IFIFO:
 		case constants.S_IFSOCK:
 		default:
-			cache.stats.clearSync();
+			cache.stats.clear();
 			throw new ErrnoError(Errno.EPERM, 'File type not supported', path, 'rm');
 	}
 
 	if (!options?._isIndirect) {
-		cache.stats.clearSync();
+		cache.stats.clear();
 	}
 }
 rmSync satisfies typeof fs.rmSync;

package/src/stats.ts

@@ -247,10 +247,7 @@ export abstract class StatsCommon<T extends number | bigint> implements Node.Sta
 	 * @internal
 	 */
 	public hasAccess(mode: number): boolean {
-		if (credentials.euid === 0 || credentials.egid === 0) {
-			// Running as root
-			return true;
-		}
+		if (this.isSymbolicLink() || credentials.euid === 0 || credentials.egid === 0) return true;
 
 		let perm = 0;
 

package/tests/fs/links.test.ts

@@ -23,6 +23,10 @@ suite('Links', () => {
 		assert.strictEqual(destination, target);
 	});
 
+	test('read target contents', async () => {
+		assert.equal(await fs.promises.readFile(target, 'utf-8'), await fs.promises.readFile(symlink, 'utf-8'));
+	});
+
 	test('unlink', async () => {
 		await fs.promises.unlink(symlink);
 		assert(!(await fs.promises.exists(symlink)));

package/tests/fs/watch.test.ts

@@ -71,18 +71,29 @@ suite('Watch Features', () => {
 	});
 
 	test('fs.watch should detect file renames', async () => {
-		const oldFile = `${testDir}/oldFile.txt`;
-		const newFile = `${testDir}/newFile.txt`;
+		const oldFileName = `oldFile.txt`;
+		const newFileName = `newFile.txt`;
+		const oldFile = `${testDir}/${oldFileName}`;
+		const newFile = `${testDir}/${newFileName}`;
 
 		await fs.promises.writeFile(oldFile, 'Some content');
+		const oldFileResolver = Promise.withResolvers<void>();
+		const newFileResolver = Promise.withResolvers<void>();
 
+		const fileResolvers: Record<string, { resolver: PromiseWithResolvers<void>; eventType: string }> = {
+			[oldFileName]: { resolver: oldFileResolver, eventType: 'rename' },
+			[newFileName]: { resolver: newFileResolver, eventType: 'change' },
+		};
 		using watcher = fs.watch(testDir, (eventType, filename) => {
-			assert.strictEqual(eventType, 'rename');
-			assert.strictEqual(filename, 'oldFile.txt');
+			const resolver = fileResolvers[filename];
+			assert.notEqual(resolver, undefined); // should have a resolver so file is expected
+			assert.strictEqual(eventType, resolver.eventType);
+			resolver.resolver.resolve();
 		});
 
 		// Rename the file to trigger the event
 		await fs.promises.rename(oldFile, newFile);
+		await Promise.all([newFileResolver.promise, oldFileResolver.promise]);
 	});
 
 	test('fs.watch should detect file deletions', async () => {