memfs 3.4.12 → 3.5.0

package/lib/Stats.d.ts

@@ -1,5 +1,5 @@
 import { Node } from './node';
-export declare type TStatNumber = number | bigint;
+export type TStatNumber = number | bigint;
 /**
  * Statistics about a file/directory, like `fs.Stats`.
  */

package/lib/encoding.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
-export declare type TDataOut = string | Buffer;
-export declare type TEncodingExtended = BufferEncoding | 'buffer';
+export type TDataOut = string | Buffer;
+export type TEncodingExtended = BufferEncoding | 'buffer';
 export declare const ENCODING_UTF8: BufferEncoding;
 export declare function assertEncoding(encoding: string | undefined): void;
 export declare function strToEncoding(str: string, encoding?: TEncodingExtended): TDataOut;

package/lib/promises.d.ts

@@ -28,7 +28,7 @@ export interface IFileHandle {
     write(buffer: Buffer | Uint8Array, offset?: number, length?: number, position?: number): Promise<TFileHandleWriteResult>;
     writeFile(data: TData, options?: IWriteFileOptions): Promise<void>;
 }
-export declare type TFileHandle = PathLike | IFileHandle;
+export type TFileHandle = PathLike | IFileHandle;
 export interface IPromisesAPI {
     FileHandle: any;
     access(path: PathLike, mode?: number): Promise<void>;

package/lib/setImmediate.d.ts

@@ -1,3 +1,3 @@
-declare type TSetImmediate = (callback: (...args: any[]) => void, args?: any) => void;
+type TSetImmediate = (callback: (...args: any[]) => void, args?: any) => void;
 declare const _default: TSetImmediate;
 export default _default;

package/lib/setTimeoutUnref.d.ts

@@ -1,4 +1,4 @@
-export declare type TSetTimeout = (callback: (...args: any[]) => void, time?: number, args?: any[]) => any;
+export type TSetTimeout = (callback: (...args: any[]) => void, time?: number, args?: any[]) => any;
 /**
  * `setTimeoutUnref` is just like `setTimeout`,
  * only in Node's environment it will "unref" its macro task.

package/lib/volume.d.ts

@@ -14,12 +14,12 @@ import { TEncodingExtended, TDataOut } from './encoding';
 export interface IError extends Error {
     code?: string;
 }
-export declare type TFileId = PathLike | number;
-export declare type TData = TDataOut | Uint8Array;
-export declare type TFlags = string | number;
-export declare type TMode = string | number;
-export declare type TTime = number | string | Date;
-export declare type TCallback<TData> = (error?: IError | null, data?: TData) => void;
+export type TFileId = PathLike | number;
+export type TData = TDataOut | Uint8Array;
+export type TFlags = string | number;
+export type TMode = string | number;
+export type TTime = number | string | Date;
+export type TCallback<TData> = (error?: IError | null, data?: TData) => void;
 export declare enum FLAGS {
     r,
     'r+',
@@ -40,7 +40,7 @@ export declare enum FLAGS {
     'ax+',
     'xa+'
 }
-export declare type TFlagsCopy = typeof constants.COPYFILE_EXCL | typeof constants.COPYFILE_FICLONE | typeof constants.COPYFILE_FICLONE_FORCE;
+export type TFlagsCopy = typeof constants.COPYFILE_EXCL | typeof constants.COPYFILE_FICLONE | typeof constants.COPYFILE_FICLONE_FORCE;
 export declare function flagsToNumber(flags: TFlags | undefined): number;
 export interface IOptions {
     encoding?: BufferEncoding | TEncodingExtended;
@@ -114,7 +114,7 @@ export declare function dataToStr(data: TData, encoding?: string): string;
 export declare function dataToBuffer(data: TData, encoding?: string): Buffer;
 export declare function bufferToEncoding(buffer: Buffer, encoding?: TEncodingExtended): TDataOut;
 export declare function toUnixTimestamp(time: any): any;
-declare type DirectoryContent = string | null;
+type DirectoryContent = string | null;
 export interface DirectoryJSON {
     [key: string]: DirectoryContent;
 }
@@ -440,9 +440,9 @@ export declare class FSWatcher extends EventEmitter {
     _encoding: BufferEncoding;
     _link: Link;
     _timer: any;
+    private _listenerRemovers;
     constructor(vol: Volume);
     private _getName;
-    private _onNodeChange;
     private _onParentChild;
     private _emit;
     private _persist;

package/lib/volume.js

@@ -127,6 +127,9 @@ function createError(errorCode, func, path, path2, Constructor) {
     if (Constructor === void 0) { Constructor = Error; }
     var error = new Constructor(formatError(errorCode, func, path, path2));
     error.code = errorCode;
+    if (path) {
+        error.path = path;
+    }
     return error;
 }
 // ---------------------------------------- Flags
@@ -2214,9 +2217,8 @@ var FSWatcher = /** @class */ (function (_super) {
         // _persistent: boolean = true;
         _this._recursive = false;
         _this._encoding = encoding_1.ENCODING_UTF8;
-        _this._onNodeChange = function () {
-            _this._emit('change');
-        };
+        // inode -> removers
+        _this._listenerRemovers = new Map();
         _this._onParentChild = function (link) {
             if (link.getName() === _this._getName()) {
                 _this._emit('rename');
@@ -2248,6 +2250,7 @@ var FSWatcher = /** @class */ (function (_super) {
         return this._steps[this._steps.length - 1];
     };
     FSWatcher.prototype.start = function (path, persistent, recursive, encoding) {
+        var _this = this;
         if (persistent === void 0) { persistent = true; }
         if (recursive === void 0) { recursive = false; }
         if (encoding === void 0) { encoding = encoding_1.ENCODING_UTF8; }
@@ -2266,9 +2269,72 @@ var FSWatcher = /** @class */ (function (_super) {
             error.errno = err.code;
             throw error;
         }
-        this._link.getNode().on('change', this._onNodeChange);
-        this._link.on('child:add', this._onNodeChange);
-        this._link.on('child:delete', this._onNodeChange);
+        var watchLinkNodeChanged = function (link) {
+            var _a;
+            var filepath = link.getPath();
+            var node = link.getNode();
+            var onNodeChange = function () { return _this.emit('change', 'change', relative(_this._filename, filepath)); };
+            node.on('change', onNodeChange);
+            var removers = (_a = _this._listenerRemovers.get(node.ino)) !== null && _a !== void 0 ? _a : [];
+            removers.push(function () { return node.removeListener('change', onNodeChange); });
+            _this._listenerRemovers.set(node.ino, removers);
+        };
+        var watchLinkChildrenChanged = function (link) {
+            var _a;
+            var node = link.getNode();
+            // when a new link added
+            var onLinkChildAdd = function (l) {
+                _this.emit('change', 'rename', relative(_this._filename, l.getPath()));
+                setTimeout(function () {
+                    // 1. watch changes of the new link-node
+                    watchLinkNodeChanged(l);
+                    // 2. watch changes of the new link-node's children
+                    watchLinkChildrenChanged(l);
+                });
+            };
+            // when a new link deleted
+            var onLinkChildDelete = function (l) {
+                // remove the listeners of the children nodes
+                var removeLinkNodeListeners = function (curLink) {
+                    var ino = curLink.getNode().ino;
+                    var removers = _this._listenerRemovers.get(ino);
+                    if (removers) {
+                        removers.forEach(function (r) { return r(); });
+                        _this._listenerRemovers.delete(ino);
+                    }
+                    Object.values(curLink.children).forEach(function (childLink) {
+                        if (childLink) {
+                            removeLinkNodeListeners(childLink);
+                        }
+                    });
+                };
+                removeLinkNodeListeners(l);
+                _this.emit('change', 'rename', relative(_this._filename, l.getPath()));
+            };
+            // children nodes changed
+            Object.values(link.children).forEach(function (childLink) {
+                if (childLink) {
+                    watchLinkNodeChanged(childLink);
+                }
+            });
+            // link children add/remove
+            link.on('child:add', onLinkChildAdd);
+            link.on('child:delete', onLinkChildDelete);
+            var removers = (_a = _this._listenerRemovers.get(node.ino)) !== null && _a !== void 0 ? _a : [];
+            removers.push(function () {
+                link.removeListener('child:add', onLinkChildAdd);
+                link.removeListener('child:delete', onLinkChildDelete);
+            });
+            if (recursive) {
+                Object.values(link.children).forEach(function (childLink) {
+                    if (childLink) {
+                        watchLinkChildrenChanged(childLink);
+                    }
+                });
+            }
+        };
+        watchLinkNodeChanged(this._link);
+        watchLinkChildrenChanged(this._link);
         var parent = this._link.parent;
         if (parent) {
             // parent.on('child:add', this._onParentChild);
@@ -2280,7 +2346,10 @@ var FSWatcher = /** @class */ (function (_super) {
     };
     FSWatcher.prototype.close = function () {
         clearTimeout(this._timer);
-        this._link.getNode().removeListener('change', this._onNodeChange);
+        this._listenerRemovers.forEach(function (removers) {
+            removers.forEach(function (r) { return r(); });
+        });
+        this._listenerRemovers.clear();
         var parent = this._link.parent;
         if (parent) {
             // parent.removeListener('child:add', this._onParentChild);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "memfs",
-  "version": "3.4.12",
+  "version": "3.5.0",
   "description": "In-memory file-system with Node's fs API.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",