@vltpkg/cli-js 1.0.10 → 1.1.1

package/{chunk-XUP35M5Q.js → chunk-GDT6KI4I.js}

@@ -11,19 +11,19 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   openUrl
-} from "./chunk-ZNCVQQDT.js";
+} from "./chunk-BWEH7DHQ.js";
 import {
   stderr
-} from "./chunk-VL7RJVNN.js";
+} from "./chunk-LR42WTKN.js";
 import {
   mermaidOutput
-} from "./chunk-FUCQ7ARR.js";
+} from "./chunk-JZJWASXL.js";
 import {
   ViewClass
 } from "./chunk-4KCU2KZL.js";
 import {
   getTokenByURL
-} from "./chunk-NWLS3VOQ.js";
+} from "./chunk-DS7YMIHP.js";
 
 // ../../src/cli-sdk/src/query-auth.ts
 var createGetAuthHeader = (conf) => async (url) => getTokenByURL(url, conf.options.identity);

package/{chunk-FUCQ7ARR.js → chunk-JZJWASXL.js}

@@ -13,14 +13,14 @@ import {
   AbortError,
   SecurityArchive,
   pRetry
-} from "./chunk-2YJ5MESP.js";
+} from "./chunk-DF5K4CYR.js";
 import {
   Monorepo,
   PackageJson,
   getUser,
   minimatch,
   platformCheck
-} from "./chunk-USTJECVS.js";
+} from "./chunk-X2AWQGYG.js";
 import {
   asDepID,
   baseDepID,
@@ -44,11 +44,13 @@ import {
   walkUp
 } from "./chunk-HTOTG4TS.js";
 import {
-  promiseSpawn
-} from "./chunk-LPIBYUMT.js";
+  userAgent,
+  userAgentHeaders
+} from "./chunk-YBVTY6ZW.js";
 import {
-  graphStep
-} from "./chunk-UBLFPJHV.js";
+  graphStep,
+  promiseSpawn
+} from "./chunk-U7TEQCBN.js";
 import {
   Spec,
   Version,
@@ -5333,7 +5335,7 @@ function hasNodeGypBinding(cwd) {
 }
 
 // ../../src/run/src/index.ts
-var npmConfigUserAgent = `vlt/${process.version.slice(1)} node/${process.version} ${process.platform} ${process.arch}`;
+var npmConfigUserAgent = userAgent;
 var dotBins = /* @__PURE__ */ new Map();
 var dirExists = (p) => {
   const cached = dotBins.get(p);
@@ -5388,7 +5390,7 @@ var runImpl = async (options, execImpl, empty2) => {
     ...execArgs
   } = options;
   const pjPath = resolve2(options.cwd, "package.json");
-  const untrustworthy = !!(manifest?.gypfile && arg0 === "install" && manifest.scripts?.install === "node-gyp rebuild");
+  const untrustworthy = !!manifest && (manifest.gypfile === true && arg0 === "install" && manifest.scripts?.install === "node-gyp rebuild" || manifest.hasInstallScript === true && !manifest.scripts);
   const pj = (untrustworthy ? void 0 : manifest) ?? packageJson.read(options.cwd);
   const { scripts: scripts2 } = pj;
   const command = scripts2?.[arg0] ?? // npm's implicit install behavior: "If there is a binding.gyp file in the
@@ -6382,7 +6384,8 @@ var retrieveDistTags = async (node, signal) => {
   url.pathname = `/${node.name}`;
   const response = await fetch(String(url), {
     headers: {
-      Accept: "application/vnd.npm.install-v1+json"
+      Accept: "application/vnd.npm.install-v1+json",
+      ...userAgentHeaders
     },
     signal
   });
@@ -6847,7 +6850,8 @@ var retrieveRemoteVersions = async (node, signal, getAuthHeader) => {
   const base = spec2.registry.endsWith("/") ? spec2.registry : `${spec2.registry}/`;
   const url = new URL(node.name, base);
   const headers = {
-    Accept: "application/vnd.npm.install-v1+json"
+    Accept: "application/vnd.npm.install-v1+json",
+    ...userAgentHeaders
   };
   const auth = await getAuthHeader?.(String(url));
   if (auth) {
@@ -7155,6 +7159,7 @@ var retrieveRemoteDate = async (node, signal) => {
   const url = new URL(spec2.registry);
   url.pathname = `/${node.name}`;
   const response = await fetch(String(url), {
+    headers: { ...userAgentHeaders },
     signal
   });
   if (response.status === 404) {
@@ -7479,6 +7484,7 @@ var score = async (state) => {
 var nodeNeedsBuild = (node) => {
   const { manifest } = node;
   if (!manifest) return false;
+  if (manifest.hasInstallScript) return true;
   const { scripts: scripts2 = {} } = manifest;
   const runInstall = !!(scripts2.install || scripts2.preinstall || scripts2.postinstall);
   if (runInstall) return true;
@@ -10485,7 +10491,7 @@ var load4 = (options) => {
       );
     }
     modifiers?.rollbackActiveEntries();
-    if (scurry.cwd.resolve("node_modules").lstatSync()?.isDirectory()) {
+    if (scurry.cwd.resolve("node_modules/.vlt").lstatSync()?.isDirectory()) {
       saveHidden({
         ...options,
         graph
@@ -10569,6 +10575,9 @@ var makeExecutable = async (path2) => {
   await chmod2(path2, execMode);
 };
 
+// ../../src/graph/src/reify/scripts-manifest.ts
+var scriptsManifest = (manifest, dir, packageJson) => manifest.hasInstallScript && !manifest.scripts ? packageJson.read(dir) : manifest;
+
 // ../../src/graph/src/reify/build.ts
 var build = async (diff2, packageJson, scurry, allowScriptsNodes) => {
   const graph = diff2.to;
@@ -10608,8 +10617,9 @@ var build = async (diff2, packageJson, scurry, allowScriptsNodes) => {
   return res;
 };
 var visit = async (packageJson, scurry, node, signal, _path) => {
-  node.manifest ??= packageJson.read(node.resolvedLocation(scurry));
-  const { manifest } = node;
+  const dir = node.resolvedLocation(scurry);
+  node.manifest ??= packageJson.read(dir);
+  const manifest = scriptsManifest(node.manifest, dir, packageJson);
   const { scripts: scripts2 = {} } = manifest;
   const {
     install: install2,
@@ -10832,10 +10842,12 @@ var build2 = async (options) => {
     scurry,
     targetFilteredNodes
   );
-  saveHidden({
-    ...options,
-    graph: actualGraph
-  });
+  if (scurry.lstatSync(scurry.resolve(projectRoot, "node_modules/.vlt"))?.isDirectory()) {
+    saveHidden({
+      ...options,
+      graph: actualGraph
+    });
+  }
   return buildResult;
 };
 
@@ -14455,14 +14467,13 @@ var deleteEdges = (diff2, scurry, remover) => {
 import { join as join3 } from "node:path";
 var nodeNeedsBuild2 = (node, scurry, packageJson) => {
   if (node.built) return false;
-  let manifest = node.manifest;
-  if (!manifest) {
-    try {
-      manifest = packageJson.read(node.resolvedLocation(scurry));
-      node.manifest = manifest;
-    } catch {
-      return false;
-    }
+  let manifest;
+  try {
+    const dir = node.resolvedLocation(scurry);
+    node.manifest ??= packageJson.read(dir);
+    manifest = scriptsManifest(node.manifest, dir, packageJson);
+  } catch {
+    return false;
   }
   const { scripts: scripts2 = {} } = manifest;
   const runInstall = !!(scripts2.install || scripts2.preinstall || scripts2.postinstall);

package/{chunk-B5IILBX7.js → chunk-KDF7PEBY.js}

@@ -14,12 +14,12 @@ import {
 } from "./chunk-RIYFGX27.js";
 import {
   createHostContextsMap
-} from "./chunk-WAYVHANF.js";
+} from "./chunk-3LUM7NX5.js";
 import {
   stderr,
   stdout,
   styleTextStdout
-} from "./chunk-VL7RJVNN.js";
+} from "./chunk-LR42WTKN.js";
 import {
   require_emoji_regex
 } from "./chunk-VTEFO2FT.js";
@@ -27,10 +27,10 @@ import {
   Query,
   actual,
   isRunResult
-} from "./chunk-FUCQ7ARR.js";
+} from "./chunk-JZJWASXL.js";
 import {
   Monorepo
-} from "./chunk-USTJECVS.js";
+} from "./chunk-X2AWQGYG.js";
 import {
   isErrorWithCause
 } from "./chunk-VFBCWAOC.js";

package/{chunk-P5S2TFCF.js → chunk-LN2A74PF.js}

@@ -20,13 +20,16 @@ import {
   pickManifest,
   resolve,
   revs
-} from "./chunk-USTJECVS.js";
+} from "./chunk-X2AWQGYG.js";
 import {
   Spec
 } from "./chunk-XKVU23NC.js";
+import {
+  registryErrorMessage
+} from "./chunk-SNOBGFNM.js";
 import {
   logRequest
-} from "./chunk-UBLFPJHV.js";
+} from "./chunk-U7TEQCBN.js";
 import {
   asPackument
 } from "./chunk-VFBCWAOC.js";
@@ -83,6 +86,7 @@ var rename = platform !== "win32" ? fsRename : (async function(oldPath, newPath)
 var debug = debuglog("vlt");
 var xdg = new XDG("vlt");
 var delimiter = "~";
+var PACKUMENT_ACCEPT = "application/vnd.vlt.packument-v1+json; q=1.0, application/json; q=0.8, */*; q=0.1";
 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',
@@ -119,7 +123,7 @@ var PackageInfoClient = class {
   #tarPoolPromise;
   async getRegistryClient() {
     if (this.#registryClient) return this.#registryClient;
-    this.#registryClientPromise ??= import("./src-J4BAYOBO.js").then(({ RegistryClient }) => {
+    this.#registryClientPromise ??= import("./src-3GN7TDNH.js").then(({ RegistryClient }) => {
       this.#registryClient = new RegistryClient(this.options);
       return this.#registryClient;
     });
@@ -228,7 +232,7 @@ var PackageInfoClient = class {
             throw this.#resolveError(
               spec,
               options,
-              `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.`,
+              `${registryErrorMessage(response)} 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
@@ -286,7 +290,7 @@ var PackageInfoClient = class {
           throw this.#resolveError(
             spec,
             options,
-            "failed to fetch remote tarball",
+            `failed to fetch remote tarball: ${registryErrorMessage(response)}`,
             {
               url: r.resolved,
               response
@@ -462,7 +466,7 @@ var PackageInfoClient = class {
             throw this.#resolveError(
               spec,
               options,
-              `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.`,
+              `${registryErrorMessage(response)} 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 }
             );
           }
@@ -542,7 +546,7 @@ var PackageInfoClient = class {
           throw this.#resolveError(
             spec,
             options,
-            "failed to fetch URL",
+            `failed to fetch URL: ${registryErrorMessage(response)}`,
             { response, url: remoteURL }
           );
         }
@@ -645,7 +649,7 @@ var PackageInfoClient = class {
             throw this.#resolveError(
               s,
               options,
-              "failed to fetch URL",
+              `failed to fetch URL: ${registryErrorMessage(response)}`,
               { response, url: remoteURL }
             );
           }
@@ -755,7 +759,7 @@ var PackageInfoClient = class {
   }
   async #fetchPackument(spec, options, pakuURL, useCache) {
     const response = await (await this.getRegistryClient()).request(pakuURL, {
-      headers: { accept: "application/json" },
+      headers: { accept: PACKUMENT_ACCEPT },
       ...useCache === false ? { useCache } : {},
       // costs a conditional GET per moving selector on an otherwise warm
       // cache, install included. 304s are cheap but not free; the
@@ -766,7 +770,7 @@ var PackageInfoClient = class {
       throw this.#resolveError(
         spec,
         options,
-        "failed to fetch packument",
+        `failed to fetch packument: ${registryErrorMessage(response)}`,
         {
           url: pakuURL,
           response

package/{chunk-VL7RJVNN.js → chunk-LR42WTKN.js}

@@ -12,7 +12,7 @@ var require = _vlt_createRequire(import.meta.filename);
 import {
   generateDefaultHelp,
   generateFullHelp
-} from "./chunk-5HBKYSTX.js";
+} from "./chunk-34TE4HZS.js";
 import {
   flush,
   trackCommand,
@@ -26,22 +26,22 @@ import {
   hasNpmRegistry,
   missingNpmRegistryError,
   missingRegistryError
-} from "./chunk-5JFRXIK2.js";
+} from "./chunk-2PWSMJD7.js";
+import {
+  isLazyView,
+  isViewClass,
+  loadLazyView
+} from "./chunk-4KCU2KZL.js";
 import {
   isGraphRunError,
   splitDepID
 } from "./chunk-YOE3VZFX.js";
 import {
   defaultView
-} from "./chunk-MNK55XSE.js";
-import {
-  isLazyView,
-  isViewClass,
-  loadLazyView
-} from "./chunk-4KCU2KZL.js";
+} from "./chunk-CEHPRPGQ.js";
 import {
   emitter
-} from "./chunk-UBLFPJHV.js";
+} from "./chunk-U7TEQCBN.js";
 import {
   isErrorWithCause,
   isObject
@@ -215,15 +215,21 @@ var printCode = (err, usage, stderr2, format) => {
       return { file: true };
     }
     case "ENEEDAUTH": {
-      const { url } = err.cause;
+      const { url, method, status } = err.cause;
       stderr2(`Authentication Error: ${err.message}`);
       if (url) {
         stderr2(indent(`URL: ${formatURL(url, format)}`));
       }
+      if (method) {
+        stderr2(indent(`Method: ${format(method)}`));
+      }
+      if (status) {
+        stderr2(indent(`Status: ${format(status)}`));
+      }
       return {};
     }
     case "EREQUEST": {
-      const { url, method } = err.cause;
+      const { url, method, status } = err.cause;
       const { code, syscall } = err.cause.cause ?? {};
       stderr2(`Request Error: ${err.message}`);
       if (code) {
@@ -238,6 +244,9 @@ var printCode = (err, usage, stderr2, format) => {
       if (method) {
         stderr2(indent(`Method: ${format(method)}`));
       }
+      if (status) {
+        stderr2(indent(`Status: ${format(status)}`));
+      }
       return { file: true };
     }
     case "EQUERY": {

package/chunk-MZA6N2TA.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-6FT6K5YN.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-3564IL5W.js → chunk-QQYTPGIL.js}

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