@vltpkg/cli-js 1.2.0 → 1.3.1

package/{chunk-6G7MTZGS.js → chunk-BUKZHMMK.js}

@@ -13,10 +13,10 @@ import {
   graphRun,
   graphRunSync,
   joinDepIDTuple
-} from "./chunk-SYGF27W7.js";
+} from "./chunk-JIQBZ2UT.js";
 import {
   Spec
-} from "./chunk-G5NJ7CYI.js";
+} from "./chunk-64VFL4WI.js";
 import {
   load,
   parse as parse2,
@@ -29,8 +29,9 @@ import {
   whichSync
 } from "./chunk-U7TEQCBN.js";
 import {
+  ot,
   ts
-} from "./chunk-VE6CCH33.js";
+} from "./chunk-Y5PA7DVK.js";
 import {
   Range,
   Version,
@@ -40,8 +41,9 @@ import {
   longDependencyTypes,
   normalizeManifest,
   parse,
+  parseRange,
   satisfies
-} from "./chunk-G5BSQ6DP.js";
+} from "./chunk-BP3PQ67D.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";
@@ -5771,6 +5773,59 @@ var assertWSConfig = (conf, path2) => {
     wanted: "string | string[] | { [group: string]: string | string[] }"
   });
 };
+var manifestWSIgnoredKeys = /* @__PURE__ */ new Set(["nohoist"]);
+var asManifestWSConfig = (conf, path2) => {
+  if (conf && typeof conf === "object" && !Array.isArray(conf)) {
+    const groups = Object.keys(conf).filter(
+      (k) => k !== "packages" && !manifestWSIgnoredKeys.has(k)
+    );
+    if (groups.length) {
+      throw error(
+        'Named workspace groups are not supported in package.json. Move them to the "workspaces" field of vlt.json to use them.',
+        {
+          path: path2,
+          found: groups,
+          wanted: "string | string[] | { packages: string[] }"
+        }
+      );
+    }
+    const { packages } = conf;
+    if (packages === void 0) return {};
+    return asWSConfig({ packages }, path2);
+  }
+  return asWSConfig(conf, path2);
+};
+var resolveWSConfig = (projectRoot, packageJson = new PackageJson()) => {
+  const fromVltJson = load("workspaces", assertWSConfig);
+  if (fromVltJson !== void 0) {
+    return { config: asWSConfig(fromVltJson), source: "vlt.json" };
+  }
+  const workspaces = packageJson.maybeRead(projectRoot)?.workspaces;
+  if (workspaces === void 0) return { config: {} };
+  return {
+    config: asManifestWSConfig(
+      workspaces,
+      resolve4(projectRoot, "package.json")
+    ),
+    source: "package.json"
+  };
+};
+var splitNegatedPatterns = (all) => {
+  const patterns = [];
+  let ignore = [];
+  for (const orig of all) {
+    const excl = /^!+/.exec(orig);
+    const stripped = excl ? orig.slice(excl[0].length) : orig;
+    const pattern = stripped.replace(/^\.?\/+/, "");
+    if (excl && excl[0].length % 2 === 1) {
+      ignore.push(pattern);
+      continue;
+    }
+    ignore = ignore.filter((ign) => !minimatch(pattern, ign));
+    patterns.push(pattern);
+  }
+  return { patterns, ignore };
+};
 var Monorepo = class _Monorepo {
   /** The project root where vlt.json is found */
   projectRoot;
@@ -5795,9 +5850,9 @@ var Monorepo = class _Monorepo {
     if (options.load) this.load(options.load);
   }
   /**
-   * Load the workspace definitions from vlt.json,
-   * canonicalizing the result into the effective `{[group:string]:string[]}`
-   * form.
+   * Load the workspace definitions from vlt.json, or from the root
+   * package.json when vlt.json declares none, canonicalizing the result
+   * into the effective `{[group:string]:string[]}` form.
    *
    * Eg:
    * - `"src/*"` => `{packages:["src/*"]}`
@@ -5805,9 +5860,10 @@ var Monorepo = class _Monorepo {
    */
   get config() {
     if (this.#config) return this.#config;
-    this.#config = asWSConfig(
-      load("workspaces", assertWSConfig) ?? {}
-    );
+    this.#config = resolveWSConfig(
+      this.projectRoot,
+      this.packageJson
+    ).config;
     return this.#config;
   }
   /**
@@ -5902,7 +5958,7 @@ var Monorepo = class _Monorepo {
   }
   // can't be cached, because it's dependent on the matches set
   // but still worthwhile to have it defined in one place
-  #globOptions(matches, parseErrors) {
+  #globOptions(matches, ignore, parseErrors) {
     const inMatches = (p) => {
       return !!p?.relativePosix() && (matches.has(p.relativePosix()) || inMatches(p.parent));
     };
@@ -5913,12 +5969,15 @@ var Monorepo = class _Monorepo {
       scurry: this.scurry,
       withFileTypes: false,
       ignore: {
-        childrenIgnored: (p) => basename2(p.relativePosix()) === "node_modules" || inMatches(p),
+        childrenIgnored: (p) => basename2(p.relativePosix()) === "node_modules" || // only prunes the subtree for a `!foo/**` style negation,
+        // matching npm -- a bare `!foo` still gets walked into
+        !!ignore?.childrenIgnored(p) || inMatches(p),
         // ignore if fails to load package.json
         ignored: (p) => {
           p.lstatSync();
           const rel = p.relativePosix();
           if (!rel) return true;
+          if (ignore?.ignored(p)) return true;
           const maybeDelete = [];
           for (const m of matches) {
             if (rel.startsWith(m + "/")) return true;
@@ -5946,10 +6005,21 @@ var Monorepo = class _Monorepo {
       }
     };
   }
+  // patterns are always an array: asWSConfig normalizes every
+  // WorkspaceConfig shape to string[], and the path filter is a Set
   #glob(pattern) {
+    const { patterns, ignore } = splitNegatedPatterns(pattern);
     const matches = /* @__PURE__ */ new Set();
