@pnpm/resolving.npm-resolver 1102.1.1 → 1102.1.2

package/lib/fetch.d.ts

@@ -3,7 +3,14 @@ import type { FetchFromRegistry, RetryTimeoutOptions } from '@pnpm/fetching.type
 import type { PackageMeta } from '@pnpm/resolving.registry.types';
 export interface FetchMetadataResult {
     meta: PackageMeta;
-    jsonText: string;
+    /**
+     * The raw registry response body, used only to mirror the response to disk
+     * without re-serializing `meta`. A fresh fetch always sets it, but it
+     * reaches only the caller that initiated the request: the phase-long memo
+     * cache holds a body-less clone (see memoizeFetchMetadata.ts), so cache
+     * hits see `undefined` and the cache never pins the body.
+     */
+    jsonText: string | undefined;
     etag?: string;
     notModified?: false;
 }

package/lib/index.js

@@ -8,12 +8,12 @@ import { readPkgFromCafs, } from '@pnpm/worker';
 import { resolveWorkspaceRange } from '@pnpm/workspace.range-resolver';
 import { LRUCache } from 'lru-cache';
 import normalize from 'normalize-path';
-import pMemoize, { pMemoizeClear } from 'p-memoize';
 import { clone } from 'ramda';
 import semver from 'semver';
 import ssri from 'ssri';
 import versionSelectorType from 'version-selector-type';
 import { fetchMetadataFromFromRegistry, RegistryResponseError } from './fetch.js';
+import { memoizeFetchMetadata } from './memoizeFetchMetadata.js';
 import { normalizeRegistryUrl } from './normalizeRegistryUrl.js';
 import { BUILTIN_NAMED_REGISTRIES, parseBareSpecifier, parseJsrSpecifierToRegistryPackageSpec, parseNamedRegistrySpecifierToRegistryPackageSpec, } from './parseBareSpecifier.js';
 import { pickPackage, } from './pickPackage.js';
@@ -75,9 +75,7 @@ export function createNpmResolver(fetchFromRegistry, getAuthHeader, opts) {
         timeout: opts.timeout ?? 60000,
         fetchWarnTimeoutMs: opts.fetchWarnTimeoutMs ?? 10 * 1000, // 10 sec
     };
-    const fetch = pMemoize(fetchMetadataFromFromRegistry.bind(null, fetchOpts), {
-        cacheKey: (...args) => JSON.stringify(args),
-    });
+    const { fetch, clear: clearFetchCache } = memoizeFetchMetadata(fetchMetadataFromFromRegistry.bind(null, fetchOpts));
     // Track ownership so `clearCache()` below only wipes the in-memory
     // cache when this factory created it. A caller-supplied
     // `opts.metaCache` may be shared with another resolver instance (or
@@ -149,7 +147,7 @@ export function createNpmResolver(fetchFromRegistry, getAuthHeader, opts) {
             if (ownsMetaCache && 'clear' in metaCache && typeof metaCache.clear === 'function') {
                 metaCache.clear();
             }
-            pMemoizeClear(fetch);
+            clearFetchCache();
         },
     };
 }

package/lib/memoizeFetchMetadata.d.ts

@@ -0,0 +1,24 @@
+import type { FetchMetadataNotModifiedResult, FetchMetadataOptions, FetchMetadataResult } from './fetch.js';
+export type FetchMetadata = (pkgName: string, opts: FetchMetadataOptions) => Promise<FetchMetadataResult | FetchMetadataNotModifiedResult>;
+export interface MemoizedFetchMetadata {
+    fetch: FetchMetadata;
+    clear: () => void;
+}
+/**
+ * Memoizes metadata fetches for the whole resolution phase (cleared via
+ * `clear`, see `clearResolutionCache`), deduplicating concurrent and repeat
+ * requests for the same package.
+ *
+ * Unlike plain memoization, the cache holds a body-less clone of each result:
+ * `jsonText` — the raw registry response body, up to tens of MB for a popular
+ * package — reaches only the caller that initiated the fetch, which is the
+ * caller that writes the disk mirror. A phase-long cache that kept the bodies
+ * would pin hundreds of MB on large cold-cache graphs. A cache-hit caller
+ * that also writes the mirror falls back to `JSON.stringify(meta)` in
+ * `prepareJsonForDisk`, which is equivalent on read: `loadMeta` re-derives
+ * `etag` from the headers line.
+ *
+ * A rejected fetch is evicted so a transient network failure is retried by
+ * the next request instead of being cached for the rest of the phase.
+ */
+export declare function memoizeFetchMetadata(fetch: FetchMetadata): MemoizedFetchMetadata;

package/lib/memoizeFetchMetadata.js

