pnpm 9.0.0-beta.0 → 9.0.0-beta.2

package/README.md

@@ -181,6 +181,11 @@ To quote the [Rush](https://rushjs.io/) team:
           </picture>
         </a>
       </td>
+      <td align="center" valign="middle">
+        <a href="https://vpsserver.com/en-us/?utm_source=pnpm&utm_medium=readme" target="_blank">
+          <img src="https://pnpm.io/img/users/vpsserver.svg" width="180" />
+        </a>
+      </td>
     </tr>
   </tbody>
 </table>

package/dist/node_modules/.modules.yaml

@@ -199,9 +199,9 @@ included:
 injectedDeps: {}
 layoutVersion: 5
 nodeLinker: hoisted
-packageManager: pnpm@9.0.0-alpha.10
+packageManager: pnpm@9.0.0-beta.1
 pendingBuilds: []
-prunedAt: Sat, 23 Mar 2024 12:43:29 GMT
+prunedAt: Sun, 31 Mar 2024 21:35:35 GMT
 publicHoistPattern:
   - '*eslint*'
   - '*prettier*'

package/dist/pnpm.cjs

@@ -3357,7 +3357,7 @@ var require_lib4 = __commonJS({
     var load_json_file_1 = __importDefault2(require_load_json_file());
     var defaultManifest = {
       name: true ? "pnpm" : "pnpm",
-      version: true ? "9.0.0-beta.0" : "0.0.0"
+      version: true ? "9.0.0-beta.2" : "0.0.0"
     };
     var pkgJson;
     if (require.main == null) {
@@ -20854,6 +20854,9 @@ var require_dirs = __commonJS({
       if (opts.env.XDG_CACHE_HOME) {
         return path_1.default.join(opts.env.XDG_CACHE_HOME, "pnpm");
       }
+      if (opts.platform === "darwin") {
+        return path_1.default.join(os_1.default.homedir(), "Library/Caches/pnpm");
+      }
       if (opts.platform !== "win32") {
         return path_1.default.join(os_1.default.homedir(), ".cache/pnpm");
       }
@@ -20883,6 +20886,9 @@ var require_dirs = __commonJS({
       if (opts.env.XDG_DATA_HOME) {
         return path_1.default.join(opts.env.XDG_DATA_HOME, "pnpm");
       }
+      if (opts.platform === "darwin") {
+        return path_1.default.join(os_1.default.homedir(), "Library/pnpm");
+      }
       if (opts.platform !== "win32") {
         return path_1.default.join(os_1.default.homedir(), ".local/share/pnpm");
       }
@@ -20896,6 +20902,9 @@ var require_dirs = __commonJS({
       if (opts.env.XDG_CONFIG_HOME) {
         return path_1.default.join(opts.env.XDG_CONFIG_HOME, "pnpm");
       }
+      if (opts.platform === "darwin") {
+        return path_1.default.join(os_1.default.homedir(), "Library/Preferences/pnpm");
+      }
       if (opts.platform !== "win32") {
         return path_1.default.join(os_1.default.homedir(), ".config/pnpm");
       }
@@ -58136,6 +58145,7 @@ var require_lib40 = __commonJS({
       return { graph, unmatched };
       function createNode(pkg) {
         const dependencies = {
+          ...pkg.manifest.peerDependencies,
           ...!opts?.ignoreDevDeps && pkg.manifest.devDependencies,
           ...pkg.manifest.optionalDependencies,
           ...pkg.manifest.dependencies
@@ -59241,9 +59251,9 @@ var require_slice_ansi2 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/getBorderCharacters.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/getBorderCharacters.js
 var require_getBorderCharacters = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/getBorderCharacters.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/getBorderCharacters.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.getBorderCharacters = void 0;
@@ -59350,15 +59360,15 @@ var require_getBorderCharacters = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/utils.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/utils.js
 var require_utils6 = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/utils.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/utils.js"(exports2) {
     "use strict";
     var __importDefault2 = exports2 && exports2.__importDefault || function(mod) {
       return mod && mod.__esModule ? mod : { "default": mod };
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.isCellInRange = exports2.areCellEqual = exports2.calculateRangeCoordinate = exports2.findOriginalRowIndex = exports2.flatten = exports2.extractTruncates = exports2.sumArray = exports2.sequence = exports2.distributeUnevenly = exports2.countSpaceSequence = exports2.groupBySizes = exports2.makeBorderConfig = exports2.splitAnsi = exports2.normalizeString = void 0;
+    exports2.isCellInRange = exports2.areCellEqual = exports2.calculateRangeCoordinate = exports2.flatten = exports2.extractTruncates = exports2.sumArray = exports2.sequence = exports2.distributeUnevenly = exports2.countSpaceSequence = exports2.groupBySizes = exports2.makeBorderConfig = exports2.splitAnsi = exports2.normalizeString = void 0;
     var slice_ansi_1 = __importDefault2(require_slice_ansi2());
     var string_width_1 = __importDefault2(require_string_width());
     var strip_ansi_1 = __importDefault2(require_strip_ansi());
@@ -59428,15 +59438,6 @@ var require_utils6 = __commonJS({
       return [].concat(...array);
     };
     exports2.flatten = flatten;
-    var findOriginalRowIndex = (mappedRowHeights, mappedRowIndex) => {
-      const rowIndexMapping = (0, exports2.flatten)(mappedRowHeights.map((height, index) => {
-        return Array.from({ length: height }, () => {
-          return index;
-        });
-      }));
-      return rowIndexMapping[mappedRowIndex];
-    };
-    exports2.findOriginalRowIndex = findOriginalRowIndex;
     var calculateRangeCoordinate = (spanningCellConfig) => {
       const { row, col, colSpan = 1, rowSpan = 1 } = spanningCellConfig;
       return {
@@ -59462,9 +59463,9 @@ var require_utils6 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/alignString.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/alignString.js
 var require_alignString = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/alignString.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/alignString.js"(exports2) {
     "use strict";
     var __importDefault2 = exports2 && exports2.__importDefault || function(mod) {
       return mod && mod.__esModule ? mod : { "default": mod };
@@ -59523,9 +59524,9 @@ var require_alignString = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/alignTableData.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/alignTableData.js
 var require_alignTableData = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/alignTableData.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/alignTableData.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.alignTableData = void 0;
@@ -59550,9 +59551,9 @@ var require_alignTableData = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/wrapString.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/wrapString.js
 var require_wrapString = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/wrapString.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/wrapString.js"(exports2) {
     "use strict";
     var __importDefault2 = exports2 && exports2.__importDefault || function(mod) {
       return mod && mod.__esModule ? mod : { "default": mod };
@@ -59574,9 +59575,9 @@ var require_wrapString = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/wrapWord.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/wrapWord.js
 var require_wrapWord = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/wrapWord.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/wrapWord.js"(exports2) {
     "use strict";
     var __importDefault2 = exports2 && exports2.__importDefault || function(mod) {
       return mod && mod.__esModule ? mod : { "default": mod };
@@ -59619,9 +59620,9 @@ var require_wrapWord = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/wrapCell.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/wrapCell.js
 var require_wrapCell = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/wrapCell.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/wrapCell.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.wrapCell = void 0;
@@ -59646,9 +59647,9 @@ var require_wrapCell = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/calculateCellHeight.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/calculateCellHeight.js
 var require_calculateCellHeight = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/calculateCellHeight.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/calculateCellHeight.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.calculateCellHeight = void 0;
@@ -59660,9 +59661,9 @@ var require_calculateCellHeight = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/calculateRowHeights.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/calculateRowHeights.js
 var require_calculateRowHeights = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/calculateRowHeights.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/calculateRowHeights.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.calculateRowHeights = void 0;
@@ -59703,9 +59704,9 @@ var require_calculateRowHeights = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/drawContent.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/drawContent.js
 var require_drawContent = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/drawContent.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/drawContent.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.drawContent = void 0;
@@ -59757,9 +59758,9 @@ var require_drawContent = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/drawBorder.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/drawBorder.js
 var require_drawBorder = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/drawBorder.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/drawBorder.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.createTableBorderGetter = exports2.drawBorderBottom = exports2.drawBorderJoin = exports2.drawBorderTop = exports2.drawBorder = exports2.createSeparatorGetter = exports2.drawBorderSegments = void 0;
@@ -59962,9 +59963,9 @@ var require_drawBorder = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/drawRow.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/drawRow.js
 var require_drawRow = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/drawRow.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/drawRow.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.drawRow = void 0;
@@ -60003,9 +60004,9 @@ var require_equal = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/generated/validators.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/generated/validators.js
 var require_validators = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/generated/validators.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/generated/validators.js"(exports2) {
     "use strict";
     exports2["config.json"] = validate43;
     var schema13 = {
@@ -62528,9 +62529,9 @@ var require_validators = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/validateConfig.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/validateConfig.js
 var require_validateConfig = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/validateConfig.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/validateConfig.js"(exports2) {
     "use strict";
     var __importDefault2 = exports2 && exports2.__importDefault || function(mod) {
       return mod && mod.__esModule ? mod : { "default": mod };
@@ -62557,9 +62558,9 @@ var require_validateConfig = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/makeStreamConfig.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/makeStreamConfig.js
 var require_makeStreamConfig = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/makeStreamConfig.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/makeStreamConfig.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.makeStreamConfig = void 0;
@@ -62597,9 +62598,9 @@ var require_makeStreamConfig = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/mapDataUsingRowHeights.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/mapDataUsingRowHeights.js
 var require_mapDataUsingRowHeights = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/mapDataUsingRowHeights.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/mapDataUsingRowHeights.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.mapDataUsingRowHeights = exports2.padCellVertically = void 0;
@@ -62656,9 +62657,9 @@ var require_mapDataUsingRowHeights = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/padTableData.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/padTableData.js
 var require_padTableData = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/padTableData.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/padTableData.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.padTableData = exports2.padString = void 0;
@@ -62686,9 +62687,9 @@ var require_padTableData = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/stringifyTableData.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/stringifyTableData.js
 var require_stringifyTableData = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/stringifyTableData.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/stringifyTableData.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.stringifyTableData = void 0;
@@ -62924,9 +62925,9 @@ var require_lodash2 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/truncateTableData.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/truncateTableData.js
 var require_truncateTableData = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/truncateTableData.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/truncateTableData.js"(exports2) {
     "use strict";
     var __importDefault2 = exports2 && exports2.__importDefault || function(mod) {
       return mod && mod.__esModule ? mod : { "default": mod };
@@ -62952,9 +62953,9 @@ var require_truncateTableData = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/createStream.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/createStream.js
 var require_createStream = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/createStream.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/createStream.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.createStream = void 0;
@@ -63030,9 +63031,9 @@ var require_createStream = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/calculateOutputColumnWidths.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/calculateOutputColumnWidths.js
 var require_calculateOutputColumnWidths = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/calculateOutputColumnWidths.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/calculateOutputColumnWidths.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.calculateOutputColumnWidths = void 0;
@@ -63045,9 +63046,9 @@ var require_calculateOutputColumnWidths = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/drawTable.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/drawTable.js
 var require_drawTable = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/drawTable.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/drawTable.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.drawTable = void 0;
@@ -63086,9 +63087,9 @@ var require_drawTable = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/injectHeaderConfig.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/injectHeaderConfig.js
 var require_injectHeaderConfig = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/injectHeaderConfig.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/injectHeaderConfig.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.injectHeaderConfig = void 0;
@@ -63126,9 +63127,9 @@ var require_injectHeaderConfig = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/calculateMaximumColumnWidths.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/calculateMaximumColumnWidths.js
 var require_calculateMaximumColumnWidths = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/calculateMaximumColumnWidths.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/calculateMaximumColumnWidths.js"(exports2) {
     "use strict";
     var __importDefault2 = exports2 && exports2.__importDefault || function(mod) {
       return mod && mod.__esModule ? mod : { "default": mod };
@@ -63166,9 +63167,9 @@ var require_calculateMaximumColumnWidths = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/alignSpanningCell.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/alignSpanningCell.js
 var require_alignSpanningCell = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/alignSpanningCell.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/alignSpanningCell.js"(exports2) {
     "use strict";
     var __importDefault2 = exports2 && exports2.__importDefault || function(mod) {
       return mod && mod.__esModule ? mod : { "default": mod };
@@ -63215,9 +63216,9 @@ var require_alignSpanningCell = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/calculateSpanningCellWidth.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/calculateSpanningCellWidth.js
 var require_calculateSpanningCellWidth = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/calculateSpanningCellWidth.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/calculateSpanningCellWidth.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.calculateSpanningCellWidth = void 0;
@@ -63241,9 +63242,9 @@ var require_calculateSpanningCellWidth = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/makeRangeConfig.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/makeRangeConfig.js
 var require_makeRangeConfig = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/makeRangeConfig.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/makeRangeConfig.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.makeRangeConfig = void 0;
@@ -63266,9 +63267,9 @@ var require_makeRangeConfig = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/spanningCellManager.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/spanningCellManager.js
 var require_spanningCellManager = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/spanningCellManager.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/spanningCellManager.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.createSpanningCellManager = void 0;
@@ -63327,10 +63328,11 @@ var require_spanningCellManager = __commonJS({
       });
       const rangeCache = {};
       let rowHeights = [];
+      let rowIndexMapping = [];
       return {
         getContainingRange: (cell, options) => {
           var _a;
-          const originalRow = (options === null || options === void 0 ? void 0 : options.mapped) ? (0, utils_1.findOriginalRowIndex)(rowHeights, cell.row) : cell.row;
+          const originalRow = (options === null || options === void 0 ? void 0 : options.mapped) ? rowIndexMapping[cell.row] : cell.row;
           const range = findRangeConfig({
             ...cell,
             row: originalRow
@@ -63355,8 +63357,16 @@ var require_spanningCellManager = __commonJS({
           return inSameRange(cell1, cell2, ranges);
         },
         rowHeights,
+        rowIndexMapping,
         setRowHeights: (_rowHeights) => {
           rowHeights = _rowHeights;
+        },
+        setRowIndexMapping: (mappedRowHeights) => {
+          rowIndexMapping = (0, utils_1.flatten)(mappedRowHeights.map((height, index) => {
+            return Array.from({ length: height }, () => {
+              return index;
+            });
+          }));
         }
       };
     };
@@ -63364,9 +63374,9 @@ var require_spanningCellManager = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/validateSpanningCellConfig.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/validateSpanningCellConfig.js
 var require_validateSpanningCellConfig = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/validateSpanningCellConfig.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/validateSpanningCellConfig.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.validateSpanningCellConfig = void 0;
@@ -63412,9 +63422,9 @@ var require_validateSpanningCellConfig = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/makeTableConfig.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/makeTableConfig.js
 var require_makeTableConfig = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/makeTableConfig.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/makeTableConfig.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.makeTableConfig = void 0;
@@ -63471,9 +63481,9 @@ var require_makeTableConfig = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/validateTableData.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/validateTableData.js
 var require_validateTableData = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/validateTableData.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/validateTableData.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.validateTableData = void 0;
@@ -63507,9 +63517,9 @@ var require_validateTableData = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/table.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/table.js
 var require_table = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/table.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/table.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.table = void 0;
@@ -63533,6 +63543,7 @@ var require_table = __commonJS({
       rows = (0, truncateTableData_1.truncateTableData)(injectedRows, (0, utils_1.extractTruncates)(config));
       const rowHeights = (0, calculateRowHeights_1.calculateRowHeights)(rows, config);
       config.spanningCellManager.setRowHeights(rowHeights);
+      config.spanningCellManager.setRowIndexMapping(rowHeights);
       rows = (0, mapDataUsingRowHeights_1.mapDataUsingRowHeights)(rows, rowHeights, config);
       rows = (0, alignTableData_1.alignTableData)(rows, config);
       rows = (0, padTableData_1.padTableData)(rows, config);
@@ -63543,17 +63554,17 @@ var require_table = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/types/api.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/types/api.js
 var require_api = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/types/api.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/types/api.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
   }
 });
 
-// ../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/index.js
+// ../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/index.js
 var require_src = __commonJS({
-  "../node_modules/.pnpm/table@6.8.1/node_modules/table/dist/src/index.js"(exports2) {
+  "../node_modules/.pnpm/table@6.8.2/node_modules/table/dist/src/index.js"(exports2) {
     "use strict";
     var __createBinding3 = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0)
@@ -68867,8 +68878,13 @@ var require_fetch2 = __commonJS({
       __setModuleDefault3(result2, mod);
       return result2;
     };
+    var __importDefault2 = exports2 && exports2.__importDefault || function(mod) {
+      return mod && mod.__esModule ? mod : { "default": mod };
+    };
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.ResponseError = exports2.fetch = exports2.Response = exports2.isRedirect = void 0;
+    var assert_1 = __importDefault2(require("assert"));
+    var util_1 = __importDefault2(require("util"));
     var core_loggers_1 = require_lib8();
     var retry_1 = require_retry2();
     var node_fetch_1 = __importStar3(require_dist6());
@@ -68904,7 +68920,8 @@ var require_fetch2 = __commonJS({
                 resolve(res);
               }
             } catch (error) {
-              if (error.code && NO_RETRY_ERROR_CODES.has(error.code)) {
+              (0, assert_1.default)(util_1.default.types.isNativeError(error));
+              if ("code" in error && typeof error.code === "string" && NO_RETRY_ERROR_CODES.has(error.code)) {
                 throw error;
               }
               const timeout = op.retry(error);
@@ -80935,9 +80952,9 @@ var require_lib55 = __commonJS({
   }
 });
 
-// ../node_modules/.pnpm/@rushstack+worker-pool@0.4.9_@types+node@18.19.24/node_modules/@rushstack/worker-pool/lib/WorkerPool.js
+// ../node_modules/.pnpm/@rushstack+worker-pool@0.4.9_@types+node@20.11.30/node_modules/@rushstack/worker-pool/lib/WorkerPool.js
 var require_WorkerPool = __commonJS({
-  "../node_modules/.pnpm/@rushstack+worker-pool@0.4.9_@types+node@18.19.24/node_modules/@rushstack/worker-pool/lib/WorkerPool.js"(exports2) {
+  "../node_modules/.pnpm/@rushstack+worker-pool@0.4.9_@types+node@20.11.30/node_modules/@rushstack/worker-pool/lib/WorkerPool.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.WorkerPool = exports2.WORKER_ID_SYMBOL = void 0;
@@ -174694,6 +174711,7 @@ var require_resolveDependencies = __commonJS({
     var path_exists_1 = __importDefault2(require_path_exists2());
     var p_defer_1 = __importDefault2(require_p_defer2());
     var promise_share_1 = __importDefault2(require_promise_share());
+    var partition_1 = __importDefault2(require_partition4());
     var pickBy_1 = __importDefault2(require_pickBy());
     var omit_1 = __importDefault2(require_omit());
     var zipWith_1 = __importDefault2(require_zipWith2());
@@ -174715,31 +174733,64 @@ var require_resolveDependencies = __commonJS({
     async function resolveRootDependencies(ctx, importers) {
       if (ctx.autoInstallPeers) {
         ctx.allPreferredVersions = (0, lockfile_preferred_versions_1.getPreferredVersionsFromLockfileAndManifests)(ctx.wantedLockfile.packages, []);
+      } else if (ctx.hoistPeers) {
+        ctx.allPreferredVersions = {};
       }
       const { pkgAddressesByImportersWithoutPeers, publishedBy, time } = await resolveDependenciesOfImporters(ctx, importers);
       const pkgAddressesByImporters = await Promise.all((0, zipWith_1.default)(async (importerResolutionResult, { parentPkgAliases, preferredVersions, options }) => {
         const pkgAddresses = importerResolutionResult.pkgAddresses;
-        if (!ctx.autoInstallPeers)
+        if (!ctx.hoistPeers)
           return pkgAddresses;
+        let prevMissingOptionalPeers = [];
         while (true) {
           for (const pkgAddress of importerResolutionResult.pkgAddresses) {
             parentPkgAliases[pkgAddress.alias] = true;
           }
-          for (const missingPeerName of Object.keys(importerResolutionResult.missingPeers ?? {})) {
+          const [missingOptionalPeers, missingRequiredPeers] = (0, partition_1.default)(([, { optional }]) => optional, Object.entries(importerResolutionResult.missingPeers ?? {}));
+          for (const missingPeerName of Object.keys(missingRequiredPeers)) {
             parentPkgAliases[missingPeerName] = true;
           }
-          for (const [resolvedPeerName, resolvedPeerAddress] of Object.entries(importerResolutionResult.resolvedPeers ?? {})) {
-            if (!parentPkgAliases[resolvedPeerName]) {
-              pkgAddresses.push(resolvedPeerAddress);
+          if (ctx.autoInstallPeers) {
+            for (const [resolvedPeerName, resolvedPeerAddress] of Object.entries(importerResolutionResult.resolvedPeers ?? {})) {
+              if (!parentPkgAliases[resolvedPeerName]) {
+                pkgAddresses.push(resolvedPeerAddress);
+              }
             }
           }
-          if (!Object.keys(importerResolutionResult.missingPeers).length)
+          const missingOptionalPeerNames = Array.from(/* @__PURE__ */ new Set([
+            ...missingOptionalPeers.map(([peerName]) => peerName),
+            ...prevMissingOptionalPeers
+          ]));
+          if (!missingRequiredPeers.length && !missingOptionalPeerNames.length)
+            break;
+          const dependencies = {};
+          for (const [peerName, { range }] of missingRequiredPeers) {
+            if (ctx.allPreferredVersions[peerName]) {
+              const versions = [];
+              const nonVersions = [];
+              for (const [spec, specType] of Object.entries(ctx.allPreferredVersions[peerName])) {
+                if (specType === "version") {
+                  versions.push(spec);
+                } else {
+                  nonVersions.push(spec);
+                }
+              }
+              dependencies[peerName] = [semver_12.default.maxSatisfying(versions, "*"), ...nonVersions].join(" || ");
+            } else if (ctx.autoInstallPeers) {
+              dependencies[peerName] = range;
+            }
+          }
+          const nextMissingOptionalPeers = [];
+          for (const missingOptionalPeerName of missingOptionalPeerNames) {
+            if (ctx.allPreferredVersions[missingOptionalPeerName]) {
+              dependencies[missingOptionalPeerName] = Object.keys(ctx.allPreferredVersions[missingOptionalPeerName]).join(" || ");
+            } else {
+              nextMissingOptionalPeers.push(missingOptionalPeerName);
+            }
+          }
+          prevMissingOptionalPeers = nextMissingOptionalPeers;
+          if (!Object.keys(dependencies).length)
             break;
-          const dependencies = Object.fromEntries(Object.entries(importerResolutionResult.missingPeers).map(([peerName, peerRange]) => {
-            if (!ctx.allPreferredVersions[peerName])
-              return [peerName, peerRange];
-            return [peerName, Object.keys(ctx.allPreferredVersions[peerName]).join(" || ")];
-          }));
           const wantedDependencies = (0, getNonDevWantedDependencies_1.getNonDevWantedDependencies)({ dependencies });
           const resolveDependenciesResult = await resolveDependencies(ctx, preferredVersions, wantedDependencies, {
             ...options,
@@ -174827,7 +174878,7 @@ var require_resolveDependencies = __commonJS({
           publishedBy
         };
         const childrenResults = await Promise.all(postponedResolutionsQueue.map((postponedResolution) => postponedResolution(postponedResolutionOpts)));
-        if (!ctx.autoInstallPeers) {
+        if (!ctx.hoistPeers) {
           return {
             missingPeers: {},
             pkgAddresses,
@@ -174931,7 +174982,7 @@ var require_resolveDependencies = __commonJS({
         publishedBy: options.publishedBy
       };
       const childrenResults = await Promise.all(postponedResolutionsQueue.map((postponedResolution) => postponedResolution(postponedResolutionOpts)));
-      if (!ctx.autoInstallPeers) {
+      if (!ctx.hoistPeers) {
         return {
           resolvingPeers: Promise.resolve({
             missingPeers: {},
@@ -174969,20 +175020,22 @@ var require_resolveDependencies = __commonJS({
     function mergePkgsDeps(pkgsDeps, opts) {
       const groupedRanges = {};
       for (const deps of pkgsDeps) {
-        for (const [name, range] of Object.entries(deps)) {
+        for (const [name, { range, optional }] of Object.entries(deps)) {
           if (!groupedRanges[name]) {
-            groupedRanges[name] = [];
+            groupedRanges[name] = { ranges: [], optional };
+          } else {
+            groupedRanges[name].optional &&= optional;
           }
-          groupedRanges[name].push(range);
+          groupedRanges[name].ranges.push(range);
         }
       }
       const mergedPkgDeps = {};
-      for (const [name, ranges] of Object.entries(groupedRanges)) {
+      for (const [name, { ranges, optional }] of Object.entries(groupedRanges)) {
         const intersection = (0, mergePeers_1.safeIntersect)(ranges);
         if (intersection) {
-          mergedPkgDeps[name] = intersection;
+          mergedPkgDeps[name] = { range: intersection, optional };
         } else if (opts.autoInstallPeersFromHighestMatch) {
-          mergedPkgDeps[name] = ranges.join(" || ");
+          mergedPkgDeps[name] = { range: ranges.join(" || "), optional };
         }
       }
       return mergedPkgDeps;
@@ -175418,7 +175471,7 @@ var require_resolveDependencies = __commonJS({
         ctx.resolvedPackagesByDepPath[depPath].prod = ctx.resolvedPackagesByDepPath[depPath].prod || !wantedDependency.dev && !wantedDependency.optional;
         ctx.resolvedPackagesByDepPath[depPath].dev = ctx.resolvedPackagesByDepPath[depPath].dev || wantedDependency.dev;
         ctx.resolvedPackagesByDepPath[depPath].optional = ctx.resolvedPackagesByDepPath[depPath].optional && currentIsOptional;
-        if (ctx.autoInstallPeers) {
+        if (ctx.hoistPeers) {
           resolveChildren2 = !ctx.missingPeersOfChildrenByPkgId[pkgResponse.body.id].missingPeersOfChildren.resolved && !ctx.resolvedPackagesByDepPath[depPath].parentImporterIds.has(parentImporterId);
           ctx.resolvedPackagesByDepPath[depPath].parentImporterIds.add(parentImporterId);
         }
@@ -175440,7 +175493,7 @@ 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 (ctx.autoInstallPeers && !(0, nodeIdUtils_1.nodeIdContains)(options.parentPkg.nodeId, depPath)) {
+      if (ctx.hoistPeers && !(0, nodeIdUtils_1.nodeIdContains)(options.parentPkg.nodeId, depPath)) {
         if (ctx.missingPeersOfChildrenByPkgId[pkgResponse.body.id]) {
           if (!options.parentPkg.nodeId.startsWith(ctx.missingPeersOfChildrenByPkgId[pkgResponse.body.id].parentImporterId)) {
             missingPeersOfChildren = ctx.missingPeersOfChildrenByPkgId[pkgResponse.body.id].missingPeersOfChildren;
@@ -175489,9 +175542,10 @@ var require_resolveDependencies = __commonJS({
     function getMissingPeers(pkg) {
       const missingPeers = {};
       for (const [peerName, peerVersion] of Object.entries(pkg.peerDependencies ?? {})) {
-        if (!pkg.peerDependenciesMeta?.[peerName]?.optional) {
-          missingPeers[peerName] = peerVersion;
-        }
+        missingPeers[peerName] = {
+          range: peerVersion,
+          optional: pkg.peerDependenciesMeta?.[peerName]?.optional === true
+        };
       }
       return missingPeers;
     }
@@ -175616,8 +175670,9 @@ var require_resolveDependencyTree = __commonJS({
     __exportStar2(require_nodeIdUtils(), exports2);
     async function resolveDependencyTree(importers, opts) {
       const wantedToBeSkippedPackageIds = /* @__PURE__ */ new Set();
+      const autoInstallPeers = opts.autoInstallPeers === true;
       const ctx = {
-        autoInstallPeers: opts.autoInstallPeers === true,
+        autoInstallPeers,
         autoInstallPeersFromHighestMatch: opts.autoInstallPeersFromHighestMatch === true,
         allowBuild: opts.allowBuild,
         allowedDeprecatedVersions: opts.allowedDeprecatedVersions,
@@ -175649,7 +175704,8 @@ var require_resolveDependencyTree = __commonJS({
         appliedPatches: /* @__PURE__ */ new Set(),
         updatedSet: /* @__PURE__ */ new Set(),
         workspacePackages: opts.workspacePackages,
-        missingPeersOfChildrenByPkgId: {}
+        missingPeersOfChildrenByPkgId: {},
+        hoistPeers: autoInstallPeers || opts.dedupePeerDependents
       };
       const resolveArgs = importers.map((importer) => {
         const projectSnapshot = opts.wantedLockfile.importers[importer.id];
@@ -180170,7 +180226,7 @@ var require_extendInstallOptions = __commonJS({
         symlink: true,
         storeController: opts.storeController,
         storeDir: opts.storeDir,
-        strictPeerDependencies: true,
+        strictPeerDependencies: false,
         tag: "latest",
         unsafePerm: process.platform === "win32" || process.platform === "cygwin" || !process.setgid || process.getuid?.() !== 0,
         useLockfile: true,
@@ -181814,6 +181870,7 @@ var require_getPeerDependencyIssues = __commonJS({
         allowedDeprecatedVersions: {},
         allowNonAppliedPatches: false,
         defaultUpdateDepth: -1,
+        dedupePeerDependents: opts.dedupePeerDependents,
         dryRun: true,
         engineStrict: false,
         force: false,
@@ -183767,7 +183824,8 @@ var require_prune3 = __commonJS({
       return (0, pick_1.default)([
         "dev",
         "optional",
-        "production"
+        "production",
+        "ignore-scripts"
       ], config_1.types);
     }
     exports2.cliOptionsTypes = cliOptionsTypes;
@@ -183787,6 +183845,7 @@ var require_prune3 = __commonJS({
                 description: "Remove the packages specified in `optionalDependencies`",
                 name: "--no-optional"
               },
+              common_cli_options_help_1.OPTIONS.ignoreScripts,
               ...common_cli_options_help_1.UNIVERSAL_OPTIONS
             ]
           }
@@ -211523,11 +211582,11 @@ var require_errorHandler = __commonJS({
       }
       logger_1.logger.error(error, error);
       setTimeout(async () => {
-        await killProcesses();
+        await killProcesses("errno" in error && typeof error.errno === "number" ? error.errno : 1);
       }, 0);
     }
     exports2.errorHandler = errorHandler;
-    async function killProcesses() {
+    async function killProcesses(status) {
       try {
         const descendentProcesses = await getDescendentProcesses(process.pid);
         for (const pid of descendentProcesses) {
@@ -211538,7 +211597,7 @@ var require_errorHandler = __commonJS({
         }
       } catch (err) {
       }
-      process.exit(1);
+      process.exit(status);
     }
   }
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pnpm",
   "description": "Fast, disk space efficient package manager",
-  "version": "9.0.0-beta.0",
+  "version": "9.0.0-beta.2",
   "bin": {
     "pnpm": "bin/pnpm.cjs",
     "pnpx": "bin/pnpx.cjs"
@@ -65,7 +65,7 @@
     "@pnpm/prepare": "workspace:*",
     "@pnpm/read-package-json": "workspace:*",
     "@pnpm/read-project-manifest": "workspace:*",
-    "@pnpm/registry-mock": "3.27.0",
+    "@pnpm/registry-mock": "3.29.0",
     "@pnpm/run-npm": "workspace:*",
     "@pnpm/tabtab": "^0.5.2",
     "@pnpm/test-fixtures": "workspace:*",