pnpm 7.12.0-0 → 7.12.1

package/dist/node_modules/.modules.yaml

@@ -7,11 +7,11 @@ included:
 injectedDeps: {}
 layoutVersion: 5
 nodeLinker: hoisted
-packageManager: pnpm@7.11.1-0
+packageManager: pnpm@7.12.0
 pendingBuilds:
   - /node-gyp/9.1.0
   - /encoding/0.1.13
-prunedAt: Thu, 15 Sep 2022 21:47:12 GMT
+prunedAt: Tue, 20 Sep 2022 00:37:24 GMT
 publicHoistPattern:
   - '*eslint*'
   - '*prettier*'

package/dist/pnpm.cjs

@@ -3206,7 +3206,7 @@ var require_lib4 = __commonJS({
     var load_json_file_1 = __importDefault(require_load_json_file());
     var defaultManifest = {
       name: "pnpm" != null && true ? "pnpm" : "pnpm",
-      version: "7.12.0-0" != null && true ? "7.12.0-0" : "0.0.0"
+      version: "7.12.1" != null && true ? "7.12.1" : "0.0.0"
     };
     var pkgJson;
     if (require.main == null) {
@@ -128857,7 +128857,12 @@ var require_nodeIdUtils = __commonJS({
   "../resolve-dependencies/lib/nodeIdUtils.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.splitNodeId = exports2.createNodeId = exports2.nodeIdContainsSequence = void 0;
+    exports2.splitNodeId = exports2.createNodeId = exports2.nodeIdContainsSequence = exports2.nodeIdContains = void 0;
+    function nodeIdContains(nodeId, pkgId) {
+      const pkgIds = splitNodeId(nodeId);
+      return pkgIds.includes(pkgId);
+    }
+    exports2.nodeIdContains = nodeIdContains;
     function nodeIdContainsSequence(nodeId, pkgId1, pkgId2) {
       const pkgIds = splitNodeId(nodeId);
       pkgIds.pop();
@@ -131504,7 +131509,10 @@ var require_resolveDependencies = __commonJS({
     var pick_registry_for_package_1 = __importDefault(require_lib63());
     var dp = __importStar2(require_lib66());
     var path_exists_1 = __importDefault(require_path_exists());
+    var p_defer_1 = __importDefault(require_p_defer2());
+    var promise_share_1 = __importDefault(require_promise_share());
     var isEmpty_1 = __importDefault(require_isEmpty2());
+    var fromPairs_1 = __importDefault(require_fromPairs());
     var omit_1 = __importDefault(require_omit());
     var zipWith_1 = __importDefault(require_zipWith2());
     var semver_12 = __importDefault(require_semver2());
@@ -131543,11 +131551,15 @@ var require_resolveDependencies = __commonJS({
           if (!Object.keys(importerResolutionResult.missingPeers).length)
             break;
           const wantedDependencies = (0, getNonDevWantedDependencies_1.default)({ dependencies: importerResolutionResult.missingPeers });
-          importerResolutionResult = await resolveDependencies(ctx, preferredVersions, wantedDependencies, {
+          const resolveDependenciesResult = await resolveDependencies(ctx, preferredVersions, wantedDependencies, {
             ...options,
             parentPkgAliases,
             publishedBy
           });
+          importerResolutionResult = {
+            pkgAddresses: resolveDependenciesResult.pkgAddresses,
+            ...await resolveDependenciesResult.resolvingPeers
+          };
           pkgAddresses.push(...importerResolutionResult.pkgAddresses);
         }
         return pkgAddresses;
@@ -131566,20 +131578,24 @@ var require_resolveDependencies = __commonJS({
       const pickLowestVersion = ctx.resolutionMode === "time-based";
       const resolveResults = await Promise.all((0, zipWith_1.default)(async (extendedWantedDeps, importer) => {
         const postponedResolutionsQueue = [];
+        const postponedPeersResolutionQueue = [];
         const pkgAddresses = [];
         (await Promise.all(extendedWantedDeps.map((extendedWantedDep) => resolveDependenciesOfDependency(ctx, importer.preferredVersions, {
           ...importer.options,
           parentPkgAliases: importer.parentPkgAliases,
           pickLowestVersion: pickLowestVersion && !importer.updatePackageManifest
-        }, extendedWantedDep)))).forEach(({ resolveDependencyResult, postponedResolution }) => {
+        }, extendedWantedDep)))).forEach(({ resolveDependencyResult, postponedPeersResolution, postponedResolution }) => {
           if (resolveDependencyResult) {
             pkgAddresses.push(resolveDependencyResult);
           }
           if (postponedResolution) {
             postponedResolutionsQueue.push(postponedResolution);
           }
+          if (postponedPeersResolution) {
+            postponedPeersResolutionQueue.push(postponedPeersResolution);
+          }
         });
-        return { pkgAddresses, postponedResolutionsQueue };
+        return { pkgAddresses, postponedResolutionsQueue, postponedPeersResolutionQueue };
       }, extendedWantedDepsByImporters, importers));
       let publishedBy;
       let time;
@@ -131590,12 +131606,12 @@ var require_resolveDependencies = __commonJS({
           time = result2.newTime;
         }
       }
-      const pkgAddressesByImportersWithoutPeers = await Promise.all((0, zipWith_1.default)(async (importer, { pkgAddresses, postponedResolutionsQueue }) => {
+      const pkgAddressesByImportersWithoutPeers = await Promise.all((0, zipWith_1.default)(async (importer, { pkgAddresses, postponedResolutionsQueue, postponedPeersResolutionQueue }) => {
         const newPreferredVersions = { ...importer.preferredVersions };
-        const newParentPkgAliases = { ...importer.parentPkgAliases };
+        const currentParentPkgAliases = {};
         for (const pkgAddress of pkgAddresses) {
-          if (newParentPkgAliases[pkgAddress.alias] !== true) {
-            newParentPkgAliases[pkgAddress.alias] = pkgAddress;
+          if (currentParentPkgAliases[pkgAddress.alias] !== true) {
+            currentParentPkgAliases[pkgAddress.alias] = pkgAddress;
           }
           if (pkgAddress.updated) {
             ctx.updatedSet.add(pkgAddress.alias);
@@ -131608,6 +131624,7 @@ var require_resolveDependencies = __commonJS({
           }
           newPreferredVersions[resolvedPackage.name][resolvedPackage.version] = "version";
         }
+        const newParentPkgAliases = { ...importer.parentPkgAliases, ...currentParentPkgAliases };
         const postponedResolutionOpts = {
           preferredVersions: newPreferredVersions,
           parentPkgAliases: newParentPkgAliases,
@@ -131621,14 +131638,17 @@ var require_resolveDependencies = __commonJS({
             resolvedPeers: {}
           };
         }
+        const postponedPeersResolution = await Promise.all(postponedPeersResolutionQueue.map((postponedMissingPeers) => postponedMissingPeers(postponedResolutionOpts.parentPkgAliases)));
+        const resolvedPeers = [...childrenResults, ...postponedPeersResolution].reduce((acc, { resolvedPeers: resolvedPeers2 }) => Object.assign(acc, resolvedPeers2), {});
         const allMissingPeers = mergePkgsDeps([
-          ...pkgAddresses,
-          ...childrenResults
+          ...filterMissingPeersFromPkgAddresses(pkgAddresses, currentParentPkgAliases, resolvedPeers),
+          ...childrenResults,
+          ...postponedPeersResolution
         ].map(({ missingPeers }) => missingPeers).filter(Boolean));
         return {
           missingPeers: allMissingPeers,
           pkgAddresses,
-          resolvedPeers: [...pkgAddresses, ...childrenResults].reduce((acc, { resolvedPeers }) => Object.assign(acc, resolvedPeers), {})
+          resolvedPeers
         };
       }, importers, resolveResults));
       return {
@@ -131637,6 +131657,19 @@ var require_resolveDependencies = __commonJS({
         time
       };
     }
+    function filterMissingPeersFromPkgAddresses(pkgAddresses, currentParentPkgAliases, resolvedPeers) {
+      return pkgAddresses.map((pkgAddress) => ({
+        ...pkgAddress,
+        missingPeers: (0, fromPairs_1.default)(Object.entries(pkgAddress.missingPeers || {}).filter(([peerName]) => {
+          if (!currentParentPkgAliases[peerName])
+            return true;
+          if (currentParentPkgAliases[peerName] !== true) {
+            resolvedPeers[peerName] = currentParentPkgAliases[peerName];
+          }
+          return false;
+        }))
+      }));
+    }
     function getPublishedByDate(pkgAddresses, timeFromLockfile = {}) {
       const newTime = {};
       for (const pkgAddress of pkgAddresses) {
@@ -131658,20 +131691,24 @@ var require_resolveDependencies = __commonJS({
         resolvedDependencies: options.resolvedDependencies
       });
       const postponedResolutionsQueue = [];
+      const postponedPeersResolutionQueue = [];
       const pkgAddresses = [];
-      (await Promise.all(extendedWantedDeps.map((extendedWantedDep) => resolveDependenciesOfDependency(ctx, preferredVersions, options, extendedWantedDep)))).forEach(({ resolveDependencyResult, postponedResolution }) => {
+      (await Promise.all(extendedWantedDeps.map((extendedWantedDep) => resolveDependenciesOfDependency(ctx, preferredVersions, options, extendedWantedDep)))).forEach(({ resolveDependencyResult, postponedResolution, postponedPeersResolution }) => {
         if (resolveDependencyResult) {
           pkgAddresses.push(resolveDependencyResult);
         }
         if (postponedResolution) {
           postponedResolutionsQueue.push(postponedResolution);
         }
+        if (postponedPeersResolution) {
+          postponedPeersResolutionQueue.push(postponedPeersResolution);
+        }
       });
       const newPreferredVersions = { ...preferredVersions };
-      const newParentPkgAliases = { ...options.parentPkgAliases };
+      const currentParentPkgAliases = {};
       for (const pkgAddress of pkgAddresses) {
-        if (newParentPkgAliases[pkgAddress.alias] !== true) {
-          newParentPkgAliases[pkgAddress.alias] = pkgAddress;
+        if (currentParentPkgAliases[pkgAddress.alias] !== true) {
+          currentParentPkgAliases[pkgAddress.alias] = pkgAddress;
         }
         if (pkgAddress.updated) {
           ctx.updatedSet.add(pkgAddress.alias);
@@ -131684,6 +131721,10 @@ var require_resolveDependencies = __commonJS({
         }
         newPreferredVersions[resolvedPackage.name][resolvedPackage.version] = "version";
       }
+      const newParentPkgAliases = {
+        ...options.parentPkgAliases,
+        ...currentParentPkgAliases
+      };
       const postponedResolutionOpts = {
         preferredVersions: newPreferredVersions,
         parentPkgAliases: newParentPkgAliases,
@@ -131692,22 +131733,38 @@ var require_resolveDependencies = __commonJS({
       const childrenResults = await Promise.all(postponedResolutionsQueue.map((postponedResolution) => postponedResolution(postponedResolutionOpts)));
       if (!ctx.autoInstallPeers) {
         return {
-          missingPeers: {},
-          pkgAddresses,
-          resolvedPeers: {}
+          resolvingPeers: Promise.resolve({
+            missingPeers: {},
+            resolvedPeers: {}
+          }),
+          pkgAddresses
         };
       }
+      return {
+        pkgAddresses,
+        resolvingPeers: startResolvingPeers({
+          childrenResults,
+          pkgAddresses,
+          parentPkgAliases: options.parentPkgAliases,
+          currentParentPkgAliases,
+          postponedPeersResolutionQueue
+        })
+      };
+    }
+    exports2.resolveDependencies = resolveDependencies;
+    async function startResolvingPeers({ childrenResults, currentParentPkgAliases, parentPkgAliases, pkgAddresses, postponedPeersResolutionQueue }) {
+      const results = await Promise.all(postponedPeersResolutionQueue.map((postponedPeersResolution) => postponedPeersResolution(parentPkgAliases)));
+      const resolvedPeers = [...childrenResults, ...results].reduce((acc, { resolvedPeers: resolvedPeers2 }) => Object.assign(acc, resolvedPeers2), {});
       const allMissingPeers = mergePkgsDeps([
-        ...pkgAddresses,
-        ...childrenResults
+        ...filterMissingPeersFromPkgAddresses(pkgAddresses, currentParentPkgAliases, resolvedPeers),
+        ...childrenResults,
+        ...results
       ].map(({ missingPeers }) => missingPeers).filter(Boolean));
       return {
         missingPeers: allMissingPeers,
-        pkgAddresses,
-        resolvedPeers: [...pkgAddresses, ...childrenResults].reduce((acc, { resolvedPeers }) => Object.assign(acc, resolvedPeers), {})
+        resolvedPeers
       };
     }
-    exports2.resolveDependencies = resolveDependencies;
     function mergePkgsDeps(pkgsDeps) {
       const groupedRanges = {};
       for (const deps of pkgsDeps) {
@@ -131759,8 +131816,15 @@ var require_resolveDependencies = __commonJS({
         };
         return { resolveDependencyResult };
       }
-      if (!resolveDependencyResult.isNew)
-        return { resolveDependencyResult };
+      if (!resolveDependencyResult.isNew) {
+        return {
+          resolveDependencyResult,
+          postponedPeersResolution: resolveDependencyResult.missingPeersOfChildren != null ? async (parentPkgAliases) => {
+            const missingPeers = await resolveDependencyResult.missingPeersOfChildren.get();
+            return filterMissingPeers(missingPeers, {}, parentPkgAliases);
+          } : void 0
+        };
+      }
       const postponedResolution = resolveChildren.bind(null, ctx, {
         parentPkg: resolveDependencyResult,
         dependencyLockfile: extendedWantedDep.infoFromLockfile?.dependencyLockfile,
@@ -131770,7 +131834,27 @@ var require_resolveDependencies = __commonJS({
       });
       return {
         resolveDependencyResult,
-        postponedResolution
+        postponedResolution: async (postponedResolutionOpts) => {
+          const { missingPeers, resolvedPeers } = await postponedResolution(postponedResolutionOpts);
+          resolveDependencyResult.missingPeersOfChildren.resolve(missingPeers);
+          return filterMissingPeers(missingPeers, resolvedPeers, postponedResolutionOpts.parentPkgAliases);
+        }
+      };
+    }
+    function filterMissingPeers(missingPeers, resolvedPeers, parentPkgAliases) {
+      const newMissing = {};
+      for (const [peerName, peerVersion] of Object.entries(missingPeers)) {
+        if (parentPkgAliases[peerName]) {
+          if (parentPkgAliases[peerName] !== true) {
+            resolvedPeers[peerName] = parentPkgAliases[peerName];
+          }
+        } else {
+          newMissing[peerName] = peerVersion;
+        }
+      }
+      return {
+        resolvedPeers,
+        missingPeers: newMissing
       };
     }
     async function resolveChildren(ctx, { parentPkg, dependencyLockfile, parentDepth, updateDepth, prefix }, { parentPkgAliases, preferredVersions, publishedBy }) {
@@ -131781,7 +131865,7 @@ var require_resolveDependencies = __commonJS({
       const resolvedDependencies = parentPkg.updated ? void 0 : currentResolvedDependencies;
       const parentDependsOnPeer = Boolean(Object.keys(dependencyLockfile?.peerDependencies ?? parentPkg.pkg.peerDependencies ?? {}).length);
       const wantedDependencies = (0, getNonDevWantedDependencies_1.default)(parentPkg.pkg);
-      const { pkgAddresses, missingPeers, resolvedPeers } = await resolveDependencies(ctx, preferredVersions, wantedDependencies, {
+      const { pkgAddresses, resolvingPeers } = await resolveDependencies(ctx, preferredVersions, wantedDependencies, {
         currentDepth: parentDepth + 1,
         parentPkg,
         parentPkgAliases,
@@ -131805,10 +131889,7 @@ var require_resolveDependencies = __commonJS({
         installable: parentPkg.installable,
         resolvedPackage: ctx.resolvedPackagesByDepPath[parentPkg.depPath]
       };
-      return {
-        missingPeers,
-        resolvedPeers
-      };
+      return resolvingPeers;
     }
     function getDepsToResolve(wantedDependencies, wantedLockfile, options) {
       const resolvedDependencies = options.resolvedDependencies ?? {};
@@ -132093,6 +132174,25 @@ var require_resolveDependencies = __commonJS({
         }
       }
       const rootDir = pkgResponse.body.resolution.type === "directory" ? path_1.default.resolve(ctx.lockfileDir, pkgResponse.body.resolution["directory"]) : options.prefix;
+      let missingPeersOfChildren;
+      if (!(0, nodeIdUtils_1.nodeIdContains)(options.parentPkg.nodeId, depPath)) {
+        if (ctx.missingPeersOfChildrenByPkgId[pkgResponse.body.id]) {
+          if (!options.parentPkg.nodeId.startsWith(ctx.missingPeersOfChildrenByPkgId[pkgResponse.body.id].parentNodeId)) {
+            missingPeersOfChildren = ctx.missingPeersOfChildrenByPkgId[pkgResponse.body.id].missingPeersOfChildren;
+          }
+        } else {
+          const p = (0, p_defer_1.default)();
+          missingPeersOfChildren = {
+            resolve: p.resolve,
+            reject: p.reject,
+            get: (0, promise_share_1.default)(p.promise)
+          };
+          ctx.missingPeersOfChildrenByPkgId[pkgResponse.body.id] = {
+            parentNodeId: options.parentPkg.nodeId,
+            missingPeersOfChildren
+          };
+        }
+      }
       return {
         alias: wantedDependency.alias || pkg.name,
         depIsLinked,
@@ -132100,9 +132200,10 @@ var require_resolveDependencies = __commonJS({
         isNew,
         nodeId,
         normalizedPref: options.currentDepth === 0 ? pkgResponse.body.normalizedPref : void 0,
+        missingPeersOfChildren,
         pkgId: pkgResponse.body.id,
         rootDir,
-        ...getMissingPeers(pkg, options.parentPkgAliases),
+        missingPeers: getMissingPeers(pkg),
         installable,
         isLinkedDependency: void 0,
         pkg,
@@ -132119,19 +132220,14 @@ var require_resolveDependencies = __commonJS({
         version: "0.0.0"
       };
     }
-    function getMissingPeers(pkg, parentPkgAliases) {
+    function getMissingPeers(pkg) {
       const missingPeers = {};
-      const resolvedPeers = {};
       for (const [peerName, peerVersion] of Object.entries(pkg.peerDependencies ?? {})) {
-        if (parentPkgAliases[peerName]) {
-          if (parentPkgAliases[peerName] !== true) {
-            resolvedPeers[peerName] = parentPkgAliases[peerName];
-          }
-        } else if (!pkg.peerDependenciesMeta?.[peerName]?.optional) {
+        if (!pkg.peerDependenciesMeta?.[peerName]?.optional) {
           missingPeers[peerName] = peerVersion;
         }
       }
-      return { missingPeers, resolvedPeers };
+      return missingPeers;
     }
     function pkgIsLeaf(pkg) {
       return (0, isEmpty_1.default)(pkg.dependencies ?? {}) && (0, isEmpty_1.default)(pkg.optionalDependencies ?? {}) && (0, isEmpty_1.default)(pkg.peerDependencies ?? {});
@@ -132267,7 +132363,8 @@ var require_resolveDependencyTree = __commonJS({
         wantedLockfile: opts.wantedLockfile,
         appliedPatches: /* @__PURE__ */ new Set(),
         updatedSet: /* @__PURE__ */ new Set(),
-        workspacePackages: opts.workspacePackages
+        workspacePackages: opts.workspacePackages,
+        missingPeersOfChildrenByPkgId: {}
       };
       const resolveArgs = importers.map((importer) => {
         const projectSnapshot = opts.wantedLockfile.importers[importer.id];

package/package.json

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