refactor: normalize pnpm lockfile data in parser

aspect-build · May 17, 2024 · 4e17ddd · 4e17ddd
1 parent a356f58
commit 4e17ddd
Show file tree

Hide file tree

Showing 17 changed files with 594 additions and 246 deletions.
diff --git a/e2e/pnpm_lockfiles/README.md b/e2e/pnpm_lockfiles/README.md
@@ -13,3 +13,5 @@ TODO:
 -   npm: references: `@aspect-test/a2": "npm:@aspect-test/a"`
 
     No :node_modules/\* targets are generated for aliases to npm packages.
+
+    Note: _sometimes_ fails to install with pnpm9
diff --git a/e2e/pnpm_lockfiles/base/package.json b/e2e/pnpm_lockfiles/base/package.json
@@ -8,6 +8,7 @@
         "uvu": "0.5.6",
         "@scoped/a": "workspace:*",
         "@scoped/b": "link:../projects/b",
+        "@scoped/c": "file:../projects/c",
         "@scoped/d": "../projects/d"
     },
     "devDependencies": {

diff --git a/e2e/pnpm_lockfiles/v54/pnpm-lock.yaml b/e2e/pnpm_lockfiles/v54/pnpm-lock.yaml
diff --git a/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl
diff --git a/e2e/pnpm_lockfiles/v60/pnpm-lock.yaml b/e2e/pnpm_lockfiles/v60/pnpm-lock.yaml
diff --git a/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl
diff --git a/e2e/pnpm_lockfiles/v61/pnpm-lock.yaml b/e2e/pnpm_lockfiles/v61/pnpm-lock.yaml
diff --git a/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl
diff --git a/e2e/pnpm_lockfiles/v90/pnpm-lock.yaml b/e2e/pnpm_lockfiles/v90/pnpm-lock.yaml
diff --git a/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl
diff --git a/npm/private/npm_translate_lock_generate.bzl b/npm/private/npm_translate_lock_generate.bzl
@@ -161,7 +161,7 @@ sh_binary(
                     dep_path = helpers.link_package(root_package, dep_version[len("file:"):])
                 dep_key = "{}+{}".format(dep_package, dep_version)
                 if not dep_key in fp_links.keys():
-                    msg = "Expected to file: referenced package {} in first-party links".format(dep_key)
+                    msg = "Expected to file: referenced package {} in first-party links {}".format(dep_key, fp_links.keys())
                     fail(msg)
                 fp_links[dep_key]["link_packages"][link_package] = []
             elif dep_version.startswith("link:"):
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,3 +13,5 @@ TODO:
		- npm: references: `@aspect-test/a2": "npm:@aspect-test/a"`

		No :node_modules/\* targets are generated for aliases to npm packages.

		Note: _sometimes_ fails to install with pnpm9