bank20baht-cli 0.1.2 → 0.2.0

package/dist/application/create.js

@@ -1,4 +1,4 @@
-import { planCreate } from '../domain/create-plan.js';
+import { planCreate, PRESET_TEMPLATE_SET } from '../domain/create-plan.js';
 import { validateProjectName } from '../domain/naming.js';
 export function runCreate(input, deps) {
     const errors = validateProjectName(input.name);
@@ -7,7 +7,7 @@ export function runCreate(input, deps) {
             deps.log.error(e);
         throw new CreateError('Invalid project name.');
     }
-    const blueprint = planCreate(input, deps.templates.load('create'), (raw, data) => deps.renderer.render(raw, data));
+    const blueprint = planCreate(input, deps.templates.load(PRESET_TEMPLATE_SET[input.preset]), (raw, data) => deps.renderer.render(raw, data));
     if (input.dryRun) {
         deps.log.info(`dry-run — would create in ${blueprint.root}:`);
         for (const f of blueprint.files)
@@ -34,8 +34,19 @@ export function runCreate(input, deps) {
     deps.log.info(`  cd ${input.name}`);
     if (!input.install)
         deps.log.info('  bun install');
-    deps.log.info('  bun run dev        # web :5173 + api :3001');
-    deps.log.info('  bun run lint && bun run test && bun run build');
+    for (const line of NEXT_STEPS[input.preset])
+        deps.log.info(`  ${line}`);
 }
+const NEXT_STEPS = {
+    full: [
+        'bun run dev        # web :5173 + api :3001',
+        'bun run lint && bun run test && bun run build',
+    ],
+    workspace: [
+        'mkdir -p apps/<name> && add a package.json with dev/build/typecheck scripts',
+        'bun run dev        # runs every apps/*/ dev script in parallel',
+        'bun run check      # lint + format:check + knip + typecheck',
+    ],
+};
 export class CreateError extends Error {
 }

package/dist/cli.js

@@ -12,7 +12,9 @@ import { ShellRunner } from './infrastructure/shell-runner.js';
 const HELP = `bahtui — bun-workspace DDD scaffolding (React + Elysia + Eden)
 
 Usage:
-  bahtui create <name> [options]        scaffold a new monorepo in ./<name>
+  bahtui new <name> [options]           bare bun workspace in ./<name> — toolchain only
+                                        (eslint, prettier, knip, husky, commitlint), no apps
+  bahtui create <name> [options]        full monorepo in ./<name> (React + Elysia + Eden)
   bahtui init [options]                 write bahtui.json into an existing repo
   bahtui g model <domain>               libs/domain/<d>/model package
   bahtui g form <domain>/<name> --fields "key:type:mod,…"
@@ -25,8 +27,9 @@ Options:
   --frontend <react|none>  init: default react
   --backend <elysia|none>  init: default elysia
   --dry-run      print what would be generated, write nothing
-  --no-install   create: skip "bun install" (also skips the initial commit)
-  --no-git       create: skip git init + initial commit
+  --no-install   new/create: skip "bun install" (also skips the initial commit)
+  --no-git       new/create: skip git init + initial commit
+  --skip-install / --skip-git   Angular-style aliases of the two above
   --force        overwrite existing files/dirs
   -h, --help     this help
   -v, --version  print version
@@ -50,6 +53,8 @@ const KNOWN_FLAGS = new Set([
     '--force',
     '--no-install',
     '--no-git',
+    '--skip-install',
+    '--skip-git',
 ]);
 /**
  * Value-carrying flags pulled out before positional parsing. Supports both
@@ -116,16 +121,17 @@ function main(rawArgv) {
         log,
     };
     try {
-        if (command === 'create') {
+        if (command === 'create' || command === 'new') {
             if (!name) {
-                log.error('create needs a project name: bahtui create <name>');
+                log.error(`${command} needs a project name: bahtui ${command} <name>`);
                 return 1;
             }
             runCreate({
                 name,
+                preset: command === 'new' ? 'workspace' : 'full',
                 targetDir: resolve(process.cwd(), name),
-                install: !flags.has('--no-install'),
-                git: !flags.has('--no-git'),
+                install: !flags.has('--no-install') && !flags.has('--skip-install'),
+                git: !flags.has('--no-git') && !flags.has('--skip-git'),
                 dryRun,
                 force,
             }, {

package/dist/domain/create-plan.js

@@ -1,3 +1,7 @@
+export const PRESET_TEMPLATE_SET = {
+    full: 'create',
+    workspace: 'new',
+};
 /**
  * Template naming conventions (the whole contract between templates/ and here):
  * - `*.hbs`            → rendered with the data below, suffix stripped.

package/dist/domain/form-dsl.js

@@ -15,6 +15,7 @@ const FIELD_TYPES = new Set([
     'textarea',
     'number',
     'email',
+    'password',
     'dropdown',
     'multiselect',
     'checkbox',

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "bank20baht-cli",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "type": "module",
-  "description": "Scaffold bun-workspace DDD monorepos (React + Elysia + Eden) and bahtui generators.",
+  "description": "Scaffold bun workspaces (bahtui new) and DDD monorepos (React + Elysia + Eden, bahtui create) plus bahtui generators.",
   "license": "MIT",
   "author": "Nattapong Promthong",
   "repository": {

package/templates/new/CLAUDE.md

@@ -0,0 +1,3 @@
+# Search tool
+
+Use the `zvec_grep` MCP tool for code search in this repo instead of Grep/Glob/`grep`/`rg`.

package/templates/new/README.md.hbs

@@ -0,0 +1,36 @@
+# {{name}}
+
+Bun-workspace monorepo scaffolded by [`bank20baht-cli`](https://github.com/bank20baht/bahtui)
+(`bahtui new`). Toolchain only — add your own apps under `apps/*` and shared
+libraries under `packages/*`.
+
+## Quickstart
+
+```sh
+bun install
+bun run dev        # runs every apps/*/package.json "dev" script in parallel
+bun run check      # lint + format:check + knip + typecheck (also the pre-push hook)
+```
+
+## Layout
+
+```
+apps/<name>          runnable applications (each with its own package.json)
+packages/<name>      shared libraries consumed by apps via workspace:*
+scripts/dev.ts       parallel dev runner with prefixed output (apps/* only)
+scripts/each.ts      `bun run scripts/each.ts <script>` in every workspace that has it
+```
+
+Add a workspace by creating `apps/<name>/package.json` (or `packages/<name>`)
+with `dev`, `build` and `typecheck` scripts, then extend `knip.json` with a
+matching workspace entry so dead-code checks cover it.
+
+## Toolchain
+
+- **ESLint 10 + typescript-eslint** (`eslint.config.ts`), **Prettier** (no semi,
+  single quotes, width 100), **knip** — all run by `bun run check`.
+- **husky** hooks: `pre-commit` → lint-staged, `commit-msg` → commitlint
+  (Conventional Commits), `pre-push` → `bun run check`.
+- `tsconfig.base.json` — strict, `moduleResolution: bundler`,
+  `verbatimModuleSyntax`, `noUncheckedIndexedAccess`. Extend it from each
+  workspace's `tsconfig.json`.

package/templates/new/_gitignore

@@ -0,0 +1,9 @@
+node_modules
+.zvec-grep
+dist
+.env
+.env.*
+!.env.example
+*.log
+.DS_Store
+bun.lockb

package/templates/new/_husky/commit-msg

@@ -0,0 +1 @@
+bunx commitlint --edit "$1"

package/templates/new/_husky/pre-commit

@@ -0,0 +1 @@
+bunx lint-staged

package/templates/new/_husky/pre-push

@@ -0,0 +1 @@
+bun run check

package/templates/new/_mcp.json

@@ -0,0 +1,9 @@
+{
+  "mcpServers": {
+    "zvec_grep": {
+      "type": "stdio",
+      "command": "zg",
+      "args": ["server", "--stdio"]
+    }
+  }
+}

package/templates/new/_prettierignore

@@ -0,0 +1,3 @@
+node_modules
+dist
+bun.lock

package/templates/new/_prettierrc

@@ -0,0 +1,6 @@
+{
+  "semi": false,
+  "singleQuote": true,
+  "trailingComma": "all",
+  "printWidth": 100
+}

package/templates/new/commitlint.config.js

@@ -0,0 +1,3 @@
+export default {
+  extends: ['@commitlint/config-conventional'],
+}

package/templates/new/eslint.config.ts

@@ -0,0 +1,24 @@
+import js from '@eslint/js'
+import prettier from 'eslint-config-prettier'
+import tseslint from 'typescript-eslint'
+
+export default tseslint.config(
+  {
+    ignores: ['**/dist/**', '**/node_modules/**', '**/*.gen.ts', '**/.angular/**'],
+  },
+  js.configs.recommended,
+  ...tseslint.configs.recommended,
+  {
+    languageOptions: {
+      parserOptions: { tsconfigRootDir: import.meta.dirname },
+    },
+    rules: {
+      '@typescript-eslint/no-unused-vars': [
+        'error',
+        { argsIgnorePattern: '^_', varsIgnorePattern: '^_' },
+      ],
+      '@typescript-eslint/consistent-type-imports': 'error',
+    },
+  },
+  prettier,
+)

package/templates/new/knip.json

@@ -0,0 +1,9 @@
+{
+  "$schema": "https://unpkg.com/knip@latest/schema.json",
+  "workspaces": {
+    ".": {
+      "entry": ["scripts/*.ts"],
+      "project": ["scripts/**/*.ts"]
+    }
+  }
+}

