@prisma-next/cli 0.3.0-dev.34 → 0.3.0-dev.36

package/src/control-api/operations/db-init.ts

@@ -119,7 +119,7 @@ export async function executeDbInit<TFamilyId extends string, TTargetId extends
   const existingMarker = await familyInstance.readMarker({ driver });
   if (existingMarker) {
     const markerMatchesDestination =
-      existingMarker.coreHash === migrationPlan.destination.coreHash &&
+      existingMarker.storageHash === migrationPlan.destination.storageHash &&
       (!migrationPlan.destination.profileHash ||
         existingMarker.profileHash === migrationPlan.destination.profileHash);
 
@@ -138,7 +138,7 @@ export async function executeDbInit<TFamilyId extends string, TTargetId extends
           ? {
               execution: { operationsPlanned: 0, operationsExecuted: 0 },
               marker: {
-                coreHash: existingMarker.coreHash,
+                storageHash: existingMarker.storageHash,
                 profileHash: existingMarker.profileHash,
               },
             }
@@ -159,11 +159,11 @@ export async function executeDbInit<TFamilyId extends string, TTargetId extends
       code: 'MARKER_ORIGIN_MISMATCH' as const,
       summary: 'Existing contract marker does not match plan destination',
       marker: {
-        coreHash: existingMarker.coreHash,
+        storageHash: existingMarker.storageHash,
         profileHash: existingMarker.profileHash,
       },
       destination: {
-        coreHash: migrationPlan.destination.coreHash,
+        storageHash: migrationPlan.destination.storageHash,
         profileHash: migrationPlan.destination.profileHash,
       },
       why: undefined,
@@ -271,10 +271,10 @@ export async function executeDbInit<TFamilyId extends string, TTargetId extends
     },
     marker: migrationPlan.destination.profileHash
       ? {
-          coreHash: migrationPlan.destination.coreHash,
+          storageHash: migrationPlan.destination.storageHash,
           profileHash: migrationPlan.destination.profileHash,
         }
-      : { coreHash: migrationPlan.destination.coreHash },
+      : { storageHash: migrationPlan.destination.storageHash },
     summary: `Applied ${execution.operationsExecuted} operation(s), marker written`,
   };
   return ok(result);

package/src/control-api/types.ts

