nexusql 0.6.2 → 0.8.0

package/README.md

@@ -60,16 +60,16 @@ nexusql migrate
 
 ## Commands
 
-| Command | Description |
-|---------|-------------|
-| `nexusql init` | Initialize configuration and directories |
-| `nexusql gen` | Generate migration SQL from DBML schema |
-| `nexusql migrate` | Interactive: generate → create file → apply |
-| `nexusql up` | Apply all pending migrations |
-| `nexusql down` | Rollback applied migrations |
-| `nexusql status` | Show migration status |
-| `nexusql types` | Generate TypeScript definitions |
-| `nexusql mark-applied <version>` | Mark migration as applied without running |
+| Command                          | Description                                 |
+| -------------------------------- | ------------------------------------------- |
+| `nexusql init`                   | Initialize configuration and directories    |
+| `nexusql gen`                    | Generate migration SQL from DBML schema     |
+| `nexusql migrate`                | Interactive: generate → create file → apply |
+| `nexusql up`                     | Apply all pending migrations                |
+| `nexusql down`                   | Rollback applied migrations                 |
+| `nexusql status`                 | Show migration status                       |
+| `nexusql types`                  | Generate TypeScript definitions             |
+| `nexusql mark-applied <version>` | Mark migration as applied without running   |
 
 ### `nexusql gen`
 
@@ -79,6 +79,7 @@ Generate migration SQL by diffing your current database against the DBML schema.
 nexusql gen                    # Output to stdout
 nexusql gen -o migration.sql   # Write to file
 nexusql gen -v                 # Verbose output
+nexusql gen -v                 # Verbose output
 ```
 
 ### `nexusql types`
@@ -142,19 +143,23 @@ nexusql mark-applied 20240101120000
 Create `nexusql.config.js` in your project root:
 
 ```js
-export default {
+module.exports = {
   // Path to DBML schema file
-  schema: './schema.dbml',
+  dbmlFile: "./schema.dbml",
 
   // Migration files directory
-  migrations: './db/migrations',
+  migrations: "./db/migrations",
 
   // PostgreSQL extensions to install in temp database
-  extensions: ['uuid-ossp', 'vector'],
+  extensions: ["uuid-ossp", "vector"],
+
+  // Restrict to specific PostgreSQL schemas (optional, default: ['public'])
+  // targetDbSchemas: ['public'],
 };
 ```
 
 Environment variables:
+
 - `DATABASE_URL` - PostgreSQL connection string
 
 ## Migration Format

package/dist/cli.js

@@ -3155,6 +3155,12 @@ var Database = class _Database {
    * Drop a database if it exists.
    */
   async dropDatabase(name) {
+    await this.exec(`
+      SELECT pg_terminate_backend(pg_stat_activity.pid)
+      FROM pg_stat_activity
+      WHERE pg_stat_activity.datname = '${name}'
+        AND pid <> pg_backend_pid();
+    `);
     await this.exec(`DROP DATABASE IF EXISTS "${name}";`);
   }
   /**
@@ -3224,6 +3230,11 @@ function runMigra(fromUrl, toUrl, options = {}) {
   if (options.unsafe) {
     args.push("--unsafe");
   }
+  if (options.schemas?.length) {
+    for (const schema of options.schemas) {
+      args.push("--schema", schema);
+    }
+  }
   try {
     const output = execFileSync("migra", args, {
       encoding: "utf-8",
@@ -3251,9 +3262,10 @@ import { join } from "path";
 import { pathToFileURL } from "url";
 import { config as loadDotenv } from "dotenv";
 var DEFAULT_CONFIG = {
-  schema: "./schema.dbml",
+  dbmlFile: "./schema.dbml",
   migrations: "./db/migrations",
-  extensions: ["uuid-ossp"]
+  extensions: ["uuid-ossp"],
+  targetDbSchemas: ["public"]
 };
 async function loadConfig(cwd = process.cwd()) {
   loadDotenv();
@@ -3267,30 +3279,42 @@ async function loadConfig(cwd = process.cwd()) {
     } catch {
     }
   }
-  return {
+  const finalConfig = {
     ...DEFAULT_CONFIG,
     ...userConfig,
     databaseUrl: process.env.DATABASE_URL || userConfig.databaseUrl
   };
+  if (userConfig.schema && !userConfig.dbmlFile) {
+    console.warn(
+      "Warning: 'schema' config option is deprecated. Use 'dbmlFile' instead."
+    );
+    finalConfig.dbmlFile = userConfig.schema;
+  }
+  return finalConfig;
 }
 function getDatabaseUrl(config) {
   const url = config.databaseUrl || process.env.DATABASE_URL;
   if (!url) {
-    throw new Error("DATABASE_URL not set. Set it in .env or nexusql.config.js");
+    throw new Error(
+      "DATABASE_URL not set. Set it in .env or nexusql.config.js"
+    );
   }
   return url;
 }
 function generateConfigTemplate() {
   return `/** @type {import('nexusql').NexusqlConfig} */
-export default {
+module.exports = {
   // Path to your DBML schema file
-  schema: './schema.dbml',
+  dbmlFile: './schema.dbml',
 
   // Directory for migration files
   migrations: './db/migrations',
 
   // PostgreSQL extensions to install in temp database
   extensions: ['uuid-ossp'],
+
+  // Restrict to specific PostgreSQL schemas (optional, default: ['public'])
+  // targetDbSchemas: ['public'],
 };
 `;
 }
@@ -3323,7 +3347,7 @@ async function gen(options = {}) {
   const db = new Database(databaseUrl);
   const spinner = ora();
   spinner.start("Reading DBML schema...");
-  const schemaPath = resolve(config.schema);
+  const schemaPath = resolve(config.dbmlFile);
   let dbmlContent;
   try {
     dbmlContent = readFileSync(schemaPath, "utf-8");
@@ -3359,10 +3383,17 @@ async function gen(options = {}) {
 Tables in temp database: ${tables.join(", ")}`));
     }
     spinner.start("Generating migration diff...");
