@yielded/auth-persistence 0.1.0-beta.10 → 0.1.0-beta.12

package/src/internal/password-kernel.ts

@@ -34,7 +34,7 @@ import {
   type SecurityRevision,
 } from "@yielded/auth/Sessions";
 import { Cause, Context, DateTime, Effect, Option, Redacted, Schema } from "effect";
-import type * as SqlError from "effect/unstable/sql/SqlError";
+import type * as SqlError from "effect/sql/SqlError";
 
 import { PersistenceMappingError } from "./mapping-error";
 import {
@@ -1121,10 +1121,10 @@ export const makePasswordKernel = <
   });
 
   const makeSqlPasswordPersistence = Effect.fn("makeSqlPasswordPersistence")(function* (
-    database: Database,
     mapping: Mapping,
     configuration: PasswordSqlConfiguration,
-  ): Effect.fn.Return<PasswordPersistence["Service"], never, LifecycleHooks> {
+  ): Effect.fn.Return<PasswordPersistence["Service"], never, LifecycleHooks | CurrentPasswordSql> {
+    const database = yield* CurrentPasswordSql;
     const hooks = yield* LifecycleHooks;
 
     return PasswordPersistence.of({

package/src/internal/persistence.ts

@@ -8,7 +8,7 @@ import { PhoneAdmission, PhoneSignInTargets, PhoneOtpUnavailable } from "@yielde
 import { ProofPersistence, ProofUnavailable } from "@yielded/auth/Proofs";
 import { AuthenticationAuthority, SessionUnavailable } from "@yielded/auth/Sessions";
 import { Context, Effect, Layer, Schema } from "effect";
-import { SqlClient } from "effect/unstable/sql";
+import { SqlClient } from "effect/sql";
 
 import {
   PersistenceConfigurationError,
@@ -27,14 +27,23 @@ import {
   type PasskeyRequirement,
   type MappingInput,
 } from "./configuration";
-import { makeEmailKernel, type EmailSqlDatabase } from "./email-kernel";
+import { makeEmailKernel, CurrentEmailSql, type EmailSqlDatabase } from "./email-kernel";
 import { PersistenceMappingError } from "./mapping-error";
-import { makePasswordKernel, type PasswordSqlDatabase } from "./password-kernel";
+import {
+  makePasswordKernel,
+  CurrentPasswordSql,
+  type PasswordSqlDatabase,
+} from "./password-kernel";
 import { makePhoneKernel, CurrentPhoneTransaction } from "./phone-kernel";
-import { makeProofKernel, type ProofSqlDatabase, type ProofSqlQuery } from "./proof-kernel";
+import {
+  makeProofKernel,
+  CurrentProofSql,
+  type ProofSqlDatabase,
+  type ProofSqlQuery,
+} from "./proof-kernel";
 import type { QueryOperations } from "./query-operations";
-import { makeRegistrationAuthority, type CreateSubject } from "./registration";
-import { makeSessionKernel, type SessionSqlDatabase } from "./session-kernel";
+import { makeRegistrationAuthority } from "./registration";
+import { makeSessionKernel, CurrentSessionSql, type SessionSqlDatabase } from "./session-kernel";
 import { requireStandalone } from "./standalone";
 import { makeMappings } from "./storage-mapping";
 import {
@@ -45,7 +54,11 @@ import {
 } from "./storage-tables";
 import { validateStorage } from "./storage-validation";
 import { makeTransactionExecutionKernel } from "./transaction-execution-kernel";
-import { makeTransactionKernel, type TransactionNativeDatabase } from "./transaction-kernel";
+import {
+  makeTransactionKernel,
+  NativeDatabase,
+  type TransactionNativeDatabase,
+} from "./transaction-kernel";
 
 export interface Backend<T extends object, R> {
   readonly makeTable: (definition: StorageTable) => T;
@@ -53,7 +66,6 @@ export interface Backend<T extends object, R> {
   readonly acquire: Effect.Effect<object, PersistenceConfigurationError, R | SqlClient.SqlClient>;
   readonly operations: QueryOperations;
   readonly passkeys: (input: {
-    readonly database: object;
     readonly storage: MappingInput;
     readonly namespace: string;
     readonly dialect: "pg" | "sqlite";
@@ -62,7 +74,7 @@ export interface Backend<T extends object, R> {
   }) => Effect.Effect<
     Context.Context<never>,
     PersistenceConfigurationError,
-    PasskeyConfig | LifecycleHooks | SqlClient.SqlClient
+    PasskeyConfig | LifecycleHooks | SqlClient.SqlClient | NativeDatabase | CurrentProofSql
   >;
 }
 
@@ -165,14 +177,6 @@ export const createPersistence = <T extends object, R>(
       `@yielded/auth-persistence/${auth.namespace}/Provisioning`,
     );
 
-    // Capability metadata controls the conditional requirement, and core has
-    // already decoded each registration with its strategy's Schema.
-    const provisioners = management
-      ? ProvisioningKey.pipe(
-          Effect.map((value) => value as Readonly<Record<string, CreateSubject>>),
-        )
-      : Effect.succeed<Readonly<Record<string, CreateSubject>>>({});
-
     const layout = <N, Instant>(
       options: {
         readonly subjects: SubjectOptions<T, N>;
@@ -317,14 +321,15 @@ export const createPersistence = <T extends object, R>(
             if (columns[name] === undefined)
               return yield* configError(`Missing ${role}.${name} column`);
           }
-          yield* validateStorage(client, dialect, description, storageTables[role].unique);
+          yield* validateStorage(dialect, description, storageTables[role].unique);
         }
-        yield* validateStorage(client, dialect, backend.describe(storage.subjects.table as T), [
+        yield* validateStorage(dialect, backend.describe(storage.subjects.table as T), [
           [storage.subjects.id],
         ]);
         const mappings = makeMappings(storage);
 
-        const standalone = <E>(error: () => E) => requireStandalone(error, client);
+        const standalone = <E>(error: () => E) =>
+          requireStandalone(error, client.transactionService);
 
         // Backend validation owns the foreign query-builder shape, never the decoded rows.
         const native = database as ProofSqlDatabase &
@@ -341,17 +346,16 @@ export const createPersistence = <T extends object, R>(
 
         const sessionMapping = mappings.sessions(auth.claims);
 
-        const sessionServices = yield* sessionKernel.makeSqlStatefulSessions(
-          native,
-          sessionMapping,
-          options,
-        );
+        const sessionServices = yield* sessionKernel
+          .makeSqlStatefulSessions(sessionMapping, options)
+          .pipe(Effect.provideService(CurrentSessionSql, native));
 
-        const authority = yield* sessionKernel.makeSqlAuthenticationAuthority<C["Type"]>(
-          native,
-          { ...mappings.authority(), isConstraintConflict: () => false },
-          options,
-        );
+        const authority = yield* sessionKernel
+          .makeSqlAuthenticationAuthority<C["Type"]>(
+            { ...mappings.authority(), isConstraintConflict: () => false },
+            options,
+          )
+          .pipe(Effect.provideService(CurrentSessionSql, native));
 
         let context: Context.Context<never> = Context.make(AuthenticationAuthority, authority).pipe(
           Context.add(
@@ -377,47 +381,40 @@ export const createPersistence = <T extends object, R>(
           context = Context.add(
             context,
             ProofPersistence,
-            yield* proofKernel.makeSqlProofPersistence(
-              native,
-              proofConfiguration.mapping,
-              proofConfiguration.configuration,
-            ),
+            yield* proofKernel
+              .makeSqlProofPersistence(proofConfiguration.mapping, proofConfiguration.configuration)
+              .pipe(Effect.provideService(CurrentProofSql, native)),
           );
         }
 
         if (password) {
-          const persistence = yield* passwordKernel.makeSqlPasswordPersistence(
-            native,
-            mappings.passwords(),
-            {
+          const persistence = yield* passwordKernel
+            .makeSqlPasswordPersistence(mappings.passwords(), {
               mode: "interactive",
               locking: dialect === "pg",
               standaloneGuard: standalone(() => PasswordUnavailable.make({})),
               insertIfAbsent: (query) => query.onConflictDoNothing(),
               proof: proofConfiguration,
-            },
-          );
+            })
+            .pipe(Effect.provideService(CurrentPasswordSql, native));
 
           context = Context.add(context, PasswordPersistence, persistence);
         }
-        const creators = yield* provisioners;
-
         for (const [name, strategy] of Object.entries(auth.strategies)) {
           if (strategy.persistence?.kind !== "password" || !strategy.persistence.management)
             continue;
           const key = strategy.RegistrationAuthority;
-          const create = creators[name];
 
-          if (key === undefined || create === undefined)
+          if (key === undefined)
             return yield* configError(`Missing subject provisioning for ${name}`);
 
           const registration = yield* makeRegistrationAuthority(
-            native,
             mappings,
             backend.operations,
             standalone(() => PasswordUnavailable.make({})),
-            create,
-          );
+            ProvisioningKey,
+            name,
+          ).pipe(Effect.provideService(CurrentPasswordSql, native));
 
           context = Context.add(context, key, registration);
         }
@@ -425,12 +422,14 @@ export const createPersistence = <T extends object, R>(
           context = Context.add(
             context,
             EmailAddressPersistence,
-            yield* emailKernel.makeSqlEmailAddressPersistence(native, mappings.emails(), {
-              mode: "interactive",
-              locking: dialect === "pg",
-              standaloneGuard: standalone(() => EmailUnavailable.make({})),
-              proof: proofConfiguration,
-            }),
+            yield* emailKernel
+              .makeSqlEmailAddressPersistence(mappings.emails(), {
+                mode: "interactive",
+                locking: dialect === "pg",
+                standaloneGuard: standalone(() => EmailUnavailable.make({})),
+                proof: proofConfiguration,
+              })
+              .pipe(Effect.provideService(CurrentEmailSql, native)),
           );
         }
         if (phone) {
@@ -486,18 +485,19 @@ export const createPersistence = <T extends object, R>(
             encodeInstant: storage.encodeInstant,
           });
 
-          const execution = executionKernel.makeTransactionExecution(
-            CurrentPhoneTransaction,
-            native,
-            {
-              mode: "interactive",
-              dialect,
-              locking: dialect === "pg",
-              standaloneGuard: () => standalone(() => PhoneOtpUnavailable.make({})),
-            },
-            () => PhoneOtpUnavailable.make({}),
-            randomId,
-          );
+          const execution = yield* executionKernel
+            .makeTransactionExecution(
+              CurrentPhoneTransaction,
+              {
+                mode: "interactive",
+                dialect,
+                locking: dialect === "pg",
+                standaloneGuard: () => standalone(() => PhoneOtpUnavailable.make({})),
+              },
+              () => PhoneOtpUnavailable.make({}),
+              randomId,
+            )
+            .pipe(Effect.provideService(NativeDatabase, native));
 
           const run = <Value, E, Requirements>(
             work: Effect.Effect<Value, E, Requirements>,
@@ -538,7 +538,6 @@ export const createPersistence = <T extends object, R>(
         if (passkeys.length > 0) {
           // Auth capability metadata determines whether PasskeyConfig is required.
           const services = backend.passkeys({
-            database,
             storage,
             namespace: auth.namespace,
             dialect,
@@ -549,10 +548,20 @@ export const createPersistence = <T extends object, R>(
           }) as Effect.Effect<
             Context.Context<never>,
             PersistenceConfigurationError,
-            PasskeyRequirement<A> | LifecycleHooks | SqlClient.SqlClient
+            | PasskeyRequirement<A>
+            | LifecycleHooks
+            | SqlClient.SqlClient
+            | NativeDatabase
+            | CurrentProofSql
           >;
 
-          context = Context.merge(context, yield* services);
+          context = Context.merge(
+            context,
+            yield* services.pipe(
+              Effect.provideService(NativeDatabase, native),
+              Effect.provideService(CurrentProofSql, native),
+            ),
+          );
         }
 
         // The checked capability metadata above determines exactly these service keys.

package/src/internal/proof-kernel.ts

@@ -22,7 +22,7 @@ import {
   ProofUnavailable,
 } from "@yielded/auth/Proofs";
 import { Cause, Context, DateTime, Effect, Option, Schema } from "effect";
-import type * as SqlError from "effect/unstable/sql/SqlError";
+import type * as SqlError from "effect/sql/SqlError";
 
 import { PersistenceMappingError } from "./mapping-error";
 import {
@@ -659,10 +659,10 @@ export const makeProofKernel = <
   };
 
   const makeSqlProofPersistence = Effect.fn("makeSqlProofPersistence")(function* (
-    database: Database,
     mapping: Mapping,
     configuration: ProofSqlConfiguration,
-  ): Effect.fn.Return<ProofPersistence["Service"], never, LifecycleHooks> {
+  ): Effect.fn.Return<ProofPersistence["Service"], never, LifecycleHooks | CurrentProofSql> {
+    const database = yield* CurrentProofSql;
     const hooks = yield* LifecycleHooks;
 
     return ProofPersistence.of({

package/src/internal/query-operations.ts

@@ -1,4 +1,4 @@
-import type { Statement } from "effect/unstable/sql/Statement";
+import type { Statement } from "effect/sql/Statement";
 
 /** Adapter-owned table metadata. No driver or ORM type enters the shared models. */
 export interface TableModel {

package/src/internal/registration.ts

@@ -5,16 +5,17 @@ import { PasswordUnavailable } from "@yielded/auth/Password";
 import { reportPersistenceFailure } from "@yielded/auth/Persistence";
 import type { SubjectId } from "@yielded/auth/Schema";
 import { SecurityRevision } from "@yielded/auth/Sessions";
-import { Effect, Schema } from "effect";
+import { type Context, Effect, Schema } from "effect";
 
-import type { PasswordSqlDatabase } from "./password-kernel";
+import { PersistenceConfigurationError } from "./configuration";
+import { CurrentPasswordSql } from "./password-kernel";
 import type { QueryOperations } from "./query-operations";
 import type { PasswordRegistrationAuthority } from "./registration-contract";
 import type { makeMappings } from "./storage-mapping";
 
 class IdentifierTaken extends Schema.TaggedError<IdentifierTaken>()("IdentifierTaken", {}) {}
 
-export type CreateSubject = (input: {
+type CreateSubject = (input: {
   readonly identifier: LoginIdentifier;
   readonly registration: unknown;
 }) => Effect.Effect<SubjectId, PasswordUnavailable>;
@@ -23,14 +24,28 @@ export type CreateSubject = (input: {
  * creates the unverified identifier and password in one SQL transaction. Replays
  * always suppress; a public request ID never recovers a private password intent.
  */
-export const makeRegistrationAuthority = Effect.fn("makeRegistrationAuthority")(function* (
-  database: PasswordSqlDatabase,
+export const makeRegistrationAuthority = Effect.fn("makeRegistrationAuthority")(function* <R>(
   mappings: ReturnType<typeof makeMappings>,
   operations: QueryOperations,
   standalone: Effect.Effect<void, PasswordUnavailable>,
-  createSubject: CreateSubject,
-): Effect.fn.Return<PasswordRegistrationAuthority<unknown>, never, LifecycleHooks> {
+  provisioning: Context.Key<R, object>,
+  strategy: string,
+): Effect.fn.Return<
+  PasswordRegistrationAuthority<unknown>,
+  PersistenceConfigurationError,
+  LifecycleHooks | CurrentPasswordSql | R
+> {
+  const database = yield* CurrentPasswordSql;
   const hooks = yield* LifecycleHooks;
+  // Core has already decoded registration with the selected strategy's Schema;
+  // the dynamic strategy table erases only that heterogeneous callback signature.
+  const creators = (yield* provisioning) as Readonly<Record<string, CreateSubject>>;
+  const createSubject = creators[strategy];
+
+  if (createSubject === undefined)
+    return yield* PersistenceConfigurationError.make({
+      reason: `Missing subject provisioning for ${strategy}`,
+    });
   const { and, eq, column } = operations;
   const mapping = mappings.passwords();
   const receipts = mappings.table("passwordRegistrations");