@vltpkg/cli-js 1.0.0-rc.26 → 1.0.0-rc.28

package/{chunk-WC3VIV77.js → chunk-HAG4VBEA.js}

@@ -12,28 +12,28 @@ var require = _vlt_createRequire(import.meta.filename);
 import {
   createDiffFilesProvider
 } from "./chunk-RIYFGX27.js";
+import {
+  createHostContextsMap
+} from "./chunk-VRIS5HAW.js";
 import {
   stderr,
   stdout,
   styleTextStdout
-} from "./chunk-LCUNWXND.js";
-import {
-  require_emoji_regex
-} from "./chunk-VTEFO2FT.js";
-import {
-  createHostContextsMap
-} from "./chunk-ORGRCZV6.js";
+} from "./chunk-RK2PISOZ.js";
 import {
   Query,
   actual,
   isRunResult
-} from "./chunk-D3UYPLBW.js";
+} from "./chunk-7RZL7BZI.js";
+import {
+  require_emoji_regex
+} from "./chunk-VTEFO2FT.js";
 import {
   Monorepo
-} from "./chunk-R3KDJL6J.js";
+} from "./chunk-XYCCQT7N.js";
 import {
   isErrorWithCause
-} from "./chunk-HIGHMXU7.js";
+} from "./chunk-Q3DNNTPG.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";
@@ -1018,7 +1018,6 @@ var ExecCommand = class {
     this.conf = conf;
     this.bg = bg;
     this.fg = fg;
-    this.view = this.validViewValues.get(conf.values.view) ?? "human";
     const {
       projectRoot,
       positionals: [arg0, ...args]
@@ -1026,6 +1025,7 @@ var ExecCommand = class {
     this.arg0 = arg0;
     this.args = args;
     this.projectRoot = projectRoot;
+    this.view = this.validViewValues.get(conf.values.view) ?? "human";
   }
   #targetCount() {
     if (this.#nodes) return this.#nodes.length;

package/{chunk-KSOWJE5Z.js → chunk-HAGUS4HI.js}

@@ -10,12 +10,9 @@ globalThis.clearInterval = _vlt_clearInterval;
 import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
-  require_lib,
-  zn
-} from "./chunk-FI5TUER7.js";
-import {
-  RegistryClient
-} from "./chunk-CEEMJNRZ.js";
+  Zn,
+  require_lib
+} from "./chunk-HQ4US6G3.js";
 import {
   Monorepo,
   PackageJson,
@@ -23,18 +20,20 @@ import {
   pickManifest,
   resolve,
   revs
-} from "./chunk-R3KDJL6J.js";
-import {
-  rimraf
-} from "./chunk-BGQCUUCA.js";
+} from "./chunk-XYCCQT7N.js";
 import {
   Spec2 as Spec
-} from "./chunk-45PZMAKV.js";
+} from "./chunk-IEISSXS4.js";
+import {
+  RegistryClient
+} from "./chunk-3MWZTKGK.js";
+import {
+  rimraf
+} from "./chunk-R44FR7BY.js";
 import {
   asError,
-  asPackument,
-  isIntegrity
-} from "./chunk-HIGHMXU7.js";
+  asPackument
+} from "./chunk-Q3DNNTPG.js";
 import {
   XDG
 } from "./chunk-XNLSTHDK.js";
@@ -50,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.11/node_modules/tar/dist/esm/header.js
+// ../../node_modules/.vlt/~npm~tar@7.5.13/node_modules/tar/dist/esm/header.js
 import { posix as pathModule } from "node:path";
 
