recursively close paths on unwatch

src/index.ts

@@ -511,7 +511,7 @@ export class FSWatcher extends EventEmitter<FSWatcherEventMap> {
         path = sysPath.resolve(path);
       }
 
-      this._closePath(path);
+      this._closePath(path, true);
 
       this._addIgnoredPath(path);
       if (this._watched.has(path)) {
@@ -924,7 +924,16 @@ export class FSWatcher extends EventEmitter<FSWatcherEventMap> {
   /**
    * Closes all watchers for a path
    */
-  _closePath(path: Path) {
+  _closePath(path: Path, recursive = false) {
+    if (recursive) {
+      // Close all watchers that are descendants of the path
+      const descendants = this._getWatchedDir(path).getChildren();
+      descendants.forEach((entry) => {
+        const p = sysPath.join(path, entry);
+        this._closePath(p, recursive);
+      });
+    }
+
     this._closeFile(path);
     const dir = sysPath.dirname(path);
     this._getWatchedDir(dir).remove(sysPath.basename(path));

test.mjs

@@ -1829,6 +1829,23 @@ const runTests = (baseopts) => {
       spy.should.not.have.been.calledWith(EV.UNLINK);
       if (!macosFswatch) spy.should.have.been.calledOnce;
     });
+    it('should emit add events for new paths if they were previously unwatched', async () => {
+      const spy = sinon.spy();
+      const watchPaths = [getFixturePath('subdir')];
+      const watcher = chokidar_watch(watchPaths, { ...options, ignoreInitial: false });
+      await waitForWatcher(watcher);
+      await write(getFixturePath('subdir/add.txt'), dateNow());
+
+      await delay();
+      watcher.unwatch(getFixturePath('subdir'));
+
+      await delay();
+      watcher.on(EV.ALL, spy).add(getFixturePath('subdir'));
+
+      await waitFor([spy]);
+      spy.should.have.been.calledWith(EV.ADD);
+      if (!macosFswatch) spy.should.have.been.calledTwice;
+    });
   });
   describe('env variable option override', () => {
     describe('CHOKIDAR_USEPOLLING', () => {