memfs 3.4.13 → 3.5.1

package/lib/node.d.ts

@@ -9,17 +9,31 @@ export declare const SEP = "/";
  */
 export declare class Node extends EventEmitter {
     ino: number;
-    uid: number;
-    gid: number;
-    atime: Date;
-    mtime: Date;
-    ctime: Date;
+    private _uid;
+    private _gid;
+    private _atime;
+    private _mtime;
+    private _ctime;
     buf: Buffer;
-    perm: number;
+    private _perm;
     mode: number;
-    nlink: number;
+    private _nlink;
     symlink: string[];
     constructor(ino: number, perm?: number);
+    set ctime(ctime: Date);
+    get ctime(): Date;
+    set uid(uid: number);
+    get uid(): number;
+    set gid(gid: number);
+    get gid(): number;
+    set atime(atime: Date);
+    get atime(): Date;
+    set mtime(mtime: Date);
+    get mtime(): Date;
+    set perm(perm: number);
+    get perm(): number;
+    set nlink(nlink: number);
+    get nlink(): number;
     getString(encoding?: string): string;
     setString(str: string): void;
     getBuffer(): Buffer;

package/lib/node.js

@@ -34,22 +34,99 @@ var Node = /** @class */ (function (_super) {
         if (perm === void 0) { perm = 438; }
         var _this = _super.call(this) || this;
         // User ID and group ID.
-        _this.uid = getuid();
-        _this.gid = getgid();
-        _this.atime = new Date();
-        _this.mtime = new Date();
-        _this.ctime = new Date();
-        _this.perm = 438; // Permissions `chmod`, `fchmod`
+        _this._uid = getuid();
+        _this._gid = getgid();
+        _this._atime = new Date();
+        _this._mtime = new Date();
+        _this._ctime = new Date();
+        _this._perm = 438; // Permissions `chmod`, `fchmod`
         _this.mode = S_IFREG; // S_IFDIR, S_IFREG, etc.. (file by default?)
         // Number of hard links pointing at this Node.
-        _this.nlink = 1;
-        _this.perm = perm;
+        _this._nlink = 1;
+        _this._perm = perm;
         _this.mode |= perm;
         _this.ino = ino;
         return _this;
     }
+    Object.defineProperty(Node.prototype, "ctime", {
+        get: function () {
+            return this._ctime;
+        },
+        set: function (ctime) {
+            this._ctime = ctime;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Node.prototype, "uid", {
+        get: function () {
+            return this._uid;
+        },
+        set: function (uid) {
+            this._uid = uid;
+            this.ctime = new Date();
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Node.prototype, "gid", {
+        get: function () {
+            return this._gid;
+        },
+        set: function (gid) {
+            this._gid = gid;
+            this.ctime = new Date();
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Node.prototype, "atime", {
+        get: function () {
+            return this._atime;
+        },
+        set: function (atime) {
+            this._atime = atime;
+            this.ctime = new Date();
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Node.prototype, "mtime", {
+        get: function () {
+            return this._mtime;
+        },
+        set: function (mtime) {
+            this._mtime = mtime;
+            this.ctime = new Date();
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Node.prototype, "perm", {
+        get: function () {
+            return this._perm;
+        },
+        set: function (perm) {
+            this._perm = perm;
+            this.ctime = new Date();
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Node.prototype, "nlink", {
+        get: function () {
+            return this._nlink;
+        },
+        set: function (nlink) {
+            this._nlink = nlink;
+            this.ctime = new Date();
+        },
+        enumerable: false,
+        configurable: true
+    });
     Node.prototype.getString = function (encoding) {
         if (encoding === void 0) { encoding = 'utf8'; }
+        this.atime = new Date();
         return this.getBuffer().toString(encoding);
     };
     Node.prototype.setString = function (str) {
@@ -58,6 +135,7 @@ var Node = /** @class */ (function (_super) {
         this.touch();
     };
     Node.prototype.getBuffer = function () {
+        this.atime = new Date();
         if (!this.buf)
             this.setBuffer((0, buffer_1.bufferAllocUnsafe)(0));
         return (0, buffer_1.bufferFrom)(this.buf); // Return a copy.
@@ -115,6 +193,7 @@ var Node = /** @class */ (function (_super) {
         if (off === void 0) { off = 0; }
         if (len === void 0) { len = buf.byteLength; }
         if (pos === void 0) { pos = 0; }
+        this.atime = new Date();
         if (!this.buf)
             this.buf = (0, buffer_1.bufferAllocUnsafe)(0);
         var actualLen = len;
@@ -244,9 +323,12 @@ var Link = /** @class */ (function (_super) {
         // Recursively sync children steps, e.g. in case of dir rename
         set: function (val) {
             this._steps = val;
-            for (var _i = 0, _a = Object.values(this.children); _i < _a.length; _i++) {
-                var child = _a[_i];
-                child === null || child === void 0 ? void 0 : child.syncSteps();
+            for (var _i = 0, _a = Object.entries(this.children); _i < _a.length; _i++) {
+                var _b = _a[_i], child = _b[0], link = _b[1];
+                if (child === '.' || child === '..') {
+                    continue;
+                }
+                link === null || link === void 0 ? void 0 : link.syncSteps();
             }
         },
         enumerable: false,
@@ -264,10 +346,8 @@ var Link = /** @class */ (function (_super) {
         var link = new Link(this.vol, this, name);
         link.setNode(node);
         if (node.isDirectory()) {
-            // link.setChild('.', link);
-            // link.getNode().nlink++;
-            // link.setChild('..', this);
-            // this.getNode().nlink++;
+            link.children['.'] = link;
+            link.getNode().nlink++;
         }
         this.setChild(name, link);
         return link;
@@ -277,15 +357,28 @@ var Link = /** @class */ (function (_super) {
         this.children[name] = link;
         link.parent = this;
         this.length++;
+        var node = link.getNode();
+        if (node.isDirectory()) {
+            link.children['..'] = this;
+            this.getNode().nlink++;
+        }
+        this.getNode().mtime = new Date();
         this.emit('child:add', link, this);
         return link;
     };
     Link.prototype.deleteChild = function (link) {
+        var node = link.getNode();
+        if (node.isDirectory()) {
+            delete link.children['..'];
+            this.getNode().nlink--;
+        }
         delete this.children[link.getName()];
         this.length--;
+        this.getNode().mtime = new Date();
         this.emit('child:delete', link, this);
     };
     Link.prototype.getChild = function (name) {
+        this.getNode().mtime = new Date();
         if (Object.hasOwnProperty.call(this.children, name)) {
             return this.children[name];
         }

package/lib/volume.d.ts

@@ -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

@@ -500,10 +500,10 @@ var Volume = /** @class */ (function () {
             }
             return FSWatcher;
         }(FSWatcher));
-        // root.setChild('.', root);
-        // root.getNode().nlink++;
-        // root.setChild('..', root);
-        // root.getNode().nlink++;
+        root.setChild('.', root);
+        root.getNode().nlink++;
+        root.setChild('..', root);
+        root.getNode().nlink++;
         this.root = root;
     }
     Volume.fromJSON = function (json, cwd) {
@@ -715,6 +715,9 @@ var Volume = /** @class */ (function () {
             link = link.parent;
         }
         for (var name_1 in children) {
+            if (name_1 === '.' || name_1 === '..') {
+                continue;
+            }
             isEmpty = false;
             var child = link.getChild(name_1);
             if (!child) {
@@ -1423,7 +1426,7 @@ var Volume = /** @class */ (function () {
             var list_1 = [];
             for (var name_2 in link.children) {
                 var child = link.getChild(name_2);
-                if (!child) {
+                if (!child || name_2 === '.' || name_2 === '..') {
                     continue;
                 }
                 list_1.push(Dirent_1.default.build(child, options.encoding));
@@ -1440,6 +1443,9 @@ var Volume = /** @class */ (function () {
         }
         var list = [];
         for (var name_3 in link.children) {
+            if (name_3 === '.' || name_3 === '..') {
+                continue;
+            }
             list.push((0, encoding_1.strToEncoding)(name_3, options.encoding));
         }
         if (!isWin && options.encoding !== 'buffer')
@@ -2217,9 +2223,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');
@@ -2251,6 +2256,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; }
@@ -2269,9 +2275,74 @@ 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.entries(link.children).forEach(function (_a) {
+                var name = _a[0], childLink = _a[1];
+                if (childLink && name !== '.' && name !== '..') {
+                    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.entries(link.children).forEach(function (_a) {
+                    var name = _a[0], childLink = _a[1];
+                    if (childLink && name !== '.' && name !== '..') {
+                        watchLinkChildrenChanged(childLink);
+                    }
+                });
+            }
+        };
+        watchLinkNodeChanged(this._link);
+        watchLinkChildrenChanged(this._link);
         var parent = this._link.parent;
         if (parent) {
             // parent.on('child:add', this._onParentChild);
@@ -2283,7 +2354,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.13",
+  "version": "3.5.1",
   "description": "In-memory file-system with Node's fs API.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",