src,lib: added --watch-pattern option

Author: louiellan

lib/internal/fs/glob.js

@@ -783,5 +783,4 @@ module.exports = {
   __proto__: null,
   Glob,
   matchGlobPattern,
-  createMatcher,
 };

lib/internal/main/watch_mode.js

@@ -1,5 +1,6 @@
 'use strict';
 const {
+  ArrayPrototypeConcat,
   ArrayPrototypeFlatMap,
   ArrayPrototypeForEach,
   ArrayPrototypeJoin,
@@ -28,29 +29,43 @@ const { inspect } = require('util');
 const { setTimeout, clearTimeout } = require('timers');
 const { resolve } = require('path');
 const { once } = require('events');
-const { createMatcher } = require('internal/fs/glob');
 const { globSync } = require('fs');
 
 prepareMainThreadExecution(false, false);
 markBootstrapComplete();
 
-function hasGlobPattern(path) {
-  return createMatcher(path).hasMagic();
+const kWatchPath = getOptionValue('--watch-path');
+const kWatchPattern = getOptionValue('--watch-pattern');
+
+function isOptionNotGiven(option) {
+  return option.length === 0;
+}
+
+function isOptionGiven(option) {
+  return option.length > 0;
 }
 
-function handleWatchedPath(path) {
-  if (hasGlobPattern(path)) {
-    const matchedFilesFromGlob = globSync(path);
-    const resolvedMatchedFiles = ArrayPrototypeMap(matchedFilesFromGlob, (path) => resolve(path));
-    return resolvedMatchedFiles;
+function handleWatchedPaths() {
+  const watchedPaths = [];
+  if (isOptionGiven(kWatchPath)) {
+    ArrayPrototypeForEach(kWatchPath, (path) => {
+      ArrayPrototypePush(watchedPaths, resolve(path));
+    });
+  }
+  if (isOptionGiven(kWatchPattern)) {
+    ArrayPrototypeForEach(kWatchPattern, (path) => {
+      const matchedPaths = globSync(path);
+      ArrayPrototypeForEach(matchedPaths, (matchedPathFromGlobPattern) =>
+        ArrayPrototypePush(watchedPaths, resolve(matchedPathFromGlobPattern)));
+    });
   }
-  return resolve(path);
+  return watchedPaths;
 }
 
 const kKillSignal = convertToValidSignal(getOptionValue('--watch-kill-signal'));
-const kShouldFilterModules = getOptionValue('--watch-pattern').length === 0;
+const kShouldFilterModules = isOptionNotGiven(kWatchPath) && isOptionNotGiven(kWatchPattern);
 const kEnvFile = getOptionValue('--env-file') || getOptionValue('--env-file-if-exists');
-const kWatchedPaths = ArrayPrototypeFlatMap(getOptionValue('--watch-path'), (path) => handleWatchedPath(path));
+const kWatchedPaths = handleWatchedPaths();
 const kPreserveOutput = getOptionValue('--watch-preserve-output');
 const kCommand = ArrayPrototypeSlice(process.argv, 1);
 const kCommandStr = inspect(ArrayPrototypeJoin(kCommand, ' '));
@@ -72,6 +87,12 @@ for (let i = 0; i < process.execArgv.length; i++) {
     }
     continue;
   }
+  if (StringPrototypeStartsWith(arg, '--watch-pattern')) {
+    if (arg['--watch-pattern'.length] !== '=') {
+      i++;
+    }
+    continue;
+  }
   if (StringPrototypeStartsWith(arg, '--watch-path')) {
     const lengthOfWatchPathStr = 12;
     if (arg[lengthOfWatchPathStr] !== '=') {

src/node_options.cc

@@ -1006,6 +1006,9 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
             "path to watch",
             &EnvironmentOptions::watch_mode_paths,
             kAllowedInEnvvar);
+  AddOption("--watch-pattern",
+            "paths to watch (can include a glob pattern)",
+            &EnvironmentOptions::watch_mode_paths_with_glob_patterns);
   AddOption("--watch-kill-signal",
             "kill signal to send to the process on watch mode restarts"
             "(default: SIGTERM)",
@@ -1016,6 +1019,7 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
             &EnvironmentOptions::watch_mode_preserve_output,
             kAllowedInEnvvar);
   Implies("--watch-path", "--watch");
+  Implies("--watch-pattern", "--watch");
   AddOption("--check",
             "syntax check script without executing",
             &EnvironmentOptions::syntax_check_only);

src/node_options.h

@@ -234,6 +234,7 @@ class EnvironmentOptions : public Options {
   bool watch_mode_preserve_output = false;
   std::string watch_mode_kill_signal = "SIGTERM";
   std::vector<std::string> watch_mode_paths;
+  std::vector<std::string> watch_mode_paths_with_glob_patterns;
 
   bool syntax_check_only = false;
   bool has_eval_string = false;

test/sequential/test-watch-mode.mjs

@@ -814,7 +814,7 @@ process.on('message', (message) => {
     ]);
   });
 
-  it('should watch files from a given glob pattern --watch-path=./**/*.js', async () => {
+  it('should watch files from a given glob pattern --watch-pattern=./**/*.js', async () => {
 
     const tmpDirForGlobTest = tmpdir.resolve('glob-test-dir');
     mkdirSync(tmpDirForGlobTest);
@@ -835,7 +835,7 @@ process.on('message', (message) => {
 
     const mainJsFile = createTmpFile('console.log(\'running\')', '.js', tmpDirForGlobTest);
 
-    const args = ['--watch-path', globPattern, mainJsFile];
+    const args = ['--watch-pattern', globPattern, mainJsFile];
     const watchedFiles = [tmpJsFile1, tmpJsFile2, tmpJsFile3, tmpJsFile4, tmpJsFile5];
 
     const { stderr, stdout } = await runWriteSucceed({