@percy/sdk-utils 1.0.0-beta.70 → 1.0.0-beta.74

package/dist/bundle.js

@@ -1,5 +1,5 @@
 (function() {
-  (function (exports, require$$0$1, require$$0$2) {
+  (function (exports, require$$0$1) {
   	'use strict';
 
   	const process = (typeof globalThis !== "undefined" && globalThis.process) || {};
@@ -9,7 +9,6 @@
   	function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
   	var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0$1);
-  	var require$$0__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$0$2);
 
   	function getAugmentedNamespace(n) {
   		if (n.__esModule) return n;
@@ -34,10 +33,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
 
@@ -48,7 +48,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)
   	  });
@@ -113,8 +114,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
 
@@ -147,9 +148,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
 
@@ -159,10 +164,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
@@ -196,7 +209,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);
@@ -229,7 +242,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
@@ -264,7 +278,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
@@ -300,9 +314,10 @@
   	      }
   	    })); // attach remote logging handler
 
-  	    socket.onmessage = ({
-  	      data
-  	    }) => {
+  	    socket.onmessage = _ref => {
+  	      let {
+  	        data
+  	      } = _ref;
   	      let {
   	        log,
   	        logAll
@@ -318,7 +333,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 => {
@@ -360,9 +376,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
@@ -385,10 +402,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 = [];
@@ -407,7 +425,8 @@
 
   	var browser = /*#__PURE__*/Object.freeze({
   		__proto__: null,
-  		'default': BrowserLogger
+  		PercyBrowserLogger: PercyBrowserLogger,
+  		'default': PercyBrowserLogger
   	});
 
   	var require$$0 = /*@__PURE__*/getAugmentedNamespace(browser);
@@ -423,16 +442,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: {
@@ -506,7 +530,8 @@
 
   	};
 
-  	async function request(path, options = {}) {
+  	async function request(path) {
+  	  let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   	  let response = await request.fetch(`${info.address}${path}`, options); // maybe parse response body as json
 
   	  if (typeof response.body === 'string' && response.headers['content-type'] === 'application/json') {
@@ -568,16 +593,19 @@
   	}
 
   	async function connectRemoteLogger() {
-  	  await src.remote(() => {
+  	  await src.remote(async () => {
   	    let url = info.address.replace('http', 'ws');
 
   	    if (process.env.__PERCY_BROWSERIFIED__) {
   	      return new window.WebSocket(url);
   	    } else {
-  	      let socket = new (require$$0__default$1["default"])(url); // allow node to exit with an active connection
+  	      /* eslint-disable-next-line import/no-extraneous-dependencies */
+  	      let {
+  	        default: WebSocket
+  	      } = await import('ws');
+  	      let ws = new WebSocket(url); // allow node to exit with an active connection
 
-  	      socket.once('open', () => socket._socket.unref());
-  	      return socket;
+  	      return ws.once('open', () => ws._socket.unref());
   	    }
   	  });
   	} // Check if Percy is enabled using the healthcheck endpoint
@@ -656,7 +684,7 @@
 
   	Object.defineProperty(exports, '__esModule', { value: true });
 
-  })(this.PercySDKUtils = this.PercySDKUtils || {}, null, null);
+  })(this.PercySDKUtils = this.PercySDKUtils || {}, null);
 }).call(window);
 
 if (typeof define === "function" && define.amd) {

package/dist/percy-dom.js

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = fetchPercyDOM;
+exports.default = void 0;
+exports.fetchPercyDOM = fetchPercyDOM;
 
 var _percyInfo = _interopRequireDefault(require("./percy-info"));
 
@@ -19,4 +20,7 @@ async function fetchPercyDOM() {
   }
 
   return _percyInfo.default.domScript;
-}
+}
+
+var _default = fetchPercyDOM;
+exports.default = _default;

package/dist/percy-enabled.js

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = isPercyEnabled;
+exports.default = void 0;
+exports.isPercyEnabled = isPercyEnabled;
 
 var _logger = _interopRequireDefault(require("@percy/logger"));
 
@@ -13,18 +14,25 @@ var _request = _interopRequireDefault(require("./request"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
 // Create a socket to connect to a remote logger
 async function connectRemoteLogger() {
-  await _logger.default.remote(() => {
+  await _logger.default.remote(async () => {
     let url = _percyInfo.default.address.replace('http', 'ws');
 
     if (process.env.__PERCY_BROWSERIFIED__) {
       return new window.WebSocket(url);
     } else {
-      let socket = new (require('ws'))(url); // allow node to exit with an active connection
+      /* eslint-disable-next-line import/no-extraneous-dependencies */
+      let {
+        default: WebSocket
+      } = await Promise.resolve().then(() => _interopRequireWildcard(require('ws')));
+      let ws = new WebSocket(url); // allow node to exit with an active connection
 
-      socket.once('open', () => socket._socket.unref());
-      return socket;
+      return ws.once('open', () => ws._socket.unref());
     }
   });
 } // Check if Percy is enabled using the healthcheck endpoint
@@ -60,4 +68,7 @@ async function isPercyEnabled() {
   }
 
   return _percyInfo.default.enabled;
-}
+}
+
+var _default = isPercyEnabled;
+exports.default = _default;

package/dist/post-snapshot.js

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = postSnapshot;
+exports.default = void 0;
+exports.postSnapshot = postSnapshot;
 
 var _percyInfo = _interopRequireDefault(require("./percy-info"));
 
@@ -22,4 +23,7 @@ async function postSnapshot(options, params) {
       throw err;
     }
   });
-}
+}
+
+var _default = postSnapshot;
+exports.default = _default;

