@atlaskit/dependency-version-analytics 1.4.7 → 1.4.8

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/dependency-version-analytics
 
+## 1.4.8
+
+### Patch Changes
+
+- [`27db2e84c40`](https://bitbucket.org/atlassian/atlassian-frontend/commits/27db2e84c40) - Removing '--current' postfix from packageName before checking it for support
+
 ## 1.4.7
 
 ### Patch Changes

package/dist/cjs/commands/populate-historic-data/lib/dependency-store.js

@@ -24,8 +24,8 @@ class DependencyStore {
   dependencies = {};
   /** Mapping of workspaces to their dependency map. Each dependency in their map links to an entry in `dependencies` */
   workspaces = {};
-  /** Set of workspace globs. Used to verify that a package.json is a valid workspace */
-  workspaceGlobs = new Set();
+  /** Set of workspace paths to their "package.json". Used to verify that a package.json is a valid workspace */
+  workspacePackageJsonPaths = new Set();
   initialised = false;
   constructor(cwd = process.cwd(), supportedScopes, supportedPackages) {
     this.cwd = cwd;
@@ -49,18 +49,18 @@ class DependencyStore {
     this.assertInitialised();
     const hash = logItem.hash;
     (0, _assert.assert)(!!logItem.diff, `Diff must exist in log ${logItem} ${hash}`);
-    const changedPackageJsons = logItem.diff.files.filter(f => f.file === 'package.json' || f.file.endsWith('/package.json')).map(f => f.file);
+    const changedPackageJsons = logItem.diff.files.filter(f => f.file.endsWith('package.json')).map(f => f.file);
     const didRootPackageJsonChange = !!changedPackageJsons.find(file => file === 'package.json');
     if (didRootPackageJsonChange) {
-      const workspaceGlobs = await (0, _yarn.getWorkspaceGlobs)(hash, this.cwd);
-      const globsChanged = workspaceGlobs !== null && (this.workspaceGlobs.size !== workspaceGlobs.size || [...this.workspaceGlobs].some(glob => !workspaceGlobs.has(glob)));
-      if (globsChanged) {
-        debug(`Workspace globs changed: ${[...workspaceGlobs]}. Resetting store.`);
+      const workspacePackageJsonPaths = await (0, _yarn.getWorkspacePackageJsonPaths)(hash, this.cwd);
+      const workspacePackageJsonPathsChanged = workspacePackageJsonPaths !== null && (this.workspacePackageJsonPaths.size !== workspacePackageJsonPaths.size || [...this.workspacePackageJsonPaths].some(glob => !workspacePackageJsonPaths.has(glob)));
+      if (workspacePackageJsonPathsChanged) {
+        debug(`Workspace globs changed: ${[...workspacePackageJsonPaths]}. Resetting store.`);
         await this.resetStore(hash);
         return this.getFlattenedDeps();
       }
     }
-    const changedWorkspaces = (0, _micromatch.default)(changedPackageJsons, [...this.workspaceGlobs]);
+    const changedWorkspaces = (0, _micromatch.default)(changedPackageJsons, [...this.workspacePackageJsonPaths]);
     debug(`Updating changed workspaces@${hash}: ${changedWorkspaces}`);
 
     // Iterate over all changed package.jsons rather than only valid workspaces so that we can
@@ -95,7 +95,7 @@ class DependencyStore {
    */
   getFlattenedDeps() {
     const deps = Object.entries(this.dependencies).filter(([, versions]) => versions.length > 0).map(([depName, versions]) => [depName, DependencyStore.getMinimumVersion(versions, depName)]);
-    return fromEntries(deps);
+    return Object.fromEntries(deps);
   }
   assertInitialised() {
     if (!this.initialised) {
@@ -104,20 +104,20 @@ class DependencyStore {
   }
 
   /** Scans all workspaces in repo and rebuilds dependency store */
-  async resetStore(gitRef) {
+  async resetStore(hash) {
     this.dependencies = {};
     this.workspaces = {};
-    const workspaceGlobs = await (0, _yarn.getWorkspaceGlobs)(gitRef, this.cwd);
+    const workspaceGlobs = await (0, _yarn.getWorkspacePackageJsonPaths)(hash, this.cwd);
     if (workspaceGlobs !== null) {
-      this.workspaceGlobs = workspaceGlobs;
+      this.workspacePackageJsonPaths = workspaceGlobs;
     }
-    const workspacePaths = await (0, _yarn.getWorkspacePaths)(gitRef, this.workspaceGlobs, this.cwd);
+    const workspacePaths = await (0, _yarn.getWorkspacePaths)(hash, this.workspacePackageJsonPaths, this.cwd);
     debug(`Workspace paths: ${workspacePaths}`);
     for (const wsPath of workspacePaths) {
       if (this.workspaces[wsPath]) {
         throw new Error(`Duplicate workspace path found: ${wsPath}`);
       }
-      const workspaceDeps = await this.getWorkspaceDependencies(gitRef, wsPath);
+      const workspaceDeps = await this.getWorkspaceDependencies(hash, wsPath);
       if (workspaceDeps == null) {
         continue;
       }
@@ -209,13 +209,36 @@ class DependencyStore {
       this.dependencies[depName] = this.dependencies[depName].filter(entry => entry !== depEntry);
     }
   }
-  getSupportedDependencies(depMap, type) {
-    return fromEntries(Object.entries(depMap).filter(
-    // Ignore suffixed `--next` deps in jira used for independent upgrades
-    ([name]) => (0, _allowedScopes.isPackageSupported)(name, this.supportedPackages, this.supportedScopes) && !name.endsWith('--next')).map(([name, version]) => [DependencyStore.transformDepName(name), {
-      version: DependencyStore.transformDepVersion(version),
-      type
-    }]));
+  getSupportedDependencies(depMap, dependencyType) {
+    return Object.entries(depMap).reduce((supportedDependencies, [rawPackageName, packageVersion]) => {
+      // Ignore suffixed `--next` deps in jira used for independent upgrades
+      if (rawPackageName.endsWith('--next')) {
+        return supportedDependencies;
+      }
+
+      // Treat `--current` as the standard dependency
+      const packageName = rawPackageName.replace(/--current$/, '');
+
+      /**
+       * Checks if the package is from supported scope
+       * and if so, checks if the package is also from supported package list.
+       */
+      const isPackageSupported = (0, _allowedScopes.isPackageFromSupportedScopes)(packageName, this.supportedScopes) && (
+      // If supportedPackages wasn't specified, then we allow ANY packages
+      !this.supportedPackages.length ||
+      /**
+       * All packageName's formatting, such as removing "--current" postfix, MUST be performed BEFORE the next line
+       * Packages in supportedPackages don't have postfixes, so checking for package with postfix will always return false
+       */
+      this.supportedPackages.includes(packageName));
+      if (isPackageSupported) {
+        supportedDependencies[packageName] = {
+          version: DependencyStore.transformDepVersion(packageVersion),
+          type: dependencyType
+        };
+      }
+      return supportedDependencies;
+    }, {});
   }
   static getMinimumVersion(versions, depName) {
     const depOrder = ['dependency', 'peerDependency', 'devDependency', 'optionalDependency'];
@@ -244,10 +267,6 @@ class DependencyStore {
     }
     return sorted[0];
   }
-  static transformDepName(name) {
-    // Treat `--current` as the standard dependency
-    return name.replace(/--current$/, '');
-  }
 
   /* Coerce non-standard versions to a semver version.
    * This essentially ignores everything up until the first number and then tries to parse a version
@@ -259,14 +278,4 @@ class DependencyStore {
     return parts[parts.length - 1];
   }
 }
-
-// Object.fromEntries polyfill, remove when upgraded to node 10
-exports.DependencyStore = DependencyStore;
-function fromEntries(iterable) {
-  return [...iterable].reduce((obj, {
-    0: key,
-    1: val
-  }) => Object.assign(obj, {
-    [key]: val
-  }), {});
-}
+exports.DependencyStore = DependencyStore;

package/dist/cjs/commands/populate-historic-data/util/allowed-scopes.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isPackageSupported = exports.isPackageFromSupportedScopes = exports.getSupportedScopes = void 0;
+exports.isPackageFromSupportedScopes = exports.getSupportedScopes = void 0;
 const defaultScopes = ['@atlaskit', '@atlassian', '@atlassiansox'];
 const getSupportedScopes = (enableNonAtlaskitPackages = false) => {
   return enableNonAtlaskitPackages ? defaultScopes : ['@atlaskit'];
@@ -12,17 +12,4 @@ exports.getSupportedScopes = getSupportedScopes;
 const isPackageFromSupportedScopes = (packageName, supportedScopes = defaultScopes) => {
   return supportedScopes.some(scope => packageName.startsWith(scope));
 };
-
-/**
- *
- * Checks if the package is from supported scope
- * and if so, the package is also from supported package list.
- */
-exports.isPackageFromSupportedScopes = isPackageFromSupportedScopes;
-const isPackageSupported = (packageName, supportedPackages = [], supportedScopes = defaultScopes) => {
-  if (isPackageFromSupportedScopes(packageName, supportedScopes)) {
-    return supportedPackages.length ? supportedPackages.indexOf(packageName) >= 0 : true;
-  }
-  return false;
-};
-exports.isPackageSupported = isPackageSupported;
+exports.isPackageFromSupportedScopes = isPackageFromSupportedScopes;

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

@@ -17,15 +17,12 @@ const generateCSV = packageChanges => {
       if (depColumnIndex === -1) {
         depColumnIndex = csvData.push([name]) - 1;
       }
-
-      // console.log(csvData)
       csvData[depColumnIndex][currentRow] = version;
     });
   });
   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] = '';
       }
     }

package/dist/cjs/util/analytics.js

@@ -10,8 +10,6 @@ var _chalk = _interopRequireDefault(require("chalk"));
 var _inquirer = _interopRequireDefault(require("inquirer"));
 var _semver = _interopRequireDefault(require("semver"));
 var _analyticsNodeClient = require("@atlassiansox/analytics-node-client");
-// @ts-ignore
-
 /* eslint-disable-next-line import/no-unresolved */
 
 function getUpgradeType(version, previousVersion) {
@@ -69,7 +67,7 @@ function createUpgradeEvent(name, version, previousVersion, date, optionalEventA
     }
   });
   return {
-    cliVersion: "1.4.7",
+    cliVersion: "1.4.8",
     dependencyName: name,
     versionString: eventVersion,
     major: parsedVersion ? `${parsedVersion.major}` : null,

package/dist/cjs/util/git.js

@@ -13,8 +13,6 @@ exports.showFile = showFile;
 exports.tagCommit = tagCommit;
 var _simpleGit = _interopRequireDefault(require("simple-git"));
 var _assert = require("./assert");
-// @ts-ignore
-
 async function getChangesSince(since) {
   const revisionRange = since ? [`${since}..`] : [];
   const listLogSummary = await (0, _simpleGit.default)().log([
@@ -28,7 +26,7 @@ async function getChangesSince(since) {
   '--stat=4096',
   // Make +- graph width as small as possible to maximise filename length
   '--stat-graph-width=1', ...revisionRange,
-  // Any commit that modifies a package.json
+  // Any commit that modifies a package.json in any directory
   ':(glob)**/package.json']);
   return {
     ...listLogSummary,

package/dist/cjs/util/yarn.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getWorkspaceGlobs = getWorkspaceGlobs;
+exports.getWorkspacePackageJsonPaths = getWorkspacePackageJsonPaths;
 exports.getWorkspacePaths = getWorkspacePaths;
 var _path = _interopRequireDefault(require("path"));
 var _debug = _interopRequireDefault(require("debug"));
@@ -14,10 +14,10 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 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; }
 const rootPackageJsonPath = 'package.json';
 const debug = (0, _debug.default)('atlaskit:yarn');
-async function getWorkspaceGlobs(ref, cwd) {
+async function getWorkspacePackageJsonPaths(hash, cwd) {
   let file;
   try {
-    file = await git.showFile(ref, rootPackageJsonPath, {
+    file = await git.showFile(hash, rootPackageJsonPath, {
       cwd
     });
   } catch (e) {
@@ -28,7 +28,7 @@ async function getWorkspaceGlobs(ref, cwd) {
   try {
     rootPackageJsonFile = JSON.parse(file);
   } catch (e) {
-    console.error(`Error parsing ${file}@${ref}: ${e}`);
+    console.error(`Error parsing ${file}@${hash}: ${e}`);
     return null;
   }
   const workspaces = rootPackageJsonFile.workspaces;

package/dist/es2019/commands/populate-historic-data/lib/dependency-store.js

@@ -3,12 +3,12 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
 import debugModule from 'debug';
 import semver from 'semver';
-import { getWorkspacePaths, getWorkspaceGlobs } from '../../../util/yarn';
+import { getWorkspacePaths, getWorkspacePackageJsonPaths } from '../../../util/yarn';
 import { showFile } from '../../../util/git';
 import { DEP_TYPES } from '../../../constants';
 import { assert } from '../../../util/assert';
 import micromatch from 'micromatch';
-import { isPackageSupported } from '../util/allowed-scopes';
+import { isPackageFromSupportedScopes } from '../util/allowed-scopes';
 const debug = debugModule('atlaskit:dependency');
 /**
  * Stores the state of atlaskit dependencies in a repository
@@ -19,8 +19,8 @@ export class DependencyStore {
     _defineProperty(this, "dependencies", {});
     /** Mapping of workspaces to their dependency map. Each dependency in their map links to an entry in `dependencies` */
     _defineProperty(this, "workspaces", {});
-    /** Set of workspace globs. Used to verify that a package.json is a valid workspace */
-    _defineProperty(this, "workspaceGlobs", new Set());
+    /** Set of workspace paths to their "package.json". Used to verify that a package.json is a valid workspace */
+    _defineProperty(this, "workspacePackageJsonPaths", new Set());
     _defineProperty(this, "initialised", false);
     this.cwd = cwd;
     this.supportedScopes = supportedScopes;
@@ -43,18 +43,18 @@ export class DependencyStore {
     this.assertInitialised();
     const hash = logItem.hash;
     assert(!!logItem.diff, `Diff must exist in log ${logItem} ${hash}`);
-    const changedPackageJsons = logItem.diff.files.filter(f => f.file === 'package.json' || f.file.endsWith('/package.json')).map(f => f.file);
+    const changedPackageJsons = logItem.diff.files.filter(f => f.file.endsWith('package.json')).map(f => f.file);
     const didRootPackageJsonChange = !!changedPackageJsons.find(file => file === 'package.json');
     if (didRootPackageJsonChange) {
-      const workspaceGlobs = await getWorkspaceGlobs(hash, this.cwd);
-      const globsChanged = workspaceGlobs !== null && (this.workspaceGlobs.size !== workspaceGlobs.size || [...this.workspaceGlobs].some(glob => !workspaceGlobs.has(glob)));
-      if (globsChanged) {
-        debug(`Workspace globs changed: ${[...workspaceGlobs]}. Resetting store.`);
+      const workspacePackageJsonPaths = await getWorkspacePackageJsonPaths(hash, this.cwd);
+      const workspacePackageJsonPathsChanged = workspacePackageJsonPaths !== null && (this.workspacePackageJsonPaths.size !== workspacePackageJsonPaths.size || [...this.workspacePackageJsonPaths].some(glob => !workspacePackageJsonPaths.has(glob)));
+      if (workspacePackageJsonPathsChanged) {
+        debug(`Workspace globs changed: ${[...workspacePackageJsonPaths]}. Resetting store.`);
         await this.resetStore(hash);
         return this.getFlattenedDeps();
       }
     }
-    const changedWorkspaces = micromatch(changedPackageJsons, [...this.workspaceGlobs]);
+    const changedWorkspaces = micromatch(changedPackageJsons, [...this.workspacePackageJsonPaths]);
     debug(`Updating changed workspaces@${hash}: ${changedWorkspaces}`);
 
     // Iterate over all changed package.jsons rather than only valid workspaces so that we can
@@ -89,7 +89,7 @@ export class DependencyStore {
    */
   getFlattenedDeps() {
     const deps = Object.entries(this.dependencies).filter(([, versions]) => versions.length > 0).map(([depName, versions]) => [depName, DependencyStore.getMinimumVersion(versions, depName)]);
-    return fromEntries(deps);
+    return Object.fromEntries(deps);
   }
   assertInitialised() {
     if (!this.initialised) {
@@ -98,20 +98,20 @@ export class DependencyStore {
   }
 
   /** Scans all workspaces in repo and rebuilds dependency store */
-  async resetStore(gitRef) {
+  async resetStore(hash) {
     this.dependencies = {};
     this.workspaces = {};
-    const workspaceGlobs = await getWorkspaceGlobs(gitRef, this.cwd);
+    const workspaceGlobs = await getWorkspacePackageJsonPaths(hash, this.cwd);
     if (workspaceGlobs !== null) {
-      this.workspaceGlobs = workspaceGlobs;
+      this.workspacePackageJsonPaths = workspaceGlobs;
     }
-    const workspacePaths = await getWorkspacePaths(gitRef, this.workspaceGlobs, this.cwd);
+    const workspacePaths = await getWorkspacePaths(hash, this.workspacePackageJsonPaths, this.cwd);
     debug(`Workspace paths: ${workspacePaths}`);
     for (const wsPath of workspacePaths) {
       if (this.workspaces[wsPath]) {
         throw new Error(`Duplicate workspace path found: ${wsPath}`);
       }
-      const workspaceDeps = await this.getWorkspaceDependencies(gitRef, wsPath);
+      const workspaceDeps = await this.getWorkspaceDependencies(hash, wsPath);
       if (workspaceDeps == null) {
         continue;
       }
@@ -203,13 +203,36 @@ export class DependencyStore {
       this.dependencies[depName] = this.dependencies[depName].filter(entry => entry !== depEntry);
     }
   }
-  getSupportedDependencies(depMap, type) {
-    return fromEntries(Object.entries(depMap).filter(
-    // Ignore suffixed `--next` deps in jira used for independent upgrades
-    ([name]) => isPackageSupported(name, this.supportedPackages, this.supportedScopes) && !name.endsWith('--next')).map(([name, version]) => [DependencyStore.transformDepName(name), {
-      version: DependencyStore.transformDepVersion(version),
-      type
-    }]));
+  getSupportedDependencies(depMap, dependencyType) {
+    return Object.entries(depMap).reduce((supportedDependencies, [rawPackageName, packageVersion]) => {
+      // Ignore suffixed `--next` deps in jira used for independent upgrades
+      if (rawPackageName.endsWith('--next')) {
+        return supportedDependencies;
+      }
+
+      // Treat `--current` as the standard dependency
+      const packageName = rawPackageName.replace(/--current$/, '');
+
+      /**
+       * Checks if the package is from supported scope
+       * and if so, checks if the package is also from supported package list.
+       */
+      const isPackageSupported = isPackageFromSupportedScopes(packageName, this.supportedScopes) && (
+      // If supportedPackages wasn't specified, then we allow ANY packages
+      !this.supportedPackages.length ||
+      /**
+       * All packageName's formatting, such as removing "--current" postfix, MUST be performed BEFORE the next line
+       * Packages in supportedPackages don't have postfixes, so checking for package with postfix will always return false
+       */
+      this.supportedPackages.includes(packageName));
+      if (isPackageSupported) {
+        supportedDependencies[packageName] = {
+          version: DependencyStore.transformDepVersion(packageVersion),
+          type: dependencyType
+        };
+      }
+      return supportedDependencies;
+    }, {});
   }
   static getMinimumVersion(versions, depName) {
     const depOrder = ['dependency', 'peerDependency', 'devDependency', 'optionalDependency'];
@@ -238,10 +261,6 @@ export class DependencyStore {
     }
     return sorted[0];
   }
-  static transformDepName(name) {
-    // Treat `--current` as the standard dependency
-    return name.replace(/--current$/, '');
-  }
 
   /* Coerce non-standard versions to a semver version.
    * This essentially ignores everything up until the first number and then tries to parse a version
@@ -252,14 +271,4 @@ export class DependencyStore {
     const parts = version.split('@');
     return parts[parts.length - 1];
   }
-}
-
-// Object.fromEntries polyfill, remove when upgraded to node 10
-function fromEntries(iterable) {
-  return [...iterable].reduce((obj, {
-    0: key,
-    1: val
-  }) => Object.assign(obj, {
-    [key]: val
-  }), {});
 }

package/dist/es2019/commands/populate-historic-data/util/allowed-scopes.js

@@ -4,16 +4,4 @@ export const getSupportedScopes = (enableNonAtlaskitPackages = false) => {
 };
 export const isPackageFromSupportedScopes = (packageName, supportedScopes = defaultScopes) => {
   return supportedScopes.some(scope => packageName.startsWith(scope));
-};
-
-/**
- *
- * Checks if the package is from supported scope
- * and if so, the package is also from supported package list.
- */
-export const isPackageSupported = (packageName, supportedPackages = [], supportedScopes = defaultScopes) => {
-  if (isPackageFromSupportedScopes(packageName, supportedScopes)) {
-    return supportedPackages.length ? supportedPackages.indexOf(packageName) >= 0 : true;
-  }
-  return false;
 };

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

@@ -11,15 +11,12 @@ export const generateCSV = packageChanges => {
       if (depColumnIndex === -1) {
         depColumnIndex = csvData.push([name]) - 1;
       }
-
-      // console.log(csvData)
       csvData[depColumnIndex][currentRow] = version;
     });
   });
   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] = '';
       }
     }

package/dist/es2019/util/analytics.js

@@ -1,5 +1,4 @@
 import chalk from 'chalk';
-// @ts-ignore
 import inquirer from 'inquirer';
 import semver from 'semver';
 /* eslint-disable-next-line import/no-unresolved */
@@ -60,7 +59,7 @@ export function createUpgradeEvent(name, version, previousVersion, date, optiona
     }
   });
   return {
-    cliVersion: "1.4.7",
+    cliVersion: "1.4.8",
     dependencyName: name,
     versionString: eventVersion,
     major: parsedVersion ? `${parsedVersion.major}` : null,

package/dist/es2019/util/git.js

@@ -1,5 +1,3 @@
-// @ts-ignore
-
 import git from 'simple-git';
 import { assert } from './assert';
 export async function getChangesSince(since) {
@@ -15,7 +13,7 @@ export async function getChangesSince(since) {
   '--stat=4096',
   // Make +- graph width as small as possible to maximise filename length
   '--stat-graph-width=1', ...revisionRange,
-  // Any commit that modifies a package.json
+  // Any commit that modifies a package.json in any directory
   ':(glob)**/package.json']);
   return {
     ...listLogSummary,

package/dist/es2019/util/yarn.js

@@ -4,10 +4,10 @@ import micromatch from 'micromatch';
 import * as git from './git';
 const rootPackageJsonPath = 'package.json';
 const debug = debugModule('atlaskit:yarn');
-export async function getWorkspaceGlobs(ref, cwd) {
+export async function getWorkspacePackageJsonPaths(hash, cwd) {
   let file;
   try {
-    file = await git.showFile(ref, rootPackageJsonPath, {
+    file = await git.showFile(hash, rootPackageJsonPath, {
       cwd
     });
   } catch (e) {
@@ -18,7 +18,7 @@ export async function getWorkspaceGlobs(ref, cwd) {
   try {
     rootPackageJsonFile = JSON.parse(file);
   } catch (e) {
-    console.error(`Error parsing ${file}@${ref}: ${e}`);
+    console.error(`Error parsing ${file}@${hash}: ${e}`);
     return null;
   }
   const workspaces = rootPackageJsonFile.workspaces;

package/dist/esm/commands/populate-historic-data/lib/dependency-store.js

@@ -14,12 +14,12 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 
 import debugModule from 'debug';
 import semver from 'semver';
-import { getWorkspacePaths, getWorkspaceGlobs } from '../../../util/yarn';
+import { getWorkspacePaths, getWorkspacePackageJsonPaths } from '../../../util/yarn';
 import { showFile } from '../../../util/git';
 import { DEP_TYPES } from '../../../constants';
 import { assert } from '../../../util/assert';
 import micromatch from 'micromatch';
-import { isPackageSupported } from '../util/allowed-scopes';
+import { isPackageFromSupportedScopes } from '../util/allowed-scopes';
 var debug = debugModule('atlaskit:dependency');
 /**
  * Stores the state of atlaskit dependencies in a repository
@@ -34,8 +34,8 @@ export var DependencyStore = /*#__PURE__*/function () {
     _defineProperty(this, "dependencies", {});
     /** Mapping of workspaces to their dependency map. Each dependency in their map links to an entry in `dependencies` */
     _defineProperty(this, "workspaces", {});
-    /** Set of workspace globs. Used to verify that a package.json is a valid workspace */
-    _defineProperty(this, "workspaceGlobs", new Set());
+    /** Set of workspace paths to their "package.json". Used to verify that a package.json is a valid workspace */
+    _defineProperty(this, "workspacePackageJsonPaths", new Set());
     _defineProperty(this, "initialised", false);
     this.cwd = cwd;
     this.supportedScopes = supportedScopes;
@@ -77,7 +77,7 @@ export var DependencyStore = /*#__PURE__*/function () {
     key: "update",
     value: function () {
       var _update = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(logItem) {
-        var hash, changedPackageJsons, didRootPackageJsonChange, workspaceGlobs, globsChanged, changedWorkspaces, _iterator, _step, workspacePath, workspaceDeps, validWorkspace, noLongerWorkspace;
+        var hash, changedPackageJsons, didRootPackageJsonChange, workspacePackageJsonPaths, workspacePackageJsonPathsChanged, changedWorkspaces, _iterator, _step, workspacePath, workspaceDeps, validWorkspace, noLongerWorkspace;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -85,7 +85,7 @@ export var DependencyStore = /*#__PURE__*/function () {
               hash = logItem.hash;
               assert(!!logItem.diff, "Diff must exist in log ".concat(logItem, " ").concat(hash));
               changedPackageJsons = logItem.diff.files.filter(function (f) {
-                return f.file === 'package.json' || f.file.endsWith('/package.json');
+                return f.file.endsWith('package.json');
               }).map(function (f) {
                 return f.file;
               });
@@ -97,23 +97,23 @@ export var DependencyStore = /*#__PURE__*/function () {
                 break;
               }
               _context2.next = 8;
-              return getWorkspaceGlobs(hash, this.cwd);
+              return getWorkspacePackageJsonPaths(hash, this.cwd);
             case 8:
-              workspaceGlobs = _context2.sent;
-              globsChanged = workspaceGlobs !== null && (this.workspaceGlobs.size !== workspaceGlobs.size || _toConsumableArray(this.workspaceGlobs).some(function (glob) {
-                return !workspaceGlobs.has(glob);
+              workspacePackageJsonPaths = _context2.sent;
+              workspacePackageJsonPathsChanged = workspacePackageJsonPaths !== null && (this.workspacePackageJsonPaths.size !== workspacePackageJsonPaths.size || _toConsumableArray(this.workspacePackageJsonPaths).some(function (glob) {
+                return !workspacePackageJsonPaths.has(glob);
               }));
-              if (!globsChanged) {
+              if (!workspacePackageJsonPathsChanged) {
                 _context2.next = 15;
                 break;
               }
-              debug("Workspace globs changed: ".concat(_toConsumableArray(workspaceGlobs), ". Resetting store."));
+              debug("Workspace globs changed: ".concat(_toConsumableArray(workspacePackageJsonPaths), ". Resetting store."));
               _context2.next = 14;
               return this.resetStore(hash);
             case 14:
               return _context2.abrupt("return", this.getFlattenedDeps());
             case 15:
-              changedWorkspaces = micromatch(changedPackageJsons, _toConsumableArray(this.workspaceGlobs));
+              changedWorkspaces = micromatch(changedPackageJsons, _toConsumableArray(this.workspacePackageJsonPaths));
               debug("Updating changed workspaces@".concat(hash, ": ").concat(changedWorkspaces));
 
               // Iterate over all changed package.jsons rather than only valid workspaces so that we can
@@ -194,7 +194,7 @@ export var DependencyStore = /*#__PURE__*/function () {
           versions = _ref4[1];
         return [depName, DependencyStore.getMinimumVersion(versions, depName)];
       });
-      return fromEntries(deps);
+      return Object.fromEntries(deps);
     }
   }, {
     key: "assertInitialised",
@@ -208,7 +208,7 @@ export var DependencyStore = /*#__PURE__*/function () {
   }, {
     key: "resetStore",
     value: function () {
-      var _resetStore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(gitRef) {
+      var _resetStore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(hash) {
         var workspaceGlobs, workspacePaths, _iterator2, _step2, wsPath, workspaceDeps;
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
@@ -216,14 +216,14 @@ export var DependencyStore = /*#__PURE__*/function () {
               this.dependencies = {};
               this.workspaces = {};
               _context3.next = 4;
-              return getWorkspaceGlobs(gitRef, this.cwd);
+              return getWorkspacePackageJsonPaths(hash, this.cwd);
             case 4:
               workspaceGlobs = _context3.sent;
               if (workspaceGlobs !== null) {
-                this.workspaceGlobs = workspaceGlobs;
+                this.workspacePackageJsonPaths = workspaceGlobs;
               }
               _context3.next = 8;
-              return getWorkspacePaths(gitRef, this.workspaceGlobs, this.cwd);
+              return getWorkspacePaths(hash, this.workspacePackageJsonPaths, this.cwd);
             case 8:
               workspacePaths = _context3.sent;
               debug("Workspace paths: ".concat(workspacePaths));
@@ -243,7 +243,7 @@ export var DependencyStore = /*#__PURE__*/function () {
               throw new Error("Duplicate workspace path found: ".concat(wsPath));
             case 17:
               _context3.next = 19;
-              return this.getWorkspaceDependencies(gitRef, wsPath);
+              return this.getWorkspaceDependencies(hash, wsPath);
             case 19:
               workspaceDeps = _context3.sent;
               if (!(workspaceDeps == null)) {
@@ -406,23 +406,40 @@ export var DependencyStore = /*#__PURE__*/function () {
     }
   }, {
     key: "getSupportedDependencies",
-    value: function getSupportedDependencies(depMap, type) {
+    value: function getSupportedDependencies(depMap, dependencyType) {
       var _this = this;
-      return fromEntries(Object.entries(depMap).filter(
-      // Ignore suffixed `--next` deps in jira used for independent upgrades
-      function (_ref5) {
-        var _ref6 = _slicedToArray(_ref5, 1),
-          name = _ref6[0];
-        return isPackageSupported(name, _this.supportedPackages, _this.supportedScopes) && !name.endsWith('--next');
-      }).map(function (_ref7) {
-        var _ref8 = _slicedToArray(_ref7, 2),
-          name = _ref8[0],
-          version = _ref8[1];
-        return [DependencyStore.transformDepName(name), {
-          version: DependencyStore.transformDepVersion(version),
-          type: type
-        }];
-      }));
+      return Object.entries(depMap).reduce(function (supportedDependencies, _ref5) {
+        var _ref6 = _slicedToArray(_ref5, 2),
+          rawPackageName = _ref6[0],
+          packageVersion = _ref6[1];
+        // Ignore suffixed `--next` deps in jira used for independent upgrades
+        if (rawPackageName.endsWith('--next')) {
+          return supportedDependencies;
+        }
+
+        // Treat `--current` as the standard dependency
+        var packageName = rawPackageName.replace(/--current$/, '');
+
+        /**
+         * Checks if the package is from supported scope
+         * and if so, checks if the package is also from supported package list.
+         */
+        var isPackageSupported = isPackageFromSupportedScopes(packageName, _this.supportedScopes) && (
+        // If supportedPackages wasn't specified, then we allow ANY packages
+        !_this.supportedPackages.length ||
+        /**
+         * All packageName's formatting, such as removing "--current" postfix, MUST be performed BEFORE the next line
+         * Packages in supportedPackages don't have postfixes, so checking for package with postfix will always return false
+         */
+        _this.supportedPackages.includes(packageName));
+        if (isPackageSupported) {
+          supportedDependencies[packageName] = {
+            version: DependencyStore.transformDepVersion(packageVersion),
+            type: dependencyType
+          };
+        }
+        return supportedDependencies;
+      }, {});
     }
   }], [{
     key: "getMinimumVersion",
@@ -454,12 +471,6 @@ export var DependencyStore = /*#__PURE__*/function () {
       }
       return sorted[0];
     }
-  }, {
-    key: "transformDepName",
-    value: function transformDepName(name) {
-      // Treat `--current` as the standard dependency
-      return name.replace(/--current$/, '');
-    }
 
     /* Coerce non-standard versions to a semver version.
      * This essentially ignores everything up until the first number and then tries to parse a version
@@ -474,13 +485,4 @@ export var DependencyStore = /*#__PURE__*/function () {
     }
   }]);
   return DependencyStore;
-}();
-
-// Object.fromEntries polyfill, remove when upgraded to node 10
-function fromEntries(iterable) {
-  return _toConsumableArray(iterable).reduce(function (obj, _ref9) {
-    var key = _ref9[0],
-      val = _ref9[1];
-    return Object.assign(obj, _defineProperty({}, key, val));
-  }, {});
-}
+}();

package/dist/esm/commands/populate-historic-data/util/allowed-scopes.js

@@ -8,18 +8,4 @@ export var isPackageFromSupportedScopes = function isPackageFromSupportedScopes(
   return supportedScopes.some(function (scope) {
     return packageName.startsWith(scope);
   });
-};
-
-/**
- *
- * Checks if the package is from supported scope
- * and if so, the package is also from supported package list.
- */
-export var isPackageSupported = function isPackageSupported(packageName) {
-  var supportedPackages = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  var supportedScopes = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : defaultScopes;
-  if (isPackageFromSupportedScopes(packageName, supportedScopes)) {
-    return supportedPackages.length ? supportedPackages.indexOf(packageName) >= 0 : true;
-  }
-  return false;
 };

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

@@ -15,15 +15,12 @@ export var generateCSV = function generateCSV(packageChanges) {
       if (depColumnIndex === -1) {
         depColumnIndex = csvData.push([name]) - 1;
       }
-
-      // console.log(csvData)
       csvData[depColumnIndex][currentRow] = version;
     });
   });
   for (var i = 0; i < csvData.length; i++) {
     for (var j = 0; j < csvData.length; j++) {
       if (typeof csvData[i][j] !== 'string') {
-        // console.log('found empty cell');
         csvData[i][j] = '';
       }
     }

package/dist/esm/util/analytics.js

@@ -4,7 +4,6 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 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) { _defineProperty(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; }
 import chalk from 'chalk';
-// @ts-ignore
 import inquirer from 'inquirer';
 import semver from 'semver';
 /* eslint-disable-next-line import/no-unresolved */
@@ -67,7 +66,7 @@ export function createUpgradeEvent(name, version, previousVersion, date) {
     }
   });
   return _objectSpread({
-    cliVersion: "1.4.7",
+    cliVersion: "1.4.8",
     dependencyName: name,
     versionString: eventVersion,
     major: parsedVersion ? "".concat(parsedVersion.major) : null,

package/dist/esm/util/git.js

@@ -4,8 +4,6 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 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) { _defineProperty(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
-
 import git from 'simple-git';
 import { assert } from './assert';
 export function getChangesSince(_x) {
@@ -30,7 +28,7 @@ function _getChangesSince() {
           '--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
+          // Any commit that modifies a package.json in any directory
           ':(glob)**/package.json']));
         case 3:
           listLogSummary = _context.sent;

package/dist/esm/util/yarn.js

@@ -7,18 +7,18 @@ import micromatch from 'micromatch';
 import * as git from './git';
 var rootPackageJsonPath = 'package.json';
 var debug = debugModule('atlaskit:yarn');
-export function getWorkspaceGlobs(_x, _x2) {
-  return _getWorkspaceGlobs.apply(this, arguments);
+export function getWorkspacePackageJsonPaths(_x, _x2) {
+  return _getWorkspacePackageJsonPaths.apply(this, arguments);
 }
-function _getWorkspaceGlobs() {
-  _getWorkspaceGlobs = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(ref, cwd) {
+function _getWorkspacePackageJsonPaths() {
+  _getWorkspacePackageJsonPaths = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(hash, cwd) {
     var file, rootPackageJsonFile, workspaces, workspacePackages;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _context.prev = 0;
           _context.next = 3;
-          return git.showFile(ref, rootPackageJsonPath, {
+          return git.showFile(hash, rootPackageJsonPath, {
             cwd: cwd
           });
         case 3:
@@ -38,7 +38,7 @@ function _getWorkspaceGlobs() {
         case 14:
           _context.prev = 14;
           _context.t1 = _context["catch"](10);
-          console.error("Error parsing ".concat(file, "@").concat(ref, ": ").concat(_context.t1));
+          console.error("Error parsing ".concat(file, "@").concat(hash, ": ").concat(_context.t1));
           return _context.abrupt("return", null);
         case 18:
           workspaces = rootPackageJsonFile.workspaces;
@@ -59,7 +59,7 @@ function _getWorkspaceGlobs() {
       }
     }, _callee, null, [[0, 6], [10, 14]]);
   }));
-  return _getWorkspaceGlobs.apply(this, arguments);
+  return _getWorkspacePackageJsonPaths.apply(this, arguments);
 }
 export function getWorkspacePaths(_x3, _x4, _x5) {
   return _getWorkspacePaths.apply(this, arguments);

package/dist/types/commands/populate-historic-data/__fixtures__/git.d.ts

@@ -1,2 +1,6 @@
 import type { LogResult } from 'simple-git';
-export declare const generateLogs: (fileChanges: string[][]) => LogResult;
+export declare const generateLogsWithFiles: (list: {
+    hash: string;
+    files: string[];
+}[]) => LogResult;
+export declare const generateLogs: (...hashList: string[]) => LogResult;

package/dist/types/commands/populate-historic-data/lib/dependency-store.d.ts

@@ -10,14 +10,14 @@ export declare class DependencyStore {
     private dependencies;
     /** Mapping of workspaces to their dependency map. Each dependency in their map links to an entry in `dependencies` */
     private workspaces;
-    /** Set of workspace globs. Used to verify that a package.json is a valid workspace */
-    private workspaceGlobs;
+    /** Set of workspace paths to their "package.json". Used to verify that a package.json is a valid workspace */
+    private workspacePackageJsonPaths;
     private initialised;
     private supportedScopes;
     private supportedPackages;
     constructor(cwd: string | undefined, supportedScopes: string[], supportedPackages: string[]);
     /** Scans the repo for dependencies at the specified git ref and return the flattened dependency map */
-    initialise(gitRef: string | undefined): Promise<DependencyMap>;
+    initialise(gitRef?: string): Promise<DependencyMap>;
     /** Updates the repo dependency store based on the changes in `logItem`.
      * Returns the updated flattened dependencies
      */
@@ -36,6 +36,5 @@ export declare class DependencyStore {
     private removeDependency;
     private getSupportedDependencies;
     private static getMinimumVersion;
-    private static transformDepName;
     private static transformDepVersion;
 }

package/dist/types/commands/populate-historic-data/util/allowed-scopes.d.ts

@@ -1,8 +1,2 @@
 export declare const getSupportedScopes: (enableNonAtlaskitPackages?: boolean) => string[];
 export declare const isPackageFromSupportedScopes: (packageName: string, supportedScopes?: string[]) => boolean;
-/**
- *
- * Checks if the package is from supported scope
- * and if so, the package is also from supported package list.
- */
-export declare const isPackageSupported: (packageName: string, supportedPackages?: string[], supportedScopes?: string[]) => boolean;

package/dist/types/util/yarn.d.ts

@@ -1,2 +1,2 @@
-export declare function getWorkspaceGlobs(ref: string, cwd: string): Promise<Set<string> | null>;
+export declare function getWorkspacePackageJsonPaths(hash: string, cwd: string): Promise<Set<string> | null>;
 export declare function getWorkspacePaths(ref: string, workspaceGlobs: Set<string>, cwd: string): Promise<string[]>;

package/dist/types-ts4.5/commands/populate-historic-data/__fixtures__/git.d.ts

@@ -1,2 +1,6 @@
 import type { LogResult } from 'simple-git';
-export declare const generateLogs: (fileChanges: string[][]) => LogResult;
+export declare const generateLogsWithFiles: (list: {
+    hash: string;
+    files: string[];
+}[]) => LogResult;
+export declare const generateLogs: (...hashList: string[]) => LogResult;

package/dist/types-ts4.5/commands/populate-historic-data/lib/dependency-store.d.ts

@@ -10,14 +10,14 @@ export declare class DependencyStore {
     private dependencies;
     /** Mapping of workspaces to their dependency map. Each dependency in their map links to an entry in `dependencies` */
     private workspaces;
-    /** Set of workspace globs. Used to verify that a package.json is a valid workspace */
-    private workspaceGlobs;
+    /** Set of workspace paths to their "package.json". Used to verify that a package.json is a valid workspace */
+    private workspacePackageJsonPaths;
     private initialised;
     private supportedScopes;
     private supportedPackages;
     constructor(cwd: string | undefined, supportedScopes: string[], supportedPackages: string[]);
     /** Scans the repo for dependencies at the specified git ref and return the flattened dependency map */
-    initialise(gitRef: string | undefined): Promise<DependencyMap>;
+    initialise(gitRef?: string): Promise<DependencyMap>;
     /** Updates the repo dependency store based on the changes in `logItem`.
      * Returns the updated flattened dependencies
      */
@@ -36,6 +36,5 @@ export declare class DependencyStore {
     private removeDependency;
     private getSupportedDependencies;
     private static getMinimumVersion;
-    private static transformDepName;
     private static transformDepVersion;
 }

package/dist/types-ts4.5/commands/populate-historic-data/util/allowed-scopes.d.ts

@@ -1,8 +1,2 @@
 export declare const getSupportedScopes: (enableNonAtlaskitPackages?: boolean) => string[];
 export declare const isPackageFromSupportedScopes: (packageName: string, supportedScopes?: string[]) => boolean;
-/**
- *
- * Checks if the package is from supported scope
- * and if so, the package is also from supported package list.
- */
-export declare const isPackageSupported: (packageName: string, supportedPackages?: string[], supportedScopes?: string[]) => boolean;

package/dist/types-ts4.5/util/yarn.d.ts

@@ -1,2 +1,2 @@
-export declare function getWorkspaceGlobs(ref: string, cwd: string): Promise<Set<string> | null>;
+export declare function getWorkspacePackageJsonPaths(hash: string, cwd: string): Promise<Set<string> | null>;
 export declare function getWorkspacePaths(ref: string, workspaceGlobs: Set<string>, cwd: string): Promise<string[]>;

package/jest.config.js

@@ -0,0 +1,5 @@
+const config = {
+  preset: 'ts-jest/presets/js-with-babel',
+};
+
+module.exports = config;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/dependency-version-analytics",
-  "version": "1.4.7",
+  "version": "1.4.8",
   "description": "Tool to pull atlaskit version history from a repo",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -28,6 +28,9 @@
   "bin": {
     "dependency-version-analytics": "./bin/dependency-version-analytics.js"
   },
+  "scripts": {
+    "test": "jest"
+  },
   "dependencies": {
     "@babel/runtime": "^7.0.0",
     "chalk": "^4.1.2",
@@ -48,6 +51,8 @@
     "@types/jest": "^26.0.14",
     "@types/micromatch": "^4.0.1",
     "@types/node": "~16.11.27",
+    "jest": "^26.4.2",
+    "ts-jest": "26.5.6",
     "ts-node": "^10.9.1",
     "typescript": "~4.9.5"
   },