chore: Update yarn to 4.13, add package age gate, fix pnpm linker path detection

.github/workflows/ci.yml

@@ -43,6 +43,12 @@ jobs:
           node-version: ${{matrix.node-version}}
           cache: yarn
       - run: yarn
+      - uses: actions/cache@v4
+        with:
+          path: |
+            test/pnpm-compat/.yarn/cache
+            test/pnpm-compat/.yarn/global
+          key: pnpm-compat-yarn-${{ runner.os }}-${{ hashFiles('test/pnpm-compat/yarn.lock') }}
       - run: node test/smoketest.mjs
       - run: yarn test
         env:
@@ -57,6 +63,12 @@ jobs:
         with:
           cache: yarn
       - run: yarn
+      - uses: actions/cache@v4
+        with:
+          path: |
+            test/pnpm-compat/.yarn/cache
+            test/pnpm-compat/.yarn/global
+          key: pnpm-compat-yarn-${{ runner.os }}-${{ hashFiles('test/pnpm-compat/yarn.lock') }}
       - run: yarn prepack
       - run: yarn test || yarn jest --no-silent --verbose --onlyFailures
       - run: node test/smoketest.mjs

.yarnrc.yml

@@ -1,4 +1,9 @@
-nodeLinker: pnpm
+compressionLevel: mixed
+
 enableGlobalCache: true
 
-yarnPath: .yarn/releases/yarn-3.6.3.cjs
+nodeLinker: node-modules
+
+npmMinimalAgeGate: 2880
+
+yarnPath: .yarn/releases/yarn-4.13.0.cjs

package.json

@@ -37,7 +37,7 @@
     "type": "git",
     "url": "git+https://github.com/getappmap/appmap-node.git"
   },
