@toptal/davinci-monorepo 8.1.4-alpha-CRT-5891-create-coverage-command-23386c1d.2 → 8.1.4-alpha-CRT-5891-create-coverage-command-082cae9e.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toptal/davinci-monorepo",
-  "version": "8.1.4-alpha-CRT-5891-create-coverage-command-23386c1d.2+23386c1d",
+  "version": "8.1.4-alpha-CRT-5891-create-coverage-command-082cae9e.3+082cae9e",
   "description": "Monorepo utility tools",
   "publishConfig": {
     "access": "public"
@@ -35,13 +35,14 @@
   "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-23386c1d.34+23386c1d",
+    "@toptal/davinci-cli-shared": "2.3.1-alpha-CRT-5891-create-coverage-command-082cae9e.35+082cae9e",
     "chalk": "^4.1.2",
     "codeowners": "5.1.1",
     "dependency-cruiser": "^12.5.0",
     "ervy": "^1.0.7",
     "execa": "^5.1.1",
     "find-up": "5.0.0",
+    "find-yarn-workspace-root": "^2.0.0",
     "glob": "^8.0.3",
     "ignore": "^5.2.0",
     "is-directory": "^0.3.1",
@@ -53,5 +54,5 @@
   "devDependencies": {
     "@jest/globals": "^29.4.2"
   },
-  "gitHead": "23386c1d709c03d921ae81f6e8ede8bbaccd64aa"
+  "gitHead": "082cae9ecf302c878d2dcbe004d88ff1ba737381"
 }

package/src/commands/coverage.js

@@ -4,8 +4,8 @@ import { groupCoverageByCodeownersCommand } from './group-coverage-by-codeowners
 export const coverageCommand = program => {
   const coverage = program.createCommand('coverage').description('TODO ..')
 
-  generateTeamCoverageCommand(coverage)
   groupCoverageByCodeownersCommand(coverage)
+  generateTeamCoverageCommand(coverage)
 
   return coverage
 }

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

@@ -3,11 +3,16 @@ import * as url from 'url'
 import execa from 'execa'
 import fs from 'fs'
 import { print } from '@toptal/davinci-cli-shared'
+import getWorkspaceRoot from 'find-yarn-workspace-root'
 
 import Codeowners from './codeowners/core/codeowners/codeowners.js'
 
 const __dirname = url.fileURLToPath(new URL('.', import.meta.url))
 const rootProjectPath = path.join(__dirname, '../../')
+const workspaceRoot = getWorkspaceRoot()
+
+console.log('workspaceRoot', workspaceRoot)
+console.log('rootProjectPath', rootProjectPath)
 
 const sanitizeTeamName = team => team.replace('/', '-').replace('@', '')
 
@@ -18,7 +23,7 @@ const sanitizeNycPercentage = percentage =>
 const generateTeamCoverage = async options => {
   print.header('generateTeamCoverage')
 
-  const codeowners = new Codeowners(rootProjectPath)
+  const codeowners = new Codeowners(workspaceRoot)
 
   const ownerEntries = codeowners.ownerEntries
   const uniqueTeams = ownerEntries

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

@@ -2,15 +2,20 @@ import path from 'path'
 import fs from 'fs'
 import * as url from 'url'
 import { print } from '@toptal/davinci-cli-shared'
+import getWorkspaceRoot from 'find-yarn-workspace-root'
 
 import Codeowners from './codeowners/core/codeowners/codeowners.js'
 
 const __dirname = url.fileURLToPath(new URL('.', import.meta.url))
 const rootProjectPath = path.join(__dirname, '../../')
+const workspaceRoot = getWorkspaceRoot()
+
+console.log('workspaceRoot', workspaceRoot)
+console.log('rootProjectPath', rootProjectPath)
 
 const readJestCoverageReport = () => {
   const jestCoverageReportPath = path.join(
-    rootProjectPath,
+    workspaceRoot,
     'coverage/jest/coverage-final-jest.json'
   )
 
@@ -21,7 +26,7 @@ const readJestCoverageReport = () => {
 
 const readCypressCoverageReport = () => {
   const cypressCoverageReportPath = path.join(
-    rootProjectPath,
+    workspaceRoot,
     'coverage/cypress/coverage-final-cypress.json'
   )
 
@@ -38,8 +43,12 @@ const splitReportIntoTeams = (reportObj, teams, codeowners, coveragePath) => {
   Object.entries(reportObj).forEach(([reportPathKey, report]) => {
     const file = report.path
     const relativePath = path.relative(rootProjectPath, file)
+    const relativeWorkspacePath = path.relative(workspaceRoot, file)
+
+    console.log('relativePath', relativePath)
+    console.log('relativeWorkspacePath', relativeWorkspacePath)
 
-    const owners = codeowners.getOwner(relativePath)
+    const owners = codeowners.getOwner(relativeWorkspacePath)
 
     owners.forEach(owner => {
       teamsReport[owner] = {
@@ -54,7 +63,7 @@ const splitReportIntoTeams = (reportObj, teams, codeowners, coveragePath) => {
     const sanitizedTeamPath = sanitizeTeamName(team)
 
     const reportPath = path.join(
-      rootProjectPath,
+      workspaceRoot,
       `${coveragePath}/coverage-final-${sanitizedTeamPath}.json`
     )
 
@@ -81,7 +90,7 @@ const groupCoverageByCodeowners = async () => {
   const jestReport = readJestCoverageReport()
   const cypressReport = readCypressCoverageReport()
 
-  const codeowners = new Codeowners(rootProjectPath)
+  const codeowners = new Codeowners(workspaceRoot)
   const teams = getAllTeams(codeowners)
 
   splitReportIntoTeams(jestReport, teams, codeowners, 'coverage/jest')
@@ -94,9 +103,5 @@ export const groupCoverageByCodeownersCommand = program => {
   return program
     .command('group-coverage-by-codeowners')
     .description('TODO: group-coverage-by-codeowners')
-    .requiredOption(
-      '-r, --repository <repository_name>',
-      'specify repository name'
-    )
     .action(groupCoverageByCodeowners)
 }