@dbsp/cli 1.1.11 → 2.0.1

package/dist/index.js

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 import {
   createDbConnection,
-  generateSchemaFile,
+  generateSchemaFileWithDiagnostics,
   redactDbUrl
-} from "./chunk-H2K46TNM.js";
+} from "./chunk-VUNVYYOZ.js";
 import {
   loadSchema,
   loadSchemaFromCwd
-} from "./chunk-AQC34IO5.js";
+} from "./chunk-EO3GHEFW.js";
 import {
   config,
   validateIdentifier
@@ -29,6 +29,14 @@ var generateCommand = new Command("generate").description("Generate code from sc
 ).action(
   async (target, options) => {
     try {
+      if (target === "manifest" || target === "kysely") {
+        throw new Error(
+          `Target '${target}' has been removed. Use 'ddl' for SQL generation, or the 'introspect' command to generate a schema file.`
+        );
+      }
+      if (target !== "ddl") {
+        throw new Error(`Unknown target: ${target}. Available targets: ddl`);
+      }
       let schema;
       let schemaPath;
       if (options.schema) {
@@ -51,9 +59,9 @@ var generateCommand = new Command("generate").description("Generate code from sc
       }
       switch (target) {
         case "ddl": {
-          const casing = options.casing ?? "snake";
+          const dbCasing = mapGenerateCasingOption(options.casing) ?? schema.dbCasing ?? "snake_case";
+          const casingLabel = formatGenerateCasingLabel(dbCasing);
           const { createPgsqlCompileOnlyAdapter } = await import("@dbsp/adapter-pgsql");
-          const dbCasing = casing === "snake" ? "snake_case" : "preserve";
           const adapter = createPgsqlCompileOnlyAdapter({
             dbCasing,
             ...options.schemaName ? { schemaName: options.schemaName } : {}
@@ -73,7 +81,7 @@ var generateCommand = new Command("generate").description("Generate code from sc
               console.log(`\u2705 Generated DDL: ${outPath}`);
               console.log(`   Tables: ${schema.tableNames.length}`);
               console.log(`   Statements: ${ddlStatements.length}`);
-              console.log(`   Casing: ${casing}`);
+              console.log(`   Casing: ${casingLabel}`);
               if (options.drop) {
                 console.log(`   Includes DROP statements`);
               }
@@ -86,15 +94,6 @@ var generateCommand = new Command("generate").description("Generate code from sc
           }
           break;
         }
-        case "manifest":
-        case "kysely":
-          throw new Error(
-            `Target '${target}' has been removed in ARCH-005. These generators required the legacy defineSchema() format. Use 'ddl' target for SQL generation.`
-          );
-        default:
-          throw new Error(
-            `Unknown target: ${target}. Available targets: ddl`
-          );
       }
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
@@ -103,11 +102,48 @@ var generateCommand = new Command("generate").description("Generate code from sc
     }
   }
 );
+function mapGenerateCasingOption(casing) {
+  switch (casing) {
+    case "snake":
+      return "snake_case";
+    case "camel":
+      return "camelCase";
+    case "none":
+      return "preserve";
+    default:
+      return void 0;
+  }
+}
+function formatGenerateCasingLabel(dbCasing) {
+  switch (dbCasing) {
+    case "snake_case":
+      return "snake";
+    case "camelCase":
+      return "camel";
+    case "preserve":
+      return "none";
+  }
+}
 
 // src/commands/introspect.ts
 import { mkdirSync as mkdirSync2, writeFileSync as writeFileSync2 } from "fs";
 import { dirname as dirname2, resolve as resolve2 } from "path";
 import { Command as Command2 } from "commander";
+function uniqueWarnings(warnings) {
+  const seen = /* @__PURE__ */ new Set();
+  const unique = [];
+  for (const warning of warnings) {
+    if (seen.has(warning)) continue;
+    seen.add(warning);
+    unique.push(warning);
+  }
+  return unique;
+}
+function reportWarnings(warnings) {
+  for (const warning of warnings) {
+    console.log(`   \u26A0\uFE0F  ${warning}`);
+  }
+}
 var introspectCommand = new Command2("introspect").description("Generate schema.ts from database introspection").requiredOption("-d, --db <url>", "Database connection URL (required)").option("-o, --out <file>", "Output schema file", "./dbsp.schema.ts").option("--schema-name <name>", "Database schema name", "public").option(
   "--exclude <patterns>",
   "Tables to exclude (comma-separated glob patterns)",
@@ -128,10 +164,10 @@ var introspectCommand = new Command2("introspect").description("Generate schema.
     try {
       const { pool } = await createDbConnection(options.db);
       try {
-        const { introspect: introspect4 } = await import("@dbsp/adapter-pgsql");
+        const { introspect } = await import("@dbsp/adapter-pgsql");
         const excludePatterns = options.exclude ? options.exclude.split(",").map((s) => s.trim()) : void 0;
         const includePatterns = options.include ? options.include.split(",").map((s) => s.trim()) : void 0;
-        const model = await introspect4(pool, {
+        const model = await introspect(pool, {
           schema: options.schemaName,
           ...excludePatterns ? { exclude: excludePatterns } : {},
           ...includePatterns ? { include: includePatterns } : {}
@@ -142,23 +178,24 @@ var introspectCommand = new Command2("introspect").description("Generate schema.
         console.log(
           `\u{1F4CA} Found ${tableCount} tables, ${relationCount} relations, ${hierarchyCount} hierarchies`
         );
-        if (model.warnings?.length) {
-          for (const w of model.warnings) {
-            console.log(`   \u26A0\uFE0F  ${w}`);
-          }
-        }
-        console.log("");
         const codegenOptions = {
           sourceUrl: options.db,
           includeDbTypeComments: options.dbTypeComments,
-          warnings: model.warnings,
           introspectedAt: model.introspectedAt,
           dbCasing: options.dbCasing
         };
-        const schemaCode = generateSchemaFile(model, codegenOptions);
+        const generated = generateSchemaFileWithDiagnostics(
+          model,
+          codegenOptions
+        );
+        const warnings = uniqueWarnings(generated.warnings);
+        if (warnings.length > 0) {
+          reportWarnings(warnings);
+        }
+        console.log("");
         const outPath = resolve2(process.cwd(), options.out);
         mkdirSync2(dirname2(outPath), { recursive: true });
-        writeFileSync2(outPath, schemaCode, "utf-8");
+        writeFileSync2(outPath, generated.code, "utf-8");
         console.log(`\u2705 Generated schema: ${outPath}`);
         console.log(`   Tables: ${tableCount}`);
         console.log(`   Relations: ${relationCount}`);
@@ -175,13 +212,13 @@ var introspectCommand = new Command2("introspect").description("Generate schema.
 
 // src/commands/migrate.ts
 import {
-  compareSchemata,
+  comparePgsqlDatabaseSchema,
+  createPgsqlAdapter,
   ensureMigrationsTable,
   generateMigrationFile,
   generateMigrationSQL,
   getAppliedMigrations,
   getNextSchemaVersion,
-  introspect,
   isDestructiveDown,
   parseMigrationFile,
   recordMigration,
@@ -318,10 +355,12 @@ var devCommand = new Command3("dev").description("Generate a migration from sche
     const loaded = await loadSchema(schemaPath);
     const schemaModel = loaded.model;
     await withMigratePool(options.db, async (pool) => {
-      const dbModel = await introspect(pool, {
-        ...options.schemaName ? { schema: options.schemaName } : {}
+      const adapter = createPgsqlAdapter(pool);
+      const diff = await comparePgsqlDatabaseSchema(adapter, schemaModel, {
+        ...options.schemaName ? { schema: options.schemaName } : {},
+        ...loaded.dbCasing ? { dbCasing: loaded.dbCasing } : {},
+        onWarning: (message) => console.warn(`\u26A0\uFE0F  ${message}`)
       });
-      const diff = compareSchemata(schemaModel, dbModel);
       if (diff.changes.length === 0) {
         console.log("\u2705 No changes detected \u2014 database matches schema.");
         return;
@@ -640,10 +679,11 @@ var migrateCommand = new Command3("migrate").description("Database migration man
 
 // src/commands/push.ts
 import {
-  compareSchemata as compareSchemata2,
+  comparePgsqlDatabaseSchema as comparePgsqlDatabaseSchema2,
+  createPgsqlAdapter as createPgsqlAdapter2,
   generateDDL,
   generateMigrationSQL as generateMigrationSQL2,
-  introspect as introspect2
+  getNamingPluginForDbCasing
 } from "@dbsp/adapter-pgsql";
 import { Command as Command4 } from "commander";
 
@@ -706,16 +746,10 @@ var pushCommand = new Command4("push").description("Push schema to database (add
         if (options.drop) {
           const statements = generateDDL(schemaModel, {
             includeDropStatements: true,
-            ...options.schemaName ? { schemaName: options.schemaName } : {}
+            ...options.schemaName ? { schemaName: options.schemaName } : {},
+            ...loaded.dbCasing !== void 0 ? { naming: getNamingPluginForDbCasing(loaded.dbCasing) } : {}
           });
-          const escapedTable = MIGRATIONS_TABLE.replace(
-            /[.*+?^${}()|[\]\\]/g,
-            "\\$&"
-          );
-          const migrationsPattern = new RegExp(
-            `DROP\\s+TABLE(?:\\s+IF\\s+EXISTS)?(?:\\s+"[^"]*"\\s*\\.)?\\s*"${escapedTable}"`,
-            "i"
-          );
+          const migrationsPattern = buildMigrationsTableDropPattern(MIGRATIONS_TABLE);
           const filtered = statements.filter(
             (stmt) => !migrationsPattern.test(stmt)
           );
@@ -724,10 +758,7 @@ var pushCommand = new Command4("push").description("Push schema to database (add
             ...options.dryRun !== void 0 ? { dryRun: options.dryRun } : {}
           });
           if (options.json) {
-            const droppedTables = statements.filter((s) => /DROP\s+TABLE/i.test(s)).filter((s) => !migrationsPattern.test(s)).map((s) => {
-              const m = s.match(/"([^"]+)"\s*(?:CASCADE\s*)?;?\s*$/i);
-              return m ? m[1] : s;
-            }).filter((t) => t !== void 0);
+            const droppedTables = statements.filter((s) => /DROP\s+TABLE/i.test(s)).filter((s) => !migrationsPattern.test(s)).map(extractDroppedTableName).filter((t) => t !== void 0);
             console.log(
               JSON.stringify(
                 {
@@ -747,10 +778,17 @@ var pushCommand = new Command4("push").description("Push schema to database (add
             );
           }
         } else {
-          const dbModel = await introspect2(pool, {
-            ...options.schemaName ? { schema: options.schemaName } : {}
-          });
-          const diff = compareSchemata2(schemaModel, dbModel);
+          const adapter = createPgsqlAdapter2(pool);
+          const compareOptions = {
+            ...options.schemaName ? { schema: options.schemaName } : {},
+            ...loaded.dbCasing ? { dbCasing: loaded.dbCasing } : {},
+            onWarning: (message) => console.warn(`\u26A0\uFE0F  ${message}`)
+          };
+          const diff = await comparePgsqlDatabaseSchema2(
+            adapter,
+            schemaModel,
+            compareOptions
+          );
           const statements = generateMigrationSQL2(diff, {
             includeDestructive: false,
             ...options.schemaName ? { schemaName: options.schemaName } : {}
@@ -787,6 +825,17 @@ var pushCommand = new Command4("push").description("Push schema to database (add
           const result = await executeDdl(pool, statements, {
             ...options.dryRun !== void 0 ? { dryRun: options.dryRun } : {}
           });
+          if (!options.dryRun) {
+            const postApplyDiff = await comparePgsqlDatabaseSchema2(
+              adapter,
+              schemaModel,
+              {
+                ...compareOptions,
+                previouslyAppliedDiff: diff
+              }
+            );
+            assertNoUnexpectedResidualDrift(postApplyDiff, skippedChanges);
+          }
           if (options.json) {
             console.log(
               JSON.stringify(
@@ -822,6 +871,17 @@ var pushCommand = new Command4("push").description("Push schema to database (add
     }
   }
 );
+function buildMigrationsTableDropPattern(tableName) {
+  const escaped = tableName.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&");
+  return new RegExp(
+    `DROP\\s+TABLE(?:\\s+IF\\s+EXISTS)?(?:\\s+"[^"]*"\\s*\\.)?\\s*"${escaped}"`,
+    "i"
+  );
+}
+function extractDroppedTableName(statement) {
+  const match = statement.match(/"([^"]+)"\s*(?:CASCADE\s*)?;?\s*$/iu);
+  return match?.[1] ?? statement;
+}
 function outputResult(statements, options) {
   if (options.dryRun && !options.json) {
     console.log(`-- Dry run: ${statements.length} statement(s)
@@ -832,6 +892,30 @@ function outputResult(statements, options) {
     }
   }
 }
+function assertNoUnexpectedResidualDrift(postApplyDiff, skippedChanges) {
+  const skippedKeys = new Set(skippedChanges.map(changeIdentity));
+  const unexpected = postApplyDiff.changes.filter(
+    (change) => !(change.destructive && skippedKeys.has(changeIdentity(change)))
+  );
+  if (unexpected.length === 0) return;
+  throw new Error(
+    `Push did not converge after applying DDL; ${unexpected.length} outstanding change(s) remain:
+` + unexpected.map(formatOutstandingChange).join("\n")
+  );
+}
+function changeIdentity(change) {
+  return JSON.stringify([
+    change.kind,
+    change.table,
+    change.column ?? null,
+    change.details,
+    change.destructive
+  ]);
+}
+function formatOutstandingChange(change) {
+  const target = change.column ? `${change.table}.${change.column}` : change.table || "schema";
+  return `   - ${change.details} (${change.kind}: ${target})`;
+}
 
 // src/commands/repl.ts
 import { readFileSync as readFileSync2 } from "fs";
@@ -888,7 +972,7 @@ var replCommand = new Command5("repl").description("Launch interactive REPL for
     if (options.use) {
       validateIdentifier(options.use, "schema");
     }
-    const dbCasing = options.casing === "snake" ? "snake_case" : options.casing === "camel" ? "camelCase" : options.casing === "none" ? "preserve" : void 0;
+    const dbCasing = mapReplCasingOption(options.casing) ?? schema.dbCasing;
     if (options.eval || options.input) {
       const { runBatchMode } = await import("./repl/batch.js");
       const queries = [];
@@ -926,7 +1010,7 @@ var replCommand = new Command5("repl").description("Launch interactive REPL for
       });
       return;
     }
-    const { startRepl } = await import("./repl-G56OK3F7.js");
+    const { startRepl } = await import("./repl-PIFVQAHC.js");
     await startRepl({
       schema,
       schemaPath,
@@ -942,9 +1026,24 @@ var replCommand = new Command5("repl").description("Launch interactive REPL for
     process.exit(1);
   }
 });
+function mapReplCasingOption(casing) {
+  switch (casing) {
+    case "snake":
+      return "snake_case";
+    case "camel":
+      return "camelCase";
+    case "none":
+      return "preserve";
+    default:
+      return void 0;
+  }
+}
 
 // src/commands/verify.ts
-import { compareSchemata as compareSchemata3, introspect as introspect3 } from "@dbsp/adapter-pgsql";
+import {
+  comparePgsqlDatabaseSchema as comparePgsqlDatabaseSchema3,
+  createPgsqlAdapter as createPgsqlAdapter3
+} from "@dbsp/adapter-pgsql";
 import { Command as Command6 } from "commander";
 
 // src/verifier.ts
@@ -1089,10 +1188,15 @@ var verifyCommand = new Command6("verify").description("Compare schema vs real d
       const schemaModel = loaded.model;
       const { pool } = await createDbConnection(options.db);
       try {
-        const dbModel = await introspect3(pool, {
+        const adapter = createPgsqlAdapter3(pool);
+        const diff = await comparePgsqlDatabaseSchema3(adapter, schemaModel, {
+          ...options.schemaName ? { schema: options.schemaName } : {},
+          ...loaded.dbCasing !== void 0 ? { dbCasing: loaded.dbCasing } : {},
+          onWarning: (message) => console.warn(`\u26A0\uFE0F  ${message}`)
+        });
+        const dbModel = await adapter.introspect({
           ...options.schemaName ? { schema: options.schemaName } : {}
         });
-        const diff = compareSchemata3(schemaModel, dbModel);
         const schemaTables = Array.from(schemaModel.tables.keys());
         const dbTables = Array.from(dbModel.tables.keys());
         const result = verifyFromDiff(diff, schemaTables, dbTables);