Minor cleanups

bin/peggy-cli.js

@@ -715,8 +715,8 @@ class PeggyCLI extends Command {
       this.watcher = new Watcher(this.inputFile);
 
       const that = this;
-      this.watcher.on("change", async event => {
-        PeggyCLI.print(this.std.err, `"${that.inputFile}" ${event}...`);
+      this.watcher.on("change", async() => {
+        PeggyCLI.print(this.std.err, `"${that.inputFile}" changed...`);
         this.lastError = null;
         await that.run();
 
@@ -728,7 +728,9 @@ class PeggyCLI extends Command {
       });
 
       return new Promise((resolve, reject) => {
-        this.watcher.on("error", reject);
+        this.watcher.on("error", er => {
+          reject(er);
+        });
         this.watcher.on("close", () => resolve(0));
       });
     } else {

bin/watcher.js

@@ -49,13 +49,16 @@ class Watcher extends EventEmitter {
         }, Watcher.interval);
       }
     };
+    const closed = () => this.emit("close");
 
     this.watcher = fs.watch(dir);
     this.watcher.on("error", er => {
+      this.watcher.off("close", closed);
       this.watcher.once("close", () => this.emit("error", er));
       this.watcher.close();
+      this.watcher = null;
     });
-    this.watcher.on("close", er => this.emit("close", er));
+    this.watcher.on("close", closed);
     this.watcher.on("change", changed);
 
     // Fire initial time if file exists.

test/cli/run.spec.ts

@@ -1210,15 +1210,15 @@ error: Rule "unknownRule" is not defined
       });
     });
 
-    it("handles chokidar errors", async() => {
+    it("handles watcher errors", async() => {
       const grammar = path.join(__dirname, "fixtures", "simple.peggy");
       let count = 0;
       await exec({
         args: ["-w", grammar],
         error: "Fake error",
         onstdout(s, cli) {
           if (++count === 3) {
-            cli.watcher?.emit("error", new Error("Fake error"));
+            cli.watcher?.watcher.emit("error", new Error("Fake error"));
           }
         },
       });