@toptal/davinci-monorepo 8.1.4-alpha-CRT-5891-create-coverage-command-2488e674.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-2488e674.2+2488e674",
+  "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-2488e674.34+2488e674",
+    "@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": "2488e6747994019dbeab8517629432f68e9af814"
+  "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(coverageCommand)
-  groupCoverageByCodeownersCommand(coverageCommand)
+  groupCoverageByCodeownersCommand(coverage)
+  generateTeamCoverageCommand(coverage)
 
   return coverage
 }

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

@@ -2,11 +2,17 @@ import path from 'path'
 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('@', '')
 
@@ -14,8 +20,10 @@ const sanitizeNycPercentage = percentage =>
   percentage === 'Unknown' ? 0 : percentage
 
 // eslint-disable-next-line max-statements
-const generateTeamCoverage = async () => {
-  const codeowners = new Codeowners(rootProjectPath)
+const generateTeamCoverage = async options => {
+  print.header('generateTeamCoverage')
+
+  const codeowners = new Codeowners(workspaceRoot)
 
   const ownerEntries = codeowners.ownerEntries
   const uniqueTeams = ownerEntries
@@ -66,15 +74,12 @@ const generateTeamCoverage = async () => {
   const results = []
   const created_at = new Date().toISOString()
 
-  // TODO pass it as param
-  const repo = 'client-portal'
-
   for await (const team of teams) {
     const sanitizedTeam = sanitizeTeamName(team)
     const result = {
       created_at,
       team,
-      repo,
+      repo: options.repository,
     }
 
     const jestCoverageSummary = JSON.parse(
@@ -127,12 +132,14 @@ const generateTeamCoverage = async () => {
 }
 
 export const generateTeamCoverageCommand = program => {
+  print.header('generateTeamCoverageCommand')
+
   return program
-    .createCommand('generate-team-coverage')
+    .command('generate-team-coverage')
     .description('TODO: generate-team-coverage')
     .requiredOption(
       '-r, --repository <repository_name>',
       'specify repository name'
     )
-    .action((_, options) => generateTeamCoverage(options))
+    .action(options => generateTeamCoverage(options))
 }

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

@@ -1,15 +1,21 @@
 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'
   )
 
@@ -20,7 +26,7 @@ const readJestCoverageReport = () => {
 
 const readCypressCoverageReport = () => {
   const cypressCoverageReportPath = path.join(
-    rootProjectPath,
+    workspaceRoot,
     'coverage/cypress/coverage-final-cypress.json'
   )
 
@@ -37,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] = {
@@ -53,7 +63,7 @@ const splitReportIntoTeams = (reportObj, teams, codeowners, coveragePath) => {
     const sanitizedTeamPath = sanitizeTeamName(team)
 
     const reportPath = path.join(
-      rootProjectPath,
+      workspaceRoot,
       `${coveragePath}/coverage-final-${sanitizedTeamPath}.json`
     )
 
@@ -74,13 +84,13 @@ const getAllTeams = codeowners => {
   return uniqueTeams
 }
 
-const groupCoverageByCodeowners = async options => {
-  console.log(options)
+const groupCoverageByCodeowners = async () => {
+  print.header('groupCoverageByCodeowners')
 
   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')
@@ -88,12 +98,10 @@ const groupCoverageByCodeowners = async options => {
 }
 
 export const groupCoverageByCodeownersCommand = program => {
+  print.header('groupCoverageByCodeownersCommand')
+
   return program
-    .createCommand('group-coverage-by-codeowners')
+    .command('group-coverage-by-codeowners')
     .description('TODO: group-coverage-by-codeowners')
-    .requiredOption(
-      '-r, --repository <repository_name>',
-      'specify repository name'
-    )
-    .action((_, options) => groupCoverageByCodeowners(options))
+    .action(groupCoverageByCodeowners)
 }

package/src/commands/__snapshots__/group-coverage-by-codeowners.test.js.snap

@@ -1,61 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`groupCoverageByCodeownersCommand has the correct command structure 1`] = `
-"{
-  "_events": {},
-  "_eventsCount": 1,
-  "commands": [],
-  "options": [
-    {
-      "flags": "-r, --repository <repository_name>",
-      "description": "specify repository name",
-      "required": true,
-      "optional": false,
-      "variadic": false,
-      "mandatory": true,
-      "short": "-r",
-      "long": "--repository",
-      "negate": false,
-      "hidden": false,
-      "conflictsWith": []
-    }
-  ],
-  "parent": null,
-  "_allowUnknownOption": false,
-  "_allowExcessArguments": true,
-  "_args": [],
-  "args": [],
-  "rawArgs": [],
-  "processedArgs": [],
-  "_scriptPath": null,
-  "_name": "group-coverage-by-codeowners",
-  "_optionValues": {},
-  "_optionValueSources": {},
-  "_storeOptionsAsProperties": false,
-  "_executableHandler": false,
-  "_executableFile": null,
-  "_executableDir": null,
-  "_defaultCommandName": null,
-  "_exitCallback": null,
-  "_aliases": [],
-  "_combineFlagAndOptionalValue": true,
-  "_description": "TODO: group-coverage-by-codeowners",
-  "_summary": "",
-  "_enablePositionalOptions": false,
-  "_passThroughOptions": false,
-  "_lifeCycleHooks": {},
-  "_showHelpAfterError": false,
-  "_showSuggestionAfterError": true,
-  "_outputConfiguration": {},
-  "_hidden": false,
-  "_hasHelpOption": true,
-  "_helpFlags": "-h, --help",
-  "_helpDescription": "display help for command",
-  "_helpShortFlag": "-h",
-  "_helpLongFlag": "--help",
-  "_helpCommandName": "help",
-  "_helpCommandnameAndArgs": "help [command]",
-  "_helpCommandDescription": "display help for command",
-  "_helpConfiguration": {}
-}"
-`;

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

@@ -1,23 +0,0 @@
-import { jest } from '@jest/globals'
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { Command } from 'commander'
-
-import { groupCoverageByCodeownersCommand } from './group-coverage-by-codeowners.js'
-
-describe('groupCoverageByCodeownersCommand', () => {
-  let program
-
-  beforeEach(() => {
-    program = new Command()
-  })
-
-  afterEach(() => {
-    jest.clearAllMocks()
-  })
-
-  it('has the correct command structure', () => {
-    const command = groupCoverageByCodeownersCommand(program)
-
-    expect(JSON.stringify(command, null, 2)).toMatchSnapshot()
-  })
-})