@atlaskit/dependency-version-analytics 1.1.0 → 1.2.1

package/dist/cjs/commands/populate-historic-data/util/generate-csv.js

@@ -1,24 +1,19 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.generateCSV = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 /** Generates a CSV of product package changes over time */
-var generateCSV = function generateCSV(packageChanges) {
-  var csvData = [['']];
-  packageChanges.forEach(function (packageChange) {
-    var firstColumn = csvData[0];
-    var currentRow = firstColumn.push(packageChange.date) - 1;
-    Object.entries(packageChange.akDeps).forEach(function (_ref) {
-      var _ref2 = (0, _slicedToArray2.default)(_ref, 2),
-        name = _ref2[0],
-        version = _ref2[1].version;
-      var depColumnIndex = csvData.findIndex(function (item) {
-        return item[0] === name;
-      });
+const generateCSV = packageChanges => {
+  const csvData = [['']];
+  packageChanges.forEach(packageChange => {
+    const firstColumn = csvData[0];
+    const currentRow = firstColumn.push(packageChange.date) - 1;
+    Object.entries(packageChange.deps).forEach(([name, {
+      version
+    }]) => {
+      let depColumnIndex = csvData.findIndex(item => item[0] === name);
       if (depColumnIndex === -1) {
         depColumnIndex = csvData.push([name]) - 1;
       }
@@ -27,8 +22,8 @@ var generateCSV = function generateCSV(packageChanges) {
       csvData[depColumnIndex][currentRow] = version;
     });
   });
-  for (var i = 0; i < csvData.length; i++) {
-    for (var j = 0; j < csvData.length; j++) {
+  for (let i = 0; i < csvData.length; i++) {
+    for (let j = 0; j < csvData.length; j++) {
       if (typeof csvData[i][j] !== 'string') {
         // console.log('found empty cell');
         csvData[i][j] = '';
@@ -36,17 +31,17 @@ var generateCSV = function generateCSV(packageChanges) {
     }
     if (i !== 0 && csvData[0].length < csvData[i].length) {}
   }
-  var csvStrings = [];
-  csvData.forEach(function (column) {
+  const csvStrings = [];
+  csvData.forEach(column => {
     if (!column) {
       return;
     }
-    for (var rowIndex = 0; rowIndex < csvData[0].length; rowIndex++) {
-      var rowItem = column[rowIndex] || '';
+    for (let rowIndex = 0; rowIndex < csvData[0].length; rowIndex++) {
+      const rowItem = column[rowIndex] || '';
       if (typeof csvStrings[rowIndex] !== 'string') {
         csvStrings[rowIndex] = '';
       }
-      csvStrings[rowIndex] += "\"".concat(rowItem, "\",");
+      csvStrings[rowIndex] += `"${rowItem}",`;
     }
   });
   return csvStrings.join('\n');

package/dist/cjs/constants.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DEP_TYPES = exports.DEFAULT_TAG = void 0;
-var DEFAULT_TAG = 'atlaskit-dependency-version-analytics-last-run';
+const DEFAULT_TAG = 'atlaskit-dependency-version-analytics-last-run';
 exports.DEFAULT_TAG = DEFAULT_TAG;
-var DEP_TYPES = [{
+const DEP_TYPES = [{
   packageJsonKey: 'devDependencies',
   depTypeName: 'devDependency'
 }, {

package/dist/cjs/index.js

@@ -5,19 +5,19 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "populatePackage", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _populateHistoricData.populatePackage;
   }
 });
 Object.defineProperty(exports, "populateProduct", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _populateHistoricData.populateProduct;
   }
 });
 Object.defineProperty(exports, "sendAnalytics", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _analytics.sendAnalytics;
   }
 });

package/dist/cjs/util/analytics.js

@@ -6,26 +6,25 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createUpgradeEvent = createUpgradeEvent;
 exports.sendAnalytics = sendAnalytics;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _chalk = _interopRequireDefault(require("chalk"));
 var _inquirer = _interopRequireDefault(require("inquirer"));
 var _semver = _interopRequireDefault(require("semver"));
 var _analyticsNodeClient = require("@atlassiansox/analytics-node-client");
 var _version = require("../version.json");
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+// @ts-ignore
+
+/* eslint-disable-next-line import/no-unresolved */
+
 function getUpgradeType(version, previousVersion) {
   if (previousVersion == null && version != null) {
     return 'add';
   } else if (previousVersion != null && version == null) {
     return 'remove';
   } else if (previousVersion != null && version != null && previousVersion !== version) {
-    var coercedPrevious = _semver.default.coerce(previousVersion);
-    var coercedNew = _semver.default.coerce(version);
+    const coercedPrevious = _semver.default.coerce(previousVersion);
+    const coercedNew = _semver.default.coerce(version);
     if (coercedNew == null) {
-      console.error("Found invalid version \"".concat(version, "\", skipping"));
+      console.error(`Found invalid version "${version}", skipping`);
       return null;
     }
     if (coercedPrevious != null && _semver.default.lt(coercedNew, coercedPrevious)) {
@@ -38,123 +37,100 @@ function getUpgradeType(version, previousVersion) {
   }
 }
 function getUpgradeSubType(version, previousVersion) {
-  var upgradeSubType = null;
+  let upgradeSubType = null;
   if (version == null || previousVersion == null) {
     return upgradeSubType;
   }
-  var parsedOld = _semver.default.coerce(previousVersion);
-  var parsedNew = _semver.default.coerce(version);
+  const parsedOld = _semver.default.coerce(previousVersion);
+  const parsedNew = _semver.default.coerce(version);
   if (parsedOld && parsedNew) {
     upgradeSubType = _semver.default.diff(parsedOld.version, parsedNew.version);
   }
   return upgradeSubType;
 }
-function createUpgradeEvent(name, version, previousVersion, date) {
-  var _optionalArgs$tags, _ref, _tags$next, _tags$hotfix, _ref2;
-  var optionalArgs = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
+
+// optionalEventArgs will be included within the event.
+function createUpgradeEvent(name, version, previousVersion, date, optionalEventArgs = {}, tags = {}) {
   if (Number.isNaN(Date.parse(date))) {
-    throw new Error("Invalid date: '".concat(date, "'"));
+    throw new Error(`Invalid date: '${date}'`);
   }
-  var upgradeType = getUpgradeType(version, previousVersion);
+  const upgradeType = getUpgradeType(version, previousVersion);
   if (!upgradeType) {
     // Not an upgrade for this dependency, return null
     return null;
   }
-  var upgradeSubType = getUpgradeSubType(version, previousVersion);
-  var eventVersion = upgradeType !== 'remove' ? version : previousVersion;
-  var parsedVersion = _semver.default.coerce(eventVersion);
-  var rcKey = null;
-  var tags = (_optionalArgs$tags = optionalArgs === null || optionalArgs === void 0 ? void 0 : optionalArgs.tags) !== null && _optionalArgs$tags !== void 0 ? _optionalArgs$tags : {};
-  Object.keys(tags).forEach(function (key) {
+  const upgradeSubType = getUpgradeSubType(version, previousVersion);
+  const eventVersion = upgradeType !== 'remove' ? version : previousVersion;
+  const parsedVersion = _semver.default.coerce(eventVersion);
+  let rcKey = null;
+  Object.keys(tags).forEach(key => {
     if (key.startsWith('rc')) {
       rcKey = key;
       return;
     }
   });
-  return _objectSpread({
+  return {
     cliVersion: _version.version,
     dependencyName: name,
     versionString: eventVersion,
-    major: parsedVersion ? "".concat(parsedVersion.major) : null,
-    minor: parsedVersion ? "".concat(parsedVersion.minor) : null,
-    patch: parsedVersion ? "".concat(parsedVersion.patch) : null,
+    major: parsedVersion ? `${parsedVersion.major}` : null,
+    minor: parsedVersion ? `${parsedVersion.minor}` : null,
+    patch: parsedVersion ? `${parsedVersion.patch}` : null,
     date: new Date(date).toISOString(),
-    upgradeType: upgradeType,
-    upgradeSubType: upgradeSubType,
-    latestTag: (_ref = tags && tags['latest']) !== null && _ref !== void 0 ? _ref : null,
-    nextTag: (_tags$next = tags['next']) !== null && _tags$next !== void 0 ? _tags$next : null,
-    hotfixTag: (_tags$hotfix = tags['hotfix']) !== null && _tags$hotfix !== void 0 ? _tags$hotfix : null,
-    rcTag: (_ref2 = rcKey && tags[rcKey]) !== null && _ref2 !== void 0 ? _ref2 : null
-  }, optionalArgs);
-}
-function sendAnalytics(_x, _x2) {
-  return _sendAnalytics.apply(this, arguments);
+    upgradeType,
+    upgradeSubType,
+    latestTag: (tags && tags['latest']) ?? null,
+    nextTag: tags['next'] ?? null,
+    hotfixTag: tags['hotfix'] ?? null,
+    rcTag: (rcKey && tags[rcKey]) ?? null,
+    ...optionalEventArgs
+  };
 }
-function _sendAnalytics() {
-  _sendAnalytics = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(analyticsEvents, _ref3) {
-    var dev, limit, product, skipPrompt, analyticsEnv, eventsToSend, client, answers, promises;
-    return _regenerator.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            dev = _ref3.dev, limit = _ref3.limit, product = _ref3.product, skipPrompt = _ref3.skipPrompt;
-            analyticsEnv = dev ? 'dev' : 'prod';
-            eventsToSend = limit != null ? analyticsEvents.slice(0, limit) : analyticsEvents;
-            client = (0, _analyticsNodeClient.analyticsClient)({
-              env: dev ? 'dev' : 'prod',
-              product: product
-            });
-            if (skipPrompt) {
-              _context.next = 9;
-              break;
-            }
-            _context.next = 7;
-            return _inquirer.default.prompt([{
-              type: 'confirm',
-              name: 'continue',
-              message: "Are you sure you want to send ".concat(eventsToSend.length, " historical analytics events to '").concat(analyticsEnv, "' env for product '").concat(product, "?"),
-              default: false
-            }]);
-          case 7:
-            answers = _context.sent;
-            if (!answers.continue) {
-              console.log('Aborting');
-              process.exit(0);
-            }
-          case 9:
-            _context.prev = 9;
-            _context.next = 12;
-            return Promise.all(eventsToSend.map(function (event) {
-              return client.sendTrackEvent({
-                anonymousId: 'unknown',
-                trackEvent: {
-                  tags: ['atlaskit'],
-                  source: '@atlaskit/dependency-version-analytics',
-                  action: 'upgraded',
-                  actionSubject: 'akDependency',
-                  attributes: _objectSpread({}, event),
-                  origin: 'console',
-                  platform: 'bot'
-                }
-              });
-            }));
-          case 12:
-            promises = _context.sent;
-            console.log(_chalk.default.green("Sent ".concat(promises.length, " dependency version upgrade analytics events")));
-            _context.next = 21;
-            break;
-          case 16:
-            _context.prev = 16;
-            _context.t0 = _context["catch"](9);
-            console.error(_chalk.default.red('Sending analytics failed'));
-            console.error(_context.t0);
-            process.exit(1);
-          case 21:
-          case "end":
-            return _context.stop();
+async function sendAnalytics(analyticsEvents, {
+  dev,
+  limit,
+  product,
+  skipPrompt
+}) {
+  const analyticsEnv = dev ? 'dev' : 'prod';
+  const eventsToSend = limit != null ? analyticsEvents.slice(0, limit) : analyticsEvents;
+  const client = (0, _analyticsNodeClient.analyticsClient)({
+    env: dev ? 'dev' : 'prod',
+    product: product
+  });
+  if (!skipPrompt) {
+    const answers = await _inquirer.default.prompt([{
+      type: 'confirm',
+      name: 'continue',
+      message: `Are you sure you want to send ${eventsToSend.length} historical analytics events to '${analyticsEnv}' env for product '${product}?`,
+      default: false
+    }]);
+    if (!answers.continue) {
+      console.log('Aborting');
+      process.exit(0);
+    }
+  }
+  try {
+    const promises = await Promise.all(eventsToSend.map(event => {
+      return client.sendTrackEvent({
+        anonymousId: 'unknown',
+        trackEvent: {
+          tags: ['atlaskit'],
+          source: '@atlaskit/dependency-version-analytics',
+          action: 'upgraded',
+          actionSubject: 'akDependency',
+          attributes: {
+            ...event
+          },
+          origin: 'console',
+          platform: 'bot'
         }
-      }
-    }, _callee, null, [[9, 16]]);
-  }));
-  return _sendAnalytics.apply(this, arguments);
+      });
+    }));
+    console.log(_chalk.default.green(`Sent ${promises.length} dependency version upgrade analytics events`));
+  } catch (e) {
+    console.error(_chalk.default.red('Sending analytics failed'));
+    console.error(e);
+    process.exit(1);
+  }
 }

package/dist/cjs/util/get-file-history-from-git.js

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = getFileHistoryFromGit;
 var _child_process = require("child_process");
 // Lock files tend to be huge
-var FiveMBBuffer = 1024 * 5000;
+const FiveMBBuffer = 1024 * 5000;
 function getFileHistoryFromGit(fileName) {
-  return new Promise(function (resolve, reject) {
-    (0, _child_process.exec)("git log ".concat(fileName), {
+  return new Promise((resolve, reject) => {
+    (0, _child_process.exec)(`git log ${fileName}`, {
       maxBuffer: FiveMBBuffer
-    }, function (error, stdout, stderr) {
+    }, (error, stdout, stderr) => {
       if (error) {
         reject(error);
       }

package/dist/cjs/util/get-package-version-history.js

@@ -6,23 +6,25 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = getPackageVersionHistoryAndTags;
 var _child_process = require("child_process");
 function getPackageVersionHistoryAndTags(packageName) {
-  return new Promise(function (resolve, reject) {
-    (0, _child_process.exec)("yarn info ".concat(packageName, " --json"), function (error, stdout, stderr) {
+  return new Promise((resolve, reject) => {
+    (0, _child_process.exec)(`yarn info ${packageName} --json`, (error, stdout, stderr) => {
       if (error) {
+        console.log(`error: Unable to execute yarn info for ${packageName}`);
         reject(error);
       }
       if (stderr) {
+        console.log(`stderr: Unable to execute yarn info for ${packageName}`);
         reject(stderr);
       }
-      var json;
+      let json;
       try {
-        var parseData = JSON.parse(stdout).data;
+        const parseData = JSON.parse(stdout).data;
         json = {
           time: parseData['time'],
           'dist-tags': parseData['dist-tags']
         };
       } catch (e) {
-        reject("Error parsing json output: ".concat(e));
+        reject(`Error parsing json output: ${e}`);
       }
       resolve(json);
     });