@enke.dev/bumper 0.0.6 → 0.0.8

package/dist/cli.mjs

@@ -2147,6 +2147,19 @@ function detectVersionManager() {
 // src/context/detectors/workspace.detector.ts
 import { readFile as readFile3 } from "node:fs/promises";
 import { dirname, join as join5, matchesGlob, relative } from "node:path";
+async function withoutIgnored(cwd, dirs, run2 = exec) {
+  if (dirs.length === 0) {
+    return dirs;
+  }
+  const manifestOf = (dir) => join5(dir, "package.json");
+  const { exitCode, stdout } = await run2(["git", "check-ignore", ...dirs.map(manifestOf)], { cwd });
+  if (exitCode !== 0 && exitCode !== 1) {
+    return dirs;
+  }
+  const ignored = new Set(stdout.split(`
+`).map((line) => line.trim()).filter(Boolean));
+  return dirs.filter((dir) => !ignored.has(manifestOf(dir)));
+}
 function parsePnpmPackages(yaml) {
   return yaml.split(`
 `).reduce((state, raw) => {
@@ -2183,7 +2196,7 @@ async function readWorkspaceGlobs(cwd, pm) {
   }
   return [];
 }
-async function detectWorkspaces(cwd, pm) {
+async function detectWorkspaces(cwd, pm, run2 = exec) {
   const globs = await readWorkspaceGlobs(cwd, pm);
   const positives = globs.filter((g) => !g.startsWith("!"));
   const negatives = globs.filter((g) => g.startsWith("!")).map((g) => g.slice(1));
@@ -2192,7 +2205,7 @@ async function detectWorkspaces(cwd, pm) {
   }
   const matches = await Promise.all(positives.map((pattern) => globFiles(cwd, `${pattern}/package.json`)));
   const found = new Set(matches.flat().map((match) => dirname(match)).filter((dir) => !negatives.some((neg) => matchesGlob(relative(cwd, dir), neg))));
-  const members = [...found].sort();
+  const members = await withoutIgnored(cwd, [...found].sort(), run2);
   return { isMonorepo: members.length > 0, workspaces: [cwd, ...members] };
 }
 
@@ -2253,6 +2266,7 @@ import { readFile as readFile4, writeFile as writeFile3 } from "node:fs/promises
 import { relative as relative2 } from "node:path";
 
 // src/utils/npm-registry.utils.ts
+var import_semver = __toESM(require_semver2(), 1);
 async function curlJson(url, run2 = execOk) {
   const { stdout } = await run2(["curl", "-sSL", "--fail", "--connect-timeout", "20", url]);
   return JSON.parse(stdout);
@@ -2300,6 +2314,27 @@ async function latestVersionInRange(pkg, range, tool, cwd, run2 = exec) {
     return null;
   }
 }
+async function maxSatisfyingRanges(pkg, ranges, tool, cwd, run2 = exec) {
+  if (ranges.length === 0) {
+    return null;
+  }
+  try {
+    const { exitCode, stdout } = await run2([tool, "view", pkg, "versions", "--json"], { cwd });
+    if (exitCode !== 0) {
+      return null;
+    }
+    const trimmed = stdout.trim();
+    if (!trimmed) {
+      return null;
+    }
+    const parsed = JSON.parse(trimmed);
+    const versions = Array.isArray(parsed) ? parsed : typeof parsed === "string" ? [parsed] : [];
+    const match = versions.filter((v) => import_semver.default.valid(v) && import_semver.default.prerelease(v) === null).filter((v) => ranges.every((range) => import_semver.default.satisfies(v, range))).sort(import_semver.default.rcompare)[0];
+    return match ?? null;
+  } catch {
+    return null;
+  }
+}
 
 // src/modules/runtimes/node/node-lts.utils.ts
 var DIST_INDEX = "https://nodejs.org/dist/index.json";
@@ -2384,9 +2419,9 @@ var githubActionsFeature = {
 import { relative as relative3 } from "node:path";
 
 // src/utils/spec.utils.ts
-var import_semver = __toESM(require_semver2(), 1);
+var import_semver2 = __toESM(require_semver2(), 1);
 function isPinnable(spec) {
-  return import_semver.default.valid(spec.replace(/^[\^~]/, "")) !== null;
+  return import_semver2.default.valid(spec.replace(/^[\^~]/, "")) !== null;
 }
 function operatorOf(spec) {
   return spec.startsWith("^") ? "^" : spec.startsWith("~") ? "~" : "";
@@ -2503,6 +2538,7 @@ async function selfUpdate(ctx, cmd) {
 }
 
 // src/utils/upgrade.utils.ts
+var import_semver3 = __toESM(require_semver2(), 1);
 import { join as join8 } from "node:path";
 var BUCKETS2 = [
   "dependencies",
@@ -2513,7 +2549,7 @@ var BUCKETS2 = [
 var CONCURRENCY = 8;
 var defaultLookups = {
   latestVersion,
-  latestVersionInRange,
+  maxSatisfyingRanges,
   peerDependencies: peerDependenciesOf
 };
 async function collectPackages(ctx) {
@@ -2548,7 +2584,7 @@ async function collectPeerCaps(cwd, depNames, latest, managed, tool, lookups) {
       (collected.get(peer) ?? collected.set(peer, new Set).get(peer))?.add(range);
     });
   }));
-  return new Map([...collected].map(([peer, ranges]) => [peer, [...ranges].join(" ")]));
+  return new Map([...collected].map(([peer, ranges]) => [peer, [...ranges]]));
 }
 async function resolveLatest(names, tool, cwd, lookups) {
   const resolved = [];
@@ -2610,15 +2646,15 @@ function cappedRanges(pkg, managed) {
 }
 async function rewriteSpecs(pkg, managed, latest, peerCaps, tool, cwd, lookups) {
   const present = allDependencies(pkg);
-  const caps = cappedRanges(pkg, managed);
-  peerCaps.forEach((range, name) => {
+  const capRanges = new Map;
+  cappedRanges(pkg, managed).forEach((range, name) => capRanges.set(name, [range]));
+  peerCaps.forEach((ranges, name) => {
     if (!(name in present)) {
       return;
     }
-    const own = caps.get(name);
-    caps.set(name, own ? `${own} ${range}` : range);
+    capRanges.set(name, [...new Set([...capRanges.get(name) ?? [], ...ranges])]);
   });
-  const capped = new Map(await Promise.all([...caps].map(async ([name, range]) => [name, await lookups.latestVersionInRange(name, range, tool, cwd)])));
+  const capped = new Map(await Promise.all([...capRanges].map(async ([name, ranges]) => [name, await lookups.maxSatisfyingRanges(name, ranges, tool, cwd)])));
   return BUCKETS2.reduce((bucketChanged, bucket) => {
     const deps = pkg[bucket];
     if (!deps) {
@@ -2628,10 +2664,15 @@ async function rewriteSpecs(pkg, managed, latest, peerCaps, tool, cwd, lookups)
       if (managed.has(name) || !isPinnable(spec)) {
         return acc;
       }
-      const version = caps.has(name) ? capped.get(name) : latest.get(name);
+      const capped_ = capRanges.has(name);
+      const version = capped_ ? capped.get(name) : latest.get(name);
       if (!version) {
         return acc;
       }
+      const current = spec.replace(/^[\^~]/, "");
+      if (!capped_ && import_semver3.default.valid(current) && import_semver3.default.lt(version, current)) {
+        return acc;
+      }
       const next = `${operatorOf(spec)}${version}`;
       if (next === spec) {
         return acc;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enke.dev/bumper",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "license": "MIT",
   "publishConfig": {
     "registry": "https://registry.npmjs.org",