@pnpm/fetching.binary-fetcher 1005.0.3 → 1100.0.0

package/lib/index.d.ts

@@ -1,9 +1,10 @@
-import { type FetchFromRegistry } from '@pnpm/fetching-types';
-import { type BinaryFetcher, type FetchFunction } from '@pnpm/fetcher-base';
+import type { BinaryFetcher, FetchFunction } from '@pnpm/fetching.fetcher-base';
+import type { FetchFromRegistry } from '@pnpm/fetching.types';
+import type { StoreIndex } from '@pnpm/store.index';
 export declare function createBinaryFetcher(ctx: {
     fetch: FetchFromRegistry;
     fetchFromRemoteTarball: FetchFunction;
-    rawConfig: Record<string, string>;
+    storeIndex: StoreIndex;
     offline?: boolean;
 }): {
     binary: BinaryFetcher;

package/lib/index.js

@@ -1,23 +1,16 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createBinaryFetcher = createBinaryFetcher;
-exports.downloadAndUnpackZip = downloadAndUnpackZip;
-const path_1 = __importDefault(require("path"));
-const promises_1 = __importDefault(require("fs/promises"));
-const error_1 = require("@pnpm/error");
-const worker_1 = require("@pnpm/worker");
-const adm_zip_1 = __importDefault(require("adm-zip"));
-const is_subdir_1 = __importDefault(require("is-subdir"));
-const rename_overwrite_1 = __importDefault(require("rename-overwrite"));
-const tempy_1 = __importDefault(require("tempy"));
-const ssri_1 = __importDefault(require("ssri"));
-function createBinaryFetcher(ctx) {
+import fsPromises from 'node:fs/promises';
+import path from 'node:path';
+import { PnpmError } from '@pnpm/error';
+import { addFilesFromDir } from '@pnpm/worker';
+import AdmZip from 'adm-zip';
+import { isSubdir } from 'is-subdir';
+import { renameOverwrite } from 'rename-overwrite';
+import ssri from 'ssri';
+import { temporaryDirectory } from 'tempy';
+export function createBinaryFetcher(ctx) {
     const fetchBinary = async (cafs, resolution, opts) => {
         if (ctx.offline) {
-            throw new error_1.PnpmError('CANNOT_DOWNLOAD_BINARY_OFFLINE', `Cannot download binary "${resolution.url}" because offline mode is enabled.`);
+            throw new PnpmError('CANNOT_DOWNLOAD_BINARY_OFFLINE', `Cannot download binary "${resolution.url}" because offline mode is enabled.`);
         }
         const manifest = {
             name: opts.pkg.name,
@@ -43,17 +36,19 @@ function createBinaryFetcher(ctx) {
                     integrity: resolution.integrity,
                     basename: resolution.prefix ?? '',
                 }, tempLocation);
-                fetchResult = await (0, worker_1.addFilesFromDir)({
+                fetchResult = await addFilesFromDir({
                     storeDir: cafs.storeDir,
+                    storeIndex: ctx.storeIndex,
                     dir: tempLocation,
                     filesIndexFile: opts.filesIndexFile,
                     readManifest: false,
                     appendManifest: manifest,
+                    includeNodeModules: true,
                 });
                 break;
             }
             default: {
-                throw new error_1.PnpmError('NOT_SUPPORTED_ARCHIVE', `The binary fetcher doesn't support archive type ${resolution.archive}`);
+                throw new PnpmError('NOT_SUPPORTED_ARCHIVE', `The binary fetcher doesn't support archive type ${resolution.archive}`);
             }
         }
         return {
@@ -73,8 +68,8 @@ function createBinaryFetcher(ctx) {
  * @param targetDir - Directory where the binary asset should be installed
  * @throws {PnpmError} When integrity verification fails or extraction fails
  */
-async function downloadAndUnpackZip(fetchFromRegistry, assetInfo, targetDir) {
-    const tmp = path_1.default.join(tempy_1.default.directory(), 'pnpm.zip');
+export async function downloadAndUnpackZip(fetchFromRegistry, assetInfo, targetDir) {
+    const tmp = path.join(temporaryDirectory(), 'pnpm.zip');
     try {
         await downloadWithIntegrityCheck(fetchFromRegistry, assetInfo, tmp);
         await extractZipToTarget(tmp, assetInfo.basename, targetDir);
@@ -82,7 +77,7 @@ async function downloadAndUnpackZip(fetchFromRegistry, assetInfo, targetDir) {
     finally {
         // Clean up temporary file
         try {
-            await promises_1.default.unlink(tmp);
+            await fsPromises.unlink(tmp);
         }
         catch {
             // Ignore cleanup errors
@@ -102,16 +97,16 @@ async function downloadWithIntegrityCheck(fetchFromRegistry, { url, integrity },
     const data = Buffer.concat(chunks);
     try {
         // Verify integrity if provided
-        ssri_1.default.checkData(data, integrity, { error: true });
+        ssri.checkData(data, integrity, { error: true });
     }
     catch (err) {
         if (!(err instanceof Error) || !('expected' in err) || !('found' in err)) {
             throw err;
         }
-        throw new error_1.PnpmError('TARBALL_INTEGRITY', `Got unexpected checksum for "${url}". Wanted "${err.expected}". Got "${err.found}".`);
+        throw new PnpmError('TARBALL_INTEGRITY', `Got unexpected checksum for "${url}". Wanted "${err.expected}". Got "${err.found}".`);
     }
     // Write the verified data to file
-    await promises_1.default.writeFile(tmpPath, data);
+    await fsPromises.writeFile(tmpPath, data);
 }
 /**
  * Extracts a zip file to the target directory.
@@ -122,8 +117,8 @@ async function downloadWithIntegrityCheck(fetchFromRegistry, { url, integrity },
  * @throws {PnpmError} When extraction fails or path traversal is detected
  */
 async function extractZipToTarget(zipPath, basename, targetDir) {
-    const zip = new adm_zip_1.default(zipPath);
-    const nodeDir = basename === '' ? targetDir : path_1.default.dirname(targetDir);
+    const zip = new AdmZip(zipPath);
+    const nodeDir = basename === '' ? targetDir : path.dirname(targetDir);
     // Validate basename/prefix doesn't escape the target directory
     if (basename !== '') {
         validatePathSecurity(nodeDir, basename);
@@ -134,8 +129,8 @@ async function extractZipToTarget(zipPath, basename, targetDir) {
         validatePathSecurity(nodeDir, entryPath);
         zip.extractEntryTo(entry, nodeDir, true, true);
     }
-    const extractedDir = path_1.default.join(nodeDir, basename);
-    await (0, rename_overwrite_1.default)(extractedDir, targetDir);
+    const extractedDir = path.join(nodeDir, basename);
+    await renameOverwrite(extractedDir, targetDir);
 }
 /**
  * Validates that a path does not escape the base directory via path traversal.
@@ -146,12 +141,12 @@ async function extractZipToTarget(zipPath, basename, targetDir) {
  */
 function validatePathSecurity(basePath, targetPath) {
     // Explicitly reject absolute paths - they should never be allowed as prefixes or entry names
-    if (path_1.default.isAbsolute(targetPath)) {
-        throw new error_1.PnpmError('PATH_TRAVERSAL', `Refusing to extract path "${targetPath}" - absolute paths are not allowed`);
+    if (path.isAbsolute(targetPath)) {
+        throw new PnpmError('PATH_TRAVERSAL', `Refusing to extract path "${targetPath}" - absolute paths are not allowed`);
     }
-    const normalizedTarget = path_1.default.resolve(basePath, targetPath);
-    if (!(0, is_subdir_1.default)(basePath, normalizedTarget) && normalizedTarget !== basePath) {
-        throw new error_1.PnpmError('PATH_TRAVERSAL', `Refusing to extract path "${targetPath}" outside of target directory`);
+    const normalizedTarget = path.resolve(basePath, targetPath);
+    if (!isSubdir(basePath, normalizedTarget) && normalizedTarget !== basePath) {
+        throw new PnpmError('PATH_TRAVERSAL', `Refusing to extract path "${targetPath}" outside of target directory`);
     }
 }
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@pnpm/fetching.binary-fetcher",
-  "version": "1005.0.3",
+  "version": "1100.0.0",
   "description": "A fetcher for binary archives",
   "keywords": [
     "pnpm",
-    "pnpm10"
+    "pnpm11"
   ],
   "license": "MIT",
   "funding": "https://opencollective.com/pnpm",
@@ -13,7 +13,7 @@
   "bugs": {
     "url": "https://github.com/pnpm/pnpm/issues"
   },
-  "type": "commonjs",
+  "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "exports": {
@@ -25,34 +25,35 @@
   ],
   "dependencies": {
     "adm-zip": "^0.5.16",
-    "is-subdir": "^1.2.0",
-    "rename-overwrite": "^6.0.2",
-    "ssri": "10.0.5",
-    "tempy": "^1.0.1",
-    "@pnpm/fetcher-base": "1001.2.2",
-    "@pnpm/fetching-types": "1000.2.1",
-    "@pnpm/error": "1000.0.5"
+    "is-subdir": "^2.0.0",
+    "rename-overwrite": "^7.0.1",
+    "ssri": "13.0.1",
+    "tempy": "3.0.0",
+    "@pnpm/error": "1100.0.0",
+    "@pnpm/fetching.fetcher-base": "1100.0.0",
+    "@pnpm/fetching.types": "1100.0.0",
+    "@pnpm/store.index": "1100.0.0"
   },
   "peerDependencies": {
-    "@pnpm/worker": "^1000.6.3"
+    "@pnpm/worker": "^1100.0.0"
   },
   "devDependencies": {
-    "@jest/globals": "29.7.0",
+    "@jest/globals": "30.3.0",
     "@types/adm-zip": "^0.5.7",
     "@types/ssri": "^7.1.5",
-    "tempy": "^1.0.1",
-    "@pnpm/fetching.binary-fetcher": "1005.0.3"
+    "tempy": "3.0.0",
+    "@pnpm/fetching.binary-fetcher": "1100.0.0"
   },
   "engines": {
-    "node": ">=18.12"
+    "node": ">=22.13"
   },
   "jest": {
     "preset": "@pnpm/jest-config"
   },
   "scripts": {
-    "_test": "jest",
-    "test": "pnpm run compile && pnpm run _test",
+    "test": "pn compile && pn .test",
     "lint": "eslint \"src/**/*.ts\" \"test/**/*.ts\"",
-    "compile": "tsc --build && pnpm run lint --fix"
+    "compile": "tsgo --build && pn lint --fix",
+    ".test": "cross-env NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules --disable-warning=ExperimentalWarning --disable-warning=DEP0169\" jest"
   }
 }

package/lib/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;AAYA,kDAyDC;AAgBD,oDAkBC;AAvGD,gDAAuB;AACvB,2DAAoC;AACpC,uCAAuC;AAGvC,yCAA8C;AAC9C,sDAA4B;AAC5B,0DAAgC;AAChC,wEAA8C;AAC9C,kDAAyB;AACzB,gDAAuB;AAEvB,SAAgB,mBAAmB,CAAE,GAKpC;IACC,MAAM,WAAW,GAAkB,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE;QAClE,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YAChB,MAAM,IAAI,iBAAS,CAAC,gCAAgC,EAAE,2BAA2B,UAAU,CAAC,GAAG,oCAAoC,CAAC,CAAA;QACtI,CAAC;QAED,MAAM,QAAQ,GAAG;YACf,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,IAAK;YACpB,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,OAAQ;YAC1B,GAAG,EAAE,UAAU,CAAC,GAAG;SACpB,CAAA;QAED,IAAI,WAAyB,CAAA;QAC7B,QAAQ,UAAU,CAAC,OAAO,EAAE,CAAC;YAC7B,KAAK,SAAS,CAAC,CAAC,CAAC;gBACf,WAAW,GAAG,MAAM,GAAG,CAAC,sBAAsB,CAAC,IAAI,EAAE;oBACnD,OAAO,EAAE,UAAU,CAAC,GAAG;oBACvB,SAAS,EAAE,UAAU,CAAC,SAAS;iBAChC,EAAE;oBACD,cAAc,EAAE,QAAQ;oBACxB,GAAG,IAAI;iBACR,CAAC,CAAA;gBACF,MAAK;YACP,CAAC;YACD,KAAK,KAAK,CAAC,CAAC,CAAC;gBACX,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;gBACzC,MAAM,oBAAoB,CAAC,GAAG,CAAC,KAAK,EAAE;oBACpC,GAAG,EAAE,UAAU,CAAC,GAAG;oBACnB,SAAS,EAAE,UAAU,CAAC,SAAS;oBAC/B,QAAQ,EAAE,UAAU,CAAC,MAAM,IAAI,EAAE;iBAClC,EAAE,YAAY,CAAC,CAAA;gBAChB,WAAW,GAAG,MAAM,IAAA,wBAAe,EAAC;oBAClC,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,GAAG,EAAE,YAAY;oBACjB,cAAc,EAAE,IAAI,CAAC,cAAc;oBACnC,YAAY,EAAE,KAAK;oBACnB,cAAc,EAAE,QAAQ;iBACzB,CAAC,CAAA;gBACF,MAAK;YACP,CAAC;YACD,OAAO,CAAC,CAAC,CAAC;gBACR,MAAM,IAAI,iBAAS,CAAC,uBAAuB,EAAE,mDAAmD,UAAU,CAAC,OAAiB,EAAE,CAAC,CAAA;YACjI,CAAC;QACD,CAAC;QACD,OAAO;YACL,GAAG,WAAW;YACd,QAAQ;SACT,CAAA;IACH,CAAC,CAAA;IACD,OAAO;QACL,MAAM,EAAE,WAAW;KACpB,CAAA;AACH,CAAC;AAQD;;;;;;;GAOG;AACI,KAAK,UAAU,oBAAoB,CACxC,iBAAoC,EACpC,SAAoB,EACpB,SAAiB;IAEjB,MAAM,GAAG,GAAG,cAAI,CAAC,IAAI,CAAC,eAAK,CAAC,SAAS,EAAE,EAAE,UAAU,CAAC,CAAA;IAEpD,IAAI,CAAC;QACH,MAAM,0BAA0B,CAAC,iBAAiB,EAAE,SAAS,EAAE,GAAG,CAAC,CAAA;QACnE,MAAM,kBAAkB,CAAC,GAAG,EAAE,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;IAC9D,CAAC;YAAS,CAAC;QACT,0BAA0B;QAC1B,IAAI,CAAC;YACH,MAAM,kBAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QAC9B,CAAC;QAAC,MAAM,CAAC;YACP,wBAAwB;QAC1B,CAAC;IACH,CAAC;AACH,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,0BAA0B,CACvC,iBAAoC,EACpC,EAAE,GAAG,EAAE,SAAS,EAAa,EAC7B,OAAe;IAEf,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,GAAG,CAAC,CAAA;IAE7C,uCAAuC;IACvC,MAAM,MAAM,GAAa,EAAE,CAAA;IAC3B,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,QAAQ,CAAC,IAAK,EAAE,CAAC;QACzC,MAAM,CAAC,IAAI,CAAC,KAAe,CAAC,CAAA;IAC9B,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IAElC,IAAI,CAAC;QACH,+BAA+B;QAC/B,cAAI,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;IAClD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,CAAC,GAAG,YAAY,KAAK,CAAC,IAAI,CAAC,CAAC,UAAU,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,IAAI,GAAG,CAAC,EAAE,CAAC;YACzE,MAAM,GAAG,CAAA;QACX,CAAC;QACD,MAAM,IAAI,iBAAS,CAAC,mBAAmB,EAAE,gCAAgC,GAAG,cAAc,GAAG,CAAC,QAAkB,WAAW,GAAG,CAAC,KAAe,IAAI,CAAC,CAAA;IACrJ,CAAC;IAED,kCAAkC;IAClC,MAAM,kBAAU,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;AAC3C,CAAC;AAED;;;;;;;GAOG;AACH,KAAK,UAAU,kBAAkB,CAC/B,OAAe,EACf,QAAgB,EAChB,SAAiB;IAEjB,MAAM,GAAG,GAAG,IAAI,iBAAM,CAAC,OAAO,CAAC,CAAA;IAC/B,MAAM,OAAO,GAAG,QAAQ,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;IAErE,+DAA+D;IAC/D,IAAI,QAAQ,KAAK,EAAE,EAAE,CAAC;QACpB,oBAAoB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IACzC,CAAC;IAED,4EAA4E;IAC5E,KAAK,MAAM,KAAK,IAAI,GAAG,CAAC,UAAU,EAAE,EAAE,CAAC;QACrC,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,CAAA;QACjC,oBAAoB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;QACxC,GAAG,CAAC,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;IAChD,CAAC;IAED,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IACjD,MAAM,IAAA,0BAAe,EAAC,YAAY,EAAE,SAAS,CAAC,CAAA;AAChD,CAAC;AAED;;;;;;GAMG;AACH,SAAS,oBAAoB,CAAE,QAAgB,EAAE,UAAkB;IACjE,6FAA6F;IAC7F,IAAI,cAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAChC,MAAM,IAAI,iBAAS,CAAC,gBAAgB,EAClC,6BAA6B,UAAU,oCAAoC,CAAC,CAAA;IAChF,CAAC;IACD,MAAM,gBAAgB,GAAG,cAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAA;IAC3D,IAAI,CAAC,IAAA,mBAAQ,EAAC,QAAQ,EAAE,gBAAgB,CAAC,IAAI,gBAAgB,KAAK,QAAQ,EAAE,CAAC;QAC3E,MAAM,IAAI,iBAAS,CAAC,gBAAgB,EAClC,6BAA6B,UAAU,+BAA+B,CAAC,CAAA;IAC3E,CAAC;AACH,CAAC"}