@strav/cli 0.4.0 → 0.4.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strav/cli",
-  "version": "0.4.0",
+  "version": "0.4.4",
   "type": "module",
   "description": "CLI framework and code generators for the Strav framework",
   "license": "MIT",
@@ -33,11 +33,11 @@
     "strav": "./src/cli/strav.ts"
   },
   "peerDependencies": {
-    "@strav/kernel": "0.4.0",
-    "@strav/http": "0.4.0",
-    "@strav/database": "0.4.0",
-    "@strav/queue": "0.4.0",
-    "@strav/signal": "0.4.0"
+    "@strav/kernel": "0.4.4",
+    "@strav/http": "0.4.4",
+    "@strav/database": "0.4.4",
+    "@strav/queue": "0.4.4",
+    "@strav/signal": "0.4.4"
   },
   "dependencies": {
     "chalk": "^5.6.2",

package/src/commands/generate_api.ts

@@ -8,7 +8,7 @@ import TestGenerator from '../generators/test_generator.ts'
 import DocGenerator from '../generators/doc_generator.ts'
 import type { ApiRoutingConfig } from '../generators/route_generator.ts'
 import type { GeneratorConfig } from '../generators/config.ts'
-import { loadGeneratorConfig, getDatabasePaths } from '../config/loader.ts'
+import { loadGeneratorConfig, getDatabasePaths, loadTenantIdType } from '../config/loader.ts'
 
 export function register(program: Command): void {
   program
@@ -17,7 +17,8 @@ export function register(program: Command): void {
     .description(
       'Generate services, controllers, policies, validators, events, and routes from schemas'
     )
-    .action(async () => {
+    .option('-f, --force', 'Overwrite existing generated files')
+    .action(async ({ force }: { force?: boolean }) => {
       try {
         console.log(chalk.cyan('Generating API layer from schemas...'))
 
@@ -29,13 +30,14 @@ export function register(program: Command): void {
         registry.validate()
 
         const schemas = registry.resolve()
-        const representation = registry.buildRepresentation()
+        const tenantIdType = await loadTenantIdType()
+        const representation = registry.buildRepresentation(tenantIdType)
 
         // Load generator config (if available)
         const config = await loadGeneratorConfig()
 
         const apiGen = new ApiGenerator(schemas, representation, config)
-        const apiFiles = await apiGen.writeAll()
+        const apiResult = await apiGen.writeAll(force)
 
         // Load API routing config from config/http.ts (if available)
         let apiConfig: Partial<ApiRoutingConfig> | undefined
@@ -47,24 +49,41 @@ export function register(program: Command): void {
         }
 
         const routeGen = new RouteGenerator(schemas, config, apiConfig)
-        const routeFiles = await routeGen.writeAll()
+        const routeResult = await routeGen.writeAll(force)
 
         const testGen = new TestGenerator(schemas, representation, config, apiConfig)
-        const testFiles = await testGen.writeAll()
+        const testResult = await testGen.writeAll(force)
 
         const docGen = new DocGenerator(schemas, representation, config, apiConfig)
-        const docFiles = await docGen.writeAll()
+        const docResult = await docGen.writeAll(force)
 
-        const files = [...apiFiles, ...routeFiles, ...testFiles, ...docFiles]
+        const written = [
+          ...apiResult.written,
+          ...routeResult.written,
+          ...testResult.written,
+          ...docResult.written,
+        ]
+        const skipped = [
+          ...apiResult.skipped,
+          ...routeResult.skipped,
+          ...testResult.skipped,
+          ...docResult.skipped,
+        ]
 
-        if (files.length === 0) {
+        if (written.length === 0 && skipped.length === 0) {
           console.log(chalk.yellow('No API files to generate.'))
           return
         }
 
-        console.log(chalk.green(`\nGenerated ${files.length} file(s):`))
-        for (const file of files) {
-          console.log(chalk.dim(`  ${file.path}`))
+        for (const file of written) {
+          console.log(chalk.green(`  CREATE  `) + chalk.dim(file.path))
+        }
+        for (const file of skipped) {
+          console.log(chalk.yellow(`  SKIP    `) + chalk.dim(file.path) + chalk.dim(' (already exists)'))
+        }
+
+        if (skipped.length > 0) {
+          console.log(chalk.dim(`\nSkipped ${skipped.length} existing file(s). Use --force to overwrite.`))
         }
       } catch (err) {
         console.error(chalk.red(`Error: ${err instanceof Error ? err.message : err}`))

package/src/commands/generate_models.ts

@@ -2,14 +2,15 @@ import type { Command } from 'commander'
 import chalk from 'chalk'
 import SchemaRegistry from '@strav/database/schema/registry'
 import ModelGenerator from '../generators/model_generator.ts'
-import { loadGeneratorConfig, getDatabasePaths } from '../config/loader.ts'
+import { loadGeneratorConfig, getDatabasePaths, loadTenantIdType } from '../config/loader.ts'
 
 export function register(program: Command): void {
   program
     .command('generate:models')
     .alias('g:models')
     .description('Generate model classes and enums from schema definitions')
-    .action(async () => {
+    .option('-f, --force', 'Overwrite existing generated files')
+    .action(async ({ force }: { force?: boolean }) => {
       try {
         const dbPaths = await getDatabasePaths()
         const config = await loadGeneratorConfig()
@@ -20,18 +21,25 @@ export function register(program: Command): void {
         await registry.discover(dbPaths.schemas)
         registry.validate()
 
-        const representation = registry.buildRepresentation()
+        const tenantIdType = await loadTenantIdType()
+        const representation = registry.buildRepresentation(tenantIdType)
         const generator = new ModelGenerator(registry.all(), representation, config)
-        const files = await generator.writeAll()
+        const { written, skipped } = await generator.writeAll(force)
 
-        if (files.length === 0) {
+        if (written.length === 0 && skipped.length === 0) {
           console.log(chalk.yellow('No models to generate.'))
           return
         }
 
-        console.log(chalk.green(`\nGenerated ${files.length} file(s):`))
-        for (const file of files) {
-          console.log(chalk.dim(`  ${file.path}`))
+        for (const file of written) {
+          console.log(chalk.green(`  CREATE  `) + chalk.dim(file.path))
+        }
+        for (const file of skipped) {
+          console.log(chalk.yellow(`  SKIP    `) + chalk.dim(file.path) + chalk.dim(' (already exists)'))
+        }
+
+        if (skipped.length > 0) {
+          console.log(chalk.dim(`\nSkipped ${skipped.length} existing file(s). Use --force to overwrite.`))
         }
       } catch (err) {
         console.error(chalk.red(`Error: ${err instanceof Error ? err.message : err}`))

package/src/commands/migration_compare.ts

@@ -16,7 +16,7 @@ export function register(program: Command): void {
 
         console.log(chalk.cyan('Comparing schema with database...\n'))
 
-        const desired = registry.buildRepresentation()
+        const desired = registry.buildRepresentation(database.tenantIdType)
         const actual = await introspector.introspect()
         const diff = new SchemaDiffer().diff(desired, actual)
 

package/src/commands/migration_fresh.ts

@@ -53,11 +53,11 @@ export async function freshDatabase(
 
   console.log(chalk.cyan('Generating fresh migration...'))
 
-  const desired = registry.buildRepresentation()
+  const desired = registry.buildRepresentation(db.tenantIdType)
   const actual = await introspector.introspect()
   const diff = new SchemaDiffer().diff(desired, actual)
 
-  const sql = new SqlGenerator().generate(diff)
+  const sql = new SqlGenerator(db.tenantIdType).generate(diff)
   const version = Date.now().toString()
   const tableOrder = desired.tables.map(t => t.name)
 

package/src/commands/migration_generate.ts

@@ -21,7 +21,7 @@ export function register(program: Command): void {
 
         console.log(chalk.cyan('Comparing schema with database...'))
 
-        const desired = registry.buildRepresentation()
+        const desired = registry.buildRepresentation(database.tenantIdType)
         const actual = await introspector.introspect()
         const diff = new SchemaDiffer().diff(desired, actual)
 
@@ -36,7 +36,7 @@ export function register(program: Command): void {
           return
         }
 
-        const sql = new SqlGenerator().generate(diff)
+        const sql = new SqlGenerator(database.tenantIdType).generate(diff)
         const version = Date.now().toString()
         const tableOrder = desired.tables.map(t => t.name)
 

package/src/commands/tenant_create.ts

@@ -16,7 +16,7 @@ export function register(program: Command): void {
         const { db: database } = await bootstrap()
         db = database
 
-        await ensureTenantTable(db.bypass)
+        await ensureTenantTable(db.bypass, db.tenantIdType)
         const manager = new TenantManager(db)
 
         const tenant = await manager.create({ slug: opts.slug, name: opts.name })

package/src/commands/tenant_delete.ts

@@ -16,7 +16,7 @@ export function register(program: Command): void {
         const { db: database } = await bootstrap()
         db = database
 
-        await ensureTenantTable(db.bypass)
+        await ensureTenantTable(db.bypass, db.tenantIdType)
         const manager = new TenantManager(db)
 
         const tenant = await manager.find(id)

package/src/commands/tenant_list.ts

@@ -14,7 +14,7 @@ export function register(program: Command): void {
         const { db: database } = await bootstrap()
         db = database
 
-        await ensureTenantTable(db.bypass)
+        await ensureTenantTable(db.bypass, db.tenantIdType)
         const manager = new TenantManager(db)
         const tenants = await manager.list()
 

package/src/config/loader.ts

@@ -1,6 +1,10 @@
 import { join } from 'node:path'
 import type { GeneratorConfig, GeneratorPaths } from '../generators/config.ts'
 import { resolvePaths } from '../generators/config.ts'
+import {
+  type TenantIdType,
+  DEFAULT_TENANT_ID_TYPE,
+} from '@strav/database/database/tenant/id_type'
 
 /**
  * Load the generator configuration from the project's config/generators.ts file.
@@ -30,3 +34,17 @@ export async function getAllPaths(): Promise<GeneratorPaths> {
   const config = await loadGeneratorConfig()
   return resolvePaths(config)
 }
+
+/**
+ * Read `database.tenant.idType` from `config/database.ts` for code-only
+ * generators (generate:models, generate:api) that don't connect to the DB.
+ * Falls back to the framework default if the config file or key is absent.
+ */
+export async function loadTenantIdType(): Promise<TenantIdType> {
+  try {
+    const dbConfig = (await import(join(process.cwd(), 'config/database.ts'))).default
+    return (dbConfig?.tenant?.idType as TenantIdType | undefined) ?? DEFAULT_TENANT_ID_TYPE
+  } catch {
+    return DEFAULT_TENANT_ID_TYPE
+  }
+}

package/src/generators/api_generator.ts

@@ -10,7 +10,7 @@ import type { FieldDefinition, FieldValidator } from '@strav/database/schema/fie
 import type { PostgreSQLCustomType } from '@strav/database/schema/postgres'
 import { toSnakeCase, toCamelCase, toPascalCase } from '@strav/kernel/helpers/strings'
 import type { GeneratedFile } from './model_generator.ts'
-import type { GeneratorConfig, GeneratorPaths } from './config.ts'
+import type { GeneratorConfig, GeneratorPaths, WriteResult } from './config.ts'
 import { resolvePaths, relativeImport, formatAndWrite } from './config.ts'
 
 // ---------------------------------------------------------------------------
@@ -208,10 +208,9 @@ export default class ApiGenerator {
   }
 
   /** Generate, format with Prettier, and write all files to disk. */
-  async writeAll(): Promise<GeneratedFile[]> {
+  async writeAll(force?: boolean): Promise<WriteResult> {
     const files = this.generate()
-    await formatAndWrite(files)
-    return files
+    return formatAndWrite(files, { force })
   }
 
   // ---------------------------------------------------------------------------

package/src/generators/config.ts

@@ -1,3 +1,4 @@
+import { existsSync } from 'node:fs'
 import { resolve, relative } from 'node:path'
 import type { GeneratedFile } from './model_generator.ts'
 
@@ -66,11 +67,22 @@ export function relativeImport(fromDir: string, toDir: string): string {
   return rel.startsWith('.') ? rel : './' + rel
 }
 
+export interface WriteResult {
+  written: GeneratedFile[]
+  skipped: GeneratedFile[]
+}
+
 /**
  * Format generated files with Prettier and write them to disk.
  * Falls back to writing unformatted content if Prettier is not installed.
+ *
+ * Skips files that already exist unless `force` is true. Returns the
+ * partition of written and skipped files so callers can report them.
  */
-export async function formatAndWrite(files: GeneratedFile[]): Promise<void> {
+export async function formatAndWrite(
+  files: GeneratedFile[],
+  options: { force?: boolean } = {}
+): Promise<WriteResult> {
   let prettier: typeof import('prettier') | null = null
   try {
     prettier = await import('prettier')
@@ -78,13 +90,24 @@ export async function formatAndWrite(files: GeneratedFile[]): Promise<void> {
     // Prettier not installed — write unformatted
   }
 
+  const written: GeneratedFile[] = []
+  const skipped: GeneratedFile[] = []
+
   for (const file of files) {
+    if (existsSync(file.path) && !options.force) {
+      skipped.push(file)
+      continue
+    }
+
     let content = file.content
     if (prettier) {
       const filePath = resolve(file.path)
-      const options = await prettier.resolveConfig(filePath)
-      content = await prettier.format(content, { ...options, filepath: filePath })
+      const prettierOpts = await prettier.resolveConfig(filePath)
+      content = await prettier.format(content, { ...prettierOpts, filepath: filePath })
     }
     await Bun.write(file.path, content)
+    written.push(file)
   }
+
+  return { written, skipped }
 }

package/src/generators/doc_generator.ts

@@ -14,8 +14,9 @@ import {
   toPascalCase,
   pluralize,
 } from '@strav/kernel/helpers/strings'
+import { existsSync } from 'node:fs'
 import type { GeneratedFile } from './model_generator.ts'
-import type { GeneratorConfig, GeneratorPaths } from './config.ts'
+import type { GeneratorConfig, GeneratorPaths, WriteResult } from './config.ts'
 import { resolvePaths } from './config.ts'
 import { ApiRouting, toRouteSegment, toChildSegment } from './route_generator.ts'
 import type { ApiRoutingConfig } from './route_generator.ts'
@@ -91,12 +92,21 @@ export default class DocGenerator {
     return [this.generateIndexPage()]
   }
 
-  async writeAll(): Promise<GeneratedFile[]> {
+  async writeAll(force?: boolean): Promise<WriteResult> {
     const files = this.generate()
+    const written: GeneratedFile[] = []
+    const skipped: GeneratedFile[] = []
+
     for (const file of files) {
+      if (existsSync(file.path) && !force) {
+        skipped.push(file)
+        continue
+      }
       await Bun.write(file.path, file.content)
+      written.push(file)
     }
-    return files
+
+    return { written, skipped }
   }
 
   // ---------------------------------------------------------------------------

package/src/generators/model_generator.ts

@@ -9,7 +9,7 @@ import type {
 } from '@strav/database/schema/database_representation'
 import type { PostgreSQLCustomType } from '@strav/database/schema/postgres'
 import { toSnakeCase, toCamelCase, toPascalCase } from '@strav/kernel/helpers/strings'
-import type { GeneratorConfig, GeneratorPaths } from './config.ts'
+import type { GeneratorConfig, GeneratorPaths, WriteResult } from './config.ts'
 import { resolvePaths, relativeImport, formatAndWrite } from './config.ts'
 
 export interface GeneratedFile {
@@ -54,10 +54,9 @@ export default class ModelGenerator {
   }
 
   /** Generate, format with Prettier, and write all files to disk. */
-  async writeAll(): Promise<GeneratedFile[]> {
+  async writeAll(force?: boolean): Promise<WriteResult> {
     const files = this.generate()
-    await formatAndWrite(files)
-    return files
+    return formatAndWrite(files, { force })
   }
 
   // ---------------------------------------------------------------------------

package/src/generators/route_generator.ts

@@ -3,7 +3,7 @@ import { Archetype } from '@strav/database/schema/types'
 import type { SchemaDefinition } from '@strav/database/schema/types'
 import { toSnakeCase, toPascalCase, pluralize } from '@strav/kernel/helpers/strings'
 import type { GeneratedFile } from './model_generator.ts'
-import type { GeneratorConfig, GeneratorPaths } from './config.ts'
+import type { GeneratorConfig, GeneratorPaths, WriteResult } from './config.ts'
 import { resolvePaths, relativeImport, formatAndWrite } from './config.ts'
 
 /** Archetypes that sit under a parent's /:parentId group. */
@@ -66,10 +66,9 @@ export default class RouteGenerator {
   }
 
   /** Generate, format with Prettier, and write the route file to disk. */
-  async writeAll(): Promise<GeneratedFile[]> {
+  async writeAll(force?: boolean): Promise<WriteResult> {
     const files = this.generate()
-    await formatAndWrite(files)
-    return files
+    return formatAndWrite(files, { force })
   }
 
   // ---------------------------------------------------------------------------

package/src/generators/test_generator.ts

@@ -13,7 +13,7 @@ import {
   pluralize,
 } from '@strav/kernel/helpers/strings'
 import type { GeneratedFile } from './model_generator.ts'
-import type { GeneratorConfig, GeneratorPaths } from './config.ts'
+import type { GeneratorConfig, GeneratorPaths, WriteResult } from './config.ts'
 import { resolvePaths, relativeImport, formatAndWrite } from './config.ts'
 import { ApiRouting, toRouteSegment, toChildSegment } from './route_generator.ts'
 import type { ApiRoutingConfig } from './route_generator.ts'
@@ -82,10 +82,9 @@ export default class TestGenerator {
     return files
   }
 
-  async writeAll(): Promise<GeneratedFile[]> {
+  async writeAll(force?: boolean): Promise<WriteResult> {
     const files = this.generate()
-    await formatAndWrite(files)
-    return files
+    return formatAndWrite(files, { force })
   }
 
   // ---------------------------------------------------------------------------