feat: support pnpm lock v9 (#1679)

Close #1652

e2e/pnpm_lockfiles/.bazelignore

@@ -5,3 +5,4 @@ projects/c/node_modules
 v54/node_modules/
 v60/node_modules/
 v61/node_modules/
+v90/node_modules/

e2e/pnpm_lockfiles/MODULE.bazel

@@ -40,6 +40,7 @@ npm = use_extension(
         "v54",
         "v60",
         "v61",
+        "v90",
     ]
 ]
 
@@ -52,5 +53,6 @@ npm = use_extension(
         "v54",
         "v60",
         "v61",
+        "v90",
     ]
 ]

e2e/pnpm_lockfiles/WORKSPACE

@@ -27,15 +27,19 @@ load("@aspect_rules_js//npm:repositories.bzl", "npm_translate_lock")
         "v54",
         "v60",
         "v61",
+        "v90",
     ]
 ]
 
 load("@lock-v54//:repositories.bzl", npm_repositories_v54 = "npm_repositories")
 load("@lock-v60//:repositories.bzl", npm_repositories_v60 = "npm_repositories")
 load("@lock-v61//:repositories.bzl", npm_repositories_v61 = "npm_repositories")
+load("@lock-v90//:repositories.bzl", npm_repositories_v90 = "npm_repositories")
 
 npm_repositories_v54()
 
 npm_repositories_v60()
 
 npm_repositories_v61()
+
+npm_repositories_v90()

e2e/pnpm_lockfiles/base/package.json

@@ -20,6 +20,9 @@
     "pnpm": {
         "patchedDependencies": {
             "[email protected]": "patches/[email protected]"
-        }
+        },
+        "onlyBuildDependencies": [
+            "@aspect-test/c"
+        ]
     }
 }

e2e/pnpm_lockfiles/setup.sh

@@ -3,10 +3,14 @@
 #   5.4 - pnpm v7.0.0 bumped the lockfile version to 5.4
 #   6.0 - pnpm v8.0.0 bumped the lockfile version to 6.0; this included breaking changes
 #   6.1 - pnpm v8.6.0 bumped the lockfile version to 6.1
+#   9.0 - pnpm v9.0.0 bumped the lockfile version to 9.0; this includes breaking changes regarding lifecycle hooks and patches
 
 mv v54/pnpm-lock.yaml base && pushd base && npx pnpm@^7.0 install --lockfile-only && mv pnpm-lock.yaml ../v54/ && popd
 
 # pnpm v8.0.0 bumped the lockfile version to 6.0, 8.6.0 bumped it to 6.1 which was then reverted to 6.0
 # while still presenting minor differences from <8.6.0.
 mv v60/pnpm-lock.yaml base && pushd base && npx [email protected] install --lockfile-only && mv pnpm-lock.yaml ../v60/ && popd
 mv v61/pnpm-lock.yaml base && pushd base && npx [email protected] install --lockfile-only && mv pnpm-lock.yaml ../v61/ && popd
+
+# pnpm v9.0.0 bumped the lockfile version to 9.0
+mv v90/pnpm-lock.yaml base && pushd base && npx pnpm@^9.0 install --lockfile-only && mv pnpm-lock.yaml ../v90 && popd

e2e/pnpm_lockfiles/v90/BUILD.bazel

@@ -0,0 +1,6 @@
+load("@lock-v90//:defs.bzl", "npm_link_all_packages")
+load("//:lockfile-test.bzl", "lockfile_test")
+
+npm_link_all_packages()
+
+lockfile_test()

e2e/pnpm_lockfiles/v90/package.json

@@ -0,0 +1 @@
+../base/package.json

e2e/pnpm_lockfiles/v90/patches

@@ -0,0 +1 @@
+../base/patches

npm/private/npm_translate_lock_helpers.bzl

@@ -278,7 +278,6 @@ def _get_npm_imports(importers, packages, patched_dependencies, only_built_depen
         optional_deps = package_info.get("optional_dependencies")
         dev = package_info.get("dev")
         optional = package_info.get("optional")
-        pnpm_patched = package_info.get("patched")
         requires_build = package_info.get("requires_build")
         transitive_closure = package_info.get("transitive_closure")
         resolution = package_info.get("resolution")
@@ -331,6 +330,9 @@ def _get_npm_imports(importers, packages, patched_dependencies, only_built_depen
 
         translate_patches, patches_keys = _gather_values_from_matching_names(True, attr.patches, name, friendly_name, unfriendly_name)
 
+        pnpm_patch = patched_dependencies.get(friendly_name, {}).get("path", None)
+        pnpm_patched = pnpm_patch != None
+
         if len(translate_patches) > 0 and pnpm_patched:
             msg = """\
 ERROR: can not apply both `pnpm.patchedDependencies` and `npm_translate_lock(patches)` to the same package {pkg}.
@@ -341,7 +343,7 @@ ERROR: can not apply both `pnpm.patchedDependencies` and `npm_translate_lock(pat
 
         # Apply patch from `pnpm.patchedDependencies` first
         if pnpm_patched:
-            patch_path = "//%s:%s" % (attr.pnpm_lock.package, patched_dependencies.get(friendly_name).get("path"))
+            patch_path = "//%s:%s" % (attr.pnpm_lock.package, pnpm_patch)
             patches.append(patch_path)
 
             # pnpm patches are always applied with -p1

npm/private/test/utils_tests.bzl

@@ -68,12 +68,13 @@ def test_version_supported(ctx):
     msg = utils.assert_lockfile_version(1.2, testonly = True)
     asserts.equals(env, "npm_translate_lock requires lock_version at least 5.4, but found 1.2. Please upgrade to pnpm v7 or greater.", msg)
     msg = utils.assert_lockfile_version(99.99, testonly = True)
-    asserts.equals(env, "npm_translate_lock currently supports a maximum lock_version of 6.1, but found 99.99. Please file an issue on rules_js", msg)
+    asserts.equals(env, "npm_translate_lock currently supports a maximum lock_version of 9.0, but found 99.99. Please file an issue on rules_js", msg)
 
     # supported versions
     utils.assert_lockfile_version(5.4)
     utils.assert_lockfile_version(6.0)
     utils.assert_lockfile_version(6.1)
+    utils.assert_lockfile_version(9.0)
 
     return unittest.end(env)
 

npm/private/transitive_closure.bzl

@@ -130,7 +130,6 @@ def _gather_package_info(package_path, package_snapshot):
         "optional_dependencies": package_snapshot.get("optionalDependencies", {}),
         "dev": package_snapshot.get("dev", False),
         "optional": package_snapshot.get("optional", False),
-        "patched": package_snapshot.get("patched", False),
         "has_bin": package_snapshot.get("hasBin", False),
         "requires_build": package_snapshot.get("requiresBuild", False),
     }