@zenfs/core 1.1.1 → 1.1.2

package/dist/devices.d.ts

@@ -1,4 +1,4 @@
-import type { FileReadResult } from 'fs/promises';
+import type { FileReadResult } from 'node:fs/promises';
 import { InMemoryStore } from './backends/memory.js';
 import { StoreFS } from './backends/store/fs.js';
 import { File } from './file.js';

package/dist/emulation/dir.d.ts

@@ -1,4 +1,4 @@
-import type { Dir as _Dir, Dirent as _Dirent } from 'fs';
+import type { Dir as _Dir, Dirent as _Dirent } from 'node:fs';
 import type { Stats } from '../stats.js';
 import type { Callback } from '../utils.js';
 export declare class Dirent implements _Dirent {

package/dist/emulation/promises.d.ts

@@ -1,7 +1,6 @@
 import { Buffer } from 'buffer';
 import type * as fs from 'node:fs';
 import type * as promises from 'node:fs/promises';
-import type { CreateReadStreamOptions, CreateWriteStreamOptions, FileChangeInfo, FileReadResult, FlagAndOpenMode } from 'node:fs/promises';
 import type { Stream } from 'node:stream';
 import type { ReadableStream as TReadableStream } from 'node:stream/web';
 import type { Interface as ReadlineInterface } from 'readline';
@@ -60,7 +59,7 @@ export declare class FileHandle implements promises.FileHandle {
      * - `mode` defaults to `0o666`.
      * - `flag` defaults to `'a'`.
      */
-    appendFile(data: string | Uint8Array, _options?: (fs.ObjectEncodingOptions & FlagAndOpenMode) | BufferEncoding): Promise<void>;
+    appendFile(data: string | Uint8Array, _options?: (fs.ObjectEncodingOptions & promises.FlagAndOpenMode) | BufferEncoding): Promise<void>;
     /**
      * Asynchronously reads data from the file.
      * The `FileHandle` must have been opened for reading.
@@ -69,7 +68,7 @@ export declare class FileHandle implements promises.FileHandle {
      * @param length The number of bytes to read.
      * @param position The offset from the beginning of the file from which data should be read. If `null`, data will be read from the current position.
      */
-    read<TBuffer extends NodeJS.ArrayBufferView>(buffer: TBuffer, offset?: number, length?: number, position?: number | null): Promise<FileReadResult<TBuffer>>;
+    read<TBuffer extends NodeJS.ArrayBufferView>(buffer: TBuffer, offset?: number, length?: number, position?: number | null): Promise<promises.FileReadResult<TBuffer>>;
     /**
      * Asynchronously reads the entire contents of a file. The underlying file will _not_ be closed automatically.
      * The `FileHandle` must have been opened for reading.
@@ -79,7 +78,7 @@ export declare class FileHandle implements promises.FileHandle {
     readFile(_options?: {
         flag?: fs.OpenMode;
     }): Promise<Buffer>;
-    readFile(_options: (fs.ObjectEncodingOptions & FlagAndOpenMode) | BufferEncoding): Promise<string>;
+    readFile(_options: (fs.ObjectEncodingOptions & promises.FlagAndOpenMode) | BufferEncoding): Promise<string>;
     /**
      * Returns a `ReadableStream` that may be used to read the files data.
      *
@@ -153,12 +152,12 @@ export declare class FileHandle implements promises.FileHandle {
      * Creates a stream for reading from the file.
      * @param options Options for the readable stream
      */
-    createReadStream(options?: CreateReadStreamOptions): ReadStream;
+    createReadStream(options?: promises.CreateReadStreamOptions): ReadStream;
     /**
      * Creates a stream for writing to the file.
      * @param options Options for the writeable stream.
      */
-    createWriteStream(options?: CreateWriteStreamOptions): WriteStream;
+    createWriteStream(options?: promises.CreateWriteStreamOptions): WriteStream;
 }
 export declare function rename(oldPath: fs.PathLike, newPath: fs.PathLike): Promise<void>;
 /**
@@ -300,9 +299,9 @@ export declare function lutimes(path: fs.PathLike, atime: fs.TimeLike, mtime: fs
  */
 export declare function realpath(path: fs.PathLike, options: fs.BufferEncodingOption): Promise<Buffer>;
 export declare function realpath(path: fs.PathLike, options?: fs.EncodingOption | BufferEncoding): Promise<string>;
-export declare function watch(filename: fs.PathLike, options?: fs.WatchOptions | BufferEncoding): AsyncIterable<FileChangeInfo<string>>;
-export declare function watch(filename: fs.PathLike, options: fs.WatchOptions | fs.BufferEncodingOption): AsyncIterable<FileChangeInfo<Buffer>>;
-export declare function watch(filename: fs.PathLike, options?: fs.WatchOptions | string): AsyncIterable<FileChangeInfo<string>> | AsyncIterable<FileChangeInfo<Buffer>>;
+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 access(path: fs.PathLike, mode?: number): Promise<void>;
 /**
  * Asynchronous `rm`. Removes files or directories (recursively).

package/dist/emulation/promises.js

@@ -871,20 +871,28 @@ realpath;
 export function watch(filename, options = {}) {
     return {
         [Symbol.asyncIterator]() {
-            const watcher = new FSWatcher(filename.toString(), typeof options != 'string' ? options : { encoding: options });
-            function withDone(done) {
-                return function () {
-                    const event = Promise.withResolvers();
-                    watcher.on('change', (eventType, filename) => {
-                        event.resolve({ value: { eventType, filename }, done });
-                    });
-                    return event.promise;
-                };
+            const watcher = new FSWatcher(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) => {
+                eventQueue.shift()?.({ value: { eventType, filename }, done: false });
+            });
+            function cleanup() {
+                watcher.close();
+                for (const resolve of eventQueue) {
+                    resolve({ value: null, done: true });
+                }
+                eventQueue.length = 0; // Clear the queue
+                return Promise.resolve({ value: null, done: true });
             }
             return {
-                next: withDone(false),
-                return: withDone(true),
-                throw: withDone(true),
+                async next() {
+                    const { promise, resolve } = Promise.withResolvers();
+                    eventQueue.push(resolve);
+                    return promise;
+                },
+                return: cleanup,
+                throw: cleanup,
             };
         },
     };

package/dist/emulation/streams.d.ts

@@ -1,4 +1,4 @@
-import type * as Node from 'fs';
+import type * as Node from 'node:fs';
 import { Readable, Writable } from 'readable-stream';
 import type { Callback } from '../utils.js';
 export declare class ReadStream extends Readable implements Node.ReadStream {

package/dist/stats.d.ts

@@ -1,4 +1,4 @@
-import type * as Node from 'fs';
+import type * as Node from 'node:fs';
 import { type Credentials } from './credentials.js';
 import { S_IFDIR, S_IFLNK, S_IFREG } from './emulation/constants.js';
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zenfs/core",
-	"version": "1.1.1",
+	"version": "1.1.2",
 	"description": "A filesystem, anywhere",
 	"funding": {
 		"type": "individual",

package/src/devices.ts

@@ -1,4 +1,4 @@
-import type { FileReadResult } from 'fs/promises';
+import type { FileReadResult } from 'node:fs/promises';
 import { InMemoryStore } from './backends/memory.js';
 import { StoreFS } from './backends/store/fs.js';
 import { S_IFBLK, S_IFCHR } from './emulation/constants.js';

package/src/emulation/dir.ts

@@ -1,4 +1,4 @@
-import type { Dir as _Dir, Dirent as _Dirent } from 'fs';
+import type { Dir as _Dir, Dirent as _Dirent } from 'node:fs';
 import { Errno, ErrnoError } from '../error.js';
 import type { Stats } from '../stats.js';
 import type { Callback } from '../utils.js';

package/src/emulation/promises.ts

@@ -2,11 +2,9 @@
 import { Buffer } from 'buffer';
 import type * as fs from 'node:fs';
 import type * as promises from 'node:fs/promises';
-import type { CreateReadStreamOptions, CreateWriteStreamOptions, FileChangeInfo, FileReadResult, FlagAndOpenMode } from 'node:fs/promises';
 import type { Stream } from 'node:stream';
-import type { ReadableStream as TReadableStream } from 'node:stream/web';
+import type { ReadableStreamController, ReadableStream as TReadableStream } from 'node:stream/web';
 import type { Interface as ReadlineInterface } from 'readline';
-import type { ReadableStreamController } from 'stream/web';
 import { Errno, ErrnoError } from '../error.js';
 import type { File } from '../file.js';
 import { flagToMode, isAppendable, isExclusive, isReadable, isTruncating, isWriteable, parseFlag } from '../file.js';
@@ -107,7 +105,7 @@ export class FileHandle implements promises.FileHandle {
 	 * - `mode` defaults to `0o666`.
 	 * - `flag` defaults to `'a'`.
 	 */
-	public async appendFile(data: string | Uint8Array, _options: (fs.ObjectEncodingOptions & FlagAndOpenMode) | BufferEncoding = {}): Promise<void> {
+	public async appendFile(data: string | Uint8Array, _options: (fs.ObjectEncodingOptions & promises.FlagAndOpenMode) | BufferEncoding = {}): Promise<void> {
 		const options = normalizeOptions(_options, 'utf8', 'a', 0o644);
 		const flag = parseFlag(options.flag);
 		if (!isAppendable(flag)) {
@@ -129,7 +127,7 @@ export class FileHandle implements promises.FileHandle {
 	 * @param length The number of bytes to read.
 	 * @param position The offset from the beginning of the file from which data should be read. If `null`, data will be read from the current position.
 	 */
-	public read<TBuffer extends NodeJS.ArrayBufferView>(buffer: TBuffer, offset?: number, length?: number, position?: number | null): Promise<FileReadResult<TBuffer>> {
+	public read<TBuffer extends NodeJS.ArrayBufferView>(buffer: TBuffer, offset?: number, length?: number, position?: number | null): Promise<promises.FileReadResult<TBuffer>> {
 		if (isNaN(+position!)) {
 			position = this.file.position;
 		}
@@ -143,8 +141,8 @@ export class FileHandle implements promises.FileHandle {
 	 * If a flag is not provided, it defaults to `'r'`.
 	 */
 	public async readFile(_options?: { flag?: fs.OpenMode }): Promise<Buffer>;
-	public async readFile(_options: (fs.ObjectEncodingOptions & FlagAndOpenMode) | BufferEncoding): Promise<string>;
-	public async readFile(_options?: (fs.ObjectEncodingOptions & FlagAndOpenMode) | BufferEncoding): Promise<string | Buffer> {
+	public async readFile(_options: (fs.ObjectEncodingOptions & promises.FlagAndOpenMode) | BufferEncoding): Promise<string>;
+	public async readFile(_options?: (fs.ObjectEncodingOptions & promises.FlagAndOpenMode) | BufferEncoding): Promise<string | Buffer> {
 		const options = normalizeOptions(_options, null, 'r', 0o444);
 		const flag = parseFlag(options.flag);
 		if (!isReadable(flag)) {
@@ -334,7 +332,7 @@ export class FileHandle implements promises.FileHandle {
 	 * Creates a stream for reading from the file.
 	 * @param options Options for the readable stream
 	 */
-	public createReadStream(options?: CreateReadStreamOptions): ReadStream {
+	public createReadStream(options?: promises.CreateReadStreamOptions): ReadStream {
 		const stream = new ReadStream({
 			highWaterMark: options?.highWaterMark || 64 * 1024,
 			encoding: options!.encoding!,
@@ -359,7 +357,7 @@ export class FileHandle implements promises.FileHandle {
 	 * Creates a stream for writing to the file.
 	 * @param options Options for the writeable stream.
 	 */
-	public createWriteStream(options?: CreateWriteStreamOptions): WriteStream {
+	public createWriteStream(options?: promises.CreateWriteStreamOptions): WriteStream {
 		const streamOptions = {
 			highWaterMark: options?.highWaterMark,
 			encoding: options?.encoding,
@@ -887,28 +885,38 @@ export async function realpath(path: fs.PathLike, options?: fs.EncodingOption |
 }
 realpath satisfies typeof promises.realpath;
 
-export function watch(filename: fs.PathLike, options?: fs.WatchOptions | BufferEncoding): AsyncIterable<FileChangeInfo<string>>;
-export function watch(filename: fs.PathLike, options: fs.WatchOptions | fs.BufferEncodingOption): AsyncIterable<FileChangeInfo<Buffer>>;
-export function watch(filename: fs.PathLike, options?: fs.WatchOptions | string): AsyncIterable<FileChangeInfo<string>> | AsyncIterable<FileChangeInfo<Buffer>>;
-export function watch<T extends string | Buffer>(filename: fs.PathLike, options: fs.WatchOptions | string = {}): AsyncIterable<FileChangeInfo<T>> {
+export function watch(filename: fs.PathLike, options?: fs.WatchOptions | BufferEncoding): AsyncIterable<promises.FileChangeInfo<string>>;
+export function watch(filename: fs.PathLike, options: fs.WatchOptions | fs.BufferEncodingOption): AsyncIterable<promises.FileChangeInfo<Buffer>>;
+export function watch(filename: fs.PathLike, options?: fs.WatchOptions | string): AsyncIterable<promises.FileChangeInfo<string>> | AsyncIterable<promises.FileChangeInfo<Buffer>>;
+export function watch<T extends string | Buffer>(filename: fs.PathLike, options: fs.WatchOptions | string = {}): AsyncIterable<promises.FileChangeInfo<T>> {
 	return {
-		[Symbol.asyncIterator](): AsyncIterator<FileChangeInfo<T>> {
-			const watcher = new FSWatcher<T>(filename.toString(), typeof options != 'string' ? options : { encoding: options as BufferEncoding | 'buffer' });
-
-			function withDone(done: boolean) {
-				return function () {
-					const event = Promise.withResolvers<IteratorResult<FileChangeInfo<T>>>();
-					watcher.on('change', (eventType, filename) => {
-						event.resolve({ value: { eventType, filename }, done });
-					});
-					return event.promise;
-				};
+		[Symbol.asyncIterator](): AsyncIterator<promises.FileChangeInfo<T>> {
+			const watcher = new FSWatcher<T>(filename.toString(), typeof options !== 'string' ? options : { encoding: options as BufferEncoding | 'buffer' });
+
+			// A queue to hold change events, since we need to resolve them in the async iterator
+			const eventQueue: ((value: IteratorResult<promises.FileChangeInfo<T>>) => void)[] = [];
+
+			watcher.on('change', (eventType: promises.FileChangeInfo<T>['eventType'], filename: T) => {
+				eventQueue.shift()?.({ value: { eventType, filename }, done: false });
+			});
+
+			function cleanup() {
+				watcher.close();
+				for (const resolve of eventQueue) {
+					resolve({ value: null, done: true });
+				}
+				eventQueue.length = 0; // Clear the queue
+				return Promise.resolve({ value: null, done: true as const });
 			}
 
 			return {
-				next: withDone(false),
-				return: withDone(true),
-				throw: withDone(true),
+				async next() {
+					const { promise, resolve } = Promise.withResolvers<IteratorResult<promises.FileChangeInfo<T>>>();
+					eventQueue.push(resolve);
+					return promise;
+				},
+				return: cleanup,
+				throw: cleanup,
 			};
 		},
 	};

package/src/emulation/streams.ts

@@ -1,4 +1,4 @@
-import type * as Node from 'fs';
+import type * as Node from 'node:fs';
 import { Readable, Writable } from 'readable-stream';
 import type { Callback } from '../utils.js';
 import { ErrnoError, Errno } from '../error.js';

package/src/stats.ts

@@ -1,4 +1,4 @@
-import type * as Node from 'fs';
+import type * as Node from 'node:fs';
 import { credentials, type Credentials } from './credentials.js';
 import { S_IFBLK, S_IFCHR, S_IFDIR, S_IFIFO, S_IFLNK, S_IFMT, S_IFREG, S_IFSOCK, S_IRWXG, S_IRWXO, S_IRWXU, size_max } from './emulation/constants.js';