@vltpkg/cli-js 1.3.6 → 1.3.8

package/{access-SFEGWG3Y.js → access-WLKANIOE.js}

@@ -11,25 +11,25 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   resolveRegistry
-} from "./chunk-J4NHRZX6.js";
+} from "./chunk-A2TSRXZD.js";
 import {
   commandUsage
-} from "./chunk-LHIDMYN2.js";
-import "./chunk-64VFL4WI.js";
-import "./chunk-XU5WNX4S.js";
+} from "./chunk-TLY4VGMH.js";
+import "./chunk-GZ5MYMBT.js";
+import "./chunk-SE2FSMBR.js";
 import {
   RegistryClient
-} from "./chunk-F6ZN6TTL.js";
+} from "./chunk-5KOLUYXH.js";
 import "./chunk-APMYKJI2.js";
 import {
   assertOk
-} from "./chunk-PBBULTAG.js";
-import "./chunk-TY2UJ3SA.js";
+} from "./chunk-6D54UN4T.js";
+import "./chunk-6BQKR2FM.js";
 import "./chunk-U7TEQCBN.js";
 import "./chunk-XNLSTHDK.js";
 import "./chunk-PDWPFR5T.js";
 import "./chunk-Y5PA7DVK.js";
-import "./chunk-BP3PQ67D.js";
+import "./chunk-IBGFQR23.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";

package/{bugs-X2JHO4WZ.js → bugs-5Q3QSTWP.js}

@@ -14,46 +14,46 @@ import {
 } from "./chunk-CLVRCGOZ.js";
 import {
   openUrl
-} from "./chunk-AFUXQ3P4.js";
+} from "./chunk-OWMR2EDW.js";
 import {
   createHostContextsMap
-} from "./chunk-WS7BNE5S.js";
-import "./chunk-TOKUDCSW.js";
-import "./chunk-BCANUHR3.js";
+} from "./chunk-WHLYMMI2.js";
+import "./chunk-XDSZO74H.js";
+import "./chunk-KMOOTBHM.js";
 import "./chunk-G2YT2GWF.js";
-import "./chunk-CRGWLUGC.js";
+import "./chunk-IHXJVKAE.js";
 import {
   PackageInfoClient
-} from "./chunk-VI7V6OCC.js";
+} from "./chunk-DL3H4EMY.js";
 import "./chunk-SRWDPPLX.js";
 import "./chunk-WGDTG44V.js";
-import "./chunk-J4NHRZX6.js";
+import "./chunk-A2TSRXZD.js";
 import {
   Query,
   actual
-} from "./chunk-WGSYVB4F.js";
+} from "./chunk-NWHKSRO3.js";
 import {
   SecurityArchive
-} from "./chunk-2XD7RUKI.js";
+} from "./chunk-XCDLOQZZ.js";
 import {
   commandUsage
-} from "./chunk-LHIDMYN2.js";
-import "./chunk-GDYDW277.js";
+} from "./chunk-TLY4VGMH.js";
+import "./chunk-CB65DPZ2.js";
 import "./chunk-4KCU2KZL.js";
-import "./chunk-JIQBZ2UT.js";
+import "./chunk-SV4WK3KX.js";
 import {
   Spec
-} from "./chunk-64VFL4WI.js";
-import "./chunk-XU5WNX4S.js";
+} from "./chunk-GZ5MYMBT.js";
+import "./chunk-SE2FSMBR.js";
 import "./chunk-HTOTG4TS.js";
 import "./chunk-APMYKJI2.js";
-import "./chunk-PBBULTAG.js";
-import "./chunk-TY2UJ3SA.js";
+import "./chunk-6D54UN4T.js";
+import "./chunk-6BQKR2FM.js";
 import "./chunk-U7TEQCBN.js";
 import "./chunk-XNLSTHDK.js";
 import "./chunk-PDWPFR5T.js";
 import "./chunk-Y5PA7DVK.js";
-import "./chunk-BP3PQ67D.js";
+import "./chunk-IBGFQR23.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";

package/{build-BK4ITRPX.js → build-XSFR63AW.js}

