@pnpm/lockfile.utils 1100.0.12 → 1100.1.0

package/lib/index.d.ts

@@ -4,6 +4,7 @@ export { packageIdFromSnapshot } from './packageIdFromSnapshot.js';
 export { packageIsIndependent } from './packageIsIndependent.js';
 export { pkgSnapshotToResolution } from './pkgSnapshotToResolution.js';
 export { refIsLocalDirectory, refIsLocalTarball } from './refIsLocalTarball.js';
-export { isGitHostedTarballUrl, toLockfileResolution } from './toLockfileResolution.js';
+export { toLockfileResolution } from './toLockfileResolution.js';
 export * from '@pnpm/lockfile.types';
+export { isGitHostedTarballUrl } from '@pnpm/resolving.resolver-base';
 export declare const getPkgShortId: typeof refToRelative;

package/lib/index.js

@@ -4,8 +4,9 @@ export { packageIdFromSnapshot } from './packageIdFromSnapshot.js';
 export { packageIsIndependent } from './packageIsIndependent.js';
 export { pkgSnapshotToResolution } from './pkgSnapshotToResolution.js';
 export { refIsLocalDirectory, refIsLocalTarball } from './refIsLocalTarball.js';
-export { isGitHostedTarballUrl, toLockfileResolution } from './toLockfileResolution.js';
+export { toLockfileResolution } from './toLockfileResolution.js';
 export * from '@pnpm/lockfile.types';
+export { isGitHostedTarballUrl } from '@pnpm/resolving.resolver-base';
 // for backward compatibility
 export const getPkgShortId = refToRelative;
 //# sourceMappingURL=index.js.map

package/lib/pkgSnapshotToResolution.js

@@ -1,38 +1,21 @@
 import url from 'node:url';
 import * as dp from '@pnpm/deps.path';
 import { PnpmError } from '@pnpm/error';
-import getNpmTarballUrl from 'get-npm-tarball-url';
+import { getNpmTarballUrl } from '@pnpm/resolving.tarball-url';
 import { nameVerFromPkgSnapshot } from './nameVerFromPkgSnapshot.js';
