@prisma-next/cli 0.3.0-dev.4 → 0.3.0-dev.41

package/src/utils/progress-adapter.ts

@@ -0,0 +1,86 @@
+import ora from 'ora';
+import type { ControlProgressEvent, OnControlProgress } from '../control-api/types';
+import type { GlobalFlags } from './global-flags';
+
+/**
+ * Options for creating a progress adapter.
+ */
+interface ProgressAdapterOptions {
+  /**
+   * Global flags that control progress output behavior (quiet, json, color).
+   */
+  readonly flags: GlobalFlags;
+}
+
+/**
+ * State for tracking active spans in the progress adapter.
+ */
+interface SpanState {
+  readonly spinner: ReturnType<typeof ora>;
+  readonly startTime: number;
+}
+
+/**
+ * Creates a progress adapter that converts control-api progress events
+ * into CLI spinner/progress output.
+ *
+ * The adapter:
+ * - Starts/succeeds spinners for top-level span boundaries
+ * - Prints per-operation lines for nested spans (e.g., migration operations under 'apply')
+ * - Respects quiet/json/non-TTY flags (no-op in those cases)
+ *
+ * @param options - Progress adapter configuration
+ * @returns An onProgress callback compatible with control-api operations
+ */
+export function createProgressAdapter(options: ProgressAdapterOptions): OnControlProgress {
+  const { flags } = options;
+
+  // Skip progress if quiet, JSON output, or non-TTY
+  const shouldShowProgress = !flags.quiet && flags.json !== 'object' && process.stdout.isTTY;
+
+  if (!shouldShowProgress) {
+    // Return a no-op callback
+    return () => {
+      // No-op
+    };
+  }
+
+  // Track active spans by spanId
+  const activeSpans = new Map<string, SpanState>();
+
+  return (event: ControlProgressEvent) => {
+    if (event.kind === 'spanStart') {
+      // Nested spans (with parentSpanId) are printed as lines, not spinners
+      if (event.parentSpanId) {
+        console.log(`  → ${event.label}...`);
+        return;
+      }
+
+      // Top-level spans get a spinner
+      const spinner = ora({
+        text: event.label,
+        color: flags.color !== false ? 'cyan' : false,
+      }).start();
+
+      activeSpans.set(event.spanId, {
+        spinner,
+        startTime: Date.now(),
+      });
+    } else if (event.kind === 'spanEnd') {
+      // Complete the spinner for this span (only top-level spans have spinners)
+      const spanState = activeSpans.get(event.spanId);
+      if (spanState) {
+        const elapsed = Date.now() - spanState.startTime;
+        if (event.outcome === 'error') {
+          spanState.spinner.fail(`${spanState.spinner.text} (failed)`);
+        } else if (event.outcome === 'skipped') {
+          spanState.spinner.info(`${spanState.spinner.text} (skipped)`);
+        } else {
+          spanState.spinner.succeed(`${spanState.spinner.text} (${elapsed}ms)`);
+        }
+        activeSpans.delete(event.spanId);
+      }
+      // Nested span ends are no-ops (could log completion if needed)
+    }
+  };
+}

package/src/utils/result-handler.ts

@@ -0,0 +1,44 @@
+import type { Result } from '@prisma-next/utils/result';
+import type { CliStructuredError } from './cli-errors';
+import type { GlobalFlags } from './global-flags';
+import { formatErrorJson, formatErrorOutput } from './output';
+
+/**
+ * Processes a CLI command result, handling both success and error cases.
+ * Formats output appropriately and returns the exit code.
+ * Never throws - returns exit code for commands to use with process.exit().
+ *
+ * @param result - The result from a CLI command
+ * @param flags - Global flags for output formatting
+ * @param onSuccess - Optional callback for successful results (for custom success output)
+ * @returns The exit code that should be used (0 for success, non-zero for errors)
+ */
+export function handleResult<T>(
+  result: Result<T, CliStructuredError>,
+  flags: GlobalFlags,
+  onSuccess?: (value: T) => void,
+): number {
+  if (result.ok) {
+    // Success case
+    if (onSuccess) {
+      onSuccess(result.value);
+    }
+    return 0;
+  }
+
+  // Error case - convert to CLI envelope
+  const envelope = result.failure.toEnvelope();
+
+  // Output error based on flags
+  if (flags.json) {
+    // JSON error to stderr
+    console.error(formatErrorJson(envelope));
+  } else {
+    // Human-readable error to stderr
+    console.error(formatErrorOutput(envelope, flags));
+  }
+
+  // Infer exit code from error domain: CLI errors = 2, RTM errors = 1
+  const exitCode = result.failure.domain === 'CLI' ? 2 : 1;
+  return exitCode;
+}

package/dist/chunk-464LNZCE.js