+    const targetDbSchemas = config.targetDbSchemas;
+    if (targetDbSchemas?.length) {
+      console.log(
+        source_default.dim(`
+Restricting to schemas: ${targetDbSchemas.join(", ")}`)
+      );
+    }
     const migraResult = runMigra(
       db.getConnectionUrl(),
       tempDb.getConnectionUrl(),
-      { unsafe: true }
+      { unsafe: true, schemas: targetDbSchemas }
     );
     migrationSql = filterSchemaMigrations(migraResult.sql);
     if (migraResult.hasChanges) {
@@ -3371,7 +3402,8 @@ Tables in temp database: ${tables.join(", ")}`));
       spinner.info("No schema changes detected");
     }
     spinner.start("Checking comment changes...");
-    const commentSql = await getCommentChanges(db, tempDb);
+    spinner.start("Checking comment changes...");
+    const commentSql = await getCommentChanges(db, tempDb, targetDbSchemas);
     if (commentSql) {
       migrationSql = migrationSql ? `${migrationSql}
 
@@ -3385,8 +3417,8 @@ ${commentSql}`;
     try {
       await db.dropDatabase(tempDbName);
       spinner.succeed("Cleaned up temp database");
-    } catch {
-      spinner.warn("Failed to cleanup temp database");
+    } catch (error) {
+      spinner.warn(`Failed to cleanup temp database: ${error}`);
     }
   }
   const finalSql = migrationSql || "-- No changes detected";
@@ -3400,7 +3432,8 @@ Migration SQL written to: ${options.output}`));
   }
   return finalSql;
 }
-async function getCommentChanges(currentDb, targetDb) {
+async function getCommentChanges(currentDb, targetDb, schemas) {
+  const schemaFilter = schemas && schemas.length > 0 ? `AND c.table_schema IN (${schemas.map((s) => `'${s}'`).join(", ")})` : "";
   const commentQuery = `
     SELECT
       format('COMMENT ON COLUMN %I.%I IS %L;',
@@ -3415,8 +3448,8 @@ async function getCommentChanges(currentDb, targetDb) {
     JOIN pg_catalog.pg_class pc ON pc.relname = c.table_name
     JOIN pg_catalog.pg_namespace pn ON pn.oid = pc.relnamespace AND pn.nspname = c.table_schema
     LEFT JOIN pg_catalog.pg_description pgd ON pgd.objoid = pc.oid AND pgd.objsubid = c.ordinal_position
-    WHERE c.table_schema = 'public'
-      AND c.table_name != 'schema_migrations'
+    WHERE c.table_name != 'schema_migrations'
+      ${schemaFilter}
     ORDER BY c.table_name, c.ordinal_position;
   `;
   const [currentComments, targetComments] = await Promise.all([
@@ -4074,7 +4107,7 @@ async function types(options = {}) {
   const config = await loadConfig();
   const spinner = ora("Generating TypeScript definitions...").start();
   try {
-    const schemaPath = resolve2(config.schema);
+    const schemaPath = resolve2(config.dbmlFile);
     const dbmlContent = readFileSync3(schemaPath, "utf-8");
     const tsContent = generateTypes(dbmlContent);
     const outputPath = options.output || "src/types/schema.d.ts";
@@ -4156,7 +4189,10 @@ program.command("mark-applied <version>").description("Mark a migration as appli
     process.exit(1);
   }
 });
-program.command("types").description("Generate TypeScript definitions from DBML").option("-o, --output <file>", "Output file path (default: src/types/schema.d.ts)").action(async (options) => {
+program.command("types").description("Generate TypeScript definitions from DBML").option(
+  "-o, --output <file>",
+  "Output file path (default: src/types/schema.d.ts)"
+).action(async (options) => {
   try {
     await types(options);
   } catch (error) {