@vltpkg/cli-js 1.0.0-rc.32 → 1.0.0-rc.33

package/{chunk-LEX7YPHR.js → chunk-4SSFBFB5.js}

@@ -10,9 +10,9 @@ globalThis.clearInterval = _vlt_clearInterval;
 import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
-  Zn,
+  Qn,
   require_lib
-} from "./chunk-HQ4US6G3.js";
+} from "./chunk-FWKQ7YDF.js";
 import {
   Monorepo,
   PackageJson,
@@ -20,20 +20,20 @@ import {
   pickManifest,
   resolve,
   revs
-} from "./chunk-KRGA5VLT.js";
-import {
-  Spec2 as Spec
-} from "./chunk-JKAZKVQU.js";
+} from "./chunk-ICJRCXSG.js";
 import {
   RegistryClient
-} from "./chunk-DI2CYYXF.js";
+} from "./chunk-BAUMCTQK.js";
 import {
   rimraf
-} from "./chunk-R44FR7BY.js";
+} from "./chunk-7NHXV6AH.js";
+import {
+  Spec2 as Spec
+} from "./chunk-PW6S6AIO.js";
 import {
   asError,
   asPackument
-} from "./chunk-6YXVQ5HC.js";
+} from "./chunk-2PLIV3N3.js";
 import {
   XDG
 } from "./chunk-XNLSTHDK.js";
@@ -49,10 +49,10 @@ import { randomBytes } from "node:crypto";
 import { lstat, mkdir, rename, writeFile } from "node:fs/promises";
 import { basename as basename2, dirname, resolve as resolve2, sep } from "node:path";
 
-// ../../node_modules/.vlt/~npm~tar@7.5.13/node_modules/tar/dist/esm/header.js
+// ../../node_modules/.vlt/~npm~tar@7.5.20/node_modules/tar/dist/esm/header.js
 import { posix as pathModule } from "node:path";
 