-// ../../node_modules/.vlt/~npm~tar@7.5.11/node_modules/tar/dist/esm/large-numbers.js
+// ../../node_modules/.vlt/~npm~tar@7.5.13/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");
@@ -134,7 +133,7 @@ var pos = (buf) => {
 var onesComp = (byte) => (255 ^ byte) & 255;
 var twosComp = (byte) => (255 ^ byte) + 1 & 255;
 
-// ../../node_modules/.vlt/~npm~tar@7.5.11/node_modules/tar/dist/esm/types.js
+// ../../node_modules/.vlt/~npm~tar@7.5.13/node_modules/tar/dist/esm/types.js
 var isCode = (c) => name.has(c);
 var name = /* @__PURE__ */ new Map([
   ["0", "File"],
@@ -177,7 +176,7 @@ 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.11/node_modules/tar/dist/esm/header.js
+// ../../node_modules/.vlt/~npm~tar@7.5.13/node_modules/tar/dist/esm/header.js
 var Header = class {
   cksumValid = false;
   needPax = false;
@@ -291,7 +290,7 @@ var Header = class {
     this.needPax = encNumber(buf, off + 116, 8, this.gid) || this.needPax;
     this.needPax = encNumber(buf, off + 124, 12, this.size) || this.needPax;
     this.needPax = encDate(buf, off + 136, 12, this.mtime) || this.needPax;
-    buf[off + 156] = this.#type.charCodeAt(0);
+    buf[off + 156] = Number(this.#type.codePointAt(0));
     this.needPax = encString(buf, off + 157, 100, this.linkpath) || this.needPax;
     buf.write("ustar\x0000", off + 257, 8);
     this.needPax = encString(buf, off + 265, 32, this.uname) || this.needPax;
@@ -380,7 +379,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.11/node_modules/tar/dist/esm/pax.js
+// ../../node_modules/.vlt/~npm~tar@7.5.13/node_modules/tar/dist/esm/pax.js
 import { basename } from "node:path";
 var Pax = class _Pax {
   atime;
@@ -867,10 +866,15 @@ var PackageInfoClient = class {
   async extract(spec, target, options = {}) {
     if (typeof spec === "string")
       spec = Spec.parse(spec, this.options);
-    const { from = this.#projectRoot, integrity, resolved } = options;
+    const {
+      from = this.#projectRoot,
+      integrity,
+      resolved,
+      fromLockfile = false
+    } = options;
     const f = spec.final;
-    const fromLockfile = !!(integrity && resolved);
-    const r = fromLockfile ? { resolved, integrity, spec } : await this.resolve(spec, options);
+    const alreadyResolved = !!(integrity && resolved);
+    const r = alreadyResolved ? { resolved, integrity, spec } : await this.resolve(spec, options);
     switch (f.type) {
       case "git": {
         const {
@@ -904,41 +908,58 @@ var PackageInfoClient = class {
         }
       }
       case "registry": {
-        const trustIntegrity = this.#trustedIntegrities.get(r.resolved) === r.integrity;
-        const response = await this.registryClient.request(
-          r.resolved,
-          {
-            integrity: r.integrity,
-            trustIntegrity
-          }
-        );
-        if (response.statusCode !== 200) {
-          throw this.#resolveError(
-            spec,
-            options,
-            "failed to fetch tarball",
+        const fetchTarball = async (useCache) => {
+          const trustIntegrity = this.#trustedIntegrities.get(r.resolved) === r.integrity;
+          const response = await this.registryClient.request(
+            r.resolved,
             {
-              url: r.resolved,
-              response
+              integrity: r.integrity,
+              trustIntegrity,
+              ...useCache === false ? { useCache } : {}
             }
           );
-        }
-        if (!trustIntegrity && response.checkIntegrity({ spec, url: resolved })) {
-          this.#trustedIntegrities.set(r.resolved, response.integrity);
-        }
-        const buf = response.buffer();
-        if (r.integrity && !fromLockfile) {
-          const hash = createHash("sha512");
-          hash.update(buf);
-          const computed = `sha512-${hash.digest("base64")}`;
-          if (computed !== r.integrity) {
-            throw error("Tarball integrity check failed", {
-              code: "EINTEGRITY",
+          if (response.statusCode !== 200) {
+            throw this.#resolveError(
               spec,
-              url: r.resolved,
-              wanted: r.integrity,
-              found: computed
-            });
+              options,
+              "failed to fetch tarball",
+              {
+                url: r.resolved,
+                response
+              }
+            );
+          }
+          if (!trustIntegrity && response.checkIntegrity({ spec, url: resolved })) {
+            this.#trustedIntegrities.set(
+              r.resolved,
+              response.integrity
+            );
+          }
+          const buf2 = response.buffer();
+          if (r.integrity && !fromLockfile) {
+            const hash = createHash("sha512");
+            hash.update(buf2);
+            const computed = `sha512-${hash.digest("base64")}`;
+            if (computed !== r.integrity) {
+              throw error("Tarball integrity check failed", {
+                code: "EINTEGRITY",
+                spec,
+                url: r.resolved,
+                wanted: r.integrity,
+                found: computed
+              });
+            }
+          }
+          return buf2;
+        };
+        let buf;
+        try {
+          buf = await fetchTarball();
+        } catch (er) {
+          if (er instanceof Error && "cause" in er && er.cause?.code === "EINTEGRITY") {
+            buf = await fetchTarball(false);
+          } else {
+            throw er;
           }
         }
         try {
@@ -1138,39 +1159,53 @@ var PackageInfoClient = class {
             "no tarball found in manifest.dist"
           );
         }
-        const trustIntegrity = this.#trustedIntegrities.get(tarball) === integrity;
-        const response = await this.registryClient.request(tarball, {
-          ...options,
-          integrity,
-          trustIntegrity
-        });
-        if (response.statusCode !== 200) {
-          throw this.#resolveError(
-            spec,
-            options,
-            "failed to fetch tarball",
-            { response, url: tarball }
+        const fetchTarball = async (useCache) => {
+          const trustIntegrity = this.#trustedIntegrities.get(tarball) === integrity;
+          const response = await this.registryClient.request(
+            tarball,
+            {
+              ...options,
+              integrity,
+              trustIntegrity,
+              ...useCache === false ? { useCache } : {}
+            }
           );
-        }
-        if (!trustIntegrity && response.checkIntegrity({ spec, url: tarball })) {
-          this.#trustedIntegrities.set(tarball, response.integrity);
-        }
-        const buf = response.buffer();
-        if (integrity) {
-          const hash = createHash("sha512");
-          hash.update(buf);
-          const computed = `sha512-${hash.digest("base64")}`;
-          if (computed !== integrity) {
-            throw error("Tarball integrity check failed", {
-              code: "EINTEGRITY",
+          if (response.statusCode !== 200) {
+            throw this.#resolveError(
               spec,
-              url: tarball,
-              wanted: integrity,
-              found: computed
-            });
+              options,
+              "failed to fetch tarball",
+              { response, url: tarball }
+            );
+          }
+          if (!trustIntegrity && response.checkIntegrity({ spec, url: tarball })) {
+            this.#trustedIntegrities.set(tarball, response.integrity);
+          }
+          const buf = response.buffer();
+          if (integrity) {
+            const hash = createHash("sha512");
+            hash.update(buf);
+            const computed = `sha512-${hash.digest("base64")}`;
+            if (computed !== integrity) {
+              throw error("Tarball integrity check failed", {
+                code: "EINTEGRITY",
+                spec,
+                url: tarball,
+                wanted: integrity,
+                found: computed
+              });
+            }
+          }
+          return buf;
+        };
+        try {
+          return await fetchTarball();
+        } catch (er) {
+          if (er instanceof Error && "cause" in er && er.cause?.code === "EINTEGRITY") {
+            return await fetchTarball(false);
           }
+          throw er;
         }
-        return buf;
       }
       case "git": {
         const {
@@ -1205,7 +1240,7 @@ var PackageInfoClient = class {
                 await rename2(src, pkg);
               }
             }
-            return zn({ cwd, gzip: true }, ["package"]).concat();
+            return Zn({ cwd, gzip: true }, ["package"]).concat();
           });
         }
       }
@@ -1235,7 +1270,7 @@ var PackageInfoClient = class {
         if (st.isDirectory()) {
           const p = dirname2(path);
           const b = basename3(path);
-          return zn({ cwd: p, gzip: true }, [b]).concat();
+          return Zn({ cwd: p, gzip: true }, [b]).concat();
         }
         return readFile(path);
       }
@@ -1243,7 +1278,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 Zn({ cwd: p, gzip: true }, [b]).concat();
       }
     }
   }
@@ -1276,15 +1311,6 @@ var PackageInfoClient = class {
           options
         );
         if (!mani) throw this.#resolveError(spec, options);
-        const { integrity, tarball } = mani.dist ?? /* c8 ignore next */
-        {};
-        if (isIntegrity(integrity) && tarball) {
-          const registryOrigin = new URL(String(f.registry)).origin;
-          const tgzOrigin = new URL(tarball).origin;
-          if (tgzOrigin === registryOrigin) {
-            this.#trustedIntegrities.set(tarball, integrity);
-          }
-        }
         if (cachePath) {
           const json = JSON.stringify({
             ...mani,