@vltpkg/cli-js 1.0.9 → 1.1.0

package/{chunk-LHMEJF6J.js → chunk-47M7IZ5P.js}

@@ -13,14 +13,14 @@ import {
   AbortError,
   SecurityArchive,
   pRetry
-} from "./chunk-2YJ5MESP.js";
+} from "./chunk-ZDQJWRCU.js";
 import {
   Monorepo,
   PackageJson,
   getUser,
   minimatch,
   platformCheck
-} from "./chunk-USTJECVS.js";
+} from "./chunk-X2AWQGYG.js";
 import {
   asDepID,
   baseDepID,
@@ -44,11 +44,9 @@ import {
   walkUp
 } from "./chunk-HTOTG4TS.js";
 import {
+  graphStep,
   promiseSpawn
-} from "./chunk-LPIBYUMT.js";
-import {
-  graphStep
-} from "./chunk-UBLFPJHV.js";
+} from "./chunk-U7TEQCBN.js";
 import {
   Spec,
   Version,
@@ -5388,7 +5386,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
@@ -5740,6 +5738,39 @@ var parse2 = (query) => {
   return (0, import_postcss_selector_parser.default)(transformAst).astSync(escapedQuery);
 };
 
+// ../../src/query/src/error.ts
+var selectorText = (node) => {
+  const text = node.toString === Object.prototype.toString ? "" : String(node).trim().replace(/\\(.)/g, "$1");
+  return text || (node.value ?? node.type);
+};
+var queryError = (message, node, extra) => error(message, {
+  code: "EQUERY",
+  found: selectorText(node),
+  ...extra
+});
+var distance = (a, b, max) => {
+  if (Math.abs(a.length - b.length) > max) return max + 1;
+  let prev = Array.from({ length: b.length + 1 }, (_, i) => i);
+  for (let i = 1; i <= a.length; i++) {
+    const row = [i];
+    let best = i;
+    for (let j = 1; j <= b.length; j++) {
+      const cost = a[i - 1] === b[j - 1] ? 0 : 1;
+      const d = Math.min(
+        (row[j - 1] ?? 0) + 1,
+        (prev[j] ?? 0) + 1,
+        (prev[j - 1] ?? 0) + cost
+      );
+      row.push(d);
+      if (d < best) best = d;
+    }
+    if (best > max) return max + 1;
+    prev = row;
+  }
+  return prev[b.length] ?? max + 1;
+};
+var didYouMean = (value, candidates, max = 2) => [...candidates].map((c) => [c, distance(value, c, max)]).filter(([, d]) => d <= max).sort(([a, x], [b, y]) => x - y || a.localeCompare(b, "en")).map(([c]) => c);
+
 // ../../src/query/src/pseudo/helpers.ts
 var removeNode = (state, node) => {
   for (const edge of node.edgesIn) {
@@ -5898,9 +5929,11 @@ var attribute = async (state) => {
     if (state.loose) {
       return state;
     }
-    throw error(`Unsupported attribute operator: ${curr.operator}`, {
-      found: state.current
-    });
+    throw queryError(
+      `Unsupported attribute operator: ${curr.operator}`,
+      state.current,
+      { validOptions: [...attributeSelectorsMap.keys()] }
+    );
   }
   const value = curr.value || "";
   const propertyName = curr.attribute;
@@ -5985,9 +6018,11 @@ var combinator = async (state) => {
     if (state.loose) {
       return state;
     }
-    throw error(`Unsupported combinator: ${state.current.value}`, {
-      found: state.current
-    });
+    throw queryError(
+      `Unsupported combinator: ${state.current.value}`,
+      state.current,
+      { validOptions: [...combinatorSelectorsMap.keys()] }
+    );
   }
   return parserFn(state);
 };
@@ -7442,6 +7477,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;
@@ -8432,6 +8468,9 @@ var pseudoSelectors = new Map(
     workspace
   })
 );
