fix: fix stdout clear for watch task and command

rafamel · Apr 3, 2021 · a1cc544 · a1cc544
1 parent 90c1527
commit a1cc544
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 5 deletions.
diff --git a/src/bin/watch.ts b/src/bin/watch.ts
@@ -1,5 +1,14 @@
 import { Task } from '../definitions';
-import { series, raises, print, log, combine, watch, context } from '../tasks';
+import {
+  series,
+  raises,
+  print,
+  log,
+  combine,
+  watch,
+  context,
+  bundle
+} from '../tasks';
 import { stripIndent as indent } from 'common-tags';
 import { flags, safePairs, splitBy } from 'cli-belt';
 import chalk from 'chalk';
@@ -67,6 +76,7 @@ export default async function bin(
 
   if (cmd['--help']) return print(help + '\n');
 
+  let first = true;
   const [names, args] = splitBy(cmd._, '--');
   return names.length
     ? context(
@@ -93,7 +103,18 @@ export default async function bin(
               poll: cmd['--poll'],
               symlinks: cmd['--symlinks']
             },
-            combine(params.record, names)
+            series(
+              bundle(() => {
+                if (first) return (first = false) || null;
+                return log(
+                  'info',
+                  chalk.bold(opts.bin),
+                  chalk.bold.blue(':watch'),
+                  names.join(' ')
+                );
+              }),
+              combine(params.record, names)
+            )
           )
         )
       )

diff --git a/src/tasks/filesystem/watch.ts b/src/tasks/filesystem/watch.ts
@@ -88,7 +88,7 @@ export function watch(options: WatchOptions | Empty, task: Task): Task.Async {
       cancel();
     }
 
-    let i = 0;
+    let i = -1;
     let current: Promise<void> = Promise.resolve();
     const onEvent = debounce(
       (onError: UnaryFn<Error>): void => {
@@ -98,9 +98,10 @@ export function watch(options: WatchOptions | Empty, task: Task): Task.Async {
 
         current = after
           .then(() => {
-            return run(series(i === 0 ? null : clear(), task), {
+            i += 1;
+            return run(series(i > 0 && opts.clear ? clear() : null, task), {
               ...ctx,
-              route: opts.parallel ? ctx.route.concat(String(i++)) : ctx.route,
+              route: opts.parallel ? ctx.route.concat(String(i)) : ctx.route,
               cancellation: new Promise((resolve) => {
                 cbs.push(resolve);
               })