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

package/{bugs-5UZKBRJ6.js → bugs-CS34LDPD.js}

@@ -14,36 +14,36 @@ import {
 } from "./chunk-AZLX27EM.js";
 import {
   createHostContextsMap
-} from "./chunk-ORGRCZV6.js";
+} from "./chunk-VTZZIXYW.js";
 import {
   Query,
   actual
-} from "./chunk-D3UYPLBW.js";
+} from "./chunk-DJBBJDHI.js";
 import {
   SecurityArchive
-} from "./chunk-BRSCRAUI.js";
-import "./chunk-QI6PGM7S.js";
+} from "./chunk-BIUCOMBH.js";
+import "./chunk-52LBC3AX.js";
 import {
   commandUsage
 } from "./chunk-5E5GX4G6.js";
 import {
   PackageInfoClient
-} from "./chunk-KSOWJE5Z.js";
+} from "./chunk-INXSTZAX.js";
 import "./chunk-FI5TUER7.js";
-import "./chunk-CEEMJNRZ.js";
+import "./chunk-JQHMLTO5.js";
 import {
   urlOpen
 } from "./chunk-D7U7KDEM.js";
-import "./chunk-R3KDJL6J.js";
+import "./chunk-YR47M5L7.js";
 import "./chunk-BGQCUUCA.js";
 import "./chunk-E74WGW5C.js";
 import {
   Spec2 as Spec
-} from "./chunk-45PZMAKV.js";
+} from "./chunk-QDGZZ5FZ.js";
 import "./chunk-VCSVHRCS.js";
 import "./chunk-D27QPHKI.js";
 import "./chunk-JLJKOF75.js";
-import "./chunk-HIGHMXU7.js";
+import "./chunk-XWF3GJKE.js";
 import "./chunk-HTOTG4TS.js";
 import "./chunk-XNLSTHDK.js";
 import {

package/{build-HHRMIGWX.js → build-XHEFAWMN.js}

@@ -11,22 +11,22 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   build
-} from "./chunk-D3UYPLBW.js";
-import "./chunk-BRSCRAUI.js";
-import "./chunk-QI6PGM7S.js";
+} from "./chunk-DJBBJDHI.js";
+import "./chunk-BIUCOMBH.js";
+import "./chunk-52LBC3AX.js";
 import {
   commandUsage
 } from "./chunk-5E5GX4G6.js";
-import "./chunk-R3KDJL6J.js";
+import "./chunk-YR47M5L7.js";
 import "./chunk-BGQCUUCA.js";
 import "./chunk-E74WGW5C.js";
-import "./chunk-45PZMAKV.js";
+import "./chunk-QDGZZ5FZ.js";
 import "./chunk-VCSVHRCS.js";
 import "./chunk-D27QPHKI.js";
 import "./chunk-JLJKOF75.js";
 import {
   isErrorWithCause
-} from "./chunk-HIGHMXU7.js";
+} from "./chunk-XWF3GJKE.js";
 import "./chunk-HTOTG4TS.js";
 import "./chunk-XNLSTHDK.js";
 import {

package/{cache-S7AIJNAW.js → cache-LII2V5IM.js}

@@ -15,29 +15,29 @@ import {
 import {
   stderr,
   stdout
-} from "./chunk-LCUNWXND.js";
+} from "./chunk-P2HZ4ISK.js";
 import "./chunk-TDTJOKF2.js";
 import {
   ViewClass
 } from "./chunk-RXNA2XCX.js";
 import "./chunk-WGDTG44V.js";
-import "./chunk-5TAPASMO.js";
+import "./chunk-TRXTSZFT.js";
 import {
   commandUsage
 } from "./chunk-5E5GX4G6.js";
 import {
   CacheEntry
-} from "./chunk-CEEMJNRZ.js";
+} from "./chunk-JQHMLTO5.js";
 import "./chunk-D7U7KDEM.js";
 import "./chunk-BGQCUUCA.js";
 import "./chunk-E74WGW5C.js";
 import {
   Spec2 as Spec
-} from "./chunk-45PZMAKV.js";
+} from "./chunk-QDGZZ5FZ.js";
 import "./chunk-VCSVHRCS.js";
 import "./chunk-D27QPHKI.js";
 import "./chunk-JLJKOF75.js";