-  "packageManager": "yarn@3.6.3",
+  "packageManager": "yarn@4.13.0",
   "type": "commonjs",
   "engines": {
     "node": ">=18"

src/hooks/jest.ts

@@ -16,12 +16,13 @@ import {
   startTestRecording,
 } from "../recorder";
 import genericTranform from "../transform";
+import { matchesPackageFile } from "../util/matchesPackageFile";
 import { isId } from "../util/isId";
 
 export function shouldInstrument(url: URL): boolean {
   return (
-    url.pathname.endsWith("jest-runtime/build/index.js") ||
-    url.pathname.endsWith("jest-circus/build/state.js")
+    matchesPackageFile(url.pathname, "jest-runtime", "build/index.js") ||
+    matchesPackageFile(url.pathname, "jest-circus", "build/state.js")
   );
 }
 

src/hooks/mocha.ts

@@ -16,9 +16,10 @@ import {
   getTestRecording,
   startTestRecording,
 } from "../recorder";
+import { matchesPackageFile } from "../util/matchesPackageFile";
 
 export function shouldInstrument(url: URL): boolean {
-  return url.pathname.endsWith("/mocha/lib/runner.js");
+  return matchesPackageFile(url.pathname, "mocha", "lib/runner.js");
 }
 
 export function transform(program: ESTree.Program): ESTree.Program {

src/hooks/vitest.ts

@@ -26,6 +26,7 @@ import {
   startTestRecording,
 } from "../recorder";
 import genericTransform from "../transform";
+import { matchesPackageFile } from "../util/matchesPackageFile";
 
 function createInitChannel() {
   return new worker.BroadcastChannel("appmap-node/vitest/initialized");
@@ -63,27 +64,18 @@ if (shouldListenForInit()) {
   };
 }
 
-const vitestRunnerIndexJsFilePathEnding = "/@vitest/runner/dist/index.js";
-// vitest v3 splits runTest into chunk-hooks.js; index.js is just re-exports
-const vitestRunnerChunkHooksJsFilePathEnding = "/@vitest/runner/dist/chunk-hooks.js";
-const viteNodeClientMjsFilePathEnding = "/vite-node/dist/client.mjs";
-// vitest v4 uses vite's built-in module runner instead of vite-node
-const viteModuleRunnerJsFilePathEnding = "/vite/dist/node/module-runner.js";
-// vitest v4 uses VitestModuleEvaluator instead of ESModulesEvaluator
-const vitestModuleEvaluatorJsFilePathEnding = "/vitest/dist/module-evaluator.js";
-
 export function shouldInstrument(url: URL): boolean {
   // 1. …/vite-node/dist/client.mjs ViteNodeRunner.runModule (vitest v0-v3)
   //    or …/vite/dist/node/module-runner.js ESModulesEvaluator.runInlinedModule (vitest v4)
   //    is the place to transform test and user files
   // 2. @vitest/runner/dist/index.js (or chunk-hooks.js for v3) runTest
   //    is the place to intercept test before and afters
   return (
-    url.pathname.endsWith(vitestRunnerIndexJsFilePathEnding) ||
-    url.pathname.endsWith(vitestRunnerChunkHooksJsFilePathEnding) ||
-    url.pathname.endsWith(viteNodeClientMjsFilePathEnding) ||
-    url.pathname.endsWith(viteModuleRunnerJsFilePathEnding) ||
-    url.pathname.endsWith(vitestModuleEvaluatorJsFilePathEnding)
+    matchesPackageFile(url.pathname, "@vitest/runner", "dist/index.js") ||
+    matchesPackageFile(url.pathname, "@vitest/runner", "dist/chunk-hooks.js") ||
+    matchesPackageFile(url.pathname, "vite-node", "dist/client.mjs") ||
+    matchesPackageFile(url.pathname, "vite", "dist/node/module-runner.js") ||
+    matchesPackageFile(url.pathname, "vitest", "dist/module-evaluator.js")
   );
 }
 
@@ -196,15 +188,16 @@ function patchRunInlinedModule(md: ESTree.MethodDefinition) {
 export function transform(program: ESTree.Program): ESTree.Program {
   const source = program.loc?.source;
   if (
-    source?.endsWith(vitestRunnerIndexJsFilePathEnding) ||
-    source?.endsWith(vitestRunnerChunkHooksJsFilePathEnding)
+    source &&
+    (matchesPackageFile(source, "@vitest/runner", "dist/index.js") ||
+      matchesPackageFile(source, "@vitest/runner", "dist/chunk-hooks.js"))
   )
     walk(program, {
       FunctionDeclaration(fd: ESTree.FunctionDeclaration) {
         if (fd.id?.name === "runTest") patchRunTest(fd);
       },
     });
-  else if (source?.endsWith(viteNodeClientMjsFilePathEnding))
+  else if (source && matchesPackageFile(source, "vite-node", "dist/client.mjs"))
     walk(program, {
       ClassDeclaration(cd: ESTree.ClassDeclaration) {
         if (cd.id?.name === "ViteNodeRunner") {
@@ -217,8 +210,9 @@ export function transform(program: ESTree.Program): ESTree.Program {
       },
     });
   else if (
-    source?.endsWith(viteModuleRunnerJsFilePathEnding) ||
-    source?.endsWith(vitestModuleEvaluatorJsFilePathEnding)
+    source &&
+    (matchesPackageFile(source, "vite", "dist/node/module-runner.js") ||
+      matchesPackageFile(source, "vitest", "dist/module-evaluator.js"))
   )
     walk(program, {
       MethodDefinition(md: ESTree.MethodDefinition) {

src/transform.ts

@@ -38,6 +38,8 @@ export function findHook(url: URL, sourceMap?: CustomSourceMapConsumer, hooks =
   return hooks.find((h) => h.shouldInstrument(url, sourceMap));
 }
 
+export { matchesPackageFile } from "./util/matchesPackageFile";
+
 export function shouldMatchOriginalSourcePaths(url: URL) {
   // We're not interested in source maps of libraries. For instance, in a Next.js project,
   // if we were to consult the source map for instrumentation of a file like

src/util/matchesPackageFile.ts

@@ -0,0 +1,23 @@
+/**
+ * Checks if a URL or path string matches a specific package file, handling multiple
+ * node_modules layouts:
+ * - Classic (npm, pnpm, yarn classic): .../node_modules/{pkg}/{file}
+ * - Yarn 3 pnpm linker: .../node_modules/.store/{pkg}-npm-{ver}-{hash}/{pkg}/{file}
+ * - Yarn 4 pnpm linker: .../node_modules/.store/{pkg}-npm-{ver}-{hash}/package/{file}
+ */
+export function matchesPackageFile(
+  urlOrPath: string,
+  packageName: string,
+  filePath: string,
+): boolean {
+  if (urlOrPath.endsWith(`/${packageName}/${filePath}`)) return true;
+  // Yarn 4 pnpm linker uses 'package' as the subdirectory name inside .store entries
+  if (urlOrPath.endsWith(`/package/${filePath}`)) {
+    // Yarn 4 pnpm linker names store entries as:
+    //   @scope/pkg → @scope-pkg-npm-ver-hash or @scope-pkg-virtual-hash
+    //   pkg         → pkg-npm-ver-hash or pkg-virtual-hash
+    const sanitized = packageName.replace("/", "-");
+    if (urlOrPath.includes(`/.store/${sanitized}-`)) return true;
+  }
+  return false;
+}

test/__snapshots__/next16.test.ts.snap

@@ -192,7 +192,7 @@ exports[`mapping a Next.js 16 appmap 1`] = `
         "http_server_response": {
           "headers": {
             "Cache-Control": "no-store, must-revalidate",
-            "Content-Length": "2238",
+            "Content-Length": "2210",
             "Content-Type": "text/html; charset=utf-8",
             "Vary": "Accept-Encoding",
             "X-Powered-By": "Next.js",

test/next.test.ts

@@ -1,14 +1,19 @@
 import { IncomingMessage, request } from "node:http";
+import { resolve } from "node:path";
 
 import { getFreePort, integrationTest, readAppmaps, spawnAppmapNode } from "./helpers";
 
+const nextBin = require.resolve("next/dist/bin/next", {
+  paths: [resolve(__dirname, "next")],
+});
+
 async function spawnNextJsApp(port: number) {
   // On Windows, we give "node" argument explicitly because next is a js file with
   // shebang (#!/usr/bin/env node) which does not work on Windows.
   const app =
     process.platform == "win32"
-      ? spawnAppmapNode("node", "node_modules\\next\\dist\\bin\\next", "dev", "-p", String(port))
-      : spawnAppmapNode("node_modules/next/dist/bin/next", "dev", "-p", String(port));
+      ? spawnAppmapNode("node", nextBin, "dev", "-p", String(port))
+      : spawnAppmapNode(nextBin, "dev", "-p", String(port));
 
   await new Promise<void>((r) => {
     const onData = (chunk: Buffer) => {

test/next16.test.ts

@@ -1,16 +1,21 @@
 import { IncomingMessage, request } from "node:http";
+import { resolve } from "node:path";
 
 import { getFreePort, integrationTest, readAppmaps, spawnAppmapNode } from "./helpers";
 
+const nextBin = require.resolve("next/dist/bin/next", {
+  paths: [resolve(__dirname, "next16")],
+});
+
 async function spawnNextJsApp(port: number) {
   // On Windows, we give "node" argument explicitly because next is a js file with
   // shebang (#!/usr/bin/env node) which does not work on Windows.
   // Turbopack (the default bundler in Next.js 16) respects webpack loaders configured
   // via next.config turbopack.rules, which we inject in src/hooks/next.ts.
   const app =
     process.platform == "win32"
-      ? spawnAppmapNode("node", "node_modules\\next\\dist\\bin\\next", "dev", "-p", String(port))
-      : spawnAppmapNode("node_modules/next/dist/bin/next", "dev", "-p", String(port));
+      ? spawnAppmapNode("node", nextBin, "dev", "-p", String(port))
+      : spawnAppmapNode(nextBin, "dev", "-p", String(port));
 
   await new Promise<void>((r) => {
     const onData = (chunk: Buffer) => {

test/pnpm-compat.test.ts

@@ -0,0 +1,22 @@
+import { spawnSync } from "node:child_process";
+import { existsSync } from "node:fs";
+import { resolve } from "node:path";
+
+import { integrationTest, readAppmaps, runAppmapNode } from "./helpers";
+
+// This test runs vitest in a separate project installed with yarn pnpm linker,
+// verifying that matchesPackageFile() correctly identifies hook targets in the
+// .store/pkg-npm-version-hash/package/ path format used by yarn 4 pnpm linker.
+
+integrationTest("pnpm linker: vitest hooks instrument code in .store paths", () => {
+  const dir = resolve(__dirname, "pnpm-compat");
+  if (!existsSync(resolve(dir, "node_modules")))
+    spawnSync("yarn", ["install"], {
+      cwd: dir,
+      stdio: "inherit",
+      shell: process.platform === "win32",
+    });
+
+  expect(runAppmapNode("yarn", "vitest", "run").status).toBe(0);
+  expect(readAppmaps()).not.toEqual({});
+});

test/pnpm-compat/.gitignore

@@ -0,0 +1 @@
+.yarn/

test/pnpm-compat/.yarnrc.yml

@@ -0,0 +1,9 @@
+nodeLinker: pnpm
+
+enableGlobalCache: false
+
+cacheFolder: ./.yarn/cache
+
+globalFolder: ./.yarn/global
+
+yarnPath: ../../.yarn/releases/yarn-4.13.0.cjs

test/pnpm-compat/appmap.yml

@@ -0,0 +1,4 @@
+name: pnpm-compat-appmap-node-test
+packages:
+  - path: .
+language: javascript

test/pnpm-compat/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "pnpm-compat-appmap-node-test",
+  "private": true,
+  "dependencies": {
+    "vitest": "^0.34.6"
+  }
+}

test/pnpm-compat/sum.test.js

@@ -0,0 +1,9 @@
+import { expect, test } from "vitest";
+
+function sum(a, b) {
+  return a + b;
+}
+
+test("adds 1 + 2 to equal 3", () => {
+  expect(sum(1, 2)).toBe(3);
+});

test/pnpm-compat/vitest.config.mjs

@@ -0,0 +1,2 @@
+import { defineConfig } from "vitest/config";
+export default defineConfig({});