@prisma-next/cli 0.12.0-dev.17 → 0.12.0-dev.2

package/src/control-api/operations/migration-apply.ts

@@ -7,7 +7,6 @@ import type {
   TargetMigrationsCapability,
 } from '@prisma-next/framework-components/control';
 import {
-  buildSynthMigrationEdge,
   type ContractMarkerRecordLike,
   type ContractSpaceAggregate,
   type ContractSpaceMember,
@@ -320,7 +319,7 @@ export async function executeMigrationApply<TFamilyId extends string, TTargetId
     includeMarkers: true,
   });
   const totalMigrationsApplied = applied.value.orderedResolutions.reduce(
-    (sum, r) => sum + r.entry.migrationEdges.length,
+    (sum, r) => sum + (r.entry.migrationEdges?.length ?? 0),
     0,
   );
   const summary = `Applied ${totalMigrationsApplied} migration(s) (${applied.value.totalOpsExecuted} operation(s)) across ${orderedAll.length} contract space(s)`;
@@ -362,13 +361,7 @@ function buildAtHeadResolution(args: {
     displayOps: [],
     destinationContract: member.contract(),
     strategy: 'graph-walk',
-    migrationEdges: [
-      buildSynthMigrationEdge({
-        currentMarkerStorageHash: liveMarker?.storageHash,
-        destinationStorageHash: targetHash,
-        operationCount: 0,
-      }),
-    ],
+    migrationEdges: [],
   };
 }
 
@@ -411,7 +404,7 @@ function buildSuccess(args: BuildSuccessArgs): MigrationApplySuccess {
   // JSON-shape consumers (e.g. `parsed.applied.length` in integration
   // tests). The aggregate per-space breakdown lives on `perSpace[]`.
   const applied = args.orderedResolutions.flatMap((r) => {
-    const edges = r.entry.migrationEdges;
+    const edges = r.entry.migrationEdges ?? [];
     return edges.map((edge) => ({
       spaceId: r.spaceId,
       dirName: edge.dirName,

package/src/control-api/types.ts

@@ -2,11 +2,7 @@ import type {
   ContractSourceDiagnostics,
   ContractSourceProvider,
 } from '@prisma-next/config/config-types';
-import type {
-  Contract,
-  ContractMarkerRecord,
-  LedgerEntryRecord,
-} from '@prisma-next/contract/types';
+import type { Contract, ContractMarkerRecord } from '@prisma-next/contract/types';
 import type {
   ControlAdapterDescriptor,
   ControlDriverDescriptor,
@@ -880,13 +876,6 @@ export interface ControlClient {
    */
   readAllMarkers(): Promise<ReadonlyMap<string, ContractMarkerRecord>>;
 
-  /**
-   * Reads the per-migration ledger journal for `space` in apply order.
-   * Returns an empty array when the ledger store does not yet exist or
-   * has no rows for that space.
-   */
-  readLedger(space?: string): Promise<readonly LedgerEntryRecord[]>;
-
   /**
    * Applies pre-planned on-disk migrations to the database.
    * Each migration runs in its own transaction with full execution checks.

package/src/utils/formatters/migration-graph-layout.ts

@@ -379,7 +379,6 @@ function emptyCells(width: number): StructuralCell[] {
 function buildBranchConnectorCells(
   startLane: number,
   endLane: number,
-  fanTargetLanes: ReadonlySet<number>,
   activeLanes: ReadonlySet<number>,
   gridWidth: number,
 ): StructuralCell[] {
@@ -394,13 +393,7 @@ function buildBranchConnectorCells(
     } else if (lane === endLane) {
       cells[lane] = { kind: 'branch-corner' };
     } else if (lane > startLane && lane < endLane) {
-      if (fanTargetLanes.has(lane)) {
-        cells[lane] = { kind: 'branch-tee' };
-      } else if (activeLanes.has(lane)) {
-        cells[lane] = { kind: 'arc-crossing' };
-      } else {
-        cells[lane] = { kind: 'branch-tee' };
-      }
+      cells[lane] = { kind: 'branch-tee' };
     }
   }
   return cells;
@@ -409,7 +402,6 @@ function buildBranchConnectorCells(
 function buildMergeConnectorCells(
   startLane: number,
   endLane: number,
-  fanTargetLanes: ReadonlySet<number>,
   activeLanes: ReadonlySet<number>,
   gridWidth: number,
 ): StructuralCell[] {
@@ -424,13 +416,7 @@ function buildMergeConnectorCells(
     } else if (lane === endLane) {
       cells[lane] = { kind: 'merge-corner' };
     } else if (lane > startLane && lane < endLane) {
-      if (fanTargetLanes.has(lane)) {
-        cells[lane] = { kind: 'merge-tee' };
-      } else if (activeLanes.has(lane)) {
-        cells[lane] = { kind: 'arc-crossing' };
-      } else {
-        cells[lane] = { kind: 'horizontal-pass' };
-      }
+      cells[lane] = activeLanes.has(lane) ? { kind: 'merge-tee' } : { kind: 'horizontal-pass' };
     }
   }
   return cells;
@@ -936,14 +922,13 @@ function layoutComponent(
     const endLane = Math.max(...laneIndices);
     ensureGridWidth(endLane + 1);
     const activeLanes = new Set(activeLaneIndices());
-    const fanTargetLanes = new Set(laneIndices);
     rows.push({
       kind: 'merge-connector',
       contractHash,
       startLane,
       endLane,
       branchCount: laneIndices.length,
-      cells: buildMergeConnectorCells(startLane, endLane, fanTargetLanes, activeLanes, gridWidth),
+      cells: buildMergeConnectorCells(startLane, endLane, activeLanes, gridWidth),
     });
     for (const index of laneIndices) {
       if (index !== startLane) setLane(index, null);
@@ -956,7 +941,6 @@ function layoutComponent(
     startLane: number,
     endLane: number,
     branchCount: number,
-    fanTargetLanes: readonly number[],
   ): void {
     ensureGridWidth(endLane + 1);
     const activeLanes = new Set(activeLaneIndices());
@@ -966,13 +950,7 @@ function layoutComponent(
       startLane,
       endLane,
       branchCount,
-      cells: buildBranchConnectorCells(
-        startLane,
-        endLane,
-        new Set(fanTargetLanes),
-        activeLanes,
-        gridWidth,
-      ),
+      cells: buildBranchConnectorCells(startLane, endLane, activeLanes, gridWidth),
     });
   }
 
@@ -1068,7 +1046,7 @@ function layoutComponent(
 
     if (groups.length >= 2) {
       const endLane = Math.max(...laneForGroup);
-      emitBranchConnector(node, column, endLane, groups.length, laneForGroup);
+      emitBranchConnector(node, column, endLane, groups.length);
     }
 
     for (let groupIndex = 0; groupIndex < groups.length; groupIndex++) {