@brust/create-app 2.0.0-alpha.10 → 2.0.0-alpha.12

package/README.md

@@ -4,6 +4,7 @@ Scaffold a [brust](https://github.com/AssetsArt/brust) v2 app.
 
 ```bash
 bun create @brust/app my-app      # --template blank (default) | pokedex
+bun create @brust/app my-app --shadcn=button,card,dialog   # also installs and runs `brust shadcn init` (needs @brust/core 2.0.0-alpha.11+)
 cd my-app && bun install
 bun run dev                       # http://127.0.0.1:1337
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brust/create-app",
-  "version": "2.0.0-alpha.10",
+  "version": "2.0.0-alpha.12",
   "description": "Scaffold a brust v2 app — bun create @brust/app <name>",
   "license": "MIT",
   "homepage": "https://brust.dev",

package/src/args.ts

@@ -4,8 +4,11 @@ import { isAbsolute, resolve } from 'node:path'
 
 const NAME_RE = /^[a-z0-9][a-z0-9_-]*$/
 const MAX_NAME_LEN = 50
+// The same rule as `brust shadcn init` (R41.8): a component is a registry name or an https URL, checked before anything is written.
+const COMPONENT_RE = /^[a-z0-9][a-z0-9-]*$/
+const REGISTRY_URL_RE = /^https:\/\/[^\s,]+$/
 
-export const USAGE = 'usage: bun create @brust/app <name> [--template blank|pokedex] [--tailwind] [--dir <path>] [--yes] [--brust-dep <spec>] [--version]'
+export const USAGE = 'usage: bun create @brust/app <name> [--template blank|pokedex] [--tailwind] [--dir <path>] [--yes] [--brust-dep <spec>] [--shadcn[=button,card,...]] [--version]'
 
 export interface ParsedArgs {
   projectName: string
@@ -16,6 +19,8 @@ export interface ParsedArgs {
   /** `--tailwind` (L21): accepted and ignored since L28: the blank template uses Tailwind CSS v4 by default. */
   tailwind: boolean
   help: boolean
+  /** `--shadcn[=a,b]` (F181): after scaffolding, install and run `brust shadcn init` with these components (`[]` = set up only). */
+  shadcn?: string[]
   /** `--version` (F131): print the bare version and exit; no short form (see the note above). */
   version: boolean
 }
@@ -29,6 +34,7 @@ export function parseArgs(args: string[]): ParsedArgs {
   let tailwind = false
   let help = false
   let version = false
+  let shadcn: string[] | undefined
   const need = (flag: string, v: string | undefined): string => {
     if (!v) throw new Error(`create-app: ${flag} requires a value`)
     return v
@@ -47,6 +53,14 @@ export function parseArgs(args: string[]): ParsedArgs {
     else if (a.startsWith('--brust-dep=')) brustDep = need('--brust-dep', a.slice('--brust-dep='.length))
     else if (a === '--yes' || a === '-y') yes = true
     else if (a === '--tailwind') tailwind = true
+    else if (a === '--shadcn') shadcn = shadcn ?? []
+    else if (a.startsWith('--shadcn=')) {
+      const names = a.slice('--shadcn='.length).split(',').filter(Boolean)
+      for (const c of names) {
+        if (!COMPONENT_RE.test(c) && !REGISTRY_URL_RE.test(c)) throw new Error(`create-app: --shadcn component "${c}" must match ^[a-z0-9][a-z0-9-]*$ or be an https:// registry URL (without commas)`)
+      }
+      shadcn = [...(shadcn ?? []), ...names]
+    }
     else if (a.startsWith('-')) throw new Error(`create-app: unknown flag "${a}"`)
     else if (name === undefined) name = a
     else throw new Error(`create-app: unexpected positional argument "${a}"`)
@@ -60,5 +74,5 @@ export function parseArgs(args: string[]): ParsedArgs {
   }
   const cwd = process.cwd()
   const targetDir = dir ? (isAbsolute(dir) ? dir : resolve(cwd, dir)) : resolve(cwd, name)
-  return { projectName: name, targetDir, template, yes, brustDep, tailwind, help, version }
+  return { projectName: name, targetDir, template, yes, brustDep, tailwind, help, version, ...(shadcn && { shadcn }) }
 }

package/src/cli.ts

@@ -5,6 +5,7 @@ import { copyTemplate } from './copy.ts'
 import { parseArgs, USAGE } from './args.ts'
 import { applyOverrides, monorepoRoot, resolveBrustDep } from './dep.ts'
 import { TAILWIND_DEFAULT_NOTE } from './tailwind.ts'
