@strav/cli 0.4.2 → 0.4.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strav/cli",
-  "version": "0.4.2",
+  "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.2",
-    "@strav/http": "0.4.2",
-    "@strav/database": "0.4.2",
-    "@strav/queue": "0.4.2",
-    "@strav/signal": "0.4.2"
+    "@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
@@ -30,7 +30,8 @@ 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()

package/src/commands/generate_models.ts

@@ -2,7 +2,7 @@ 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
@@ -21,7 +21,8 @@ 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 { written, skipped } = await generator.writeAll(force)
 

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
+  }
+}