@brust/create-app 2.0.0-alpha.32 → 2.0.0-alpha.34

package/package.json

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

package/src/cli.ts

@@ -1,6 +1,7 @@
 // `create-app` main — a port of 0.1.x runNew (runtime/cli/new.ts:221-294) with the v2 dependency resolution.
 import { existsSync, readFileSync } from 'node:fs'
 import { readdir, rm } from 'node:fs/promises'
+import { isAbsolute, relative, sep } from 'node:path'
 import { copyTemplate } from './copy.ts'
 import { parseArgs, USAGE } from './args.ts'
 import { applyOverrides, monorepoRoot, resolveBrustDep } from './dep.ts'
@@ -67,7 +68,8 @@ export async function main(argv: string[]): Promise<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
+  const rel = relative(cwd, targetDir)
+  const displayPath = rel !== '' && !isAbsolute(rel) && rel !== '..' && !rel.startsWith(`..${sep}`) ? `./${rel.split(sep).join('/')}` : targetDir
   console.log(`Created ${name} at ${targetDir} (template: ${template}, @brust/core ${spec})\n`)
   console.log('Next:')
   console.log(`  cd ${shq(displayPath)}`)

package/src/dep.ts

@@ -1,9 +1,9 @@
 // Resolves the `@brust/core` spec written into a scaffolded package.json (`__BRUST_DEP__`, M3-F rulings R2/R3).
 import { existsSync, readFileSync, writeFileSync } from 'node:fs'
-import { dirname, join, relative, resolve } from 'node:path'
+import { dirname, join, relative, resolve, sep } from 'node:path'
 
 /** = scripts/release-files.ts PLATS. */
-export const PLATS = ['darwin-x64', 'darwin-arm64', 'linux-x64-gnu', 'linux-arm64-gnu', 'linux-x64-musl', 'linux-arm64-musl'] as const
+export const PLATS = ['darwin-x64', 'darwin-arm64', 'linux-x64-gnu', 'linux-arm64-gnu', 'linux-x64-musl', 'linux-arm64-musl', 'win32-x64-msvc'] as const
 
 export interface BrustDep {
   kind: 'explicit' | 'version' | 'workspace' | 'file'
@@ -31,11 +31,16 @@ export function monorepoRoot(pkgRoot = packageRoot()): string | null {
 function inWorkspace(root: string, target: string): boolean {
   const rootPkg = readJson(join(root, 'package.json'))
   const globs = (rootPkg?.workspaces as string[] | undefined) ?? []
-  const rel = relative(root, resolve(target))
+  const rel = fileSpecPath(relative(root, resolve(target)))
   if (rel.startsWith('..') || rel === '') return false
   return globs.some((g) => (g.endsWith('/*') ? dirname(rel) === g.slice(0, -2) : rel === g))
 }
 
+/** F484: a `file:` spec path is `/`-spelled on every platform (`C:\\repo` -> `C:/repo`); a no-op on POSIX. */
+export function fileSpecPath(p: string, s: string = sep): string {
+  return s === '/' ? p : p.split(s).join('/')
+}
+
 export function resolveBrustDep(o: { explicit?: string; targetDir: string; pkgRoot?: string }): BrustDep {
   if (o.explicit) return { kind: 'explicit', spec: o.explicit }
   const pkgRoot = o.pkgRoot ?? packageRoot()
@@ -43,10 +48,11 @@ export function resolveBrustDep(o: { explicit?: string; targetDir: string; pkgRo
   if (root) {
     if (inWorkspace(root, o.targetDir)) return { kind: 'workspace', spec: 'workspace:*' }
     // `file:` alone fails: core's own workspace:* deps do not resolve outside the workspace globs, so override them.
-    const overrides: Record<string, string> = { '@brust/runtime-dom': `file:${root}/packages/runtime-dom` }
-    overrides['@brust/core-cf'] = `file:${root}/npm/core-cf`
-    for (const p of PLATS) overrides[`@brust/native-${p}`] = `file:${root}/npm/${p}`
-    return { kind: 'file', spec: `file:${root}/packages/brust`, overrides }
+    const r = fileSpecPath(root)
+    const overrides: Record<string, string> = { '@brust/runtime-dom': `file:${r}/packages/runtime-dom` }
+    overrides['@brust/core-cf'] = `file:${r}/npm/core-cf`
+    for (const p of PLATS) overrides[`@brust/native-${p}`] = `file:${r}/npm/${p}`
+    return { kind: 'file', spec: `file:${r}/packages/brust`, overrides }
   }
   const version = (readJson(join(pkgRoot, 'package.json'))?.version as string | undefined) ?? '0.0.0'
   return { kind: 'version', spec: `^${version}` }

package/src/shadcn.ts

@@ -15,16 +15,29 @@ export const spawnRunner: Runner = async (argv, cwd) => {
   }
 }
 
+/** F485 P6: how to start the project's own brust CLI. POSIX runs the `.bin` shim by path (unchanged); Windows has no
+ * executable `brust` there (a `.exe`/`.cmd` shim), so the package's bin script runs through the running Bun. */
+export function brustArgv(targetDir: string, platform: string = process.platform, execPath: string = process.execPath): string[] {
+  if (platform === 'win32') return [execPath, join(targetDir, 'node_modules', '@brust', 'core', 'bin', 'brust')]
+  return [join(targetDir, 'node_modules/.bin/brust')]
+}
+
+/** The command text printed for the user to paste: the POSIX shim path, or on Windows the Bun-run bin script (F485 P6). */
+export function brustHint(targetDir: string, platform: string = process.platform, execPath: string = process.execPath): string {
+  if (platform !== 'win32') return 'node_modules/.bin/brust'
+  return brustArgv(targetDir, platform, execPath).map((a) => (a.includes(' ') ? `"${a}"` : a)).join(' ')
+}
+
 /** 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('')}`
+  const by = `cd ${shq(targetDir)} && bun install && ${brustHint(targetDir)} 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('')}`)
+    out(`  ${brustHint(targetDir)} 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)')
@@ -33,9 +46,9 @@ export async function runShadcn(o: { targetDir: string; components: string[]; wo
     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)
+  const init = await o.run([...brustArgv(targetDir), '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('')}`)
+    out(`create-app: brust shadcn init failed (exit ${init}); the project is created. Run again: cd ${shq(targetDir)} && ${brustHint(targetDir)} shadcn init${components.map((c) => ` ${shq(c)}`).join('')}`)
   }
   return init
 }