+import { runShadcn, shq, spawnRunner } from './shadcn.ts'
 import { selectTemplate } from './templates.ts'
 
 // F131: read at run time from the package.json that `bun publish` ships, so release-bump.ts stays the only place versions change.
@@ -55,15 +56,21 @@ export async function main(argv: string[]): Promise<void> {
     if (!targetExisted) await rm(targetDir, { recursive: true, force: true }).catch(() => {})
     return fail(`create-app: failed to scaffold (${msg(e)})`)
   }
+  if (parsed.shadcn) {
+    const code = await runShadcn({ targetDir, components: parsed.shadcn, workspace: dep.kind === 'workspace', run: spawnRunner, out: (l) => console.log(l) })
+    if (code !== 0) process.exit(code)
+    printNextSteps(projectName, targetDir, tmpl.name, dep.spec, dep.kind === 'workspace', true)
+    return
+  }
   printNextSteps(projectName, targetDir, tmpl.name, dep.spec, dep.kind === 'workspace')
 }
 
-function printNextSteps(name: string, targetDir: string, template: string, spec: string, workspace: boolean): void {
+function printNextSteps(name: string, targetDir: string, template: string, spec: string, workspace: boolean, installed = false): void {
   const cwd = process.cwd()
   const displayPath = targetDir.startsWith(`${cwd}/`) ? `./${targetDir.slice(cwd.length + 1)}` : targetDir
   console.log(`Created ${name} at ${targetDir} (template: ${template}, @brust/core ${spec})\n`)
   console.log('Next:')
-  console.log(`  cd ${displayPath}`)
-  console.log(workspace ? '  bun install   # run it at the brust repo root: this app is a workspace member' : '  bun install')
+  console.log(`  cd ${shq(displayPath)}`)
+  if (!installed) console.log(workspace ? '  bun install   # run it at the brust repo root: this app is a workspace member' : '  bun install')
   console.log('  bun run dev')
 }

package/src/shadcn.ts

@@ -0,0 +1,41 @@
+// `--shadcn[=a,b]` (F181): after the scaffold, install the project and run its own `brust shadcn init`.
+// Every child is an argv array (no shell). The project's own `node_modules/.bin/brust` is run by path, never `bunx brust`,
+// which could fetch an unrelated package named `brust` from the registry when the local one is missing.
+import { join } from 'node:path'
+
+/** Runs `argv` in `cwd` with the terminal attached; resolves to the exit code. */
+export type Runner = (argv: string[], cwd: string) => Promise<number>
+
+export const spawnRunner: Runner = async (argv, cwd) => {
+  try {
+    const p = Bun.spawn(argv, { cwd, stdin: 'inherit', stdout: 'inherit', stderr: 'inherit' })
+    return await p.exited
+  } catch {
+    return 127
+  }
+}
+
+/** POSIX single-quoting: nothing inside expands when the printed command is pasted into a shell. */
+export const shq = (s: string): string => (/^[A-Za-z0-9_@%+=:,./-]+$/.test(s) ? s : `'${s.replace(/'/g, `'\\''`)}'`)
+
+/** Returns 0 when done, else the failing step's exit code (the project is left in place; `lines` says what to run). */
+export async function runShadcn(o: { targetDir: string; components: string[]; workspace: boolean; run: Runner; out: (line: string) => void }): Promise<number> {
+  const { targetDir, components, out } = o
+  const by = `cd ${shq(targetDir)} && bun install && node_modules/.bin/brust shadcn init${components.map((c) => ` ${shq(c)}`).join('')}`
+  if (o.workspace) {
+    out('--shadcn: this app is a workspace member of a brust checkout; run `bun install` at the repo root, then in the app:')
+    out(`  node_modules/.bin/brust shadcn init${components.map((c) => ` ${shq(c)}`).join('')}`)
+    return 0
+  }
+  out('\n--shadcn: installing, then running `brust shadcn init` (needs @brust/core 2.0.0-alpha.11 or later)')
+  const install = await o.run(['bun', 'install'], targetDir)
+  if (install !== 0) {
+    out(`create-app: bun install failed (exit ${install}); the project is created. Finish with: ${by}`)
+    return install
+  }
+  const init = await o.run([join(targetDir, 'node_modules/.bin/brust'), 'shadcn', 'init', ...components], targetDir)
+  if (init !== 0) {
+    out(`create-app: brust shadcn init failed (exit ${init}); the project is created. Run again: cd ${shq(targetDir)} && node_modules/.bin/brust shadcn init${components.map((c) => ` ${shq(c)}`).join('')}`)
+  }
+  return init
+}