just-task 1.12.0 → 1.14.0

package/src/logger.ts

@@ -1 +1,85 @@
-export * from 'just-task-logger';
+import chalk = require('chalk');
+import * as parser from 'yargs-parser';
+
+const argv = parser(process.argv.slice(2));
+
+function logInternal(method: 'info' | 'warn' | 'error', symbol: string, ...args: any[]) {
+  const now = new Date();
+  const timestamp = chalk.gray(`[${now.toLocaleTimeString()}]`);
+
+  console[method](timestamp, symbol, ...args);
+}
+
+const markers: { [marker: string]: [number, number] } = {};
+
+export function mark(marker: string): void {
+  markers[marker] = process.hrtime();
+}
+
+function getDeltaAndClearMark(marker: string): [number, number] | null {
+  if (markers[marker]) {
+    const delta = process.hrtime(markers[marker]);
+    delete markers[marker];
+    return delta;
+  }
+
+  return null;
+}
+
+export interface Logger {
+  /** Whether verbose logging is enabled. Default false unless --verbose arg is given. */
+  enableVerbose: boolean;
+  /** Log to `console.info` with a timestamp, but only if verbose logging is enabled. */
+  verbose(...args: any[]): void;
+  /** Log to `console.info` with a timestamp. */
+  info(...args: any[]): void;
+  /** Log to `console.warn` with a timestamp. */
+  warn(...args: any[]): void;
+  /** Log to `console.error` with a timestamp. */
+  error(...args: any[]): void;
+  /** Log perf marker data to `consold.info` with timestamp, only if verbose is enabled */
+  perf(marker: string, ...args: any[]): void;
+}
+
+const emptySquare = '\u25a1';
+const square = '\u25a0';
+const triangle = '\u25b2';
+
+export const logger: Logger = {
+  enableVerbose: !!argv.verbose,
+
+  verbose(...args: any[]) {
+    if (logger.enableVerbose) {
+      logInternal('info', chalk.gray(emptySquare), ...args);
+    }
+  },
+
+  info(...args: any[]) {
+    logInternal('info', chalk.green(square), ...args);
+  },
+
+  warn(...args: any[]) {
+    logInternal('warn', chalk.yellow(triangle), ...args);
+  },
+
+  error(...args: any[]) {
+    logInternal('error', chalk.redBright('x'), ...args);
+  },
+
+  perf(marker: string, ...args: any[]) {
+    if (logger.enableVerbose) {
+      const delta = getDeltaAndClearMark(marker);
+
+      if (delta) {
+        const ns = delta[0] * 1e9 + delta[1];
+        const deltaMsg = `${ns / 1e9}s`;
+        logInternal(
+          'info',
+          chalk.cyan(square),
+          `mark(${chalk.cyanBright(marker)}): took ${chalk.cyanBright(deltaMsg)}`,
+          ...args,
+        );
+      }
+    }
+  },
+};

package/src/task.ts

@@ -1,7 +1,6 @@
 import { undertaker } from './undertaker';
 import { wrapTask } from './wrapTask';
 import { TaskFunction } from './interfaces';
-import { registerCachedTask } from './cache';
 
 export function task(
   firstParam: string | TaskFunction,
@@ -16,9 +15,6 @@ export function task(
     // task('default', 'build');
 
     const wrapped = wrapTask(undertaker.series(secondParam));
-    wrapped.cached = () => {
-      registerCachedTask(firstParam);
-    };
 
     undertaker.task(firstParam, wrapped);
 
@@ -27,9 +23,6 @@ export function task(
     // task('pretter', prettierTask());
     // task('custom', () => { ... });
     const wrapped = wrapTask(secondParam as TaskFunction) as TaskFunction;
-    wrapped.cached = () => {
-      registerCachedTask(firstParam);
-    };
 
     undertaker.task(firstParam, wrapped);
 
@@ -37,9 +30,6 @@ export function task(
   } else if (argCount === 3 && isString(firstParam) && isString(secondParam) && isTaskFunction(thirdParam)) {
     // task('custom', 'describes this thing', () => { ... })
     const wrapped = wrapTask(thirdParam);
-    wrapped.cached = () => {
-      registerCachedTask(firstParam);
-    };
 
     wrapped.description = secondParam;
 

package/src/undertaker.ts

@@ -2,7 +2,6 @@ import { logger } from './logger';
 import chalk = require('chalk');
 import { wrapTask } from './wrapTask';
 import { Task } from './interfaces';
-import { clearCache } from './cache';
 import Undertaker = require('undertaker');
 
 const undertaker = new Undertaker();
@@ -84,8 +83,6 @@ undertaker.on('error', function (args: any) {
 
     logger.error(chalk.yellow('------------------------------------'));
 
-    clearCache();
-
     process.exitCode = 1;
   } else if (shouldLog(args)) {
     const duration = args.duration;