ember.nvp 1.11.1 → 1.12.0

package/.release-plan.json

@@ -1,14 +1,14 @@
 {
   "solution": {
     "ember.nvp": {
-      "impact": "patch",
-      "oldVersion": "1.11.0",
-      "newVersion": "1.11.1",
+      "impact": "minor",
+      "oldVersion": "1.11.2",
+      "newVersion": "1.12.0",
       "tagName": "latest",
       "constraints": [
         {
-          "impact": "patch",
-          "reason": "Appears in changelog section :bug: Bug Fix"
+          "impact": "minor",
+          "reason": "Appears in changelog section :rocket: Enhancement"
         }
       ],
       "pkgJSONPath": "./package.json"
@@ -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.12.0 (minor)\n\n#### :rocket: Enhancement\n* `ember.nvp`\n  * [#152](https://github.com/NullVoxPopuli/ember.nvp/pull/152) Ask about the project in the current directory first ([@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,28 @@
 
 ## Release (2026-09-30)
 
+* ember.nvp 1.12.0 (minor)
+
+#### :rocket: Enhancement
+* `ember.nvp`
+  * [#152](https://github.com/NullVoxPopuli/ember.nvp/pull/152) Ask about the project in the current directory first ([@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.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/README.md

@@ -37,6 +37,15 @@ npx NullVoxPopuli/ember.nvp
 ### Updating an existing project
 
 You can run `ember.nvp` on top of an existing project to add layers to it.
+
+Run it inside the project. When the current directory has a `package.json`, the first question is what to do with it:
+
+- **update**: update the project in this directory. The project name starts as the `package.json` name.
+- **replace**: delete this directory and generate a new project in it.
+- **new**: generate a new project in another directory.
+
+`--path` skips this question, and `--replaceOrUpdate` answers it.
+
 Nothing is written to your project until you confirm. Before finishing, you choose to:
 
 - **write the files**: apply all of the staged changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember.nvp",
-  "version": "1.11.1",
+  "version": "1.12.0",
   "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/cli/index.js

@@ -12,10 +12,11 @@ import { askIfOK } from "./questions/ok.js";
 import { askToWrite } from "./questions/write.js";
 import { styleText } from "node:util";
 import { readFile, rm } from "node:fs/promises";
-import { join } from "node:path";
+import { join, relative } from "node:path";
+import { cwd } from "#utils/cwd.js";
 import { Project } from "#utils/project.js";
 import { Stage } from "#utils/stage.js";
-import { askReplaceOrUpdate } from "./questions/replace-or-update.js";
+import { askAboutProjectHere, askReplaceOrUpdate } from "./questions/replace-or-update.js";
 
 /**
  * This whole file's primary purpose is to be an interactive CLI
@@ -29,9 +30,10 @@ async function main() {
 
   p.intro(styleText(["bgCyan", "black"], " ember.nvp "));
 
-  const projectName = await askName();
-  const projectPath = await askPath(projectName);
-  const replaceOrUpdate = await askReplaceOrUpdate(projectPath);
+  const here = await askAboutProjectHere();
+  const projectName = await askName(here === "update" ? cwd : undefined);
+  const projectPath = here ? cwd : await askPath(projectName);
+  const replaceOrUpdate = here ?? (await askReplaceOrUpdate(projectPath));
   const projectType = await askProjectType();
   const selectedLayers = await askLayers(projectType);
   const packageManager = await askPackageManager();
@@ -158,8 +160,10 @@ async function main() {
     // no readable package.json -- skip the suggestion
   }
 
+  let projectDir = relative(cwd, projectPath);
+
   p.note(
-    `cd ${projectName}\n` +
+    (projectDir ? `cd ${projectDir}\n` : "") +
       `${packageManager} install\n` +
       lintFixStep +
       `${packageManager} ${packageManager === "npm" ? "run " : ""}start`,

package/src/cli/questions/name.js

@@ -1,10 +1,15 @@
 import { cancel, isCancel, text } from "@clack/prompts";
 import packageNameRegex from "package-name-regex";
+import { readFileSync } from "node:fs";
+import { join } from "node:path";
 import { answers, printArgInUse } from "#args";
 
 const DEFAULT = "my-app";
 
-export async function askName() {
+/**
+ * @param {string} [existingProject] a directory whose package.json name fills in the answer
+ */
+export async function askName(existingProject) {
   if (answers.name) {
     let isValid = packageNameRegex.test(answers.name);
     if (isValid) {
@@ -13,10 +18,15 @@ export async function askName() {
       return answers.name;
     }
   }
+
+  let existingName = existingProject ? readName(existingProject) : undefined;
+  let fallback = existingName ?? DEFAULT;
+
   const projectName = await text({
     message: "What is your project name?",
-    placeholder: DEFAULT,
-    defaultValue: DEFAULT,
+    placeholder: fallback,
+    defaultValue: fallback,
+    initialValue: existingName,
     validate(value) {
       if (!value || value.length === 0) return;
 
@@ -33,5 +43,17 @@ export async function askName() {
     return process.exit(0);
   }
 
-  return projectName ?? DEFAULT;
+  return projectName ?? fallback;
+}
+
+/**
+ * @param {string} directory
+ * @returns {string | undefined}
+ */
+function readName(directory) {
+  let { name } = JSON.parse(readFileSync(join(directory, "package.json"), "utf-8"));
+
+  if (typeof name === "string" && packageNameRegex.test(name)) {
+    return name;
+  }
 }

package/src/cli/questions/replace-or-update.js

@@ -2,11 +2,13 @@ import * as p from "@clack/prompts";
 
 import { answers, printArgInUse } from "#args";
 import { existsSync } from "node:fs";
+import { join } from "node:path";
+import { cwd } from "#utils/cwd.js";
 
 /**
  *
  * @param {string | undefined} value
- * @returns
+ * @returns {value is "replace" | "update"}
  */
 function isValid(value) {
   if (!value) return false;
@@ -54,3 +56,51 @@ export async function askReplaceOrUpdate(projectPath) {
 
   return answer;
 }
+
+/**
+ * A package.json in the current directory is most likely the project to work on.
+ * This question comes before the name, so that an update can default to that project's name.
+ *
+ * Skipped when `--path` picks the target.
+ *
+ * @returns {Promise<"replace" | "update" | undefined>} undefined for a new project in another directory
+ */
+export async function askAboutProjectHere() {
+  if (answers.path) return;
+  if (!existsSync(join(cwd, "package.json"))) return;
+
+  if (isValid(answers.replaceOrUpdate)) {
+    printArgInUse("replaceOrUpdate", answers.replaceOrUpdate);
+
+    return answers.replaceOrUpdate;
+  }
+
+  const answer = await p.select({
+    message: "This directory has a package.json. What would you like to do?",
+    initialValue: "update",
+    options: [
+      {
+        value: "update",
+        label: "update",
+        hint: "Updates the project in this directory",
+      },
+      {
+        value: "replace",
+        label: "replace",
+        hint: "Deletes this directory and generates a new project in it",
+      },
+      {
+        value: "new",
+        label: "new",
+        hint: "Generates a new project in another directory",
+      },
+    ],
+  });
+
+  if (p.isCancel(answer)) {
+    p.cancel("Operation cancelled");
+    return process.exit(0);
+  }
+
+  return isValid(answer) ? answer : undefined;
+}

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/cli.test.ts

@@ -2,7 +2,7 @@ import { test, expect as hardExpect } from "vitest";
 import { cli, mktemp } from "#test-helpers";
 import { packageJson } from "ember-apply";
 import { existsSync } from "node:fs";
-import { rm } from "node:fs/promises";
+import { readFile, rm, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 import { stripVTControlCharacters } from "node:util";
 
@@ -153,3 +153,54 @@ test("cli exits on an invalid layer option flag, before writing anything", async
     await rm(parent, { recursive: true, force: true });
   }
 });
+
+test("in a project directory, asks to update first and fills in the project's name", async () => {
+  let dir = await mktemp("cli-update-here");
+  await writeFile(join(dir, "package.json"), JSON.stringify({ name: "@scope/my-lib" }));
+
+  // No --name or --path, so the CLI asks about the project in this directory
+  let args = [
+    "--type",
+    "library",
+    "--layers",
+    "prettier",
+    "--packageManager",
+    "pnpm",
+    "--confirm",
+    "yes",
+    "--write",
+    "yes",
+  ];
+  let prompts = ["This directory has a package.json", "What is your project name?"];
+
+  try {
+    let { execaPromise } = cli(args, { cwd: dir });
+    let output = "";
+
+    execaPromise.stdout?.on("data", (chunk) => {
+      output += chunk;
+
+      // Enter keeps the answer each prompt starts with: "update", then the name
+      if (prompts[0] && stripVTControlCharacters(output).includes(prompts[0])) {
+        prompts.shift();
+        execaPromise.stdin?.write("\r");
+      }
+    });
+
+    let res = await execaPromise;
+    let text = stripVTControlCharacters(output);
+
+    expect(res.exitCode).toBe(0);
+    expect(text.indexOf("This directory has a package.json")).toBeLessThan(
+      text.indexOf("What is your project name?"),
+    );
+    expect(text).not.toContain("Where would you like to place your project?");
+    expect(text).not.toContain("cd ");
+
+    let manifest = JSON.parse(await readFile(join(dir, "package.json"), "utf-8"));
+
+    expect(manifest.name).toBe("@scope/my-lib");
+  } finally {
+    await rm(dir, { recursive: true, force: true });
+  }
+});

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 () => {

package/test/test-helpers.ts

@@ -119,7 +119,7 @@ export async function generate({
 
 const cliPath = join(import.meta.dirname, "../src/cli/index.js");
 
-export function cli(args: string[] = []) {
+export function cli(args: string[] = [], options: { cwd?: string } = {}) {
   let cmd = `node ${cliPath} ${args.join(" ")}`;
 
   console.log(`Running '${styleText("cyan", cmd)}'`);
@@ -127,7 +127,7 @@ export function cli(args: string[] = []) {
   let output = new MockWritable();
   let input = new MockReadable();
 
-  let execaPromise = execa("node", [cliPath, ...args]);
+  let execaPromise = execa("node", [cliPath, ...args], options);
   if (execaPromise.stdout) {
     execaPromise.stdout.pipe(output);
   }