@prisma-next/family-sql 0.5.0-dev.61 → 0.5.0-dev.63

package/src/core/control-instance.ts

@@ -20,6 +20,7 @@ import type {
   VerifyDatabaseSchemaResult,
 } from '@prisma-next/framework-components/control';
 import {
+  APP_SPACE_ID,
   SchemaTreeNode,
   VERIFY_CODE_HASH_MISMATCH,
   VERIFY_CODE_MARKER_MISSING,
@@ -355,7 +356,7 @@ export function createSqlFamilyInstance<TTargetId extends string>(
       const contractProfileHash = contract.profileHash;
       const contractTarget = contract.target;
 
-      const marker = await getControlAdapter().readMarker(driver);
+      const marker = await getControlAdapter().readMarker(driver, APP_SPACE_ID);
 
       let missingCodecs: readonly string[] | undefined;
       let codecCoverageSkipped = false;
@@ -500,7 +501,7 @@ export function createSqlFamilyInstance<TTargetId extends string>(
       await driver.query(ensureSchemaStatement.sql, ensureSchemaStatement.params);
       await driver.query(ensureTableStatement.sql, ensureTableStatement.params);
 
-      const existingMarker = await getControlAdapter().readMarker(driver);
+      const existingMarker = await getControlAdapter().readMarker(driver, APP_SPACE_ID);
 
       let markerCreated = false;
       let markerUpdated = false;
@@ -508,6 +509,7 @@ export function createSqlFamilyInstance<TTargetId extends string>(
 
       if (!existingMarker) {
         const write = writeContractMarker({
+          space: APP_SPACE_ID,
           storageHash: contractStorageHash,
           profileHash: contractProfileHash,
           contractJson: contractInput,
@@ -528,6 +530,7 @@ export function createSqlFamilyInstance<TTargetId extends string>(
             profileHash: existingProfileHash,
           };
           const write = writeContractMarker({
+            space: APP_SPACE_ID,
             storageHash: contractStorageHash,
             profileHash: contractProfileHash,
             contractJson: contractInput,
@@ -576,8 +579,9 @@ export function createSqlFamilyInstance<TTargetId extends string>(
     },
     async readMarker(options: {
       readonly driver: ControlDriverInstance<'sql', string>;
+      readonly space: string;
     }): Promise<ContractMarkerRecord | null> {
-      return getControlAdapter().readMarker(options.driver);
+      return getControlAdapter().readMarker(options.driver, options.space);
     },
     async introspect(options: {
       readonly driver: ControlDriverInstance<'sql', string>;

package/src/core/migrations/plan-helpers.ts

@@ -98,6 +98,7 @@ export function createMigrationPlan<TTargetDetails>(
 ): SqlMigrationPlan<TTargetDetails> {
   return Object.freeze({
     targetId: options.targetId,
+    spaceId: options.spaceId,
     ...(options.origin !== undefined
       ? { origin: options.origin ? Object.freeze({ ...options.origin }) : null }
       : {}),

package/src/core/migrations/types.ts

@@ -1,6 +1,7 @@
 import type { Contract } from '@prisma-next/contract/types';
 import type { TargetBoundComponentDescriptor } from '@prisma-next/framework-components/components';
 import type {
+  ContractSpace,
   ControlAdapterDescriptor,
   ControlDriverInstance,
   ControlExtensionDescriptor,
@@ -128,6 +129,20 @@ export interface SqlControlExtensionDescriptor<TTargetId extends string>
   extends ControlExtensionDescriptor<'sql', TTargetId> {
   readonly databaseDependencies?: ComponentDatabaseDependencies<unknown>;
   readonly queryOperations?: () => ReadonlyArray<SqlOperationDescriptor>;
+  /**
+   * Schema-contributing extensions opt into the per-space planner / runner /
+   * verifier by setting this field. Extensions without it are codec-only or
+   * query-ops-only — today's behaviour preserved.
+   *
+   * The shape comes from `@prisma-next/framework-components/control`
+   * (`ContractSpace`) — contract-space identity is a framework concept,
+   * not a SQL-specific one. The SQL family specialises the generic to
+   * `Contract<SqlStorage>` so descriptor authors continue to see a
+   * typed contract value.
+   *
+   * @see specs/framework-mechanism.spec.md § 1.
+   */
+  readonly contractSpace?: ContractSpace<Contract<SqlStorage>>;
 }
 
 export interface SqlControlAdapterDescriptor<TTargetId extends string>
@@ -182,6 +197,21 @@ export interface SqlMigrationPlanContractInfo {
 }
 
 export interface SqlMigrationPlan<TTargetDetails> extends MigrationPlan {
+  /**
+   * Contract space this plan applies to. The runner uses this to key the
+   * `prisma_contract.marker` row it writes/reads (`space = <spaceId>`),
+   * so per-extension plans hit per-extension marker rows instead of all
+   * collapsing onto the app's row.
+   *
+   * App-plan callers pass `APP_SPACE_ID` (`'app'`); per-extension plans
+   * pass the extension's space id. Required at every call site so the
+   * type system surfaces every place that needs to thread the value
+   * (rather than letting an `?? APP_SPACE_ID` fall-through silently
+   * collapse multi-space markers onto the `'app'` row).
+   *
+   * @see specs/framework-mechanism.spec.md § 2.
+   */
+  readonly spaceId: string;
   /**
    * Origin contract identity that the plan expects the database to currently be at.
    * If omitted or null, the runner skips origin validation entirely.
@@ -246,6 +276,14 @@ export interface SqlMigrationPlannerPlanOptions {
   readonly schema: SqlSchemaIR;
   readonly policy: MigrationOperationPolicy;
   readonly schemaName?: string;
+  /**
+   * Contract space the plan applies to. The planner stamps this onto
+   * the produced {@link SqlMigrationPlan.spaceId} so the runner keys
+   * the marker row by the right space. App-plan callers pass
+   * `APP_SPACE_ID`; per-extension callers pass the extension's space
+   * id.
+   */
+  readonly spaceId: string;
   /**
    * The "from" contract (state the planner assumes the database starts at),
    * or `null` for reconciliation flows that have no prior contract.
@@ -311,6 +349,7 @@ export interface SqlMigrationRunnerExecuteOptions<TTargetDetails> {
 
 export type SqlMigrationRunnerErrorCode =
   | 'DESTINATION_CONTRACT_MISMATCH'
+  | 'LEGACY_MARKER_SHAPE'
   | 'MARKER_ORIGIN_MISMATCH'
   | 'POLICY_VIOLATION'
   | 'PRECHECK_FAILED'
@@ -346,6 +385,10 @@ export interface SqlControlTargetDescriptor<TTargetId extends string, TTargetDet
 
 export interface CreateSqlMigrationPlanOptions<TTargetDetails> {
   readonly targetId: string;
+  /**
+   * Contract space this plan applies to. Mirrors {@link SqlMigrationPlan.spaceId}.
+   */
+  readonly spaceId: string;
   readonly origin?: SqlMigrationPlanContractInfo | null;
   readonly destination: SqlMigrationPlanContractInfo;
   readonly operations: readonly SqlMigrationPlanOperation<TTargetDetails>[];