@@ -11,24 +11,24 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   build
-} from "./chunk-WGSYVB4F.js";
-import "./chunk-2XD7RUKI.js";
+} from "./chunk-NWHKSRO3.js";
+import "./chunk-XCDLOQZZ.js";
 import {
   commandUsage
-} from "./chunk-LHIDMYN2.js";
-import "./chunk-GDYDW277.js";
-import "./chunk-JIQBZ2UT.js";
-import "./chunk-64VFL4WI.js";
-import "./chunk-XU5WNX4S.js";
+} from "./chunk-TLY4VGMH.js";
+import "./chunk-CB65DPZ2.js";
+import "./chunk-SV4WK3KX.js";
+import "./chunk-GZ5MYMBT.js";
+import "./chunk-SE2FSMBR.js";
 import "./chunk-HTOTG4TS.js";
-import "./chunk-TY2UJ3SA.js";
+import "./chunk-6BQKR2FM.js";
 import "./chunk-U7TEQCBN.js";
 import "./chunk-XNLSTHDK.js";
 import "./chunk-PDWPFR5T.js";
 import "./chunk-Y5PA7DVK.js";
 import {
   isErrorWithCause
-} from "./chunk-BP3PQ67D.js";
+} from "./chunk-IBGFQR23.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";

package/{cache-JRW72UJE.js → cache-UVPK5J5A.js}

@@ -15,31 +15,31 @@ import {
 import {
   stderr,
   stdout
-} from "./chunk-TOKUDCSW.js";
-import "./chunk-BCANUHR3.js";
+} from "./chunk-XDSZO74H.js";
+import "./chunk-KMOOTBHM.js";
 import "./chunk-G2YT2GWF.js";
-import "./chunk-CRGWLUGC.js";
+import "./chunk-IHXJVKAE.js";
 import "./chunk-WGDTG44V.js";
-import "./chunk-J4NHRZX6.js";
+import "./chunk-A2TSRXZD.js";
 import {
   commandUsage
-} from "./chunk-LHIDMYN2.js";
+} from "./chunk-TLY4VGMH.js";
 import {
   ViewClass
 } from "./chunk-4KCU2KZL.js";
-import "./chunk-JIQBZ2UT.js";
+import "./chunk-SV4WK3KX.js";
 import {
   Spec
-} from "./chunk-64VFL4WI.js";
-import "./chunk-XU5WNX4S.js";
+} from "./chunk-GZ5MYMBT.js";
+import "./chunk-SE2FSMBR.js";
 import {
   CacheEntry
-} from "./chunk-F6ZN6TTL.js";
+} from "./chunk-5KOLUYXH.js";
 import "./chunk-APMYKJI2.js";
 import {
   assertOk
-} from "./chunk-PBBULTAG.js";
-import "./chunk-TY2UJ3SA.js";
+} from "./chunk-6D54UN4T.js";
+import "./chunk-6BQKR2FM.js";
 import "./chunk-U7TEQCBN.js";
 import "./chunk-XNLSTHDK.js";
 import {
@@ -50,12 +50,12 @@ import {
   storeEntryNames,
   storeEntryTime,
   verifyStoreEntry
-} from "./chunk-X2WYIUFQ.js";
+} from "./chunk-H77JYU7F.js";
 import "./chunk-PDWPFR5T.js";
 import "./chunk-Y5PA7DVK.js";
 import {
   integrityHex
-} from "./chunk-BP3PQ67D.js";
+} from "./chunk-IBGFQR23.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";

package/chunk-3U6QWN62.js

@@ -0,0 +1,45 @@
+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 {
+  getId
+} from "./chunk-SV4WK3KX.js";
+
+// ../../src/cli-sdk/src/stub-node.ts
+var createStubNode = (spec, name, version, options) => ({
+  id: getId(spec, { name, version }),
+  name,
+  version,
+  confused: false,
+  edgesIn: /* @__PURE__ */ new Set(),
+  edgesOut: /* @__PURE__ */ new Map(),
+  workspaces: void 0,
+  importer: false,
+  mainImporter: false,
+  projectRoot: "",
+  dev: false,
+  optional: false,
+  graph: {},
+  options,
+  /* c8 ignore next 5 - stub methods for NodeLike interface */
+  toJSON: () => ({}),
+  toString: () => `${name}@${version}`,
+  setResolved: () => {
+  },
+  setConfusedManifest: () => {
+  },
+  maybeSetConfusedManifest: () => {
+  }
+});
+
+export {
+  createStubNode
+};

package/{chunk-2XDF3JBH.js → chunk-43HNQWPQ.js}