@@ -0,0 +1,37 @@
+/**
+ * Memoizes metadata fetches for the whole resolution phase (cleared via
+ * `clear`, see `clearResolutionCache`), deduplicating concurrent and repeat
+ * requests for the same package.
+ *
+ * Unlike plain memoization, the cache holds a body-less clone of each result:
+ * `jsonText` — the raw registry response body, up to tens of MB for a popular
+ * package — reaches only the caller that initiated the fetch, which is the
+ * caller that writes the disk mirror. A phase-long cache that kept the bodies
+ * would pin hundreds of MB on large cold-cache graphs. A cache-hit caller
+ * that also writes the mirror falls back to `JSON.stringify(meta)` in
+ * `prepareJsonForDisk`, which is equivalent on read: `loadMeta` re-derives
+ * `etag` from the headers line.
+ *
+ * A rejected fetch is evicted so a transient network failure is retried by
+ * the next request instead of being cached for the rest of the phase.
+ */
+export function memoizeFetchMetadata(fetch) {
+    const cache = new Map();
+    return {
+        fetch: (pkgName, opts) => {
+            const key = JSON.stringify([pkgName, opts]);
+            const cached = cache.get(key);
+            if (cached != null)
+                return cached;
+            const pending = fetch(pkgName, opts);
+            const bodiless = pending.then((result) => result.notModified ? result : { ...result, jsonText: undefined });
+            bodiless.catch(() => cache.delete(key));
+            cache.set(key, bodiless);
+            return pending;
+        },
+        clear: () => {
+            cache.clear();
+        },
+    };
+}
+//# sourceMappingURL=memoizeFetchMetadata.js.map

package/lib/pickPackage.js

@@ -344,7 +344,7 @@ export async function pickPackage(ctx, spec, opts) {
                 if (!isModifiedValid || modifiedDate > opts.publishedBy) {
                     // Save the abbreviated metadata to the abbreviated cache before re-fetching full.
                     if (!opts.dryRun) {
-                        const abbreviatedJson = prepareJsonForDisk(fetchResult.meta, fetchResult.etag, fetchResult.jsonText);
+                        const abbreviatedJson = prepareJsonForDisk(resultToSave.meta, resultToSave.etag, resultToSave.jsonText);
                         // Fire-and-forget save to the abbreviated cache path (pkgMirror).
                         runLimited(pkgMirror, (limit) => limit(async () => {
                             try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/resolving.npm-resolver",
-  "version": "1102.1.1",
+  "version": "1102.1.2",
   "description": "Resolver for npm-hosted packages",
   "keywords": [
     "pnpm",
@@ -34,7 +34,6 @@
     "lru-cache": "^11.5.0",
     "normalize-path": "^3.0.0",
     "p-limit": "^7.3.0",
-    "p-memoize": "8.0.0",
     "parse-npm-tarball-url": "^5.0.0",
     "path-temp": "^3.0.0",
     "ramda": "npm:@pnpm/ramda@0.28.1",
@@ -45,22 +44,22 @@
     "validate-npm-package-name": "7.0.2",
     "version-selector-type": "^3.0.0",
     "@pnpm/config.pick-registry-for-package": "1100.0.9",
-    "@pnpm/config.version-policy": "1100.1.6",
-    "@pnpm/constants": "1100.0.0",
-    "@pnpm/core-loggers": "1100.2.1",
     "@pnpm/crypto.hash": "1100.0.1",
     "@pnpm/error": "1100.0.1",
+    "@pnpm/config.version-policy": "1100.1.6",
     "@pnpm/fetching.types": "1100.0.2",
-    "@pnpm/fs.graceful-fs": "1100.1.0",
     "@pnpm/resolving.registry.pkg-metadata-filter": "1100.0.9",
-    "@pnpm/resolving.jsr-specifier-parser": "1100.0.2",
     "@pnpm/resolving.registry.types": "1100.1.3",
-    "@pnpm/store.cafs": "1100.1.12",
+    "@pnpm/resolving.jsr-specifier-parser": "1100.0.2",
     "@pnpm/resolving.resolver-base": "1100.5.1",
-    "@pnpm/store.index": "1100.2.1",
     "@pnpm/types": "1101.3.2",
+    "@pnpm/fs.graceful-fs": "1100.1.0",
     "@pnpm/workspace.range-resolver": "1100.0.2",
-    "@pnpm/workspace.spec-parser": "1100.0.0"
+    "@pnpm/store.index": "1100.2.1",
+    "@pnpm/workspace.spec-parser": "1100.0.0",
+    "@pnpm/store.cafs": "1100.1.12",
+    "@pnpm/core-loggers": "1100.2.1",
+    "@pnpm/constants": "1100.0.0"
   },
   "peerDependencies": {
     "@pnpm/logger": "^1100.0.0",
@@ -75,11 +74,11 @@
     "@types/validate-npm-package-name": "^4.0.2",
     "load-json-file": "^7.0.1",
     "tempy": "3.0.0",
-    "@pnpm/logger": "1100.0.0",
-    "@pnpm/resolving.npm-resolver": "1102.1.1",
+    "@pnpm/resolving.npm-resolver": "1102.1.2",
     "@pnpm/test-fixtures": "1100.0.0",
-    "@pnpm/network.fetch": "1100.1.4",
-    "@pnpm/testing.mock-agent": "1101.0.4"
+    "@pnpm/logger": "1100.0.0",
+    "@pnpm/testing.mock-agent": "1101.0.4",
+    "@pnpm/network.fetch": "1100.1.4"
   },
   "engines": {
     "node": ">=22.13"