@enke.dev/bumper 0.0.2 → 0.0.4

package/README.md

@@ -122,7 +122,7 @@ then the remaining file-rewriting features:
 | id               | kind            | detects                         | does                                                    |
 | ---------------- | --------------- | ------------------------------- | ------------------------------------------------------- |
 | `node`           | runtime         | node runtime / `.node-version`  | install latest LTS via fnm/asdf, write `.node-version`  |
-| `types-node`     | feature         | `@types/node` in any package    | pin spec to Node LTS major                              |
+| `types-node`     | feature         | `@types/node` in any package    | pin spec to exact latest in the Node LTS major line     |
 | `bun`            | package-manager | bun packageManager / lockfile   | self-upgrade, bump specs, pin `.bun-version`, reinstall |
 | `npm`            | package-manager | npm packageManager / lockfile   | bump specs to latest, clean reinstall                   |
 | `pnpm`           | package-manager | pnpm packageManager / lockfile  | self-update, bump specs to latest, clean reinstall      |

package/dist/cli.mjs

@@ -2298,7 +2298,7 @@ async function fetchLatestLts() {
   }
   const version = latest.version.replace(/^v/, "");
   const major = Number(version.split(".")[0]);
-  return { version, major };
+  return { version, major, ...latest.npm ? { npm: latest.npm } : {} };
 }
 async function ensureNodeLts(ctx) {
   ctx.nodeLts ??= await fetchLatestLts();
@@ -2400,17 +2400,45 @@ async function dirsWithTypesNode(ctx) {
   }));
   return dirs.filter((dir) => dir !== null);
 }
-function pinTypesNode(pkg, major) {
+function pinTypesNode(pkg, version) {
   return BUCKETS.reduce((changed, bucket) => {
     const deps = pkg[bucket];
     const spec = deps?.[TYPES_NODE_PACKAGE];
     if (deps && spec && !isVersionRange(spec)) {
-      deps[TYPES_NODE_PACKAGE] = major;
-      return true;
+      const next = `${operatorOf(spec)}${version}`;
+      if (next !== spec) {
+        deps[TYPES_NODE_PACKAGE] = next;
+        return true;
+      }
     }
     return changed;
   }, false);
 }
+async function updateTypesNode(ctx, resolveInRange = latestVersionInRange) {
+  const { major } = await ensureNodeLts(ctx);
+  const majorSpec = String(major);
+  const dirs = await dirsWithTypesNode(ctx);
+  if (dirs.length === 0) {
+    return;
+  }
+  if (ctx.dryRun) {
+    dirs.forEach((dir) => {
+      const label = relative3(ctx.cwd, dir) || ".";
+      planLine(`pin ${TYPES_NODE_PACKAGE} to latest ${majorSpec}.x in ${label}`);
+    });
+    return;
+  }
+  const version = await resolveInRange(TYPES_NODE_PACKAGE, majorSpec, viewTool(ctx.packageManager), ctx.cwd);
+  if (!version) {
+    return;
+  }
+  await Promise.all(dirs.map(async (dir) => {
+    const pkg = await readPackageJson(dir);
+    if (pkg && pinTypesNode(pkg, version)) {
+      await writePackageJson(dir, pkg);
+    }
+  }));
+}
 var typesNodeFeature = {
   kind: "feature" /* Feature */,
   id: "types-node",
@@ -2421,22 +2449,7 @@ var typesNodeFeature = {
   async managedDependencies() {
     return [TYPES_NODE_PACKAGE];
   },
-  async update(ctx) {
-    const { major } = await ensureNodeLts(ctx);
-    const majorSpec = String(major);
-    const dirs = await dirsWithTypesNode(ctx);
-    await Promise.all(dirs.map(async (dir) => {
-      const label = relative3(ctx.cwd, dir) || ".";
-      if (ctx.dryRun) {
-        planLine(`pin ${TYPES_NODE_PACKAGE}@${majorSpec} in ${label}`);
-        return;
-      }
-      const pkg = await readPackageJson(dir);
-      if (pkg && pinTypesNode(pkg, majorSpec)) {
-        await writePackageJson(dir, pkg);
-      }
-    }));
-  }
+  update: updateTypesNode
 };
 
 // src/modules/package-managers/bun/bun.package-manager.ts
@@ -2517,7 +2530,7 @@ async function resolveLatest(names, tool, cwd, lookups) {
 async function bumpPackageManagerField(ctx, root, lookups) {
   const match = root?.packageManager?.match(/^([a-z]+)@(.+)$/);
   const name = match?.[1];
-  if (!root || !name) {
+  if (!root || !name || name === "npm") {
     return;
   }
   const version = await lookups.latestVersion(name, viewTool(ctx.packageManager), ctx.cwd);
@@ -2631,6 +2644,26 @@ var bunPackageManager = {
 };
 
 // src/modules/package-managers/npm/npm.package-manager.ts
+async function alignNpmToNodeLts(ctx) {
+  const root = await readPackageJson(ctx.cwd);
+  if (!root?.packageManager?.startsWith("npm@")) {
+    return;
+  }
+  const { npm } = await ensureNodeLts(ctx);
+  if (!npm) {
+    return;
+  }
+  const next = `npm@${npm}`;
+  if (next === root.packageManager) {
+    return;
+  }
+  if (ctx.dryRun) {
+    planLine(`set packageManager to ${next} (bundled with Node LTS)`);
+    return;
+  }
+  root.packageManager = next;
+  await writePackageJson(ctx.cwd, root);
+}
 var npmPackageManager = {
   kind: "package-manager" /* PackageManager */,
   id: "npm",
@@ -2640,6 +2673,7 @@ var npmPackageManager = {
   },
   async update(ctx) {
     await upgradeAllWorkspaces(ctx);
+    await alignNpmToNodeLts(ctx);
     await cleanInstall(ctx, ["npm", "install"]);
   }
 };

package/package.json

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