shadcn-nsh 0.2.0 → 0.3.0

package/README.md

@@ -15,7 +15,7 @@ Default registry: `https://raw.githubusercontent.com/aningdev/shadcn-nsh/main/pu
 
 | Command             | What it does                                                         |
 | ------------------- | -------------------------------------------------------------------- |
-| `init`              | Writes `nsh-ui.json`, installs `theme`, points each `nsh.json` at it |
+| `init`              | Writes `nsh-ui.json`, installs a theme, points each `nsh.json` at it |
 | `add [components…]` | Copies items and their `registryDependencies` into the app           |
 | `list`              | The registry's items, `✓` on the ones the app has                    |
 | `view <items…>`     | The files `add` would write: target paths and contents               |
@@ -26,7 +26,8 @@ Default registry: `https://raw.githubusercontent.com/aningdev/shadcn-nsh/main/pu
 Every command takes `-c, --cwd <dir>` (default: the current directory). `init`, `add`, `list`,
 `view` and `diff` also take `--registry <url>`, a template with `{name}` in it; without it, `add`,
 `list`, `view` and `diff` use the one in `nsh-ui.json`, and `init` uses the public registry.
-`init` also takes `--overwrite` and `-y` (accepted; nothing prompts today).
+`init` also takes `--overwrite`, `-y` (accepted; nothing prompts today) and `--theme <name>`,
+`default` (the library's own) or `shadcn` (shadcn's neutral palette and flat finishes).
 
 ## add
 
@@ -43,6 +44,11 @@ shadcn-nsh add button --overwrite
 - `theme.json` is merged by key: the app keeps its colors and gains the tokens it lacks. A
   recolored theme is kept as it is (`kept theme.json (the app's colors stay)`).
 - `--all` (`-a`) adds every `registry:ui` item the catalog lists, dependencies included.
+- Naming a theme (`add theme-shadcn`, or `add theme` to go back) switches the app's theme: its
+  files are written where they differ and `nsh-ui.json`'s `theme` records the new one. Naming the
+  theme the app already has is a plain `add`: its colors stay unless `--overwrite`.
+- After that, `theme` as a dependency resolves to the theme the app has, so `add button`,
+  `add button --overwrite` and `add --all --overwrite` never write the default theme back.
 - `--dry-run` prints the same lines as `would write …` / `would overwrite …` and writes nothing —
   not even `nsh-ui.json` or the theme `init` would install first.
 
@@ -80,6 +86,7 @@ recolored theme is the app's own, and only `add --overwrite` replaces it.
 ```json
 {
   "registry": "https://raw.githubusercontent.com/aningdev/shadcn-nsh/main/public/r/{name}.json",
+  "theme": "theme",
   "aliases": {
     "components": "./components",
     "ui": "./components/ui",
@@ -89,6 +96,9 @@ recolored theme is the app's own, and only `add --overwrite` replaces it.
 }
 ```
 
+`theme` is the `registry:theme` item the app installed (`theme`, or `theme-shadcn`); a file
+without it is on `theme`.
+
 In a monorepo (`apps/*` + `packages/ui`) it lives in `packages/ui` and `add -c apps/web`
 installs there.
 

package/README.zh.md

@@ -15,7 +15,7 @@ bunx shadcn-nsh@latest add button
 
 | 命令                | 作用                                                       |
 | ------------------- | ---------------------------------------------------------- |
-| `init`              | 写 `nsh-ui.json`、装 `theme`、把每个 `nsh.json` 指向它     |
+| `init`              | 写 `nsh-ui.json`、装一个主题、把每个 `nsh.json` 指向它     |
 | `add [components…]` | 复制条目及其 `registryDependencies`                        |
 | `list`              | registry 的全部条目，应用已有的标 `✓`                      |
 | `view <items…>`     | `add` 会写的文件：目标路径与内容                           |
@@ -25,7 +25,8 @@ bunx shadcn-nsh@latest add button
 
 每个命令都接受 `-c, --cwd <dir>`（默认：当前目录）。`init`、`add`、`list`、`view`、`diff`
 另接受 `--registry <url>`（含 `{name}` 的模板）；省略时 `add`、`list`、`view`、`diff` 用
-`nsh-ui.json` 里的，`init` 用公共 registry。`init` 还接受 `--overwrite` 与 `-y`（接受，当前不弹确认）。
+`nsh-ui.json` 里的，`init` 用公共 registry。`init` 还接受 `--overwrite`、`-y`（接受，当前不弹确认）与 `--theme <name>`：
+`default`（本库自己的主题）或 `shadcn`（shadcn 的 neutral 配色与平面 finish）。
 
 ## add
 
@@ -42,6 +43,11 @@ shadcn-nsh add button --overwrite
 - `theme.json` 按 key 合并：应用保留自己的颜色，补上缺的 token；改过颜色的主题原样保留
   （`kept theme.json (the app's colors stay)`）。
 - `--all`（`-a`）加全部 `registry:ui` 条目（含依赖）。
