@prisma-next/sql-runtime 0.3.0-dev.34 → 0.3.0-dev.36

package/src/sql-family-adapter.ts

@@ -33,11 +33,15 @@ export class SqlFamilyAdapter<TContract extends SqlContract<SqlStorage>>
       });
     }
 
-    if (plan.meta.coreHash !== contract.coreHash) {
-      throw runtimeError('PLAN.HASH_MISMATCH', 'Plan core hash does not match runtime contract', {
-        planCoreHash: plan.meta.coreHash,
-        runtimeCoreHash: contract.coreHash,
-      });
+    if (plan.meta.storageHash !== contract.storageHash) {
+      throw runtimeError(
+        'PLAN.HASH_MISMATCH',
+        'Plan storage hash does not match runtime contract',
+        {
+          planStorageHash: plan.meta.storageHash,
+          runtimeStorageHash: contract.storageHash,
+        },
+      );
     }
   }
 }

package/src/sql-marker.ts

@@ -6,7 +6,7 @@ export interface SqlStatement {
 }
 
 export interface WriteMarkerInput {
-  readonly coreHash: string;
+  readonly storageHash: string;
   readonly profileHash: string;
   readonly contractJson?: unknown;
   readonly canonicalVersion?: number;
@@ -57,7 +57,7 @@ export interface WriteContractMarkerStatements {
 export function writeContractMarker(input: WriteMarkerInput): WriteContractMarkerStatements {
   const baseParams: readonly unknown[] = [
     1,
-    input.coreHash,
+    input.storageHash,
     input.profileHash,
     input.contractJson ?? null,
     input.canonicalVersion ?? null,

package/src/sql-runtime.ts

@@ -1,4 +1,6 @@
 import type { ExecutionPlan } from '@prisma-next/contract/types';
+import type { ExecutionStackInstance } from '@prisma-next/core-execution-plane/stack';
+import type { RuntimeDriverInstance } from '@prisma-next/core-execution-plane/types';
 import type { OperationRegistry } from '@prisma-next/operations';
 import type {
   Log,
@@ -15,41 +17,86 @@ import type {
   Adapter,
   CodecRegistry,
   LoweredStatement,
+  QueryAst,
   SelectAst,
   SqlDriver,
 } from '@prisma-next/sql-relational-core/ast';
 import type { SqlQueryPlan } from '@prisma-next/sql-relational-core/plan';
+import type { JsonSchemaValidatorRegistry } from '@prisma-next/sql-relational-core/query-lane-context';
+import { ifDefined } from '@prisma-next/utils/defined';
 import { decodeRow } from './codecs/decoding';
 import { encodeParams } from './codecs/encoding';
 import { validateCodecRegistryCompleteness } from './codecs/validation';
 import { lowerSqlPlan } from './lower-sql-plan';
-import type { RuntimeContext } from './sql-context';
+import type {
+  ExecutionContext,
+  SqlRuntimeAdapterInstance,
+  SqlRuntimeExtensionInstance,
+} from './sql-context';
 import { SqlFamilyAdapter } from './sql-family-adapter';
 
 export interface RuntimeOptions<
   TContract extends SqlContract<SqlStorage> = SqlContract<SqlStorage>,
 > {
-  readonly driver: SqlDriver;
+  readonly context: ExecutionContext<TContract>;
+  readonly adapter: Adapter<QueryAst, SqlContract<SqlStorage>, LoweredStatement>;
+  readonly driver: SqlDriver<unknown>;
   readonly verify: RuntimeVerifyOptions;
-  readonly context: RuntimeContext<TContract>;
   readonly plugins?: readonly Plugin<
     TContract,
     Adapter<SelectAst, SqlContract<SqlStorage>, LoweredStatement>,
-    SqlDriver
+    SqlDriver<unknown>
   >[];
   readonly mode?: 'strict' | 'permissive';
   readonly log?: Log;
 }
 
-export interface Runtime {
-  execute<Row = Record<string, unknown>>(
-    plan: ExecutionPlan<Row> | SqlQueryPlan<Row>,
-  ): AsyncIterableResult<Row>;
+export interface CreateRuntimeOptions<
+  TContract extends SqlContract<SqlStorage> = SqlContract<SqlStorage>,
+  TTargetId extends string = string,
+> {
+  readonly stackInstance: ExecutionStackInstance<
+    'sql',
+    TTargetId,
+    SqlRuntimeAdapterInstance<TTargetId>,
+    RuntimeDriverInstance<'sql', TTargetId>,
+    SqlRuntimeExtensionInstance<TTargetId>
+  >;
+  readonly context: ExecutionContext<TContract>;
+  readonly driver: SqlDriver<unknown>;
+  readonly verify: RuntimeVerifyOptions;
+  readonly plugins?: readonly Plugin<
+    TContract,
+    Adapter<SelectAst, SqlContract<SqlStorage>, LoweredStatement>,
+    SqlDriver<unknown>
+  >[];
+  readonly mode?: 'strict' | 'permissive';
+  readonly log?: Log;
+}
+
+export interface Runtime extends RuntimeQueryable {
+  connection(): Promise<RuntimeConnection>;
   telemetry(): RuntimeTelemetryEvent | null;
   close(): Promise<void>;
   operations(): OperationRegistry;
 }
 
+export interface RuntimeConnection extends RuntimeQueryable {
+  transaction(): Promise<RuntimeTransaction>;
+  release(): Promise<void>;
+}
+
+export interface RuntimeTransaction extends RuntimeQueryable {
+  commit(): Promise<void>;
+  rollback(): Promise<void>;
+}
+
+export interface RuntimeQueryable {
+  execute<Row = Record<string, unknown>>(
+    plan: ExecutionPlan<Row> | SqlQueryPlan<Row>,
+  ): AsyncIterableResult<Row>;
+}
+
 export type { RuntimeTelemetryEvent, RuntimeVerifyOptions, TelemetryOutcome };
 
 class SqlRuntimeImpl<TContract extends SqlContract<SqlStorage> = SqlContract<SqlStorage>>
@@ -58,18 +105,20 @@ class SqlRuntimeImpl<TContract extends SqlContract<SqlStorage> = SqlContract<Sql
   private readonly core: RuntimeCore<
     TContract,
     Adapter<SelectAst, SqlContract<SqlStorage>, LoweredStatement>,
-    SqlDriver
+    SqlDriver<unknown>
   >;
   private readonly contract: TContract;
-  private readonly context: RuntimeContext<TContract>;
+  private readonly adapter: Adapter<QueryAst, SqlContract<SqlStorage>, LoweredStatement>;
   private readonly codecRegistry: CodecRegistry;
+  private readonly jsonSchemaValidators: JsonSchemaValidatorRegistry | undefined;
   private codecRegistryValidated: boolean;
 
   constructor(options: RuntimeOptions<TContract>) {
-    const { context, driver, verify, plugins, mode, log } = options;
+    const { context, adapter, driver, verify, plugins, mode, log } = options;
     this.contract = context.contract;
-    this.context = context;
+    this.adapter = adapter;
     this.codecRegistry = context.codecs;
+    this.jsonSchemaValidators = context.jsonSchemaValidators;
     this.codecRegistryValidated = false;
 
     const familyAdapter = new SqlFamilyAdapter(context.contract);
@@ -77,7 +126,7 @@ class SqlRuntimeImpl<TContract extends SqlContract<SqlStorage> = SqlContract<Sql
     const coreOptions: RuntimeCoreOptions<
       TContract,
       Adapter<SelectAst, SqlContract<SqlStorage>, LoweredStatement>,
-      SqlDriver
+      SqlDriver<unknown>
     > = {
       familyAdapter,
       driver,
@@ -85,10 +134,10 @@ class SqlRuntimeImpl<TContract extends SqlContract<SqlStorage> = SqlContract<Sql
       plugins: plugins as readonly Plugin<
         TContract,
         Adapter<SelectAst, SqlContract<SqlStorage>, LoweredStatement>,
-        SqlDriver
+        SqlDriver<unknown>
       >[],
-      ...(mode !== undefined ? { mode } : {}),
-      ...(log !== undefined ? { log } : {}),
+      ...ifDefined('mode', mode),
+      ...ifDefined('log', log),
       operationRegistry: context.operations,
     };
 
@@ -112,20 +161,22 @@ class SqlRuntimeImpl<TContract extends SqlContract<SqlStorage> = SqlContract<Sql
   ): AsyncIterableResult<Row> {
     this.ensureCodecRegistryValidated(this.contract);
 
-    // Check if plan is SqlQueryPlan (has ast but no sql)
     const isSqlQueryPlan = (p: ExecutionPlan<Row> | SqlQueryPlan<Row>): p is SqlQueryPlan<Row> => {
       return 'ast' in p && !('sql' in p);
     };
 
-    // Lower SqlQueryPlan to Plan if needed
     const executablePlan: ExecutionPlan<Row> = isSqlQueryPlan(plan)
-      ? lowerSqlPlan(this.context, plan)
+      ? lowerSqlPlan(this.adapter, this.contract, plan)
       : plan;
 
     const iterator = async function* (
       self: SqlRuntimeImpl<TContract>,
     ): AsyncGenerator<Row, void, unknown> {
-      const encodedParams = encodeParams(executablePlan, self.codecRegistry);
+      const encodedParams = encodeParams(
+        executablePlan,
+        self.codecRegistry,
+        self.jsonSchemaValidators,
+      );
       const planWithEncodedParams: ExecutionPlan<Row> = {
         ...executablePlan,
         params: encodedParams,
@@ -138,6 +189,7 @@ class SqlRuntimeImpl<TContract extends SqlContract<SqlStorage> = SqlContract<Sql
           rawRow as Record<string, unknown>,
           executablePlan,
           self.codecRegistry,
+          self.jsonSchemaValidators,
         );
         yield decodedRow as Row;
       }
@@ -146,6 +198,10 @@ class SqlRuntimeImpl<TContract extends SqlContract<SqlStorage> = SqlContract<Sql
     return new AsyncIterableResult(iterator(this));
   }
 
+  connection(): Promise<RuntimeConnection> {
+    return this.core.connection();
+  }
+
   telemetry(): RuntimeTelemetryEvent | null {
     return this.core.telemetry();
   }
@@ -159,8 +215,18 @@ class SqlRuntimeImpl<TContract extends SqlContract<SqlStorage> = SqlContract<Sql
   }
 }
 
-export function createRuntime<TContract extends SqlContract<SqlStorage>>(
-  options: RuntimeOptions<TContract>,
+export function createRuntime<TContract extends SqlContract<SqlStorage>, TTargetId extends string>(
+  options: CreateRuntimeOptions<TContract, TTargetId>,
 ): Runtime {
-  return new SqlRuntimeImpl(options);
+  const { stackInstance, context, driver, verify, plugins, mode, log } = options;
+
+  return new SqlRuntimeImpl({
+    context,
+    adapter: stackInstance.adapter,
+    driver,
+    verify,
+    ...ifDefined('plugins', plugins),
+    ...ifDefined('mode', mode),
+    ...ifDefined('log', log),
+  });
 }

package/test/async-iterable-result.test.ts

@@ -1,10 +1,17 @@
 import type { ExecutionPlan } from '@prisma-next/contract/types';
+import { instantiateExecutionStack } from '@prisma-next/core-execution-plane/stack';
 import type { AsyncIterableResult } from '@prisma-next/runtime-executor';
 import { describe, expect, it } from 'vitest';
-import { createRuntime } from '../src/exports';
-import { createStubAdapter, createTestContext, createTestContract } from './utils';
+import type { Runtime } from '../src/exports';
+import { createRuntime, createSqlExecutionStack } from '../src/exports';
+import {
+  createStubAdapter,
+  createTestAdapterDescriptor,
+  createTestContext,
+  createTestContract,
+  createTestTargetDescriptor,
+} from './utils';
 
-// Mock driver that implements SqlDriver interface
 class MockDriver {
   private rows: ReadonlyArray<Record<string, unknown>> = [];
 
@@ -12,11 +19,10 @@ class MockDriver {
     this.rows = rows;
   }
 
-  async query(
+  async query<Row = Record<string, unknown>>(
     _sql: string,
-    _params: readonly unknown[],
-  ): Promise<{ rows: ReadonlyArray<unknown> }> {
-    // Return empty marker result for contract verification
+    _params?: readonly unknown[],
+  ): Promise<{ rows: ReadonlyArray<Row> }> {
     return { rows: [] };
   }
 
@@ -29,20 +35,20 @@ class MockDriver {
     }
   }
 
-  async connect(): Promise<void> {
-    // No-op
+  async acquireConnection(): Promise<never> {
+    throw new Error('Not implemented in mock');
   }
 
-  async close(): Promise<void> {
-    // No-op
-  }
+  async connect(): Promise<void> {}
+
+  async close(): Promise<void> {}
 }
 
 const fixtureContract = createTestContract({
   schemaVersion: '1',
   targetFamily: 'sql',
   target: 'postgres',
-  coreHash: 'test-hash',
+  storageHash: 'test-hash',
   profileHash: 'test-profile-hash',
   storage: {
     tables: {
@@ -62,20 +68,31 @@ const fixtureContract = createTestContract({
   mappings: { codecTypes: {}, operationTypes: {} },
 });
 
+function createTestRuntime(mockDriver: MockDriver): Runtime {
+  const adapter = createStubAdapter();
+  const stack = createSqlExecutionStack({
+    target: createTestTargetDescriptor(),
+    adapter: createTestAdapterDescriptor(adapter),
+    extensionPacks: [],
+  });
+  const stackInstance = instantiateExecutionStack(stack);
+  const context = createTestContext(fixtureContract, adapter);
+  return createRuntime({
+    stackInstance,
+    context,
+    driver: mockDriver,
+    verify: { mode: 'onFirstUse', requireMarker: false },
+  });
+}
+
 describe('SqlRuntime AsyncIterableResult integration', () => {
   it('returns AsyncIterableResult from execute', async () => {
-    const adapter = createStubAdapter();
     const driver = new MockDriver();
     driver.setRows([
       { id: 1, email: 'test1@example.com' },
       { id: 2, email: 'test2@example.com' },
     ]);
-    const context = createTestContext(fixtureContract, adapter);
-    const runtime = createRuntime({
-      driver: driver as unknown as Parameters<typeof createRuntime>[0]['driver'],
-      context,
-      verify: { mode: 'onFirstUse', requireMarker: false },
-    });
+    const runtime = createTestRuntime(driver);
 
     const plan: ExecutionPlan<{ id: number; email: string }> = {
       sql: 'SELECT id, email FROM "user" ORDER BY id',
@@ -83,7 +100,7 @@ describe('SqlRuntime AsyncIterableResult integration', () => {
       meta: {
         target: 'postgres',
         targetFamily: 'sql',
-        coreHash: 'test-hash',
+        storageHash: 'test-hash',
         lane: 'sql',
         paramDescriptors: [],
       },
@@ -91,7 +108,6 @@ describe('SqlRuntime AsyncIterableResult integration', () => {
 
     const result = runtime.execute(plan);
 
-    // Verify it's an AsyncIterableResult
     expect(result).toBeInstanceOf(Object);
     expect(typeof result.toArray).toBe('function');
     expect(typeof result[Symbol.asyncIterator]).toBe('function');
@@ -100,15 +116,9 @@ describe('SqlRuntime AsyncIterableResult integration', () => {
   });
 
   it('preserves type information', async () => {
-    const adapter = createStubAdapter();
     const driver = new MockDriver();
     driver.setRows([{ id: 1, email: 'test@example.com' }]);
-    const context = createTestContext(fixtureContract, adapter);
-    const runtime = createRuntime({
-      driver: driver as unknown as Parameters<typeof createRuntime>[0]['driver'],
-      context,
-      verify: { mode: 'onFirstUse', requireMarker: false },
-    });
+    const runtime = createTestRuntime(driver);
 
     const plan: ExecutionPlan<{ id: number; email: string }> = {
       sql: 'SELECT id, email FROM "user" LIMIT 1',
@@ -116,7 +126,7 @@ describe('SqlRuntime AsyncIterableResult integration', () => {
       meta: {
         target: 'postgres',
         targetFamily: 'sql',
-        coreHash: 'test-hash',
+        storageHash: 'test-hash',
         lane: 'sql',
         paramDescriptors: [],
       },
@@ -126,10 +136,8 @@ describe('SqlRuntime AsyncIterableResult integration', () => {
     const rows = await result.toArray();
 
     expect(rows.length).toBe(1);
-    if (rows[0]) {
-      expect(typeof rows[0].id).toBe('number');
-      expect(typeof rows[0].email).toBe('string');
-    }
+    expect(typeof rows[0]!.id).toBe('number');
+    expect(typeof rows[0]!.email).toBe('string');
 
     await runtime.close();
   });

package/test/context.types.test-d.ts

@@ -1,6 +1,6 @@
 import type { SqlContract, SqlMappings, SqlStorage } from '@prisma-next/sql-contract/types';
 import { expectTypeOf, test } from 'vitest';
-import type { RuntimeContext, TypeHelperRegistry } from '../src/sql-context';
+import type { ExecutionContext, TypeHelperRegistry } from '../src/sql-context';
 
 // Contract type with storage.types using literal types (matching emission output)
 type TestContract = SqlContract<
@@ -33,23 +33,21 @@ type TestContract = SqlContract<
   SqlMappings
 >;
 
-test('RuntimeContext.types is TypeHelperRegistry', () => {
-  // RuntimeContext.types is intentionally loose (Record<string, unknown>)
+test('ExecutionContext.types is TypeHelperRegistry', () => {
+  // ExecutionContext.types is intentionally loose (Record<string, unknown>)
   // The strong typing comes from schema(context).types via ExtractSchemaTypes
-  expectTypeOf<RuntimeContext<TestContract>['types']>().toEqualTypeOf<
-    TypeHelperRegistry | undefined
-  >();
+  expectTypeOf<ExecutionContext<TestContract>['types']>().toEqualTypeOf<TypeHelperRegistry>();
 
   // TypeHelperRegistry allows any values - the actual type depends on init hooks
   expectTypeOf<TypeHelperRegistry>().toEqualTypeOf<Record<string, unknown>>();
 });
 
-test('RuntimeContext preserves contract type parameter', () => {
-  // Verify the contract type is preserved in RuntimeContext
-  expectTypeOf<RuntimeContext<TestContract>['contract']>().toEqualTypeOf<TestContract>();
+test('ExecutionContext preserves contract type parameter', () => {
+  // Verify the contract type is preserved in ExecutionContext
+  expectTypeOf<ExecutionContext<TestContract>['contract']>().toEqualTypeOf<TestContract>();
 
   // Verify we can access storage.types through the context's contract
-  type ContractStorageTypes = RuntimeContext<TestContract>['contract']['storage']['types'];
+  type ContractStorageTypes = ExecutionContext<TestContract>['contract']['storage']['types'];
   expectTypeOf<ContractStorageTypes>().toExtend<
     | {
         readonly Vector1536: {
@@ -62,9 +60,9 @@ test('RuntimeContext preserves contract type parameter', () => {
   >();
 });
 
-test('RuntimeContext accepts generic SqlContract', () => {
-  // Verify RuntimeContext defaults work
-  type DefaultContext = RuntimeContext;
+test('ExecutionContext accepts generic SqlContract', () => {
+  // Verify ExecutionContext defaults work
+  type DefaultContext = ExecutionContext;
   expectTypeOf<DefaultContext['contract']>().toExtend<SqlContract<SqlStorage>>();
-  expectTypeOf<DefaultContext['types']>().toEqualTypeOf<TypeHelperRegistry | undefined>();
+  expectTypeOf<DefaultContext['types']>().toEqualTypeOf<TypeHelperRegistry>();
 });

package/test/execution-stack.test.ts

@@ -0,0 +1,166 @@
+import { createExecutionStack } from '@prisma-next/core-execution-plane/stack';
+import { codec, createCodecRegistry } from '@prisma-next/sql-relational-core/ast';
+import { describe, expect, it } from 'vitest';
+import { createExecutionContext, createSqlExecutionStack } from '../src/exports';
+import type {
+  ExecutionContext,
+  SqlRuntimeAdapterDescriptor,
+  SqlRuntimeExtensionDescriptor,
+  SqlRuntimeTargetDescriptor,
+} from '../src/sql-context';
+import { createTestContract } from './utils';
+
+function createStubAdapterDescriptor(): SqlRuntimeAdapterDescriptor<'postgres'> {
+  const registry = createCodecRegistry();
+  registry.register(
+    codec({
+      typeId: 'pg/text@1',
+      targetTypes: ['text'],
+      encode: (value: string) => value,
+      decode: (wire: string) => wire,
+    }),
+  );
+
+  return {
+    kind: 'adapter',
+    id: 'test-adapter',
+    version: '0.0.1',
+    familyId: 'sql' as const,
+    targetId: 'postgres' as const,
+    codecs: () => registry,
+    operationSignatures: () => [],
+    parameterizedCodecs: () => [],
+    create() {
+      return Object.assign(
+        { familyId: 'sql' as const, targetId: 'postgres' as const },
+        {
+          profile: {
+            id: 'test-profile',
+            target: 'postgres',
+            capabilities: {},
+            codecs: () => registry,
+          },
+          lower() {
+            return {
+              profileId: 'test-profile',
+              body: Object.freeze({ sql: '', params: [] }),
+            };
+          },
+        },
+      );
+    },
+  };
+}
+
+function createStubTargetDescriptor(): SqlRuntimeTargetDescriptor<'postgres'> {
+  return {
+    kind: 'target',
+    id: 'postgres',
+    version: '0.0.1',
+    familyId: 'sql' as const,
+    targetId: 'postgres' as const,
+    codecs: () => createCodecRegistry(),
+    operationSignatures: () => [],
+    parameterizedCodecs: () => [],
+    create() {
+      return { familyId: 'sql' as const, targetId: 'postgres' as const };
+    },
+  };
+}
+
+function createStubExtensionDescriptor(): SqlRuntimeExtensionDescriptor<'postgres'> {
+  const registry = createCodecRegistry();
+  registry.register(
+    codec({
+      typeId: 'pg/uuid@1',
+      targetTypes: ['uuid'],
+      encode: (value: string) => value,
+      decode: (wire: string) => wire,
+    }),
+  );
+
+  const operations = [
+    {
+      forTypeId: 'pg/text@1',
+      method: 'example',
+      args: [],
+      returns: { kind: 'builtin' as const, type: 'string' as const },
+      lowering: {
+        targetFamily: 'sql' as const,
+        strategy: 'function' as const,
+        template: 'example({args})',
+      },
+    },
+  ];
+
+  return {
+    kind: 'extension',
+    id: 'test-extension',
+    version: '0.0.1',
+    familyId: 'sql' as const,
+    targetId: 'postgres' as const,
+    codecs: () => registry,
+    operationSignatures: () => operations,
+    parameterizedCodecs: () => [],
+    create() {
+      return {
+        familyId: 'sql' as const,
+        targetId: 'postgres' as const,
+      };
+    },
+  };
+}
+
+describe('createExecutionStack', () => {
+  it('defaults driver to undefined and extensions to empty', () => {
+    const stack = createExecutionStack({
+      target: createStubTargetDescriptor(),
+      adapter: createStubAdapterDescriptor(),
+    });
+
+    expect(stack.driver).toBeUndefined();
+    expect(stack.extensionPacks).toEqual([]);
+  });
+
+  it('creates an execution context from descriptors-only stack', () => {
+    const contract = createTestContract({
+      storage: { tables: {} },
+    });
+
+    const context = createExecutionContext({
+      contract,
+      stack: {
+        target: createStubTargetDescriptor(),
+        adapter: createStubAdapterDescriptor(),
+        extensionPacks: [createStubExtensionDescriptor()],
+      },
+    }) as ExecutionContext<typeof contract>;
+
+    expect(context.contract).toBe(contract);
+    expect(context.codecs.get('pg/text@1')).toBeDefined();
+    expect(context.codecs.get('pg/uuid@1')).toBeDefined();
+    expect(context.operations.byType('pg/text@1')).toHaveLength(1);
+    expect(context.types).toEqual({});
+  });
+});
+
+describe('createSqlExecutionStack', () => {
+  it('preserves descriptor references and defaults extensions', () => {
+    const target = createStubTargetDescriptor();
+    const adapter = createStubAdapterDescriptor();
+    const stack = createSqlExecutionStack({ target, adapter });
+
+    expect(stack.target).toBe(target);
+    expect(stack.adapter).toBe(adapter);
+    expect(stack.extensionPacks).toEqual([]);
+  });
+
+  it('keeps extension packs intact', () => {
+    const target = createStubTargetDescriptor();
+    const adapter = createStubAdapterDescriptor();
+    const extension = createStubExtensionDescriptor();
+    const stack = createSqlExecutionStack({ target, adapter, extensionPacks: [extension] });
+
+    expect(stack.extensionPacks).toEqual([extension]);
+  });
+});