@prisma-next/cli 0.3.0-pr.99.6 → 0.4.0-dev.1

package/src/commands/db-verify.ts

@@ -1,10 +1,20 @@
 import { readFile } from 'node:fs/promises';
-import { relative, resolve } from 'node:path';
-import type { VerifyDatabaseResult } from '@prisma-next/core-control-plane/types';
+import type {
+  VerifyDatabaseResult,
+  VerifyDatabaseSchemaResult,
+} from '@prisma-next/framework-components/control';
+import {
+  VERIFY_CODE_HASH_MISMATCH,
+  VERIFY_CODE_MARKER_MISSING,
+  VERIFY_CODE_TARGET_MISMATCH,
+} from '@prisma-next/framework-components/control';
+import { ifDefined } from '@prisma-next/utils/defined';
 import { notOk, ok, type Result } from '@prisma-next/utils/result';
 import { Command } from 'commander';
+import { relative, resolve } from 'pathe';
 import { loadConfig } from '../config-loader';
 import { createControlClient } from '../control-api/client';
+import { ContractValidationError } from '../control-api/errors';
 import {
   CliStructuredError,
   errorContractValidationFailed,
@@ -12,53 +22,73 @@ import {
   errorDriverRequired,
   errorFileNotFound,
   errorHashMismatch,
-  errorJsonFormatNotSupported,
   errorMarkerMissing,
   errorRuntime,
   errorTargetMismatch,
   errorUnexpected,
 } from '../utils/cli-errors';
-import { setCommandDescriptions } from '../utils/command-helpers';
-import { type GlobalFlags, parseGlobalFlags } from '../utils/global-flags';
 import {
-  formatCommandHelp,
-  formatStyledHeader,
+  addGlobalOptions,
+  maskConnectionUrl,
+  resolveContractPath,
+  setCommandDescriptions,
+  setCommandExamples,
+} from '../utils/command-helpers';
+import { formatStyledHeader } from '../utils/formatters/styled';
+import {
+  type DbVerifyCommandSuccessResult,
+  formatSchemaVerifyJson,
+  formatSchemaVerifyOutput,
   formatVerifyJson,
   formatVerifyOutput,
-} from '../utils/output';
+} from '../utils/formatters/verify';
+import type { CommonCommandOptions } from '../utils/global-flags';
+import { type GlobalFlags, parseGlobalFlags } from '../utils/global-flags';
 import { createProgressAdapter } from '../utils/progress-adapter';
 import { handleResult } from '../utils/result-handler';
+import { TerminalUI } from '../utils/terminal-ui';
 
