@toptal/davinci-monorepo 8.1.4-alpha-CRT-5891-create-coverage-command-0a4adac5.7 → 8.1.4-alpha-CRT-5891-create-coverage-command-e6e5bd51.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toptal/davinci-monorepo",
-  "version": "8.1.4-alpha-CRT-5891-create-coverage-command-0a4adac5.7+0a4adac5",
+  "version": "8.1.4-alpha-CRT-5891-create-coverage-command-e6e5bd51.7+e6e5bd51",
   "description": "Monorepo utility tools",
   "publishConfig": {
     "access": "public"
@@ -35,10 +35,9 @@
   "dependencies": {
     "@nodelib/fs.walk": "^1.2.6",
     "@oclif/core": "^1.16.1",
-    "@toptal/davinci-cli-shared": "2.3.1-alpha-CRT-5891-create-coverage-command-0a4adac5.39+0a4adac5",
+    "@toptal/davinci-cli-shared": "2.3.1-alpha-CRT-5891-create-coverage-command-e6e5bd51.39+e6e5bd51",
     "chalk": "^4.1.2",
     "codeowners": "5.1.1",
-    "commander": "^10.0.0",
     "dependency-cruiser": "^12.5.0",
     "ervy": "^1.0.7",
     "execa": "^5.1.1",
@@ -55,5 +54,5 @@
   "devDependencies": {
     "@jest/globals": "^29.4.2"
   },
-  "gitHead": "0a4adac5650c666f07b97522a76b2f30dd604738"
+  "gitHead": "e6e5bd5114c669c12d4b245907649d617b9fdd96"
 }

package/src/commands/coverage-command/generate-team-coverage.js

@@ -4,8 +4,6 @@ import fs from 'fs'
 import { print } from '@toptal/davinci-cli-shared'
 import getWorkspaceRoot from 'find-yarn-workspace-root'
 
-// eslint-disable-next-line no-restricted-syntax
-import Codeowners from '../codeowners/core/codeowners/codeowners.js'
 import { sanitizeTeamName } from './services/sanitize-team-name/sanitize-team-name.js'
 import {
   CYPRESS_COVERAGE_PATH,
@@ -46,9 +44,23 @@ const getCoverageSummary = (type, teamPath) => {
 const generateTeamCoverage = async options => {
   print.header('Generating team coverage')
 
-  const codeowners = new Codeowners(workspaceRoot)
+  let codeowners
+  const { default: CodeOwnersTool } = await import(
+    // eslint-disable-next-line no-restricted-syntax
+    'codeowners/codeowners.js'
+  )
+
+  try {
+    codeowners = new CodeOwnersTool(workspaceRoot)
+  } catch (e) {
+    console.error(e.message)
+    process.exit(1)
+  }
+
   const teams = getUniqueTeams(codeowners.ownerEntries)
 
+  print.grey('Teams: ', teams)
+
   await execa.command(`rm -rf ${TEAMS_COVERAGE_PATH}`)
   await execa.command(`mkdir ${TEAMS_COVERAGE_PATH}`)
 

package/src/commands/coverage-command/group-coverage-by-codeowners.js

@@ -3,8 +3,6 @@ import fs from 'fs'
 import { print } from '@toptal/davinci-cli-shared'
 import getWorkspaceRoot from 'find-yarn-workspace-root'
 
-// eslint-disable-next-line no-restricted-syntax
-import Codeowners from '../codeowners/core/codeowners/codeowners.js'
 import { CYPRESS_COVERAGE_PATH, JEST_COVERAGE_PATH } from './config.js'
 import { sanitizeTeamName } from './services/sanitize-team-name/sanitize-team-name.js'
 import { getUniqueTeams } from './services/get-unique-teams/get-unique-teams.js'
@@ -58,9 +56,23 @@ const groupCoverageByCodeowners = async () => {
     path.join(CYPRESS_COVERAGE_PATH, 'coverage-final-cypress.json')
   )
 
-  const codeowners = new Codeowners(workspaceRoot)
+  let codeowners
+  const { default: CodeOwnersTool } = await import(
+    // eslint-disable-next-line no-restricted-syntax
+    'codeowners/codeowners.js'
+  )
+
+  try {
+    codeowners = new CodeOwnersTool(workspaceRoot)
+  } catch (e) {
+    console.error(e.message)
+    process.exit(1)
+  }
+
   const teams = getUniqueTeams(codeowners.ownerEntries)
 
+  print.grey('Teams: ', teams)
+
   splitReportIntoTeams({
     report: jestReport,
     teams,

package/src/commands/coverage-command/services/get-unique-teams/get-unique-teams.js

@@ -1,11 +1,4 @@
-import { print } from '@toptal/davinci-cli-shared'
-
-export const getUniqueTeams = teams => {
-  const uniqueTeams = teams
+export const getUniqueTeams = teams =>
+  teams
     .flatMap(entry => entry.usernames)
     .filter((teamName, index, allTeams) => allTeams.indexOf(teamName) === index)
-
-  print.grey('Teams: ', uniqueTeams)
-
-  return uniqueTeams
-}

package/src/commands/coverage-command/services/get-unique-teams/get-unique-teams.test.js

@@ -1,21 +1,6 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { jest } from '@jest/globals'
-
 import { getUniqueTeams } from './get-unique-teams'
 
-jest.unstable_mockModule('@toptal/davinci-cli-shared', () => ({
-  print: {
-    grey: jest.fn(),
-  },
-}))
-
-const { print } = await import('@toptal/davinci-cli-shared')
-
 describe('getUniqueTeams', () => {
-  beforeEach(() => {
-    print.grey.mockImplementation(jest.fn())
-  })
-
   it.each([
     [
       [