-import "./chunk-HIGHMXU7.js";
+import "./chunk-XWF3GJKE.js";
 import "./chunk-XNLSTHDK.js";
 import {
   error

package/{chunk-QI6PGM7S.js → chunk-52LBC3AX.js}

@@ -12,11 +12,11 @@ var require = _vlt_createRequire(import.meta.filename);
 import {
   PackageJson,
   getUser
-} from "./chunk-R3KDJL6J.js";
+} from "./chunk-YR47M5L7.js";
 import {
   asError,
   normalizeManifest
-} from "./chunk-HIGHMXU7.js";
+} from "./chunk-XWF3GJKE.js";
 
 // ../../src/init/src/index.ts
 import { basename, resolve } from "node:path";

package/{chunk-WC3VIV77.js → chunk-6YTJVEK2.js}

@@ -16,24 +16,24 @@ import {
   stderr,
   stdout,
   styleTextStdout
-} from "./chunk-LCUNWXND.js";
+} from "./chunk-P2HZ4ISK.js";
 import {
   require_emoji_regex
 } from "./chunk-VTEFO2FT.js";
 import {
   createHostContextsMap
-} from "./chunk-ORGRCZV6.js";
+} from "./chunk-VTZZIXYW.js";
 import {
   Query,
   actual,
   isRunResult
-} from "./chunk-D3UYPLBW.js";
+} from "./chunk-DJBBJDHI.js";
 import {
   Monorepo
-} from "./chunk-R3KDJL6J.js";
+} from "./chunk-YR47M5L7.js";
 import {
   isErrorWithCause
-} from "./chunk-HIGHMXU7.js";
+} from "./chunk-XWF3GJKE.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";

package/{chunk-BRSCRAUI.js → chunk-BIUCOMBH.js}

@@ -16,7 +16,7 @@ import {
   asDepID,
   baseDepID,
   splitDepID
-} from "./chunk-45PZMAKV.js";
+} from "./chunk-QDGZZ5FZ.js";
 import {
   L
 } from "./chunk-VCSVHRCS.js";

package/{chunk-D3UYPLBW.js → chunk-DJBBJDHI.js}

@@ -13,16 +13,16 @@ import {
   AbortError,
   SecurityArchive,
   pRetry
-} from "./chunk-BRSCRAUI.js";
+} from "./chunk-BIUCOMBH.js";
 import {
   init
-} from "./chunk-QI6PGM7S.js";
+} from "./chunk-52LBC3AX.js";
 import {
   Monorepo,
   PackageJson,
   minimatch,
   platformCheck
-} from "./chunk-R3KDJL6J.js";
+} from "./chunk-YR47M5L7.js";
 import {
   rimraf
 } from "./chunk-BGQCUUCA.js";
@@ -49,7 +49,7 @@ import {
   joinExtra,
   splitDepID,
   splitExtra
-} from "./chunk-45PZMAKV.js";
+} from "./chunk-QDGZZ5FZ.js";
 import {
   promiseSpawn
 } from "./chunk-VCSVHRCS.js";
@@ -84,7 +84,7 @@ import {
   patch,
   satisfies,
   shortDependencyTypes
-} from "./chunk-HIGHMXU7.js";
+} from "./chunk-XWF3GJKE.js";
 import {
   load,
   walkUp

package/{chunk-WYE4WWGF.js → chunk-DJBVQKBB.js}

@@ -11,13 +11,13 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   stderr
-} from "./chunk-LCUNWXND.js";
+} from "./chunk-P2HZ4ISK.js";
 import {
   ViewClass
 } from "./chunk-RXNA2XCX.js";
 import {
   mermaidOutput
-} from "./chunk-D3UYPLBW.js";
+} from "./chunk-DJBBJDHI.js";
 import {
   urlOpen
 } from "./chunk-D7U7KDEM.js";

