@percy/logger 1.0.0-beta.70 → 1.0.0-beta.74

package/dist/browser.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = exports.PercyBrowserLogger = void 0;
 
 var _util = require("./util");
 
@@ -11,7 +11,7 @@ var _logger = _interopRequireDefault(require("./logger"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-class BrowserLogger extends _logger.default {
+class PercyBrowserLogger extends _logger.default {
   write(level, message) {
     let out = ['warn', 'error'].includes(level) ? level : 'log';
     let colors = [];
@@ -28,4 +28,6 @@ class BrowserLogger extends _logger.default {
 
 }
 
-exports.default = BrowserLogger;
+exports.PercyBrowserLogger = PercyBrowserLogger;
+var _default = PercyBrowserLogger;
+exports.default = _default;

package/dist/bundle.js

@@ -29,10 +29,11 @@
   	const ANSI_REG = new RegExp('[\\u001B\\u009B][[\\]()#;?]*((?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)' + '|(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))', 'g'); // color names by ansi escape code
 
   	const ANSI_COLORS = {
-  	  '31m': 'red',
-  	  '33m': 'yellow',
+  	  '91m': 'red',
+  	  '32m': 'green',
+  	  '93m': 'yellow',
   	  '34m': 'blue',
-  	  '35m': 'magenta',
+  	  '95m': 'magenta',
   	  '90m': 'grey'
   	}; // colorize each line of a string using an ansi escape sequence
 
@@ -43,7 +44,8 @@
   	} // map ansi colors to bound colorize functions
 
 
-  	const colors = entries(ANSI_COLORS).reduce((colors, [code, name]) => {
+  	const colors = entries(ANSI_COLORS).reduce((colors, _ref) => {
+  	  let [code, name] = _ref;
   	  return assign(colors, {
   	    [name]: colorize.bind(null, code)
   	  });
@@ -108,8 +110,8 @@
 
 
   	  loglevel(level) {
-  	    if (!level) return this.level;
-  	    this.level = level;
+  	    if (level) this.level = level;
+  	    return this.level;
   	  } // Change namespaces by generating an array of namespace regular expressions from a
   	  // comma separated debug string
 
@@ -142,9 +144,13 @@
   	    return Object.keys(LOG_LEVELS).reduce((group, level) => Object.assign(group, {
   	      [level]: this.log.bind(this, name, level)
   	    }), {
-  	      progress: this.progress.bind(this, name),
   	      deprecated: this.deprecated.bind(this, name),
-  	      shouldLog: this.shouldLog.bind(this, name)
+  	      shouldLog: this.shouldLog.bind(this, name),
+  	      progress: this.progress.bind(this, name),
+  	      format: this.format.bind(this, name),
+  	      loglevel: this.loglevel.bind(this),
+  	      stdout: this.constructor.stdout,
+  	      stderr: this.constructor.stderr
   	    });
   	  } // Query for a set of logs by filtering the in-memory store
 
@@ -154,10 +160,18 @@
   	  } // Formats messages before they are logged to stdio
 
 
-  	  format(message, debug, level, elapsed) {
+  	  format(debug, level, message, elapsed) {
   	    let label = 'percy';
   	    let suffix = '';
 
+  	    if (arguments.length === 1) {
+  	      // format(message)
+  	      [debug, message] = [null, debug];
+  	    } else if (arguments.length === 2) {
+  	      // format(debug, message)
+  	      [level, message] = [null, level];
+  	    }
+
   	    if (this.level === 'debug') {
   	      // include debug info in the label
   	      if (debug) label += `:${debug}`; // include elapsed time since last log
@@ -191,7 +205,7 @@
   	    } = this.constructor;
 
   	    if (stdout.isTTY || !this._progress) {
-  	      message && (message = this.format(message, debug));
+  	      message && (message = this.format(debug, message));
   	      if (stdout.isTTY) stdout.cursorTo(0);else message && (message = message + '\n');
   	      if (message) stdout.write(message);
   	      if (stdout.isTTY) stdout.clearLine(1);
@@ -224,7 +238,8 @@
   	  // information to store with the message and other info
 
 
-  	  log(debug, level, message, meta = {}) {
+  	  log(debug, level, message) {
+  	    let meta = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   	    // message might be an error object
   	    let isError = typeof message !== 'string' && (level === 'error' || level === 'debug');
   	    let error = isError && message; // if remote, send logs there
@@ -259,7 +274,7 @@
   	    if (this.shouldLog(debug, level)) {
   	      let elapsed = timestamp - (this.lastlog || timestamp);
   	      if (isError && this.level !== 'debug') message = error.toString();
-  	      this.write(level, this.format(message, debug, error ? 'error' : level, elapsed));
+  	      this.write(level, this.format(debug, error ? 'error' : level, message, elapsed));
   	      this.lastlog = timestamp;
   	    }
   	  } // Writes a message to stdio based on the loglevel
@@ -295,9 +310,10 @@
   	      }
   	    })); // attach remote logging handler
 
-  	    socket.onmessage = ({
-  	      data
-  	    }) => {
+  	    socket.onmessage = _ref => {
+  	      let {
+  	        data
+  	      } = _ref;
   	      let {
   	        log,
   	        logAll
@@ -313,7 +329,8 @@
   	  } // Connects to a remote logger
 
 
-  	  async remote(createSocket, timeout = 1000) {
+  	  async remote(createSocket) {
+  	    let timeout = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1000;
   	    if (this.isRemote) return; // if not already connected, wait until the timeout
 
   	    let err = await new Promise(resolve => {
@@ -355,9 +372,10 @@
   	    } // attach an incoming message handler
 
 
-  	    this.socket.onmessage = ({
-  	      data
-  	    }) => {
+  	    this.socket.onmessage = _ref2 => {
+  	      let {
+  	        data
+  	      } = _ref2;
   	      let {
   	        env
   	      } = JSON.parse(data); // update local environment info
@@ -380,10 +398,11 @@
 
   	var logger$1 = /*#__PURE__*/Object.freeze({
   		__proto__: null,
+  		PercyLogger: PercyLogger,
   		'default': PercyLogger
   	});
 
-  	class BrowserLogger extends PercyLogger {
+  	class PercyBrowserLogger extends PercyLogger {
   	  write(level, message) {
   	    let out = ['warn', 'error'].includes(level) ? level : 'log';
   	    let colors = [];
@@ -402,7 +421,8 @@
 
   	var browser = /*#__PURE__*/Object.freeze({
   		__proto__: null,
-  		'default': BrowserLogger
+  		PercyBrowserLogger: PercyBrowserLogger,
+  		'default': PercyBrowserLogger
   	});
 
   	var require$$0 = /*@__PURE__*/getAugmentedNamespace(browser);
@@ -418,16 +438,21 @@
   	}
 
   	Object.assign(logger, {
-  	  format: (...args) => new Logger().format(...args),
-  	  query: (...args) => new Logger().query(...args),
-  	  connect: (...args) => new Logger().connect(...args),
-  	  remote: (...args) => new Logger().remote(...args),
-
-  	  loglevel(level, flags = {}) {
-  	    if (flags.debug) level = 'debug';else if (flags.verbose) level = 'debug';else if (flags.quiet) level = 'warn';else if (flags.silent) level = 'silent';
-  	    return new Logger().loglevel(level);
+  	  format: function () {
+  	    return new Logger().format(...arguments);
+  	  },
+  	  query: function () {
+  	    return new Logger().query(...arguments);
+  	  },
+  	  connect: function () {
+  	    return new Logger().connect(...arguments);
+  	  },
+  	  remote: function () {
+  	    return new Logger().remote(...arguments);
+  	  },
+  	  loglevel: function () {
+  	    return new Logger().loglevel(...arguments);
   	  }
-
   	});
   	Object.defineProperties(logger, {
   	  Logger: {

package/dist/index.js

@@ -13,12 +13,7 @@ Object.assign(logger, {
   query: (...args) => new Logger().query(...args),
   connect: (...args) => new Logger().connect(...args),
   remote: (...args) => new Logger().remote(...args),
-
-  loglevel(level, flags = {}) {
-    if (flags.debug) level = 'debug';else if (flags.verbose) level = 'debug';else if (flags.quiet) level = 'warn';else if (flags.silent) level = 'silent';
-    return new Logger().loglevel(level);
-  }
-
+  loglevel: (...args) => new Logger().loglevel(...args)
 });
 Object.defineProperties(logger, {
   Logger: {

package/dist/logger.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = exports.PercyLogger = void 0;
 
 var _util = require("./util");
 
@@ -53,8 +53,8 @@ class PercyLogger {
 
 
   loglevel(level) {
-    if (!level) return this.level;
-    this.level = level;
+    if (level) this.level = level;
+    return this.level;
   } // Change namespaces by generating an array of namespace regular expressions from a
   // comma separated debug string
 
@@ -87,9 +87,13 @@ class PercyLogger {
     return Object.keys(LOG_LEVELS).reduce((group, level) => Object.assign(group, {
       [level]: this.log.bind(this, name, level)
     }), {
-      progress: this.progress.bind(this, name),
       deprecated: this.deprecated.bind(this, name),
-      shouldLog: this.shouldLog.bind(this, name)
+      shouldLog: this.shouldLog.bind(this, name),
+      progress: this.progress.bind(this, name),
+      format: this.format.bind(this, name),
+      loglevel: this.loglevel.bind(this),
+      stdout: this.constructor.stdout,
+      stderr: this.constructor.stderr
     });
   } // Query for a set of logs by filtering the in-memory store
 
@@ -99,10 +103,18 @@ class PercyLogger {
   } // Formats messages before they are logged to stdio
 
 
-  format(message, debug, level, elapsed) {
+  format(debug, level, message, elapsed) {
     let label = 'percy';
     let suffix = '';
 
+    if (arguments.length === 1) {
+      // format(message)
+      [debug, message] = [null, debug];
+    } else if (arguments.length === 2) {
+      // format(debug, message)
+      [level, message] = [null, level];
+    }
+
     if (this.level === 'debug') {
       // include debug info in the label
       if (debug) label += `:${debug}`; // include elapsed time since last log
@@ -136,7 +148,7 @@ class PercyLogger {
     } = this.constructor;
 
     if (stdout.isTTY || !this._progress) {
-      message && (message = this.format(message, debug));
+      message && (message = this.format(debug, message));
       if (stdout.isTTY) stdout.cursorTo(0);else message && (message = message + '\n');
       if (message) stdout.write(message);
       if (stdout.isTTY) stdout.clearLine(1);
@@ -204,7 +216,7 @@ class PercyLogger {
     if (this.shouldLog(debug, level)) {
       let elapsed = timestamp - (this.lastlog || timestamp);
       if (isError && this.level !== 'debug') message = error.toString();
-      this.write(level, this.format(message, debug, error ? 'error' : level, elapsed));
+      this.write(level, this.format(debug, error ? 'error' : level, message, elapsed));
       this.lastlog = timestamp;
     }
   } // Writes a message to stdio based on the loglevel
@@ -319,8 +331,11 @@ class PercyLogger {
 
 }
 
-exports.default = PercyLogger;
+exports.PercyLogger = PercyLogger;
 
 _defineProperty(PercyLogger, "stdout", process.stdout);
 
-_defineProperty(PercyLogger, "stderr", process.stderr);
+_defineProperty(PercyLogger, "stderr", process.stderr);
+
+var _default = PercyLogger;
+exports.default = _default;

package/dist/util.js

@@ -13,10 +13,11 @@ const ANSI_REG = new RegExp('[\\u001B\\u009B][[\\]()#;?]*((?:(?:[a-zA-Z\\d]*(?:;
 
 exports.ANSI_REG = ANSI_REG;
 const ANSI_COLORS = {
-  '31m': 'red',
-  '33m': 'yellow',
+  '91m': 'red',
+  '32m': 'green',
+  '93m': 'yellow',
   '34m': 'blue',
-  '35m': 'magenta',
+  '95m': 'magenta',
   '90m': 'grey'
 }; // colorize each line of a string using an ansi escape sequence
 

package/package.json

@@ -1,7 +1,15 @@
 {
   "name": "@percy/logger",
-  "version": "1.0.0-beta.70",
+  "version": "1.0.0-beta.74",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/percy/cli",
+    "directory": "packages/logger"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
   "main": "dist/index.js",
   "browser": "dist/bundle.js",
   "files": [
@@ -18,18 +26,10 @@
     "test": "node ../../scripts/test",
     "test:coverage": "yarn test --coverage"
   },
-  "publishConfig": {
-    "access": "public"
-  },
   "rollup": {
     "output": {
       "name": "PercyLogger"
     }
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/percy/cli",
-    "directory": "packages/logger"
-  },
-  "gitHead": "34f37a98ff71281cebadd39e53bb55a65b0d3456"
+  "gitHead": "f8d1e38e93e5d731b8519d3fa8637e8a478efcde"
 }

package/test/client.js

@@ -37,10 +37,11 @@
   	const ANSI_REG$1 = new RegExp('[\\u001B\\u009B][[\\]()#;?]*((?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)' + '|(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))', 'g'); // color names by ansi escape code
 
   	const ANSI_COLORS = {
-  	  '31m': 'red',
-  	  '33m': 'yellow',
+  	  '91m': 'red',
+  	  '32m': 'green',
+  	  '93m': 'yellow',
   	  '34m': 'blue',
-  	  '35m': 'magenta',
+  	  '95m': 'magenta',
   	  '90m': 'grey'
   	}; // colorize each line of a string using an ansi escape sequence
 
@@ -51,7 +52,8 @@
   	} // map ansi colors to bound colorize functions
 
 
-  	const colors = entries(ANSI_COLORS).reduce((colors, [code, name]) => {
+  	const colors = entries(ANSI_COLORS).reduce((colors, _ref) => {
+  	  let [code, name] = _ref;
   	  return assign(colors, {
   	    [name]: colorize.bind(null, code)
   	  });
@@ -77,10 +79,11 @@
   	const NEWLINE_REG = /\r\n/g;
   	const LASTLINE_REG = /\n$/;
 
-  	function sanitizeLog(str, {
-  	  ansi,
-  	  elapsed
-  	} = {}) {
+  	function sanitizeLog(str) {
+  	  let {
+  	    ansi,
+  	    elapsed
+  	  } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   	  // normalize line endings
   	  str = str.replace(NEWLINE_REG, '\n'); // strip ansi colors
 
@@ -118,7 +121,11 @@
   	    return object[method];
   	  }
 
-  	  let spy = Object.assign(function spy(...args) {
+  	  let spy = Object.assign(function spy() {
+  	    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+  	      args[_key] = arguments[_key];
+  	    }
+
   	    spy.calls.push(args);
   	    if (func) return func.apply(this, args);
   	  }, {
@@ -180,14 +187,15 @@
 
   	    let logs = Array.from(helpers.messages);
   	    logger.loglevel('debug');
-  	    write(logger.format('--- DUMPING LOGS ---', 'testing', 'warn'));
-  	    logs.reduce((lastlog, {
-  	      debug,
-  	      level,
-  	      message,
-  	      timestamp
-  	    }) => {
-  	      write(logger.format(message, debug, level, timestamp - lastlog));
+  	    write(logger.format('testing', 'warn', '--- DUMPING LOGS ---'));
+  	    logs.reduce((lastlog, _ref) => {
+  	      let {
+  	        debug,
+  	        level,
+  	        message,
+  	        timestamp
+  	      } = _ref;
+  	      write(logger.format(debug, level, message, timestamp - lastlog));
   	      return timestamp;
   	    }, logs[0].timestamp);
   	  }

package/test/helpers.js

@@ -109,10 +109,10 @@ const helpers = {
 
     logger.loglevel('debug');
 
-    write(logger.format('--- DUMPING LOGS ---', 'testing', 'warn'));
+    write(logger.format('testing', 'warn', '--- DUMPING LOGS ---'));
 
     logs.reduce((lastlog, { debug, level, message, timestamp }) => {
-      write(logger.format(message, debug, level, timestamp - lastlog));
+      write(logger.format(debug, level, message, timestamp - lastlog));
       return timestamp;
     }, logs[0].timestamp);
   }