@quenty/nevermore-cli 4.50.0 → 4.50.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/nevermore-cli",
-  "version": "4.50.0",
+  "version": "4.50.1",
   "description": "CLI interface for Nevermore",
   "type": "module",
   "keywords": [
@@ -25,11 +25,11 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/cli-output-helpers": "1.19.0",
-    "@quenty/nevermore-cli-helpers": "1.20.0",
+    "@quenty/cli-output-helpers": "1.19.1",
+    "@quenty/nevermore-cli-helpers": "1.20.1",
     "@quenty/nevermore-deploy": "1.1.1",
-    "@quenty/nevermore-template-helpers": "1.21.0",
-    "@quenty/studio-bridge": "0.22.0",
+    "@quenty/nevermore-template-helpers": "1.21.1",
+    "@quenty/studio-bridge": "0.22.1",
     "execa": "^9.6.1",
     "find-git-root": "^1.0.4",
     "inquirer": "^13.2.0",
@@ -60,5 +60,5 @@
   "engines": {
     "node": ">=16"
   },
-  "gitHead": "8ccad9d519f633a4af6659664374605cf2df7ecf"
+  "gitHead": "e663d6c2e0577e2831040d2a922a3c636fb62007"
 }

package/src/commands/tools-command/ci-post-test-results.ts

@@ -2,6 +2,7 @@ import { CommandModule } from 'yargs';
 import { OutputHelper } from '@quenty/cli-output-helpers';
 import {
   type Diagnostic,
+  dedupeDiagnostics,
   emitAnnotations,
   writeAnnotationSummaryAsync,
 } from '@quenty/cli-output-helpers/reporting';
@@ -16,6 +17,7 @@ import {
 } from '../../utils/testing/reporting/index.js';
 import { parseJestLuaOutput } from '../../utils/testing/parsers/index.js';
 import { tryLoadSourcemapResolver } from '../../utils/sourcemap/index.js';