package/{chunk-JXGBASMB.js → chunk-DYL7AFY7.js}

@@ -11,11 +11,11 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   asDependency
-} from "./chunk-D3UYPLBW.js";
+} from "./chunk-DJBBJDHI.js";
 import {
   Spec2 as Spec,
   joinDepIDTuple
-} from "./chunk-45PZMAKV.js";
+} from "./chunk-QDGZZ5FZ.js";
 
 // ../../src/cli-sdk/src/parse-add-remove-args.ts
 var rootDepID = joinDepIDTuple(["file", "."]);

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

@@ -15,7 +15,7 @@ import {
 } from "./chunk-FI5TUER7.js";
 import {
   RegistryClient
-} from "./chunk-CEEMJNRZ.js";
+} from "./chunk-JQHMLTO5.js";
 import {
   Monorepo,
   PackageJson,
@@ -23,18 +23,17 @@ import {
   pickManifest,
   resolve,
   revs
-} from "./chunk-R3KDJL6J.js";
+} from "./chunk-YR47M5L7.js";
 import {
   rimraf
 } from "./chunk-BGQCUUCA.js";
 import {
   Spec2 as Spec
-} from "./chunk-45PZMAKV.js";
+} from "./chunk-QDGZZ5FZ.js";
 import {
   asError,
-  asPackument,
-  isIntegrity
-} from "./chunk-HIGHMXU7.js";
+  asPackument
+} from "./chunk-XWF3GJKE.js";
 import {
   XDG
 } from "./chunk-XNLSTHDK.js";
@@ -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 {
@@ -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,

package/{chunk-CEEMJNRZ.js → chunk-JQHMLTO5.js}

@@ -26,7 +26,7 @@ import {
 } from "./chunk-JLJKOF75.js";
 import {
   asError
-} from "./chunk-HIGHMXU7.js";
+} from "./chunk-XWF3GJKE.js";
 import {
   XDG
 } from "./chunk-XNLSTHDK.js";

package/{chunk-REEVCBSC.js → chunk-LAG2R3YJ.js}

@@ -16,10 +16,10 @@ import {
 } from "./chunk-FI5TUER7.js";
 import {
   minimatch
-} from "./chunk-R3KDJL6J.js";
+} from "./chunk-YR47M5L7.js";
 import {
   Spec2 as Spec
-} from "./chunk-45PZMAKV.js";
+} from "./chunk-QDGZZ5FZ.js";
 import {
   parse,
   stringify

package/{chunk-CY225LQK.js → chunk-LKFTVDWS.js}

@@ -11,7 +11,7 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   init
-} from "./chunk-QI6PGM7S.js";
+} from "./chunk-52LBC3AX.js";
 import {
   commandUsage
 } from "./chunk-5E5GX4G6.js";
@@ -19,7 +19,7 @@ import {
   asWSConfig,
   assertWSConfig,
   minimatch
-} from "./chunk-R3KDJL6J.js";
+} from "./chunk-YR47M5L7.js";
 import {
   load,
   save

package/{chunk-LCUNWXND.js → chunk-P2HZ4ISK.js}

@@ -18,18 +18,18 @@ import {
 } from "./chunk-RXNA2XCX.js";
 import {
   parseError
-} from "./chunk-5TAPASMO.js";
+} from "./chunk-TRXTSZFT.js";
 import {
   isGraphRunError,
   splitDepID
-} from "./chunk-45PZMAKV.js";
+} from "./chunk-QDGZZ5FZ.js";
 import {
   defaultView
 } from "./chunk-D27QPHKI.js";
 import {
   isErrorWithCause,
   isObject
-} from "./chunk-HIGHMXU7.js";
+} from "./chunk-XWF3GJKE.js";
 import {
   XDG
 } from "./chunk-XNLSTHDK.js";

