@atlaskit/dependency-version-analytics 0.4.2 → 1.1.0

package/dist/cjs/util/analytics.js

@@ -1,33 +1,21 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 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; }
-
 function getUpgradeType(version, previousVersion) {
   if (previousVersion == null && version != null) {
     return 'add';
@@ -35,14 +23,11 @@ function getUpgradeType(version, previousVersion) {
     return 'remove';
   } else if (previousVersion != null && version != null && previousVersion !== version) {
     var coercedPrevious = _semver.default.coerce(previousVersion);
-
     var coercedNew = _semver.default.coerce(version);
-
     if (coercedNew == null) {
       console.error("Found invalid version \"".concat(version, "\", skipping"));
       return null;
     }
-
     if (coercedPrevious != null && _semver.default.lt(coercedNew, coercedPrevious)) {
       return 'downgrade';
     } else {
@@ -52,44 +37,40 @@ function getUpgradeType(version, previousVersion) {
     return null;
   }
 }
-
 function getUpgradeSubType(version, previousVersion) {
   var upgradeSubType = null;
-
   if (version == null || previousVersion == null) {
     return upgradeSubType;
   }
-
   var parsedOld = _semver.default.coerce(previousVersion);
-
   var 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] : {};
-
   if (Number.isNaN(Date.parse(date))) {
     throw new Error("Invalid date: '".concat(date, "'"));
   }
-
   var 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) {
+    if (key.startsWith('rc')) {
+      rcKey = key;
+      return;
+    }
+  });
   return _objectSpread({
     cliVersion: _version.version,
     dependencyName: name,
@@ -99,34 +80,34 @@ function createUpgradeEvent(name, version, previousVersion, date) {
     patch: parsedVersion ? "".concat(parsedVersion.patch) : null,
     date: new Date(date).toISOString(),
     upgradeType: upgradeType,
-    upgradeSubType: upgradeSubType
+    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);
 }
-
 function _sendAnalytics() {
-  _sendAnalytics = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(analyticsEvents, _ref) {
+  _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 = _ref.dev, limit = _ref.limit, product = _ref.product, skipPrompt = _ref.skipPrompt;
+            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',
@@ -134,15 +115,12 @@ function _sendAnalytics() {
               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;
@@ -160,20 +138,17 @@ function _sendAnalytics() {
                 }
               });
             }));
-
           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();

