feat(tasks): allow log task to take silent as a level

rafamel · Apr 4, 2021 · 19170ca · 19170ca
1 parent f9d9b27
commit 19170ca
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/src/tasks/stdio/log.ts b/src/tasks/stdio/log.ts
@@ -33,16 +33,14 @@ const color = {
  * of the call.
  * @returns Task
  */
-export function log(
-  level: Exclude<LogLevel, 'silent'>,
-  item: any,
-  ...data: any[]
-): Task.Sync {
-  const nLevel = rank[String(level).toLowerCase()] || 5;
+export function log(level: LogLevel, item: any, ...data: any[]): Task.Sync {
+  level = String(level) as LogLevel;
+  const nLevel = rank[level.toLowerCase()] || 5;
 
   return (ctx: Context): void => {
-    const nCurrent = rank[String(ctx.level).toLowerCase()] || 0;
+    if (level === 'silent' || level.toLowerCase() === 'silent') return;
 
+    const nCurrent = rank[String(ctx.level).toLowerCase()] || 0;
     if (nCurrent >= nLevel) {
       const str = addPrefix(
         util.format(item, ...data) + '\n',

diff --git a/src/tasks/transform/catches.ts b/src/tasks/transform/catches.ts
@@ -29,12 +29,8 @@ export function catches(
     try {
       await task(ctx);
     } catch (err) {
-      if (opts.level !== 'silent') {
-        into(ctx, log(opts.level, formatMessage(err)));
-      }
-      if (alternate) {
-        await alternate(ctx);
-      }
+      into(ctx, log(opts.level, formatMessage(err)));
+      if (alternate) await alternate(ctx);
     }
   };
 }