@vltpkg/cli-js 1.3.8 → 1.5.0

package/{chunk-5KOLUYXH.js → chunk-35EG6T3J.js}

@@ -11,21 +11,21 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   urlOpen
-} from "./chunk-APMYKJI2.js";
+} from "./chunk-QNHBAGXQ.js";
+import {
+  userAgent
+} from "./chunk-G3FZ2ZJK.js";
 import {
   assertOk,
   registryErrorMessage,
   statusText,
   storeRoot,
   tokenRefusal
-} from "./chunk-6D54UN4T.js";
-import {
-  userAgent
-} from "./chunk-6BQKR2FM.js";
+} from "./chunk-5KW6AOTT.js";
 import {
   I,
   logRequest
-} from "./chunk-U7TEQCBN.js";
+} from "./chunk-B6RIGNEO.js";
 import {
   XDG
 } from "./chunk-XNLSTHDK.js";
@@ -36,7 +36,7 @@ import {
   asError,
   integrityHex,
   integrityRE
-} from "./chunk-IBGFQR23.js";
+} from "./chunk-6LZM3I4Q.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";
@@ -11273,14 +11273,14 @@ var require_retry_agent = __commonJS({
         this.#options = options;
       }
       dispatch(opts, handler) {
-        const retry = new RetryHandler({
+        const retry2 = new RetryHandler({
           ...opts,
           retryOptions: this.#options
         }, {
           dispatch: this.#agent.dispatch.bind(this.#agent),
           handler
         });
-        return this.#agent.dispatch(opts, retry);
+        return this.#agent.dispatch(opts, retry2);
       }
       close() {
         return this.#agent.close();
@@ -13770,7 +13770,7 @@ var require_snapshot_recorder = __commonJS({
     "use strict";
     var { writeFile: writeFile3, readFile: readFile3, mkdir: mkdir3 } = __require("node:fs/promises");
     var { dirname: dirname4, resolve: resolve5 } = __require("node:path");
-    var { setTimeout: setTimeout3, clearTimeout: clearTimeout2 } = __require("node:timers");
+    var { setTimeout: setTimeout4, clearTimeout: clearTimeout2 } = __require("node:timers");
     var { InvalidArgumentError, UndiciError } = require_errors();
     var { hashId, isUrlExcludedFactory, normalizeHeaders, createHeaderFilters } = require_snapshot_utils();
     function formatRequestKey(opts, headerFilters, matchOptions = {}) {
@@ -14104,7 +14104,7 @@ var require_snapshot_recorder = __commonJS({
        * Schedules a flush (debounced to avoid excessive writes)
        */
       #scheduleFlush() {
-        this.#flushTimeout = setTimeout3(() => {
+        this.#flushTimeout = setTimeout4(() => {
           this.saveSnapshots().catch(() => {
           });
           if (this.#autoFlush) {
@@ -19487,7 +19487,7 @@ var require_request2 = __commonJS({
     var { URLSerializer } = require_data_url();
     var { kConstruct } = require_symbols();
     var assert = __require("node:assert");
-    var { getMaxListeners, setMaxListeners, defaultMaxListeners } = __require("node:events");
+    var { getMaxListeners, setMaxListeners: setMaxListeners2, defaultMaxListeners } = __require("node:events");
     var kAbortController = /* @__PURE__ */ Symbol("abortController");
     var requestFinalizer = new FinalizationRegistry(({ signal, abort }) => {
       signal.removeEventListener("abort", abort);
@@ -19727,7 +19727,7 @@ var require_request2 = __commonJS({
             const acRef = new WeakRef(ac);
             const abort = buildAbort(acRef);
             if (abortSignalHasEventHandlerLeakWarning && getMaxListeners(signal) === defaultMaxListeners) {
-              setMaxListeners(1500, signal);
+              setMaxListeners2(1500, signal);
             }
             util.addAbortListener(signal, abort);
             requestFinalizer.register(ac, { signal, abort }, abort);
@@ -26153,8 +26153,9 @@ import { randomUUID } from "node:crypto";
 import { closeSync, openSync, readFileSync as readFileSync2, readSync } from "node:fs";
 import { availableParallelism } from "node:os";
 import { dirname as dirname3, resolve as resolve4 } from "node:path";
+import { setMaxListeners } from "node:events";
 import { pipeline } from "node:stream";
-import { setTimeout as setTimeout2 } from "node:timers/promises";
+import { setTimeout as setTimeout3 } from "node:timers/promises";
 import { createGunzip } from "node:zlib";
 
 // ../../src/registry-client/src/is-iterable.ts
@@ -27408,6 +27409,40 @@ var readBody = async (response, entry) => {
   });
 };
 
+// ../../src/registry-client/src/retry.ts
+import { setTimeout as setTimeout2 } from "node:timers/promises";
+var retry = (err, { state: { counter }, opts }, cb) => {
+  const { code, statusCode, headers } = err;
+  const { method } = opts;
+  const { signal } = opts;
+  const {
+    maxRetries,
+    minTimeout,
+    maxTimeout,
+    timeoutFactor,
+    methods,
+    statusCodes,
+    errorCodes
+  } = opts.retryOptions;
+  if (code && code !== "UND_ERR_REQ_RETRY" && !errorCodes.includes(code) || !methods.includes(method) || typeof statusCode === "number" && !statusCodes.includes(statusCode) || counter > maxRetries) {
+    cb(err);
+    return;
+  }
+  const ra = String(headers?.["retry-after"] ?? "");
+  const secs = Number(ra);
+  const after = Number.isNaN(secs) ? Date.parse(ra) - Date.now() : secs * 1e3;
+  const wait = Math.min(
+    after > 0 ? after : minTimeout * timeoutFactor ** (counter - 1),
+    maxTimeout
+  );
+  setTimeout2(wait, null, {
+    signal: signal instanceof AbortSignal ? signal : void 0
+  }).then(
+    () => cb(null),
+    (er) => cb(er)
+  );
+};
+
 // ../../src/registry-client/src/oidc.ts
 var import_undici2 = __toESM(require_undici(), 1);
 var log2 = (...args) => (
@@ -27595,7 +27630,15 @@ var RegistryClient = class {
   #decoded = /* @__PURE__ */ new WeakMap();
   // request() calls not settled yet, awaited by drain()
   #inFlight = /* @__PURE__ */ new Set();
+  #signal;
+  /** the request's own signal joined with the client's */
+  #withSignal(own) {
+    const c = this.#signal;
+    return !c || own === c || !(own instanceof AbortSignal) ? own ?? c : AbortSignal.any([own, c]);
+  }
   constructor(options) {
+    this.#signal = options.signal;
+    if (options.signal) setMaxListeners(0, options.signal);
     const {
       cache = xdg.cache(),
       "fetch-retry-factor": timeoutFactor = 2,
@@ -27628,6 +27671,7 @@ var RegistryClient = class {
       minTimeout,
       maxTimeout,
       retryAfter: true,
+      retry,
       errorCodes: [
         "ECONNREFUSED",
         "ECONNRESET",
@@ -27831,7 +27875,7 @@ var RegistryClient = class {
       const rt = response.getHeaderString("retry-after");
       const retryAfter = rt ? Number(rt) : -1;
       if (retryAfter > 0) {
-        await setTimeout2(retryAfter * 1e3, null, { signal });
+        await setTimeout3(retryAfter * 1e3, null, { signal });
       }
       return await this.#checkLogin(url, options);
     }
@@ -27971,6 +28015,7 @@ var RegistryClient = class {
     const u = typeof url === "string" ? new URL(url) : url;
     const o = {
       ...options,
+      signal: this.#withSignal(options.signal),
       method: options.method ?? "GET",
       path: u.pathname.replace(/\/+$/, "") + u.search,
       origin: u.origin,
@@ -28029,6 +28074,7 @@ var RegistryClient = class {
     } while (this.#inFlight.size);
   }
   async request(url, options = {}) {
+    options.signal = this.#withSignal(options.signal);
     let settle;
     const tracked = new Promise((res) => settle = res);
     this.#inFlight.add(tracked);

package/{chunk-PJJCFMLW.js → chunk-3S3W7QEM.js}

@@ -12,16 +12,17 @@ var require = _vlt_createRequire(import.meta.filename);
 import {
   init,
   install
-} from "./chunk-NWHKSRO3.js";
+} from "./chunk-4UH3KMTD.js";
 import {
   commandUsage
-} from "./chunk-TLY4VGMH.js";
+} from "./chunk-CW56EJIL.js";
 import {
   assertWSConfig,
+  migratableWSConfig,
   minimatch,
   resolveWSConfig,
   splitNegatedPatterns
-} from "./chunk-CB65DPZ2.js";
+} from "./chunk-C6ZVVEFV.js";
 import {
   load,
   save
@@ -75,11 +76,12 @@ Modify/add properties using \`vlt pkg\`. For example:
 var command = async (conf) => {
   const allowScripts = conf.get("allow-scripts") ? String(conf.get("allow-scripts")) : ":not(*)";
   if (conf.values.workspace?.length) {
-    const { config: parsedWSConfig, source } = resolveWSConfig(
+    const resolved = resolveWSConfig(
       conf.options.projectRoot,
       conf.options.packageJson
     );
-    const workspacesConfig = load("workspaces", assertWSConfig) ?? (source === "package.json" ? Object.values(parsedWSConfig).flat() : void 0);
+    const parsedWSConfig = resolved.config;
+    const workspacesConfig = load("workspaces", assertWSConfig) ?? migratableWSConfig(resolved);
     const results = [];
     const addToConfig = [];
     for (const workspace of conf.values.workspace) {

package/chunk-43EJ4Q42.js

@@ -0,0 +1,57 @@
+var global = globalThis;
+import {Buffer} from "node:buffer";
+import {setTimeout as _vlt_setTimeout,clearTimeout as _vlt_clearTimeout,setImmediate as _vlt_setImmediate,clearImmediate as _vlt_clearImmediate,setInterval as _vlt_setInterval,clearInterval as _vlt_clearInterval} from "node:timers";
+globalThis.setTimeout = _vlt_setTimeout;
+globalThis.clearTimeout = _vlt_clearTimeout;
+globalThis.setImmediate = _vlt_setImmediate;
+globalThis.clearImmediate = _vlt_clearImmediate;
+globalThis.setInterval = _vlt_setInterval;
+globalThis.clearInterval = _vlt_clearInterval;
+import {createRequire as _vlt_createRequire} from "node:module";
+var require = _vlt_createRequire(import.meta.filename);
+import {
+  graphRunSync
+} from "./chunk-F7NPYSI2.js";
+
+// ../../src/cli-sdk/src/sort-scope-locations.ts
+import { resolve } from "node:path";
+var sortScopeLocations = (locations, monorepo) => {
+  if (!monorepo || locations.length < 2) return locations;
+  const wsAt = (loc) => monorepo.get(resolve(monorepo.projectRoot, loc));
+  const slots = locations.map((loc) => [loc, wsAt(loc)]);
+  const locOf = /* @__PURE__ */ new Map();
+  for (const [loc, ws] of slots) {
+    if (ws && !locOf.has(ws)) locOf.set(ws, loc);
+  }
+  const [first, ...rest] = locOf.keys();
+  if (!first || !rest.length) return locations;
+  const getDeps = (ws) => {
+    const found = [];
+    const seen = /* @__PURE__ */ new Set([ws]);
+    const queue = monorepo.getDeps(ws);
+    for (const dep of queue) {
+      if (seen.has(dep)) continue;
+      seen.add(dep);
+      if (locOf.has(dep)) found.push(dep);
+      else queue.push(...monorepo.getDeps(dep));
+    }
+    return found;
+  };
+  const sorted = graphRunSync({
+    graph: [first, ...rest],
+    getDeps,
+    visit: () => {
+    }
+  }).keys();
+  const placed = /* @__PURE__ */ new Set();
+  return slots.map(([loc, ws]) => {
+    if (!ws || placed.has(ws)) return loc;
+    placed.add(ws);
+    const next = sorted.next().value;
+    return (next && locOf.get(next)) ?? loc;
+  });
+};
+
+export {
+  sortScopeLocations
+};

package/{chunk-IHXJVKAE.js → chunk-4TSHLSRK.js}

@@ -12,7 +12,7 @@ var require = _vlt_createRequire(import.meta.filename);
 import {
   isError,
   isObject
-} from "./chunk-IBGFQR23.js";
+} from "./chunk-6LZM3I4Q.js";
 
 // ../../src/output/src/error.ts
 var parseError = (err) => {
@@ -46,5 +46,6 @@ var asRootError = (v, match) => {
 
 export {
   parseError,
+  findRootError,
   asRootError
 };