fix: don't error when watched directory gets renamed (#939)

streamich · Aug 7, 2023 · b431b08 · b431b08
1 parent cd6c256
commit b431b08
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/__tests__/volume.test.ts b/src/__tests__/volume.test.ts
@@ -1126,6 +1126,21 @@ describe('volume', () => {
         }
       });
 
+      it('handles directories being renamed', () => {
+        const vol = Volume.fromJSON({ '/1': null });
+
+        const mockCallback = jest.fn();
+        const watcher = vol.watch('/', mockCallback as any);
+
+        try {
+          expect(() => vol.renameSync('/1', '/2')).not.toThrow();
+          expect(mockCallback).toHaveBeenCalledWith('rename', '1');
+          expect(mockCallback).toHaveBeenCalledWith('rename', '2');
+        } finally {
+          watcher.close();
+        }
+      });
+
       it('Calls listener on .watch when renaming with recursive=true', done => {
         const vol = new Volume();
         vol.mkdirSync('/test');

diff --git a/src/volume.ts b/src/volume.ts
@@ -2406,8 +2406,8 @@ export class FSWatcher extends EventEmitter {
             removers.forEach(r => r());
             this._listenerRemovers.delete(ino);
           }
-          Object.values(curLink.children).forEach(childLink => {
-            if (childLink) {
+          Object.entries(curLink.children).forEach(([name, childLink]) => {
+            if (childLink && name !== '.' && name !== '..') {
               removeLinkNodeListeners(childLink);
             }
           });