@vltpkg/cli-js 1.0.0-rc.29 → 1.0.0-rc.30

package/{exec-local-52TVUL5K.js → exec-local-5EIXJDU2.js}

@@ -12,16 +12,16 @@ var require = _vlt_createRequire(import.meta.filename);
 import {
   ExecCommand,
   views
-} from "./chunk-CLDF5XLG.js";
+} from "./chunk-FXFN5J74.js";
 import "./chunk-RIYFGX27.js";
-import "./chunk-VRIS5HAW.js";
+import "./chunk-LUL76G2K.js";
 import "./chunk-LPLXAVG7.js";
 import "./chunk-G2YT2GWF.js";
 import "./chunk-NLFBANVO.js";
 import {
   exec,
   execFG
-} from "./chunk-7RZL7BZI.js";
+} from "./chunk-E76YOTJF.js";
 import "./chunk-MAIQR5GM.js";
 import "./chunk-VTEFO2FT.js";
 import "./chunk-RXNA2XCX.js";

package/{help-LNSDVBGJ.js → help-VZXBYP36.js}

@@ -11,7 +11,7 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   loadCommand
-} from "./chunk-7WHVJ56C.js";
+} from "./chunk-HDWMQCAC.js";
 import {
   generateDefaultHelp,
   generateFullHelp

package/{init-XNMWYATA.js → init-B3GRYNH5.js}

@@ -13,8 +13,8 @@ import {
   command,
   usage,
   views
-} from "./chunk-VPKJNCKL.js";
-import "./chunk-7RZL7BZI.js";
+} from "./chunk-EGIFRSA7.js";
+import "./chunk-E76YOTJF.js";
 import "./chunk-MAIQR5GM.js";
 import "./chunk-XYCCQT7N.js";
 import "./chunk-TYV4N3S3.js";

package/{install-SKUZERZJ.js → install-GFUAOCU3.js}

@@ -11,16 +11,16 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   parseAddArgs
-} from "./chunk-CPM47YUH.js";
+} from "./chunk-AAO77QBG.js";
 import {
   InstallReporter
-} from "./chunk-ZINDEKAU.js";
+} from "./chunk-BCS77CZK.js";
 import {
   trackInstall
 } from "./chunk-G2YT2GWF.js";
 import {
   install
-} from "./chunk-7RZL7BZI.js";
+} from "./chunk-E76YOTJF.js";
 import "./chunk-MAIQR5GM.js";
 import "./chunk-VTEFO2FT.js";
 import "./chunk-RXNA2XCX.js";

package/{list-XEDVFUD5.js → list-SWSGDOS2.js}

@@ -11,10 +11,10 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   MermaidImageView
-} from "./chunk-K3RN3BGU.js";
+} from "./chunk-6SMCDBB5.js";
 import {
   createHostContextsMap
-} from "./chunk-VRIS5HAW.js";
+} from "./chunk-LUL76G2K.js";
 import "./chunk-LPLXAVG7.js";
 import "./chunk-G2YT2GWF.js";
 import "./chunk-NLFBANVO.js";
@@ -26,7 +26,7 @@ import {
   humanReadableOutput,
   jsonOutput,
   mermaidOutput
-} from "./chunk-7RZL7BZI.js";
+} from "./chunk-E76YOTJF.js";
 import {
   SecurityArchive
 } from "./chunk-MAIQR5GM.js";

package/{login-52SA2DSI.js → login-2QU5SPGP.js}

@@ -14,7 +14,7 @@ import {
 } from "./chunk-FBTBHRPG.js";
 import {
   RegistryClient
-} from "./chunk-3MWZTKGK.js";
+} from "./chunk-UUE6D7ZK.js";
 import "./chunk-YCQTLBWF.js";
 import "./chunk-R44FR7BY.js";
 import "./chunk-2V4AQPBR.js";

package/{logout-5YYHNV5W.js → logout-DVW3KZKJ.js}

@@ -14,7 +14,7 @@ import {
 } from "./chunk-FBTBHRPG.js";
 import {
   RegistryClient
-} from "./chunk-3MWZTKGK.js";
+} from "./chunk-UUE6D7ZK.js";
 import "./chunk-YCQTLBWF.js";
 import "./chunk-R44FR7BY.js";
 import "./chunk-2V4AQPBR.js";

