ember.nvp 1.9.0 → 1.10.0

package/.release-plan.json

@@ -2,13 +2,17 @@
   "solution": {
     "ember.nvp": {
       "impact": "minor",
-      "oldVersion": "1.8.0",
-      "newVersion": "1.9.0",
+      "oldVersion": "1.9.0",
+      "newVersion": "1.10.0",
       "tagName": "latest",
       "constraints": [
         {
           "impact": "minor",
           "reason": "Appears in changelog section :rocket: Enhancement"
+        },
+        {
+          "impact": "patch",
+          "reason": "Appears in changelog section :bug: Bug Fix"
         }
       ],
       "pkgJSONPath": "./package.json"
@@ -17,11 +21,25 @@
       "oldVersion": "1.2.0"
     },
     "@nullvoxpopuli/ember-rolldown": {
-      "oldVersion": "2.9.0"
+      "impact": "minor",
+      "oldVersion": "2.9.0",
+      "newVersion": "2.10.0",
+      "tagName": "latest",
+      "constraints": [
+        {
+          "impact": "minor",
+          "reason": "Appears in changelog section :rocket: Enhancement"
+        },
+        {
+          "impact": "patch",
+          "reason": "Appears in changelog section :bug: Bug Fix"
+        }
+      ],
+      "pkgJSONPath": "./packages/rolldown/package.json"
     },
     "@nullvoxpopuli/ember-vite": {
       "oldVersion": "1.2.0"
     }
   },
-  "description": "## Release (2026-09-28)\n\n* ember.nvp 1.9.0 (minor)\n\n#### :rocket: Enhancement\n* `ember.nvp`\n  * [#139](https://github.com/NullVoxPopuli/ember.nvp/pull/139) CLI help ([@tcjr](https://github.com/tcjr))\n  * [#137](https://github.com/NullVoxPopuli/ember.nvp/pull/137) Add an expect-type layer for type tests ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))\n\n#### Committers: 2\n- @NullVoxPopuli's reduced-access machine account for AI usage ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))\n- Tom Carter ([@tcjr](https://github.com/tcjr))\n"
+  "description": "## Release (2026-09-30)\n\n* ember.nvp 1.10.0 (minor)\n* @nullvoxpopuli/ember-rolldown 2.10.0 (minor)\n\n#### :rocket: Enhancement\n* `ember.nvp`, `@nullvoxpopuli/ember-rolldown`\n  * [#144](https://github.com/NullVoxPopuli/ember.nvp/pull/144) Layer options, with an ESLint preset and a TypeScript version ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))\n  * [#142](https://github.com/NullVoxPopuli/ember.nvp/pull/142) Add a TypeScript 7.1+ layer ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))\n* `@nullvoxpopuli/ember-rolldown`, `ember.nvp`\n  * [#140](https://github.com/NullVoxPopuli/ember.nvp/pull/140) Point .gts declaration maps at the .gts source ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))\n\n#### :bug: Bug Fix\n* `@nullvoxpopuli/ember-rolldown`, `ember.nvp`\n  * [#145](https://github.com/NullVoxPopuli/ember.nvp/pull/145) Make .gts source maps point at the real source ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))\n  * [#140](https://github.com/NullVoxPopuli/ember.nvp/pull/140) Point .gts declaration maps at the .gts source ([@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

@@ -1,5 +1,25 @@
 # Changelog
 