package/dist/cjs/util/assert.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.assert = assert;
-
 /** Generic assertion function */
 function assert(condition, msg) {
   if (!condition) {

package/dist/cjs/util/env-with-guard.js

@@ -4,11 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
-
 function _default(name) {
   if (!process.env.hasOwnProperty(name) || !process.env[name] || typeof process.env[name] !== 'string') {
     return null;
   }
-
   return process.env[name];
 }

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

@@ -4,12 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = getFileHistoryFromGit;
-
 var _child_process = require("child_process");
-
 // Lock files tend to be huge
 var FiveMBBuffer = 1024 * 5000;
-
 function getFileHistoryFromGit(fileName) {
   return new Promise(function (resolve, reject) {
     (0, _child_process.exec)("git log ".concat(fileName), {
@@ -18,11 +15,9 @@ function getFileHistoryFromGit(fileName) {
       if (error) {
         reject(error);
       }
-
       if (stderr) {
         reject(stderr);
       }
-
       resolve(stdout);
     });
   });

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

@@ -3,29 +3,27 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = getPackageVersionHistory;
-
+exports.default = getPackageVersionHistoryAndTags;
 var _child_process = require("child_process");
-
-function getPackageVersionHistory(packageName) {
+function getPackageVersionHistoryAndTags(packageName) {
   return new Promise(function (resolve, reject) {
-    (0, _child_process.exec)("yarn info ".concat(packageName, " --json time"), function (error, stdout, stderr) {
+    (0, _child_process.exec)("yarn info ".concat(packageName, " --json"), function (error, stdout, stderr) {
       if (error) {
         reject(error);
       }
-
       if (stderr) {
         reject(stderr);
       }
-
       var json;
-
       try {
-        json = JSON.parse(stdout).data;
+        var parseData = JSON.parse(stdout).data;
+        json = {
+          time: parseData['time'],
+          'dist-tags': parseData['dist-tags']
+        };
       } catch (e) {
         reject("Error parsing json output: ".concat(e));
       }
-
       resolve(json);
     });
   });

package/dist/cjs/util/git.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -12,27 +11,17 @@ exports.getHash = getHash;
 exports.refetchTag = refetchTag;
 exports.showFile = showFile;
 exports.tagCommit = tagCommit;
-
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _simpleGit = _interopRequireDefault(require("simple-git"));
-
 var _assert = require("./assert");
-
 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; }
-
 function getChangesSince(_x) {
   return _getChangesSince.apply(this, arguments);
 }
-
 function _getChangesSince() {
   _getChangesSince = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(since) {
     var revisionRange, listLogSummary;
@@ -42,14 +31,19 @@ function _getChangesSince() {
           case 0:
             revisionRange = since ? ["".concat(since, "..")] : [];
             _context.next = 3;
-            return (0, _simpleGit.default)().log([// Only commits on mainline master
-            '--first-parent', // Show merge commit contents
-            '-m', // Reverse the order
-            '--reverse', // Show filename changes - simple-git parses --stat flag but not --name-only unfortunately
-            '--stat=4096', // Make +- graph width as small as possible to maximise filename length
-            '--stat-graph-width=1'].concat(revisionRange, [// Any commit that modifies a package.json
+            return (0, _simpleGit.default)().log([
+            // Only commits on mainline master
+            '--first-parent',
+            // Show merge commit contents
+            '-m',
+            // Reverse the order
+            '--reverse',
+            // Show filename changes - simple-git parses --stat flag but not --name-only unfortunately
+            '--stat=4096',
+            // Make +- graph width as small as possible to maximise filename length
+            '--stat-graph-width=1'].concat(revisionRange, [
+            // Any commit that modifies a package.json
             ':(glob)**/package.json']));
-
           case 3:
             listLogSummary = _context.sent;
             return _context.abrupt("return", _objectSpread(_objectSpread({}, listLogSummary), {}, {
@@ -57,7 +51,6 @@ function _getChangesSince() {
                 return parseLogLine(logLine);
               })
             }));
-
           case 5:
           case "end":
             return _context.stop();
@@ -67,22 +60,19 @@ function _getChangesSince() {
   }));
   return _getChangesSince.apply(this, arguments);
 }
-
 function parseLogLine(logLine) {
   if (!logLine.diff) {
     return logLine;
-  } // Split files into separate entries when a rename has occurred so both old and new files are processed
-
+  }
 
+  // Split files into separate entries when a rename has occurred so both old and new files are processed
   var parsedDiffFiles = logLine.diff.files.reduce(function (acc, curr) {
     var renameArrowCount = curr.file.match(/ => /g);
-
     if (renameArrowCount == null) {
       return [].concat((0, _toConsumableArray2.default)(acc), [curr]);
-    } // Multiple rename parts are not supported. They most likely don't exist in git but we check
+    }
+    // Multiple rename parts are not supported. They most likely don't exist in git but we check
     // for them anyway just in case
-
-
     (0, _assert.assert)(renameArrowCount.length === 1, "Multiple rename parts detected: ".concat(curr.file));
     /* Matches:
      * - '{new-frontend/src => src}/package.json'
@@ -90,10 +80,10 @@ function parseLogLine(logLine) {
      * - 'src/{ => platform}/analytics/package.json'
      * - 'src/packages/spa/{main => }/package.json'
      */
-
     var renameMatch = curr.file.match(/\{?([^{]+)? => ([^}]+)?\}?/);
     (0, _assert.assert)(renameMatch != null, "Invalid rename format ".concat(curr.file));
-    var oldFile = curr.file.replace(renameMatch[0], renameMatch[1] || '') // If the previous name segment is empty, we will have a double slash
+    var oldFile = curr.file.replace(renameMatch[0], renameMatch[1] || '')
+    // If the previous name segment is empty, we will have a double slash
     .replace('//', '/');
     var newFile = curr.file.replace(renameMatch[0], renameMatch[2] || '').replace('//', '/');
     return [].concat((0, _toConsumableArray2.default)(acc), [_objectSpread(_objectSpread({}, curr), {}, {
@@ -108,11 +98,9 @@ function parseLogLine(logLine) {
     })
   });
 }
-
 function tagCommit(_x2) {
   return _tagCommit.apply(this, arguments);
 }
-
 function _tagCommit() {
   _tagCommit = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(tag) {
     return _regenerator.default.wrap(function _callee2$(_context2) {
@@ -120,7 +108,6 @@ function _tagCommit() {
         switch (_context2.prev = _context2.next) {
           case 0:
             return _context2.abrupt("return", (0, _simpleGit.default)().tag(['-f', tag]));
-
           case 1:
           case "end":
             return _context2.stop();
@@ -130,11 +117,9 @@ function _tagCommit() {
   }));
   return _tagCommit.apply(this, arguments);
 }
-
 function doesTagExist(_x3) {
   return _doesTagExist.apply(this, arguments);
 }
-
 function _doesTagExist() {
   _doesTagExist = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(tag) {
     var tags;
@@ -144,11 +129,9 @@ function _doesTagExist() {
           case 0:
             _context3.next = 2;
             return (0, _simpleGit.default)().tags((0, _defineProperty2.default)({}, tag, null));
-
           case 2:
             tags = _context3.sent;
             return _context3.abrupt("return", tags.all.length > 0);
-
           case 4:
           case "end":
             return _context3.stop();
@@ -158,11 +141,9 @@ function _doesTagExist() {
   }));
   return _doesTagExist.apply(this, arguments);
 }
-
 function refetchTag(_x4) {
   return _refetchTag.apply(this, arguments);
 }
-
 function _refetchTag() {
   _refetchTag = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(tag) {
     var fetchTagResult;
@@ -173,48 +154,37 @@ function _refetchTag() {
             _context4.prev = 0;
             _context4.next = 3;
             return (0, _simpleGit.default)().tag(['-d', tag]);
-
           case 3:
             _context4.next = 9;
             break;
-
           case 5:
             _context4.prev = 5;
             _context4.t0 = _context4["catch"](0);
-
             if (/tag.*not found/.test(_context4.t0.message)) {
               _context4.next = 9;
               break;
             }
-
             throw _context4.t0;
-
           case 9:
             _context4.prev = 9;
             _context4.next = 12;
             return (0, _simpleGit.default)().fetch(['origin', 'tag', tag]);
-
           case 12:
             fetchTagResult = _context4.sent;
             _context4.next = 19;
             break;
-
           case 15:
             _context4.prev = 15;
             _context4.t1 = _context4["catch"](9);
-
             if (/Couldn't find remote ref refs\/tags\//.test(_context4.t1.message)) {
               _context4.next = 19;
               break;
             }
-
             throw _context4.t1;
-
           case 19:
             return _context4.abrupt("return", {
               fetchTagResult: fetchTagResult
             });
-
           case 20:
           case "end":
             return _context4.stop();
@@ -224,11 +194,9 @@ function _refetchTag() {
   }));
   return _refetchTag.apply(this, arguments);
 }
-
 function getHash(_x5) {
   return _getHash.apply(this, arguments);
 }
-
 function _getHash() {
   _getHash = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(ref) {
     return _regenerator.default.wrap(function _callee5$(_context5) {
@@ -236,7 +204,6 @@ function _getHash() {
         switch (_context5.prev = _context5.next) {
           case 0:
             return _context5.abrupt("return", (0, _simpleGit.default)().revparse([ref]));
-
           case 1:
           case "end":
             return _context5.stop();
@@ -246,21 +213,18 @@ function _getHash() {
   }));
   return _getHash.apply(this, arguments);
 }
-
 function showFile(ref, filename) {
   var opts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   return (0, _simpleGit.default)(opts.cwd || process.cwd()).show(["".concat(ref, ":").concat(filename)]);
 }
-
 function getFiles(_x6, _x7) {
   return _getFiles.apply(this, arguments);
 }
-
 function _getFiles() {
   _getFiles = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(ref, glob) {
     var opts,
-        result,
-        _args6 = arguments;
+      result,
+      _args6 = arguments;
     return _regenerator.default.wrap(function _callee6$(_context6) {
       while (1) {
         switch (_context6.prev = _context6.next) {
@@ -268,7 +232,6 @@ function _getFiles() {
             opts = _args6.length > 2 && _args6[2] !== undefined ? _args6[2] : {};
             _context6.next = 3;
             return (0, _simpleGit.default)(opts.cwd || process.cwd()).raw(['grep', '--name-only', '', ref, '--', ":(glob)".concat(glob)]);
-
           case 3:
             result = _context6.sent;
             return _context6.abrupt("return", result.split('\n').filter(function (line) {
@@ -276,7 +239,6 @@ function _getFiles() {
             }).map(function (line) {
               return line.split(':')[1];
             }));
-
           case 5:
           case "end":
             return _context6.stop();

package/dist/cjs/util/statlas.js

@@ -1,25 +1,18 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getMeta = getMeta;
 exports.uploadMeta = uploadMeta;
-
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _nodeFetch = _interopRequireDefault(require("node-fetch"));
-
 var STATLAS_BASE_URL = 'https://statlas.prod.atl-paas.net/af-product-analytics';
-
 function getMeta(_x) {
   return _getMeta.apply(this, arguments);
 }
-
 function _getMeta() {
   _getMeta = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(product) {
     var response;
@@ -29,11 +22,9 @@ function _getMeta() {
           case 0:
             _context.next = 2;
             return retrieveJSON(getProductMetaPath(product));
-
           case 2:
             response = _context.sent;
             return _context.abrupt("return", response.json);
-
           case 4:
           case "end":
             return _context.stop();
@@ -43,21 +34,17 @@ function _getMeta() {
   }));
   return _getMeta.apply(this, arguments);
 }
-
 function uploadMeta(product, lastRunHash) {
   return uploadJSON(getProductMetaPath(product), {
     lastRunHash: lastRunHash
   });
 }
-
 function getProductMetaPath(product) {
   return "product/".concat(product, ".json");
 }
-
 function retrieveJSON(_x2) {
   return _retrieveJSON.apply(this, arguments);
 }
-
 function _retrieveJSON() {
   _retrieveJSON = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(filepath) {
     var response, json;
@@ -67,28 +54,22 @@ function _retrieveJSON() {
           case 0:
             _context2.next = 2;
             return (0, _nodeFetch.default)("".concat(STATLAS_BASE_URL, "/").concat(filepath, "?statlasredirect"));
-
           case 2:
             response = _context2.sent;
             json = null;
-
             if (!response.ok) {
               _context2.next = 8;
               break;
             }
-
             _context2.next = 7;
             return response.json();
-
           case 7:
             json = _context2.sent;
-
           case 8:
             return _context2.abrupt("return", {
               json: json,
               rawResponse: response
             });
-
           case 9:
           case "end":
             return _context2.stop();
@@ -98,11 +79,9 @@ function _retrieveJSON() {
   }));
   return _retrieveJSON.apply(this, arguments);
 }
-
 function uploadJSON(_x3, _x4) {
   return _uploadJSON.apply(this, arguments);
 }
-
 function _uploadJSON() {
   _uploadJSON = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(filepath, json) {
     var res;
@@ -118,17 +97,13 @@ function _uploadJSON() {
                 Authorization: "Bearer ".concat(process.env.bamboo_JWT_TOKEN)
               }
             });
-
           case 2:
             res = _context3.sent;
-
             if (res.ok) {
               _context3.next = 5;
               break;
             }
-
             throw new Error("Statlas upload failed: ".concat(res.statusText));
-
           case 5:
           case "end":
             return _context3.stop();