fix(cli): correct watch ignore logic (#495)

Corrects an issue in `yarn ocap watch` in which files which should have
been ignored (including `.bundle` files) were not.

Author: grypez

packages/cli/src/app.ts

@@ -116,8 +116,6 @@ await yargs(hideBin(process.argv))
       const closeHandlers: (() => Promise<void>)[] = [];
       const resolvedDir = path.resolve(args.dir);
 
-      await bundleSource(resolvedDir, logger);
-
       const handleClose = async (): Promise<void> => {
         await Promise.all(
           closeHandlers.map(async (close) => withTimeout(close(), 400)),

packages/cli/src/commands/watch.test.ts

@@ -8,7 +8,7 @@ import { unlink } from 'fs/promises';
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 
 import { bundleFile } from './bundle.ts';
-import { watchDir, makeWatchEvents, filterOnlyJsFiles } from './watch.ts';
+import { watchDir, makeWatchEvents, shouldIgnore } from './watch.ts';
 
 vi.mock('fs/promises', () => ({
   unlink: vi.fn(async () => new Promise<void>(() => undefined)),
@@ -46,21 +46,22 @@ describe('watchDir', () => {
   });
 });
 
-describe('filterOnlyJsFiles', () => {
+describe('shouldIgnore', () => {
   const missingStats = undefined as unknown as Stats;
   const fileStats = { isFile: () => true } as unknown as Stats;
   const nonFileStats = { isFile: () => false } as unknown as Stats;
 
   it.each`
-    description                    | file             | stats           | expectation
-    ${'a file with missing stats'} | ${'test.js'}     | ${missingStats} | ${false}
-    ${'a non-file'}                | ${'test.js'}     | ${nonFileStats} | ${false}
-    ${'a .ts file'}                | ${'test.ts'}     | ${fileStats}    | ${false}
-    ${'a .bundle file'}            | ${'test.bundle'} | ${fileStats}    | ${false}
-    ${'a .txt file'}               | ${'test.txt'}    | ${nonFileStats} | ${false}
-    ${'a .js file'}                | ${'test.js'}     | ${fileStats}    | ${true}
+    description                     | file                      | stats           | expectation
+    ${'a file with missing stats'}  | ${'test.js'}              | ${missingStats} | ${false}
+    ${'a non-file'}                 | ${'test.js'}              | ${nonFileStats} | ${false}
+    ${'a .js file'}                 | ${'test.js'}              | ${fileStats}    | ${false}
+    ${'a .ts file'}                 | ${'test.ts'}              | ${fileStats}    | ${true}
+    ${'a .bundle file'}             | ${'test.bundle'}          | ${fileStats}    | ${true}
+    ${'a .txt file'}                | ${'test.txt'}             | ${fileStats}    | ${true}
+    ${'a .js file in node_modules'} | ${'node_modules/test.js'} | ${fileStats}    | ${true}
   `('returns $expectation for $description', ({ file, expectation, stats }) => {
-    expect(filterOnlyJsFiles(file, stats)).toBe(expectation);
+    expect(shouldIgnore(file, stats)).toBe(expectation);
   });
 });
 

packages/cli/src/commands/watch.ts

@@ -56,8 +56,11 @@ export const makeWatchEvents = (
   error: (error: Error) => throwError(error),
 });
 
-export const filterOnlyJsFiles: MatchFunction = (file, stats) =>
-  (stats?.isFile() ?? false) && file.endsWith('.js');
+export const shouldIgnore: MatchFunction = (file, stats): boolean =>
+  // Ignore files and directories in `node_modules`.
+  file.includes('node_modules') ||
+  // Watch non-files, but ignore files that are not JavaScript.
+  ((stats?.isFile() ?? false) && !file.endsWith('.js'));
 
 /**
  * Start a watcher that bundles `.js` files in the target dir.
@@ -77,14 +80,8 @@ export function watchDir(dir: string, logger: Logger): WatchDirReturn {
   const { reject: throwError, promise: errorPromise } = makePromiseKit<never>();
 
   let watcher = watch(resolvedDir, {
-    ignoreInitial: true,
-    ignored: [
-      '**/node_modules/**',
-      '**/*.test.js',
-      '**/*.test.ts',
-      '**/*.bundle',
-      filterOnlyJsFiles,
-    ],
+    ignoreInitial: false,
+    ignored: shouldIgnore,
   });
 
   const events = makeWatchEvents(watcher, readyResolve, throwError, logger);

vitest.config.ts

@@ -64,10 +64,10 @@ export default defineConfig({
       thresholds: {
         autoUpdate: true,
         'packages/cli/**': {
-          statements: 69.46,
+          statements: 70,
           functions: 66.66,
-          branches: 88.23,
-          lines: 69.23,
+          branches: 88.57,
+          lines: 70,
         },
         'packages/create-package/**': {
           statements: 100,