-// ../../node_modules/.vlt/~npm~tar@7.5.13/node_modules/tar/dist/esm/large-numbers.js
+// ../../node_modules/.vlt/~npm~tar@7.5.20/node_modules/tar/dist/esm/large-numbers.js
 var encode = (num, buf) => {
   if (!Number.isSafeInteger(num)) {
     throw Error("cannot encode number outside of javascript safe integer range");
@@ -133,8 +133,20 @@ var pos = (buf) => {
 var onesComp = (byte) => (255 ^ byte) & 255;
 var twosComp = (byte) => (255 ^ byte) + 1 & 255;
 
-// ../../node_modules/.vlt/~npm~tar@7.5.13/node_modules/tar/dist/esm/types.js
+// ../../node_modules/.vlt/~npm~tar@7.5.20/node_modules/tar/dist/esm/types.js
 var isCode = (c) => name.has(c);
+var normalFsTypes = /* @__PURE__ */ new Set([
+  "0",
+  "",
+  "1",
+  "2",
+  "3",
+  "4",
+  "5",
+  "6",
+  "7",
+  "D"
+]);
 var name = /* @__PURE__ */ new Map([
   ["0", "File"],
   // same as File
@@ -176,7 +188,8 @@ var name = /* @__PURE__ */ new Map([
 ]);
 var code = new Map(Array.from(name).map((kv) => [kv[1], kv[0]]));
 
-// ../../node_modules/.vlt/~npm~tar@7.5.13/node_modules/tar/dist/esm/header.js
+// ../../node_modules/.vlt/~npm~tar@7.5.20/node_modules/tar/dist/esm/header.js
+var notNegative = (n) => n === void 0 || n < 0 ? void 0 : n;
 var Header = class {
   cksumValid = false;
   needPax = false;
@@ -213,18 +226,21 @@ var Header = class {
     if (!buf || !(buf.length >= off + 512)) {
       throw new Error("need 512 bytes for header");
     }
-    this.path = ex?.path ?? decString(buf, off, 100);
-    this.mode = ex?.mode ?? gex?.mode ?? decNumber(buf, off + 100, 8);
-    this.uid = ex?.uid ?? gex?.uid ?? decNumber(buf, off + 108, 8);
-    this.gid = ex?.gid ?? gex?.gid ?? decNumber(buf, off + 116, 8);
-    this.size = ex?.size ?? gex?.size ?? decNumber(buf, off + 124, 12);
-    this.mtime = ex?.mtime ?? gex?.mtime ?? decDate(buf, off + 136, 12);
-    this.cksum = decNumber(buf, off + 148, 12);
-    if (gex)
-      this.#slurp(gex, true);
-    if (ex)
-      this.#slurp(ex);
     const t = decString(buf, off + 156, 1);
+    const isNormalFS = normalFsTypes.has(t);
+    const exForFields = isNormalFS ? ex : void 0;
+    const gexForFields = isNormalFS ? gex : void 0;
+    this.path = exForFields?.path ?? decString(buf, off, 100);
+    this.mode = exForFields?.mode ?? gexForFields?.mode ?? decNumber(buf, off + 100, 8);
+    this.uid = exForFields?.uid ?? gexForFields?.uid ?? decNumber(buf, off + 108, 8);
+    this.gid = exForFields?.gid ?? gexForFields?.gid ?? decNumber(buf, off + 116, 8);
+    this.size = notNegative(exForFields?.size ?? gexForFields?.size ?? decNumber(buf, off + 124, 12));
+    this.mtime = exForFields?.mtime ?? gexForFields?.mtime ?? decDate(buf, off + 136, 12);
+    this.cksum = decNumber(buf, off + 148, 12);
+    if (gexForFields)
+      this.#slurp(gexForFields, true);
+    if (exForFields)
+      this.#slurp(exForFields);
     if (isCode(t)) {
       this.#type = t || "0";
     }
@@ -236,10 +252,10 @@ var Header = class {
     }
     this.linkpath = decString(buf, off + 157, 100);
     if (buf.subarray(off + 257, off + 265).toString() === "ustar\x0000") {
-      this.uname = ex?.uname ?? gex?.uname ?? decString(buf, off + 265, 32);
-      this.gname = ex?.gname ?? gex?.gname ?? decString(buf, off + 297, 32);
-      this.devmaj = ex?.devmaj ?? gex?.devmaj ?? decNumber(buf, off + 329, 8) ?? 0;
-      this.devmin = ex?.devmin ?? gex?.devmin ?? decNumber(buf, off + 337, 8) ?? 0;
+      this.uname = exForFields?.uname ?? gexForFields?.uname ?? decString(buf, off + 265, 32);
+      this.gname = exForFields?.gname ?? gexForFields?.gname ?? decString(buf, off + 297, 32);
+      this.devmaj = exForFields?.devmaj ?? gexForFields?.devmaj ?? decNumber(buf, off + 329, 8) ?? 0;
+      this.devmin = exForFields?.devmin ?? gexForFields?.devmin ?? decNumber(buf, off + 337, 8) ?? 0;
       if (buf[off + 475] !== 0) {
         const prefix = decString(buf, off + 345, 155);
         this.path = prefix + "/" + this.path;
@@ -266,7 +282,7 @@ var Header = class {
   }
   #slurp(ex, gex = false) {
     Object.assign(this, Object.fromEntries(Object.entries(ex).filter(([k, v]) => {
-      return !(v === null || v === void 0 || k === "path" && gex || k === "linkpath" && gex || k === "global");
+      return !(v === null || v === void 0 || k === "size" && Number(v) < 0 || k === "path" && gex || k === "linkpath" && gex || k === "global");
     })));
   }
   encode(buf, off = 0) {
@@ -379,7 +395,7 @@ var encDate = (buf, off, size, date) => date === void 0 ? false : encNumber(buf,
 var NULLS = new Array(156).join("\0");
 var encString = (buf, off, size, str) => str === void 0 ? false : (buf.write(str + NULLS, off, size, "utf8"), str.length !== Buffer.byteLength(str) || str.length > size);
 
-// ../../node_modules/.vlt/~npm~tar@7.5.13/node_modules/tar/dist/esm/pax.js
+// ../../node_modules/.vlt/~npm~tar@7.5.20/node_modules/tar/dist/esm/pax.js
 import { basename } from "node:path";
 var Pax = class _Pax {
   atime;
@@ -491,8 +507,36 @@ var parseKVLine = (set, line) => {
     return set;
   }
   const k = r.replace(/^SCHILY\.(dev|ino|nlink)/, "$1");
-  const v = kv.join("=");
-  set[k] = /^([A-Z]+\.)?([mac]|birth|creation)time$/.test(k) ? new Date(Number(v) * 1e3) : /^[0-9]+$/.test(v) ? +v : v;
+  const v = kv.join("=").replace(/\0.*/, "");
+  switch (k) {
+    case "path":
+    case "linkpath":
+    case "type":
+    case "charset":
+    case "comment":
+    case "gname":
+    case "uname":
+      set[k] = v;
+      break;
+    case "ctime":
+    case "atime":
+    case "mtime":
+      set[k] = new Date(Number(v) * 1e3);
+      break;
+    case "size":
+      const s = +v;
+      if (s >= 0)
+        set[k] = s;
+      break;
+    case "gid":
+    case "uid":
+    case "dev":
+    case "ino":
+    case "nlink":
+    case "mode":
+      set[k] = +v;
+      break;
+  }
   return set;
 };
 
@@ -822,6 +866,10 @@ var rename2 = platform !== "win32" ? fsRename : (async function(oldPath, newPath
 var xdg = new XDG("vlt");
 var delimiter = "~";
 var manifestCacheMaxAge = 5 * 60 * 1e3;
+var noRegistryError = (spec) => error(
+  'No registry configured to resolve this spec. Set "registry" in vlt.json, pass --registry, or run `vlt login --registry=<url>`. See https://docs.vlt.sh/cli',
+  { code: "ECONFIG", spec }
+);
 var PackageInfoClient = class {
   #registryClient;
   #projectRoot;
@@ -833,6 +881,7 @@ var PackageInfoClient = class {
   #trustedIntegrities = /* @__PURE__ */ new Map();
   #manifestCacheMinAge = Date.now() - manifestCacheMaxAge;
   #cachePath;
+  #packumentPromises = /* @__PURE__ */ new Map();
   get registryClient() {
     if (!this.#registryClient) {
       this.#registryClient = new RegistryClient(this.options);
@@ -922,7 +971,7 @@ var PackageInfoClient = class {
             throw this.#resolveError(
               spec,
               options,
-              "failed to fetch tarball",
+              `Registry returned HTTP ${response.statusCode} when fetching the tarball for ${spec}. The resolved version may have been unpublished, or the registry may be misconfigured or unreachable.`,
               {
                 url: r.resolved,
                 response
@@ -1085,7 +1134,7 @@ var PackageInfoClient = class {
       extra += `${delimiter}arch:${options.arch}`;
     }
     return encodeURIComponent(
-      `${spec.registry}${delimiter}${spec}${extra}`
+      `${spec.registry ?? ""}${delimiter}${spec}${extra}`
     );
   }
   /**
@@ -1104,40 +1153,6 @@ var PackageInfoClient = class {
     const key = this.#manifestCacheKey(f, options);
     return pathResolve(this.#cachePath, "package-info", key);
   }
-  async #registryManifestRequest(spec, options) {
-    const { registry, name: name2, registrySpec } = spec.final;
-    if (!spec.range?.isSingle || !registrySpec) {
-      throw this.#resolveError(
-        spec,
-        options,
-        "failed to request manifest",
-        { spec }
-      );
-    }
-    const possibleLeadingChars = ["=", "^", "~", "v"];
-    const hasLeadingRange = possibleLeadingChars.some(
-      (char) => registrySpec.startsWith(char)
-    );
-    const version = hasLeadingRange ? registrySpec.slice(1) : registrySpec;
-    const pakuURL = new URL(`${name2}/${version}`, registry);
-    const response = await this.registryClient.request(pakuURL, {
-      headers: {
-        accept: "application/json"
-      }
-    });
-    if (response.statusCode !== 200) {
-      throw this.#resolveError(
-        spec,
-        options,
-        "failed to fetch manifest",
-        {
-          url: pakuURL,
-          response
-        }
-      );
-    }
-    return response.json();
-  }
   async tarball(spec, options = {}) {
     if (typeof spec === "string")
       spec = Spec.parse(spec, this.options);
@@ -1149,14 +1164,14 @@ var PackageInfoClient = class {
           throw this.#resolveError(
             spec,
             options,
-            "no dist object found in manifest"
+            `The registry manifest for ${spec} has no "dist" section, so no tarball can be resolved. The package version may be malformed or unpublished.`
           );
         const { tarball, integrity } = dist;
         if (!tarball) {
           throw this.#resolveError(
             spec,
             options,
-            "no tarball found in manifest.dist"
+            `The registry manifest for ${spec} is missing a tarball URL (dist.tarball). The package version may be malformed or unpublished in this registry.`
           );
         }
         const fetchTarball = async (useCache) => {
@@ -1174,7 +1189,7 @@ var PackageInfoClient = class {
             throw this.#resolveError(
               spec,
               options,
-              "failed to fetch tarball",
+              `Registry returned HTTP ${response.statusCode} when fetching the tarball for ${spec} at ${tarball}. The version may have been unpublished, or the registry may be misconfigured or unreachable.`,
               { response, url: tarball }
             );
           }
@@ -1240,7 +1255,7 @@ var PackageInfoClient = class {
                 await rename2(src, pkg);
               }
             }
-            return Zn({ cwd, gzip: true }, ["package"]).concat();
+            return Qn({ cwd, gzip: true }, ["package"]).concat();
           });
         }
       }
@@ -1270,7 +1285,7 @@ var PackageInfoClient = class {
         if (st.isDirectory()) {
           const p = dirname2(path);
           const b = basename3(path);
-          return Zn({ cwd: p, gzip: true }, [b]).concat();
+          return Qn({ cwd: p, gzip: true }, [b]).concat();
         }
         return readFile(path);
       }
@@ -1278,7 +1293,7 @@ var PackageInfoClient = class {
         const ws = this.#getWS(spec, options);
         const p = dirname2(ws.fullpath);
         const b = basename3(ws.fullpath);
-        return Zn({ cwd: p, gzip: true }, [b]).concat();
+        return Qn({ cwd: p, gzip: true }, [b]).concat();
       }
     }
   }
@@ -1305,7 +1320,7 @@ var PackageInfoClient = class {
           } catch {
           }
         }
-        const mani = spec.range?.isSingle ? await this.#registryManifestRequest(spec, options) : pickManifest(
+        const mani = pickManifest(
           await this.packument(f, options),
           spec,
           options
@@ -1455,27 +1470,43 @@ var PackageInfoClient = class {
       }
       case "registry": {
         const { registry, name: name2 } = f;
-        const pakuURL = new URL(name2, registry);
-        const response = await this.registryClient.request(pakuURL, {
-          headers: {
-            accept: "application/json"
-          }
-        });
-        if (response.statusCode !== 200) {
-          throw this.#resolveError(
-            spec,
-            options,
-            "failed to fetch packument",
-            {
-              url: pakuURL,
-              response
-            }
-          );
+        if (!registry) throw noRegistryError(spec);
+        if (options.fullPackument) {
+          const pakuURL2 = new URL(name2, registry);
+          return this.#fetchPackument(spec, options, pakuURL2);
         }
-        return response.json();
+        const packumentKey = `${registry}${name2}`;
+        const inflight = this.#packumentPromises.get(packumentKey);
+        if (inflight) return inflight;
+        const pakuURL = new URL(name2, registry);
+        const promise = this.#fetchPackument(spec, options, pakuURL);
+        this.#packumentPromises.set(packumentKey, promise);
+        promise.then(
+          () => this.#packumentPromises.delete(packumentKey),
+          () => this.#packumentPromises.delete(packumentKey)
+        );
+        return promise;
       }
     }
   }
+  async #fetchPackument(spec, options, pakuURL) {
+    const accept = options.fullPackument ? "application/json" : "application/vnd.npm.install-v1+json; q=1.0, application/json; q=0.8, */*";
+    const response = await this.registryClient.request(pakuURL, {
+      headers: { accept }
+    });
+    if (response.statusCode !== 200) {
+      throw this.#resolveError(
+        spec,
+        options,
+        "failed to fetch packument",
+        {
+          url: pakuURL,
+          response
+        }
+      );
+    }
+    return response.json();
+  }
   async resolve(spec, options = {}) {
     const memoKey = String(spec);
     if (typeof spec === "string")

package/{chunk-SDBTQF2Y.js → chunk-5COWONUB.js}

@@ -14,26 +14,26 @@ import {
 } from "./chunk-RIYFGX27.js";
 import {
   createHostContextsMap
-} from "./chunk-XFQ2EH5D.js";
+} from "./chunk-XIJFEV6U.js";
 import {
   stderr,
   stdout,
   styleTextStdout
-} from "./chunk-5UXEBLLT.js";
+} from "./chunk-7KI6XHXZ.js";
 import {
   Query,
   actual,
   isRunResult
-} from "./chunk-YQXDHMHG.js";
+} from "./chunk-VGWEB64T.js";
 import {
   require_emoji_regex
 } from "./chunk-VTEFO2FT.js";
 import {
   Monorepo
-} from "./chunk-KRGA5VLT.js";
+} from "./chunk-ICJRCXSG.js";
 import {
   isErrorWithCause
-} from "./chunk-6YXVQ5HC.js";
+} from "./chunk-2PLIV3N3.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";

package/{chunk-5UXEBLLT.js → chunk-7KI6XHXZ.js}

@@ -17,24 +17,31 @@ import {
 import {
   generateDefaultHelp,
   generateFullHelp
-} from "./chunk-NLFBANVO.js";
+} from "./chunk-SSN4CYZF.js";
 import {
   isViewClass
 } from "./chunk-RXNA2XCX.js";
 import {
   parseError
-} from "./chunk-DFNHGGGV.js";
+} from "./chunk-EFWPI6IY.js";
 import {
   isGraphRunError,
   splitDepID
-} from "./chunk-IAKUGHGT.js";
+} from "./chunk-MT76WHSM.js";
+import {
+  hasConfiguredRegistry,
+  missingRegistryError
+} from "./chunk-FAG776ZD.js";
 import {
   defaultView
-} from "./chunk-2V4AQPBR.js";
+} from "./chunk-PMCAQG5J.js";
+import {
+  emitter
+} from "./chunk-UBLFPJHV.js";
 import {
   isErrorWithCause,
   isObject
-} from "./chunk-6YXVQ5HC.js";
+} from "./chunk-2PLIV3N3.js";
 import {
   XDG
 } from "./chunk-XNLSTHDK.js";
@@ -53,6 +60,8 @@ var formatURL = (v, format) => v instanceof URL ? v.toString() : (
   /* c8 ignore next */
   format(v)
 );
+var hasCustomToString = (v) => isObject(v) && v.toString !== Object.prototype.toString;
+var formatToString = (v, format) => hasCustomToString(v) ? v.toString() : format(v);
 var formatArray = (v, format, joiner = ", ") => Array.isArray(v) ? v.join(joiner) : (
   /* c8 ignore next */
   format(v)
@@ -191,7 +200,7 @@ var printCode = (err, usage, stderr2, format) => {
         stderr2(indent(`While fetching: ${formatURL(url, format)}`));
       }
       if (spec) {
-        stderr2(indent(`To satisfy: ${format(spec)}`));
+        stderr2(indent(`To satisfy: ${formatToString(spec, format)}`));
       }
       if (from) {
         stderr2(indent(`From: ${format(from)}`));
@@ -381,6 +390,48 @@ var supportsColor = {
   stderr: createSupportsColor({ isTTY: tty.isatty(2) })
 };
 
+// ../../src/cli-sdk/src/verbose-log.ts
+var rank = {
+  silent: 0,
+  error: 1,
+  warn: 2,
+  info: 3,
+  verbose: 4,
+  debug: 5
+};
+var isVerbose = (level) => rank[level] >= rank.verbose;
+var isDebug = (level) => rank[level] >= rank.debug;
+var identityStyle = (_f, s) => s;
+var tagStyle = (state, statusCode) => {
+  switch (state) {
+    case "cache":
+    case "stale":
+    case "304":
+      return "green";
+    case "start":
+      return "gray";
+    case "complete":
+      return statusCode !== void 0 && statusCode >= 400 ? "red" : "green";
+  }
+};
+var formatRequestEvent = (event, style = identityStyle) => {
+  const { url, state, method = "GET", statusCode, durationMs } = event;
+  const tag = state === "complete" ? String(statusCode ?? "") : state;
+  const duration = durationMs === void 0 ? "" : style("gray", ` (${durationMs}ms)`);
+  return `${style(tagStyle(state, statusCode), tag.padEnd(8))} ${method} ${String(url)}${duration}`;
+};
+var startRequestLog = (level, write, style = identityStyle) => {
+  if (!isVerbose(level)) return () => {
+  };
+  const debug = isDebug(level);
+  const handler = (event) => {
+    if (event.state === "start" && !debug) return;
+    write(formatRequestEvent(event, style));
+  };
+  emitter.on("request", handler);
+  return () => emitter.off("request", handler);
+};
+
 // ../../src/cli-sdk/src/output.ts
 var isCI = () => !!(process.env.CI || process.env.GITHUB_ACTIONS || process.env.GITLAB_CI || process.env.CIRCLECI || process.env.JENKINS_URL || process.env.BUILDKITE || process.env.TRAVIS);
 var supportsColor2 = (stream) => {
@@ -428,7 +479,7 @@ var startView = (conf, opts, views, { start } = { start: Date.now() }) => {
 var outputCommand = async (cliCommand, conf, { start, vltVersion } = {
   start: Date.now()
 }) => {
-  const { usage, views, command } = cliCommand;
+  const { usage, views, command, needsRegistry } = cliCommand;
   const stdoutColor = conf.values.color ?? supportsColor2(process.stdout);
   const stderrColor = conf.values.color ?? supportsColor2(process.stderr);
   if (conf.values.help) {
@@ -442,6 +493,11 @@ var outputCommand = async (cliCommand, conf, { start, vltVersion } = {
   }
   if (stdoutColor) styleTextStdout = styleText;
   if (stderrColor) styleTextStderr = styleText;
+  const stopRequestLog = startRequestLog(
+    conf.values.loglevel,
+    (line) => stderr(line),
+    styleTextStderr
+  );
   const { onDone, onError } = startView(
     conf,
     // assume views will always output to stdout so use color support from there
@@ -452,7 +508,11 @@ var outputCommand = async (cliCommand, conf, { start, vltVersion } = {
   const telemetryEnabled = conf.values.telemetry;
   const commandName = conf.command;
   try {
+    if (needsRegistry && !hasConfiguredRegistry(conf)) {
+      throw missingRegistryError();
+    }
     const output = await onDone(await command(conf));
+    stopRequestLog();
     const duration_ms = Date.now() - start;
     trackCommand(
       {
@@ -480,6 +540,7 @@ var outputCommand = async (cliCommand, conf, { start, vltVersion } = {
     }
     await flush();
   } catch (err) {
+    stopRequestLog();
     onError?.(err);
     process.exitCode ||= 1;
     const duration_ms = Date.now() - start;