reg-cli 0.17.7 → 0.18.0

package/dist/index.js

@@ -1,263 +1,200 @@
-'use strict';
-
-var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; // $FlowIgnore
+"use strict";
+
+var _glob = _interopRequireDefault(require("glob"));
+var _makeDir = _interopRequireDefault(require("make-dir"));
+var _del = _interopRequireDefault(require("del"));
+var _fs = _interopRequireDefault(require("fs"));
+var _path = _interopRequireDefault(require("path"));
+var _lodash = require("lodash");
+var _log = _interopRequireDefault(require("./log"));
+var _report = _interopRequireDefault(require("./report"));
+var _bluebird = _interopRequireDefault(require("bluebird"));
+var _events = _interopRequireDefault(require("events"));
+var _processAdaptor = _interopRequireDefault(require("./process-adaptor"));
+var _imageFinder = require("./image-finder");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // $FlowIgnore
 // $FlowIgnore
-
 // $FlowIgnore
-
-
-var _glob = require('glob');
-
-var _glob2 = _interopRequireDefault(_glob);
-
-var _makeDir = require('make-dir');
-
-var _makeDir2 = _interopRequireDefault(_makeDir);
-
-var _del = require('del');
-
-var _del2 = _interopRequireDefault(_del);
-
-var _fs = require('fs');
-
-var _fs2 = _interopRequireDefault(_fs);
-
-var _path = require('path');
-
-var _path2 = _interopRequireDefault(_path);
-
-var _lodash = require('lodash');
-
-var _log = require('./log');
-
-var _log2 = _interopRequireDefault(_log);
-
-var _report = require('./report');
-
-var _report2 = _interopRequireDefault(_report);
-
-var _bluebird = require('bluebird');
-
-var _bluebird2 = _interopRequireDefault(_bluebird);
-
-var _events = require('events');
-
-var _events2 = _interopRequireDefault(_events);
-
-var _processAdaptor = require('./process-adaptor');
-
-var _processAdaptor2 = _interopRequireDefault(_processAdaptor);
-
-var _imageFinder = require('./image-finder');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } }
-
-var copyImages = function copyImages(actualImages, _ref) {
-  var expectedDir = _ref.expectedDir,
-      actualDir = _ref.actualDir;
-
-  return Promise.all(actualImages.map(function (image) {
-    return new Promise(function (resolve, reject) {
-      try {
-        _makeDir2.default.sync(_path2.default.dirname(_path2.default.join(expectedDir, image)));
-        var writeStream = _fs2.default.createWriteStream(_path2.default.join(expectedDir, image));
-        _fs2.default.createReadStream(_path2.default.join(actualDir, image)).pipe(writeStream);
-        writeStream.on('finish', function (err) {
-          if (err) reject(err);
-          resolve();
-        });
-      } catch (err) {
-        reject(err);
-      }
-    });
-  }));
+// $FlowIgnore
+var copyImages = (actualImages, {
+  expectedDir,
+  actualDir
+}) => {
+  return Promise.all(actualImages.map(image => new Promise((resolve, reject) => {
+    try {
+      _makeDir.default.sync(_path.default.dirname(_path.default.join(expectedDir, image)));
+      var writeStream = _fs.default.createWriteStream(_path.default.join(expectedDir, image));
+      _fs.default.createReadStream(_path.default.join(actualDir, image)).pipe(writeStream);
+      writeStream.on('finish', err => {
+        if (err) reject(err);
+        resolve();
+      });
+    } catch (err) {
+      reject(err);
+    }
+  })));
 };
-
-var compareImages = function compareImages(emitter, _ref2) {
-  var expectedImages = _ref2.expectedImages,
-      actualImages = _ref2.actualImages,
-      dirs = _ref2.dirs,
-      matchingThreshold = _ref2.matchingThreshold,
-      thresholdPixel = _ref2.thresholdPixel,
-      thresholdRate = _ref2.thresholdRate,
-      concurrency = _ref2.concurrency,
-      enableAntialias = _ref2.enableAntialias;
-
-  var images = actualImages.filter(function (actualImage) {
-    return expectedImages.includes(actualImage);
-  });
+var compareImages = (emitter, {
+  expectedImages,
+  actualImages,
+  dirs,
+  matchingThreshold,
+  thresholdPixel,
+  thresholdRate,
+  concurrency,
+  enableAntialias
+}) => {
+  var images = actualImages.filter(actualImage => expectedImages.includes(actualImage));
   concurrency = images.length < 20 ? 1 : concurrency || 4;
-  var processes = (0, _lodash.range)(concurrency).map(function () {
-    return new _processAdaptor2.default(emitter);
-  });
-  return _bluebird2.default.map(images, function (image) {
-    var p = processes.find(function (p) {
-      return !p.isRunning();
-    });
+  var processes = (0, _lodash.range)(concurrency).map(() => new _processAdaptor.default(emitter));
+  return _bluebird.default.map(images, image => {
+    var p = processes.find(p => !p.isRunning());
     if (p) {
-      return p.run(_extends({}, dirs, {
-        image: image,
-        matchingThreshold: matchingThreshold,
-        thresholdRate: thresholdRate,
-        thresholdPixel: thresholdPixel,
-        enableAntialias: enableAntialias
-      }));
+      return p.run({
+        ...dirs,
+        image,
+        matchingThreshold,
+        thresholdRate,
+        thresholdPixel,
+        enableAntialias
+      });
     }
-  }, { concurrency: concurrency }).then(function (result) {
-    processes.forEach(function (p) {
-      return p.close();
-    });
+  }, {
+    concurrency
+  }).then(result => {
+    processes.forEach(p => p.close());
     return result;
-  }).filter(function (r) {
-    return !!r;
-  });
+  }).filter(r => !!r);
 };
-
-var cleanupExpectedDir = function cleanupExpectedDir(expectedDir, changedFiles) {
-  var paths = changedFiles.map(function (image) {
-    var _path$posix;
-
+var cleanupExpectedDir = (expectedDir, changedFiles) => {
+  var paths = changedFiles.map(image => {
     var directories = expectedDir.split("\\");
-    return escapeGlob((_path$posix = _path2.default.posix).join.apply(_path$posix, _toConsumableArray(directories).concat([image])));
+    return escapeGlob(_path.default.posix.join(...directories, image));
   });
   // force: true needed to allow deleting outside working directory
-  return (0, _del2.default)(paths, { force: true });
+  return (0, _del.default)(paths, {
+    force: true
+  });
 };
-
-var escapeGlob = function escapeGlob(fileName) {
+var escapeGlob = fileName => {
   return fileName.replace(/(\*)/g, '[$1]').replace(/(\*)/g, '[$1]').replace(/(\?)/g, '[$1]').replace(/(\[)/g, '[$1]').replace(/(\])/g, '[$1]').replace(/(\{)/g, '[$1]').replace(/(\})/g, '[$1]').replace(/(\))/g, '[$1]').replace(/(\()/g, '[$1]').replace(/(\!)/g, '[$1]');
 };
-
-var aggregate = function aggregate(result) {
-  var passed = result.filter(function (r) {
-    return r.passed;
-  }).map(function (r) {
-    return r.image;
-  });
-  var failed = result.filter(function (r) {
-    return !r.passed;
-  }).map(function (r) {
-    return r.image;
-  });
-  var diffItems = failed.map(function (image) {
-    return image.replace(/\.[^\.]+$/, '.png');
-  });
-  return { passed: passed, failed: failed, diffItems: diffItems };
+var aggregate = result => {
+  var passed = result.filter(r => r.passed).map(r => r.image);
+  var failed = result.filter(r => !r.passed).map(r => r.image);
+  var diffItems = failed.map(image => image.replace(/\.[^\.]+$/, '.png'));
+  return {
+    passed,
+    failed,
+    diffItems
+  };
 };
-
-var updateExpected = function updateExpected(_ref3) {
-  var actualDir = _ref3.actualDir,
-      expectedDir = _ref3.expectedDir,
-      diffDir = _ref3.diffDir,
-      deletedImages = _ref3.deletedImages,
-      newImages = _ref3.newImages,
-      diffItems = _ref3.diffItems;
-
-  return cleanupExpectedDir(expectedDir, [].concat(_toConsumableArray(deletedImages), _toConsumableArray(diffItems))).then(function () {
-    return copyImages([].concat(_toConsumableArray(newImages), _toConsumableArray(diffItems)), {
-      actualDir: actualDir,
-      expectedDir: expectedDir,
-      diffDir: diffDir
-    });
-  }).then(function () {
-    _log2.default.success('\nAll images are updated. ');
+var updateExpected = ({
+  actualDir,
+  expectedDir,
+  diffDir,
+  deletedImages,
+  newImages,
+  diffItems
+}) => {
+  return cleanupExpectedDir(expectedDir, [...deletedImages, ...diffItems]).then(() => copyImages([...newImages, ...diffItems], {
+    actualDir,
+    expectedDir,
+    diffDir
+  })).then(() => {
+    _log.default.success(`\nAll images are updated. `);
   });
 };
-
-module.exports = function (params) {
-  var actualDir = params.actualDir,
-      expectedDir = params.expectedDir,
-      diffDir = params.diffDir,
-      json = params.json,
-      _params$concurrency = params.concurrency,
-      concurrency = _params$concurrency === undefined ? 4 : _params$concurrency,
-      update = params.update,
-      report = params.report,
-      urlPrefix = params.urlPrefix,
-      threshold = params.threshold,
-      _params$matchingThres = params.matchingThreshold,
-      matchingThreshold = _params$matchingThres === undefined ? 0 : _params$matchingThres,
-      thresholdRate = params.thresholdRate,
-      thresholdPixel = params.thresholdPixel,
-      enableAntialias = params.enableAntialias,
-      enableClientAdditionalDetection = params.enableClientAdditionalDetection;
-
-  var dirs = { actualDir: actualDir, expectedDir: expectedDir, diffDir: diffDir };
-  var emitter = new _events2.default();
-
-  var _findImages = (0, _imageFinder.findImages)(expectedDir, actualDir),
-      expectedImages = _findImages.expectedImages,
-      actualImages = _findImages.actualImages,
-      deletedImages = _findImages.deletedImages,
-      newImages = _findImages.newImages;
-
-  _makeDir2.default.sync(expectedDir);
-  _makeDir2.default.sync(diffDir);
-
-  setImmediate(function () {
-    return emitter.emit('start');
-  });
+module.exports = params => {
+  var {
+    actualDir,
+    expectedDir,
+    diffDir,
+    json,
+    concurrency = 4,
+    update,
+    report,
+    junitReport,
+    extendedErrors,
+    urlPrefix,
+    threshold,
+    matchingThreshold = 0,
+    thresholdRate,
+    thresholdPixel,
+    enableAntialias,
+    enableClientAdditionalDetection
+  } = params;
+  var dirs = {
+    actualDir,
+    expectedDir,
+    diffDir
+  };
+  var emitter = new _events.default();
+  var {
+    expectedImages,
+    actualImages,
+    deletedImages,
+    newImages
+  } = (0, _imageFinder.findImages)(expectedDir, actualDir);
+  _makeDir.default.sync(expectedDir);
+  _makeDir.default.sync(diffDir);
+  setImmediate(() => emitter.emit('start'));
   compareImages(emitter, {
-    expectedImages: expectedImages,
-    actualImages: actualImages,
-    dirs: dirs,
-    matchingThreshold: matchingThreshold,
+    expectedImages,
+    actualImages,
+    dirs,
+    matchingThreshold,
     thresholdRate: thresholdRate || threshold,
-    thresholdPixel: thresholdPixel,
-    concurrency: concurrency,
+    thresholdPixel,
+    concurrency,
     enableAntialias: !!enableAntialias
-  }).then(function (result) {
-    return aggregate(result);
-  }).then(function (_ref4) {
-    var passed = _ref4.passed,
-        failed = _ref4.failed,
-        diffItems = _ref4.diffItems;
-
-    return (0, _report2.default)({
+  }).then(result => aggregate(result)).then(({
+    passed,
+    failed,
+    diffItems
+  }) => {
+    return (0, _report.default)({
       passedItems: passed,
       failedItems: failed,
       newItems: newImages,
       deletedItems: deletedImages,
       expectedItems: update ? actualImages : expectedImages,
       actualItems: actualImages,
-      diffItems: diffItems,
+      diffItems,
       json: json || './reg.json',
-      actualDir: actualDir,
-      expectedDir: expectedDir,
-      diffDir: diffDir,
+      actualDir,
+      expectedDir,
+      diffDir,
       report: report || '',
+      junitReport: junitReport || '',
+      extendedErrors: !!extendedErrors,
       urlPrefix: urlPrefix || '',
       enableClientAdditionalDetection: !!enableClientAdditionalDetection
     });
-  }).then(function (result) {
-    deletedImages.forEach(function (image) {
-      return emitter.emit('compare', { type: 'delete', path: image });
-    });
-    newImages.forEach(function (image) {
-      return emitter.emit('compare', { type: 'new', path: image });
-    });
+  }).then(result => {
+    deletedImages.forEach(image => emitter.emit('compare', {
+      type: 'delete',
+      path: image
+    }));
+    newImages.forEach(image => emitter.emit('compare', {
+      type: 'new',
+      path: image
+    }));
     if (update) {
       return updateExpected({
-        actualDir: actualDir,
-        expectedDir: expectedDir,
-        diffDir: diffDir,
-        deletedImages: deletedImages,
-        newImages: newImages,
+        actualDir,
+        expectedDir,
+        diffDir,
+        deletedImages,
+        newImages,
         diffItems: result.diffItems
-      }).then(function () {
+      }).then(() => {
         emitter.emit('update');
         return result;
       });
     }
     return result;
-  }).then(function (result) {
-    return emitter.emit('complete', result);
-  }).catch(function (err) {
-    return emitter.emit('error', err);
-  });
-
+  }).then(result => emitter.emit('complete', result)).catch(err => emitter.emit('error', err));
   return emitter;
 };

package/dist/log.js

@@ -1,21 +1,21 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = void 0;
 var chalk = require('chalk');
-
-exports.default = {
-  info: function info(text) {
+var _default = exports.default = {
+  info(text) {
     console.log(chalk.cyan(text));
   },
-  warn: function warn(text) {
+  warn(text) {
     console.log(chalk.gray(text));
   },
-  success: function success(text) {
+  success(text) {
     console.log(chalk.green(text));
   },
-  fail: function fail(text) {
+  fail(text) {
     console.log(chalk.red(text));
   }
 };

package/dist/process-adaptor.js

@@ -1,63 +1,40 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); // $FlowIgnore
-
-
-var _child_process = require('child_process');
-
-var _path = require('path');
-
-var _path2 = _interopRequireDefault(_path);
-
+exports.default = void 0;
+var _child_process = require("child_process");
+var _path = _interopRequireDefault(require("path"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-var ProcessAdaptor = function () {
-  function ProcessAdaptor(emitter) {
-    _classCallCheck(this, ProcessAdaptor);
-
-    this._process = (0, _child_process.fork)(_path2.default.resolve(__dirname, './diff.js'));
+// $FlowIgnore
+class ProcessAdaptor {
+  constructor(emitter) {
+    this._process = (0, _child_process.fork)(_path.default.resolve(__dirname, './diff.js'));
     this._isRunning = false;
     this._emitter = emitter;
   }
-
-  _createClass(ProcessAdaptor, [{
-    key: 'isRunning',
-    value: function isRunning() {
-      return this._isRunning;
-    }
-  }, {
-    key: 'run',
-    value: function run(params) {
-      var _this = this;
-
-      return new Promise(function (resolve, reject) {
-        _this._isRunning = true;
-        if (!_this._process || !_this._process.send) resolve();
-        _this._process.send(params);
-        _this._process.once('message', function (result) {
-          _this._isRunning = false;
-          _this._emitter.emit('compare', {
-            type: result.passed ? 'pass' : 'fail', path: result.image
-          });
-          resolve(result);
+  isRunning() {
+    return this._isRunning;
+  }
+  run(params) {
+    return new Promise((resolve, reject) => {
+      this._isRunning = true;
+      if (!this._process || !this._process.send) resolve();
+      this._process.send(params);
+      this._process.once('message', result => {
+        this._isRunning = false;
+        this._emitter.emit('compare', {
+          type: result.passed ? 'pass' : 'fail',
+          path: result.image
         });
+        resolve(result);
       });
-    }
-  }, {
-    key: 'close',
-    value: function close() {
-      if (!this._process || !this._process.kill) return;
-      this._process.kill();
-    }
-  }]);
-
-  return ProcessAdaptor;
-}();
-
+    });
+  }
+  close() {
+    if (!this._process || !this._process.kill) return;
+    this._process.kill();
+  }
+}
 exports.default = ProcessAdaptor;