-interface DbVerifyOptions {
+interface DbVerifyOptions extends CommonCommandOptions {
   readonly db?: string;
   readonly config?: string;
-  readonly json?: string | boolean;
-  readonly quiet?: boolean;
-  readonly q?: boolean;
-  readonly verbose?: boolean;
-  readonly v?: boolean;
-  readonly vv?: boolean;
-  readonly trace?: boolean;
-  readonly timestamps?: boolean;
-  readonly color?: boolean;
-  readonly 'no-color'?: boolean;
+  readonly markerOnly?: boolean;
+  readonly schemaOnly?: boolean;
+  readonly strict?: boolean;
 }
 
+type DbVerifyMode = 'full' | 'marker-only' | 'schema-only';
+
 /**
  * Maps a VerifyDatabaseResult failure to a CliStructuredError.
  */
 function mapVerifyFailure(verifyResult: VerifyDatabaseResult): CliStructuredError {
   if (!verifyResult.ok && verifyResult.code) {
-    if (verifyResult.code === 'PN-RTM-3001') {
+    if (verifyResult.code === VERIFY_CODE_MARKER_MISSING) {
       return errorMarkerMissing();
     }
-    if (verifyResult.code === 'PN-RTM-3002') {
+    if (verifyResult.code === VERIFY_CODE_HASH_MISMATCH) {
+      const storageMatch = verifyResult.marker?.storageHash === verifyResult.contract.storageHash;
+      const profileMatch =
+        !verifyResult.contract.profileHash ||
+        verifyResult.marker?.profileHash === verifyResult.contract.profileHash;
+
+      if (!storageMatch) {
+        return errorHashMismatch({
+          why: 'Contract storageHash does not match database marker',
+          expected: verifyResult.contract.storageHash,
+          ...ifDefined('actual', verifyResult.marker?.storageHash),
+        });
+      }
+
       return errorHashMismatch({
-        expected: verifyResult.contract.coreHash,
-        ...(verifyResult.marker?.coreHash ? { actual: verifyResult.marker.coreHash } : {}),
+        why: profileMatch
+          ? 'Contract hash does not match database marker'
+          : 'Contract profileHash does not match database marker',
+        ...ifDefined('expected', verifyResult.contract.profileHash),
+        ...ifDefined('actual', verifyResult.marker?.profileHash),
       });
     }
-    if (verifyResult.code === 'PN-RTM-3003') {
+    if (verifyResult.code === VERIFY_CODE_TARGET_MISMATCH) {
       return errorTargetMismatch(
         verifyResult.target.expected,
         verifyResult.target.actual ?? 'unknown',
@@ -69,43 +99,152 @@ function mapVerifyFailure(verifyResult: VerifyDatabaseResult): CliStructuredErro
   return errorRuntime(verifyResult.summary);
 }
 
-/**
- * Executes the db verify command and returns a structured Result.
- */
-async function executeDbVerifyCommand(
+type DbVerifyFailure = CliStructuredError | VerifyDatabaseSchemaResult;
+
+function errorInvalidVerifyMode(options: {
+  readonly why: string;
+  readonly fix: string;
+}): CliStructuredError {
+  return new CliStructuredError('4012', 'Invalid verify mode', {
+    domain: 'CLI',
+    why: options.why,
+    fix: options.fix,
+    docsUrl: 'https://pris.ly/db-verify',
+  });
+}
+
+function resolveDbVerifyMode(options: DbVerifyOptions): Result<DbVerifyMode, CliStructuredError> {
+  if (options.markerOnly && options.schemaOnly) {
+    return notOk(
+      errorInvalidVerifyMode({
+        why: '`--marker-only` and `--schema-only` cannot be used together',
+        fix: 'Choose one mode: omit both to check the marker and schema, use `--marker-only` to check only the marker, or use `--schema-only` to check only the live schema.',
+      }),
+    );
+  }
+
+  if (options.markerOnly && options.strict) {
+    return notOk(
+      errorInvalidVerifyMode({
+        why: '`--strict` requires schema verification, but `--marker-only` skips it',
+        fix: 'Remove `--strict`, or use `db verify` / `db verify --schema-only` when you want to check the live schema in strict mode.',
+      }),
+    );
+  }
+
+  if (options.schemaOnly) {
+    return ok('schema-only');
+  }
+
+  if (options.markerOnly) {
+    return ok('marker-only');
+  }
+
+  return ok('full');
+}
+
+function formatDbVerifyModeLabel(mode: DbVerifyMode, strict: boolean): string {
+  if (mode === 'marker-only') {
+    return 'marker only';
+  }
+
+  if (mode === 'schema-only') {
+    return `schema only (${strict ? 'strict' : 'tolerant'})`;
+  }
+
+  return `full (marker + schema, ${strict ? 'strict' : 'tolerant'})`;
+}
+
+function formatDbVerifyInvocation(mode: DbVerifyMode, strict: boolean): string {
+  const args = ['db verify'];
+
+  if (mode === 'marker-only') {
+    args.push('--marker-only');
+  }
+
+  if (mode === 'schema-only') {
+    args.push('--schema-only');
+  }
+
+  if (strict) {
+    args.push('--strict');
+  }
+
+  return args.join(' ');
+}
+
+function createDbVerifyConnectionRequiredError(options: {
+  readonly configPath: string;
+  readonly mode: DbVerifyMode;
+  readonly strict: boolean;
+}): CliStructuredError {
+  const invocation = formatDbVerifyInvocation(options.mode, options.strict);
+  return errorDatabaseConnectionRequired({
+    why: `Database connection is required for ${invocation} (set db.connection in ${options.configPath}, or pass --db <url>)`,
+    retryCommand: `prisma-next ${invocation} --db <url>`,
+  });
+}
+
+function renderVerifyHeader(
+  paths: { configPath: string; contractPath: string },
   options: DbVerifyOptions,
+  mode: DbVerifyMode,
   flags: GlobalFlags,
-): Promise<Result<VerifyDatabaseResult, CliStructuredError>> {
-  // Load config
+  ui: TerminalUI,
+): void {
+  if (flags.json || flags.quiet) return;
+
+  const description =
+    mode === 'schema-only'
+      ? 'Check whether the live database schema matches your contract'
+      : mode === 'marker-only'
+        ? 'Check whether the database marker matches your contract'
+        : 'Check whether the database marker and live schema match your contract';
+
+  const details: Array<{ label: string; value: string }> = [
+    { label: 'config', value: paths.configPath },
+    { label: 'contract', value: paths.contractPath },
+    { label: 'mode', value: formatDbVerifyModeLabel(mode, options.strict ?? false) },
+  ];
+  if (options.db) {
+    details.push({ label: 'database', value: maskConnectionUrl(options.db) });
+  }
+
+  ui.stderr(
+    formatStyledHeader({
+      command: 'db verify',
+      description,
+      url: 'https://pris.ly/db-verify',
+      details,
+      flags,
+    }),
+  );
+}
+
+async function resolveVerifyPaths(options: DbVerifyOptions) {
   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 contractPathAbsolute = resolveContractPath(config);
   const contractPath = relative(process.cwd(), contractPathAbsolute);
+  return { config, configPath, contractPathAbsolute, contractPath };
+}
 
-  // 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 verify',
-      description: 'Check whether the database has been signed with your contract',
-      url: 'https://pris.ly/db-verify',
-      details,
-      flags,
-    });
-    console.log(header);
-  }
+type VerifyPaths = Awaited<ReturnType<typeof resolveVerifyPaths>>;
+
+interface VerifySetup extends VerifyPaths {
+  readonly contractJson: Record<string, unknown>;
+  readonly dbConnection: string;
+}
+
+async function resolveVerifySetup(
+  paths: VerifyPaths,
+  options: DbVerifyOptions,
+  mode: DbVerifyMode,
+): Promise<Result<VerifySetup, CliStructuredError>> {
+  const { config, configPath, contractPathAbsolute, contractPath } = paths;
 
-  // Load contract file
   let contractJsonContent: string;
   try {
     contractJsonContent = await readFile(contractPathAbsolute, 'utf-8');
@@ -137,63 +276,174 @@ async function executeDbVerifyCommand(
     );
   }
 
-  // Resolve database connection (--db flag or config.db.connection)
   const dbConnection = options.db ?? config.db?.connection;
-  if (!dbConnection) {
+  if (typeof dbConnection !== 'string' || dbConnection.length === 0) {
     return notOk(
-      errorDatabaseConnectionRequired({
-        why: `Database connection is required for db verify (set db.connection in ${configPath}, or pass --db <url>)`,
+      createDbVerifyConnectionRequiredError({
+        configPath,
+        mode,
+        strict: options.strict ?? false,
       }),
     );
   }
 
-  // Check for driver
   if (!config.driver) {
-    return notOk(errorDriverRequired({ why: 'Config.driver is required for db verify' }));
+    return notOk(
+      errorDriverRequired({
+        why: `Config.driver is required for ${formatDbVerifyInvocation(mode, options.strict ?? false)}`,
+      }),
+    );
   }
 
-  // Create control client
-  const client = createControlClient({
-    family: config.family,
-    target: config.target,
-    adapter: config.adapter,
-    driver: config.driver,
-    extensionPacks: config.extensionPacks ?? [],
+  return ok({ ...paths, contractJson, dbConnection });
+}
+
+function createVerifyClient(setup: VerifySetup) {
+  return createControlClient({
+    family: setup.config.family,
+    target: setup.config.target,
+    adapter: setup.config.adapter,
+    driver: setup.config.driver!,
+    extensionPacks: setup.config.extensionPacks ?? [],
   });
+}
+
+function wrapVerifyError(
+  error: unknown,
+  contractPathAbsolute: string,
+  modeLabel: string,
+): Result<never, CliStructuredError> {
+  if (error instanceof CliStructuredError) {
+    return notOk(error);
+  }
+  if (error instanceof ContractValidationError) {
+    return notOk(
+      errorContractValidationFailed(`Contract validation failed: ${error.message}`, {
+        where: { path: contractPathAbsolute },
+      }),
+    );
+  }
+  return notOk(
+    errorUnexpected(error instanceof Error ? error.message : String(error), {
+      why: `Unexpected error during ${modeLabel}: ${error instanceof Error ? error.message : String(error)}`,
+    }),
+  );
+}
+
+/**
+ * Executes the db verify command and returns a structured Result.
+ */
+async function executeDbVerifyCommand(
+  options: DbVerifyOptions,
+  flags: GlobalFlags,
+  ui: TerminalUI,
+  mode: Extract<DbVerifyMode, 'full' | 'marker-only'>,
+): Promise<Result<DbVerifyCommandSuccessResult, DbVerifyFailure>> {
+  const startTime = Date.now();
+  const paths = await resolveVerifyPaths(options);
+  renderVerifyHeader(paths, options, mode, flags, ui);
 
-  // Create progress adapter
-  const onProgress = createProgressAdapter({ flags });
+  const setupResult = await resolveVerifySetup(paths, options, mode);
+  if (!setupResult.ok) return setupResult;
+  const { contractJson, dbConnection, contractPathAbsolute } = setupResult.value;
+
+  const client = createVerifyClient(setupResult.value);
+  const onProgress = createProgressAdapter({ ui, flags });
 
   try {
     const verifyResult = await client.verify({
-      contractIR: contractJson,
+      contract: contractJson,
       connection: dbConnection,
       onProgress,
     });
 
-    // Add blank line after all async operations if spinners were shown
-    if (!flags.quiet && flags.json !== 'object' && process.stdout.isTTY) {
-      console.log('');
-    }
-
     // If verification failed, map to CLI structured error
     if (!verifyResult.ok) {
       return notOk(mapVerifyFailure(verifyResult));
     }
 
-    return ok(verifyResult);
-  } catch (error) {
-    // Driver already throws CliStructuredError for connection failures
-    if (error instanceof CliStructuredError) {
-      return notOk(error);
+    if (mode === 'marker-only') {
+      return ok({
+        ok: true,
+        mode: 'marker-only',
+        summary: 'Database marker matches contract',
+        contract: verifyResult.contract,
+        marker: verifyResult.marker,
+        target: verifyResult.target,
+        ...ifDefined('missingCodecs', verifyResult.missingCodecs),
+        ...ifDefined('codecCoverageSkipped', verifyResult.codecCoverageSkipped),
+        warning: 'Schema verification skipped because --marker-only was provided',
+        meta: {
+          ...(verifyResult.meta ?? {}),
+          schemaVerification: 'skipped',
+        },
+        timings: { total: Date.now() - startTime },
+      });
     }
 
-    // Wrap unexpected errors
-    return notOk(
-      errorUnexpected(error instanceof Error ? error.message : String(error), {
-        why: `Unexpected error during db verify: ${error instanceof Error ? error.message : String(error)}`,
-      }),
-    );
+    const schemaVerifyResult = await client.schemaVerify({
+      contract: contractJson,
+      strict: options.strict ?? false,
+      onProgress,
+    });
+
+    if (!schemaVerifyResult.ok) {
+      return notOk(schemaVerifyResult);
+    }
+
+    return ok({
+      ok: true,
+      mode: 'full',
+      summary: 'Database marker and schema match contract',
+      contract: verifyResult.contract,
+      marker: verifyResult.marker,
+      target: verifyResult.target,
+      ...ifDefined('missingCodecs', verifyResult.missingCodecs),
+      ...ifDefined('codecCoverageSkipped', verifyResult.codecCoverageSkipped),
+      schema: {
+        summary: schemaVerifyResult.summary,
+        counts: schemaVerifyResult.schema.counts,
+        strict: schemaVerifyResult.meta?.strict ?? false,
+      },
+      meta: {
+        ...(verifyResult.meta ?? {}),
+        schemaVerification: 'performed',
+      },
+      timings: { total: Date.now() - startTime },
+    });
+  } catch (error) {
+    return wrapVerifyError(error, contractPathAbsolute, 'db verify');
+  } finally {
+    await client.close();
+  }
+}
+
+async function executeDbSchemaOnlyVerifyCommand(
+  options: DbVerifyOptions,
+  flags: GlobalFlags,
+  ui: TerminalUI,
+): Promise<Result<VerifyDatabaseSchemaResult, CliStructuredError>> {
+  const paths = await resolveVerifyPaths(options);
+  renderVerifyHeader(paths, options, 'schema-only', flags, ui);
+
+  const setupResult = await resolveVerifySetup(paths, options, 'schema-only');
+  if (!setupResult.ok) return setupResult;
+  const { contractJson, dbConnection, contractPathAbsolute } = setupResult.value;
+
+  const client = createVerifyClient(setupResult.value);
+  const onProgress = createProgressAdapter({ ui, flags });
+
+  try {
+    const schemaVerifyResult = await client.schemaVerify({
+      contract: contractJson,
+      strict: options.strict ?? false,
+      connection: dbConnection,
+      onProgress,
+    });
+
+    return ok(schemaVerifyResult);
+  } catch (error) {
+    return wrapVerifyError(error, contractPathAbsolute, 'db verify --schema-only');
   } finally {
     await client.close();
   }
@@ -203,55 +453,95 @@ export function createDbVerifyCommand(): Command {
   const command = new Command('verify');
   setCommandDescriptions(
     command,
-    'Check whether the database has been signed with your contract',
-    'Verifies that your database schema matches the emitted contract. Checks table structures,\n' +
-      'column types, constraints, and codec coverage. Reports any mismatches or missing codecs.',
+    'Check whether the database marker and live schema match your contract',
+    'Verifies the database marker first, then checks the database schema matches your contract.\n' +
+      'Use `--marker-only` for marker-only verification, `--schema-only` to skip marker checks and\n' +
+      'inspect only the live schema, and `--strict` to fail if the database includes elements\n' +
+      'not present in the contract.',
   );
-  command
-    .configureHelp({
-      formatHelp: (cmd) => {
-        const flags = parseGlobalFlags({});
-        return formatCommandHelp({ command: cmd, flags });
-      },
-    })
+  setCommandExamples(command, [
+    'prisma-next db verify --db $DATABASE_URL',
+    'prisma-next db verify --db $DATABASE_URL --strict',
+    'prisma-next db verify --db $DATABASE_URL --schema-only',
+    'prisma-next db verify --db $DATABASE_URL --schema-only --strict',
+    'prisma-next db verify --db $DATABASE_URL --marker-only',
+    'prisma-next db verify --db $DATABASE_URL --json',
+  ]);
+  addGlobalOptions(command)
     .option('--db <url>', 'Database connection string')
     .option('--config <path>', 'Path to prisma-next.config.ts')
-    .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')
-    .option('--timestamps', 'Add timestamps to output')
-    .option('--color', 'Force color output')
-    .option('--no-color', 'Disable color output')
+    .option('--marker-only', 'Skip schema verification and only check the database marker')
+    .option(
+      '--schema-only',
+      'Skip marker verification and only check whether the live schema satisfies the contract',
+    )
+    .option(
+      '--strict',
+      'Strict mode: schema elements not present in the contract are considered an error',
+      false,
+    )
     .action(async (options: DbVerifyOptions) => {
       const flags = parseGlobalFlags(options);
+      const ui = new TerminalUI({ color: flags.color, interactive: flags.interactive });
+
+      const modeResult = resolveDbVerifyMode(options);
+      if (!modeResult.ok) {
+        const exitCode = handleResult(modeResult as Result<never, CliStructuredError>, flags, ui);
+        process.exit(exitCode);
+      }
+
+      const mode = modeResult.value;
+
+      if (mode === 'schema-only') {
+        const result = await executeDbSchemaOnlyVerifyCommand(options, flags, ui);
+        const exitCode = handleResult(result, flags, ui, (schemaVerifyResult) => {
+          if (flags.json) {
+            ui.output(formatSchemaVerifyJson(schemaVerifyResult));
+          } else {
+            const output = formatSchemaVerifyOutput(schemaVerifyResult, flags);
+            if (output) {
+              ui.log(output);
+            }
+          }
+        });
+
+        if (result.ok && !result.value.ok) {
+          process.exit(1);
+        }
 
-      // Validate JSON format option
-      if (flags.json === 'ndjson') {
-        const result = notOk(
-          errorJsonFormatNotSupported({
-            command: 'db verify',
-            format: 'ndjson',
-            supportedFormats: ['object'],
-          }),
-        );
-        const exitCode = handleResult(result, flags);
         process.exit(exitCode);
       }
 
-      const result = await executeDbVerifyCommand(options, flags);
+      const result = await executeDbVerifyCommand(options, flags, ui, mode);
 
-      const exitCode = handleResult(result, flags, (verifyResult) => {
-        if (flags.json === 'object') {
-          console.log(formatVerifyJson(verifyResult));
+      if (result.ok) {
+        if (flags.json) {
+          ui.output(formatVerifyJson(result.value));
         } else {
-          const output = formatVerifyOutput(verifyResult, flags);
+          const output = formatVerifyOutput(result.value, flags);
           if (output) {
-            console.log(output);
+            ui.log(output);
           }
         }
-      });
-      process.exit(exitCode);
+        process.exit(0);
+      }
+
+      if (CliStructuredError.is(result.failure)) {
+        const exitCode = handleResult(result as Result<never, CliStructuredError>, flags, ui);
+        process.exit(exitCode);
+      }
+
+      if (flags.json) {
+        ui.output(formatSchemaVerifyJson(result.failure));
+      } else {
+        // Always show schema-drift failures, even in quiet mode — exiting 1 without
+        // diagnostics is unhelpful.
+        const output = formatSchemaVerifyOutput(result.failure, { ...flags, quiet: false });
+        if (output) {
+          ui.log(output);
+        }
+      }
+      process.exit(1);
     });
 
   return command;

package/src/commands/init/detect-package-manager.ts

@@ -0,0 +1,47 @@
+import { existsSync } from 'node:fs';
+import { detect } from 'package-manager-detector/detect';
+import { join } from 'pathe';
+
+export type PackageManager = 'pnpm' | 'npm' | 'yarn' | 'bun' | 'deno';
+
+const KNOWN: ReadonlySet<string> = new Set<PackageManager>(['pnpm', 'npm', 'yarn', 'bun', 'deno']);
+
+export async function detectPackageManager(cwd: string): Promise<PackageManager> {
+  const result = await detect({ cwd });
+  if (result && KNOWN.has(result.name)) {
+    return result.name as PackageManager;
+  }
+  return 'npm';
+}
+
+export function hasProjectManifest(cwd: string): boolean {
+  return (
+    existsSync(join(cwd, 'package.json')) ||
+    existsSync(join(cwd, 'deno.json')) ||
+    existsSync(join(cwd, 'deno.jsonc'))
+  );
+}
+
+export function formatRunCommand(pm: PackageManager, bin: string, args: string): string {
+  if (pm === 'npm') {
+    return `npx ${bin} ${args}`;
+  }
+  if (pm === 'deno') {
+    return `deno run npm:${bin} ${args}`;
+  }
+  return `${pm} ${bin} ${args}`;
+}
+
+export function formatAddArgs(pm: PackageManager, packages: string[]): string[] {
+  if (pm === 'deno') {
+    return ['add', ...packages.map((p) => `npm:${p}`)];
+  }
+  return ['add', ...packages];
+}
+
+export function formatAddDevArgs(pm: PackageManager, packages: string[]): string[] {
+  if (pm === 'deno') {
+    return ['add', '--dev', ...packages.map((p) => `npm:${p}`)];
+  }
+  return ['add', '-D', ...packages];
+}