package/templates/new/package.json.hbs

@@ -0,0 +1,37 @@
+{
+  "name": "{{name}}",
+  "private": true,
+  "type": "module",
+  "workspaces": ["apps/*", "packages/*"],
+  "scripts": {
+    "dev": "bun run scripts/dev.ts",
+    "build": "bun run scripts/each.ts build",
+    "typecheck": "tsc -p tsconfig.json && bun run scripts/each.ts typecheck",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
+    "format": "prettier --write .",
+    "format:check": "prettier --check .",
+    "knip": "knip",
+    "check": "bun run lint && bun run format:check && bun run knip && bun run typecheck",
+    "prepare": "husky"
+  },
+  "lint-staged": {
+    "*.{ts,tsx}": ["eslint --fix", "prettier --write"],
+    "*.{json,md,html,css}": ["prettier --write"]
+  },
+  "devDependencies": {
+    "@commitlint/cli": "^21.2.2",
+    "@commitlint/config-conventional": "^21.2.2",
+    "@eslint/js": "^10.0.1",
+    "@types/bun": "^1.3.0",
+    "eslint": "^10.10.0",
+    "eslint-config-prettier": "^10.1.8",
+    "husky": "^9.1.7",
+    "jiti": "^2.6.1",
+    "knip": "^6.35.1",
+    "lint-staged": "^17.5.1",
+    "prettier": "^3.9.6",
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.70.0"
+  }
+}

