@pnpm/lockfile.utils 1100.0.3 → 1100.0.5

package/lib/pkgSnapshotToResolution.js

@@ -1,13 +1,23 @@
 import url from 'node:url';
-import { isGitHostedPkgUrl } from '@pnpm/fetching.pick-fetcher';
+import * as dp from '@pnpm/deps.path';
 import getNpmTarballUrl from 'get-npm-tarball-url';
 import { nameVerFromPkgSnapshot } from './nameVerFromPkgSnapshot.js';
 export function pkgSnapshotToResolution(depPath, pkgSnapshot, registries) {
     if (Boolean(pkgSnapshot.resolution.type) ||
         pkgSnapshot.resolution.tarball?.startsWith('file:') ||
-        isGitHostedPkgUrl(pkgSnapshot.resolution.tarball ?? '')) {
+        pkgSnapshot.resolution.gitHosted === true) {
         return pkgSnapshot.resolution;
     }
+    // Recover the tarball field for `file:` snapshots whose resolution lost
+    // its tarball (e.g. lockfiles written by an earlier pnpm 11 version that
+    // dropped the tarball under `lockfile-include-tarball-url=false`).
+    const nonSemverVersion = dp.parse(depPath).nonSemverVersion;
+    if (nonSemverVersion?.startsWith('file:')) {
+        return {
+            ...pkgSnapshot.resolution,
+            tarball: nonSemverVersion,
+        };
+    }
     const { name, version } = nameVerFromPkgSnapshot(depPath, pkgSnapshot);
     let registry = '';
     if (name != null) {

package/lib/toLockfileResolution.js

@@ -3,11 +3,27 @@ export function toLockfileResolution(pkg, resolution, registry, lockfileIncludeT
     if (resolution.type !== undefined || !resolution['integrity']) {
         return resolution;
     }
+    const tarball = resolution['tarball'];
+    // Honor the resolver-supplied flag, with a URL fallback for resolutions
+    // that didn't go through the git resolver (e.g. config-dep migrations or
+    // legacy lockfiles read by callers that don't enrich the field).
+    const gitHosted = resolution.gitHosted === true ||
+        (tarball != null && isGitHostedTarballUrl(tarball));
     if (lockfileIncludeTarballUrl) {
-        return {
+        return preservingGitHosted({
             integrity: resolution['integrity'],
-            tarball: resolution['tarball'],
-        };
+            tarball,
+        }, gitHosted);
+    }
+    // Tarball URLs that cannot be reconstructed from the package name, version,
+    // and registry must always stay in the lockfile, otherwise the package can
+    // no longer be re-fetched. This covers local `file:` tarballs and tarballs
+    // served by git providers (GitHub, GitLab, Bitbucket).
+    if (tarball != null && (tarball.startsWith('file:') || gitHosted)) {
+        return preservingGitHosted({
+            integrity: resolution['integrity'],
+            tarball,
+        }, gitHosted);
     }
     if (lockfileIncludeTarballUrl === false) {
         return {
@@ -18,17 +34,28 @@ export function toLockfileResolution(pkg, resolution, registry, lockfileIncludeT
     // For instance, when they are hosted on npm Enterprise. See https://github.com/pnpm/pnpm/issues/867
     // Or in other weird cases, like https://github.com/pnpm/pnpm/issues/1072
     const expectedTarball = getNpmTarballUrl(pkg.name, pkg.version, { registry });
-    const actualTarball = resolution['tarball'].replaceAll('%2f', '/');
+    const actualTarball = tarball.replaceAll('%2f', '/');
     if (removeProtocol(expectedTarball) !== removeProtocol(actualTarball)) {
-        return {
+        return preservingGitHosted({
             integrity: resolution['integrity'],
-            tarball: resolution['tarball'],
-        };
+            tarball,
+        }, gitHosted);
     }
     return {
         integrity: resolution['integrity'],
     };
 }
+function preservingGitHosted(resolution, gitHosted) {
+    return gitHosted ? { ...resolution, gitHosted: true } : resolution;
+}
+// Inlined to avoid pulling @pnpm/fetching.pick-fetcher into the lockfile-utils
+// dep graph. Used as a fallback when callers haven't pre-set the
+// `gitHosted` field on TarballResolution.
+function isGitHostedTarballUrl(url) {
+    return (url.startsWith('https://codeload.github.com/') ||
+        url.startsWith('https://bitbucket.org/') ||
+        url.startsWith('https://gitlab.com/')) && url.includes('tar.gz');
+}
 function removeProtocol(url) {
     return url.split('://')[1];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/lockfile.utils",
-  "version": "1100.0.3",
+  "version": "1100.0.5",
   "description": "Utils for dealing with pnpm-lock.yaml",
   "keywords": [
     "pnpm",
@@ -28,20 +28,20 @@
   "dependencies": {
     "get-npm-tarball-url": "^2.1.0",
     "ramda": "npm:@pnpm/ramda@0.28.1",
-    "@pnpm/deps.path": "1100.0.1",
     "@pnpm/error": "1100.0.0",
-    "@pnpm/hooks.types": "1100.0.3",
-    "@pnpm/lockfile.types": "1100.0.2",
-    "@pnpm/resolving.resolver-base": "1100.1.0",
-    "@pnpm/types": "1101.0.0",
-    "@pnpm/fetching.pick-fetcher": "1100.0.3"
+    "@pnpm/hooks.types": "1100.0.5",
+    "@pnpm/lockfile.types": "1100.0.4",
+    "@pnpm/deps.path": "1100.0.2",
+    "@pnpm/resolving.resolver-base": "1100.1.2",
+    "@pnpm/types": "1101.0.0"
   },
   "devDependencies": {
+    "@jest/globals": "30.3.0",
     "@types/ramda": "0.31.1",
     "tempy": "3.0.0",
     "write-yaml-file": "^6.0.0",
     "yaml-tag": "1.1.0",
-    "@pnpm/lockfile.utils": "1100.0.3"
+    "@pnpm/lockfile.utils": "1100.0.5"
   },
   "engines": {
     "node": ">=22.13"