@@ -1,134 +0,0 @@
-import {
-  formatCommandHelp,
-  formatEmitJson,
-  formatEmitOutput,
-  formatStyledHeader,
-  formatSuccessMessage,
-  handleResult,
-  parseGlobalFlags,
-  performAction,
-  setCommandDescriptions,
-  withSpinner
-} from "./chunk-BZMBKEEQ.js";
-import {
-  loadConfig
-} from "./chunk-HWYQOCAJ.js";
-
-// src/commands/contract-emit.ts
-import { mkdirSync, writeFileSync } from "fs";
-import { dirname, relative, resolve } from "path";
-import { errorContractConfigMissing } from "@prisma-next/core-control-plane/errors";
-import { Command } from "commander";
-function createContractEmitCommand() {
-  const command = new Command("emit");
-  setCommandDescriptions(
-    command,
-    "Write your contract to JSON and sign it",
-    "Reads your contract source (TypeScript or Prisma schema) and emits contract.json and\ncontract.d.ts. The contract.json contains the canonical contract structure, and\ncontract.d.ts provides TypeScript types for type-safe query building."
-  );
-  command.configureHelp({
-    formatHelp: (cmd) => {
-      const flags = parseGlobalFlags({});
-      return formatCommandHelp({ command: cmd, flags });
-    }
-  }).option("--config <path>", "Path to prisma-next.config.ts").option("--json [format]", "Output as JSON (object or ndjson)", 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").action(async (options) => {
-    const flags = parseGlobalFlags(options);
-    const result = await performAction(async () => {
-      const config = await loadConfig(options.config);
-      if (!config.contract) {
-        throw errorContractConfigMissing({
-          why: "Config.contract is required for emit. Define it in your config: contract: { source: ..., output: ..., types: ... }"
-        });
-      }
-      const contractConfig = config.contract;
-      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);
-      if (flags.json !== "object" && !flags.quiet) {
-        const configPath = options.config ? relative(process.cwd(), resolve(options.config)) : "prisma-next.config.ts";
-        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);
-      }
-      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 ?? []
-      });
-      let contractRaw;
-      if (typeof contractConfig.source === "function") {
-        contractRaw = await contractConfig.source();
-      } else {
-        contractRaw = contractConfig.source;
-      }
-      const emitResult = await withSpinner(
-        () => familyInstance.emitContract({ contractIR: contractRaw }),
-        {
-          message: "Emitting contract...",
-          flags
-        }
-      );
-      mkdirSync(dirname(outputJsonPath), { recursive: true });
-      mkdirSync(dirname(outputDtsPath), { recursive: true });
-      writeFileSync(outputJsonPath, emitResult.contractJson, "utf-8");
-      writeFileSync(outputDtsPath, emitResult.contractDts, "utf-8");
-      if (!flags.quiet && flags.json !== "object" && process.stdout.isTTY) {
-        console.log("");
-      }
-      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 exitCode = handleResult(result, flags, (emitResult) => {
-      if (flags.json === "object") {
-        console.log(formatEmitJson(emitResult));
-      } else {
-        const output = formatEmitOutput(emitResult, flags);
-        if (output) {
-          console.log(output);
-        }
-        if (!flags.quiet) {
-          console.log(formatSuccessMessage(flags));
-        }
-      }
-    });
-    process.exit(exitCode);
-  });
-  return command;
-}
-
-export {
-  createContractEmitCommand
-};
-//# sourceMappingURL=chunk-464LNZCE.js.map