package/templates/new/scripts/dev.ts

@@ -0,0 +1,54 @@
+/**
+ * Run every `apps/*` workspace `dev` script in parallel with prefixed,
+ * live-streamed output. Replaces `bun run --filter '*' dev`, which serializes
+ * long-running scripts and never starts the second one.
+ */
+import { workspacesWithScript } from './workspaces.ts'
+
+const colors = ['\x1b[36m', '\x1b[35m', '\x1b[33m', '\x1b[32m', '\x1b[34m']
+const reset = '\x1b[0m'
+
+const targets = workspacesWithScript('dev', ['apps']).map((ws, i) => ({
+  ...ws,
+  color: colors[i % colors.length],
+}))
+
+if (targets.length === 0) {
+  console.log('No apps/*/package.json with a "dev" script yet — nothing to run.')
+  process.exit(0)
+}
+
+const procs = targets.map(({ name, cwd, color }) => {
+  const proc = Bun.spawn(['bun', 'run', 'dev'], {
+    cwd,
+    env: process.env,
+    stdout: 'pipe',
+    stderr: 'pipe',
+  })
+
+  const prefix = (line: string) => `${color}[${name}]${reset} ${line}`
+  const pump = async (stream: ReadableStream<Uint8Array>) => {
+    const decoder = new TextDecoder()
+    let buf = ''
+    for await (const chunk of stream) {
+      buf += decoder.decode(chunk, { stream: true })
+      const lines = buf.split('\n')
+      buf = lines.pop() ?? ''
+      for (const line of lines) console.log(prefix(line))
+    }
+    if (buf) console.log(prefix(buf))
+  }
+
+  pump(proc.stdout)
+  pump(proc.stderr)
+  return proc
+})
+
+const shutdown = () => {
+  for (const p of procs) p.kill()
+  process.exit(0)
+}
+process.on('SIGINT', shutdown)
+process.on('SIGTERM', shutdown)
+
+await Promise.all(procs.map((p) => p.exited))

