@pnpm/store.controller 1004.0.0 → 1100.0.1

package/lib/storeController/index.js

@@ -8,7 +8,7 @@ export {};
 export function createPackageStore(resolve, fetchers, initOpts) {
     const storeDir = initOpts.storeDir;
     if (!fs.existsSync(path.join(storeDir, 'files'))) {
-        initStoreDir(storeDir).catch();
+        initStoreDir(storeDir).catch(() => { });
     }
     const cafs = createCafsStore(storeDir, {
         cafsLocker: initOpts.cafsLocker,

package/lib/storeController/projectRegistry.js

@@ -5,7 +5,7 @@ import { createShortHash } from '@pnpm/crypto.hash';
 import { PnpmError } from '@pnpm/error';
 import { globalInfo } from '@pnpm/logger';
 import { isSubdir } from 'is-subdir';
-import symlinkDir from 'symlink-dir';
+import { symlinkDir } from 'symlink-dir';
 const PROJECTS_DIR = 'projects';
 export function getProjectsRegistryDir(storeDir) {
     return path.join(storeDir, PROJECTS_DIR);

package/lib/storeController/prune.js

@@ -3,6 +3,7 @@ import path from 'node:path';
 import util from 'node:util';
 import { globalInfo, globalWarn } from '@pnpm/logger';
 import { rimraf } from '@zkochan/rimraf';
+import prettyBytes from 'pretty-bytes';
 import { pruneGlobalVirtualStore } from './pruneGlobalVirtualStore.js';
 const BIG_ONE = BigInt(1);
 export async function prune({ cacheDir, storeDir, storeIndex }, removeAlienFiles) {
@@ -11,9 +12,10 @@ export async function prune({ cacheDir, storeDir, storeIndex }, removeAlienFiles
     // the virtual store will reduce hard link counts on files in the CAS
     await pruneGlobalVirtualStore(storeDir);
     // 2. Clean up metadata cache
+    // Metadata dirs may be at top level (legacy metadata-*) or under a version prefix (v11/metadata*)
     const metadataDirs = await getSubdirsSafely(cacheDir);
     await Promise.all(metadataDirs.map(async (metadataDir) => {
-        if (!metadataDir.startsWith('metadata'))
+        if (!metadataDir.startsWith('metadata') && !/^v\d+$/.test(metadataDir))
             return;
         try {
             await rimraf(path.join(cacheDir, metadataDir));
@@ -31,6 +33,7 @@ export async function prune({ cacheDir, storeDir, storeIndex }, removeAlienFiles
     const removedHashes = new Set();
     const dirs = await getSubdirsSafely(cafsDir);
     let fileCounter = 0;
+    let totalSize = 0;
     await Promise.all(dirs.map(async (dir) => {
         const subdir = path.join(cafsDir, dir);
         await Promise.all((await fs.readdir(subdir)).map(async (fileName) => {
@@ -49,6 +52,7 @@ export async function prune({ cacheDir, storeDir, storeIndex }, removeAlienFiles
                 }
             }
             if (stat.nlink === 1 || stat.nlink === BIG_ONE) {
+                totalSize += stat.size;
                 await fs.unlink(filePath);
                 fileCounter++;
                 // Store the hex digest, which matches the format stored in PackageFileInfo.digest
@@ -57,7 +61,7 @@ export async function prune({ cacheDir, storeDir, storeIndex }, removeAlienFiles
             }
         }));
     }));
-    globalInfo(`Removed ${fileCounter} file${fileCounter === 1 ? '' : 's'}`);
+    globalInfo(`Removed ${fileCounter} file${fileCounter === 1 ? '' : 's'} (${prettyBytes(totalSize)})`);
     // 4. Clean up orphaned package index entries
     let pkgCounter = 0;
     const toDelete = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/store.controller",
-  "version": "1004.0.0",
+  "version": "1100.0.1",
   "description": "A storage for packages",
   "keywords": [
     "pnpm",
@@ -36,33 +36,34 @@
   "dependencies": {
     "@zkochan/rimraf": "^4.0.0",
     "is-subdir": "^2.0.0",
+    "pretty-bytes": "^7.1.0",
     "ramda": "npm:@pnpm/ramda@0.28.1",
-    "ssri": "13.0.0",
-    "symlink-dir": "^7.0.0",
-    "@pnpm/fetching.fetcher-base": "1001.0.2",
-    "@pnpm/error": "1000.0.5",
-    "@pnpm/installing.package-requester": "1008.0.0",
-    "@pnpm/hooks.types": "1001.0.12",
-    "@pnpm/resolving.resolver-base": "1005.1.0",
-    "@pnpm/store.cafs": "1000.0.19",
-    "@pnpm/store.controller-types": "1004.1.0",
-    "@pnpm/store.create-cafs-store": "1000.0.20",
-    "@pnpm/store.index": "1000.0.0-0",
-    "@pnpm/crypto.hash": "1000.2.1",
-    "@pnpm/types": "1000.9.0"
+    "ssri": "13.0.1",
+    "symlink-dir": "^10.0.1",
+    "@pnpm/crypto.hash": "1100.0.0",
+    "@pnpm/installing.package-requester": "1100.0.1",
+    "@pnpm/error": "1100.0.0",
+    "@pnpm/resolving.resolver-base": "1100.0.1",
+    "@pnpm/hooks.types": "1100.0.1",
+    "@pnpm/store.cafs": "1100.0.1",
+    "@pnpm/fetching.fetcher-base": "1100.0.1",
+    "@pnpm/store.controller-types": "1100.0.1",
+    "@pnpm/types": "1101.0.0",
+    "@pnpm/store.index": "1100.0.0",
+    "@pnpm/store.create-cafs-store": "1100.0.1"
   },
   "peerDependencies": {
     "@pnpm/logger": ">=1001.0.0 <1002.0.0",
-    "@pnpm/worker": "^1000.3.0"
+    "@pnpm/worker": "^1100.0.1"
   },
   "devDependencies": {
-    "@types/ramda": "0.29.12",
+    "@types/ramda": "0.31.1",
     "@types/ssri": "^7.1.5",
     "tempy": "3.0.0",
-    "@pnpm/installing.client": "1001.1.4",
-    "@pnpm/logger": "1001.0.1",
-    "@pnpm/store.controller": "1004.0.0",
-    "@pnpm/prepare": "1000.0.4"
+    "@pnpm/installing.client": "1100.0.1",
+    "@pnpm/logger": "1100.0.0",
+    "@pnpm/prepare": "1100.0.1",
+    "@pnpm/store.controller": "1100.0.1"
   },
   "engines": {
     "node": ">=22.13"
@@ -75,8 +76,8 @@
     "fix": "tslint -c tslint.json src/**/*.ts test/**/*.ts --fix",
     "lint": "eslint \"src/**/*.ts\" \"test/**/*.ts\"",
     "pretest": "rimraf .tmp",
-    "_test": "pnpm pretest && cross-env NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules --disable-warning=ExperimentalWarning --disable-warning=DEP0169\" jest",
-    "test": "pnpm run compile && pnpm run _test",
-    "compile": "tsgo --build && pnpm run lint --fix"
+    "test": "pn compile && pn .test",
+    "compile": "tsgo --build && pn lint --fix",
+    ".test": "pn pretest && cross-env NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules --disable-warning=ExperimentalWarning --disable-warning=DEP0169\" jest"
   }
 }