+import { tryLoadAnnotationWorkspaceAsync } from '../../utils/testing/parsers/annotation-workspace.js';
 
 type ErrorReporter = Reporter & {
   setError(error: string): void;
@@ -99,14 +101,17 @@ export const ciPostTestResultsCommand: CommandModule<
 
       // Emit test failure annotations
       const sourcemapResolver = tryLoadSourcemapResolver(process.cwd());
-      const allDiagnostics: Diagnostic[] = [];
+      const workspace = await tryLoadAnnotationWorkspaceAsync(process.cwd());
+      const parsedDiagnostics: Diagnostic[] = [];
       for (const failure of state.getFailures()) {
         const diagnostics = parseJestLuaOutput(failure.logs, {
           packageName: failure.packageName,
           sourcemapResolver,
+          workspace,
         });
-        allDiagnostics.push(...diagnostics);
+        parsedDiagnostics.push(...diagnostics);
       }
+      const allDiagnostics = dedupeDiagnostics(parsedDiagnostics);
 
       if (allDiagnostics.length > 0) {
         OutputHelper.info(

package/src/utils/batch/changed-packages-utils.ts

@@ -10,6 +10,11 @@ import {
   toManifestPlaceInfo,
 } from '@quenty/nevermore-deploy';
 
+export interface WorkspacePackageInfo {
+  name: string;
+  path: string;
+}
+
 export interface TargetPackage {
   name: string;
   path: string;
@@ -50,16 +55,19 @@ export interface BatchTarget {
 export async function discoverAllTargetPackagesAsync(
   targetName: string
 ): Promise<TargetPackage[]> {
-  const { stdout } = await execa('pnpm', [
-    'ls',
-    '--json',
-    '-r',
-    '--depth',
-    '-1',
-  ]);
+  return filterByTargetAsync(await listWorkspacePackagesAsync(), targetName);
+}
 
-  const packages = JSON.parse(stdout) as Array<{ name: string; path: string }>;
-  return _filterByTargetAsync(packages, targetName);
+/** Every package in the pnpm workspace, with absolute paths. */
+export async function listWorkspacePackagesAsync(
+  cwd?: string
+): Promise<WorkspacePackageInfo[]> {
+  const { stdout } = await execa(
+    'pnpm',
+    ['ls', '--json', '-r', '--depth', '-1'],
+    { cwd }
+  );
+  return JSON.parse(stdout) as WorkspacePackageInfo[];
 }
 
 /**
@@ -92,7 +100,7 @@ export async function discoverChangedTargetPackagesAsync(
     return [];
   }
 
-  return _filterByTargetAsync(packages, targetName);
+  return filterByTargetAsync(packages, targetName);
 }
 
 /**
@@ -181,8 +189,9 @@ function _requireScriptTemplate(targets: BatchTarget[]): BatchTarget[] {
   return withTemplate;
 }
 
-async function _filterByTargetAsync(
-  packages: Array<{ name: string; path: string }>,
+/** Keep the packages whose deploy config has `targetName`, with its places. */
+export async function filterByTargetAsync(
+  packages: WorkspacePackageInfo[],
   targetName: string
 ): Promise<TargetPackage[]> {
   const results: TargetPackage[] = [];

package/src/utils/testing/parsers/annotation-workspace.ts

@@ -0,0 +1,74 @@
+import * as fs from 'fs/promises';
+import * as path from 'path';
+import {
+  filterByTargetAsync,
+  listWorkspacePackagesAsync,
+} from '../../batch/changed-packages-utils.js';
+import {
+  type TestRojoProject,
+  findTestProjectSlug,
+} from '../runner/test-project-slug.js';
+
+export interface AnnotationWorkspacePackage {
+  /** Repo-relative POSIX directory, e.g. `src/player-mock` */
+  dir: string;
+  /** Rojo project name, which the sourcemap uses */
+  projectName?: string;
+  /** Instance names the package gets in its test places */
+  testSlugs: string[];
+}
+
+export interface AnnotationWorkspace {
+  packagesByName: Map<string, AnnotationWorkspacePackage>;
+}
+
+/**
+ * Index the pnpm workspace for mapping test output back to files. Returns
+ * `undefined` when the workspace can't be listed.
+ */
+export async function tryLoadAnnotationWorkspaceAsync(
+  repoRoot: string
+): Promise<AnnotationWorkspace | undefined> {
+  let packages;
+  try {
+    packages = await listWorkspacePackagesAsync(repoRoot);
+  } catch {
+    return undefined;
+  }
+
+  const packagesByName = new Map<string, AnnotationWorkspacePackage>();
+  await Promise.all(
+    packages.map(async (pkg) => {
+      const project = await _tryReadJsonAsync<{ name?: string }>(
+        path.join(pkg.path, 'default.project.json')
+      );
+      packagesByName.set(pkg.name, {
+        dir: path.relative(repoRoot, pkg.path).replace(/\\/g, '/'),
+        projectName: project?.name,
+        testSlugs: [],
+      });
+    })
+  );
+
+  for (const testPackage of await filterByTargetAsync(packages, 'test')) {
+    const entry = packagesByName.get(testPackage.name);
+    if (!entry) continue;
+    for (const target of testPackage.activeTargets) {
+      const project = await _tryReadJsonAsync<TestRojoProject>(
+        path.resolve(testPackage.path, target.project)
+      );
+      const slug = project && findTestProjectSlug(project);
+      if (slug && !entry.testSlugs.includes(slug)) entry.testSlugs.push(slug);
+    }
+  }
+
+  return { packagesByName };
+}
+
+async function _tryReadJsonAsync<T>(filePath: string): Promise<T | undefined> {
+  try {
+    return JSON.parse(await fs.readFile(filePath, 'utf-8')) as T;
+  } catch {
+    return undefined;
+  }
+}

package/src/utils/testing/parsers/index.ts

@@ -1,2 +1 @@
-export { resolveRobloxTestPath } from './roblox-path-resolver.js';
 export { parseJestLuaOutput } from './jest-lua-parser.js';