package/templates/new/scripts/each.ts

@@ -0,0 +1,25 @@
+/**
+ * `bun run scripts/each.ts <script>` — run `<script>` in every apps/* and
+ * packages/* workspace that defines it, one after another, failing on the
+ * first non-zero exit. Unlike `bun run --filter '*' <script>` it exits 0 when
+ * no workspace defines the script yet, so a fresh repo passes `bun run check`.
+ */
+import { workspacesWithScript } from './workspaces.ts'
+
+const script = process.argv[2]
+if (!script) {
+  console.error('usage: bun run scripts/each.ts <script>')
+  process.exit(1)
+}
+
+const targets = workspacesWithScript(script)
+if (targets.length === 0) {
+  console.log(`No workspace defines "${script}" yet — nothing to run.`)
+  process.exit(0)
+}
+
+for (const { name, cwd } of targets) {
+  console.log(`\x1b[36m[${name}]\x1b[0m bun run ${script}`)
+  const proc = Bun.spawnSync(['bun', 'run', script], { cwd, env: process.env, stdio: ['inherit', 'inherit', 'inherit'] })
+  if (proc.exitCode !== 0) process.exit(proc.exitCode ?? 1)
+}

package/templates/new/scripts/workspaces.ts

@@ -0,0 +1,24 @@
+import { existsSync, readdirSync, readFileSync } from 'node:fs'
+import { join } from 'node:path'
+
+export interface Workspace {
+  name: string
+  cwd: string
+}
+
+/** Every `apps/*` and `packages/*` directory whose package.json defines `script`. */
+export function workspacesWithScript(script: string, groups = ['apps', 'packages']): Workspace[] {
+  const found: Workspace[] = []
+  for (const group of groups) {
+    if (!existsSync(group)) continue
+    for (const entry of readdirSync(group, { withFileTypes: true })) {
+      if (!entry.isDirectory()) continue
+      const cwd = join(group, entry.name)
+      const pkgPath = join(cwd, 'package.json')
+      if (!existsSync(pkgPath)) continue
+      const pkg = JSON.parse(readFileSync(pkgPath, 'utf8')) as { scripts?: Record<string, string> }
+      if (typeof pkg.scripts?.[script] === 'string') found.push({ name: entry.name, cwd })
+    }
+  }
+  return found
+}

package/templates/new/tsconfig.base.json

@@ -0,0 +1,16 @@
+{
+  "compilerOptions": {
+    "target": "ESNext",
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "moduleDetection": "force",
+    "allowImportingTsExtensions": true,
+    "verbatimModuleSyntax": true,
+    "esModuleInterop": true,
+    "resolveJsonModule": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "noUncheckedIndexedAccess": true,
+    "noEmit": true
+  }
+}

package/templates/new/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "extends": "./tsconfig.base.json",
+  "compilerOptions": {
+    "types": ["bun"]
+  },
+  "include": ["scripts"]
+}