-import { isGitHostedTarballUrl } from './toLockfileResolution.js';
 export function pkgSnapshotToResolution(depPath, pkgSnapshot, registries) {
     const resolution = pkgSnapshot.resolution;
-    // Tarball-shaped resolutions (no `type` field) must carry `integrity`,
-    // except where the URL itself anchors the bytes:
-    //   - `file:` tarballs (local file on the user's machine; integrity
-    //     adds nothing the user doesn't already control).
-    //   - Git-hosted tarballs (URL contains the commit SHA; git's content-
-    //     addressed model binds the bytes to the commit). The `gitHosted`
-    //     flag may be absent on legacy lockfiles, so fall back to a URL
-    //     match — same logic as `toLockfileResolution`.
-    // For any other tarball entry a missing integrity is what a tampered
-    // lockfile looks like: the worker would mint a fresh integrity from
-    // whatever bytes the URL returned, so we fail closed here. Pacquet
-    // enforces the same invariant via
-    // `pacquet_package_manager::missing_tarball_integrity`.
-    if (resolution.type == null &&
-        resolution.integrity == null &&
-        !resolution.tarball?.startsWith('file:') &&
-        !(resolution.gitHosted === true || (resolution.tarball != null && isGitHostedTarballUrl(resolution.tarball)))) {
-        throw new PnpmError('MISSING_TARBALL_INTEGRITY', `Cannot install package "${depPath}": its lockfile entry has no "integrity" field, so pnpm cannot verify the downloaded tarball.`, { hint: 'The lockfile may be corrupted or have been tampered with. Restore it from a trusted source, or delete it and re-run installation without --frozen-lockfile to regenerate.' });
+    if (resolution.tarball != null && typeof resolution.tarball !== 'string') {
+        // Avoid URL string-coercion from malformed YAML lockfile values.
+        throw new PnpmError('INVALID_TARBALL_RESOLUTION', `Cannot install package "${depPath}": its lockfile entry has a non-string "tarball" field.`);
     }
     if (Boolean(resolution.type) ||
         resolution.tarball?.startsWith('file:') ||
         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`).
+    // Recover the tarball field for `file:` snapshots whose depPath is the only
+    // source of the local tarball reference.
     const nonSemverVersion = dp.parse(depPath).nonSemverVersion;
     if (nonSemverVersion?.startsWith('file:')) {
         return {
@@ -51,11 +34,11 @@ export function pkgSnapshotToResolution(depPath, pkgSnapshot, registries) {
         registry = registries.default;
     }
     let tarball;
-    if (!pkgSnapshot.resolution.tarball) {
+    if (!resolution.tarball) {
         tarball = getTarball(registry);
     }
     else {
-        tarball = new url.URL(pkgSnapshot.resolution.tarball, registry.endsWith('/') ? registry : `${registry}/`).toString();
+        tarball = new url.URL(resolution.tarball, registry.endsWith('/') ? registry : `${registry}/`).toString();
     }
     return {
         ...pkgSnapshot.resolution,

package/lib/toLockfileResolution.d.ts

@@ -1,7 +1,6 @@
 import type { LockfileResolution } from '@pnpm/lockfile.types';
-import type { Resolution } from '@pnpm/resolving.resolver-base';
+import { type Resolution } from '@pnpm/resolving.resolver-base';
 export declare function toLockfileResolution(pkg: {
     name: string;
     version: string;
 }, resolution: Resolution, registry: string, lockfileIncludeTarballUrl?: boolean): LockfileResolution;
-export declare function isGitHostedTarballUrl(url: string): boolean;

package/lib/toLockfileResolution.js

@@ -1,4 +1,5 @@
-import getNpmTarballUrl from 'get-npm-tarball-url';
+import { isGitHostedTarballUrl } from '@pnpm/resolving.resolver-base';
+import { isCanonicalRegistryTarballUrl } from '@pnpm/resolving.tarball-url';
 export function toLockfileResolution(pkg, resolution, registry, lockfileIncludeTarballUrl) {
     if (resolution.type !== undefined || !resolution['integrity']) {
         return resolution;
@@ -15,60 +16,29 @@ export function toLockfileResolution(pkg, resolution, registry, lockfileIncludeT
     // legacy lockfiles read by callers that don't enrich the field).
     const gitHosted = resolution.gitHosted === true ||
         isGitHostedTarballUrl(tarball);
-    if (lockfileIncludeTarballUrl) {
-        return preservingGitHosted({
-            integrity: resolution['integrity'],
-            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.startsWith('file:') || gitHosted) {
-        return preservingGitHosted({
-            integrity: resolution['integrity'],
-            tarball,
-        }, gitHosted);
-    }
-    // Sometimes packages are hosted under non-standard tarball URLs.
-    // 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.
-    // Even when the user explicitly sets `lockfileIncludeTarballUrl: false`, we
-    // must preserve such URLs — otherwise the package cannot be re-fetched on a
-    // frozen-lockfile install (e.g. GitHub Packages tarballs at
-    // `https://npm.pkg.github.com/download/<scope>/<name>/<version>/<hash>`).
-    // `lockfileIncludeTarballUrl` only controls whether URLs that *can* be
-    // derived from name+version+registry are written.
-    const expectedTarball = getNpmTarballUrl(pkg.name, pkg.version, { registry });
-    const actualTarball = tarball.replaceAll('%2f', '/');
-    if (removeProtocol(expectedTarball) !== removeProtocol(actualTarball)) {
-        return preservingGitHosted({
-            integrity: resolution['integrity'],
-            tarball,
-        }, gitHosted);
+    // A standard registry tarball whose URL can be rebuilt from the package name,
+    // version, and registry is written as just `{ integrity }` — pnpm derives the
+    // URL on demand. Every other tarball must keep its URL or it can no longer be
+    // re-fetched on a frozen-lockfile install: `file:` tarballs, git-provider
+    // tarballs (GitHub/GitLab/Bitbucket), and non-standard registry URLs such as
+    // npm Enterprise (https://github.com/pnpm/pnpm/issues/867) or GitHub Packages
+    // `/download/` URLs. `lockfileIncludeTarballUrl` forces the URL to be kept.
+    if (!lockfileIncludeTarballUrl &&
+        !gitHosted &&
+        !tarball.startsWith('file:') &&
+        isCanonicalRegistryTarballUrl(tarball, pkg, registry)) {
+        return { integrity: resolution['integrity'] };
     }
+    // The kept-URL form carries the `gitHosted` marker and the subdirectory `path`
+    // (`repo#commit&path:/sub/dir`, only ever set on git-hosted tarballs) so a
+    // git-hosted monorepo tarball still unpacks the right subfolder.
+    // See https://github.com/pnpm/pnpm/issues/12304.
+    const { path } = resolution;
     return {
         integrity: resolution['integrity'],
+        tarball,
+        ...(gitHosted ? { gitHosted: true } : {}),
+        ...(path == null ? {} : { path }),
     };
 }
-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.
-export function isGitHostedTarballUrl(url) {
-    // Schemes and hostnames are case-insensitive, so match against a lowercased
-    // copy: a tampered `https://CODELOAD.GITHUB.COM/...` must not slip past as a
-    // non-git-hosted (and therefore registry-trusted) tarball. Only the
-    // lowercased copy is inspected; the original URL is never rewritten.
-    const lowerUrl = url.toLowerCase();
-    return (lowerUrl.startsWith('https://codeload.github.com/') ||
-        lowerUrl.startsWith('https://bitbucket.org/') ||
-        lowerUrl.startsWith('https://gitlab.com/')) && lowerUrl.includes('tar.gz');
-}
-function removeProtocol(url) {
-    return url.split('://')[1];
-}
 //# sourceMappingURL=toLockfileResolution.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/lockfile.utils",
-  "version": "1100.0.12",
+  "version": "1100.1.0",
   "description": "Utils for dealing with pnpm-lock.yaml",
   "keywords": [
     "pnpm",
@@ -12,9 +12,9 @@
   "funding": "https://opencollective.com/pnpm",
   "repository": {
     "type": "git",
-    "url": "https://github.com/pnpm/pnpm/tree/main/lockfile/utils"
+    "url": "https://github.com/pnpm/pnpm/tree/main/pnpm11/lockfile/utils"
   },
-  "homepage": "https://github.com/pnpm/pnpm/tree/main/lockfile/utils#readme",
+  "homepage": "https://github.com/pnpm/pnpm/tree/main/pnpm11/lockfile/utils#readme",
   "bugs": {
     "url": "https://github.com/pnpm/pnpm/issues"
   },
@@ -29,22 +29,22 @@
     "!*.map"
   ],
   "dependencies": {
-    "get-npm-tarball-url": "^2.1.0",
     "ramda": "npm:@pnpm/ramda@0.28.1",
-    "@pnpm/deps.path": "1100.0.7",
-    "@pnpm/lockfile.types": "1100.0.10",
-    "@pnpm/resolving.resolver-base": "1100.4.1",
-    "@pnpm/types": "1101.3.1",
-    "@pnpm/hooks.types": "1100.0.11",
-    "@pnpm/error": "1100.0.0"
+    "@pnpm/error": "1100.0.1",
+    "@pnpm/hooks.types": "1100.1.0",
+    "@pnpm/resolving.resolver-base": "1100.5.0",
+    "@pnpm/lockfile.types": "1100.0.12",
+    "@pnpm/resolving.tarball-url": "1100.0.0",
+    "@pnpm/deps.path": "1100.0.8",
+    "@pnpm/types": "1101.3.2"
   },
   "devDependencies": {
-    "@jest/globals": "30.3.0",
+    "@jest/globals": "30.4.1",
     "@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.12"
+    "@pnpm/lockfile.utils": "1100.1.0"
   },
   "engines": {
     "node": ">=22.13"