package/{pack-B7QZHMYP.js → pack-GNYL35NY.js}

@@ -11,18 +11,18 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   packTarball
-} from "./chunk-BW6C3YUV.js";
+} from "./chunk-QI6JZT5E.js";
 import {
   prettyBytes
 } from "./chunk-LRPTCGTW.js";
 import {
   createHostContextsMap
-} from "./chunk-VRIS5HAW.js";
+} from "./chunk-LUL76G2K.js";
 import {
   Query,
   actual,
   run
-} from "./chunk-7RZL7BZI.js";
+} from "./chunk-E76YOTJF.js";
 import "./chunk-MAIQR5GM.js";
 import "./chunk-HQ4US6G3.js";
 import {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vltpkg/cli-js",
   "description": "The vlt CLI",
-  "version": "1.0.0-rc.29",
+  "version": "1.0.0-rc.30",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vltpkg/vltpkg.git",

package/{ping-PRGDYDRI.js → ping-5NKJAV3C.js}

@@ -14,7 +14,7 @@ import {
 } from "./chunk-FBTBHRPG.js";
 import {
   RegistryClient
-} from "./chunk-3MWZTKGK.js";
+} from "./chunk-UUE6D7ZK.js";
 import "./chunk-YCQTLBWF.js";
 import "./chunk-R44FR7BY.js";
 import "./chunk-2V4AQPBR.js";

package/{pkg-UEIQIVVD.js → pkg-XGXCIZCS.js}

@@ -11,7 +11,7 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   views
-} from "./chunk-VPKJNCKL.js";
+} from "./chunk-EGIFRSA7.js";
 import {
   del,
   get,
@@ -19,14 +19,14 @@ import {
 } from "./chunk-DBANBIL2.js";
 import {
   createHostContextsMap
-} from "./chunk-VRIS5HAW.js";
+} from "./chunk-LUL76G2K.js";
 import {
   GraphModifier,
   Query,
   VIRTUAL_ROOT_ID,
   actual,
   init
-} from "./chunk-7RZL7BZI.js";
+} from "./chunk-E76YOTJF.js";
 import {
   SecurityArchive
 } from "./chunk-MAIQR5GM.js";

package/{profile-46FKVQEL.js → profile-OZYH6GL2.js}

@@ -14,7 +14,7 @@ import {
 } from "./chunk-FBTBHRPG.js";
 import {
   RegistryClient
-} from "./chunk-3MWZTKGK.js";
+} from "./chunk-UUE6D7ZK.js";
 import "./chunk-YCQTLBWF.js";
 import "./chunk-R44FR7BY.js";
 import "./chunk-2V4AQPBR.js";

package/{publish-HBYHOSKH.js → publish-PUXCD3CT.js}

@@ -11,18 +11,18 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   packTarball
-} from "./chunk-BW6C3YUV.js";
+} from "./chunk-QI6JZT5E.js";
 import {
   prettyBytes
 } from "./chunk-LRPTCGTW.js";
 import {
   createHostContextsMap
-} from "./chunk-VRIS5HAW.js";
+} from "./chunk-LUL76G2K.js";
 import {
   Query,
   actual,
   run
-} from "./chunk-7RZL7BZI.js";
+} from "./chunk-E76YOTJF.js";
 import "./chunk-MAIQR5GM.js";
 import "./chunk-HQ4US6G3.js";
 import {
@@ -36,8 +36,9 @@ import {
 } from "./chunk-FBTBHRPG.js";
 import {
   RegistryClient,
-  oidc
-} from "./chunk-3MWZTKGK.js";
+  oidc,
+  registryBase
+} from "./chunk-UUE6D7ZK.js";
 import "./chunk-YCQTLBWF.js";
 import "./chunk-R44FR7BY.js";
 import "./chunk-2V4AQPBR.js";
@@ -185,6 +186,13 @@ var command = async (conf) => {
   }
   return results;
 };
