Adds a test

Author: arcanis

.claude/settings.local.json

@@ -16,7 +16,8 @@
       "Bash(yarn test:integration:*)",
       "Bash(cargo check:*)",
       "Bash(git stash:*)",
-      "Bash(RUST_BACKTRACE=1 ~/Repositories/zpm/target/release/yarn-bin:*)"
+      "Bash(RUST_BACKTRACE=1 ~/Repositories/zpm/target/release/yarn-bin:*)",
+      "Bash(/Users/mael.nison/Repositories/zpm/target/release/yarn-bin install *)"
     ],
     "deny": [],
     "ask": []

.github/actions/run-e2e-sandbox/Dockerfile

@@ -13,7 +13,8 @@ RUN apt-get update \
     npm \
     python3 \
     python-is-python3 \
-  && rm -rf /var/lib/apt/lists/*
+  && rm -rf /var/lib/apt/lists/* \
+  && npm install -g pnpm
 
 COPY entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh

packages/zpm/src/lockfile.rs

@@ -475,14 +475,22 @@ pub fn from_pnpm_node_modules(project_cwd: &Path) -> Result<Lockfile, Error> {
             continue;
         };
 
-        let Ok(package_path) = Path::try_from(package_path_str.as_str()) else {
+        let Ok(raw_path) = Path::try_from(package_path_str.as_str()) else {
             continue;
         };
 
+        let package_path = if raw_path.is_relative() {
+            project_cwd.with_join_str("node_modules").with_join(&raw_path)
+        } else {
+            raw_path
+        };
+
         #[derive(Debug, Deserialize)]
         struct Manifest {
             #[serde(default)]
             dependencies: BTreeMap<String, String>,
+            #[serde(default, rename = "optionalDependencies")]
+            optional_dependencies: BTreeMap<String, String>,
         }
 
         let manifest: Option<Manifest>
@@ -496,7 +504,11 @@ pub fn from_pnpm_node_modules(project_cwd: &Path) -> Result<Lockfile, Error> {
             continue;
         };
 
-        for (name, range) in manifest.dependencies {
+        let all_dependencies
+            = manifest.dependencies.into_iter().map(|(n, r)| (n, r, false))
+                .chain(manifest.optional_dependencies.into_iter().map(|(n, r)| (n, r, true)));
+
+        for (name, range, is_optional) in all_dependencies {
             let Ok(ident) = Ident::from_file_string(&name) else {
                 continue;
             };
@@ -510,6 +522,25 @@ pub fn from_pnpm_node_modules(project_cwd: &Path) -> Result<Lockfile, Error> {
                 continue;
             };
 
+            if is_optional {
+                let installed = resolved_entry.path.as_ref().and_then(|p| {
+                    let p
+                        = Path::try_from(p.as_str()).ok()?;
+
+                    let p = if p.is_relative() {
+                        project_cwd.with_join_str("node_modules").with_join(&p)
+                    } else {
+                        p
+                    };
+
+                    Some(p.with_join_str("package.json").fs_exists())
+                });
+
+                if !installed.unwrap_or(false) {
+                    continue;
+                }
+            }
+
             let Some(version) = &resolved_entry.version else {
                 continue;
             };

tests/e2e/pnpm-migration.sh

@@ -0,0 +1,63 @@
+#!/usr/bin/env bash
+
+mkdir -p packages/pkg-a
+
+cat > package.json <<'JSON'
+{
+  "name": "e2e-pnpm-migration",
+  "private": true,
+  "workspaces": [
+    "packages/*"
+  ]
+}
+JSON
+
+cat > pnpm-workspace.yaml <<'YAML'
+packages:
+  - "packages/*"
+YAML
+
+cat > packages/pkg-a/package.json <<'JSON'
+{
+  "name": "pkg-a",
+  "version": "1.0.0",
+  "private": true,
+  "dependencies": {
+    "jest": "*"
+  }
+}
+JSON
+
+pnpm install
+
+# Capture the versions pnpm resolved (normalized to name@version)
+pnpm ls -r --json --depth=Infinity \
+  | jq -r '.. | objects | select(.version? and .from?) | "\(.from)@\(.version)"' \
+  | sort -u > "${TEMP_DIR}/pnpm-versions.txt"
+
+rm -f pnpm-lock.yaml
+
+yarn install
+
+# Capture the versions yarn resolved (normalized to name@version)
+yarn info -AR --json \
+  | jq -r '.value' \
+  | grep '@npm:' \
+  | sed -E 's/@npm:(.+@)?/\t/' \
+  | awk -F'\t' '{print $1"@"$2}' \
+  | sort -u > "${TEMP_DIR}/yarn-versions.txt"
+
+# Every version from pnpm must appear in yarn's resolution.
+# Platform-specific packages (like fsevents) may be absent; that's expected.
+MISMATCHES=0
+while IFS= read -r line; do
+  if ! grep -qxF "${line}" "${TEMP_DIR}/yarn-versions.txt"; then
+    echo "MISMATCH: pnpm had ${line} but yarn does not" >&2
+    MISMATCHES=$((MISMATCHES + 1))
+  fi
+done < "${TEMP_DIR}/pnpm-versions.txt"
+
+if [[ "${MISMATCHES}" -gt 5 ]]; then
+  echo "Too many version mismatches (${MISMATCHES}); migration did not preserve versions" >&2
+  exit 1
+fi