@zenfs/core 1.6.12 → 1.6.14

package/dist/emulation/async.js

@@ -365,7 +365,7 @@ export function watchFile(path, options, listener) {
         }
         return;
     }
-    const watcher = new StatWatcher(normalizedPath, opts);
+    const watcher = new StatWatcher(this, normalizedPath, opts);
     watcher.on('change', (curr, prev) => {
         const entry = statWatchers.get(normalizedPath);
         if (!entry) {
@@ -407,7 +407,7 @@ export function unwatchFile(path, listener = nop) {
 }
 unwatchFile;
 export function watch(path, options, listener) {
-    const watcher = new FSWatcher(normalizePath(path), typeof options == 'object' ? options : {});
+    const watcher = new FSWatcher(this, normalizePath(path), typeof options == 'object' ? options : {});
     listener = typeof options == 'function' ? options : listener;
     watcher.on('change', listener || nop);
     return watcher;

package/dist/emulation/promises.d.ts

@@ -295,9 +295,9 @@ export declare function lutimes(this: V_Context, path: fs.PathLike, atime: fs.Ti
  */
 export declare function realpath(this: V_Context, path: fs.PathLike, options: fs.BufferEncodingOption): Promise<Buffer>;
 export declare function realpath(this: V_Context, path: fs.PathLike, options?: fs.EncodingOption | BufferEncoding): Promise<string>;
-export declare function watch(filename: fs.PathLike, options?: fs.WatchOptions | BufferEncoding): AsyncIterable<promises.FileChangeInfo<string>>;
-export declare function watch(filename: fs.PathLike, options: fs.WatchOptions | fs.BufferEncodingOption): AsyncIterable<promises.FileChangeInfo<Buffer>>;
-export declare function watch(filename: fs.PathLike, options?: fs.WatchOptions | string): AsyncIterable<promises.FileChangeInfo<string>> | AsyncIterable<promises.FileChangeInfo<Buffer>>;
+export declare function watch(this: V_Context, filename: fs.PathLike, options?: fs.WatchOptions | BufferEncoding): AsyncIterable<promises.FileChangeInfo<string>>;
+export declare function watch(this: V_Context, filename: fs.PathLike, options: fs.WatchOptions | fs.BufferEncodingOption): AsyncIterable<promises.FileChangeInfo<Buffer>>;
+export declare function watch(this: V_Context, filename: fs.PathLike, options?: fs.WatchOptions | string): AsyncIterable<promises.FileChangeInfo<string>> | AsyncIterable<promises.FileChangeInfo<Buffer>>;
 export declare function access(this: V_Context, path: fs.PathLike, mode?: number): Promise<void>;
 /**
  * Asynchronous `rm`. Removes files or directories (recursively).

package/dist/emulation/promises.js

@@ -928,7 +928,7 @@ realpath;
 export function watch(filename, options = {}) {
     return {
         [Symbol.asyncIterator]() {
-            const watcher = new FSWatcher(filename.toString(), typeof options !== 'string' ? options : { encoding: options });
+            const watcher = new FSWatcher(this, filename.toString(), typeof options !== 'string' ? options : { encoding: options });
             // A queue to hold change events, since we need to resolve them in the async iterator
             const eventQueue = [];
             watcher.on('change', (eventType, filename) => {

package/dist/emulation/watchers.d.ts

@@ -1,6 +1,7 @@
 import { EventEmitter } from 'eventemitter3';
 import type { EventEmitter as NodeEventEmitter } from 'node:events';
 import type * as fs from 'node:fs';
+import type { V_Context } from '../context.js';
 import { type Stats } from '../stats.js';
 /**
  * Base class for file system watchers.
@@ -9,10 +10,18 @@ import { type Stats } from '../stats.js';
  * @template TEvents The type of events emitted by the watcher.
  */
 declare class Watcher<TEvents extends Record<string, unknown[]> = Record<string, unknown[]>> extends EventEmitter<TEvents> implements NodeEventEmitter {
+    /**
+     * @internal
+     */
+    readonly _context: V_Context;
     readonly path: string;
     off<T extends EventEmitter.EventNames<TEvents>>(event: T, fn?: (...args: any[]) => void, context?: any, once?: boolean): this;
     removeListener<T extends EventEmitter.EventNames<TEvents>>(event: T, fn?: (...args: any[]) => void, context?: any, once?: boolean): this;
-    constructor(path: string);
+    constructor(
+    /**
+     * @internal
+     */
+    _context: V_Context, path: string);
     setMaxListeners(): never;
     getMaxListeners(): never;
     prependListener(): never;
@@ -32,7 +41,7 @@ export declare class FSWatcher<T extends string | Buffer = string | Buffer> exte
     error: [error: Error];
 }> implements fs.FSWatcher {
     readonly options: fs.WatchOptions;
-    constructor(path: string, options: fs.WatchOptions);
+    constructor(context: V_Context, path: string, options: fs.WatchOptions);
     close(): void;
     [Symbol.dispose](): void;
 }
@@ -49,7 +58,7 @@ export declare class StatWatcher extends Watcher<{
     private options;
     private intervalId?;
     private previous?;
-    constructor(path: string, options: {
+    constructor(context: V_Context, path: string, options: {
         persistent?: boolean;
         interval?: number;
     });

package/dist/emulation/watchers.js

@@ -19,8 +19,13 @@ class Watcher extends EventEmitter {
         return super.removeListener(event, fn, context, once);
     }
     /* eslint-enable @typescript-eslint/no-explicit-any */
-    constructor(path) {
+    constructor(
+    /**
+     * @internal
+     */
+    _context, path) {
         super();
+        this._context = _context;
         this.path = path;
     }
     setMaxListeners() {
@@ -51,8 +56,8 @@ class Watcher extends EventEmitter {
  * @template T The type of the filename, either `string` or `Buffer`.
  */
 export class FSWatcher extends Watcher {
-    constructor(path, options) {
-        super(path);
+    constructor(context, path, options) {
+        super(context, path);
         this.options = options;
         addWatcher(path.toString(), this);
     }
@@ -70,8 +75,8 @@ export class FSWatcher extends Watcher {
  * Instances of `StatWatcher` are used by `fs.watchFile()` to monitor changes to a file's statistics.
  */
 export class StatWatcher extends Watcher {
-    constructor(path, options) {
-        super(path);
+    constructor(context, path, options) {
+        super(context, path);
         this.options = options;
         this.start();
     }
@@ -130,6 +135,7 @@ export function removeWatcher(path, watcher) {
     }
 }
 export function emitChange(eventType, filename) {
+    var _a;
     filename = normalizePath(filename);
     // Notify watchers on the specific file
     if (watchers.has(filename)) {
@@ -142,10 +148,14 @@ export function emitChange(eventType, filename) {
     while (parent !== normalizedFilename) {
         normalizedFilename = parent;
         parent = dirname(parent);
-        if (watchers.has(parent)) {
-            for (const watcher of watchers.get(parent)) {
-                watcher.emit('change', eventType, filename.slice(parent.length + (parent == '/' ? 0 : 1)));
-            }
+        if (!watchers.has(parent))
+            continue;
+        for (const watcher of watchers.get(parent)) {
+            // Strip the context root from the path if the watcher has a context
+            const root = (_a = watcher._context) === null || _a === void 0 ? void 0 : _a.root;
+            const contextPath = root && filename.startsWith(root) ? filename.slice(root.length) : filename;
+            const relativePath = contextPath.slice(parent.length + (parent == '/' ? 0 : 1));
+            watcher.emit('change', eventType, relativePath);
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zenfs/core",
-	"version": "1.6.12",
+	"version": "1.6.14",
 	"description": "A filesystem, anywhere",
 	"funding": {
 		"type": "individual",
@@ -59,11 +59,6 @@
 		"dev": "npm run build -- --watch",
 		"prepublishOnly": "npm run build"
 	},
-	"lint-staged": {
-		"*": [
-			"prettier --write"
-		]
-	},
 	"dependencies": {
 		"@types/node": "^22.10.1",
 		"@types/readable-stream": "^4.0.10",
@@ -73,7 +68,6 @@
 		"utilium": "^1.1.1"
 	},
 	"optionalDependencies": {
-		"minimatch": "^9.0.3",
 		"c8": "^10.1.2"
 	},
 	"devDependencies": {
@@ -81,7 +75,6 @@
 		"@types/eslint__js": "^8.42.3",
 		"eslint": "^9.15.0",
 		"globals": "^15.9.0",
-		"lint-staged": "^15.2.7",
 		"prettier": "^3.2.5",
 		"tsx": "^4.19.1",
 		"typedoc": "^0.27.1",

package/scripts/make-index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { readdirSync, statSync, writeFileSync } from 'node:fs';
-import _path from 'node:path/posix';
+import { matchesGlob, relative, join, resolve } from 'node:path/posix';
 import { parseArgs } from 'node:util';
 
 const { values: options, positionals } = parseArgs({
@@ -36,24 +36,6 @@ 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('\\', '/');
 }
@@ -96,7 +78,7 @@ function computeEntries(path) {
 		const stats = statSync(path);
 
 		if (stats.isFile()) {
-			entries.set('/' + _path.relative(resolvedRoot, path), stats);
+			entries.set('/' + relative(resolvedRoot, path), stats);
 			if (options.verbose) {
 				console.log(`${color('green', 'file')} ${path}`);
 			}
@@ -104,9 +86,9 @@ function computeEntries(path) {
 		}
 
 		for (const file of readdirSync(path)) {
-			computeEntries(_path.join(path, file));
+			computeEntries(join(path, file));
 		}
-		entries.set('/' + _path.relative(resolvedRoot, path), stats);
+		entries.set('/' + relative(resolvedRoot, path), stats);
 		if (options.verbose) {
 			console.log(`${color('bright_green', ' dir')} ${path}`);
 		}
@@ -119,7 +101,7 @@ function computeEntries(path) {
 
 computeEntries(resolvedRoot);
 if (!options.quiet) {
-	console.log('Generated listing for ' + fixSlash(_path.resolve(root)));
+	console.log('Generated listing for ' + fixSlash(resolve(root)));
 }
 
 const index = {