refactor: remove use of pnpm <9 lockfile id field

Author: jbedard

npm/private/npm_translate_lock_generate.bzl

@@ -126,11 +126,9 @@ sh_binary(
         name = package_info.get("name")
         version = package_info.get("version")
         deps = package_info.get("dependencies")
-        if version.startswith("file:"):
-            if version in packages and packages[version]["id"] and packages[version]["id"].startswith("file:"):
-                dep_path = helpers.link_package(root_package, packages[version]["id"][len("file:"):])
-            else:
-                dep_path = helpers.link_package(root_package, version[len("file:"):])
+        resolution = package_info.get("resolution")
+        if resolution.get("type", None) == "directory":
+            dep_path = helpers.link_package(root_package, resolution.get("directory"))
             dep_key = "{}+{}".format(name, version)
             transitive_deps = {}
             for raw_package, raw_version in deps.items():

npm/private/pnpm.bzl

@@ -34,14 +34,6 @@ def _new_import_info(dependencies, dev_dependencies, optional_dependencies):
 # have data normalized across lockfiles.
 #
 # Args:
-#   id: a "universal identifier of the package" only present when the id is not the same as the key
-#       Normally present when the package is an odd version (such as file: or link: package) while
-#       also having peer dependencies in the key.
-#
-#       Removed in lockfile v9+ where snapshots/packages are separate.
-#
-#       See https://github.com/pnpm/spec/blob/master/lockfile/6.0.md#packagesdependencypathid
-#
 #   name:
 #   version:
 #   dependencies:
@@ -64,9 +56,8 @@ def _new_import_info(dependencies, dev_dependencies, optional_dependencies):
 #       See https://github.com/pnpm/spec/blob/master/lockfile/6.0.md#packagesdependencypathrequiresbuild
 #
 #   resolution: the lockfile resolution field
-def _new_package_info(id, name, dependencies, optional_dependencies, dev_only, has_bin, optional, requires_build, version, friendly_version, resolution):
+def _new_package_info(name, dependencies, optional_dependencies, dev_only, has_bin, optional, requires_build, version, friendly_version, resolution):
     return {
-        "id": id,
         "name": name,
         "dependencies": dependencies,
         "optional_dependencies": optional_dependencies,
@@ -236,7 +227,6 @@ def _convert_v5_packages(packages):
         package_key = _to_package_key(name, version)
 
         package_info = _new_package_info(
-            id = package_snapshot.get("id", None),
             name = name,
             version = version,
             friendly_version = friendly_version,
@@ -403,7 +393,6 @@ def _convert_v6_packages(packages):
         package_key = _to_package_key(name, version)
 
         package_info = _new_package_info(
-            id = package_snapshot.get("id", None),
             name = name,
             version = version,
             friendly_version = friendly_version,
@@ -530,16 +519,7 @@ def _convert_v9_packages(packages, snapshots):
 
         package_key = _convert_pnpm_v6_v9_version_peer_dep(package_key)
 
-        # pnpm v9+ no longer contains an id field
-        # but we will use it to support some edge cases
-        id = None
-
         if version.startswith("file:"):
-            # Keep the file: path as the 'id' for later use when linking to the path
-            peer_index = version.find("(")
-            if peer_index != -1:
-                id = version[:peer_index]
-
             version, friendly_version = _convert_v9_file_package_version(version, package_data)
             version = _convert_pnpm_v6_v9_version_peer_dep(version)
 
@@ -552,7 +532,6 @@ def _convert_v9_packages(packages, snapshots):
             friendly_version = package_data["version"] if "version" in package_data else static_key[version_index + 1:]
 
         package_info = _new_package_info(
-            id = id,
             name = name,
             version = version,
             friendly_version = friendly_version,

npm/private/test/parse_pnpm_lock_tests.bzl

@@ -27,7 +27,6 @@ expected_importers = {
 }
 expected_packages = {
     "@aspect-test/[email protected]": {
-        "id": None,
         "name": "@aspect-test/a",
         "dependencies": {
             "@aspect-test/b": "5.0.0",
@@ -46,7 +45,6 @@ expected_packages = {
         },
     },
     "[email protected]": {
-        "id": None,
         "name": "lodash",
         "dependencies": {},
         "optional_dependencies": {},