@vltpkg/cli-js 1.0.9 → 1.1.0

package/{access-5DJJIIGD.js → access-GLWBGQLN.js}

@@ -11,19 +11,21 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   resolveRegistry
-} from "./chunk-5JFRXIK2.js";
+} from "./chunk-2PWSMJD7.js";
 import {
   commandUsage
-} from "./chunk-PTR5IGFQ.js";
+} from "./chunk-CBASIDQH.js";
 import "./chunk-XKVU23NC.js";
-import "./chunk-XISRK3R5.js";
+import "./chunk-CEHPRPGQ.js";
 import {
   RegistryClient
-} from "./chunk-ATYE2HQV.js";
-import "./chunk-HAYXR3MW.js";
+} from "./chunk-GJGQTRAT.js";
+import "./chunk-APMYKJI2.js";
+import {
+  assertOk
+} from "./chunk-SNOBGFNM.js";
 import "./chunk-E74WGW5C.js";
-import "./chunk-LPIBYUMT.js";
-import "./chunk-UBLFPJHV.js";
+import "./chunk-U7TEQCBN.js";
 import "./chunk-VFBCWAOC.js";
 import "./chunk-XNLSTHDK.js";
 import "./chunk-BHJT53TP.js";
@@ -116,6 +118,7 @@ var command = async (conf) => {
   }
 };
 var encodePkgName = (name) => name.startsWith("@") ? `@${encodeURIComponent(name.slice(1))}` : encodeURIComponent(name);
+var accessAdvice = (what) => (statusCode) => statusCode === 401 ? "Run `vlt login` and try again." : statusCode === 403 ? `This account cannot ${what}. Run \`vlt whoami\` to see who you are logged in as.` : statusCode === 404 ? "Not found. Check the name, and that this account has access to it." : void 0;
 var listPackages = async (conf, args) => {
   const [keyword, entity] = args;
   if (keyword !== "packages") {
@@ -132,6 +135,11 @@ var listPackages = async (conf, args) => {
     registryUrl
   );
   const response = await rc.request(url, { useCache: false });
+  assertOk(response, {
+    message: "Failed to list packages",
+    url,
+    advice: accessAdvice("list packages for this scope")
+  });
   const data = response.json();
   return { packages: data };
 };
@@ -155,6 +163,11 @@ var getStatus = async (conf, args) => {
     registryUrl
   );
   const response = await rc.request(url, { useCache: false });
+  assertOk(response, {
+    message: "Failed to get package access status",
+    url,
+    advice: accessAdvice("read access for this package")
+  });
   const data = response.json();
   return { package: pkg, access: data.access };
 };
@@ -185,13 +198,19 @@ var setStatus = async (conf, args) => {
     `-/package/${encodePkgName(pkg)}/access`,
     registryUrl
   );
