@percy/logger 1.6.3 → 1.7.1

package/dist/logger.js

@@ -1,5 +1,5 @@
 import { colors } from './utils.js';
-const URL_REGEXP = /\bhttps?:\/\/[^\s/$.?#].[^\s]*\b/i;
+const URL_REGEXP = /https?:\/\/[-a-zA-Z0-9@:%._+~#=]{2,256}\.[a-z]{2,4}\b([-a-zA-Z0-9@:;%_+.~#?&//=[\]]*)/i;
 const LOG_LEVELS = {
   debug: 0,
   info: 1,
@@ -92,6 +92,8 @@ export class PercyLogger {
 
 
   format(debug, level, message, elapsed) {
+    let color = (n, m) => this.isTTY ? colors[n](m) : m;
+
     let label = 'percy';
     let suffix = '';
 
@@ -108,24 +110,30 @@ export class PercyLogger {
       if (debug) label += `:${debug}`; // include elapsed time since last log
 
       if (elapsed != null) {
-        suffix = ' ' + colors.grey(`(${elapsed}ms)`);
+        suffix = ' ' + color('grey', `(${elapsed}ms)`);
       }
-    }
+    } // add colors
+
 
-    label = colors.magenta(label);
+    label = color('magenta', label);
 
     if (level === 'error') {
       // red errors
-      message = colors.red(message);
+      message = color('red', message);
     } else if (level === 'warn') {
       // yellow warnings
-      message = colors.yellow(message);
+      message = color('yellow', message);
     } else if (level === 'info' || level === 'debug') {
       // blue info and debug URLs
-      message = message.replace(URL_REGEXP, colors.blue('$&'));
+      message = message.replace(URL_REGEXP, color('blue', '$&'));
     }
 
     return `[${label}] ${message}${suffix}`;
+  } // True if stdout is a TTY interface
+
+
+  get isTTY() {
+    return !!this.constructor.stdout.isTTY;
   } // Replaces the current line with a log message
 
 
@@ -135,11 +143,11 @@ export class PercyLogger {
       stdout
     } = this.constructor;
 
-    if (stdout.isTTY || !this._progress) {
+    if (this.isTTY || !this._progress) {
       message && (message = this.format(debug, message));
-      if (stdout.isTTY) stdout.cursorTo(0);else message && (message = message + '\n');
+      if (this.isTTY) stdout.cursorTo(0);else message && (message = message + '\n');
       if (message) stdout.write(message);
-      if (stdout.isTTY) stdout.clearLine(1);
+      if (this.isTTY) stdout.clearLine(1);
     }
 
     this._progress = !!message && {
@@ -174,34 +182,45 @@ export class PercyLogger {
       level,
       message,
       meta,
-      timestamp
+      timestamp,
+      error: !!err
     };
     this.messages.add(entry); // maybe write the message to stdio
 
     if (this.shouldLog(debug, level)) {
+      // unless the loglevel is debug, write shorter error messages
       if (err && this.level !== 'debug') message = err;
-      let elapsed = timestamp - (this.lastlog || timestamp);
-      this.write(level, this.format(debug, err ? 'error' : level, message, elapsed));
+      this.write({ ...entry,
+        message
+      });
       this.lastlog = timestamp;
     }
-  } // Writes a message to stdio based on the loglevel
+  } // Writes a log entry to stdio based on the loglevel
 
 
-  write(level, message) {
+  write({
+    debug,
+    level,
+    message,
+    timestamp,
+    error
+  }) {
     var _this$_progress;
 
+    let elapsed = timestamp - (this.lastlog || timestamp);
+    let msg = this.format(debug, error ? 'error' : level, message, elapsed);
+    let progress = this.isTTY && this._progress;
     let {
       stdout,
       stderr
-    } = this.constructor;
-    let progress = stdout.isTTY && this._progress;
+    } = this.constructor; // clear any logged progress
 
     if (progress) {
       stdout.cursorTo(0);
       stdout.clearLine(0);
     }
 
-    (level === 'info' ? stdout : stderr).write(message + '\n');
+    (level === 'info' ? stdout : stderr).write(msg + '\n');
     if (!((_this$_progress = this._progress) !== null && _this$_progress !== void 0 && _this$_progress.persist)) delete this._progress;else if (progress) stdout.write(progress.message);
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@percy/logger",
-  "version": "1.6.3",
+  "version": "1.7.1",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -31,5 +31,5 @@
     "test": "node ../../scripts/test",
     "test:coverage": "yarn test --coverage"
   },
-  "gitHead": "ab48a150317a4af36d536a5671701532c669d2d1"
+  "gitHead": "012892cdaf7a07aa1b5aa355017639cee0e8a19e"
 }