@prisma-next/cli 0.3.0-pr.87.2 → 0.3.0-pr.88.2

package/src/commands/db-sign.ts

@@ -1,26 +1,24 @@
 import { readFile } from 'node:fs/promises';
 import { relative, resolve } from 'node:path';
-import {
-  errorDatabaseConnectionRequired,
-  errorDriverRequired,
-  errorFileNotFound,
-  errorRuntime,
-  errorUnexpected,
-} from '@prisma-next/core-control-plane/errors';
 import type {
   SignDatabaseResult,
   VerifyDatabaseSchemaResult,
 } from '@prisma-next/core-control-plane/types';
-import { createControlPlaneStack } from '@prisma-next/core-control-plane/types';
+import { notOk, ok, type Result } from '@prisma-next/utils/result';
 import { Command } from 'commander';
 import { loadConfig } from '../config-loader';
-import { performAction } from '../utils/action';
-import { setCommandDescriptions } from '../utils/command-helpers';
+import { createControlClient } from '../control-api/client';
 import {
-  assertContractRequirementsSatisfied,
-  assertFrameworkComponentsCompatible,
-} from '../utils/framework-components';
-import { parseGlobalFlags } from '../utils/global-flags';
+  CliStructuredError,
+  errorContractValidationFailed,
+  errorDatabaseConnectionRequired,
+  errorDriverRequired,
+  errorFileNotFound,
+  errorJsonFormatNotSupported,
+  errorUnexpected,
+} from '../utils/cli-errors';
+import { setCommandDescriptions } from '../utils/command-helpers';
+import { type GlobalFlags, parseGlobalFlags } from '../utils/global-flags';
 import {
   formatCommandHelp,
   formatSchemaVerifyJson,
@@ -29,8 +27,8 @@ import {
   formatSignOutput,
   formatStyledHeader,
 } from '../utils/output';
+import { createProgressAdapter } from '../utils/progress-adapter';
 import { handleResult } from '../utils/result-handler';
-import { withSpinner } from '../utils/spinner';
 
 interface DbSignOptions {
   readonly db?: string;
@@ -47,6 +45,153 @@ interface DbSignOptions {
   readonly 'no-color'?: boolean;
 }
 
+interface DbSignResult {
+  readonly schemaVerifyResult: VerifyDatabaseSchemaResult | undefined;
+  readonly signResult: SignDatabaseResult | undefined;
+}
+
+/**
+ * Executes the db sign command and returns a structured Result.
+ */
+async function executeDbSignCommand(
+  options: DbSignOptions,
+  flags: GlobalFlags,
+): Promise<Result<DbSignResult, CliStructuredError>> {
+  // Load config
+  const config = await loadConfig(options.config);
+  const configPath = options.config
+    ? relative(process.cwd(), resolve(options.config))
+    : 'prisma-next.config.ts';
+  const contractPathAbsolute = config.contract?.output
+    ? resolve(config.contract.output)
+    : resolve('src/prisma/contract.json');
+  const contractPath = relative(process.cwd(), contractPathAbsolute);
+
+  // Output header
+  if (flags.json !== 'object' && !flags.quiet) {
+    const details: Array<{ label: string; value: string }> = [
+      { label: 'config', value: configPath },
+      { label: 'contract', value: contractPath },
+    ];
+    if (options.db) {
+      details.push({ label: 'database', value: options.db });
+    }
+    const header = formatStyledHeader({
+      command: 'db sign',
+      description: 'Sign the database with your contract so you can safely run queries',
+      url: 'https://pris.ly/db-sign',
+      details,
+      flags,
+    });
+    console.log(header);
+  }
+
+  // Load contract file
+  let contractJsonContent: string;
+  try {
+    contractJsonContent = await readFile(contractPathAbsolute, 'utf-8');
+  } catch (error) {
+    if (error instanceof Error && (error as { code?: string }).code === 'ENOENT') {
+      return notOk(
+        errorFileNotFound(contractPathAbsolute, {
+          why: `Contract file not found at ${contractPathAbsolute}`,
+          fix: `Run \`prisma-next contract emit\` to generate ${contractPath}, or update \`config.contract.output\` in ${configPath}`,
+        }),
+      );
+    }
+    return notOk(
+      errorUnexpected(error instanceof Error ? error.message : String(error), {
+        why: `Failed to read contract file: ${error instanceof Error ? error.message : String(error)}`,
+      }),
+    );
+  }
+
+  let contractJson: Record<string, unknown>;
+  try {
+    contractJson = JSON.parse(contractJsonContent) as Record<string, unknown>;
+  } catch (error) {
+    return notOk(
+      errorContractValidationFailed(
+        `Contract JSON is invalid: ${error instanceof Error ? error.message : String(error)}`,
+        { where: { path: contractPathAbsolute } },
+      ),
+    );
+  }
+
+  // Resolve database connection (--db flag or config.db.connection)
+  const dbConnection = options.db ?? config.db?.connection;
+  if (!dbConnection) {
+    return notOk(
+      errorDatabaseConnectionRequired({
+        why: `Database connection is required for db sign (set db.connection in ${configPath}, or pass --db <url>)`,
+      }),
+    );
+  }
+
+  // Check for driver
+  if (!config.driver) {
+    return notOk(errorDriverRequired({ why: 'Config.driver is required for db sign' }));
+  }
+
+  // Create control client
+  const client = createControlClient({
+    family: config.family,
+    target: config.target,
+    adapter: config.adapter,
+    driver: config.driver,
+    extensionPacks: config.extensionPacks ?? [],
+  });
+
+  // Create progress adapter
+  const onProgress = createProgressAdapter({ flags });
+
+  try {
+    // Step 1: Schema verification - connect here
+    const schemaVerifyResult = await client.schemaVerify({
+      contractIR: contractJson,
+      strict: false,
+      connection: dbConnection,
+      onProgress,
+    });
+
+    // If schema verification failed, return result for handling
+    if (!schemaVerifyResult.ok) {
+      // Add blank line after all async operations if spinners were shown
+      if (!flags.quiet && flags.json !== 'object' && process.stdout.isTTY) {
+        console.log('');
+      }
+      return ok({ schemaVerifyResult, signResult: undefined });
+    }
+
+    // Step 2: Sign (already connected from schemaVerify)
+    const signResult = await client.sign({
+      contractIR: contractJson,
+      onProgress,
+    });
+
+    // Add blank line after all async operations if spinners were shown
+    if (!flags.quiet && flags.json !== 'object' && process.stdout.isTTY) {
+      console.log('');
+    }
+
+    return ok({ schemaVerifyResult: undefined, signResult });
+  } catch (error) {
+    // Driver already throws CliStructuredError for connection failures
+    if (error instanceof CliStructuredError) {
+      return notOk(error);
+    }
+
+    // Wrap unexpected errors
+    return notOk(
+      errorUnexpected(error instanceof Error ? error.message : String(error), {
+        why: `Unexpected error during db sign: ${error instanceof Error ? error.message : String(error)}`,
+      }),
+    );
+  } finally {
+    await client.close();
+  }
+}
+
 export function createDbSignCommand(): Command {
   const command = new Command('sign');
   setCommandDescriptions(
@@ -66,7 +211,7 @@ export function createDbSignCommand(): Command {
     })
     .option('--db <url>', 'Database connection string')
     .option('--config <path>', 'Path to prisma-next.config.ts')
-    .option('--json [format]', 'Output as JSON (object or ndjson)', false)
+    .option('--json [format]', 'Output as JSON (object)', false)
     .option('-q, --quiet', 'Quiet mode: errors only')
     .option('-v, --verbose', 'Verbose output: debug info, timings')
     .option('-vv, --trace', 'Trace output: deep internals, stack traces')
@@ -76,156 +221,20 @@ export function createDbSignCommand(): Command {
     .action(async (options: DbSignOptions) => {
       const flags = parseGlobalFlags(options);
 
-      const result = await performAction(async () => {
-        // Load config (file I/O)
-        const config = await loadConfig(options.config);
-        // Normalize config path for display (match contract path format - no ./ prefix)
-        const configPath = options.config
-          ? relative(process.cwd(), resolve(options.config))
-          : 'prisma-next.config.ts';
-        const contractPathAbsolute = config.contract?.output
-          ? resolve(config.contract.output)
-          : resolve('src/prisma/contract.json');
-        // Convert to relative path for display
-        const contractPath = relative(process.cwd(), contractPathAbsolute);
-
-        // Output header (only for human-readable output)
-        if (flags.json !== 'object' && !flags.quiet) {
-          const details: Array<{ label: string; value: string }> = [
-            { label: 'config', value: configPath },
-            { label: 'contract', value: contractPath },
-          ];
-          if (options.db) {
-            details.push({ label: 'database', value: options.db });
-          }
-          const header = formatStyledHeader({
+      // Validate JSON format option
+      if (flags.json === 'ndjson') {
+        const result = notOk(
+          errorJsonFormatNotSupported({
             command: 'db sign',
-            description: 'Sign the database with your contract so you can safely run queries',
-            url: 'https://pris.ly/db-sign',
-            details,
-            flags,
-          });
-          console.log(header);
-        }
-
-        // Load contract file (file I/O)
-        let contractJsonContent: string;
-        try {
-          contractJsonContent = await readFile(contractPathAbsolute, 'utf-8');
-        } catch (error) {
-          if (error instanceof Error && (error as { code?: string }).code === 'ENOENT') {
-            throw errorFileNotFound(contractPathAbsolute, {
-              why: `Contract file not found at ${contractPathAbsolute}`,
-            });
-          }
-          throw errorUnexpected(error instanceof Error ? error.message : String(error), {
-            why: `Failed to read contract file: ${error instanceof Error ? error.message : String(error)}`,
-          });
-        }
-        const contractJson = JSON.parse(contractJsonContent) as Record<string, unknown>;
-
-        // Resolve database connection (--db flag or config.db.connection)
-        const dbConnection = options.db ?? config.db?.connection;
-        if (!dbConnection) {
-          throw errorDatabaseConnectionRequired();
-        }
-
-        // Check for driver
-        if (!config.driver) {
-          throw errorDriverRequired();
-        }
-
-        // Store driver descriptor after null check
-        const driverDescriptor = config.driver;
-
-        // Create family instance (needed for contract validation - no DB connection required)
-        const stack = createControlPlaneStack({
-          target: config.target,
-          adapter: config.adapter,
-          driver: driverDescriptor,
-          extensionPacks: config.extensionPacks,
-        });
-        const familyInstance = config.family.create(stack);
-
-        // Validate contract using instance validator (fail-fast before DB connection)
-        const contractIR = familyInstance.validateContractIR(contractJson);
-        assertContractRequirementsSatisfied({ contract: contractIR, stack });
-
-        const rawComponents = [config.target, config.adapter, ...(config.extensionPacks ?? [])];
-        const frameworkComponents = assertFrameworkComponentsCompatible(
-          config.family.familyId,
-          config.target.targetId,
-          rawComponents,
+            format: 'ndjson',
+            supportedFormats: ['object'],
+          }),
         );
+        const exitCode = handleResult(result, flags);
+        process.exit(exitCode);
+      }
 
-        // Create driver (expensive operation - done after validation)
-        const driver = await driverDescriptor.create(dbConnection);
-
-        try {
-          // Schema verification precondition with spinner
-          let schemaVerifyResult: VerifyDatabaseSchemaResult;
-          try {
-            schemaVerifyResult = await withSpinner(
-              () =>
-                familyInstance.schemaVerify({
-                  driver,
-                  contractIR,
-                  strict: false,
-                  contractPath: contractPathAbsolute,
-                  configPath,
-                  frameworkComponents,
-                }),
-              {
-                message: 'Verifying database satisfies contract',
-                flags,
-              },
-            );
-          } catch (error) {
-            // Wrap errors from schemaVerify() in structured error
-            throw errorRuntime(error instanceof Error ? error.message : String(error), {
-              why: `Failed to verify database schema: ${error instanceof Error ? error.message : String(error)}`,
-            });
-          }
-
-          // If schema verification failed, return both results for handling outside performAction
-          if (!schemaVerifyResult.ok) {
-            return { schemaVerifyResult, signResult: undefined };
-          }
-
-          // Schema verification passed - proceed with signing
-          let signResult: SignDatabaseResult;
-          try {
-            signResult = await withSpinner(
-              () =>
-                familyInstance.sign({
-                  driver,
-                  contractIR,
-                  contractPath: contractPathAbsolute,
-                  configPath,
-                }),
-              {
-                message: 'Signing database...',
-                flags,
-              },
-            );
-          } catch (error) {
-            // Wrap errors from sign() in structured error
-            throw errorRuntime(error instanceof Error ? error.message : String(error), {
-              why: `Failed to sign database: ${error instanceof Error ? error.message : String(error)}`,
-            });
-          }
-
-          // Add blank line after all async operations if spinners were shown
-          if (!flags.quiet && flags.json !== 'object' && process.stdout.isTTY) {
-            console.log('');
-          }
-
-          return { schemaVerifyResult: undefined, signResult };
-        } finally {
-          // Ensure driver connection is closed
-          await driver.close();
-        }
-      });
+      const result = await executeDbSignCommand(options, flags);
 
       // Handle result - formats output and returns exit code
       const exitCode = handleResult(result, flags, (value) => {
@@ -241,7 +250,6 @@ export function createDbSignCommand(): Command {
               console.log(output);
             }
           }
-          // Don't proceed to sign output formatting
           return;
         }