-  await rc.request(url, {
+  const response = await rc.request(url, {
     method: "PUT",
     headers: { "content-type": "application/json" },
     body: JSON.stringify({ access: accessLevel }),
     otp: conf.options.otp,
     useCache: false
   });
+  assertOk(response, {
+    message: "Failed to set package access status",
+    url,
+    method: "PUT",
+    advice: accessAdvice("change access for this package")
+  });
   return { package: pkg, access: accessLevel };
 };
 var grant = async (conf, args) => {
@@ -223,7 +242,7 @@ var grant = async (conf, args) => {
     `-/team/${encodeURIComponent(scope)}/${encodeURIComponent(team)}/package`,
     registryUrl
   );
-  await rc.request(url, {
+  const response = await rc.request(url, {
     method: "PUT",
     headers: { "content-type": "application/json" },
     body: JSON.stringify({
@@ -233,6 +252,12 @@ var grant = async (conf, args) => {
     otp: conf.options.otp,
     useCache: false
   });
+  assertOk(response, {
+    message: "Failed to grant team access",
+    url,
+    method: "PUT",
+    advice: accessAdvice("grant access for this team")
+  });
   return {
     granted: {
       team: `${scope}:${team}`,
@@ -262,13 +287,19 @@ var revoke = async (conf, args) => {
     `-/team/${encodeURIComponent(scope)}/${encodeURIComponent(team)}/package`,
     registryUrl
   );
-  await rc.request(url, {
+  const response = await rc.request(url, {
     method: "DELETE",
     headers: { "content-type": "application/json" },
     body: JSON.stringify({ package: pkgName }),
     otp: conf.options.otp,
     useCache: false
   });
+  assertOk(response, {
+    message: "Failed to revoke team access",
+    url,
+    method: "DELETE",
+    advice: accessAdvice("revoke access for this team")
+  });
   return {
     revoked: {
       team: `${scope}:${team}`

package/{bugs-NRHU4ENC.js → bugs-OCQYFWFE.js}

@@ -14,42 +14,42 @@ import {
 } from "./chunk-CLVRCGOZ.js";
 import {
   openUrl
-} from "./chunk-2HDWM6AD.js";
+} from "./chunk-TXTK2PKN.js";
 import {
   createHostContextsMap
-} from "./chunk-6NQBG3ZR.js";
+} from "./chunk-6LEMBT22.js";
+import "./chunk-TNEMFBP5.js";
+import "./chunk-HYCYL4RX.js";
+import "./chunk-G2YT2GWF.js";
+import "./chunk-GDJ7JT2R.js";
 import {
   PackageInfoClient
-} from "./chunk-HRY5MJCA.js";
+} from "./chunk-CTQSUNNE.js";
 import "./chunk-ZWKI5OSF.js";
-import "./chunk-MXCWH7WC.js";
-import "./chunk-YAIKXFLN.js";
-import "./chunk-G2YT2GWF.js";
-import "./chunk-GDJ7JT2R.js";
-import "./chunk-5JFRXIK2.js";
 import "./chunk-WGDTG44V.js";
+import "./chunk-2PWSMJD7.js";
 import {
   Query,
   actual
-} from "./chunk-LHMEJF6J.js";
+} from "./chunk-47M7IZ5P.js";
 import {
   SecurityArchive
-} from "./chunk-2YJ5MESP.js";
-import "./chunk-USTJECVS.js";
-import "./chunk-YOE3VZFX.js";
+} from "./chunk-ZDQJWRCU.js";
 import {
   commandUsage
-} from "./chunk-PTR5IGFQ.js";
+} from "./chunk-CBASIDQH.js";
+import "./chunk-X2AWQGYG.js";
+import "./chunk-4KCU2KZL.js";
+import "./chunk-YOE3VZFX.js";
 import {
   Spec
 } from "./chunk-XKVU23NC.js";
-import "./chunk-XISRK3R5.js";
-import "./chunk-4KCU2KZL.js";
+import "./chunk-CEHPRPGQ.js";
 import "./chunk-HTOTG4TS.js";
-import "./chunk-HAYXR3MW.js";
+import "./chunk-APMYKJI2.js";
+import "./chunk-SNOBGFNM.js";
 import "./chunk-E74WGW5C.js";
-import "./chunk-LPIBYUMT.js";
-import "./chunk-UBLFPJHV.js";
+import "./chunk-U7TEQCBN.js";
 import "./chunk-VFBCWAOC.js";
 import "./chunk-XNLSTHDK.js";
 import "./chunk-BHJT53TP.js";

package/{build-5VZJTEBD.js → build-CPWGNTCM.js}

@@ -11,19 +11,18 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   build
-} from "./chunk-LHMEJF6J.js";
-import "./chunk-2YJ5MESP.js";
-import "./chunk-USTJECVS.js";
-import "./chunk-YOE3VZFX.js";
+} from "./chunk-47M7IZ5P.js";
+import "./chunk-ZDQJWRCU.js";
 import {
   commandUsage
-} from "./chunk-PTR5IGFQ.js";
+} from "./chunk-CBASIDQH.js";
+import "./chunk-X2AWQGYG.js";
+import "./chunk-YOE3VZFX.js";
 import "./chunk-XKVU23NC.js";
-import "./chunk-XISRK3R5.js";
+import "./chunk-CEHPRPGQ.js";
 import "./chunk-HTOTG4TS.js";
 import "./chunk-E74WGW5C.js";
-import "./chunk-LPIBYUMT.js";
-import "./chunk-UBLFPJHV.js";
+import "./chunk-U7TEQCBN.js";
 import {
   isErrorWithCause
 } from "./chunk-VFBCWAOC.js";

package/{cache-QZ5XII4U.js → cache-SL7DQMY2.js}

@@ -15,30 +15,32 @@ import {
 import {
   stderr,
   stdout
-} from "./chunk-MXCWH7WC.js";
-import "./chunk-YAIKXFLN.js";
+} from "./chunk-TNEMFBP5.js";
+import "./chunk-HYCYL4RX.js";
 import "./chunk-G2YT2GWF.js";
 import "./chunk-GDJ7JT2R.js";
-import "./chunk-5JFRXIK2.js";
 import "./chunk-WGDTG44V.js";
-import "./chunk-YOE3VZFX.js";
+import "./chunk-2PWSMJD7.js";
 import {
   commandUsage
-} from "./chunk-PTR5IGFQ.js";
-import {
-  Spec
-} from "./chunk-XKVU23NC.js";
-import "./chunk-XISRK3R5.js";
+} from "./chunk-CBASIDQH.js";
 import {
   ViewClass
 } from "./chunk-4KCU2KZL.js";
+import "./chunk-YOE3VZFX.js";
+import {
+  Spec
+} from "./chunk-XKVU23NC.js";
+import "./chunk-CEHPRPGQ.js";
 import {
   CacheEntry
-} from "./chunk-ATYE2HQV.js";
-import "./chunk-HAYXR3MW.js";
+} from "./chunk-GJGQTRAT.js";
+import "./chunk-APMYKJI2.js";
+import {
+  assertOk
+} from "./chunk-SNOBGFNM.js";
 import "./chunk-E74WGW5C.js";
-import "./chunk-LPIBYUMT.js";
-import "./chunk-UBLFPJHV.js";
+import "./chunk-U7TEQCBN.js";
 import "./chunk-VFBCWAOC.js";
 import "./chunk-XNLSTHDK.js";
 import "./chunk-BHJT53TP.js";
@@ -297,12 +299,16 @@ var add = async (conf, specs, view2) => {
       staleWhileRevalidate: false
     }).then(async (r) => {
       const { resolved, integrity } = r;
-      await (await packageInfo.getRegistryClient()).request(resolved, {
+      const response = await (await packageInfo.getRegistryClient()).request(resolved, {
         ...conf.options,
         integrity,
         staleWhileRevalidate: false,
         query: void 0
       });
+      assertOk(response, {
+        message: `Failed to cache ${spec}`,
+        url: resolved
+      });
       view2?.stdout("+", spec, r.resolved);
     });
     promises.push(p);

package/chunk-2IMBYPYC.js

@@ -0,0 +1,190 @@
+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 {
+  assertRegistryKeys,
+  configWriteTarget,
+  pairsToRecords,
+  registrySelectionFields,
+  registrySelectors
+} from "./chunk-J2XWQVDK.js";
+import {
+  normalizeRegistryURL
+} from "./chunk-2PWSMJD7.js";
+import {
+  getCommand,
+  isRecordField
+} from "./chunk-CEHPRPGQ.js";
+import {
+  find
+} from "./chunk-HTOTG4TS.js";
+import {
+  defaultGitHostArchives,
+  defaultGitHosts,
+  defaultJsrRegistries,
+  defaultRegistries,
+  defaultRegistryName,
+  isObject
+} from "./chunk-VFBCWAOC.js";
+import {
+  error
+} from "./chunk-WZWDS3W4.js";
+
+// ../../src/cli-sdk/src/persist-spec-config.ts
+var specConfigFields = [
+  "registry",
+  "registries",
+  "default-registry-alias",
+  "scoped-registries",
+  "jsr-registries",
+  "git-hosts",
+  "git-host-archives"
+];
+var builtins = {
+  registries: defaultRegistries,
+  "jsr-registries": defaultJsrRegistries,
+  "git-hosts": defaultGitHosts,
+  "git-host-archives": defaultGitHostArchives
+};
+var urlFields = /* @__PURE__ */ new Set([
+  "registry",
+  "registries",
+  "scoped-registries",
+  "jsr-registries"
+]);
+var norm = (field, v) => urlFields.has(field) ? normalizeRegistryURL(v) : v;
+var redact = (value) => {
+  if (!URL.canParse(value)) return value;
+  const url = new URL(value);
+  if (!url.username && !url.password) return value;
+  url.username = "";
+  url.password = "";
+  return url.href.replace("://", "://***@");
+};
+var fromLayer = (layer, field, key) => {
+  const v = layer?.[field];
+  const r = key === void 0 ? v : v && typeof v === "object" ? v[key] : void 0;
+  return typeof r === "string" ? r : void 0;
+};
+var isNulled = (layer, field, key) => {
+  const v = layer?.[field];
+  return key === void 0 ? v === null : isObject(v) && v[key] === null;
+};
+var conflictError = (field, key, current, wanted, file, block) => {
+  const name = (block ? `command.${block}.` : "") + (key === void 0 ? field : `${field}.${key}`);
+  const cur = redact(current);
+  const flag = key === void 0 ? `--${field}=${cur}` : `--${field} ${key}=${cur}`;
+  return error(
+    [
+      `${name} is already set to ${cur} in ${file}.`,
+      "",
+      `Pass \`${flag}\`${key === void 0 ? "" : ", use another name,"} or run`,
+      block ? "`vlt config edit` to change it first." : `\`vlt config set ${name}=${redact(wanted)}\` first.`
+    ].join("\n"),
+    { code: "ECONFIG", found: wanted, wanted: current }
+  );
+};
+var ownsSelection = (layer) => registrySelectionFields.some((f) => f in (layer ?? {}));
+var planSpecConfigPersist = (conf) => {
+  if (!conf.get("save-config")) return void 0;
+  const explicit = pairsToRecords(conf.explicit);
+  if (!specConfigFields.some((f) => f in explicit)) return void 0;
+  const which = configWriteTarget(conf, "project");
+  const target = conf.layers[which];
+  const other = conf.layers[which === "project" ? "user" : "project"];
+  const otherSelectors = which === "user" || !ownsSelection(target);
+  const blocks = target?.command ?? {};
+  const blockName = Object.keys(blocks).filter((n) => getCommand(n) === conf.command).at(-1);
+  const block = blockName ? blocks[blockName] : void 0;
+  const staged = {};
+  for (const field of specConfigFields) {
+    const v = explicit[field];
+    if (v === void 0) continue;
+    const entries2 = isRecordField(field) ? Object.entries(v) : [[void 0, v]];
+    for (const [key, raw] of entries2) {
+      if (key === "") {
+        throw error(`${field} has an entry with no name.`, {
+          code: "ECONFIG",
+          found: `=${raw}`,
+          wanted: `<name>=${raw}`
+        });
+      }
+      if (key !== void 0 && field === "registries") {
+        assertRegistryKeys({ [key]: raw }, `--${field}`);
+      }
+      if (key !== void 0 && !raw) {
+        throw error(`${field}.${key} has no value.`, {
+          code: "ECONFIG",
+          found: key,
+          wanted: `${key}=<value>`
+        });
+      }
+      if (!raw) continue;
+      const value = norm(field, raw);
+      const inBlock = fromLayer(block, field, key);
+      if (inBlock !== void 0) {
+        if (norm(field, inBlock) === value) continue;
+        throw conflictError(
+          field,
+          key,
+          inBlock,
+          value,
+          find(which),
+          blockName
+        );
+      }
+      const toBlock = key !== void 0 && isObject(block?.[field]) ? blockName : void 0;
+      const current = toBlock === void 0 ? fromLayer(target, field, key) : void 0;
+      if (current !== void 0) {
+        if (norm(field, current) === value) continue;
+        throw conflictError(field, key, current, value, find(which));
+      }
+      const inOther = toBlock !== void 0 || isNulled(target, field, key) || key === void 0 && !otherSelectors ? void 0 : fromLayer(other, field, key);
+      const builtin = key !== void 0 ? builtins[field]?.[key] : field === "default-registry-alias" ? defaultRegistryName : void 0;
+      const inEffect = inOther ?? builtin;
+      if (inEffect !== void 0 && norm(field, inEffect) === value) {
+        continue;
+      }
+      let dest = staged;
+      if (toBlock !== void 0) {
+        const cmds = staged.command ??= {};
+        dest = cmds[toBlock] ??= {};
+      }
+      if (key === void 0) dest[field] = value;
+      else {
+        const rec = dest[field] ??= {};
+        rec[key] = value;
+      }
+    }
+  }
+  if (!Object.keys(staged).length) return void 0;
+  const { user } = conf.layers;
+  if (which === "project" && ownsSelection(staged) && !ownsSelection(target)) {
+    for (const f of registrySelectors) {
+      const v = fromLayer(user, f);
+      if (v !== void 0 && !(f in staged)) staged[f] = v;
+    }
+    const alias = staged["default-registry-alias"];
+    const url = alias && fromLayer(user, "registries", alias);
+    const regs = staged.registries ?? {};
+    if (url && !(alias in regs)) {
+      staged.registries = { ...regs, [alias]: url };
+    }
+  }
+  return { which, values: staged };
+};
+var entries = (path, v) => isObject(v) ? Object.entries(v).flatMap(([k, x]) => entries(`${path}.${k}`, x)) : [`${path}=${redact(String(v))}`];
+var persistedEntries = (values) => Object.entries(values).flatMap(([f, v]) => entries(f, v));
+
+export {
+  planSpecConfigPersist,
+  persistedEntries
+};

package/{chunk-5JFRXIK2.js → chunk-2PWSMJD7.js}

@@ -11,7 +11,9 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   defaultRegistries,
-  defaultRegistryName
+  defaultRegistryName,
+  isErrorWithCause,
+  isObject
 } from "./chunk-VFBCWAOC.js";
 import {
   error
@@ -68,6 +70,21 @@ var missingRegistryError = () => error(
   ].join("\n"),
   { code: "ECONFIG" }
 );
+var normalizeRegistryURL = (url) => url.replace(/\/*$/, "/");
+var unknownSpecPrefixError = (prefix, spec, validOptions) => error(
+  [
+    `Unknown spec prefix "${prefix}:" in "${spec}".`,
+    "",
+    `Define it with \`--registries ${prefix}=<url>\` or`,
+    `\`--git-hosts ${prefix}=<template>\` (add \`--save-config\` to keep`,
+    `it in vlt.json), or run \`vlt config set registries.${prefix}=<url>\`.`
+  ].join("\n"),
+  { code: "ECONFIG", found: `${prefix}:`, validOptions }
+);
+var asUnknownSpecPrefix = (er) => {
+  const { found, spec, validOptions } = isErrorWithCause(er) && isObject(er.cause) ? er.cause : {};
+  return typeof found === "string" && /^[^:]+:$/.test(found) && typeof spec === "string" && er.message.startsWith("Protocol ") ? unknownSpecPrefixError(found.slice(0, -1), spec, validOptions) : er;
+};
 var missingNpmRegistryError = (alias = defaultRegistryName) => error(
   [
     `Missing ${alias} registry configuration.`,
@@ -144,6 +161,8 @@ var resolveRegistry = async (conf, {
 
 export {
   missingRegistryError,
+  normalizeRegistryURL,
+  asUnknownSpecPrefix,
   missingNpmRegistryError,
   hasConfiguredRegistry,
   hasNpmRegistry,