+var getPublishConfig = (manifest) => {
+  const pc = manifest.publishConfig;
+  if (pc && typeof pc === "object") {
+    return pc;
+  }
+  return void 0;
+};
 var commandSingle = async (location, conf) => {
   const manifestPath = conf.options.packageJson.find(location);
   assert(manifestPath, "No package.json found");
@@ -194,14 +202,12 @@ var commandSingle = async (location, conf) => {
     !manifest.private,
     error("Package has been marked as private")
   );
-  const {
-    tag,
-    access,
-    registry,
-    "dry-run": dry = false,
-    otp
-  } = conf.options;
-  const registryUrl = new URL(registry);
+  const { "dry-run": dry = false, otp } = conf.options;
+  const publishConfig = getPublishConfig(manifest);
+  const tag = publishConfig?.tag ?? conf.options.tag;
+  const access = publishConfig?.access ?? conf.options.access;
+  const registry = publishConfig?.registry ?? conf.options.registry;
+  const registryUrl = new URL(registryBase(registry));
   const runOptions = {
     cwd: manifestDir,
     projectRoot: conf.projectRoot,
@@ -307,7 +313,10 @@ var commandSingle = async (location, conf) => {
     }
     if (response.statusCode !== 200 && response.statusCode !== 201) {
       let extraMsg = "";
-      if (response.statusCode === 404) {
+      if (response.statusCode === 409) {
+        extraMsg = `.
+\u26A0\uFE0F ${name}@${version} already exists in the registry. Bump the version and try again.`;
+      } else if (response.statusCode === 404) {
         extraMsg = ".\n\u26A0\uFE0F Make sure you're logged in and have access to publish the package.";
       }
       throw error(`Failed to publish package${extraMsg}`, {

package/{query-5A4YLS2C.js → query-TUQMPQGD.js}

@@ -11,13 +11,13 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   MermaidImageView
-} from "./chunk-K3RN3BGU.js";
+} from "./chunk-6SMCDBB5.js";
 import {
   createDiffFilesProvider
 } from "./chunk-RIYFGX27.js";
 import {
   createHostContextsMap
-} from "./chunk-VRIS5HAW.js";
+} from "./chunk-LUL76G2K.js";
 import "./chunk-LPLXAVG7.js";
 import "./chunk-G2YT2GWF.js";
 import "./chunk-NLFBANVO.js";
@@ -29,7 +29,7 @@ import {
   humanReadableOutput,
   jsonOutput,
   mermaidOutput
-} from "./chunk-7RZL7BZI.js";
+} from "./chunk-E76YOTJF.js";
 import {
   SecurityArchive
 } from "./chunk-MAIQR5GM.js";

package/registry-client-package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vltpkg/registry-client",
   "description": "Fetch package artifacts and metadata from registries",
-  "version": "1.0.0-rc.29",
+  "version": "1.0.0-rc.30",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vltpkg/vltpkg.git",

package/registry-client-src-revalidate.js

@@ -30298,6 +30298,7 @@ var normalizeRegistryKey = (url) => {
   const u4 = new URL(url);
   return (u4.origin + u4.pathname).replace(/\/+$/, "");
 };
+var registryBase = (url) => url.endsWith("/") ? url : url + "/";
 var keychains = /* @__PURE__ */ new Map();
 var runtimeTokens = /* @__PURE__ */ new Map();
 var getKC = (identity) => {
@@ -30316,7 +30317,9 @@ var deleteToken = async (registry, identity) => {
 };
 var setToken = async (registry, token, identity) => {
   const kc = getKC(identity);
-  return kc.set(normalizeRegistryKey(registry), token);
+  await kc.load();
+  kc.set(normalizeRegistryKey(registry), token);
+  await kc.save();
 };
 var getToken = async (registry, identity) => {
   const kc = getKC(identity);
@@ -30951,8 +30954,10 @@ var otplease = async (client, options, response) => {
     );
     if (challenge) {
       return {
-        ...options,
-        otp: (await client.webAuthOpener(challenge)).token
+        retry: {
+          ...options,
+          otp: (await client.webAuthOpener(challenge)).token
+        }
       };
     }
     const { "npm-notice": npmNotice } = response.headers;
@@ -30963,8 +30968,10 @@ var otplease = async (client, options, response) => {
         await urlOpen(match[1]);
         log2(notice);
         return {
-          ...options,
-          otp: await question("OTP: ")
+          retry: {
+            ...options,
+            otp: await question("OTP: ")
+          }
         };
       }
     }
@@ -30972,16 +30979,25 @@ var otplease = async (client, options, response) => {
       response
     });
   }
+  if (wwwAuth.has("bearer")) {
+    throw error(
+      "Missing or invalid authentication token. Run `vlt login` or `vlt token add` to authenticate.",
+      { response }
+    );
+  }
   if (wwwAuth.size) {
     throw error("Unknown authentication challenge", { response });
   }
   const text = await response.body.text().catch(() => "");
   if (text.toLowerCase().includes("one-time pass")) {
     return {
-      ...options,
-      otp: await question(text)
+      retry: {
+        ...options,
+        otp: await question(text)
+      }
     };
   }
+  return { bodyConsumed: text };
 };
 
 // ../../src/registry-client/src/redirect.ts