@@ -11,15 +11,15 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   PackageInfoClient
-} from "./chunk-VI7V6OCC.js";
+} from "./chunk-DL3H4EMY.js";
 import {
   Monorepo,
   PackageJson,
   PathScurry
-} from "./chunk-GDYDW277.js";
+} from "./chunk-CB65DPZ2.js";
 import {
   resetCaches
-} from "./chunk-JIQBZ2UT.js";
+} from "./chunk-SV4WK3KX.js";
 import {
   commands,
   defaultValues,
@@ -28,7 +28,7 @@ import {
   isRecordField,
   recordFields,
   storeLinkers
-} from "./chunk-XU5WNX4S.js";
+} from "./chunk-SE2FSMBR.js";
 import {
   find,
   load,
@@ -37,14 +37,14 @@ import {
 } from "./chunk-HTOTG4TS.js";
 import {
   storeRoot
-} from "./chunk-PBBULTAG.js";
+} from "./chunk-6D54UN4T.js";
 import {
   assertRecordStringString,
   assertRecordStringT,
   getOptions,
   isObject,
   isRecordStringString
-} from "./chunk-BP3PQ67D.js";
+} from "./chunk-IBGFQR23.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";

package/chunk-4JAZZRKR.js

@@ -0,0 +1,76 @@
+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 {
+  error
+} from "./chunk-WZWDS3W4.js";
+import {
+  __glob
+} from "./chunk-PZLD7RTK.js";
+
+// import("./commands/**/*.ts") in ../../src/cli-sdk/src/load-command.ts
+var globImport_commands_ts = __glob({
+  "./commands/access.ts": () => import("./access-WLKANIOE.js"),
+  "./commands/bugs.ts": () => import("./bugs-5Q3QSTWP.js"),
+  "./commands/build.ts": () => import("./build-XSFR63AW.js"),
+  "./commands/cache.ts": () => import("./cache-UVPK5J5A.js"),
+  "./commands/ci.ts": () => import("./ci-EDRETPUF.js"),
+  "./commands/config.ts": () => import("./config-OKBXU7TU.js"),
+  "./commands/create.ts": () => import("./create-R7BXYJSU.js"),
+  "./commands/deprecate.ts": () => import("./deprecate-YSUKBKQM.js"),
+  "./commands/dist-tag.ts": () => import("./dist-tag-MIGYSR4F.js"),
+  "./commands/docs.ts": () => import("./docs-4WVIN75H.js"),
+  "./commands/exec-cache.ts": () => import("./exec-cache-EA7GHIK7.js"),
+  "./commands/exec-local.ts": () => import("./exec-local-GM4LH56M.js"),
+  "./commands/exec.ts": () => import("./exec-IXHDQLAM.js"),
+  "./commands/help.ts": () => import("./help-TCXGBICU.js"),
+  "./commands/init.ts": () => import("./init-MWZDWQHM.js"),
+  "./commands/install.ts": () => import("./install-HPI5HU3C.js"),
+  "./commands/install/reporter.ts": () => import("./reporter-4KK2JNGO.js"),
+  "./commands/list.ts": () => import("./list-2CX6REPJ.js"),
+  "./commands/login.ts": () => import("./login-RAY23CVG.js"),
+  "./commands/logout.ts": () => import("./logout-ICB5OMGY.js"),
+  "./commands/outdated.ts": () => import("./outdated-FYHPXRMT.js"),
+  "./commands/pack.ts": () => import("./pack-E5MNPQXK.js"),
+  "./commands/ping.ts": () => import("./ping-REQ2KSAR.js"),
+  "./commands/pkg.ts": () => import("./pkg-YB4GSRII.js"),
+  "./commands/profile.ts": () => import("./profile-GKBW6GRI.js"),
+  "./commands/publish.ts": () => import("./publish-4ZQJYYLF.js"),
+  "./commands/query.ts": () => import("./query-SKXBF3MJ.js"),
+  "./commands/registry.ts": () => import("./registry-MQJJCWJY.js"),
+  "./commands/repo.ts": () => import("./repo-ACPTZI2C.js"),
+  "./commands/run-exec.ts": () => import("./run-exec-7VQX3OFG.js"),
+  "./commands/run.ts": () => import("./run-YW3ITX2A.js"),
+  "./commands/setup.ts": () => import("./setup-PLEKCMXN.js"),
+  "./commands/token.ts": () => import("./token-GB7RPE5J.js"),
+  "./commands/uninstall.ts": () => import("./uninstall-RLCECX37.js"),
+  "./commands/unpublish.ts": () => import("./unpublish-3ZXEAVHF.js"),
+  "./commands/update.ts": () => import("./update-VDZP6EZN.js"),
+  "./commands/version.ts": () => import("./version-MRELJPOK.js"),
+  "./commands/view.ts": () => import("./view-LCXMTGCJ.js"),
+  "./commands/whoami.ts": () => import("./whoami-PNRDBS45.js")
+});
+
+// ../../src/cli-sdk/src/load-command.ts
+var loadCommand = async (command) => {
+  try {
+    return await globImport_commands_ts(`./commands/${command}.ts`);
+  } catch (e) {
+    throw error("Could not load command", {
+      found: command,
+      cause: e
+    });
+  }
+};
+
+export {
+  loadCommand
+};

