@lssm/app.cli-database 1.11.1 → 1.41.1

package/dist/cli.mjs

@@ -4,6 +4,8 @@ import { runCheck } from "./commands/check.mjs";
 import { runGenerate } from "./commands/generate.mjs";
 import { runMigrate } from "./commands/migrate.mjs";
 import { runSeed } from "./commands/seed.mjs";
+import { runSchemaGenerate } from "./commands/schema-generate.mjs";
+import { runSchemaCompose } from "./commands/schema-compose.mjs";
 import mri from "minimist";
 
 //#region src/cli.ts
@@ -28,11 +30,48 @@ async function main() {
 		case "seed":
 			await runSeed(argv);
 			break;
+		case "schema:generate":
+			await runSchemaGenerate(argv);
+			break;
+		case "schema:compose":
+			await runSchemaCompose(argv);
+			break;
 		default:
-			console.error("Usage: database <import|check|generate|migrate:dev|migrate:deploy|migrate:status|seed>");
+			printUsage();
 			process.exit(1);
 	}
 }
+function printUsage() {
+	console.log(`
+Usage: database <command> [options]
+
+Commands:
+  import              Import schema from external sources
+  check               Check Prisma schema validity
+  generate            Generate Prisma client
+  migrate:dev         Run migrations in development
+  migrate:deploy      Deploy migrations to production
+  migrate:status      Check migration status
+  seed                Seed the database
+
+Schema Generation (spec-first):
+  schema:generate     Generate Prisma schema from entity specs
+                      --config <path>   Schema config file (default: ./schema.config.ts)
+                      --output <path>   Output path (default: ./prisma/schema/generated.prisma)
+                      --module <id>     Generate only a specific module
+
+  schema:compose      Compose multiple module schemas
+                      --config <path>   Schema config file (default: ./schema.config.ts)
+                      --output <path>   Output path (default: ./prisma/schema/composed.prisma)
+                      --modules <list>  Comma-separated module IDs to include
+
+Examples:
+  database schema:generate --config ./schema.config.ts
+  database schema:compose --modules "@lssm/lib.identity-rbac,@lssm/module.audit-trail"
+  database generate
+  database migrate:dev --name add_users_table
+`);
+}
 main().catch((err) => {
 	console.error(err);
 	process.exit(1);

package/dist/commands/schema-compose.mjs

@@ -0,0 +1,76 @@
+import { loadSchemaConfig } from "../lib/schema-config.mjs";
+import fs from "node:fs";
+import path from "node:path";
+
+//#region src/commands/schema-compose.ts
+/**
+* Compose multiple module schemas into a single Prisma schema.
+*
+* Usage:
+*   database schema:compose --config ./schema.config.ts
+*   database schema:compose --modules "@lssm/lib.identity-rbac,@lssm/module.audit-trail"
+*/
+async function runSchemaCompose(argv) {
+	console.log("🔗 Composing module schemas...\n");
+	const configPath = argv.config ?? "./schema.config.ts";
+	const config = await loadSchemaConfig(configPath);
+	if (!config) {
+		console.error(`❌ Could not load schema config from ${configPath}`);
+		process.exit(1);
+	}
+	let modules = config.modules;
+	if (argv.modules) {
+		const moduleIds = argv.modules.split(",").map((m) => m.trim());
+		modules = config.modules.filter((m) => moduleIds.includes(m.moduleId));
+	}
+	if (modules.length === 0) {
+		console.error("❌ No modules found to compose");
+		process.exit(1);
+	}
+	console.log(`📦 Composing ${modules.length} module(s):`);
+	modules.forEach((m) => {
+		console.log(`   - ${m.moduleId}`);
+		m.entities.forEach((e) => {
+			console.log(`     • ${e.name} (${Object.keys(e.fields).length} fields)`);
+		});
+	});
+	console.log("");
+	const allEnums = /* @__PURE__ */ new Set();
+	modules.forEach((m) => {
+		m.enums?.forEach((e) => allEnums.add(e.name));
+		m.entities.forEach((entity) => {
+			entity.enums?.forEach((e) => allEnums.add(e.name));
+		});
+	});
+	if (allEnums.size > 0) {
+		console.log(`📋 Enums discovered: ${Array.from(allEnums).join(", ")}`);
+		console.log("");
+	}
+	const { composeModuleSchemas } = await import("@lssm/lib.schema");
+	const prismaSchema = composeModuleSchemas(modules, {
+		provider: config.provider ?? "postgresql",
+		clientOutput: config.clientOutput,
+		includePothos: config.includePothos ?? true,
+		pothosOutput: config.pothosOutput
+	});
+	const outputPath = argv.output ?? config.outputPath ?? "./prisma/schema/composed.prisma";
+	const outputDir = path.dirname(outputPath);
+	if (!fs.existsSync(outputDir)) fs.mkdirSync(outputDir, { recursive: true });
+	fs.writeFileSync(outputPath, prismaSchema, "utf-8");
+	const entityCount = modules.reduce((acc, m) => acc + m.entities.length, 0);
+	const fieldCount = modules.reduce((acc, m) => acc + m.entities.reduce((eAcc, e) => eAcc + Object.keys(e.fields).length, 0), 0);
+	console.log("✅ Schema composition complete!");
+	console.log("");
+	console.log(`   📄 Output: ${outputPath}`);
+	console.log(`   📦 Modules: ${modules.length}`);
+	console.log(`   🏗️  Entities: ${entityCount}`);
+	console.log(`   📝 Fields: ${fieldCount}`);
+	console.log(`   📋 Enums: ${allEnums.size}`);
+	console.log("");
+	console.log("Next steps:");
+	console.log("  1. Run: database generate");
+	console.log("  2. Run: database migrate:dev --name <migration-name>");
+}
+
+//#endregion
+export { runSchemaCompose };

package/dist/commands/schema-generate.mjs

@@ -0,0 +1,51 @@
+import { loadSchemaConfig } from "../lib/schema-config.mjs";
+import fs from "node:fs";
+import path from "node:path";
+
+//#region src/commands/schema-generate.ts
+/**
+* Generate Prisma schema from ContractSpec entity definitions.
+*
+* Usage:
+*   database schema:generate --config ./schema.config.ts --output ./prisma/schema
+*   database schema:generate --module @lssm/lib.identity-rbac
+*/
+async function runSchemaGenerate(argv) {
+	console.log("📝 Generating Prisma schema from entity specs...\n");
+	const configPath = argv.config ?? "./schema.config.ts";
+	const config = await loadSchemaConfig(configPath);
+	if (!config) {
+		console.error(`❌ Could not load schema config from ${configPath}`);
+		process.exit(1);
+	}
+	const modules = argv.module ? config.modules.filter((m) => m.moduleId === argv.module) : config.modules;
+	if (modules.length === 0) {
+		console.error("❌ No modules found to generate");
+		process.exit(1);
+	}
+	console.log(`📦 Processing ${modules.length} module(s):`);
+	modules.forEach((m) => {
+		console.log(`   - ${m.moduleId} (${m.entities.length} entities)`);
+	});
+	console.log("");
+	const { composeModuleSchemas } = await import("@lssm/lib.schema");
+	const prismaSchema = composeModuleSchemas(modules, {
+		provider: config.provider ?? "postgresql",
+		clientOutput: config.clientOutput,
+		includePothos: config.includePothos ?? true,
+		pothosOutput: config.pothosOutput
+	});
+	const outputPath = argv.output ?? config.outputPath ?? "./prisma/schema/generated.prisma";
+	const outputDir = path.dirname(outputPath);
+	if (!fs.existsSync(outputDir)) fs.mkdirSync(outputDir, { recursive: true });
+	fs.writeFileSync(outputPath, prismaSchema, "utf-8");
+	console.log(`✅ Generated Prisma schema: ${outputPath}`);
+	console.log("");
+	console.log("Next steps:");
+	console.log("  1. Review the generated schema");
+	console.log("  2. Run: database generate");
+	console.log("  3. Run: database migrate:dev");
+}
+
+//#endregion
+export { runSchemaGenerate };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { createPrismaClientFromEnv, getSingletonClient } from "./lib/client.mjs";
+import { defineSchemaConfig, loadSchemaConfig } from "./lib/schema-config.mjs";
 import { defineMergedPrismaConfig } from "./lib/config.mjs";
 
-export { createPrismaClientFromEnv, defineMergedPrismaConfig, getSingletonClient };
+export { defineMergedPrismaConfig, defineSchemaConfig, loadSchemaConfig };

package/dist/lib/schema-config.mjs

@@ -0,0 +1,22 @@
+//#region src/lib/schema-config.ts
+/**
+* Define a schema configuration.
+*/
+function defineSchemaConfig(config) {
+	return config;
+}
+/**
+* Load schema configuration from a file.
+*/
+async function loadSchemaConfig(configPath) {
+	try {
+		const module = await (configPath.startsWith("/") ? import(configPath) : import(`${process.cwd()}/${configPath}`));
+		return module.default ?? module.config ?? module;
+	} catch (error) {
+		console.error(`Failed to load schema config from ${configPath}:`, error);
+		return null;
+	}
+}
+
+//#endregion
+export { defineSchemaConfig, loadSchemaConfig };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lssm/app.cli-database",
-  "version": "1.11.1",
+  "version": "1.41.1",
   "type": "module",
   "bin": {
     "database": "dist/cli.js"
@@ -8,28 +8,34 @@
   "scripts": {
     "clean": "rm -rf dist",
     "publish:pkg": "bun publish --tolerate-republish --ignore-scripts --verbose",
+    "publish:pkg:canary": "bun publish:pkg --tag canary",
     "build": "tsdown",
     "dev": "bun run build --watch",
     "lint": "bun run lint:fix",
     "lint:fix": "eslint src --fix",
     "lint:check": "eslint src",
-    "prisma:import": "bun database import",
-    "prisma:check": "bun database check",
-    "dbs:generate": "bun database generate",
-    "dbs:migrate": "bun database migrate:dev",
-    "dbs:deploy": "bun database migrate:deploy",
-    "dbs:status": "bun database migrate:status",
-    "dbs:seed": "bun database seed"
+    "prisma:import": "database import",
+    "prisma:check": "database check",
+    "dbs:generate": "database generate",
+    "dbs:migrate": "database migrate:dev",
+    "dbs:deploy": "database migrate:deploy",
+    "dbs:status": "database migrate:status",
+    "dbs:seed": "database seed",
+    "schema:generate": "database schema:generate",
+    "schema:compose": "database schema:compose"
   },
   "dependencies": {
-    "@prisma/adapter-pg": "^7.0.1",
-    "@prisma/client": "^7.0.1",
-    "prisma": "^7.0.1",
-    "minimist": "^1.2.8"
+    "@lssm/lib.schema": "1.41.1",
+    "@prisma/adapter-pg": "^7.1.0",
+    "@prisma/client": "^7.1.0",
+    "prisma": "^7.1.0",
+    "minimist": "^1.2.8",
+    "execa": "^9.6.1"
   },
   "devDependencies": {
-    "@lssm/tool.tsdown": "0.12.1",
-    "tsdown": "^0.16.6"
+    "@lssm/tool.tsdown": "1.41.1",
+    "@types/minimist": "^1.2.5",
+    "tsdown": "^0.17.4"
   },
   "main": "./dist/index.mjs",
   "module": "./dist/index.mjs",
@@ -39,11 +45,16 @@
     "README.md"
   ],
   "exports": {
-    ".": "./dist/index.mjs",
-    "./cli": "./dist/cli.mjs",
+    ".": "./src/index.ts",
+    "./cli": "./src/cli.ts",
     "./*": "./*"
   },
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "exports": {
+      ".": "./dist/index.mjs",
+      "./cli": "./dist/cli.mjs",
+      "./*": "./*"
+    }
   }
 }

