@prisma-next/cli 0.3.0-dev.5 → 0.3.0-dev.53

package/src/commands/contract-emit.ts

@@ -1,20 +1,24 @@
 import { mkdirSync, writeFileSync } from 'node:fs';
-import { dirname, relative, resolve } from 'node:path';
 import { errorContractConfigMissing } from '@prisma-next/core-control-plane/errors';
+import { notOk, ok, type Result } from '@prisma-next/utils/result';
 import { Command } from 'commander';
+import { dirname, isAbsolute, join, relative, resolve } from 'pathe';
 import { loadConfig } from '../config-loader';
-import { performAction } from '../utils/action';
+import { createControlClient } from '../control-api/client';
+import type { EmitFailure } from '../control-api/types';
+import { CliStructuredError, errorRuntime, errorUnexpected } from '../utils/cli-errors';
 import { setCommandDescriptions } from '../utils/command-helpers';
-import { parseGlobalFlags } from '../utils/global-flags';
+import { type GlobalFlags, parseGlobalFlags } from '../utils/global-flags';
 import {
+  type EmitContractResult,
   formatCommandHelp,
   formatEmitJson,
   formatEmitOutput,
   formatStyledHeader,
   formatSuccessMessage,
 } from '../utils/output';
+import { createProgressAdapter } from '../utils/progress-adapter';
 import { handleResult } from '../utils/result-handler';