@@ -31148,14 +31164,15 @@ var RegistryClient = class {
     const tok = await getToken(registry, this.identity);
     if (!tok) return;
     const s = tok.replace(/^(Bearer|Basic) /i, "");
-    const tokensUrl = new URL("-/npm/v1/tokens", registry);
+    const base = registryBase(registry);
+    const tokensUrl = new URL("-/npm/v1/tokens", base);
     const record = await this.seek(tokensUrl, ({ token }) => s.startsWith(token), {
       useCache: false
     }).catch(() => void 0);
     if (record) {
       const { key } = record;
       await this.request(
-        new URL(`-/npm/v1/tokens/token/${key}`, registry),
+        new URL(`-/npm/v1/tokens/token/${key}`, base),
         { useCache: false, method: "DELETE" }
       );
     }
@@ -31168,7 +31185,7 @@ var RegistryClient = class {
    * and returns void if it worked. Otherwise, error is raised.
    */
   async login(registry) {
-    const webLoginURL = new URL("-/v1/login", registry);
+    const webLoginURL = new URL("-/v1/login", registryBase(registry));
     const response = await this.request(webLoginURL, {
       method: "POST",
       useCache: false,
@@ -31337,9 +31354,15 @@ var RegistryClient = class {
   }
   async #handleResponse(url, options, response, entry) {
     if (handleCacheHitResponse(response, entry)) return entry;
+    let consumedBody;
     if (response.statusCode === 401) {
-      const repeatRequest = await otplease(this, options, response);
-      if (repeatRequest) return await this.request(url, repeatRequest);
+      const otpResult = await otplease(this, options, response);
+      if (otpResult && "retry" in otpResult) {
+        return await this.request(url, otpResult.retry);
+      }
+      if (otpResult && "bodyConsumed" in otpResult) {
+        consumedBody = otpResult.bodyConsumed;
+      }
     }
     const h = [];
     for (const [key, value] of Object.entries(response.headers)) {
@@ -31353,6 +31376,10 @@ var RegistryClient = class {
       }
     }
     const { integrity, trustIntegrity } = options;
+    const contentLength = consumedBody !== void 0 ? consumedBody.length : response.headers["content-length"] ? Number(response.headers["content-length"]) : (
+      /* c8 ignore next */
+      void 0
+    );
     const result = new CacheEntry(
       /* c8 ignore next - should always have a status code */
       response.statusCode || 200,
@@ -31361,10 +31388,7 @@ var RegistryClient = class {
         integrity,
         trustIntegrity,
         "stale-while-revalidate-factor": this.staleWhileRevalidateFactor,
-        contentLength: response.headers["content-length"] ? Number(response.headers["content-length"]) : (
-          /* c8 ignore next */
-          void 0
-        )
+        contentLength
       }
     );
     if (isRedirect(result)) {
@@ -31375,6 +31399,12 @@ var RegistryClient = class {
       }
       return result;
     }
+    if (consumedBody !== void 0) {
+      if (consumedBody.length > 0) {
+        result.addBody(new TextEncoder().encode(consumedBody));
+      }
+      return result;
+    }
     response.body.on(
       "data",
       (chunk) => result.addBody(chunk)

package/{repo-I6X66PHD.js → repo-ALXGJFIG.js}

@@ -14,17 +14,17 @@ import {
 } from "./chunk-FXDRM4ZO.js";
 import {
   createHostContextsMap
-} from "./chunk-VRIS5HAW.js";
+} from "./chunk-LUL76G2K.js";
 import {
   Query,
   actual
-} from "./chunk-7RZL7BZI.js";
+} from "./chunk-E76YOTJF.js";
 import {
   SecurityArchive
 } from "./chunk-MAIQR5GM.js";
 import {
   PackageInfoClient
-} from "./chunk-HAGUS4HI.js";
+} from "./chunk-DPQWORL7.js";
 import "./chunk-HQ4US6G3.js";
 import "./chunk-XYCCQT7N.js";
 import "./chunk-TYV4N3S3.js";
@@ -35,7 +35,7 @@ import "./chunk-HTOTG4TS.js";
 import {
   commandUsage
 } from "./chunk-FBTBHRPG.js";
-import "./chunk-3MWZTKGK.js";
+import "./chunk-UUE6D7ZK.js";
 import {
   urlOpen
 } from "./chunk-YCQTLBWF.js";

package/{reporter-NUXJTV4G.js → reporter-MSQWYN76.js}

@@ -11,7 +11,7 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   InstallReporter
-} from "./chunk-ZINDEKAU.js";
+} from "./chunk-BCS77CZK.js";
 import "./chunk-VTEFO2FT.js";
 import "./chunk-RXNA2XCX.js";
 import "./chunk-WGDTG44V.js";

package/{run-VEZMUMVH.js → run-GM2E5WHJ.js}

@@ -12,16 +12,16 @@ var require = _vlt_createRequire(import.meta.filename);
 import {
   ExecCommand,
   views
-} from "./chunk-CLDF5XLG.js";
+} from "./chunk-FXFN5J74.js";
 import "./chunk-RIYFGX27.js";