+var pseudoSelectorNames = new Set(
+  pseudoSelectors.keys()
+);
 var pseudo = async (state) => {
   await state.cancellable();
   const curr = asPseudoNode(state.current);
@@ -8442,9 +8481,15 @@ var pseudo = async (state) => {
       state.partial.nodes.clear();
       return state;
     }
-    throw error(`Unsupported pseudo-class: ${state.current.value}`, {
-      found: state.current
-    });
+    const name = selectorText(state.current).replace(/^:/, "").replace(/\(.*$/s, "");
+    const suggestions = didYouMean(name, pseudoSelectorNames).map(
+      (n) => `:${n}`
+    );
+    throw queryError(
+      `Unsupported pseudo-class: ${state.current.value}`,
+      state.current,
+      suggestions.length > 1 ? { validOptions: suggestions } : { wanted: suggestions[0] }
+    );
   }
   const result = await parserFn(state);
   const pseudoValue = curr.value.slice(1);
@@ -8456,11 +8501,18 @@ var pseudo = async (state) => {
 
 // ../../src/query/src/index.ts
 var noopFn = async (state) => state;
+var unsupportedName = (state) => {
+  const text = selectorText(state.current);
+  const name = text.replace(/^[.#]/, "");
+  return queryError("Unsupported selector", state.current, {
+    wanted: pseudoSelectorNames.has(name) ? `:${name}` : name ? `#${name}` : void 0
+  });
+};
 var selectors = {
   attribute,
-  /* c8 ignore start */
+  /* c8 ignore start -- dss-parser reports `.foo` as an escaped tag */
   class: async (state) => {
-    throw error("Unsupported selector", { found: state.current });
+    throw unsupportedName(state);
   },
   /* c8 ignore end */
   combinator,
@@ -8482,11 +8534,11 @@ var selectors = {
     return state;
   },
   string: async (state) => {
-    throw error("Unsupported selector", { found: state.current });
+    throw queryError("Unsupported selector", state.current);
   },
   tag: async (state) => {
     if (state.current.value !== "{" && state.current.value !== "}") {
-      throw error("Unsupported selector", { found: state.current });
+      throw unsupportedName(state);
     }
     return state;
   },
@@ -8502,11 +8554,9 @@ var walk = async (state) => {
     if (state.loose) {
       return state;
     }
-    throw error(
+    throw queryError(
       `Missing parser for query node: ${state.current.type}`,
-      {
-        found: state.current
-      }
+      state.current
     );
   }
   state = await parserFn(state);
@@ -10434,7 +10484,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
@@ -10518,6 +10568,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;
@@ -10557,8 +10610,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,
@@ -10781,10 +10835,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;
 };
 
@@ -14404,14 +14460,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-6NQBG3ZR.js → chunk-6LEMBT22.js}

@@ -13,14 +13,39 @@ import {
   actual,
   callLimit,
   createVirtualRoot
-} from "./chunk-LHMEJF6J.js";
+} from "./chunk-47M7IZ5P.js";
 import {
   SecurityArchive
-} from "./chunk-2YJ5MESP.js";
+} from "./chunk-ZDQJWRCU.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";
 
+// ../../src/cli-sdk/src/is-vlt-installed.ts
+import { lstatSync } from "node:fs";
+import { resolve } from "node:path";
+var lstat = (path) => {
+  try {
+    return lstatSync(path, { throwIfNoEntry: false });
+  } catch {
+    return void 0;
+  }
+};
+var isDir = (path) => !!lstat(path)?.isDirectory();
+var isFile = (path) => !!lstat(path)?.isFile();
+var isVltInstalled = (projectRoot) => isDir(resolve(projectRoot, "node_modules/.vlt")) || isFile(resolve(projectRoot, "node_modules/.vlt-lock.json"));
+var assertVltInstalled = (projectRoot, command) => {
+  if (isVltInstalled(projectRoot)) return;
+  const nodeModules = resolve(projectRoot, "node_modules");
+  const hint = isDir(nodeModules) ? `run \`vlt install\` to rebuild it before running \`vlt ${command}\`` : `run \`vlt install\` before running \`vlt ${command}\``;
+  throw error(`No vlt install found in ${nodeModules}
+
+  ${hint}`, {
+    code: "EQUERY",
+    path: nodeModules
+  });
+};
+
 // ../../src/cli-sdk/src/query-host-contexts.ts
 import { homedir as homedir2 } from "node:os";
 import { parse, posix } from "node:path";
@@ -115,7 +140,7 @@ var reloadConfig = async (folder) => {
     unload("project");
   } catch {
   }
-  const { Config } = await import("./config-RQKPUW5B.js");
+  const { Config } = await import("./config-ZPH7V77F.js");
   return Config.load(folder, process.argv, true);
 };
 
@@ -126,7 +151,6 @@ try {
 } catch {
 }
 var home2 = foundHome ?? posix.dirname(posix.format(parse(process.cwd())));
-var isVltInstalled = (folder) => !!folder.resolve("node_modules/.vlt").lstatSync()?.isDirectory() || !!folder.resolve("node_modules/.vlt-lock.json").lstatSync()?.isFile();
 var getPossibleProjectKeys = (folder, scurry) => {
   const relativePath = posix.relative(
     scurry.cwd.fullpathPosix(),
@@ -196,7 +220,7 @@ var createHostContextsMap = async (conf) => {
     for (const folder of projectFolders) {
       try {
         const config = await reloadConfig(folder.fullpath());
-        if (!isVltInstalled(folder)) {
+        if (!isVltInstalled(folder.fullpath())) {
           continue;
         }
         const graph = actual.load({
@@ -234,5 +258,6 @@ var createHostContextsMap = async (conf) => {
 };
 
 export {
+  assertVltInstalled,
   createHostContextsMap
 };

package/chunk-A75UYRJC.js

@@ -0,0 +1,75 @@
+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 {
+  error
+} from "./chunk-WZWDS3W4.js";
+import {
+  __glob
+} from "./chunk-PZLD7RTK.js";
+
+// import("./commands/**/*.ts") in ../../src/cli-sdk/src/load-command.ts
+var globImport_commands_ts = __glob({
+  "./commands/access.ts": () => import("./access-GLWBGQLN.js"),
+  "./commands/bugs.ts": () => import("./bugs-OCQYFWFE.js"),
+  "./commands/build.ts": () => import("./build-CPWGNTCM.js"),
+  "./commands/cache.ts": () => import("./cache-SL7DQMY2.js"),
+  "./commands/ci.ts": () => import("./ci-O2RSLTBX.js"),
+  "./commands/config.ts": () => import("./config-ZBIF32GS.js"),
+  "./commands/create.ts": () => import("./create-2JX4RV5U.js"),
+  "./commands/deprecate.ts": () => import("./deprecate-XJLP2TUW.js"),
+  "./commands/dist-tag.ts": () => import("./dist-tag-F6ZFWGQU.js"),
+  "./commands/docs.ts": () => import("./docs-IJCZZ4V6.js"),
+  "./commands/exec-cache.ts": () => import("./exec-cache-AG77OOEE.js"),
+  "./commands/exec-local.ts": () => import("./exec-local-QXPWC4QG.js"),
+  "./commands/exec.ts": () => import("./exec-IWSS2LUA.js"),
+  "./commands/help.ts": () => import("./help-TGNDNWLP.js"),
+  "./commands/init.ts": () => import("./init-WU7BRPKR.js"),
+  "./commands/install.ts": () => import("./install-74XKB5N7.js"),
+  "./commands/install/reporter.ts": () => import("./reporter-ZW7OMRZT.js"),
+  "./commands/list.ts": () => import("./list-TOEC6Q3A.js"),
+  "./commands/login.ts": () => import("./login-WJYMAFSL.js"),
+  "./commands/logout.ts": () => import("./logout-MTRQWI3L.js"),
+  "./commands/pack.ts": () => import("./pack-FFWGLSNC.js"),
+  "./commands/ping.ts": () => import("./ping-DWUVTCJB.js"),
+  "./commands/pkg.ts": () => import("./pkg-KNZW5FIA.js"),
+  "./commands/profile.ts": () => import("./profile-6W2ABNXL.js"),
+  "./commands/publish.ts": () => import("./publish-HGNUONU3.js"),
+  "./commands/query.ts": () => import("./query-FSCYPETX.js"),
+  "./commands/registry.ts": () => import("./registry-YTJZ3AQD.js"),
+  "./commands/repo.ts": () => import("./repo-OVIKYYWA.js"),
+  "./commands/run-exec.ts": () => import("./run-exec-YJSMWMMP.js"),
+  "./commands/run.ts": () => import("./run-UPV3RPQJ.js"),
+  "./commands/setup.ts": () => import("./setup-7DPMAPUY.js"),
+  "./commands/token.ts": () => import("./token-GA73ER5V.js"),
+  "./commands/uninstall.ts": () => import("./uninstall-E3VKSC3B.js"),
+  "./commands/unpublish.ts": () => import("./unpublish-Q6MQHBPQ.js"),
+  "./commands/update.ts": () => import("./update-4CC44TR5.js"),
+  "./commands/version.ts": () => import("./version-CRZBXNDG.js"),
+  "./commands/view.ts": () => import("./view-ILUULGSO.js"),
+  "./commands/whoami.ts": () => import("./whoami-Z4TSLYTR.js")
+});
+
+// ../../src/cli-sdk/src/load-command.ts
+var loadCommand = async (command) => {
+  try {
+    return await globImport_commands_ts(`./commands/${command}.ts`);
+  } catch (e) {
+    throw error("Could not load command", {
+      found: command,
+      cause: e
+    });
+  }
+};
+
+export {
+  loadCommand
+};

package/{chunk-HAYXR3MW.js → chunk-APMYKJI2.js}

@@ -12,7 +12,7 @@ var require = _vlt_createRequire(import.meta.filename);
 import {
   promiseSpawn,
   which
-} from "./chunk-LPIBYUMT.js";
+} from "./chunk-U7TEQCBN.js";
 
 // ../../src/url-open/src/index.ts
 import { release } from "node:os";

package/{chunk-A6TBJ4AB.js → chunk-BUXPKRYB.js}

@@ -14,12 +14,12 @@ import {
 } from "./chunk-RIYFGX27.js";
 import {
   createHostContextsMap
-} from "./chunk-6NQBG3ZR.js";
+} from "./chunk-6LEMBT22.js";
 import {
   stderr,
   stdout,
   styleTextStdout
-} from "./chunk-MXCWH7WC.js";
+} from "./chunk-TNEMFBP5.js";
 import {
   require_emoji_regex
 } from "./chunk-VTEFO2FT.js";
@@ -27,10 +27,10 @@ import {
   Query,
   actual,
   isRunResult
-} from "./chunk-LHMEJF6J.js";
+} from "./chunk-47M7IZ5P.js";
 import {
   Monorepo
-} from "./chunk-USTJECVS.js";
+} from "./chunk-X2AWQGYG.js";
 import {
   isErrorWithCause
 } from "./chunk-VFBCWAOC.js";

package/{chunk-PTR5IGFQ.js → chunk-CBASIDQH.js}

@@ -12,7 +12,7 @@ var require = _vlt_createRequire(import.meta.filename);
 import {
   commandAliases,
   jack
-} from "./chunk-XISRK3R5.js";
+} from "./chunk-CEHPRPGQ.js";
 
 // ../../src/cli-sdk/src/config/usage.ts
 var toArr = (v) => Array.isArray(v) ? v : [v];

package/{chunk-XISRK3R5.js → chunk-CEHPRPGQ.js}

@@ -1203,6 +1203,10 @@ var definition = j2.heading("Configuration").description(
 
      Command-specific fields may be set in a nested \`command\` object that
      overrides any options defined at the top level.
+
+     Object type values given in the environment or on the command line
+     are merged key by key over the config files (command line wins over
+     environment); other values replace them.
     `
 ).flag({
   color: {
@@ -1266,6 +1270,12 @@ var definition = j2.heading("Configuration").description(
                     alias must be configured (e.g. via \`vlt setup\`) before it
                     can be used. The \`gh\` and \`jsr\` aliases have built-in
                     defaults that can be overridden here.
+
+                    Aliases given on the command line or in
+                    \`VLT_REGISTRIES\` (newline-delimited) merge with the
+                    configured ones, later sources winning per key. Pass
+                    \`--save-config\` to \`install\`, \`add\` or
+                    \`update\` to save them to \`vlt.json\`.
                     `
   },
   "scoped-registries": {
@@ -1689,6 +1699,17 @@ var definition = j2.heading("Configuration").description(
                     This is useful if a package already exists in
                     devDependencies or optionalDependencies, but you want to
                     move it to be a non-optional production dependency.`
+  },
+  "save-config": {
+    description: `Save the registry and git host options given on the
+                    command line or via \`VLT_*\` env (\`--registry\`,
+                    \`--registries\`, \`--default-registry-alias\`,
+                    \`--scoped-registries\`, \`--jsr-registries\`,
+                    \`--git-hosts\`, \`--git-host-archives\`) to the
+                    project \`vlt.json\` (or the user one with
+                    \`--config=user\`) after a successful \`install\`,
+                    \`add\` or \`update\`. Values a config file already
+                    has are left alone.`
   }
 }).opt({
   "save-prefix": {
@@ -1745,6 +1766,23 @@ var definition = j2.heading("Configuration").description(
     description: "Set the access level of the package",
     validOptions: ["public", "restricted"]
   }
+}).flag({
+  "git-tag-version": {
+    description: `Commit and tag the version change made by \`vlt version\`.
+
+                    Set \`--no-git-tag-version\` to bump the version in
+                    \`package.json\` without touching git at all, so that a
+                    series of bumps can be committed together.`,
+    default: true
+  },
+  commit: {
+    description: `Create the version commit in \`vlt version\`.
+
+                    Set \`--no-commit\` to leave the bumped \`package.json\`
+                    uncommitted while still creating the git tag. Implied by
+                    \`--no-git-tag-version\`.`,
+    default: true
+  }
 }).opt({
   otp: {
     description: `Provide an OTP to use when publishing a package.`

package/{chunk-KCXN2GTX.js → chunk-CF5EGH4W.js}

@@ -9,10 +9,13 @@ globalThis.setInterval = _vlt_setInterval;
 globalThis.clearInterval = _vlt_clearInterval;
 import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
+import {
+  asUnknownSpecPrefix
+} from "./chunk-2PWSMJD7.js";
 import {
   addKey,
   asDependency
-} from "./chunk-LHMEJF6J.js";
+} from "./chunk-47M7IZ5P.js";
 import {
   joinDepIDTuple,
   splitDepID
@@ -65,6 +68,13 @@ var rebaseFileSpec = (spec, importerPath, scurryCwd, specOptions, monorepo) => {
   if (rebasedPath === spec.file) return spec;
   return Spec.parseArgs(rebasedPath, specOptions);
 };
+var parseArg = (item, options) => {
+  try {
+    return Spec.parseArgs(item, options);
+  } catch (er) {
+    throw asUnknownSpecPrefix(er);
+  }
+};
 var parseAddArgs = (config, scurry, monorepo) => {
   const add = new AddImportersDependenciesMapImpl();
   const items = config.positionals;
@@ -74,7 +84,7 @@ var parseAddArgs = (config, scurry, monorepo) => {
   const parsedItems = [];
   let hasFileSpecs = false;
   for (const item of items) {
-    const spec = Spec.parseArgs(item, specOptions);
+    const spec = parseArg(item, specOptions);
     parsedItems.push({ spec, type });
     if (spec.type === "file") hasFileSpecs = true;
     add.modifiedDependencies = true;