-import { withSpinner } from '../utils/spinner';
 
 interface ContractEmitOptions {
   readonly config?: string;
@@ -30,11 +34,205 @@ interface ContractEmitOptions {
   readonly 'no-color'?: boolean;
 }
 
+function mapDiagnosticsToIssues(
+  failure: EmitFailure,
+): ReadonlyArray<{ kind: string; message: string }> {
+  const diagnostics = failure.diagnostics?.diagnostics ?? [];
+  return diagnostics.map((diagnostic) => {
+    const location =
+      diagnostic.sourceId && diagnostic.span
+        ? ` (${diagnostic.sourceId}:${diagnostic.span.start.line}:${diagnostic.span.start.column})`
+        : diagnostic.sourceId
+          ? ` (${diagnostic.sourceId})`
+          : '';
+    return {
+      kind: diagnostic.code,
+      message: `${diagnostic.message}${location}`,
+    };
+  });
+}
+
+/**
+ * Maps an EmitFailure to a CliStructuredError for consistent error handling.
+ */
+function mapEmitFailure(failure: EmitFailure): CliStructuredError {
+  if (failure.code === 'CONTRACT_SOURCE_INVALID') {
+    const issues = mapDiagnosticsToIssues(failure);
+    return errorRuntime(failure.summary, {
+      why: failure.why ?? 'Contract source provider failed',
+      fix: 'Check your contract source provider in prisma-next.config.ts and ensure it returns Result<ContractIR, Diagnostics>',
+      ...(issues.length > 0 ? { meta: { issues } } : {}),
+    });
+  }
+
+  if (failure.code === 'EMIT_FAILED') {
+    return errorRuntime(failure.summary, {
+      why: failure.why ?? 'Failed to emit contract',
+      fix: 'Check your contract configuration and ensure the source is valid',
+    });
+  }
+
+  // Exhaustive check - TypeScript will error if a new code is added but not handled
+  const exhaustive: never = failure.code;
+  throw new Error(`Unhandled EmitFailure code: ${exhaustive}`);
+}
+
+/**
+ * Executes the contract emit command and returns a structured Result.
+ */
+async function executeContractEmitCommand(
+  options: ContractEmitOptions,
+  flags: GlobalFlags,
+  startTime: number,
+): Promise<Result<EmitContractResult, CliStructuredError>> {
+  // Load config
+  let config: Awaited<ReturnType<typeof loadConfig>>;
+  try {
+    config = await loadConfig(options.config);
+  } catch (error) {
+    // Convert thrown CliStructuredError to Result
+    if (error instanceof CliStructuredError) {
+      return notOk(error);
+    }
+    return notOk(
+      errorUnexpected(error instanceof Error ? error.message : String(error), {
+        why: 'Failed to load config',
+      }),
+    );
+  }
+
+  // Resolve contract from config
+  if (!config.contract) {
+    return notOk(
+      errorContractConfigMissing({
+        why: 'Config.contract is required for emit. Define it in your config: contract: { source: ..., output: ... }',
+      }),
+    );
+  }
+
+  // Contract config is already normalized by defineConfig() with defaults applied
+  const contractConfig = config.contract;
+
+  // Resolve artifact paths from config (already normalized by defineConfig() with defaults)
+  if (!contractConfig.output) {
+    return notOk(
+      errorContractConfigMissing({
+        why: 'Contract config must have output path. This should not happen if defineConfig() was used.',
+      }),
+    );
+  }
+  if (!contractConfig.output.endsWith('.json')) {
+    return notOk(
+      errorContractConfigMissing({
+        why: 'Contract config output path must end with .json (e.g., "src/prisma/contract.json")',
+      }),
+    );
+  }
+  const configDir = options.config ? dirname(resolve(options.config)) : process.cwd();
+  const outputJsonPath = isAbsolute(contractConfig.output)
+    ? contractConfig.output
+    : join(configDir, contractConfig.output);
+  // Colocate .d.ts with .json (contract.json → contract.d.ts)
+  const outputDtsPath = `${outputJsonPath.slice(0, -5)}.d.ts`;
+
+  // Output header (only for human-readable output)
+  if (flags.json !== 'object' && !flags.quiet) {
+    // 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';
+    // Convert absolute paths to relative paths for display
+    const contractPath = relative(process.cwd(), outputJsonPath);
+    const typesPath = relative(process.cwd(), outputDtsPath);
+    const header = formatStyledHeader({
+      command: 'contract emit',
+      description: 'Emit your contract artifacts',
+      url: 'https://pris.ly/contract-emit',
+      details: [
+        { label: 'config', value: configPath },
+        { label: 'contract', value: contractPath },
+        { label: 'types', value: typesPath },
+      ],
+      flags,
+    });
+    console.log(header);
+  }
+
+  // Create control client (no driver needed for emit)
+  const client = createControlClient({
+    family: config.family,
+    target: config.target,
+    adapter: config.adapter,
+    extensionPacks: config.extensionPacks ?? [],
+  });
+
+  // Create progress adapter
+  const onProgress = createProgressAdapter({ flags });
+
+  try {
+    // Call emit with progress callback
+    const result = await client.emit({
+      contractConfig: {
+        sourceProvider: contractConfig.source,
+        output: outputJsonPath,
+      },
+      onProgress,
+    });
+
+    // Handle failures by mapping to CLI structured error
+    if (!result.ok) {
+      return notOk(mapEmitFailure(result.failure));
+    }
+
+    // Create directories if needed
+    mkdirSync(dirname(outputJsonPath), { recursive: true });
+    mkdirSync(dirname(outputDtsPath), { recursive: true });
+
+    // Write the results to files
+    writeFileSync(outputJsonPath, result.value.contractJson, 'utf-8');
+    writeFileSync(outputDtsPath, result.value.contractDts, 'utf-8');
+
+    // Add blank line after all async operations if spinners were shown
+    if (!flags.quiet && flags.json !== 'object' && process.stdout.isTTY) {
+      console.log('');
+    }
+
+    // Convert success result to CLI output format
+    const emitResult: EmitContractResult = {
+      storageHash: result.value.storageHash,
+      ...(result.value.executionHash ? { executionHash: result.value.executionHash } : {}),
+      profileHash: result.value.profileHash,
+      outDir: dirname(outputJsonPath),
+      files: {
+        json: outputJsonPath,
+        dts: outputDtsPath,
+      },
+      timings: { total: Date.now() - startTime },
+    };
+
+    return ok(emitResult);
+  } catch (error) {
+    // Use static type guard to work across module boundaries
+    if (CliStructuredError.is(error)) {
+      return notOk(error);
+    }
+
+    // Wrap unexpected errors
+    return notOk(
+      errorUnexpected('Unexpected error during contract emit', {
+        why: error instanceof Error ? error.message : String(error),
+      }),
+    );
+  } finally {
+    await client.close();
+  }
+}
+
 export function createContractEmitCommand(): Command {
   const command = new Command('emit');
   setCommandDescriptions(
     command,
-    'Write your contract to JSON and sign it',
+    'Emit your contract artifacts',
     'Reads your contract source (TypeScript or Prisma schema) and emits contract.json and\n' +
       'contract.d.ts. The contract.json contains the canonical contract structure, and\n' +
       'contract.d.ts provides TypeScript types for type-safe query building.',
@@ -56,113 +254,9 @@ export function createContractEmitCommand(): Command {
     .option('--no-color', 'Disable color output')
     .action(async (options: ContractEmitOptions) => {
       const flags = parseGlobalFlags(options);
+      const startTime = Date.now();
 
-      const result = await performAction(async () => {
-        // Load config
-        const config = await loadConfig(options.config);
-
-        // Resolve contract from config
-        if (!config.contract) {
-          throw errorContractConfigMissing({
-            why: 'Config.contract is required for emit. Define it in your config: contract: { source: ..., output: ..., types: ... }',
-          });
-        }
-
-        // Contract config is already normalized by defineConfig() with defaults applied
-        const contractConfig = config.contract;
-
-        // Resolve artifact paths from config (already normalized by defineConfig() with defaults)
-        if (!contractConfig.output || !contractConfig.types) {
-          throw errorContractConfigMissing({
-            why: 'Contract config must have output and types paths. This should not happen if defineConfig() was used.',
-          });
-        }
-        const outputJsonPath = resolve(contractConfig.output);
-        const outputDtsPath = resolve(contractConfig.types);
-
-        // Output header (only for human-readable output)
-        if (flags.json !== 'object' && !flags.quiet) {
-          // 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';
-          // Convert absolute paths to relative paths for display
-          const contractPath = relative(process.cwd(), outputJsonPath);
-          const typesPath = relative(process.cwd(), outputDtsPath);
-          const header = formatStyledHeader({
-            command: 'contract emit',
-            description: 'Write your contract to JSON and sign it',
-            url: 'https://pris.ly/contract-emit',
-            details: [
-              { label: 'config', value: configPath },
-              { label: 'contract', value: contractPath },
-              { label: 'types', value: typesPath },
-            ],
-            flags,
-          });
-          console.log(header);
-        }
-
-        // Create family instance (assembles operation registry, type imports, extension IDs)
-        // Note: emit command doesn't need driver, but ControlFamilyDescriptor.create() requires it
-        // We'll need to provide a minimal driver descriptor or make driver optional for emit
-        // For now, we'll require driver to be present in config even for emit
-        if (!config.driver) {
-          throw errorContractConfigMissing({
-            why: 'Config.driver is required. Even though emit does not use the driver, it is required by ControlFamilyDescriptor.create()',
-          });
-        }
-        const familyInstance = config.family.create({
-          target: config.target,
-          adapter: config.adapter,
-          driver: config.driver,
-          extensionPacks: config.extensionPacks ?? [],
-        });
-
-        // Resolve contract source from config (user's config handles loading)
-        let contractRaw: unknown;
-        if (typeof contractConfig.source === 'function') {
-          contractRaw = await contractConfig.source();
-        } else {
-          contractRaw = contractConfig.source;
-        }
-
-        // Call emitContract on family instance (handles stripping mappings and validation internally)
-        const emitResult = await withSpinner(
-          () => familyInstance.emitContract({ contractIR: contractRaw }),
-          {
-            message: 'Emitting contract...',
-            flags,
-          },
-        );
-
-        // Create directories if needed
-        mkdirSync(dirname(outputJsonPath), { recursive: true });
-        mkdirSync(dirname(outputDtsPath), { recursive: true });
-
-        // Write the results to files
-        writeFileSync(outputJsonPath, emitResult.contractJson, 'utf-8');
-        writeFileSync(outputDtsPath, emitResult.contractDts, 'utf-8');
-
-        // Add blank line after all async operations if spinners were shown
-        if (!flags.quiet && flags.json !== 'object' && process.stdout.isTTY) {
-          console.log('');
-        }
-
-        // Return result with file paths for output formatting
-        return {
-          coreHash: emitResult.coreHash,
-          profileHash: emitResult.profileHash,
-          outDir: dirname(outputJsonPath),
-          files: {
-            json: outputJsonPath,
-            dts: outputDtsPath,
-          },
-          timings: {
-            total: 0, // Timing is handled by emitContract internally if needed
-          },
-        };
-      });
+      const result = await executeContractEmitCommand(options, flags, startTime);
 
       // Handle result - formats output and returns exit code
       const exitCode = handleResult(result, flags, (emitResult) => {