@vltpkg/cli-js 1.1.1 → 1.3.0

package/{chunk-X2AWQGYG.js → chunk-P4LLYWCG.js}

@@ -13,10 +13,10 @@ import {
   graphRun,
   graphRunSync,
   joinDepIDTuple
-} from "./chunk-YOE3VZFX.js";
+} from "./chunk-J3R4XWB3.js";
 import {
   Spec
-} from "./chunk-XKVU23NC.js";
+} from "./chunk-V7EQZOO5.js";
 import {
   load,
   parse as parse2,
@@ -28,6 +28,10 @@ import {
   promiseSpawn,
   whichSync
 } from "./chunk-U7TEQCBN.js";
+import {
+  ot,
+  ts
+} from "./chunk-Y5PA7DVK.js";
 import {
   Range,
   Version,
@@ -37,11 +41,9 @@ import {
   longDependencyTypes,
   normalizeManifest,
   parse,
+  parseRange,
   satisfies
-} from "./chunk-VFBCWAOC.js";
-import {
-  ts
-} from "./chunk-VE6CCH33.js";
+} from "./chunk-RH2Y7MPW.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-BHJT53TP.js → chunk-PDWPFR5T.js}

@@ -12,7 +12,7 @@ var require = _vlt_createRequire(import.meta.filename);
 import {
   Ze,
   ts
-} from "./chunk-VE6CCH33.js";
+} from "./chunk-Y5PA7DVK.js";
 
 // ../../node_modules/.vlt/~npm~rimraf@6.1.3/node_modules/rimraf/dist/esm/opt-arg.js
 var typeOrUndef = (val, t) => typeof val === "undefined" || typeof val === t;

package/{chunk-XIF734VO.js → chunk-QETVMIIT.js}

@@ -11,18 +11,18 @@ import {createRequire as _vlt_createRequire} from "node:module";
 var require = _vlt_createRequire(import.meta.filename);
 import {
   asUnknownSpecPrefix
-} from "./chunk-2PWSMJD7.js";
+} from "./chunk-D2LEK7VS.js";
 import {
   addKey,
   asDependency
-} from "./chunk-JZJWASXL.js";
+} from "./chunk-J2WL3A3C.js";
 import {
   joinDepIDTuple,
   splitDepID
-} from "./chunk-YOE3VZFX.js";
+} from "./chunk-J3R4XWB3.js";
 import {
   Spec
-} from "./chunk-XKVU23NC.js";
+} from "./chunk-V7EQZOO5.js";
 
 // ../../src/cli-sdk/src/parse-add-remove-args.ts
 import { isAbsolute, relative, resolve } from "node:path";

package/{chunk-WE2TQN32.js → chunk-QWJDHBV7.js}

@@ -16,10 +16,10 @@ import {
 } from "./chunk-ZWKI5OSF.js";
 import {
   minimatch
-} from "./chunk-X2AWQGYG.js";
+} from "./chunk-P4LLYWCG.js";
 import {
   Spec
-} from "./chunk-XKVU23NC.js";
+} from "./chunk-V7EQZOO5.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-VFBCWAOC.js → chunk-RH2Y7MPW.js}

@@ -1946,6 +1946,28 @@ var normalizeBinPaths = (manifest) => {
   }
 };
 var isBoolean = (value) => typeof value === "boolean";
+var integrityRE = /^sha512-[a-zA-Z0-9/+]{86}==$/;
+var isIntegrity = (i) => typeof i === "string" && integrityRE.test(i);
+var integrityHex = (i) => isIntegrity(i) ? Buffer.from(i.slice(7), "base64").toString("hex") : void 0;
+var BROTLI_TARBALL_EXT = ".tar.br";
+var tarballFormat = (url) => {
+  const end = /[?#]/.exec(url)?.index ?? url.length;
+  return url.endsWith(BROTLI_TARBALL_EXT, end) ? "brotli" : void 0;
+};
+var brotliTarballName = (tgz) => tgz.replace(/\.tgz$/, BROTLI_TARBALL_EXT);
+var brotliTarballUrl = (tarball, alternates) => {
+  if (!tarball) return void 0;
+  const entry = alternates?.find(
+    (a) => a.kind === "tar.br" && !!a.tarball
+  );
+  if (!entry) return void 0;
+  try {
+    const href = new URL(entry.tarball, tarball).href;
+    return href === new URL(brotliTarballName(tarball)).href ? href : void 0;
+  } catch {
+    return void 0;
+  }
+};
 var asError = (er, fallbackMessage = "Unknown error") => er instanceof Error ? er : new Error(String(er) || fallbackMessage);
 var isError = (er) => er instanceof Error;
 var isErrorWithCause = (er) => isError(er) && "cause" in er;
@@ -2508,6 +2530,12 @@ export {
   isSpec,
   currentDefaultRegistryName,
   Spec,
+  normalizeBinPaths,
+  integrityRE,
+  integrityHex,
+  tarballFormat,
+  brotliTarballName,
+  brotliTarballUrl,
   asError,
   isError,
   isErrorWithCause,
@@ -2515,6 +2543,7 @@ export {
   isRecordStringString,
   assertRecordStringString,
   assertRecordStringT,
+  isManifest,
   asManifest,
   normalizeManifest,
   asNormalizedManifest,