package/dist/request.js

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = request;
+exports.default = void 0;
+exports.request = request;
 
 var _percyInfo = _interopRequireDefault(require("./percy-info"));
 
@@ -69,4 +70,7 @@ if (process.env.__PERCY_BROWSERIFIED__) {
       }).on('error', reject).end(options.body);
     });
   };
-}
+}
+
+var _default = request;
+exports.default = _default;

package/package.json

@@ -1,7 +1,15 @@
 {
   "name": "@percy/sdk-utils",
-  "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/sdk-utils"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
   "main": "dist/index.js",
   "browser": "dist/bundle.js",
   "files": [
@@ -19,9 +27,6 @@
     "test": "node ../../scripts/test",
     "test:coverage": "yarn test --coverage"
   },
-  "publishConfig": {
-    "access": "public"
-  },
   "karma": {
     "run_start": "node test/server start &",
     "run_complete": "node test/server stop"
@@ -46,12 +51,7 @@
     }
   },
   "dependencies": {
-    "@percy/logger": "1.0.0-beta.70"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/percy/cli",
-    "directory": "packages/sdk-utils"
+    "@percy/logger": "1.0.0-beta.74"
   },
-  "gitHead": "34f37a98ff71281cebadd39e53bb55a65b0d3456"
+  "gitHead": "f8d1e38e93e5d731b8519d3fa8637e8a478efcde"
 }

package/test/client.js

@@ -39,10 +39,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
 
@@ -53,7 +54,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)
   	  });
@@ -79,10 +81,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
 
@@ -120,7 +123,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);
   	  }, {
@@ -182,14 +189,15 @@
 
   	    let logs = Array.from(helpers$1.messages);
   	    logger$1.loglevel('debug');
-  	    write(logger$1.format('--- DUMPING LOGS ---', 'testing', 'warn'));
-  	    logs.reduce((lastlog, {
-  	      debug,
-  	      level,
-  	      message,
-  	      timestamp
-  	    }) => {
-  	      write(logger$1.format(message, debug, level, timestamp - lastlog));
+  	    write(logger$1.format('testing', 'warn', '--- DUMPING LOGS ---'));
+  	    logs.reduce((lastlog, _ref) => {
+  	      let {
+  	        debug,
+  	        level,
+  	        message,
+  	        timestamp
+  	      } = _ref;
+  	      write(logger$1.format(debug, level, message, timestamp - lastlog));
   	      return timestamp;
   	    }, logs[0].timestamp);
   	  }
@@ -225,7 +233,11 @@
   	};
 
   	if (process.env.__PERCY_BROWSERIFIED__) {
-  	  helpers.call = async function call(event, ...args) {
+  	  helpers.call = async function call(event) {
+  	    for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+  	      args[_key - 1] = arguments[_key];
+  	    }
+
   	    let {
   	      socket,
   	      pending = {}
@@ -249,9 +261,10 @@
   	        socket.onopen = socket.onerror = done;
   	      });
 
-  	      socket.onmessage = ({
-  	        data
-  	      }) => {
+  	      socket.onmessage = _ref => {
+  	        let {
+  	          data
+  	        } = _ref;
   	        let {
   	          id,
   	          resolve,

package/test/server.js

@@ -123,12 +123,13 @@ async function start(args, log) {
     close.called = true;
 
     if (ctx) ctx.call('close');
+    for (let ws of wss.clients) ws.terminate();
     wss.close(() => log('info', 'Closed SDK testing server'));
   };
 
   wss.on('connection', ws => {
     ws.on('message', data => {
-      if (data === 'CLOSE') return close();
+      if (data.toString() === 'CLOSE') return close();
       let { id, event, args = [] } = JSON.parse(data);
 
       Promise.resolve().then(async () => {