fix: fixes some minor bugs

PreMiD · Feb 12, 2025 · 0fc9c01 · 0fc9c01
1 parent 4900199
commit 0fc9c01
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 12 deletions.
diff --git a/cli/src/commands/build/buildChanged.ts b/cli/src/commands/build/buildChanged.ts
@@ -17,6 +17,10 @@ export async function buildChanged({
 }) {
   const { changed } = await getChangedActivities()
   if (changed.length === 0) {
+    // If no activities are changed, we still want to write the sarif log
+    if (sarif) {
+      await writeSarifLog()
+    }
     success('No changed activities found')
   }
 

diff --git a/cli/src/index.ts b/cli/src/index.ts
@@ -1,13 +1,12 @@
 #! /usr/bin/env node
 
-import { readFile } from 'node:fs/promises'
 import { cac } from 'cac'
 import { build } from './commands/build.js'
 import { bump } from './commands/bump.js'
 import { newActivity } from './commands/new.js'
 import { release } from './commands/release.js'
 import { updateAssets } from './commands/updateAssets.js'
-import { getPackageJson } from './util/getPackageJson.js'
+import { getCliPackageJson, getPackageJson } from './util/getPackageJson.js'
 import { exit } from './util/log.js'
 
 const cli = cac('pmd')
@@ -17,9 +16,7 @@ if (localPackageJson.name !== 'activities') {
   exit('This CLI is only available in the activities repository')
 }
 
-const cliPackageJson = JSON.parse(await readFile('./cli/package.json', 'utf-8').catch(() => {
-  exit('This CLI is only available in the activities repository')
-}))
+const cliPackageJson = await getCliPackageJson()
 
 cli
   .command('new [activity]', 'Create a new activity')

diff --git a/cli/src/util/getActivities.ts b/cli/src/util/getActivities.ts
@@ -157,7 +157,7 @@ async function getChangedFilesLocal() {
   const head = execSync('git rev-parse HEAD').toString().trim()
   const diffOutput = execSync(`git diff --name-status ${base} ${head}`).toString().trim()
 
-  return diffOutput.split('\n').map((line) => {
+  return diffOutput.split('\n').filter(line => line.length > 0).map((line) => {
     const [status, path] = line.split('\t')
     return {
       path,

diff --git a/cli/src/util/getPackageJson.ts b/cli/src/util/getPackageJson.ts
@@ -12,3 +12,15 @@ export async function getPackageJson(): Promise<Record<string, any>> {
 
   return packageJson = localPackageJson
 }
+
+let cliPackageJson: Record<string, any> | undefined
+export async function getCliPackageJson(): Promise<Record<string, any>> {
+  if (cliPackageJson)
+    return cliPackageJson
+
+  const localCliPackageJson = JSON.parse(await readFile('./cli/package.json', 'utf-8').catch(() => {
+    exit('This CLI is only available in the activities repository')
+  }))
+
+  return cliPackageJson = localCliPackageJson
+}
diff --git a/cli/src/util/sarif.ts b/cli/src/util/sarif.ts
@@ -2,7 +2,7 @@ import { writeFile } from 'node:fs/promises'
 import { resolve } from 'node:path'
 import process from 'node:process'
 import { pathToFileURL } from 'node:url'
-import { getPackageJson } from './getPackageJson.js'
+import { getCliPackageJson } from './getPackageJson.js'
 
 export enum SarifRuleId {
   bumpCheck = 'bump-check',
@@ -108,11 +108,6 @@ export function addSarifLog(log: {
   }
 }) {
   log.path = log.path.replace(process.cwd(), '')
-  if (!sarifLog.runs[0].tool.driver.semanticVersion) {
-    getPackageJson().then((packageJson) => {
-      sarifLog.runs[0].tool.driver.semanticVersion = packageJson.version
-    })
-  }
 
   if (typeof sarifArtifactIndices[log.path] === 'undefined') {
     sarifArtifactIndices[log.path] = nextArtifactIndex++
@@ -161,6 +156,10 @@ export function addSarifLog(log: {
 }
 
 export async function writeSarifLog() {
+  await getCliPackageJson().then((packageJson) => {
+    sarifLog.runs[0].tool.driver.semanticVersion = packageJson.version
+  })
+
   if (Object.keys(sarifFiles).length > 0) {
     sarifLog.runs[0].artifacts = []