+- 点名一个主题（`add theme-shadcn`，`add theme` 是换回默认）就是换主题：文件写到应用里，
+  `nsh-ui.json` 的 `theme` 记下新的那个。点名应用已有的主题只是普通的 `add`：不加 `--overwrite`
+  就保留应用的配色。
+- 此后 `theme` 这个依赖按应用的主题解析，所以 `add button`、`add button --overwrite`、
+  `add --all --overwrite` 都不会把默认主题写回来。
 - `--dry-run` 用 `would write …` / `would overwrite …` 打印同样的行，一个字节都不写——
   包括 `init` 会先写的 `nsh-ui.json` 与主题。
 
@@ -77,6 +83,7 @@ shadcn-nsh diff || echo "run shadcn-nsh add <item> --overwrite"
 ```json
 {
   "registry": "https://raw.githubusercontent.com/aningdev/shadcn-nsh/main/public/r/{name}.json",
+  "theme": "theme",
   "aliases": {
     "components": "./components",
     "ui": "./components/ui",
@@ -86,6 +93,9 @@ shadcn-nsh diff || echo "run shadcn-nsh add <item> --overwrite"
 }
 ```
 
+`theme` 是应用装的 `registry:theme` 条目（`theme`，或 `theme-shadcn`）；文件里没有它就是
+`theme`。
+
 monorepo（`apps/*` + `packages/ui`）里它位于 `packages/ui`，`add -c apps/web` 装到那里。
 
 ## 本仓开发

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command as Command8 } from "commander";
 // package.json
 var package_default = {
   name: "shadcn-nsh",
-  version: "0.2.0",
+  version: "0.3.0",
   description: "Add styled NSH components (copy-into-app) from the shadcn-nsh registry",
   keywords: [
     "cli",
@@ -52,13 +52,27 @@ var package_default = {
 };
 
 // src/commands/add.ts
-import path10 from "path";
+import path11 from "path";
 import { Command as Command2 } from "commander";
 
 // src/types.ts
 var DEFAULT_REGISTRY = "https://raw.githubusercontent.com/aningdev/shadcn-nsh/main/public/r/{name}.json";
+var DEFAULT_THEME = "theme";
+var THEMES = {
+  default: DEFAULT_THEME,
+  shadcn: "theme-shadcn"
+};
+var isThemeName = (value) => value in THEMES;
+function themeItem(name) {
+  if (!isThemeName(name)) {
+    const options = Object.keys(THEMES).join(", ");
+    throw new Error(`Unknown theme "${name}". Choose one of: ${options}.`);
+  }
+  return THEMES[name];
+}
 var DEFAULT_CONFIG = () => ({
   registry: DEFAULT_REGISTRY,
+  theme: DEFAULT_THEME,
   aliases: {
     components: "./components",
     ui: "./components/ui",
@@ -194,9 +208,223 @@ async function readApp(cwd, registry) {
   return { ws, config, hasConfig: stored != null };
 }
 
-// src/utils/install.ts
+// src/utils/deps.ts
+import { spawnSync } from "child_process";
 import fs4 from "fs/promises";
-import path7 from "path";
+import path5 from "path";
+
+// src/utils/registry.ts
+import fs3 from "fs/promises";
+import path4 from "path";
+function itemUrl(config, name, registryOverride) {
+  const template = registryOverride ?? config.registry;
+  if (!template.includes("{name}")) {
+    throw new Error(`Registry URL must contain {name}: ${template}`);
+  }
+  return template.replaceAll("{name}", name);
+}
+function indexUrl(config, registryOverride) {
+  const template = registryOverride ?? config.registry;
+  if (!template.includes("{name}")) {
+    throw new Error(`Registry URL must contain {name}: ${template}`);
+  }
+  return template.replaceAll("{name}", "index");
+}
+async function fetchItem(config, name, registryOverride) {
+  const url = itemUrl(config, name, registryOverride);
+  const res = await fetch(url);
+  if (!res.ok) {
+    throw new Error(`Failed to fetch ${url}: ${res.status} ${res.statusText}`);
+  }
+  return await res.json();
+}
+async function fetchIndex(config, registryOverride) {
+  const url = indexUrl(config, registryOverride);
+  const res = await fetch(url);
+  if (!res.ok) {
+    throw new Error(
+      `Failed to fetch ${url}: ${res.status} ${res.statusText}. A registry needs an index.json (bun run registry:build writes one).`
+    );
+  }
+  return await res.json();
+}
+function resolveDependency(config, name) {
+  return name === DEFAULT_THEME && config.theme !== DEFAULT_THEME ? config.theme : name;
+}
+async function resolveTree(config, names, registryOverride) {
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  async function walk(name) {
+    if (seen.has(name)) return;
+    seen.add(name);
+    const item = await fetchItem(config, name, registryOverride);
+    for (const dep of item.registryDependencies ?? []) {
+      await walk(resolveDependency(config, dep));
+    }
+    out.push(item);
+  }
+  for (const name of names) {
+    await walk(name);
+  }
+  return out;
+}
+var IMPORT_RE = /(?:import|export)\s[^;]*?from\s+["']([^"']+)["']|import\s+["']([^"']+)["']/g;
+var THEME_PACKAGE = "@shadcn-nsh/theme";
+var RESOLVE_SUFFIXES = ["", ".ts", ".tsx", ".json", "/index.ts", "/index.tsx"];
+var fromRuntime = (spec) => spec === "nsh" || spec.startsWith("nsh/");
+function packageOf(spec) {
+  const parts = spec.split("/");
+  return spec.startsWith("@") ? parts.slice(0, 2).join("/") : parts[0] ?? spec;
+}
+function declaredPackage(entry) {
+  const at = entry.indexOf("@", 1);
+  return at === -1 ? entry : entry.slice(0, at);
+}
+async function checkRegistryDependencies(registry, baseDir) {
+  const owner = /* @__PURE__ */ new Map();
+  const targets = /* @__PURE__ */ new Map();
+  for (const item of registry.items) {
+    const own = /* @__PURE__ */ new Set();
+    for (const file of item.files) {
+      owner.set(path4.resolve(baseDir, file.path), item.name);
+      if (file.target) own.add(file.target);
+    }
+    targets.set(item.name, own);
+  }
+  const themeItems = new Set(
+    registry.items.filter((item) => item.type === "registry:theme").map((item) => item.name)
+  );
+  const hasTheme = themeItems.has(DEFAULT_THEME);
+  const problems = [];
+  for (const item of registry.items) {
+    const used = /* @__PURE__ */ new Set();
+    const own = targets.get(item.name) ?? /* @__PURE__ */ new Set();
+    const packages = /* @__PURE__ */ new Set();
+    for (const file of item.files) {
+      const abs = path4.resolve(baseDir, file.path);
+      if (!/\.(ts|tsx)$/.test(abs)) continue;
+      const source = await fs3.readFile(abs, "utf8");
+      for (const match of source.matchAll(IMPORT_RE)) {
+        const spec = match[1] ?? match[2];
+        if (spec === THEME_PACKAGE && (hasTheme || themeItems.has(item.name))) {
+          used.add(themeItems.has(item.name) ? item.name : DEFAULT_THEME);
+        } else if (spec.startsWith(".")) {
+          const beside = file.target ? RESOLVE_SUFFIXES.map(
+            (suffix) => `${path4.posix.normalize(path4.posix.join(path4.posix.dirname(file.target), spec))}${suffix}`
+          ) : [];
+          if (beside.some((candidate) => own.has(candidate))) continue;
+          const target = RESOLVE_SUFFIXES.map(
+            (x) => path4.resolve(path4.dirname(abs), spec) + x
+          ).find((candidate) => owner.has(candidate));
+          if (target) used.add(owner.get(target));
+          else problems.push(`${item.name}: imports "${spec}", which no registry item ships`);
+        } else if (spec !== THEME_PACKAGE && !fromRuntime(spec)) packages.add(packageOf(spec));
+      }
+    }
+    used.delete(item.name);
+    const declared = new Set(item.registryDependencies ?? []);
+    for (const dep of used) {
+      if (!declared.has(dep))
+        problems.push(`${item.name}: imports "${dep}" but does not declare it`);
+    }
+    for (const dep of declared) {
+      if (!used.has(dep)) problems.push(`${item.name}: declares "${dep}" but never imports it`);
+    }
+    const installed = new Map(
+      (item.dependencies ?? []).map((entry) => [declaredPackage(entry), entry])
+    );
+    for (const name of packages) {
+      if (!installed.has(name))
+        problems.push(`${item.name}: imports "${name}" but does not declare it in dependencies`);
+    }
+    for (const [name, entry] of installed) {
+      if (!packages.has(name))
+        problems.push(`${item.name}: declares "${entry}" but never imports it`);
+    }
+  }
+  return problems;
+}
+
+// src/utils/deps.ts
+var LOCKFILES = [
+  ["bun.lock", "bun"],
+  ["pnpm-lock.yaml", "pnpm"],
+  ["yarn.lock", "yarn"]
+];
+async function exists2(file) {
+  try {
+    await fs4.access(file);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function projectOf(dir) {
+  const start = path5.resolve(dir);
+  let root;
+  let manager;
+  for (let at = start; ; at = path5.dirname(at)) {
+    for (const [lock, name] of LOCKFILES) {
+      if (manager == null && await exists2(path5.join(at, lock))) manager = name;
+    }
+    if (root == null && await exists2(path5.join(at, "package.json"))) root = at;
+    if (manager != null || path5.dirname(at) === at) {
+      return { root: root ?? start, manager: manager ?? "npm" };
+    }
+  }
+}
+function dependenciesOf(items) {
+  const packages = /* @__PURE__ */ new Map();
+  for (const item of items) {
+    for (const entry of item.dependencies ?? []) {
+      const name = declaredPackage(entry);
+      if (!packages.has(name)) packages.set(name, entry);
+    }
+  }
+  return [...packages.values()];
+}
+function packageName(dir) {
+  const name = path5.basename(dir).toLowerCase().replace(/[^a-z0-9._-]+/g, "-").replace(/^[^a-z0-9]+/, "");
+  return name === "" ? "app" : name;
+}
+async function ensurePackageJson(dir) {
+  const file = path5.join(dir, "package.json");
+  if (await exists2(file)) return null;
+  const content = { name: packageName(dir), private: true, dependencies: {} };
+  await fs4.writeFile(file, `${JSON.stringify(content, null, 2)}
+`, "utf8");
+  return file;
+}
+async function installDependencies(dir, items, opts = {}) {
+  const dependencies = dependenciesOf(items);
+  if (dependencies.length === 0) return null;
+  const { root, manager } = await projectOf(dir);
+  const command = [manager, "add", ...dependencies];
+  const shown = command.join(" ");
+  const install = { manager, root, command: shown, ok: true };
+  if (opts.dryRun) {
+    console.log(`would install ${dependencies.join(" ")} (${shown})`);
+    return install;
+  }
+  const written = await ensurePackageJson(root);
+  if (written != null) {
+    console.log(`write ${path5.relative(path5.resolve(dir), written) || "package.json"}`);
+  }
+  const result = spawnSync(manager, command.slice(1), { cwd: root, stdio: "inherit" });
+  const failed = result.error ?? (result.status === 0 ? null : `exited ${result.status}`);
+  if (failed == null) {
+    console.log(`installed ${dependencies.join(" ")} (${shown})`);
+    return install;
+  }
+  const why = failed instanceof Error ? failed.message : failed;
+  console.error(`shadcn-nsh: \`${shown}\` failed in ${root}: ${why}`);
+  console.error(`      run it yourself: cd ${root} && ${shown}`);
+  return { ...install, ok: false };
+}
+
+// src/utils/install.ts
+import fs6 from "fs/promises";
+import path9 from "path";
 
 // src/utils/diff.ts
 function diffLines(before, after) {
@@ -249,25 +477,25 @@ function formatDiff(lines) {
 }
 
 // src/utils/plan.ts
-import fs3 from "fs";
+import fs5 from "fs";
 import fsPromises from "fs/promises";
-import path6 from "path";
+import path8 from "path";
 
 // src/utils/paths.ts
-import path4 from "path";
+import path6 from "path";
 function resolveAlias(cwd, alias) {
-  return path4.resolve(cwd, alias);
+  return path6.resolve(cwd, alias);
 }
 function relativeImport(fromFile, toModuleFile) {
-  let rel = path4.relative(path4.dirname(fromFile), toModuleFile);
+  let rel = path6.relative(path6.dirname(fromFile), toModuleFile);
   if (!rel.startsWith(".")) rel = `./${rel}`;
   return rel.replace(/\\/g, "/").replace(/\.(tsx?|jsx?)$/, "");
 }
 function defaultTarget(file, aliases) {
   if (file.target) return file.target;
-  const base = path4.basename(file.path);
-  if (file.type === "registry:ui") return path4.posix.join(aliases.ui.replace(/^\.\//, ""), base);
-  if (file.type === "registry:lib") return path4.posix.join(aliases.lib.replace(/^\.\//, ""), base);
+  const base = path6.basename(file.path);
+  if (file.type === "registry:ui") return path6.posix.join(aliases.ui.replace(/^\.\//, ""), base);
+  if (file.type === "registry:lib") return path6.posix.join(aliases.lib.replace(/^\.\//, ""), base);
   return base;
 }
 
@@ -293,7 +521,7 @@ function mergeTheme(existing, incoming) {
 }
 
 // src/utils/transform.ts
-import path5 from "path";
+import path7 from "path";
 function transformContent(content, absoluteTargetFile, config, cwd) {
   const themeModule = resolveAlias(cwd, config.aliases.theme);
   const themeImport = relativeImport(absoluteTargetFile, themeModule);
@@ -301,13 +529,13 @@ function transformContent(content, absoluteTargetFile, config, cwd) {
   const rewritten = content.replaceAll(`from "@shadcn-nsh/theme"`, `from "${themeImport}"`).replaceAll(`from '@shadcn-nsh/theme'`, `from '${themeImport}'`);
   return rewritten.replace(
     /from (["'])\.\/lib\/([\w-]+)\1/g,
-    (_match, quote, name) => `from ${quote}${relativeImport(absoluteTargetFile, path5.join(libDir, name))}${quote}`
+    (_match, quote, name) => `from ${quote}${relativeImport(absoluteTargetFile, path7.join(libDir, name))}${quote}`
   );
 }
 
 // src/utils/plan.ts
 function isThemeFile(file) {
-  return path6.basename(file.absolute) === "theme.json";
+  return path8.basename(file.absolute) === "theme.json";
 }
 function hasChange(file) {
   if (file.status === "merge") return true;
@@ -330,18 +558,19 @@ function themeMerge(existing, incoming) {
     return null;
   }
 }
-async function planItems(uiRoot, config, items) {
+async function planItems(uiRoot, config, items, opts = {}) {
   const planned = [];
+  const adopted = new Set(opts.adopt ?? []);
   for (const item of items) {
     for (const file of item.files) {
       if (file.content == null) {
         throw new Error(`Item ${item.name} file ${file.path} has no content (run registry:build)`);
       }
       const target = defaultTarget(file, config.aliases);
-      const absolute = path6.isAbsolute(target) ? target : path6.resolve(uiRoot, target);
+      const absolute = path8.isAbsolute(target) ? target : path8.resolve(uiRoot, target);
       const content = transformContent(file.content, absolute, config, uiRoot);
-      const existing = await readOrNull(absolute);
-      const relative = path6.relative(uiRoot, absolute) || path6.basename(absolute);
+      const existing = adopted.has(item.name) ? null : await readOrNull(absolute);
+      const relative = path8.relative(uiRoot, absolute) || path8.basename(absolute);
       const entry = {
         item: item.name,
         file,
@@ -356,7 +585,7 @@ async function planItems(uiRoot, config, items) {
       if (existing != null) {
         if (existing === content) {
           entry.status = "same";
-        } else if (path6.basename(absolute) === "theme.json") {
+        } else if (path8.basename(absolute) === "theme.json") {
           const merged2 = themeMerge(existing, content);
           if (merged2 && merged2.added > 0) {
             entry.status = "merge";
@@ -381,13 +610,13 @@ async function planItems(uiRoot, config, items) {
 function isInstalled(uiRoot, config, item) {
   return (item.files ?? []).some((file) => {
     const target = defaultTarget(file, config.aliases);
-    return fs3.existsSync(path6.isAbsolute(target) ? target : path6.resolve(uiRoot, target));
+    return fs5.existsSync(path8.isAbsolute(target) ? target : path8.resolve(uiRoot, target));
   });
 }
 
 // src/utils/install.ts
 async function installItems(uiRoot, config, items, opts = {}) {
-  const planned = await planItems(uiRoot, config, items);
+  const planned = await planItems(uiRoot, config, items, opts);
   const written = [];
   for (const file of planned) {
     const shown = file.path;
@@ -431,8 +660,8 @@ async function installItems(uiRoot, config, items, opts = {}) {
   return { planned, written };
 }
 async function write(file, content) {
-  await fs4.mkdir(path7.dirname(file.absolute), { recursive: true });
-  await fs4.writeFile(file.absolute, content, "utf8");
+  await fs6.mkdir(path9.dirname(file.absolute), { recursive: true });
+  await fs6.writeFile(file.absolute, content, "utf8");
 }
 async function merged(file) {
   if (file.existing == null) return null;
@@ -448,105 +677,12 @@ async function merged(file) {
   }
 }
 
-// src/utils/registry.ts
-import fs5 from "fs/promises";
-import path8 from "path";
-function itemUrl(config, name, registryOverride) {
-  const template = registryOverride ?? config.registry;
-  if (!template.includes("{name}")) {
-    throw new Error(`Registry URL must contain {name}: ${template}`);
-  }
-  return template.replaceAll("{name}", name);
-}
-function indexUrl(config, registryOverride) {
-  const template = registryOverride ?? config.registry;
-  if (!template.includes("{name}")) {
-    throw new Error(`Registry URL must contain {name}: ${template}`);
-  }
-  return template.replaceAll("{name}", "index");
-}
-async function fetchItem(config, name, registryOverride) {
-  const url = itemUrl(config, name, registryOverride);
-  const res = await fetch(url);
-  if (!res.ok) {
-    throw new Error(`Failed to fetch ${url}: ${res.status} ${res.statusText}`);
-  }
-  return await res.json();
-}
-async function fetchIndex(config, registryOverride) {
-  const url = indexUrl(config, registryOverride);
-  const res = await fetch(url);
-  if (!res.ok) {
-    throw new Error(
-      `Failed to fetch ${url}: ${res.status} ${res.statusText}. A registry needs an index.json (bun run registry:build writes one).`
-    );
-  }
-  return await res.json();
-}
-async function resolveTree(config, names, registryOverride) {
-  const seen = /* @__PURE__ */ new Set();
-  const out = [];
-  async function walk(name) {
-    if (seen.has(name)) return;
-    seen.add(name);
-    const item = await fetchItem(config, name, registryOverride);
-    for (const dep of item.registryDependencies ?? []) {
-      await walk(dep);
-    }
-    out.push(item);
-  }
-  for (const name of names) {
-    await walk(name);
-  }
-  return out;
-}
-var IMPORT_RE = /(?:import|export)\s[^;]*?from\s+["']([^"']+)["']|import\s+["']([^"']+)["']/g;
-var THEME_PACKAGE = "@shadcn-nsh/theme";
-var RESOLVE_SUFFIXES = ["", ".ts", ".tsx", ".json", "/index.ts", "/index.tsx"];
-async function checkRegistryDependencies(registry, baseDir) {
-  const owner = /* @__PURE__ */ new Map();
-  for (const item of registry.items) {
-    for (const file of item.files) owner.set(path8.resolve(baseDir, file.path), item.name);
-  }
-  const hasTheme = registry.items.some((item) => item.name === "theme");
-  const problems = [];
-  for (const item of registry.items) {
-    const used = /* @__PURE__ */ new Set();
-    for (const file of item.files) {
-      const abs = path8.resolve(baseDir, file.path);
-      if (!/\.(ts|tsx)$/.test(abs)) continue;
-      const source = await fs5.readFile(abs, "utf8");
-      for (const match of source.matchAll(IMPORT_RE)) {
-        const spec = match[1] ?? match[2];
-        if (spec === THEME_PACKAGE && hasTheme) used.add("theme");
-        else if (spec.startsWith(".")) {
-          const target = RESOLVE_SUFFIXES.map(
-            (x) => path8.resolve(path8.dirname(abs), spec) + x
-          ).find((candidate) => owner.has(candidate));
-          if (target) used.add(owner.get(target));
-          else problems.push(`${item.name}: imports "${spec}", which no registry item ships`);
-        }
-      }
-    }
-    used.delete(item.name);
-    const declared = new Set(item.registryDependencies ?? []);
-    for (const dep of used) {
-      if (!declared.has(dep))
-        problems.push(`${item.name}: imports "${dep}" but does not declare it`);
-    }
-    for (const dep of declared) {
-      if (!used.has(dep)) problems.push(`${item.name}: declares "${dep}" but never imports it`);
-    }
-  }
-  return problems;
-}
-
 // src/commands/init.ts
-import fs6 from "fs/promises";
-import path9 from "path";
+import fs7 from "fs/promises";
+import path10 from "path";
 import { Command } from "commander";
 async function runInit(opts) {
-  const cwd = path9.resolve(opts.cwd);
+  const cwd = path10.resolve(opts.cwd);
   const ws = await resolveWorkspace(cwd);
   if (ws.kind === "app") {
     const nshJsonPath = await findNshJson(cwd);
@@ -562,10 +698,12 @@ async function runInit(opts) {
   }
   const config = DEFAULT_CONFIG();
   if (opts.registry) config.registry = opts.registry;
+  config.theme = themeItem(opts.theme ?? "default");
   await writeConfig(ws.uiRoot, config);
-  console.log(`write ${path9.relative(cwd, path9.join(ws.uiRoot, "nsh-ui.json")) || "nsh-ui.json"}`);
-  const items = await resolveTree(config, ["theme"], opts.registry);
+  console.log(`write ${path10.relative(cwd, path10.join(ws.uiRoot, "nsh-ui.json")) || "nsh-ui.json"}`);
+  const items = await resolveTree(config, [config.theme], opts.registry);
   await installItems(ws.uiRoot, config, items, { overwrite: opts.overwrite });
+  await installDependencies(ws.uiRoot, items);
   for (const appDir of ws.apps) {
     const nshJsonPath = await findNshJson(appDir);
     if (!nshJsonPath) continue;
@@ -573,13 +711,13 @@ async function runInit(opts) {
     nsh.theme = ws.kind === "monorepo" ? themePathForApp(appDir, ws.uiRoot) : "./theme.json";
     await writeJson(nshJsonPath, nsh);
     console.log(
-      `update ${path9.relative(cwd, nshJsonPath) || "nsh.json"} theme \u2192 ${String(nsh.theme)}`
+      `update ${path10.relative(cwd, nshJsonPath) || "nsh.json"} theme \u2192 ${String(nsh.theme)}`
     );
   }
   if (ws.kind === "app") {
-    const tsconfig = path9.join(cwd, "tsconfig.json");
+    const tsconfig = path10.join(cwd, "tsconfig.json");
     try {
-      await fs6.access(tsconfig);
+      await fs7.access(tsconfig);
     } catch {
       await writeJson(tsconfig, {
         extends: "./.nsh/tsconfig.json",
@@ -590,14 +728,16 @@ async function runInit(opts) {
   }
   return config;
 }
-var init = new Command().name("init").description("Initialize shadcn-nsh (writes nsh-ui.json + theme; monorepo \u2192 packages/ui)").option("-c, --cwd <cwd>", "app or monorepo directory", process.cwd()).option("-y, --yes", "skip confirmation", false).option("--overwrite", "overwrite existing files", false).option("--registry <url>", "registry URL template containing {name}").action(async (opts) => {
-  await runInit(opts);
-  console.log("\nDone. Next: shadcn-nsh add button");
-});
+var init = new Command().name("init").description("Initialize shadcn-nsh (writes nsh-ui.json + theme; monorepo \u2192 packages/ui)").option("-c, --cwd <cwd>", "app or monorepo directory", process.cwd()).option("-y, --yes", "skip confirmation", false).option("--overwrite", "overwrite existing files", false).option("--theme <name>", "theme to install: default (the library's own) or shadcn", "default").option("--registry <url>", "registry URL template containing {name}").action(
+  async (opts) => {
+    await runInit(opts);
+    console.log("\nDone. Next: shadcn-nsh add button");
+  }
+);
 
 // src/commands/add.ts
 async function runAdd(components, opts) {
-  const cwd = path10.resolve(opts.cwd);
+  const cwd = path11.resolve(opts.cwd);
   const dryRun = opts.dryRun === true;
   if (components.length === 0 && !opts.all) {
     throw new Error("Name at least one component, or pass --all.");
@@ -629,7 +769,22 @@ async function runAdd(components, opts) {
     throw new Error("The registry lists no registry:ui item to add.");
   }
   const items = await resolveTree(config, names, opts.registry);
-  await installItems(ws.uiRoot, config, items, { overwrite: opts.overwrite, dryRun });
+  const themes = items.filter((item) => item.type === "registry:theme").map((item) => item.name);
+  const named = names.filter((name) => themes.includes(name));
+  if (named.length > 1) {
+    throw new Error(`Name one theme, not ${named.join(", ")}: an app installs one.`);
+  }
+  const theme = named[0] === config.theme ? void 0 : named[0];
+  if (theme != null) {
+    config.theme = theme;
+    if (!dryRun) await writeConfig(ws.uiRoot, config);
+  }
+  await installItems(ws.uiRoot, config, items, {
+    overwrite: opts.overwrite,
+    dryRun,
+    adopt: theme == null ? [] : [theme]
+  });
+  const installed = await installDependencies(ws.uiRoot, items, { dryRun });
   if (dryRun) {
     const count = `${names.length} item${names.length === 1 ? "" : "s"}`;
     console.log(`
@@ -642,9 +797,9 @@ Added: all ${names.length} registry:ui items` : `
 Added: ${names.join(", ")}`
   );
   if (ws.kind === "monorepo") {
-    console.log(`(installed under ${path10.relative(ws.root, ws.uiRoot) || "packages/ui"})`);
+    console.log(`(installed under ${path11.relative(ws.root, ws.uiRoot) || "packages/ui"})`);
   }
-  return 0;
+  return installed?.ok === false ? 1 : 0;
 }
 var add = new Command2().name("add").description("Add registry components (monorepo: installs into packages/ui)").argument("[components...]", "component names (e.g. button)").option("-c, --cwd <cwd>", "app or monorepo directory", process.cwd()).option("-o, --overwrite", "replace files the app has changed", false).option("-a, --all", "every registry:ui item the registry lists", false).option("--dry-run", "print what would be written; write nothing", false).option("--registry <url>", "registry URL template containing {name}").action(
   async (components, opts) => {
@@ -653,8 +808,8 @@ var add = new Command2().name("add").description("Add registry components (monor
 );
 
 // src/commands/build.ts
-import fs7 from "fs/promises";
-import path11 from "path";
+import fs8 from "fs/promises";
+import path12 from "path";
 import { Command as Command3 } from "commander";
 
 // src/utils/registry-schema.ts
@@ -736,7 +891,7 @@ function parseRegistry(value, where) {
 async function holdsItem(file, name) {
   let value;
   try {
-    value = JSON.parse(await fs7.readFile(file, "utf8"));
+    value = JSON.parse(await fs8.readFile(file, "utf8"));
   } catch (error) {
     if (error instanceof SyntaxError) return false;
     throw error;
@@ -749,33 +904,33 @@ async function holdsItem(file, name) {
   }
 }
 async function runBuild(registryFile, opts) {
-  const cwd = path11.resolve(opts.cwd);
-  const registryPath = path11.resolve(cwd, registryFile);
-  const outputDir = path11.resolve(cwd, opts.output);
-  const registry = parseRegistry(JSON.parse(await fs7.readFile(registryPath, "utf8")), registryPath);
-  const problems = await checkRegistryDependencies(registry, path11.dirname(registryPath));
+  const cwd = path12.resolve(opts.cwd);
+  const registryPath = path12.resolve(cwd, registryFile);
+  const outputDir = path12.resolve(cwd, opts.output);
+  const registry = parseRegistry(JSON.parse(await fs8.readFile(registryPath, "utf8")), registryPath);
+  const problems = await checkRegistryDependencies(registry, path12.dirname(registryPath));
   if (problems.length > 0) {
     for (const problem of problems) console.error(`registry: ${problem}`);
     return 1;
   }
-  await fs7.mkdir(outputDir, { recursive: true });
+  await fs8.mkdir(outputDir, { recursive: true });
   const catalog = [];
   for (const item of registry.items) {
     const built = {
       ...item,
       files: await Promise.all(
         item.files.map(async (file) => {
-          const abs = path11.resolve(path11.dirname(registryPath), file.path);
-          const content = await fs7.readFile(abs, "utf8");
+          const abs = path12.resolve(path12.dirname(registryPath), file.path);
+          const source = await fs8.readFile(abs, "utf8");
           return {
             ...file,
-            content
+            content: opts.publish ? opts.publish(source, file.path) : source
           };
         })
       )
     };
-    const outFile = path11.join(outputDir, `${item.name}.json`);
-    await fs7.writeFile(outFile, `${JSON.stringify(built, null, 2)}
+    const outFile = path12.join(outputDir, `${item.name}.json`);
+    await fs8.writeFile(outFile, `${JSON.stringify(built, null, 2)}
 `, "utf8");
     catalog.push({
       name: item.name,
@@ -789,24 +944,24 @@ async function runBuild(registryFile, opts) {
         target: file.target
       }))
     });
-    console.log(`built ${path11.relative(cwd, outFile)}`);
+    console.log(`built ${path12.relative(cwd, outFile)}`);
   }
-  const indexPath = path11.join(outputDir, "index.json");
-  await fs7.writeFile(
+  const indexPath = path12.join(outputDir, "index.json");
+  await fs8.writeFile(
     indexPath,
     `${JSON.stringify({ name: registry.name, homepage: registry.homepage, items: catalog }, null, 2)}
 `,
     "utf8"
   );
-  console.log(`built ${path11.relative(cwd, indexPath)}`);
+  console.log(`built ${path12.relative(cwd, indexPath)}`);
   const written = /* @__PURE__ */ new Set([...registry.items.map((item) => `${item.name}.json`), "index.json"]);
-  for (const entry of await fs7.readdir(outputDir, { withFileTypes: true })) {
+  for (const entry of await fs8.readdir(outputDir, { withFileTypes: true })) {
     if (!entry.isFile() || !entry.name.endsWith(".json") || written.has(entry.name)) continue;
-    const stale = path11.join(outputDir, entry.name);
+    const stale = path12.join(outputDir, entry.name);
     const name = entry.name.slice(0, -".json".length);
     if (!await holdsItem(stale, name)) continue;
-    await fs7.rm(stale);
-    console.log(`removed ${path11.relative(cwd, stale)} (not in ${path11.basename(registryPath)})`);
+    await fs8.rm(stale);
+    console.log(`removed ${path12.relative(cwd, stale)} (not in ${path12.basename(registryPath)})`);
   }
   return 0;
 }
@@ -822,8 +977,9 @@ async function runDiff(names, opts) {
     console.log("No nsh-ui.json \u2014 run init first.");
     return 1;
   }
+  const installedHere = (item) => isInstalled(ws.uiRoot, config, item) && (item.type !== "registry:theme" || item.name === config.theme);
   const index = await fetchIndex(config, opts.registry);
-  const targets = names.length ? names : index.items.filter((item) => isInstalled(ws.uiRoot, config, item)).map((item) => item.name);
+  const targets = names.length ? names : index.items.filter(installedHere).map((item) => item.name);
   if (targets.length === 0) {
     console.log("Nothing installed.");
     return 0;
@@ -866,12 +1022,13 @@ import { Command as Command5 } from "commander";
 async function runList(opts) {
   const { ws, config } = await readApp(opts.cwd, opts.registry);
   const index = await fetchIndex(config, opts.registry);
+  const installedHere = (item) => isInstalled(ws.uiRoot, config, item) && (item.type !== "registry:theme" || item.name === config.theme);
   const rows = index.items.map((item) => ({
     name: item.name,
     type: item.type,
     title: item.title,
     description: item.description,
-    installed: isInstalled(ws.uiRoot, config, item)
+    installed: installedHere(item)
   }));
   if (opts.json) {
     console.log(
@@ -896,20 +1053,20 @@ var list = new Command5().name("list").description("List the registry's items, m
 });
 
 // src/commands/serve.ts
-import fs8 from "fs/promises";
+import fs9 from "fs/promises";
 import http from "http";
-import path12 from "path";
+import path13 from "path";
 import { Command as Command6 } from "commander";
 function fileUnder(root, pathname) {
-  const file = path12.join(root, pathname);
-  const relative = path12.relative(root, file);
-  if (relative === "" || relative === ".." || relative.startsWith(`..${path12.sep}`) || path12.isAbsolute(relative)) {
+  const file = path13.join(root, pathname);
+  const relative = path13.relative(root, file);
+  if (relative === "" || relative === ".." || relative.startsWith(`..${path13.sep}`) || path13.isAbsolute(relative)) {
     return null;
   }
   return file;
 }
 async function startRegistryServer(opts) {
-  const root = path12.resolve(opts.dir);
+  const root = path13.resolve(opts.dir);
   const port = opts.port ?? 0;
   const server = http.createServer(async (req, res) => {
     try {
@@ -925,7 +1082,7 @@ async function startRegistryServer(opts) {
         return;
       }
       try {
-        const body = await fs8.readFile(filePath);
+        const body = await fs9.readFile(filePath);
         res.writeHead(200, {
           "content-type": "application/json; charset=utf-8",
           "access-control-allow-origin": "*"
@@ -956,7 +1113,7 @@ async function startRegistryServer(opts) {
   };
 }
 var serve = new Command6().name("serve").description("Serve public/r over HTTP for local CLI testing").option("-p, --port <port>", "port (0 picks a free one)", "4173").option("-d, --dir <path>", "registry directory", "./public/r").option("-c, --cwd <cwd>", "working directory", process.cwd()).action(async (opts) => {
-  const root = path12.resolve(opts.cwd, opts.dir);
+  const root = path13.resolve(opts.cwd, opts.dir);
   const server = await startRegistryServer({ dir: root, port: Number(opts.port) });
   console.log(`Serving ${root}`);
   console.log(`  ${server.url}/index.json`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shadcn-nsh",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Add styled NSH components (copy-into-app) from the shadcn-nsh registry",
   "keywords": [
     "cli",