package/dist/chunk-464LNZCE.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/commands/contract-emit.ts"],"sourcesContent":["import { mkdirSync, writeFileSync } from 'node:fs';\nimport { dirname, relative, resolve } from 'node:path';\nimport { errorContractConfigMissing } from '@prisma-next/core-control-plane/errors';\nimport { Command } from 'commander';\nimport { loadConfig } from '../config-loader';\nimport { performAction } from '../utils/action';\nimport { setCommandDescriptions } from '../utils/command-helpers';\nimport { parseGlobalFlags } from '../utils/global-flags';\nimport {\n  formatCommandHelp,\n  formatEmitJson,\n  formatEmitOutput,\n  formatStyledHeader,\n  formatSuccessMessage,\n} from '../utils/output';\nimport { handleResult } from '../utils/result-handler';\nimport { withSpinner } from '../utils/spinner';\n\ninterface ContractEmitOptions {\n  readonly config?: string;\n  readonly json?: string | boolean;\n  readonly quiet?: boolean;\n  readonly q?: boolean;\n  readonly verbose?: boolean;\n  readonly v?: boolean;\n  readonly vv?: boolean;\n  readonly trace?: boolean;\n  readonly timestamps?: boolean;\n  readonly color?: boolean;\n  readonly 'no-color'?: boolean;\n}\n\nexport function createContractEmitCommand(): Command {\n  const command = new Command('emit');\n  setCommandDescriptions(\n    command,\n    'Write your contract to JSON and sign it',\n    'Reads your contract source (TypeScript or Prisma schema) and emits contract.json and\\n' +\n      'contract.d.ts. The contract.json contains the canonical contract structure, and\\n' +\n      'contract.d.ts provides TypeScript types for type-safe query building.',\n  );\n  command\n    .configureHelp({\n      formatHelp: (cmd) => {\n        const flags = parseGlobalFlags({});\n        return formatCommandHelp({ command: cmd, flags });\n      },\n    })\n    .option('--config <path>', 'Path to prisma-next.config.ts')\n    .option('--json [format]', 'Output as JSON (object or ndjson)', false)\n    .option('-q, --quiet', 'Quiet mode: errors only')\n    .option('-v, --verbose', 'Verbose output: debug info, timings')\n    .option('-vv, --trace', 'Trace output: deep internals, stack traces')\n    .option('--timestamps', 'Add timestamps to output')\n    .option('--color', 'Force color output')\n    .option('--no-color', 'Disable color output')\n    .action(async (options: ContractEmitOptions) => {\n      const flags = parseGlobalFlags(options);\n\n      const result = await performAction(async () => {\n        // Load config\n        const config = await loadConfig(options.config);\n\n        // Resolve contract from config\n        if (!config.contract) {\n          throw errorContractConfigMissing({\n            why: 'Config.contract is required for emit. Define it in your config: contract: { source: ..., output: ..., types: ... }',\n          });\n        }\n\n        // Contract config is already normalized by defineConfig() with defaults applied\n        const contractConfig = config.contract;\n\n        // Resolve artifact paths from config (already normalized by defineConfig() with defaults)\n        if (!contractConfig.output || !contractConfig.types) {\n          throw errorContractConfigMissing({\n            why: 'Contract config must have output and types paths. This should not happen if defineConfig() was used.',\n          });\n        }\n        const outputJsonPath = resolve(contractConfig.output);\n        const outputDtsPath = resolve(contractConfig.types);\n\n        // Output header (only for human-readable output)\n        if (flags.json !== 'object' && !flags.quiet) {\n          // Normalize config path for display (match contract path format - no ./ prefix)\n          const configPath = options.config\n            ? relative(process.cwd(), resolve(options.config))\n            : 'prisma-next.config.ts';\n          // Convert absolute paths to relative paths for display\n          const contractPath = relative(process.cwd(), outputJsonPath);\n          const typesPath = relative(process.cwd(), outputDtsPath);\n          const header = formatStyledHeader({\n            command: 'contract emit',\n            description: 'Write your contract to JSON and sign it',\n            url: 'https://pris.ly/contract-emit',\n            details: [\n              { label: 'config', value: configPath },\n              { label: 'contract', value: contractPath },\n              { label: 'types', value: typesPath },\n            ],\n            flags,\n          });\n          console.log(header);\n        }\n\n        // Create family instance (assembles operation registry, type imports, extension IDs)\n        // Note: emit command doesn't need driver, but ControlFamilyDescriptor.create() requires it\n        // We'll need to provide a minimal driver descriptor or make driver optional for emit\n        // For now, we'll require driver to be present in config even for emit\n        if (!config.driver) {\n          throw errorContractConfigMissing({\n            why: 'Config.driver is required. Even though emit does not use the driver, it is required by ControlFamilyDescriptor.create()',\n          });\n        }\n        const familyInstance = config.family.create({\n          target: config.target,\n          adapter: config.adapter,\n          driver: config.driver,\n          extensionPacks: config.extensionPacks ?? [],\n        });\n\n        // Resolve contract source from config (user's config handles loading)\n        let contractRaw: unknown;\n        if (typeof contractConfig.source === 'function') {\n          contractRaw = await contractConfig.source();\n        } else {\n          contractRaw = contractConfig.source;\n        }\n\n        // Call emitContract on family instance (handles stripping mappings and validation internally)\n        const emitResult = await withSpinner(\n          () => familyInstance.emitContract({ contractIR: contractRaw }),\n          {\n            message: 'Emitting contract...',\n            flags,\n          },\n        );\n\n        // Create directories if needed\n        mkdirSync(dirname(outputJsonPath), { recursive: true });\n        mkdirSync(dirname(outputDtsPath), { recursive: true });\n\n        // Write the results to files\n        writeFileSync(outputJsonPath, emitResult.contractJson, 'utf-8');\n        writeFileSync(outputDtsPath, emitResult.contractDts, 'utf-8');\n\n        // Add blank line after all async operations if spinners were shown\n        if (!flags.quiet && flags.json !== 'object' && process.stdout.isTTY) {\n          console.log('');\n        }\n\n        // Return result with file paths for output formatting\n        return {\n          coreHash: emitResult.coreHash,\n          profileHash: emitResult.profileHash,\n          outDir: dirname(outputJsonPath),\n          files: {\n            json: outputJsonPath,\n            dts: outputDtsPath,\n          },\n          timings: {\n            total: 0, // Timing is handled by emitContract internally if needed\n          },\n        };\n      });\n\n      // Handle result - formats output and returns exit code\n      const exitCode = handleResult(result, flags, (emitResult) => {\n        // Output based on flags\n        if (flags.json === 'object') {\n          // JSON output to stdout\n          console.log(formatEmitJson(emitResult));\n        } else {\n          // Human-readable output to stdout\n          const output = formatEmitOutput(emitResult, flags);\n          if (output) {\n            console.log(output);\n          }\n          // Output success message\n          if (!flags.quiet) {\n            console.log(formatSuccessMessage(flags));\n          }\n        }\n      });\n      process.exit(exitCode);\n    });\n\n  return command;\n}\n"],"mappings":"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","names":[]}