ember.nvp 1.11.1 → 1.11.2

package/.release-plan.json

@@ -2,8 +2,8 @@
   "solution": {
     "ember.nvp": {
       "impact": "patch",
-      "oldVersion": "1.11.0",
-      "newVersion": "1.11.1",
+      "oldVersion": "1.11.1",
+      "newVersion": "1.11.2",
       "tagName": "latest",
       "constraints": [
         {
@@ -23,5 +23,5 @@
       "oldVersion": "1.2.0"
     }
   },
-  "description": "## Release (2026-09-30)\n\n* ember.nvp 1.11.1 (patch)\n\n#### :bug: Bug Fix\n* `ember.nvp`\n  * [#148](https://github.com/NullVoxPopuli/ember.nvp/pull/148) Keep update runs working for deprecated and non-registry deps ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))\n\n#### Committers: 1\n- @NullVoxPopuli's reduced-access machine account for AI usage ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))\n"
+  "description": "## Release (2026-09-30)\n\n* ember.nvp 1.11.2 (patch)\n\n#### :bug: Bug Fix\n* `ember.nvp`\n  * [#150](https://github.com/NullVoxPopuli/ember.nvp/pull/150) Keep the range when bumping a dependency ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))\n\n#### Committers: 1\n- @NullVoxPopuli's reduced-access machine account for AI usage ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))\n"
 }

package/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ## Release (2026-09-30)
 
+* ember.nvp 1.11.2 (patch)
+
+#### :bug: Bug Fix
+* `ember.nvp`
+  * [#150](https://github.com/NullVoxPopuli/ember.nvp/pull/150) Keep the range when bumping a dependency ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))
+
+#### Committers: 1
+- @NullVoxPopuli's reduced-access machine account for AI usage ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))
+
+## Release (2026-09-30)
+
 * ember.nvp 1.11.1 (patch)
 
 #### :bug: Bug Fix

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember.nvp",
-  "version": "1.11.1",
+  "version": "1.11.2",
   "description": "ember project generator, alternative to the official blueprints, but more modern -- hopefully one day to upstream back in to ember-cli / official blueprints",
   "repository": {
     "type": "git",
@@ -29,7 +29,8 @@
     "enhanced-resolve": "^5.24.2",
     "execa": "^9.6.1",
     "latest-version": "^9.0.0",
-    "package-name-regex": "^5.0.0"
+    "package-name-regex": "^5.0.0",
+    "semver": "^7.8.5"
   },
   "devDependencies": {
     "@ember/app-tsconfig": "^2.0.0",
@@ -37,6 +38,7 @@
     "@glint/ember-tsc": "^1.7.5",
     "@glint/template": "^1.7.7",
     "@glint/tsserver-plugin": "^2.5.5",
+    "@types/semver": "^7.8.0",
     "concurrently": "^9.2.1",
     "ember-source": "^7.0.0",
     "prettier": "^3.8.3",

package/src/utils/npm.js

@@ -1,6 +1,7 @@
 import latestVersion, { VersionNotFoundError } from "latest-version";
 import { existsSync } from "node:fs";
 import { join, resolve } from "node:path";
+import semver from "semver";
 
 /**
  * @type {{ [name: string]: { [version: string]: string } }}
@@ -56,12 +57,12 @@ export async function getLatest(deps) {
         version =
           "link:" + resolve(join(import.meta.dirname, "../../packages", LOCAL_PACKAGES[dep]));
       } else if (alias) {
-        version = `npm:${alias.name}@${await resolveVersion(alias.name, alias.range)}`;
+        version = `npm:${alias.name}@${await bump(alias.name, alias.range)}`;
       } else {
         if (range == "workspace:*") {
           range = "latest";
         }
-        version = isFromRegistry(range) ? await resolveVersion(dep, range) : range;
+        version = isFromRegistry(range) ? await bump(dep, range) : range;
       }
 
       CACHE[dep] ||= {};
@@ -85,6 +86,28 @@ function isFromRegistry(range) {
   return !/[:/]/.test(range);
 }
 
+/**
+ * Moves a range to the newest version it allows, and keeps its kind:
+ * - `^5.4.1` becomes `^5.5.2`, and `~` works the same way
+ * - an exact version stays exact
+ * - a dist-tag becomes the version it points at
+ *
+ * Other ranges (`>= 4.1.0`, `1.x`, `^1 || ^2`) stay as written.
+ * A new floor there would drop versions that the project supports.
+ *
+ * @param {string} name
+ * @param {string} range
+ */
+async function bump(name, range) {
+  let isTag = !semver.validRange(range);
+  let isExact = Boolean(semver.valid(range));
+  let [, operator = ""] = /^([\^~])\s*v?\d[\w.+-]*$/.exec(range) ?? [];
+
+  if (!isTag && !isExact && !operator) return range;
+
+  return operator + (await resolveVersion(name, range));
+}
+
 /**
  * Deprecated versions are skipped when the range allows another version.
  *

package/test/ember.nvp/layer-typescript.test.ts

@@ -55,8 +55,8 @@ describe("layer: typescript, version 7", () => {
     it("installs TypeScript 7 as @typescript/native, and TypeScript 6 for typescript-eslint", async () => {
       let deps = await devDependencies(project);
 
-      expect(deps["@typescript/native"]).toMatch(/^npm:typescript@7\./);
-      expect(deps["typescript"]).toMatch(/^npm:@typescript\/typescript6@6\./);
+      expect(deps["@typescript/native"]).toMatch(/^npm:typescript@\^7\./);
+      expect(deps["typescript"]).toMatch(/^npm:@typescript\/typescript6@\^6\./);
       expect(deps).toHaveProperty("ember-content-mapper");
       expect(deps).not.toHaveProperty("@glint/tsserver-plugin");
     });
@@ -172,7 +172,7 @@ describe("layer: typescript, version 7", () => {
         let manifest = await packageJson.read(project.directory);
 
         expect(manifest.scripts?.["lint:types"]).toBe("tsc --noEmit --runExternalCode");
-        expect(manifest.devDependencies?.["@typescript/native"]).toMatch(/^npm:typescript@7\./);
+        expect(manifest.devDependencies?.["@typescript/native"]).toMatch(/^npm:typescript@\^7\./);
         expect(manifest.devDependencies).not.toHaveProperty("typescript");
         expect(manifest.devDependencies).not.toHaveProperty("@glint/tsserver-plugin");
       });

package/test/ember.nvp/npm.test.ts

@@ -6,13 +6,35 @@ describe("getLatest", () => {
     // ESLint deprecated all of 9.x once 10 was out
     const { eslint } = await getLatest({ eslint: "^9.39.2" });
 
-    expect(eslint).toMatch(/^9\.39\.\d+$/);
+    expect(eslint).toMatch(/^\^9\.39\.\d+$/);
   });
 
   it("still prefers versions that are not deprecated", async () => {
     const { eslint } = await getLatest({ eslint: "^10.0.0" });
 
-    expect(eslint).toMatch(/^10\.\d+\.\d+$/);
+    expect(eslint).toMatch(/^\^10\.\d+\.\d+$/);
+  });
+
+  it("bumps a range without changing its kind", async () => {
+    const result = await getLatest({
+      "@ember/test-helpers": "^5.4.1",
+      "ember-source": "~7.2.0",
+      "@embroider/macros": "1.20.2",
+      "@ember/test-waiters": ">= 4.1.0",
+      "ember-modifier": "^4.2.0 || ^5.0.0",
+      "decorator-transforms": "latest",
+      typescript: "npm:@typescript/typescript6@^6.0.2",
+    });
+
+    expect(result).toEqual({
+      "@ember/test-helpers": expect.stringMatching(/^\^5\.\d+\.\d+$/),
+      "ember-source": expect.stringMatching(/^~7\.2\.\d+$/),
+      "@embroider/macros": "1.20.2",
+      "@ember/test-waiters": ">= 4.1.0",
+      "ember-modifier": "^4.2.0 || ^5.0.0",
+      "decorator-transforms": expect.stringMatching(/^\d+\.\d+\.\d+$/),
+      typescript: expect.stringMatching(/^npm:@typescript\/typescript6@\^6\.\d+\.\d+$/),
+    });
   });
 
   it("keeps specs that do not come from the registry", async () => {