package/{chunk-F6ZN6TTL.js → chunk-5KOLUYXH.js}

@@ -18,10 +18,10 @@ import {
   statusText,
   storeRoot,
   tokenRefusal
-} from "./chunk-PBBULTAG.js";
+} from "./chunk-6D54UN4T.js";
 import {
   userAgent
-} from "./chunk-TY2UJ3SA.js";
+} from "./chunk-6BQKR2FM.js";
 import {
   I,
   logRequest
@@ -36,7 +36,7 @@ import {
   asError,
   integrityHex,
   integrityRE
-} from "./chunk-BP3PQ67D.js";
+} from "./chunk-IBGFQR23.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";
@@ -26320,10 +26320,15 @@ var getKC = (identity) => {
   return nkc;
 };
 var isToken = (t) => typeof t === "string" && (t.startsWith("Bearer ") || t.startsWith("Basic "));
-var deleteToken = async (registry, identity) => {
+var deleteToken = async (registry, identity, token) => {
   const kc = getKC(identity);
   await kc.load();
   kc.delete(normalizeRegistryKey(registry));
+  if (token) {
+    for (const key of kc.keysSync()) {
+      if (kc.getSync(key) === token) kc.delete(key);
+    }
+  }
   await kc.save();
 };
 var setToken = async (registry, token, identity) => {
@@ -26346,9 +26351,19 @@ var getToken = async (registry, identity) => {
   if (tok) return `Bearer ${tok}`;
   return kc.get(key);
 };
-var getTokenByURL = async (requestUrl, identity) => {
+var registryKeys = (o) => [
+  ...new Set(
+    [
+      o.registry,
+      ...Object.values(o.registries ?? {}),
+      ...Object.values(o["scoped-registries"] ?? {}),
+      ...Object.values(o["jsr-registries"] ?? {})
+    ].filter((u) => !!u && URL.canParse(u)).map(normalizeRegistryKey)
+  )
+];
+var getTokenByURL = async (requestUrl, identity, keys = []) => {
   const normalized = normalizeRegistryKey(requestUrl);
-  const candidates = [...runtimeTokens.keys()];
+  const candidates = [...runtimeTokens.keys(), ...keys];
   const envReg = process.env.VLT_REGISTRY;
   if (envReg) {
     candidates.push(normalizeRegistryKey(envReg));
@@ -27573,9 +27588,13 @@ var RegistryClient = class {
   agent;
   cache;
   identity;
+  /** configured registry keys; `VLT_TOKEN_<key>` applies under each */
+  registryKeys;
   staleWhileRevalidateFactor;
   #session = randomUUID();
   #decoded = /* @__PURE__ */ new WeakMap();
+  // request() calls not settled yet, awaited by drain()
+  #inFlight = /* @__PURE__ */ new Set();
   constructor(options) {
     const {
       cache = xdg.cache(),
@@ -27588,6 +27607,7 @@ var RegistryClient = class {
       // 48h for a 5min cache
     } = options;
     this.identity = identity;
+    this.registryKeys = registryKeys(options);
     this.staleWhileRevalidateFactor = staleWhileRevalidateFactor;
     const path = resolve4(cache, "registry-client");
     const store = options.storeRoot ?? storeRoot(cache);
@@ -27710,7 +27730,7 @@ var RegistryClient = class {
         }
       }
     } finally {
-      await deleteToken(registry, this.identity);
+      await deleteToken(registry, this.identity, tok);
     }
   }
   /**
@@ -27971,7 +27991,11 @@ var RegistryClient = class {
     o.headers = addHeader(
       o.headers,
       "authorization",
-      await getTokenByURL(String(u), this.identity)
+      await getTokenByURL(
+        String(u),
+        this.identity,
+        this.registryKeys
+      )
     );
     logRequest(url, "start", { method: o.method });
     const requestStart = Date.now();
@@ -27994,7 +28018,28 @@ var RegistryClient = class {
     }
     return { statusCode: response.statusCode, body };
   }
+  /**
+   * Settle in-flight requests and their cache writes. Await before
+   * removing the cache dir.
+   */
+  async drain() {
+    do {
+      await Promise.all(this.#inFlight);
+      await this.cache.promise();
+    } while (this.#inFlight.size);
+  }
   async request(url, options = {}) {
+    let settle;
+    const tracked = new Promise((res) => settle = res);
+    this.#inFlight.add(tracked);
+    try {
+      return await this.#request(url, options);
+    } finally {
+      this.#inFlight.delete(tracked);
+      settle();
+    }
+  }
+  async #request(url, options) {
     const u = typeof url === "string" ? new URL(url) : url;
     const {
       method = "GET",
@@ -28070,7 +28115,11 @@ var RegistryClient = class {
       options.headers = addHeader(
         options.headers,
         "authorization",
-        await getTokenByURL(String(u), this.identity)
+        await getTokenByURL(
+          String(u),
+          this.identity,
+          this.registryKeys
+        )
       );
     }
     let response = null;
@@ -28134,7 +28183,7 @@ var RegistryClient = class {
     if (response.statusCode === 401) {
       const otpResult = await otplease(this, options, response);
       if (otpResult && "retry" in otpResult) {
-        return await this.request(url, otpResult.retry);
+        return await this.#request(url, otpResult.retry);
       }
       if (otpResult && "bodyConsumed" in otpResult) {
         consumedBody = otpResult.bodyConsumed;
@@ -28162,7 +28211,7 @@ var RegistryClient = class {
       response.body.resume();
       const [nextURL, nextOptions] = redirect(options, result, url);
       if (nextOptions && nextURL) {
-        return await this.request(nextURL, nextOptions);
+        return await this.#request(nextURL, nextOptions);
       }
       return result;
     }
@@ -28188,6 +28237,7 @@ export {
   deleteToken,
   setToken,
   getToken,
+  registryKeys,
   getTokenByURL,
   CacheEntry,
   oidc,

package/{chunk-TY2UJ3SA.js → chunk-6BQKR2FM.js}

@@ -14,7 +14,7 @@ var require = _vlt_createRequire(import.meta.filename);
 var package_default = {
   name: "@vltpkg/user-agent",
   description: "The User-Agent string that vlt sends with every outbound request",
-  version: "1.3.6",
+  version: "1.3.8",
   repository: {
     type: "git",
     url: "git+https://github.com/vltpkg/vltpkg.git",

package/{chunk-PBBULTAG.js → chunk-6D54UN4T.js}

@@ -12,7 +12,7 @@ var require = _vlt_createRequire(import.meta.filename);
 import {
   asError,
   isObject
-} from "./chunk-BP3PQ67D.js";
+} from "./chunk-IBGFQR23.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";

package/{chunk-FOSDT7YU.js → chunk-6P5CFJR7.js}

@@ -11,18 +11,18 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   asUnknownSpecPrefix
-} from "./chunk-J4NHRZX6.js";
+} from "./chunk-A2TSRXZD.js";
 import {
   addKey,
   asDependency
-} from "./chunk-WGSYVB4F.js";
+} from "./chunk-NWHKSRO3.js";
 import {
   joinDepIDTuple,
   splitDepID
-} from "./chunk-JIQBZ2UT.js";
+} from "./chunk-SV4WK3KX.js";
 import {
   Spec
-} from "./chunk-64VFL4WI.js";
+} from "./chunk-GZ5MYMBT.js";
 
 // ../../src/cli-sdk/src/parse-add-remove-args.ts
 import { isAbsolute, relative, resolve } from "node:path";

package/{chunk-J4NHRZX6.js → chunk-A2TSRXZD.js}

@@ -14,7 +14,7 @@ import {
   defaultRegistryName,
   isErrorWithCause,
   isObject
-} from "./chunk-BP3PQ67D.js";
+} from "./chunk-IBGFQR23.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";