@pnpm/store.pkg-finder 1100.0.4 → 1100.0.6

package/lib/index.d.ts

@@ -10,10 +10,18 @@ export interface ReadPackageFileMapOptions {
  * Reads the file index for a package and returns a `Map<string, string>`
  * mapping filenames to absolute paths on disk.
  *
- * Handles three types of package resolutions:
- * - Directory packages: fetches the file list from the local directory
- * - Packages with integrity: looks up the index file in the CAFS by integrity hash
- * - Tarball packages: looks up the index file by package directory name
+ * Picks the store key by resolution shape:
+ * - Directory packages: fetches the file list from the local directory.
+ * - Git-hosted tarballs (codeload.github.com / gitlab.com / bitbucket.org):
+ *   keyed by `gitHostedStoreIndexKey(packageId, { built: true })`. The
+ *   lockfile pins their integrity for security, but the cached payload
+ *   depends on whether build scripts ran during fetch (preparePackage), so
+ *   the `built` dimension is part of the key. Folding them under the
+ *   integrity-only key would collapse that distinction.
+ * - npm-registry tarballs with integrity: keyed by
+ *   `storeIndexKey(integrity, packageId)`.
+ * - Other tarball / git resolutions without integrity: keyed by
+ *   `gitHostedStoreIndexKey(packageId, { built: true })`.
  *
  * For CAFS packages, the content-addressed digests are resolved to file
  * paths upfront, so callers get a uniform map regardless of resolution type.

package/lib/index.js

@@ -1,16 +1,23 @@
 import path from 'node:path';
-import { parse } from '@pnpm/deps.path';
 import { fetchFromDir } from '@pnpm/fetching.directory-fetcher';
 import { getFilePathByModeInCafs } from '@pnpm/store.cafs';
-import { gitHostedStoreIndexKey, storeIndexKey } from '@pnpm/store.index';
+import { pickStoreIndexKey } from '@pnpm/store.index';
 /**
  * Reads the file index for a package and returns a `Map<string, string>`
  * mapping filenames to absolute paths on disk.
  *
- * Handles three types of package resolutions:
- * - Directory packages: fetches the file list from the local directory
- * - Packages with integrity: looks up the index file in the CAFS by integrity hash
- * - Tarball packages: looks up the index file by package directory name
+ * Picks the store key by resolution shape:
+ * - Directory packages: fetches the file list from the local directory.
+ * - Git-hosted tarballs (codeload.github.com / gitlab.com / bitbucket.org):
+ *   keyed by `gitHostedStoreIndexKey(packageId, { built: true })`. The
+ *   lockfile pins their integrity for security, but the cached payload
+ *   depends on whether build scripts ran during fetch (preparePackage), so
+ *   the `built` dimension is part of the key. Folding them under the
+ *   integrity-only key would collapse that distinction.
+ * - npm-registry tarballs with integrity: keyed by
+ *   `storeIndexKey(integrity, packageId)`.
+ * - Other tarball / git resolutions without integrity: keyed by
+ *   `gitHostedStoreIndexKey(packageId, { built: true })`.
  *
  * For CAFS packages, the content-addressed digests are resolved to file
  * paths upfront, so callers get a uniform map regardless of resolution type.
@@ -26,17 +33,10 @@ export async function readPackageFileMap(packageResolution, packageId, opts) {
         const localInfo = await fetchFromDir(path.join(opts.lockfileDir, packageResolution.directory), {});
         return localInfo.filesMap;
     }
-    const isPackageWithIntegrity = 'integrity' in packageResolution;
     let pkgIndexFilePath;
-    if (isPackageWithIntegrity) {
-        const parsedId = parse(packageId);
-        pkgIndexFilePath = storeIndexKey(packageResolution.integrity, parsedId.nonSemverVersion ?? `${parsedId.name}@${parsedId.version}`);
-    }
-    else if (!packageResolution.type && 'tarball' in packageResolution && packageResolution.tarball) {
-        pkgIndexFilePath = gitHostedStoreIndexKey(packageId, { built: true });
-    }
-    else if (packageResolution.type === 'git') {
-        pkgIndexFilePath = gitHostedStoreIndexKey(packageId, { built: true });
+    if ((!packageResolution.type && 'tarball' in packageResolution && packageResolution.tarball) ||
+        packageResolution.type === 'git') {
+        pkgIndexFilePath = pickStoreIndexKey(packageResolution, packageId, { built: true });
     }
     else {
         return undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/store.pkg-finder",
-  "version": "1100.0.4",
+  "version": "1100.0.6",
   "description": "Read a package's file map from the content-addressable store",
   "keywords": [
     "pnpm",
@@ -24,14 +24,14 @@
     "!*.map"
   ],
   "dependencies": {
-    "@pnpm/deps.path": "1100.0.1",
-    "@pnpm/fetching.directory-fetcher": "1100.0.4",
-    "@pnpm/store.cafs": "1100.1.0",
-    "@pnpm/resolving.resolver-base": "1100.1.0",
+    "@pnpm/fetching.directory-fetcher": "1100.0.6",
+    "@pnpm/resolving.resolver-base": "1100.1.2",
+    "@pnpm/store.cafs": "1100.1.2",
     "@pnpm/store.index": "1100.0.0"
   },
   "devDependencies": {
-    "@pnpm/store.pkg-finder": "1100.0.4"
+    "@jest/globals": "30.3.0",
+    "@pnpm/store.pkg-finder": "1100.0.6"
   },
   "engines": {
     "node": ">=22.13"