@@ -236,14 +236,9 @@ export interface EmitContractConfig {
   readonly source: EmitContractSource;
   /**
    * Output path for contract.json.
-   * Should be an absolute or relative path.
+   * The .d.ts types file will be colocated (e.g., contract.json → contract.d.ts).
    */
   readonly output: string;
-  /**
-   * Output path for contract.d.ts.
-   * Should be an absolute or relative path.
-   */
-  readonly types: string;
 }
 
 /**
@@ -279,7 +274,7 @@ export interface DbInitSuccess {
     readonly operationsExecuted: number;
   };
   readonly marker?: {
-    readonly coreHash: string;
+    readonly storageHash: string;
     readonly profileHash?: string;
   };
   readonly summary: string;
@@ -300,11 +295,11 @@ export interface DbInitFailure {
   readonly conflicts: ReadonlyArray<MigrationPlannerConflict> | undefined;
   readonly meta: Record<string, unknown> | undefined;
   readonly marker?: {
-    readonly coreHash?: string;
+    readonly storageHash?: string;
     readonly profileHash?: string;
   };
   readonly destination?: {
-    readonly coreHash: string;
+    readonly storageHash: string;
     readonly profileHash?: string | undefined;
   };
 }
@@ -320,8 +315,10 @@ export type DbInitResult = Result<DbInitSuccess, DbInitFailure>;
  * Contains the hashes and paths of emitted files.
  */
 export interface EmitSuccess {
-  /** Core hash of the emitted contract */
-  readonly coreHash: string;
+  /** Storage hash of the emitted contract */
+  readonly storageHash: string;
+  /** Execution hash of the emitted contract (if execution section exists) */
+  readonly executionHash?: string;
   /** Profile hash of the emitted contract (target-specific) */
   readonly profileHash: string;
   /** The emitted contract as JSON string */
@@ -351,6 +348,41 @@ export interface EmitFailure {
  */
 export type EmitResult = Result<EmitSuccess, EmitFailure>;
 
+// ============================================================================
+// Standalone Contract Emit Types
+// ============================================================================
+
+/**
+ * Options for the standalone executeContractEmit function.
+ * Used by tooling (e.g., Vite plugin) that needs to emit contracts
+ * without the full ControlClient infrastructure.
+ */
+export interface ContractEmitOptions {
+  /** Path to the prisma-next.config.ts file */
+  readonly configPath: string;
+  /** Optional AbortSignal for cancellation support */
+  readonly signal?: AbortSignal;
+}
+
+/**
+ * Result from the standalone executeContractEmit function.
+ */
+export interface ContractEmitResult {
+  /** Hash of the storage contract (schema-level) */
+  readonly storageHash: string;
+  /** Hash of the execution contract (if execution section exists) */
+  readonly executionHash?: string;
+  /** Hash of the profile (target+extensions) */
+  readonly profileHash: string;
+  /** Paths to the emitted files */
+  readonly files: {
+    /** Path to the emitted contract.json file */
+    readonly json: string;
+    /** Path to the emitted contract.d.ts file */
+    readonly dts: string;
+  };
+}
+
 // ============================================================================
 // Client Interface
 // ============================================================================
@@ -397,7 +429,7 @@ export interface ControlClient {
 
   /**
    * Verifies database marker matches the contract.
-   * Compares coreHash and profileHash.
+   * Compares storageHash and profileHash.
    *
    * @returns Structured result (ok: false for mismatch, not throwing)
    * @throws If not connected or infrastructure failure

package/src/exports/control-api.ts

@@ -18,8 +18,13 @@ export type {
 // Client factory
 export { createControlClient } from '../control-api/client';
 
+// Standalone operations (for tooling that doesn't need full client)
+export { executeContractEmit } from '../control-api/operations/contract-emit';
+
 // CLI-specific types
 export type {
+  ContractEmitOptions,
+  ContractEmitResult,
   ContractSourceLoader,
   ContractSourceValue,
   ControlActionName,

package/src/load-ts-contract.ts

@@ -30,26 +30,31 @@ function validatePurity(value: unknown): void {
     return;
   }
 
-  const seen = new WeakSet();
+  const path = new WeakSet();
+
   function check(value: unknown): void {
     if (value === null || typeof value !== 'object') {
       return;
     }
 
-    if (seen.has(value)) {
+    if (path.has(value)) {
       throw new Error('Contract export contains circular references');
     }
-    seen.add(value);
+    path.add(value);
 
-    for (const key in value) {
-      const descriptor = Object.getOwnPropertyDescriptor(value, key);
-      if (descriptor && (descriptor.get || descriptor.set)) {
-        throw new Error(`Contract export contains getter/setter at key "${key}"`);
-      }
-      if (descriptor && typeof descriptor.value === 'function') {
-        throw new Error(`Contract export contains function at key "${key}"`);
+    try {
+      for (const key in value) {
+        const descriptor = Object.getOwnPropertyDescriptor(value, key);
+        if (descriptor && (descriptor.get || descriptor.set)) {
+          throw new Error(`Contract export contains getter/setter at key "${key}"`);
+        }
+        if (descriptor && typeof descriptor.value === 'function') {
+          throw new Error(`Contract export contains function at key "${key}"`);
+        }
+        check((value as Record<string, unknown>)[key]);
       }
-      check((value as Record<string, unknown>)[key]);
+    } finally {
+      path.delete(value);
     }
   }
 

package/src/utils/output.ts

@@ -1,4 +1,5 @@
 import { relative } from 'node:path';
+import { ifDefined } from '@prisma-next/utils/defined';
 import { bgGreen, blue, bold, cyan, dim, green, magenta, red, yellow } from 'colorette';
 import type { Command } from 'commander';
 import stringWidth from 'string-width';
@@ -6,7 +7,8 @@ import stripAnsi from 'strip-ansi';
 import wrapAnsi from 'wrap-ansi';
 // EmitContractResult type for CLI output formatting (includes file paths)
 export interface EmitContractResult {
-  readonly coreHash: string;
+  readonly storageHash: string;
+  readonly executionHash?: string;
   readonly profileHash: string;
   readonly outDir: string;
   readonly files: {
@@ -94,7 +96,10 @@ export function formatEmitOutput(result: EmitContractResult, flags: GlobalFlags)
 
   lines.push(`${prefix}✔ Emitted contract.json → ${jsonPath}`);
   lines.push(`${prefix}✔ Emitted contract.d.ts → ${dtsPath}`);
-  lines.push(`${prefix}  coreHash: ${result.coreHash}`);
+  lines.push(`${prefix}  storageHash: ${result.storageHash}`);
+  if (result.executionHash) {
+    lines.push(`${prefix}  executionHash: ${result.executionHash}`);
+  }
   if (result.profileHash) {
     lines.push(`${prefix}  profileHash: ${result.profileHash}`);
   }
@@ -111,7 +116,8 @@ export function formatEmitOutput(result: EmitContractResult, flags: GlobalFlags)
 export function formatEmitJson(result: EmitContractResult): string {
   const output = {
     ok: true,
-    coreHash: result.coreHash,
+    storageHash: result.storageHash,
+    ...ifDefined('executionHash', result.executionHash),
     ...(result.profileHash ? { profileHash: result.profileHash } : {}),
     outDir: result.outDir,
     files: result.files,
@@ -223,7 +229,7 @@ export function formatVerifyOutput(result: VerifyDatabaseResult, flags: GlobalFl
 
   if (result.ok) {
     lines.push(`${prefix}${formatGreen('✔')} ${result.summary}`);
-    lines.push(`${prefix}${formatDimText(`  coreHash: ${result.contract.coreHash}`)}`);
+    lines.push(`${prefix}${formatDimText(`  storageHash: ${result.contract.storageHash}`)}`);
     if (result.contract.profileHash) {
       lines.push(`${prefix}${formatDimText(`  profileHash: ${result.contract.profileHash}`)}`);
     }
@@ -772,8 +778,8 @@ export function formatSignOutput(result: SignDatabaseResult, flags: GlobalFlags)
     lines.push(`${prefix}${formatGreen('✔')} Database signed`);
 
     // Show from -> to hashes with clear labels
-    const previousHash = result.marker.previous?.coreHash ?? 'none';
-    const currentHash = result.contract.coreHash;
+    const previousHash = result.marker.previous?.storageHash ?? 'none';
+    const currentHash = result.contract.storageHash;
 
     lines.push(`${prefix}${formatDimText(`  from: ${previousHash}`)}`);
     lines.push(`${prefix}${formatDimText(`  to:   ${currentHash}`)}`);
@@ -814,7 +820,7 @@ export interface DbInitResult {
   readonly plan?: {
     readonly targetId: string;
     readonly destination: {
-      readonly coreHash: string;
+      readonly storageHash: string;
       readonly profileHash?: string;
     };
     readonly operations: readonly {
@@ -828,7 +834,7 @@ export interface DbInitResult {
     readonly operationsExecuted: number;
   };
   readonly marker?: {
-    readonly coreHash: string;
+    readonly storageHash: string;
     readonly profileHash?: string;
   };
   readonly summary: string;
@@ -872,7 +878,7 @@ export function formatDbInitPlanOutput(result: DbInitResult, flags: GlobalFlags)
   if (result.plan?.destination) {
     lines.push(`${prefix}`);
     lines.push(
-      `${prefix}${formatDimText(`Destination hash: ${result.plan.destination.coreHash}`)}`,
+      `${prefix}${formatDimText(`Destination hash: ${result.plan.destination.storageHash}`)}`,
     );
   }
 
@@ -910,7 +916,7 @@ export function formatDbInitApplyOutput(result: DbInitResult, flags: GlobalFlags
 
     // Marker info
     if (result.marker) {
-      lines.push(`${prefix}${formatDimText(`  Marker written: ${result.marker.coreHash}`)}`);
+      lines.push(`${prefix}${formatDimText(`  Marker written: ${result.marker.storageHash}`)}`);
       if (result.marker.profileHash) {
         lines.push(`${prefix}${formatDimText(`  Profile hash: ${result.marker.profileHash}`)}`);
       }