-import "./chunk-VRIS5HAW.js";
+import "./chunk-LUL76G2K.js";
 import "./chunk-LPLXAVG7.js";
 import "./chunk-G2YT2GWF.js";
 import "./chunk-NLFBANVO.js";
 import {
   run,
   runFG
-} from "./chunk-7RZL7BZI.js";
+} from "./chunk-E76YOTJF.js";
 import "./chunk-MAIQR5GM.js";
 import "./chunk-VTEFO2FT.js";
 import "./chunk-RXNA2XCX.js";

package/{run-exec-6ADY4BKH.js → run-exec-3AMM56A3.js}

@@ -12,16 +12,16 @@ var require = _vlt_createRequire(import.meta.filename);
 import {
   ExecCommand,
   views
-} from "./chunk-CLDF5XLG.js";
+} from "./chunk-FXFN5J74.js";
 import "./chunk-RIYFGX27.js";
-import "./chunk-VRIS5HAW.js";
+import "./chunk-LUL76G2K.js";
 import "./chunk-LPLXAVG7.js";
 import "./chunk-G2YT2GWF.js";
 import "./chunk-NLFBANVO.js";
 import {
   runExec,
   runExecFG
-} from "./chunk-7RZL7BZI.js";
+} from "./chunk-E76YOTJF.js";
 import "./chunk-MAIQR5GM.js";
 import "./chunk-VTEFO2FT.js";
 import "./chunk-RXNA2XCX.js";

package/{src-O32QL33R.js → src-QQVS7FWK.js}

@@ -11,7 +11,7 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   loadCommand
-} from "./chunk-7WHVJ56C.js";
+} from "./chunk-HDWMQCAC.js";
 import {
   indent,
   outputCommand,
@@ -27,14 +27,14 @@ import {
 } from "./chunk-IYO5QKUW.js";
 import {
   Config
-} from "./chunk-M7HPHM7B.js";
-import "./chunk-HAGUS4HI.js";
+} from "./chunk-CX6CSVSZ.js";
+import "./chunk-DPQWORL7.js";
 import "./chunk-HQ4US6G3.js";
 import "./chunk-XYCCQT7N.js";
 import "./chunk-TYV4N3S3.js";
 import "./chunk-IEISSXS4.js";
 import "./chunk-HTOTG4TS.js";
-import "./chunk-3MWZTKGK.js";
+import "./chunk-UUE6D7ZK.js";
 import "./chunk-YCQTLBWF.js";
 import "./chunk-R44FR7BY.js";
 import {