pnpm 7.30.5 → 7.31.0

package/LICENSE

@@ -1,7 +1,7 @@
 The MIT License (MIT)
 
 Copyright (c) 2015-2016 Rico Sta. Cruz and other contributors
-Copyright (c) 2016-2021 Zoltan Kochan and other contributors
+Copyright (c) 2016-2023 Zoltan Kochan and other contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/node_modules/.modules.yaml

@@ -204,7 +204,7 @@ packageManager: pnpm@7.24.2
 pendingBuilds:
   - /node-gyp/9.3.1
   - /encoding/0.1.13
-prunedAt: Mon, 27 Mar 2023 13:41:59 GMT
+prunedAt: Tue, 04 Apr 2023 00:30:21 GMT
 publicHoistPattern:
   - '*eslint*'
   - '*prettier*'

package/dist/pnpm.cjs

@@ -3244,7 +3244,7 @@ var require_lib4 = __commonJS({
     var load_json_file_1 = __importDefault3(require_load_json_file());
     var defaultManifest = {
       name: true ? "pnpm" : "pnpm",
-      version: true ? "7.30.5" : "0.0.0"
+      version: true ? "7.31.0" : "0.0.0"
     };
     var pkgJson;
     if (require.main == null) {
@@ -26209,6 +26209,7 @@ var require_lib21 = __commonJS({
       "ignore-dep-scripts": Boolean,
       "ignore-pnpmfile": Boolean,
       "ignore-workspace": Boolean,
+      "ignore-workspace-cycles": Boolean,
       "ignore-workspace-root-check": Boolean,
       "include-workspace-root": Boolean,
       "legacy-dir-filtering": Boolean,
@@ -26328,6 +26329,7 @@ var require_lib21 = __commonJS({
         "git-branch-lockfile": false,
         hoist: true,
         "hoist-pattern": ["*"],
+        "ignore-workspace-cycles": false,
         "ignore-workspace-root-check": false,
         "link-workspace-packages": true,
         "lockfile-include-tarball-url": false,
@@ -41357,8 +41359,8 @@ You can run ${highlight("pnpm install --force")} to refetch the modified package
       };
     }
     function formatRecursiveCommandSummary(msg) {
-      const output = constants_1.EOL + `Summary: ${chalk_1.default.red(`${msg.fails.length} fails`)}, ${msg.passes} passes` + constants_1.EOL + constants_1.EOL + msg.fails.map((fail) => {
-        return fail.prefix + ":" + constants_1.EOL + formatErrorSummary(fail.message);
+      const output = constants_1.EOL + `Summary: ${chalk_1.default.red(`${msg.failures.length} fails`)}, ${msg.passes} passes` + constants_1.EOL + constants_1.EOL + msg.failures.map(({ message: message2, prefix }) => {
+        return prefix + ":" + constants_1.EOL + formatErrorSummary(message2);
       }).join(constants_1.EOL + constants_1.EOL);
       return {
         title: "",
@@ -54127,6 +54129,8 @@ var require_lib32 = __commonJS({
     function createPkgGraph(pkgs, opts) {
       const pkgMap = createPkgMap(pkgs);
       const pkgMapValues = Object.values(pkgMap);
+      let pkgMapByManifestName;
+      let pkgMapByDir;
       const unmatched = [];
       const graph = (0, map_1.default)((pkg) => ({
         dependencies: createNode(pkg),
@@ -54154,16 +54158,24 @@ var require_lib32 = __commonJS({
             return "";
           }
           if (spec.type === "directory") {
+            pkgMapByDir ?? (pkgMapByDir = getPkgMapByDir(pkgMapValues));
+            const resolvedPath = path_1.default.resolve(pkg.dir, spec.fetchSpec);
+            const found = pkgMapByDir[resolvedPath];
+            if (found) {
+              return found.dir;
+            }
             const matchedPkg2 = pkgMapValues.find((pkg2) => path_1.default.relative(pkg2.dir, spec.fetchSpec) === "");
             if (matchedPkg2 == null) {
               return "";
             }
+            pkgMapByDir[resolvedPath] = matchedPkg2;
             return matchedPkg2.dir;
           }
           if (spec.type !== "version" && spec.type !== "range")
             return "";
-          const pkgs2 = pkgMapValues.filter((pkg2) => pkg2.manifest.name === depName);
-          if (pkgs2.length === 0)
+          pkgMapByManifestName ?? (pkgMapByManifestName = getPkgMapByManifestName(pkgMapValues));
+          const pkgs2 = pkgMapByManifestName[depName];
+          if (!pkgs2 || pkgs2.length === 0)
             return "";
           const versions = pkgs2.filter(({ manifest }) => manifest.version).map((pkg2) => pkg2.manifest.version);
           const strictWorkspaceMatching = opts?.linkWorkspacePackages === false && !isWorkspaceSpec;
@@ -54197,6 +54209,23 @@ var require_lib32 = __commonJS({
       }
       return pkgMap;
     }
+    function getPkgMapByManifestName(pkgMapValues) {
+      var _a;
+      const pkgMapByManifestName = {};
+      for (const pkg of pkgMapValues) {
+        if (pkg.manifest.name) {
+          (pkgMapByManifestName[_a = pkg.manifest.name] ?? (pkgMapByManifestName[_a] = [])).push(pkg);
+        }
+      }
+      return pkgMapByManifestName;
+    }
+    function getPkgMapByDir(pkgMapValues) {
+      const pkgMapByDir = {};
+      for (const pkg of pkgMapValues) {
+        pkgMapByDir[path_1.default.resolve(pkg.dir)] = pkg;
+      }
+      return pkgMapByDir;
+    }
   }
 });
 
@@ -83417,9 +83446,9 @@ var require_localTarballFetcher = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@pnpm+npm-lifecycle@2.0.0(typanion@3.12.1)/node_modules/@pnpm/npm-lifecycle/lib/spawn.js
+// ../node_modules/.pnpm/@pnpm+npm-lifecycle@2.0.1(typanion@3.12.1)/node_modules/@pnpm/npm-lifecycle/lib/spawn.js
 var require_spawn = __commonJS({
-  "../node_modules/.pnpm/@pnpm+npm-lifecycle@2.0.0(typanion@3.12.1)/node_modules/@pnpm/npm-lifecycle/lib/spawn.js"(exports2, module2) {
+  "../node_modules/.pnpm/@pnpm+npm-lifecycle@2.0.1(typanion@3.12.1)/node_modules/@pnpm/npm-lifecycle/lib/spawn.js"(exports2, module2) {
     "use strict";
     module2.exports = spawn;
     var _spawn = require("child_process").spawn;
@@ -97725,9 +97754,9 @@ var require_source2 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@yarnpkg+shell@3.2.0-rc.8(typanion@3.12.1)/node_modules/@yarnpkg/shell/lib/errors.js
+// ../node_modules/.pnpm/@yarnpkg+shell@3.2.5(typanion@3.12.1)/node_modules/@yarnpkg/shell/lib/errors.js
 var require_errors3 = __commonJS({
-  "../node_modules/.pnpm/@yarnpkg+shell@3.2.0-rc.8(typanion@3.12.1)/node_modules/@yarnpkg/shell/lib/errors.js"(exports2) {
+  "../node_modules/.pnpm/@yarnpkg+shell@3.2.5(typanion@3.12.1)/node_modules/@yarnpkg/shell/lib/errors.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.ShellError = void 0;
@@ -97741,17 +97770,17 @@ var require_errors3 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@yarnpkg+shell@3.2.0-rc.8(typanion@3.12.1)/node_modules/@yarnpkg/shell/lib/globUtils.js
+// ../node_modules/.pnpm/@yarnpkg+shell@3.2.5(typanion@3.12.1)/node_modules/@yarnpkg/shell/lib/globUtils.js
 var require_globUtils = __commonJS({
-  "../node_modules/.pnpm/@yarnpkg+shell@3.2.0-rc.8(typanion@3.12.1)/node_modules/@yarnpkg/shell/lib/globUtils.js"(exports2) {
+  "../node_modules/.pnpm/@yarnpkg+shell@3.2.5(typanion@3.12.1)/node_modules/@yarnpkg/shell/lib/globUtils.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.isBraceExpansion = exports2.match = exports2.isGlobPattern = exports2.fastGlobOptions = exports2.micromatchOptions = void 0;
     var tslib_12 = (init_tslib_es6(), __toCommonJS(tslib_es6_exports));
     var fslib_12 = require_lib49();
-    var fast_glob_1 = (0, tslib_12.__importDefault)(require_out4());
-    var fs_1 = (0, tslib_12.__importDefault)(require("fs"));
-    var micromatch_12 = (0, tslib_12.__importDefault)(require_micromatch());
+    var fast_glob_1 = tslib_12.__importDefault(require_out4());
+    var fs_1 = tslib_12.__importDefault(require("fs"));
+    var micromatch_12 = tslib_12.__importDefault(require_micromatch());
     exports2.micromatchOptions = {
       // This is required because we don't want ")/*" to be a valid shell glob pattern.
       strictBrackets: true
@@ -97786,14 +97815,14 @@ var require_globUtils = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@yarnpkg+shell@3.2.0-rc.8(typanion@3.12.1)/node_modules/@yarnpkg/shell/lib/pipe.js
+// ../node_modules/.pnpm/@yarnpkg+shell@3.2.5(typanion@3.12.1)/node_modules/@yarnpkg/shell/lib/pipe.js
 var require_pipe2 = __commonJS({
-  "../node_modules/.pnpm/@yarnpkg+shell@3.2.0-rc.8(typanion@3.12.1)/node_modules/@yarnpkg/shell/lib/pipe.js"(exports2) {
+  "../node_modules/.pnpm/@yarnpkg+shell@3.2.5(typanion@3.12.1)/node_modules/@yarnpkg/shell/lib/pipe.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.createOutputStreamsWithPrefix = exports2.start = exports2.Handle = exports2.ProtectedStream = exports2.makeBuiltin = exports2.makeProcess = exports2.Pipe = void 0;
     var tslib_12 = (init_tslib_es6(), __toCommonJS(tslib_es6_exports));
-    var cross_spawn_1 = (0, tslib_12.__importDefault)(require_cross_spawn());
+    var cross_spawn_1 = tslib_12.__importDefault(require_cross_spawn());
     var stream_12 = require("stream");
     var string_decoder_1 = require("string_decoder");
     var Pipe;
@@ -97864,7 +97893,7 @@ var require_pipe2 = __commonJS({
                   break;
               }
             });
-            child.on(`exit`, (code) => {
+            child.on(`close`, (code) => {
               activeChildren.delete(child);
               if (activeChildren.size === 0) {
                 process.off(`SIGINT`, sigintHandler);
@@ -97929,6 +97958,13 @@ var require_pipe2 = __commonJS({
       }
     };
     var Handle = class {
+      static start(implementation, { stdin, stdout, stderr }) {
+        const chain = new Handle(null, implementation);
+        chain.stdin = stdin;
+        chain.stdout = stdout;
+        chain.stderr = stderr;
+        return chain;
+      }
       constructor(ancestor, implementation) {
         this.stdin = null;
         this.stdout = null;
@@ -97937,13 +97973,6 @@ var require_pipe2 = __commonJS({
         this.ancestor = ancestor;
         this.implementation = implementation;
       }
-      static start(implementation, { stdin, stdout, stderr }) {
-        const chain = new Handle(null, implementation);
-        chain.stdin = stdin;
-        chain.stdout = stdout;
-        chain.stderr = stderr;
-        return chain;
-      }
       pipeTo(implementation, source = Pipe.STDOUT) {
         const next = new Handle(this, implementation);
         const pipe = new PipeStream();
@@ -98022,8 +98051,8 @@ var require_pipe2 = __commonJS({
           lineIndex = chunkStr.indexOf(`
 `);
           if (lineIndex !== -1) {
-            const line = buffer + chunkStr.substr(0, lineIndex);
-            chunkStr = chunkStr.substr(lineIndex + 1);
+            const line = buffer + chunkStr.substring(0, lineIndex);
+            chunkStr = chunkStr.substring(lineIndex + 1);
             buffer = ``;
             if (prefix !== null) {
               reportFn(`${prefix} ${line}`);
@@ -98058,16 +98087,16 @@ var require_pipe2 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@yarnpkg+shell@3.2.0-rc.8(typanion@3.12.1)/node_modules/@yarnpkg/shell/lib/index.js
+// ../node_modules/.pnpm/@yarnpkg+shell@3.2.5(typanion@3.12.1)/node_modules/@yarnpkg/shell/lib/index.js
 var require_lib51 = __commonJS({
-  "../node_modules/.pnpm/@yarnpkg+shell@3.2.0-rc.8(typanion@3.12.1)/node_modules/@yarnpkg/shell/lib/index.js"(exports2) {
+  "../node_modules/.pnpm/@yarnpkg+shell@3.2.5(typanion@3.12.1)/node_modules/@yarnpkg/shell/lib/index.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.execute = exports2.ShellError = exports2.globUtils = void 0;
     var tslib_12 = (init_tslib_es6(), __toCommonJS(tslib_es6_exports));
     var fslib_12 = require_lib49();
     var parsers_1 = require_lib50();
-    var chalk_1 = (0, tslib_12.__importDefault)(require_source2());
+    var chalk_1 = tslib_12.__importDefault(require_source2());
     var os_1 = require("os");
     var stream_12 = require("stream");
     var util_1 = require("util");
@@ -98075,7 +98104,7 @@ var require_lib51 = __commonJS({
     Object.defineProperty(exports2, "ShellError", { enumerable: true, get: function() {
       return errors_1.ShellError;
     } });
-    var globUtils = (0, tslib_12.__importStar)(require_globUtils());
+    var globUtils = tslib_12.__importStar(require_globUtils());
     exports2.globUtils = globUtils;
     var pipe_1 = require_pipe2();
     var pipe_2 = require_pipe2();
@@ -98412,29 +98441,32 @@ var require_lib51 = __commonJS({
           {
             const argIndex = parseInt(segment.name, 10);
             let raw;
-            if (Number.isFinite(argIndex)) {
+            const isArgument = Number.isFinite(argIndex);
+            if (isArgument) {
               if (argIndex >= 0 && argIndex < opts.args.length) {
                 raw = opts.args[argIndex];
-              } else if (segment.defaultValue) {
-                raw = (await interpolateArguments(segment.defaultValue, opts, state)).join(` `);
-              } else if (segment.alternativeValue) {
-                raw = (await interpolateArguments(segment.alternativeValue, opts, state)).join(` `);
-              } else {
-                throw new errors_1.ShellError(`Unbound argument #${argIndex}`);
               }
             } else {
               if (Object.prototype.hasOwnProperty.call(state.variables, segment.name)) {
                 raw = state.variables[segment.name];
               } else if (Object.prototype.hasOwnProperty.call(state.environment, segment.name)) {
                 raw = state.environment[segment.name];
-              } else if (segment.defaultValue) {
-                raw = (await interpolateArguments(segment.defaultValue, opts, state)).join(` `);
-              } else {
-                throw new errors_1.ShellError(`Unbound variable "${segment.name}"`);
               }
             }
-            if (typeof raw !== `undefined` && segment.alternativeValue)
+            if (typeof raw !== `undefined` && segment.alternativeValue) {
               raw = (await interpolateArguments(segment.alternativeValue, opts, state)).join(` `);
+            } else if (typeof raw === `undefined`) {
+              if (segment.defaultValue) {
+                raw = (await interpolateArguments(segment.defaultValue, opts, state)).join(` `);
+              } else if (segment.alternativeValue) {
+                raw = ``;
+              }
+            }
+            if (typeof raw === `undefined`) {
+              if (isArgument)
+                throw new errors_1.ShellError(`Unbound argument #${argIndex}`);
+              throw new errors_1.ShellError(`Unbound variable "${segment.name}"`);
+            }
             if (segment.quoted) {
               push(raw);
             } else {
@@ -99316,9 +99348,9 @@ var require_resolve_from = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@pnpm+npm-lifecycle@2.0.0(typanion@3.12.1)/node_modules/@pnpm/npm-lifecycle/lib/extendPath.js
+// ../node_modules/.pnpm/@pnpm+npm-lifecycle@2.0.1(typanion@3.12.1)/node_modules/@pnpm/npm-lifecycle/lib/extendPath.js
 var require_extendPath = __commonJS({
-  "../node_modules/.pnpm/@pnpm+npm-lifecycle@2.0.0(typanion@3.12.1)/node_modules/@pnpm/npm-lifecycle/lib/extendPath.js"(exports2, module2) {
+  "../node_modules/.pnpm/@pnpm+npm-lifecycle@2.0.1(typanion@3.12.1)/node_modules/@pnpm/npm-lifecycle/lib/extendPath.js"(exports2, module2) {
     var path2 = require("path");
     var which = require_which2();
     module2.exports = (wd, originalPath, nodeGyp, opts) => {
@@ -99369,9 +99401,9 @@ var require_extendPath = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@pnpm+npm-lifecycle@2.0.0(typanion@3.12.1)/node_modules/@pnpm/npm-lifecycle/index.js
+// ../node_modules/.pnpm/@pnpm+npm-lifecycle@2.0.1(typanion@3.12.1)/node_modules/@pnpm/npm-lifecycle/index.js
 var require_npm_lifecycle = __commonJS({
-  "../node_modules/.pnpm/@pnpm+npm-lifecycle@2.0.0(typanion@3.12.1)/node_modules/@pnpm/npm-lifecycle/index.js"(exports2, module2) {
+  "../node_modules/.pnpm/@pnpm+npm-lifecycle@2.0.1(typanion@3.12.1)/node_modules/@pnpm/npm-lifecycle/index.js"(exports2, module2) {
     "use strict";
     exports2 = module2.exports = lifecycle;
     exports2.makeEnv = makeEnv;
@@ -110821,6 +110853,26 @@ var require_pickPackageFromMeta = __commonJS({
       }
     }
     exports2.pickPackageFromMeta = pickPackageFromMeta;
+    var semverRangeCache = /* @__PURE__ */ new Map();
+    function semverSatisfiesLoose(version2, range) {
+      let semverRange = semverRangeCache.get(range);
+      if (semverRange === void 0) {
+        try {
+          semverRange = new semver_12.default.Range(range, true);
+        } catch {
+          semverRange = null;
+        }
+        semverRangeCache.set(range, semverRange);
+      }
+      if (semverRange) {
+        try {
+          return semverRange.test(new semver_12.default.SemVer(version2, true));
+        } catch {
+          return false;
+        }
+      }
+      return false;
+    }
     function pickLowestVersionByVersionRange(meta, versionRange, preferredVerSels) {
       if (preferredVerSels != null && Object.keys(preferredVerSels).length > 0) {
         const prioritizedPreferredVersions = prioritizePreferredVersions(meta, versionRange, preferredVerSels);
@@ -110842,7 +110894,7 @@ var require_pickPackageFromMeta = __commonJS({
       if (preferredVerSels != null && Object.keys(preferredVerSels).length > 0) {
         const prioritizedPreferredVersions = prioritizePreferredVersions(meta, versionRange, preferredVerSels);
         for (const preferredVersions of prioritizedPreferredVersions) {
-          if (preferredVersions.includes(latest) && semver_12.default.satisfies(latest, versionRange, true)) {
+          if (preferredVersions.includes(latest) && semverSatisfiesLoose(latest, versionRange)) {
             return latest;
           }
           const preferredVersion = semver_12.default.maxSatisfying(preferredVersions, versionRange, true);
@@ -110858,7 +110910,7 @@ var require_pickPackageFromMeta = __commonJS({
           latest = void 0;
         }
       }
-      if (latest && (versionRange === "*" || semver_12.default.satisfies(latest, versionRange, true))) {
+      if (latest && (versionRange === "*" || semverSatisfiesLoose(latest, versionRange))) {
         return latest;
       }
       const maxVersion = semver_12.default.maxSatisfying(versions, versionRange, true);
@@ -110886,7 +110938,7 @@ var require_pickPackageFromMeta = __commonJS({
           case "range": {
             const versions = Object.keys(meta.versions);
             for (const version2 of versions) {
-              if (semver_12.default.satisfies(version2, preferredSelector, true)) {
+              if (semverSatisfiesLoose(version2, preferredSelector)) {
                 versionsPrioritizer.add(version2, weight);
               }
             }
@@ -110949,6 +111001,19 @@ var require_pickPackage = __commonJS({
     var toRaw_1 = require_toRaw();
     var pickPackageFromMeta_1 = require_pickPackageFromMeta();
     var metafileOperationLimits = {};
+    async function runLimited(pkgMirror, fn2) {
+      let entry;
+      try {
+        entry = metafileOperationLimits[pkgMirror] ?? (metafileOperationLimits[pkgMirror] = { count: 0, limit: (0, p_limit_12.default)(1) });
+        entry.count++;
+        return await fn2(entry.limit);
+      } finally {
+        entry.count--;
+        if (entry.count === 0) {
+          metafileOperationLimits[pkgMirror] = void 0;
+        }
+      }
+    }
     function pickPackageFromMetaUsingTime(spec, preferredVersionSelectors, meta, publishedBy) {
       const pickedPackage = (0, pickPackageFromMeta_1.pickPackageFromMeta)(pickPackageFromMeta_1.pickVersionByVersionRange, spec, preferredVersionSelectors, meta, publishedBy);
       if (pickedPackage)
@@ -110968,80 +111033,81 @@ var require_pickPackage = __commonJS({
       }
       const registryName = (0, encode_registry_1.default)(opts.registry);
       const pkgMirror = path_1.default.join(ctx.cacheDir, ctx.metaDir, registryName, `${encodePkgName(spec.name)}.json`);
-      const limit = metafileOperationLimits[pkgMirror] = metafileOperationLimits[pkgMirror] || (0, p_limit_12.default)(1);
-      let metaCachedInStore;
-      if (ctx.offline === true || ctx.preferOffline === true || opts.pickLowestVersion) {
-        metaCachedInStore = await limit(async () => loadMeta(pkgMirror));
-        if (ctx.offline) {
-          if (metaCachedInStore != null)
-            return {
-              meta: metaCachedInStore,
-              pickedPackage: _pickPackageFromMeta(spec, opts.preferredVersionSelectors, metaCachedInStore, opts.publishedBy)
-            };
-          throw new error_1.PnpmError("NO_OFFLINE_META", `Failed to resolve ${(0, toRaw_1.toRaw)(spec)} in package mirror ${pkgMirror}`);
-        }
-        if (metaCachedInStore != null) {
-          const pickedPackage = _pickPackageFromMeta(spec, opts.preferredVersionSelectors, metaCachedInStore, opts.publishedBy);
-          if (pickedPackage) {
-            return {
-              meta: metaCachedInStore,
-              pickedPackage
-            };
+      return runLimited(pkgMirror, async (limit) => {
+        let metaCachedInStore;
+        if (ctx.offline === true || ctx.preferOffline === true || opts.pickLowestVersion) {
+          metaCachedInStore = await limit(async () => loadMeta(pkgMirror));
+          if (ctx.offline) {
+            if (metaCachedInStore != null)
+              return {
+                meta: metaCachedInStore,
+                pickedPackage: _pickPackageFromMeta(spec, opts.preferredVersionSelectors, metaCachedInStore, opts.publishedBy)
+              };
+            throw new error_1.PnpmError("NO_OFFLINE_META", `Failed to resolve ${(0, toRaw_1.toRaw)(spec)} in package mirror ${pkgMirror}`);
+          }
+          if (metaCachedInStore != null) {
+            const pickedPackage = _pickPackageFromMeta(spec, opts.preferredVersionSelectors, metaCachedInStore, opts.publishedBy);
+            if (pickedPackage) {
+              return {
+                meta: metaCachedInStore,
+                pickedPackage
+              };
+            }
           }
         }
-      }
-      if (spec.type === "version") {
-        metaCachedInStore = metaCachedInStore ?? await limit(async () => loadMeta(pkgMirror));
-        if (metaCachedInStore?.versions?.[spec.fetchSpec] != null) {
-          return {
-            meta: metaCachedInStore,
-            pickedPackage: metaCachedInStore.versions[spec.fetchSpec]
-          };
-        }
-      }
-      if (opts.publishedBy) {
-        metaCachedInStore = metaCachedInStore ?? await limit(async () => loadMeta(pkgMirror));
-        if (metaCachedInStore?.cachedAt && new Date(metaCachedInStore.cachedAt) >= opts.publishedBy) {
-          const pickedPackage = _pickPackageFromMeta(spec, opts.preferredVersionSelectors, metaCachedInStore, opts.publishedBy);
-          if (pickedPackage) {
+        if (spec.type === "version") {
+          metaCachedInStore = metaCachedInStore ?? await limit(async () => loadMeta(pkgMirror));
+          if (metaCachedInStore?.versions?.[spec.fetchSpec] != null) {
             return {
               meta: metaCachedInStore,
-              pickedPackage
+              pickedPackage: metaCachedInStore.versions[spec.fetchSpec]
             };
           }
         }
-      }
-      try {
-        let meta = await ctx.fetch(spec.name, opts.registry, opts.authHeaderValue);
-        if (ctx.filterMetadata) {
-          meta = clearMeta(meta);
-        }
-        meta.cachedAt = Date.now();
-        ctx.metaCache.set(spec.name, meta);
-        if (!opts.dryRun) {
-          limit(async () => {
-            try {
-              await saveMeta(pkgMirror, meta);
-            } catch (err) {
+        if (opts.publishedBy) {
+          metaCachedInStore = metaCachedInStore ?? await limit(async () => loadMeta(pkgMirror));
+          if (metaCachedInStore?.cachedAt && new Date(metaCachedInStore.cachedAt) >= opts.publishedBy) {
+            const pickedPackage = _pickPackageFromMeta(spec, opts.preferredVersionSelectors, metaCachedInStore, opts.publishedBy);
+            if (pickedPackage) {
+              return {
+                meta: metaCachedInStore,
+                pickedPackage
+              };
             }
-          });
+          }
         }
-        return {
-          meta,
-          pickedPackage: _pickPackageFromMeta(spec, opts.preferredVersionSelectors, meta, opts.publishedBy)
-        };
-      } catch (err) {
-        err.spec = spec;
-        const meta = await loadMeta(pkgMirror);
-        if (meta == null)
-          throw err;
-        logger_1.logger.error(err, err);
-        logger_1.logger.debug({ message: `Using cached meta from ${pkgMirror}` });
-        return {
-          meta,
-          pickedPackage: _pickPackageFromMeta(spec, opts.preferredVersionSelectors, meta, opts.publishedBy)
-        };
-      }
+        try {
+          let meta = await ctx.fetch(spec.name, opts.registry, opts.authHeaderValue);
+          if (ctx.filterMetadata) {
+            meta = clearMeta(meta);
+          }
+          meta.cachedAt = Date.now();
+          ctx.metaCache.set(spec.name, meta);
+          if (!opts.dryRun) {
+            runLimited(pkgMirror, (limit2) => limit2(async () => {
+              try {
+                await saveMeta(pkgMirror, meta);
+              } catch (err) {
+              }
+            }));
+          }
+          return {
+            meta,
+            pickedPackage: _pickPackageFromMeta(spec, opts.preferredVersionSelectors, meta, opts.publishedBy)
+          };
+        } catch (err) {
+          err.spec = spec;
+          const meta = await loadMeta(pkgMirror);
+          if (meta == null)
+            throw err;
+          logger_1.logger.error(err, err);
+          logger_1.logger.debug({ message: `Using cached meta from ${pkgMirror}` });
+          return {
+            meta,
+            pickedPackage: _pickPackageFromMeta(spec, opts.preferredVersionSelectors, meta, opts.publishedBy)
+          };
+        }
+      });
     }
     exports2.pickPackage = pickPackage;
     function clearMeta(pkg) {
@@ -112199,7 +112265,7 @@ var require_lib78 = __commonJS({
       return mod && mod.__esModule ? mod : { "default": mod };
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.createPeersFolderSuffix = exports2.createPeersFolderSuffixNewFormat = exports2.depPathToFilename = exports2.parse = exports2.refToRelative = exports2.relative = exports2.getRegistryByPackageName = exports2.refToAbsolute = exports2.tryGetPackageId = exports2.resolve = exports2.isAbsolute = void 0;
+    exports2.createPeersFolderSuffix = exports2.createPeersFolderSuffixNewFormat = exports2.depPathToFilename = exports2.parse = exports2.refToRelative = exports2.relative = exports2.getRegistryByPackageName = exports2.refToAbsolute = exports2.tryGetPackageId = exports2.indexOfPeersSuffix = exports2.resolve = exports2.isAbsolute = void 0;
     var crypto_base32_hash_1 = require_lib77();
     var encode_registry_1 = __importDefault3(require_encode_registry());
     var semver_12 = __importDefault3(require_semver2());
@@ -112223,13 +112289,31 @@ var require_lib78 = __commonJS({
       return resolutionLocation;
     }
     exports2.resolve = resolve;
+    function indexOfPeersSuffix(depPath) {
+      if (!depPath.endsWith(")"))
+        return -1;
+      let open = true;
+      for (let i = depPath.length - 2; i >= 0; i--) {
+        if (depPath[i] === "(") {
+          open = false;
+        } else if (depPath[i] === ")") {
+          if (open)
+            return -1;
+          open = true;
+        } else if (!open) {
+          return i + 1;
+        }
+      }
+      return -1;
+    }
+    exports2.indexOfPeersSuffix = indexOfPeersSuffix;
     function tryGetPackageId(registries, relDepPath) {
       if (relDepPath[0] !== "/") {
         return null;
       }
-      const sepIndex = relDepPath.indexOf("(");
+      const sepIndex = indexOfPeersSuffix(relDepPath);
       if (sepIndex !== -1) {
-        return resolve(registries, relDepPath.slice(0, sepIndex));
+        return resolve(registries, relDepPath.substring(0, sepIndex));
       }
       const underscoreIndex = relDepPath.indexOf("_", relDepPath.lastIndexOf("/"));
       if (underscoreIndex !== -1) {
@@ -113178,7 +113262,7 @@ var require_inlineSpecifiersLockfileConverters = __commonJS({
       return result2;
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.convertNewDepPathToOldDepPath = exports2.revertFromInlineSpecifiersFormat = exports2.revertFromInlineSpecifiersFormatIfNecessary = exports2.convertToInlineSpecifiersFormat = exports2.isExperimentalInlineSpecifiersFormat = void 0;
+    exports2.convertLockfileV6DepPathToV5DepPath = exports2.revertFromInlineSpecifiersFormat = exports2.revertFromInlineSpecifiersFormatIfNecessary = exports2.convertToInlineSpecifiersFormat = exports2.isExperimentalInlineSpecifiersFormat = void 0;
     var dp = __importStar4(require_lib78());
     var InlineSpecifiersLockfile_1 = require_InlineSpecifiersLockfile();
     function isExperimentalInlineSpecifiersFormat(lockfile) {
@@ -113287,7 +113371,7 @@ var require_inlineSpecifiersLockfileConverters = __commonJS({
           if (newSnapshot.optionalDependencies != null) {
             newSnapshot.optionalDependencies = mapValues(newSnapshot.optionalDependencies, convertNewRefToOldRef);
           }
-          return [convertNewDepPathToOldDepPath(depPath), newSnapshot];
+          return [convertLockfileV6DepPathToV5DepPath(depPath), newSnapshot];
         }));
       }
       const newLockfile = {
@@ -113297,26 +113381,26 @@ var require_inlineSpecifiersLockfileConverters = __commonJS({
         importers: revertedImporters
       };
       if (originalVersion === 6 && newLockfile.time) {
-        newLockfile.time = Object.fromEntries(Object.entries(newLockfile.time).map(([depPath, time]) => [convertNewDepPathToOldDepPath(depPath), time]));
+        newLockfile.time = Object.fromEntries(Object.entries(newLockfile.time).map(([depPath, time]) => [convertLockfileV6DepPathToV5DepPath(depPath), time]));
       }
       return newLockfile;
     }
     exports2.revertFromInlineSpecifiersFormat = revertFromInlineSpecifiersFormat;
-    function convertNewDepPathToOldDepPath(oldDepPath) {
-      if (!oldDepPath.includes("@", 2))
-        return oldDepPath;
-      const index = oldDepPath.indexOf("@", oldDepPath.indexOf("/@") + 2);
-      if (oldDepPath.includes("(") && index > oldDepPath.indexOf("("))
-        return oldDepPath;
-      return `${oldDepPath.substring(0, index)}/${oldDepPath.substring(index + 1)}`;
-    }
-    exports2.convertNewDepPathToOldDepPath = convertNewDepPathToOldDepPath;
+    function convertLockfileV6DepPathToV5DepPath(newDepPath) {
+      if (!newDepPath.includes("@", 2) || newDepPath.startsWith("file:"))
+        return newDepPath;
+      const index = newDepPath.indexOf("@", newDepPath.indexOf("/@") + 2);
+      if (newDepPath.includes("(") && index > dp.indexOfPeersSuffix(newDepPath))
+        return newDepPath;
+      return `${newDepPath.substring(0, index)}/${newDepPath.substring(index + 1)}`;
+    }
+    exports2.convertLockfileV6DepPathToV5DepPath = convertLockfileV6DepPathToV5DepPath;
     function convertNewRefToOldRef(oldRef) {
       if (oldRef.startsWith("link:") || oldRef.startsWith("file:")) {
         return oldRef;
       }
       if (oldRef.includes("@")) {
-        return convertNewDepPathToOldDepPath(oldRef);
+        return convertLockfileV6DepPathToV5DepPath(oldRef);
       }
       return oldRef;
     }
@@ -191632,7 +191716,8 @@ var require_extendInstallOptions = __commonJS({
         dedupeDirectDeps: false,
         dedupePeerDependents: false,
         resolvePeersFromWorkspaceRoot: false,
-        extendNodePath: true
+        extendNodePath: true,
+        ignoreWorkspaceCycles: false
       };
     };
     async function extendOptions(opts) {
@@ -192219,7 +192304,8 @@ var require_install = __commonJS({
           existsCurrentLockfile: ctx.existsCurrentLockfile,
           existsWantedLockfile: ctx.existsWantedLockfile,
           lockfileDir: ctx.lockfileDir,
-          storeDir: ctx.storeDir
+          storeDir: ctx.storeDir,
+          registries: ctx.registries
         });
       }
       const pruneVirtualStore = ctx.modulesFile?.prunedAt && opts.modulesCacheMaxAge > 0 ? cacheExpired(ctx.modulesFile.prunedAt, opts.modulesCacheMaxAge) : true;
@@ -193996,7 +194082,7 @@ var require_installDeps = __commonJS({
         const selectedProjectsGraph = opts.selectedProjectsGraph ?? selectProjectByDir(allProjects, opts.dir);
         if (selectedProjectsGraph != null) {
           const sequencedGraph = (0, sort_packages_1.sequenceGraph)(selectedProjectsGraph);
-          if (!sequencedGraph.safe) {
+          if (!opts.ignoreWorkspaceCycles && !sequencedGraph.safe) {
             const cyclicDependenciesInfo = sequencedGraph.cycles.length > 0 ? `: ${sequencedGraph.cycles.map((deps) => deps.join(", ")).join("; ")}` : "";
             logger_1.logger.warn({
               message: `There are cyclic workspace dependencies${cyclicDependenciesInfo}`,
@@ -204169,7 +204255,7 @@ var require_import = __commonJS({
         const selectedProjectsGraph = opts.selectedProjectsGraph ?? selectProjectByDir(allProjects, opts.dir);
         if (selectedProjectsGraph != null) {
           const sequencedGraph = (0, sort_packages_1.sequenceGraph)(selectedProjectsGraph);
-          if (!sequencedGraph.safe) {
+          if (!opts.ignoreWorkspaceCycles && !sequencedGraph.safe) {
             const cyclicDependenciesInfo = sequencedGraph.cycles.length > 0 ? `: ${sequencedGraph.cycles.map((deps) => deps.join(", ")).join("; ")}` : "";
             logger_1.logger.warn({
               message: `There are cyclic workspace dependencies${cyclicDependenciesInfo}`,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pnpm",
   "description": "Fast, disk space efficient package manager",
-  "version": "7.30.5",
+  "version": "7.31.0",
   "bin": {
     "pnpm": "bin/pnpm.cjs",
     "pnpx": "bin/pnpx.cjs"