+    if (!patterns.length) return matches;
     const parseErrors = /* @__PURE__ */ new Map();
-    ts(pattern, this.#globOptions(matches, parseErrors));
+    ts(
+      patterns,
+      this.#globOptions(
+        matches,
+        ignore.length ? new ot(ignore, {}) : void 0,
+        parseErrors
+      )
+    );
     for (const [rel, err] of parseErrors) {
       let isNested = false;
       for (const m of matches) {
@@ -5978,6 +6048,12 @@ var Monorepo = class _Monorepo {
    * This does *not* get the full set of dependencies, or expand any
    * `workspace:` dependencies that are not loaded.
    *
+   * Bare semver specs are matched by name, and linked only when the
+   * local workspace version satisfies the range -- the same test
+   * `@vltpkg/satisfies` applies at resolution time, so the two agree on
+   * which deps are local. Specs that aren't parseable ranges, such as
+   * dist-tags, still match by name alone.
+   *
    * Call with the `forceLoad` param set to `true` to attempt a full
    * load if any deps are not currently loaded.
    */
@@ -5994,15 +6070,20 @@ var Monorepo = class _Monorepo {
       const deps = manifest[depType];
       if (!deps) continue;
       for (const [dep, spec] of Object.entries(deps)) {
-        if (spec.startsWith("workspace:")) {
+        if (spec.startsWith("workspace:") || !spec.includes(":")) {
           let depWS = this.#workspaces.get(dep);
+          if (depWS && depWS.name !== dep) depWS = void 0;
           if (!depWS) {
             if (!forceLoad) continue;
             if (didForceLoad) continue;
             didForceLoad = true;
             this.load();
             depWS = this.#workspaces.get(dep);
-            if (!depWS) continue;
+            if (depWS?.name !== dep) continue;
+          }
+          const range2 = spec.includes(":") ? void 0 : parseRange(spec);
+          if (range2 && !satisfies(depWS.manifest.version ?? "", range2)) {
+            continue;
           }
           depWorkspaces.push(depWS);
         }
@@ -6142,13 +6223,20 @@ var Monorepo = class _Monorepo {
   }
   /**
    * Convenience method to instantiate and load in one call.
-   * Returns undefined if the project is not a monorepo workspaces
-   * root, otherwise returns the loaded Monorepo.
+   * Returns undefined if the project is not a monorepo workspaces root,
+   * meaning neither `vlt.json` nor the root `package.json` declares any
+   * workspaces. Otherwise returns the loaded Monorepo.
    */
   static maybeLoad(projectRoot, options = { load: {} }) {
-    const config = load("workspaces", assertWSConfig);
-    if (!config) return;
-    return new _Monorepo(projectRoot, { load: {}, ...options });
+    if (options.config) {
+      return new _Monorepo(projectRoot, { load: {}, ...options });
+    }
+    const { config, source } = resolveWSConfig(
+      projectRoot,
+      options.packageJson
+    );
+    if (!source) return;
+    return new _Monorepo(projectRoot, { load: {}, ...options, config });
   }
   /**
    * Convenience method to instantiate and load in one call.
@@ -6198,7 +6286,8 @@ export {
   PackageJson,
   minimatch,
   PathScurry,
-  asWSConfig,
   assertWSConfig,
+  resolveWSConfig,
+  splitNegatedPatterns,
   Monorepo
 };

package/{chunk-YTT3UHUB.js → chunk-CRGWLUGC.js}

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

package/{chunk-UNWQVOLY.js → chunk-CSZTT7QN.js}

@@ -12,7 +12,7 @@ var require = _vlt_createRequire(import.meta.filename);
 import {
   generateDefaultHelp,
   generateFullHelp
-} from "./chunk-GUATFMMU.js";
+} from "./chunk-CU752KW7.js";
 import {
   flush,
   trackCommand,
@@ -20,13 +20,13 @@ import {
 } from "./chunk-G2YT2GWF.js";
 import {
   parseError
-} from "./chunk-YTT3UHUB.js";
+} from "./chunk-CRGWLUGC.js";
 import {
   hasConfiguredRegistry,
   hasNpmRegistry,
   missingNpmRegistryError,
   missingRegistryError
-} from "./chunk-O44Z6MAV.js";
+} from "./chunk-J4NHRZX6.js";
 import {
   isLazyView,
   isViewClass,
@@ -35,10 +35,10 @@ import {
 import {
   isGraphRunError,
   splitDepID
-} from "./chunk-SYGF27W7.js";
+} from "./chunk-JIQBZ2UT.js";
 import {
   defaultView
-} from "./chunk-6A3XS52F.js";
+} from "./chunk-ENSGPOLR.js";
 import {
   emitter
 } from "./chunk-U7TEQCBN.js";
@@ -48,7 +48,7 @@ import {
 import {
   isErrorWithCause,
   isObject
-} from "./chunk-G5BSQ6DP.js";
+} from "./chunk-BP3PQ67D.js";
 
 // ../../src/cli-sdk/src/print-err.ts
 import { mkdirSync, readFileSync, writeFileSync } from "node:fs";

package/{chunk-GUATFMMU.js → chunk-CU752KW7.js}

@@ -14,7 +14,7 @@ import {
 } from "./chunk-WGDTG44V.js";
 import {
   commandAliases
-} from "./chunk-6A3XS52F.js";
+} from "./chunk-ENSGPOLR.js";
 
 // ../../node_modules/.vlt/~npm~package-json-from-dist@1.0.1/node_modules/package-json-from-dist/dist/esm/index.js
 import { readFileSync } from "node:fs";

package/{chunk-6A3XS52F.js → chunk-ENSGPOLR.js}

@@ -1780,6 +1780,19 @@ var definition = j2.heading("Configuration").description(
   },
   "lockfile-only": {
     description: "Only update the lockfile (vlt-lock.json) and package.json files, skip all node_modules operations including package extraction and filesystem changes."
+  },
+  "brotli-tarballs": {
+    description: `Resolve to the Brotli (\`.tar.br\`) tarball when the
+                    registry advertises one for a version, transferring far
+                    less than the gzip \`.tgz\`.
+
+                    The \`.tar.br\` is its own artifact and hashes
+                    differently, so a version installed this way records that
+                    hash in \`vlt-lock.json\`. An existing lockfile keeps
+                    whichever artifact it already pinned; set
+                    \`--no-brotli-tarballs\` before resolving to pin the
+                    \`.tgz\` instead.`,
+    default: true
   }
 }).opt({
   "allow-scripts": {

package/chunk-GVQDUMNW.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-ATF2FQHI.js"),
+  "./commands/bugs.ts": () => import("./bugs-P26XZBIE.js"),
+  "./commands/build.ts": () => import("./build-UABOHT3O.js"),
+  "./commands/cache.ts": () => import("./cache-R2SEGAZJ.js"),
+  "./commands/ci.ts": () => import("./ci-3R6MFNVV.js"),
+  "./commands/config.ts": () => import("./config-WPVXQDM5.js"),
+  "./commands/create.ts": () => import("./create-MS4GFBDA.js"),
+  "./commands/deprecate.ts": () => import("./deprecate-JTTM44ZL.js"),
+  "./commands/dist-tag.ts": () => import("./dist-tag-HJEVOOH3.js"),
+  "./commands/docs.ts": () => import("./docs-6OIBQSV6.js"),
+  "./commands/exec-cache.ts": () => import("./exec-cache-6UBB7RI2.js"),
+  "./commands/exec-local.ts": () => import("./exec-local-C7MPFSOE.js"),
+  "./commands/exec.ts": () => import("./exec-LCWL6Z3E.js"),
+  "./commands/help.ts": () => import("./help-DC77D3YW.js"),
+  "./commands/init.ts": () => import("./init-B6G7COKW.js"),
+  "./commands/install.ts": () => import("./install-LJPM2XSF.js"),
+  "./commands/install/reporter.ts": () => import("./reporter-47XFGNJH.js"),
+  "./commands/list.ts": () => import("./list-4KT3WIIG.js"),
+  "./commands/login.ts": () => import("./login-CFYSVNFH.js"),
+  "./commands/logout.ts": () => import("./logout-5ZUJHYWI.js"),
+  "./commands/pack.ts": () => import("./pack-YP5WBIT6.js"),
+  "./commands/ping.ts": () => import("./ping-LLMQAG3Y.js"),
+  "./commands/pkg.ts": () => import("./pkg-QTMOXWRT.js"),
+  "./commands/profile.ts": () => import("./profile-IA3ELAPB.js"),
+  "./commands/publish.ts": () => import("./publish-QSIXKUCZ.js"),
+  "./commands/query.ts": () => import("./query-KHXMK2ED.js"),
+  "./commands/registry.ts": () => import("./registry-MXAA4HVJ.js"),
+  "./commands/repo.ts": () => import("./repo-XKG2HZ46.js"),
+  "./commands/run-exec.ts": () => import("./run-exec-IH5YQF4G.js"),
+  "./commands/run.ts": () => import("./run-3OEGBMSR.js"),
+  "./commands/setup.ts": () => import("./setup-LRR3VSGV.js"),
+  "./commands/token.ts": () => import("./token-UBMP2WBT.js"),
+  "./commands/uninstall.ts": () => import("./uninstall-4F4QIOAW.js"),
+  "./commands/unpublish.ts": () => import("./unpublish-JPDDQZXF.js"),
+  "./commands/update.ts": () => import("./update-CVJFMZOK.js"),
+  "./commands/version.ts": () => import("./version-I7K3J2O2.js"),
+  "./commands/view.ts": () => import("./view-G5O4ZBLM.js"),
+  "./commands/whoami.ts": () => import("./whoami-NG7XVRAL.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-55DYW2MP.js → chunk-I6QGYSB4.js}

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

package/{chunk-O44Z6MAV.js → chunk-J4NHRZX6.js}

@@ -14,7 +14,7 @@ import {
   defaultRegistryName,
   isErrorWithCause,
   isObject
-} from "./chunk-G5BSQ6DP.js";
+} from "./chunk-BP3PQ67D.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";

package/{chunk-SYGF27W7.js → chunk-JIQBZ2UT.js}

@@ -11,12 +11,12 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   Spec as Spec2
-} from "./chunk-G5NJ7CYI.js";
+} from "./chunk-64VFL4WI.js";
 import {
   Spec,
   currentDefaultRegistryName,
   defaultRegistryName
-} from "./chunk-G5BSQ6DP.js";
+} from "./chunk-BP3PQ67D.js";
 import {
   error
 } from "./chunk-WZWDS3W4.js";

package/{chunk-5PP77V44.js → chunk-KH3ERNCA.js}

@@ -16,10 +16,10 @@ import {
 } from "./chunk-ZWKI5OSF.js";
 import {
   minimatch
-} from "./chunk-6G7MTZGS.js";
+} from "./chunk-BUKZHMMK.js";
 import {
   Spec
-} from "./chunk-G5NJ7CYI.js";
+} from "./chunk-64VFL4WI.js";
 import {
   parse,
   stringify
@@ -770,7 +770,8 @@ var packTarball = async (manifest, dir, config) => {
       files,
       integrity,
       shasum,
-      resolvedManifest: processedManifest
+      resolvedManifest: processedManifest,
+      packDir
     };
   } finally {
     config.options.packageJson.write(packDir, manifest);

package/{chunk-FSZF2RSQ.js → chunk-KPMPYRBZ.js}

@@ -11,19 +11,19 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   openUrl
-} from "./chunk-3CUFJPBK.js";
+} from "./chunk-MC6CESRA.js";
 import {
   stderr
-} from "./chunk-UNWQVOLY.js";
+} from "./chunk-CSZTT7QN.js";
 import {
   mermaidOutput
-} from "./chunk-B2FK2HHL.js";
+} from "./chunk-3WBHQEWL.js";
 import {
   ViewClass
 } from "./chunk-4KCU2KZL.js";
 import {
   getTokenByURL
-} from "./chunk-OE6VHHN4.js";
+} from "./chunk-P6LBJWJN.js";
 
 // ../../src/cli-sdk/src/query-auth.ts
 var createGetAuthHeader = (conf) => async (url) => getTokenByURL(url, conf.options.identity);

package/{chunk-JTUZP2OD.js → chunk-LCAH3OGR.js}

@@ -14,7 +14,7 @@ var require = _vlt_createRequire(import.meta.filename);
 var package_default = {
   name: "@vltpkg/user-agent",
   description: "The User-Agent string that vlt sends with every outbound request",
-  version: "1.2.0",
+  version: "1.3.1",
   repository: {
     type: "git",
     url: "git+https://github.com/vltpkg/vltpkg.git",

package/{chunk-3CUFJPBK.js → chunk-MC6CESRA.js}

@@ -11,7 +11,7 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   stderr
-} from "./chunk-UNWQVOLY.js";
+} from "./chunk-CSZTT7QN.js";
 import {
   urlOpen
 } from "./chunk-APMYKJI2.js";

package/{chunk-VHHLO5L6.js → chunk-OKJ4U3PP.js}

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

package/{chunk-NJZSCUD4.js → chunk-OOYLF23O.js}

@@ -12,15 +12,16 @@ var require = _vlt_createRequire(import.meta.filename);
 import {
   init,
   install
-} from "./chunk-B2FK2HHL.js";
+} from "./chunk-3WBHQEWL.js";
 import {
   commandUsage
-} from "./chunk-55DYW2MP.js";
+} from "./chunk-I6QGYSB4.js";
 import {
-  asWSConfig,
   assertWSConfig,
-  minimatch
-} from "./chunk-6G7MTZGS.js";
+  minimatch,
+  resolveWSConfig,
+  splitNegatedPatterns
+} from "./chunk-BUKZHMMK.js";
 import {
   load,
   save
@@ -74,8 +75,11 @@ Modify/add properties using \`vlt pkg\`. For example:
 var command = async (conf) => {
   const allowScripts = conf.get("allow-scripts") ? String(conf.get("allow-scripts")) : ":not(*)";
   if (conf.values.workspace?.length) {
-    const workspacesConfig = load("workspaces", assertWSConfig);
-    const parsedWSConfig = asWSConfig(workspacesConfig ?? {});
+    const { config: parsedWSConfig, source } = resolveWSConfig(
+      conf.options.projectRoot,
+      conf.options.packageJson
+    );
+    const workspacesConfig = load("workspaces", assertWSConfig) ?? (source === "package.json" ? Object.values(parsedWSConfig).flat() : void 0);
     const results = [];
     const addToConfig = [];
     for (const workspace of conf.values.workspace) {
@@ -83,10 +87,9 @@ var command = async (conf) => {
       mkdirSync(cwd, { recursive: true });
       results.push(await init({ cwd }));
       const isMatched = Object.values(parsedWSConfig).some(
-        (patterns) => {
-          return patterns.some(
-            (pattern) => minimatch(workspace, pattern)
-          );
+        (group) => {
+          const { patterns, ignore } = splitNegatedPatterns(group);
+          return patterns.some((pattern) => minimatch(workspace, pattern)) && !ignore.some((pattern) => minimatch(workspace, pattern));
         }
       );
       if (!isMatched) {