package/{chunk-45PZMAKV.js → chunk-QDGZZ5FZ.js}

@@ -11,7 +11,7 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   parseRange
-} from "./chunk-HIGHMXU7.js";
+} from "./chunk-XWF3GJKE.js";
 import {
   error,
   typeError

package/{chunk-GM7VNI3N.js → chunk-QWWYZ3TT.js}

@@ -17,7 +17,7 @@ var run = async (command) => {
   if (command) {
     process.argv.splice(2, 0, command);
   }
-  const vlt = await import("./src-BTES32CE.js");
+  const vlt = await import("./src-SDJWTPCU.js");
   await vlt.default();
 };
 

package/{chunk-3T3M5JJF.js → chunk-S5I2UOBT.js}

@@ -12,19 +12,19 @@ var require = _vlt_createRequire(import.meta.filename);
 import {
   findCmdShimIfExists,
   install
-} from "./chunk-D3UYPLBW.js";
+} from "./chunk-DJBBJDHI.js";
 import {
   PackageInfoClient
-} from "./chunk-KSOWJE5Z.js";
+} from "./chunk-INXSTZAX.js";
 import {
   PathScurry
-} from "./chunk-R3KDJL6J.js";
+} from "./chunk-YR47M5L7.js";
 import {
   Spec2 as Spec
-} from "./chunk-45PZMAKV.js";
+} from "./chunk-QDGZZ5FZ.js";
 import {
   parseScope
-} from "./chunk-HIGHMXU7.js";
+} from "./chunk-XWF3GJKE.js";
 import {
   walkUp
 } from "./chunk-HTOTG4TS.js";

package/{chunk-3PCMZMV5.js → chunk-SR66HWMM.js}

@@ -23,7 +23,7 @@ import {
 } from "./chunk-JLJKOF75.js";
 import {
   asError
-} from "./chunk-HIGHMXU7.js";
+} from "./chunk-XWF3GJKE.js";
 import {
   __commonJS,
   __export,

package/{chunk-5TAPASMO.js → chunk-TRXTSZFT.js}

@@ -12,7 +12,7 @@ var require = _vlt_createRequire(import.meta.filename);
 import {
   isError,
   isObject
-} from "./chunk-HIGHMXU7.js";
+} from "./chunk-XWF3GJKE.js";
 
 // ../../src/output/src/error.ts
 var parseError = (err) => {

package/{chunk-ORGRCZV6.js → chunk-VTZZIXYW.js}

@@ -13,10 +13,10 @@ import {
   actual,
   callLimit,
   createVirtualRoot
-} from "./chunk-D3UYPLBW.js";
+} from "./chunk-DJBBJDHI.js";
 import {
   SecurityArchive
-} from "./chunk-BRSCRAUI.js";
+} from "./chunk-BIUCOMBH.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";
@@ -115,7 +115,7 @@ var reloadConfig = async (folder) => {
     unload("project");
   } catch {
   }
-  const { Config } = await import("./config-2OSWSNLR.js");
+  const { Config } = await import("./config-4ZFJD5AY.js");
   return Config.load(folder, process.argv, true);
 };
 

package/{chunk-UNANFLLJ.js → chunk-XSUIV5NF.js}

@@ -11,16 +11,16 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   PackageInfoClient
-} from "./chunk-KSOWJE5Z.js";
+} from "./chunk-INXSTZAX.js";
 import {
   Monorepo,
   PackageJson,
   PathScurry
-} from "./chunk-R3KDJL6J.js";
+} from "./chunk-YR47M5L7.js";
 import {
   getOptions,
   resetCaches
-} from "./chunk-45PZMAKV.js";
+} from "./chunk-QDGZZ5FZ.js";
 import {
   commands,
   definition,
@@ -32,7 +32,7 @@ import {
   assertRecordStringString,
   assertRecordStringT,
   isRecordStringString
-} from "./chunk-HIGHMXU7.js";
+} from "./chunk-XWF3GJKE.js";
 import {
   find,
   load,