package/dist/cli.d.mts

@@ -1 +0,0 @@
-export { };

package/dist/index.d.mts

@@ -1,4 +0,0 @@
-import { createPrismaClientFromEnv, getSingletonClient } from "./lib/client.mjs";
-import { ImportLock, ImportLockEntry } from "./lib/types.mjs";
-import { MergedPrismaConfig, defineMergedPrismaConfig } from "./lib/config.mjs";
-export { ImportLock, ImportLockEntry, MergedPrismaConfig, createPrismaClientFromEnv, defineMergedPrismaConfig, getSingletonClient };

package/dist/lib/client.d.mts

@@ -1,7 +0,0 @@
-import { PrismaClient } from "@prisma/client";
-
-//#region src/lib/client.d.ts
-declare function createPrismaClientFromEnv(envVar: string, fallback?: string): PrismaClient;
-declare function getSingletonClient(envVar?: string): PrismaClient;
-//#endregion
-export { createPrismaClientFromEnv, getSingletonClient };

package/dist/lib/client.mjs

@@ -1,17 +0,0 @@
-import { PrismaClient } from "@prisma/client";
-import { PrismaPg } from "@prisma/adapter-pg";
-
-//#region src/lib/client.ts
-const g = global;
-function createPrismaClientFromEnv(envVar, fallback) {
-	const raw = process.env[envVar] || (fallback ? process.env[fallback] : void 0);
-	if (!raw) throw new Error(`Missing database URL env: ${envVar}${fallback ? ` (or ${fallback})` : ""}`);
-	return new PrismaClient({ adapter: new PrismaPg({ connectionString: `${raw}`.replaceAll("sslmode=require", "sslmode=disable") }) });
-}
-function getSingletonClient(envVar = "DATABASE_URL") {
-	if (!g.__lssm_db) g.__lssm_db = createPrismaClientFromEnv(envVar);
-	return g.__lssm_db;
-}
-
-//#endregion
-export { createPrismaClientFromEnv, getSingletonClient };

package/dist/lib/config.d.mts

@@ -1,7 +0,0 @@
-//#region src/lib/config.d.ts
-interface MergedPrismaConfig {
-  modules: string[];
-}
-declare function defineMergedPrismaConfig(config: MergedPrismaConfig): MergedPrismaConfig;
-//#endregion
-export { MergedPrismaConfig, defineMergedPrismaConfig };

package/dist/lib/types.d.mts

@@ -1,13 +0,0 @@
-//#region src/lib/types.d.ts
-interface ImportLockEntry {
-  moduleName: string;
-  version: string;
-  sourcePath: string;
-  sha256: string;
-}
-interface ImportLock {
-  updatedAt: string;
-  entries: ImportLockEntry[];
-}
-//#endregion
-export { ImportLock, ImportLockEntry };