+## Release (2026-09-30)
+
+* ember.nvp 1.10.0 (minor)
+* @nullvoxpopuli/ember-rolldown 2.10.0 (minor)
+
+#### :rocket: Enhancement
+* `ember.nvp`, `@nullvoxpopuli/ember-rolldown`
+  * [#144](https://github.com/NullVoxPopuli/ember.nvp/pull/144) Layer options, with an ESLint preset and a TypeScript version ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))
+  * [#142](https://github.com/NullVoxPopuli/ember.nvp/pull/142) Add a TypeScript 7.1+ layer ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))
+* `@nullvoxpopuli/ember-rolldown`, `ember.nvp`
+  * [#140](https://github.com/NullVoxPopuli/ember.nvp/pull/140) Point .gts declaration maps at the .gts source ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))
+
+#### :bug: Bug Fix
+* `@nullvoxpopuli/ember-rolldown`, `ember.nvp`
+  * [#145](https://github.com/NullVoxPopuli/ember.nvp/pull/145) Make .gts source maps point at the real source ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))
+  * [#140](https://github.com/NullVoxPopuli/ember.nvp/pull/140) Point .gts declaration maps at the .gts source ([@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-28)
 
 * ember.nvp 1.9.0 (minor)

package/README.md

@@ -154,6 +154,11 @@ Adds modern ESLint configuration with:
 - Flat config (ESLint 9+)
 - Prettier compatibility
 
+Choose a preset:
+
+- `ember` (default): [ember-eslint](https://github.com/NullVoxPopuli/ember-eslint), which follows the official configuration
+- `nvp`: [@nullvoxpopuli/eslint-configs](https://github.com/NullVoxPopuli/eslint-configs)
+
 ### 🎨 Prettier (optional)
 
 Code formatting with:
@@ -172,6 +177,18 @@ Code formatting with:
 
 Super experimental vitest setup using [ember-vitest](https://github.com/NullVoxPopuli/ember-vitest)
 
+### TypeScript (optional, on by default for libraries)
+
+Choose a version:
+
+- `7` (default): native TypeScript 7 and [ember-content-mapper](https://github.com/NullVoxPopuli/ember-content-mapper) for `.gts` and `.gjs`.
+  `lint:types` runs `tsc --noEmit --runExternalCode`.
+  ESLint keeps TypeScript 6, because typescript-eslint needs its API.
+- `6`: TypeScript 6 and Glint's `ember-tsc`.
+
+A TypeScript 6 project moves to 7 when you choose 7.
+A TypeScript 7 project stays on 7.
+
 ### expect-type (optional)
 
 Type tests for TypeScript libraries with [expect-type](https://github.com/mmkal/expect-type).
@@ -188,7 +205,7 @@ Type tests for TypeScript libraries with [expect-type](https://github.com/mmkal/
 2. **Selection**: the user selects which optional layers to include
 3. **Execution**: each layer's `run()` function is called in sequence:
    ```js
-   await layer.run(project);
+   await layer.run(project, project.getLayerOptions(layer.name));
    ```
 4. **Layer Functions**: inside `run()`, layers use [`ember-apply`](https://ember-apply.pages.dev/) to apply codemods:
    - copy files from the `files/` directory
@@ -204,20 +221,34 @@ To add a new layer, create a new directory in `src/layers/` with:
 1. **`index.js`** - Layer definition:
 
 ```js
+// src/layers/itemizer/index.js
 import { packageJson, files } from "ember-apply";
 import { join } from "node:path";
 
 export default {
   label: "My Feature",
-  description: "What this feature does",
+  hint: "What this feature does",
+
+  // Optional: questions to ask when the layer is selected (see "Layer options")
+  options: {
+    maxItems: {
+      type: "number",
+      prompt: "Enter maximum item count:",
+      default: 10,
+      validate: (val) => (val > 0 ? undefined : "Must be greater than 0"),
+    },
+  },
 
-  async run(project) {
+  async run(project, { maxItems }) {
     // Copy files from files/ directory
     await files.applyFolder(join(import.meta.dirname, "files"), project.directory);
 
     await packageJson.addDependencies({ "some-package": "^1.0.0" }, project.directory);
 
-    await packageJson.addScripts({ "my-script": 'echo "Hello"' }, project.directory);
+    await packageJson.addScripts(
+      { "my-script": `echo "Max items: ${maxItems}"` },
+      project.directory,
+    );
   },
 
   // Optionally add something to the README.md file
@@ -231,3 +262,33 @@ export default {
    - files are copied to the target directory, keeping their structure
 
 The CLI discovers the layer and offers it as an option.
+
+### Layer options
+
+A layer's `options` are questions that the CLI asks after the user selects the layer.
+`run(project, options)` receives the answers, with defaults filled in.
+`project.getLayerOptions(name)` returns the options of any layer.
+
+Each option needs:
+
+- `type`: `"text"`, `"number"`, `"select"`, `"confirm"`, or `"multiselect"`
+- `prompt`: the question, also shown in `--help`
+- `options`, for `select` and `multiselect`: the choices, as `{ value, label, hint }`
+
+Each option can also have:
+
+- `default`
+- `validate`: the same as [clack's `validate`](https://github.com/bombshell-dev/clack/tree/main/packages/prompts#text).
+  A function that returns a message to reject the value, or a [Standard Schema](https://standardschema.dev).
+- `detect(project)`: the value that an existing project uses now.
+  When updating a project, the question starts at this value instead of `default`.
+
+Each option is also a CLI flag, `--<layer>.<option>`:
+
+```bash
+npx ember.nvp --layers eslint-bundled --eslint-bundled.preset nvp
+```
+
+- `confirm` options are on with `--<layer>.<option>`, and off with `--no-<layer>.<option>`.
+- `multiselect` options take the flag more than once, or a comma-separated list.
+- `npx ember.nvp --help` lists every option.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember.nvp",
-  "version": "1.9.0",
+  "version": "1.10.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",
@@ -19,6 +19,7 @@
   "exports": "./src/index.js",
   "bin": "./src/cli/index.js",
   "dependencies": {
+    "@clack/core": "^1.4.2",
     "@clack/prompts": "^1.6.0",
     "babel-remove-types": "^2.0.0",
     "content-tag": "^4.2.0",

package/packages/rolldown/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nullvoxpopuli/ember-rolldown",
-  "version": "2.9.0",
+  "version": "2.10.0",
   "description": "Meta plugin for building ember v2 libraries/addons with rolldown & tsdown.",
   "type": "module",
   "main": "index.ts",
@@ -46,10 +46,13 @@
     "@babel/core": "^7.28.10 || ^8.0.0",
     "@babel/plugin-transform-typescript": "^7.28.10 || ^8.0.0",
     "@embroider/core": "^4.4.2",
+    "@jridgewell/remapping": "^2.3.5",
     "@nullvoxpopuli/ember-build-tooling-utils": "workspace:*",
     "babel-plugin-ember-template-compilation": "^4.0.0",
     "content-tag": "^4.2.0",
-    "decorator-transforms": "^2.4.0"
+    "decorator-transforms": "^2.4.0",
+    "get-tsconfig": "^4.14.3",
+    "magic-string": "^1.4.2"
   },
   "engines": {
     "node": ">= 24"
@@ -67,6 +70,7 @@
     }
   },
   "devDependencies": {
+    "@jridgewell/trace-mapping": "^0.3.31",
     "@tsdown/css": "^0.22.13",
     "rolldown": "^1.2.0",
     "tsdown": "^0.22.9",

package/packages/rolldown/src/dts.test.ts

@@ -1,3 +1,5 @@
+import { originalPositionFor, TraceMap } from "@jridgewell/trace-mapping";
+import { existsSync } from "node:fs";
 import { mkdtemp, mkdir, readdir, readFile, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
@@ -7,6 +9,10 @@ import { afterEach, describe, expect, it } from "vitest";
 import { ember } from "../index.ts";
 
 interface Dist {
+  /**
+   * The emitted directory.
+   */
+  dir: string;
   /**
    * Sorted dist-relative paths of every emitted file.
    */
@@ -71,7 +77,7 @@ async function buildFixture(files: Record<string, string>, entry: string[]): Pro
   });
 
   const distDir = path.join(dir, "dist");
-  const dist: Dist = { files: [], contents: {} };
+  const dist: Dist = { dir: distDir, files: [], contents: {} };
 
   for (const entry of await readdir(distDir, { withFileTypes: true, recursive: true })) {
     if (!entry.isFile()) continue;
@@ -99,6 +105,41 @@ function printed(dist: Dist): string {
     .join("\n");
 }
 
+/**
+ * Follows each declaration in a `.d.ts` through its declaration map,
+ * the way an editor does on "go to definition".
+ *
+ * One line per declaration: the source the map names, and that source's line.
+ */
+async function traced(dist: Dist, file: string): Promise<string> {
+  const map = new TraceMap(await readFile(path.join(dist.dir, `${file}.map`), "utf8"));
+  const result: string[] = [];
+
+  for (const [index, line] of (dist.contents[file] ?? "").split("\n").entries()) {
+    const name = line.match(/\b(?:interface|class|const|function)\s+(\w+)/)?.[1];
+    if (!name) continue;
+
+    const { source, line: sourceLine } = originalPositionFor(map, {
+      line: index + 1,
+      column: line.indexOf(name),
+    });
+
+    if (!source || sourceLine === null) {
+      result.push(`${name} -> (unmapped)`);
+      continue;
+    }
+
+    const sourcePath = path.resolve(dist.dir, source);
+    const text = existsSync(sourcePath)
+      ? (await readFile(sourcePath, "utf8")).split("\n")[sourceLine - 1]?.trim()
+      : "(no such file)";
+
+    result.push(`${name} -> ${source}:${sourceLine}  ${text}`);
+  }
+
+  return result.join("\n");
+}
+
 describe("declarations (full ember() via tsdown)", () => {
   it("emits .d.ts for an entry that type-imports from a non-entry .gts", async () => {
     // Mirrors a design-system shape:
@@ -300,6 +341,69 @@ describe("declarations (full ember() via tsdown)", () => {
     `);
   });
 
+  it("maps declarations back to their .gts source lines", async () => {
+    // Declaration maps let a consumer's "go to definition" open the library's source.
+    //
+    // A .gts module reaches the declaration pipeline as a virtual .ts id,
+    // holding content-tag's output (which moves lines around).
+    // The maps must still name the .gts file, at its own line numbers,
+    // including for a .gts with no <template> to compile.
+    const dist = await buildFixture(
+      {
+        "src/index.ts": [
+          `export { default as Popup, type AfterTemplate, type PopupBlock } from './popup.gts';`,
+          `export { double } from './helpers.gts';`,
+          `export { default as Plain, type PlainArgs } from './plain.ts';`,
+        ].join("\n"),
+        "src/popup.gts": [
+          `import Component from '@glimmer/component';`,
+          ``,
+          `export interface PopupBlock {`,
+          `  open: () => void;`,
+          `}`,
+          ``,
+          `export default class Popup extends Component<{ Blocks: { default: [PopupBlock] } }> {`,
+          `  <template>`,
+          `    <div class="popup">`,
+          `      {{yield (hash open=this.open)}}`,
+          `    </div>`,
+          `  </template>`,
+          ``,
+          `  open = (): void => {};`,
+          `}`,
+          ``,
+          `export interface AfterTemplate {`,
+          `  after: boolean;`,
+          `}`,
+        ].join("\n"),
+        "src/helpers.gts": [
+          `export function double(value: number): number {`,
+          `  return value * 2;`,
+          `}`,
+        ].join("\n"),
+        "src/plain.ts": [
+          `export interface PlainArgs {`,
+          `  name: string;`,
+          `}`,
+          ``,
+          `export default class Plain {`,
+          `  args?: PlainArgs;`,
+          `}`,
+        ].join("\n"),
+      },
+      ["./src/index.ts"],
+    );
+
+    expect(await traced(dist, "index.d.ts")).toMatchInlineSnapshot(`
+      "PopupBlock -> ../src/popup.gts:3  export interface PopupBlock {
+      Popup -> ../src/popup.gts:7  export default class Popup extends Component<{ Blocks: { default: [PopupBlock] } }> {
+      AfterTemplate -> ../src/popup.gts:17  export interface AfterTemplate {
+      double -> ../src/helpers.gts:1  export function double(value: number): number {
+      PlainArgs -> ../src/plain.ts:1  export interface PlainArgs {
+      Plain -> ../src/plain.ts:5  export default class Plain {"
+    `);
+  });
+
   it("bundles co-located CSS (via @tsdown/css) without breaking declarations", async () => {
     // Ember components routinely import a co-located .css file.
     //

package/packages/rolldown/src/isolated-declarations.ts

@@ -1,6 +1,7 @@
 import { existsSync, statSync } from "node:fs";
-import { dirname, resolve } from "node:path";
+import { resolve } from "node:path";
 
+import { parseTsconfig, type TsConfigJsonResolved } from "get-tsconfig";
 import type { Plugin } from "rolldown";
 import type { UserConfig } from "tsdown";
 
@@ -61,8 +62,11 @@ function resolveTsconfigPath(option: string | boolean | undefined): string | und
  * Isolated declarations then constrain exactly the code that gets declarations emitted,
  * and nothing else.
  *
- * Projects with no tsconfig (JavaScript libraries) or without the `typescript` package
- * have no declarations to emit, so there is nothing to check.
+ * Projects with no tsconfig (JavaScript libraries) have no declarations to emit,
+ * so there is nothing to check.
+ *
+ * The tsconfig is read without the `typescript` package.
+ * TypeScript 7 has no JavaScript API, and a TypeScript 7 library can have no TypeScript 6.
  *
  * `tsconfig: false` is different.
  * It is an explicit opt-out.
@@ -88,64 +92,66 @@ export function emberIsolatedDeclarations(): Plugin {
       emitsDeclarations = config.dts !== false;
     },
 
-    async buildStart() {
-      if (tsconfigOption === false) {
-        if (!emitsDeclarations) return;
-
-        // Without a tsconfig there is no `isolatedDeclarations`,
-        // so tsdown falls back to the tsc-based declaration pipeline.
-        //
-        // That pipeline reads source files from disk,
-        // and dies with "Source file not found" on every `.gts` / `.gjs`,
-        // since those only exist compiled in the module graph.
-        //
-        // Say so here instead of leaving that to be decoded.
-        this.error(
-          `\`tsconfig: false\` cannot be combined with declaration emit.\n\n` +
-            `Declarations are emitted by the isolated-declarations pipeline, which needs a ` +
-            `tsconfig setting "compilerOptions.isolatedDeclarations": true -- it is the only ` +
-            `pipeline that can see compiled .gts/.gjs modules.\n\n` +
-            `Either point tsdown's \`tsconfig\` option at such a config, or set \`dts: false\` ` +
-            `if this library ships no types.`,
-        );
-      }
-
-      const tsconfigPath = resolveTsconfigPath(tsconfigOption);
-
-      if (!tsconfigPath || !existsSync(tsconfigPath)) return;
-
-      let ts: typeof import("typescript");
-
-      try {
-        ts = (await import("typescript")).default;
-      } catch {
-        return;
-      }
-
-      const { config, error } = ts.readConfigFile(tsconfigPath, ts.sys.readFile);
-
-      if (error) {
-        // Unreadable / unparsable tsconfig.
-        // tsc itself will report this with a better message than we can.
-        return;
-      }
-
-      // Resolves `extends` chains, so the flag may come from a base config.
-      const parsed = ts.parseJsonConfigFileContent(config, ts.sys, dirname(tsconfigPath));
-
-      if (parsed.options.isolatedDeclarations !== true) {
-        this.error(
-          `${tsconfigPath} must set "compilerOptions.isolatedDeclarations": true.\n\n` +
-            `Declarations for .gts/.gjs (template tag) modules can only be emitted by the ` +
-            `isolated-declarations pipeline, which reads compiled modules from the bundler's ` +
-            `module graph -- the tsc-based pipeline reads from disk and cannot see them.\n\n` +
-            `Isolated declarations require exported values to have explicit type annotations, ` +
-            `e.g. \`export const X: TOC<Sig> = <template>...\`.\n\n` +
-            `If this tsconfig also covers dev-only code (a demo app, in-package tests) that ` +
-            `should not be constrained this way, point tsdown's \`tsconfig\` option at a ` +
-            `publish-only tsconfig that sets the flag and covers just the published sources.`,
-        );
-      }
+    buildStart: {
+      /**
+       * Before rolldown-plugin-dts, whose buildStart loads the `typescript` package
+       * when isolatedDeclarations is off.
+       *
+       * In a TypeScript 7 library that package is TypeScript 7, which has no JavaScript API,
+       * so it crashes before this message can show.
+       */
+      order: "pre",
+      async handler() {
+        if (tsconfigOption === false) {
+          if (!emitsDeclarations) return;
+
+          // Without a tsconfig there is no `isolatedDeclarations`,
+          // so tsdown falls back to the tsc-based declaration pipeline.
+          //
+          // That pipeline reads source files from disk,
+          // and dies with "Source file not found" on every `.gts` / `.gjs`,
+          // since those only exist compiled in the module graph.
+          //
+          // Say so here instead of leaving that to be decoded.
+          this.error(
+            `\`tsconfig: false\` cannot be combined with declaration emit.\n\n` +
+              `Declarations are emitted by the isolated-declarations pipeline, which needs a ` +
+              `tsconfig setting "compilerOptions.isolatedDeclarations": true -- it is the only ` +
+              `pipeline that can see compiled .gts/.gjs modules.\n\n` +
+              `Either point tsdown's \`tsconfig\` option at such a config, or set \`dts: false\` ` +
+              `if this library ships no types.`,
+          );
+        }
+
+        const tsconfigPath = resolveTsconfigPath(tsconfigOption);
+
+        if (!tsconfigPath || !existsSync(tsconfigPath)) return;
+
+        let tsconfig: TsConfigJsonResolved;
+
+        try {
+          // Resolves `extends` chains, so the flag may come from a base config.
+          tsconfig = parseTsconfig(tsconfigPath);
+        } catch {
+          // Unreadable / unparsable tsconfig.
+          // tsc itself will report this with a better message than we can.
+          return;
+        }
+
+        if (tsconfig.compilerOptions?.isolatedDeclarations !== true) {
+          this.error(
+            `${tsconfigPath} must set "compilerOptions.isolatedDeclarations": true.\n\n` +
+              `Declarations for .gts/.gjs (template tag) modules can only be emitted by the ` +
+              `isolated-declarations pipeline, which reads compiled modules from the bundler's ` +
+              `module graph -- the tsc-based pipeline reads from disk and cannot see them.\n\n` +
+              `Isolated declarations require exported values to have explicit type annotations, ` +
+              `e.g. \`export const X: TOC<Sig> = <template>...\`.\n\n` +
+              `If this tsconfig also covers dev-only code (a demo app, in-package tests) that ` +
+              `should not be constrained this way, point tsdown's \`tsconfig\` option at a ` +
+              `publish-only tsconfig that sets the flag and covers just the published sources.`,
+          );
+        }
+      },
     },
   };
 }