@yielded/auth-persistence-drizzle 0.1.0-beta.1 → 0.1.0-beta.12

package/src/drizzle/password-target.ts

@@ -15,13 +15,14 @@ import {
   type PasswordRegistrationConfiguration,
 } from "./password-registration";
 import {
+  CurrentPasswordSql,
   makeSqlPasswordPersistence,
   type PasswordSqlConfiguration,
   type PasswordSqlDatabase,
   type PasswordSqlQuery,
 } from "./password-sql";
 import type { ProofTargetConfiguration } from "./proof-target";
-import { sqlClientStandaloneGuard } from "./standalone-guard";
+import { sqlClientStandaloneGuard, type TransactionService } from "./standalone-guard";
 
 export interface PasswordTargetConfiguration {
   readonly mode: "interactive" | "synchronous";
@@ -50,9 +51,9 @@ export type PasswordCoordinatorError<E> =
   | SqlError.SqlError;
 
 export const sqlClientPasswordStandaloneGuard = (
-  database: unknown,
+  service: TransactionService | undefined,
 ): Effect.Effect<void, PasswordUnavailable> =>
-  sqlClientStandaloneGuard(database, () => PasswordUnavailable.make({}));
+  sqlClientStandaloneGuard(service, () => PasswordUnavailable.make({}));
 
 export const passwordOptions = (
   configuration: PasswordTargetConfiguration,
@@ -96,7 +97,6 @@ const registrationOptions = (
 });
 
 export const makeTargetPasswordPersistenceServices = (
-  database: any,
   mapping: any,
   configuration: PasswordTargetConfiguration,
   proofMapping?: any,
@@ -104,7 +104,6 @@ export const makeTargetPasswordPersistenceServices = (
   Effect.gen(function* () {
     return {
       passwordPersistence: yield* makeSqlPasswordPersistence(
-        database,
         mapping,
         passwordOptions(configuration, proofMapping),
       ),
@@ -112,14 +111,12 @@ export const makeTargetPasswordPersistenceServices = (
   });
 
 export const makeTargetPasswordRegistrationServices = <Registration>(
-  database: any,
   mapping: any,
   configuration: PasswordTargetConfiguration,
 ) =>
   Effect.gen(function* () {
     return {
       registrationAuthority: yield* makeSqlPasswordRegistrationAuthority<Registration>(
-        database,
         mapping,
         registrationOptions(configuration),
       ),
@@ -149,9 +146,13 @@ export const coordinateTargetPasswordPersistence = <Transaction, A, E, R>(
           Effect.gen(function* () {
             return yield* owner(transaction, {
               passwordPersistence: yield* makeSqlPasswordPersistence(
-                transaction as unknown as PasswordSqlDatabase,
                 mapping,
                 passwordOptions(configuration, proofMapping, true),
+              ).pipe(
+                Effect.provideService(
+                  CurrentPasswordSql,
+                  transaction as unknown as PasswordSqlDatabase,
+                ),
               ),
             });
           }),
@@ -185,9 +186,13 @@ export const coordinateTargetPasswordRegistration = <Registration, Transaction,
           Effect.gen(function* () {
             return yield* owner(transaction, {
               registrationAuthority: yield* makeSqlPasswordRegistrationAuthority<Registration>(
-                transaction as unknown as PasswordSqlDatabase,
                 mapping,
                 registrationOptions(configuration, true),
+              ).pipe(
+                Effect.provideService(
+                  CurrentPasswordSql,
+                  transaction as unknown as PasswordSqlDatabase,
+                ),
               ),
             });
           }),
@@ -198,24 +203,20 @@ export const coordinateTargetPasswordRegistration = <Registration, Transaction,
     return result.value;
   });
 
-export const passwordPersistenceLayer = (
-  services: Effect.Effect<
-    { readonly passwordPersistence: PasswordPersistence["Service"] },
-    never,
-    LifecycleHooks
-  >,
+export const passwordPersistenceLayer = <E, R>(
+  services: Effect.Effect<{ readonly passwordPersistence: PasswordPersistence["Service"] }, E, R>,
 ) =>
   Layer.effect(
     PasswordPersistence,
     Effect.map(services, (value) => value.passwordPersistence),
   );
 
-export const passwordRegistrationLayer = <Id, Registration>(
+export const passwordRegistrationLayer = <Id, Registration, E, R>(
   tag: Context.Key<Id, PasswordRegistrationAuthority<Registration>>,
   services: Effect.Effect<
     { readonly registrationAuthority: PasswordRegistrationAuthority<Registration> },
-    never,
-    LifecycleHooks
+    E,
+    R
   >,
 ) =>
   Layer.effect(

package/src/drizzle/pg-database.ts

@@ -0,0 +1,10 @@
+import type { AnyRelations } from "drizzle-orm";
+import type { EffectPgDatabase as PgliteDatabase } from "drizzle-orm/effect-pglite";
+import type { EffectPgDatabase as PostgresDatabase } from "drizzle-orm/effect-postgres";
+import { Context } from "effect";
+
+/** Application-owned PostgreSQL database; Postgres and Pglite share this service. */
+export class Database extends Context.Service<
+  Database,
+  PostgresDatabase<AnyRelations> | PgliteDatabase<AnyRelations>
+>()("effect-auth/persistence-drizzle/Postgres/Database") {}

package/src/drizzle/pg-emails.ts

@@ -14,6 +14,7 @@ import type {
   EmailSignInMapping,
 } from "./email-model";
 import type { EmailRegistrationAuthority } from "./email-registration";
+import { CurrentEmailSql } from "./email-sql";
 import type { EmailSqlQuery } from "./email-sql";
 import {
   coordinateTargetEmailAddress,
@@ -23,9 +24,16 @@ import {
   makeTargetEmailSignInServices,
   sqlClientEmailStandaloneGuard,
 } from "./email-target";
+import { nativeDatabase } from "./native-database";
+import { Database as DatabaseService } from "./pg-database";
 import type { ProofPersistenceMapping } from "./proof-model";
 import type { ProofSqlQuery } from "./proof-sql";
 import { sqlClientProofStandaloneGuard } from "./proof-target";
+import {
+  type TransactionService,
+  acquireTransactionService,
+  transactionService,
+} from "./standalone-guard";
 import type { SuppliedService } from "./SuppliedService";
 
 type Database = PostgresDatabase<AnyRelations> | PgliteDatabase<AnyRelations>;
@@ -45,15 +53,15 @@ type ProofMapping = ProofPersistenceMapping<
   any
 >;
 
-const configuration = (database: Database) => ({
+const configuration = (service: TransactionService | undefined) => ({
   mode: "interactive" as const,
   locking: true,
-  standaloneGuard: sqlClientEmailStandaloneGuard(database),
+  standaloneGuard: sqlClientEmailStandaloneGuard(service),
   generatedSubjectRows: (query: EmailSqlQuery) => query.returning(),
   proof: {
     mode: "interactive" as const,
     locking: true,
-    standaloneGuard: sqlClientProofStandaloneGuard(database),
+    standaloneGuard: sqlClientProofStandaloneGuard(service),
     insertIfAbsent: (query: ProofSqlQuery) => query.onConflictDoNothing(),
   },
 });
@@ -64,9 +72,12 @@ export const makePgEmailSignInServices = <
   C extends AnyPgTable,
   NativeId,
 >(
-  database: Database,
   mapping: EmailSignInMapping<S, I, C, NativeId>,
-) => makeTargetEmailSignInServices(database, mapping, configuration(database));
+) =>
+  Effect.flatMap(
+    Effect.map(acquireTransactionService(DatabaseService), configuration),
+    (configuration) => makeTargetEmailSignInServices(mapping, configuration),
+  ).pipe(Effect.provideServiceEffect(CurrentEmailSql, nativeDatabase(DatabaseService)));
 
 export const makePgEmailAddressServices = <
   S extends AnyPgTable,
@@ -76,10 +87,13 @@ export const makePgEmailAddressServices = <
   M extends AnyPgTable,
   NativeId,
 >(
-  database: Database,
   mapping: EmailAddressMapping<S, I, C, AC, M, NativeId>,
   proofMapping: ProofMapping,
-) => makeTargetEmailAddressServices(database, mapping, proofMapping, configuration(database));
+) =>
+  Effect.flatMap(
+    Effect.map(acquireTransactionService(DatabaseService), configuration),
+    (configuration) => makeTargetEmailAddressServices(mapping, proofMapping, configuration),
+  ).pipe(Effect.provideServiceEffect(CurrentEmailSql, nativeDatabase(DatabaseService)));
 
 export function coordinatePgEmailAddress<
   D extends Database,
@@ -170,7 +184,7 @@ export function coordinatePgEmailAddress<
       database,
       options.mapping,
       options.proofMapping,
-      configuration(database),
+      configuration(transactionService(database)),
       (
         transaction: TransactionOf<D>,
         services: { readonly emailAddressPersistence: EmailAddressPersistence["Service"] },
@@ -195,16 +209,14 @@ export const makePgEmailRegistrationServices = <
   Rq extends AnyPgTable,
   NativeId,
 >(
-  database: Database,
   mapping: EmailRegistrationMapping<Registration, S, I, C, AC, Rq, NativeId>,
   proofMapping: ProofMapping,
 ) =>
-  makeTargetEmailRegistrationServices<Registration>(
-    database,
-    mapping,
-    proofMapping,
-    configuration(database),
-  );
+  Effect.flatMap(
+    Effect.map(acquireTransactionService(DatabaseService), configuration),
+    (configuration) =>
+      makeTargetEmailRegistrationServices<Registration>(mapping, proofMapping, configuration),
+  ).pipe(Effect.provideServiceEffect(CurrentEmailSql, nativeDatabase(DatabaseService)));
 
 export function coordinatePgEmailRegistration<
   TargetId,
@@ -304,7 +316,7 @@ export function coordinatePgEmailRegistration<
       database,
       options.mapping,
       options.proofMapping,
-      configuration(database),
+      configuration(transactionService(database)),
       (
         transaction: TransactionOf<D>,
         services: { readonly registrationAuthority: EmailRegistrationAuthority<Registration> },

package/src/drizzle/pg-identity.ts

@@ -10,8 +10,7 @@ import {
 import { reportPersistenceFailure } from "@yielded/auth/Persistence";
 import type { SubjectId } from "@yielded/auth/Schema";
 /* oxlint-disable no-explicit-any -- Drizzle's generic query builders lose the concrete consumer table through a runtime column map. Assertions stay in this adapter. */
-import { and, eq, type AnyRelations } from "drizzle-orm";
-import type { EffectPgDatabase as PgliteDatabase } from "drizzle-orm/effect-pglite";
+import { and, eq } from "drizzle-orm";
 import type { EffectPgDatabase as PgDatabase } from "drizzle-orm/effect-postgres";
 import { type AnyPgTable, type PgColumn } from "drizzle-orm/pg-core";
 import { Cause, Effect, Schema } from "effect";
@@ -25,8 +24,8 @@ import {
   type IdentityTables,
   type SubjectProvisioningTables,
 } from "./model";
+import { Database as DatabaseService } from "./pg-database";
 
-type Database = PgDatabase<AnyRelations> | PgliteDatabase<AnyRelations>;
 type RuntimeDatabase = PgDatabase<any>;
 
 const identityUnavailable = () => IdentityUnavailable.make();
@@ -41,15 +40,14 @@ const mapIdentityFailure = <A, E, R>(effect: Effect.Effect<A, E, R>) =>
     ),
   );
 
-export const makePgSubjectProvisioningServices = <
+export const makePgSubjectProvisioningServices = Effect.fnUntraced(function* <
   Subject extends AnyPgTable,
   Identifier extends AnyPgTable,
   Request extends AnyPgTable,
   NativeId,
->(
-  database: Database,
-  mapping: SubjectProvisioningTables<Subject, Identifier, Request, NativeId>,
-) => {
+>(mapping: SubjectProvisioningTables<Subject, Identifier, Request, NativeId>) {
+  const database = yield* DatabaseService;
+
   const db = database as RuntimeDatabase;
   const requestTable = mapping.provisioningRequest.table;
   const requestIdColumn = column(requestTable, mapping.provisioningRequest.requestId);
@@ -174,16 +172,15 @@ export const makePgSubjectProvisioningServices = <
   return {
     subjectProvisioner: SubjectProvisioner.of({ provision }),
   } as const;
-};
+});
 
-export const makePgExternalIdentityServices = <
+export const makePgExternalIdentityServices = Effect.fnUntraced(function* <
   Subject extends AnyPgTable,
   External extends AnyPgTable,
   NativeId,
->(
-  database: Database,
-  mapping: ExternalIdentityTables<Subject, External, NativeId>,
-) => {
+>(mapping: ExternalIdentityTables<Subject, External, NativeId>) {
+  const database = yield* DatabaseService;
+
   const db = database as RuntimeDatabase;
   const externalTable = mapping.externalIdentity.table;
 
@@ -284,18 +281,17 @@ export const makePgExternalIdentityServices = <
   }, mapIdentityFailure);
 
   return { externalIdentityMutation: ExternalIdentityMutation.of({ bind }) } as const;
-};
+});
 
-export const makePgIdentityServices = <
+export const makePgIdentityServices = Effect.fnUntraced(function* <
   Subject extends AnyPgTable,
   Identifier extends AnyPgTable,
   External extends AnyPgTable,
   Request extends AnyPgTable,
   NativeId,
->(
-  database: Database,
-  mapping: IdentityTables<Subject, Identifier, External, Request, NativeId>,
-) => ({
-  ...makePgSubjectProvisioningServices(database, mapping),
-  ...makePgExternalIdentityServices(database, mapping),
+>(mapping: IdentityTables<Subject, Identifier, External, Request, NativeId>) {
+  return {
+    ...(yield* makePgSubjectProvisioningServices(mapping)),
+    ...(yield* makePgExternalIdentityServices(mapping)),
+  };
 });

package/src/drizzle/pg-password-prepared.ts

@@ -7,6 +7,7 @@ import type { AnyPgTable } from "drizzle-orm/pg-core";
 import { Effect, Context } from "effect";
 import type { SqlError } from "effect/sql/SqlError";
 
+import { nativeDatabase } from "./native-database";
 import type {
   PasswordPreparedPersistenceMapping,
   PasswordPreparedProofMapping,
@@ -15,7 +16,10 @@ import {
   makeTargetPasswordPreparedPersistenceServices,
   coordinateTargetPasswordPreparedPersistence,
 } from "./password-prepared-target";
+import { CurrentPasswordSql } from "./password-sql";
+import { Database as DatabaseService } from "./pg-database";
 import { pgPasswordConfiguration as configuration } from "./pg-passwords";
+import { acquireTransactionService, transactionService } from "./standalone-guard";
 import type { SuppliedService } from "./SuppliedService";
 type Database = PostgresDatabase<AnyRelations> | PgliteDatabase<AnyRelations>;
 type TransactionOf<D extends Database> = Parameters<Parameters<D["transaction"]>[0]>[0];
@@ -40,16 +44,14 @@ export const makePgPasswordPreparedPersistenceServices = <
   PCr extends AnyPgTable = AnyPgTable,
   PNativeId = unknown,
 >(
-  database: Database,
   mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, A, RS, CE, M, T, B, NativeId>,
   proofMapping?: PasswordPreparedProofMapping<PS, PC, PM, PSub, PI, PCr, PNativeId>,
 ) =>
-  makeTargetPasswordPreparedPersistenceServices(
-    database,
-    mapping,
-    configuration(database),
-    proofMapping,
-  );
+  Effect.flatMap(
+    Effect.map(acquireTransactionService(DatabaseService), configuration),
+    (configuration) =>
+      makeTargetPasswordPreparedPersistenceServices(mapping, configuration, proofMapping),
+  ).pipe(Effect.provideServiceEffect(CurrentPasswordSql, nativeDatabase(DatabaseService)));
 
 export function coordinatePgPasswordPreparedPersistence<
   TargetId,
@@ -187,7 +189,7 @@ export function coordinatePgPasswordPreparedPersistence<
     coordinateTargetPasswordPreparedPersistence<TransactionOf<D>, Out, E, Exclude<R, TargetId>>(
       database,
       options.mapping,
-      configuration(database),
+      configuration(transactionService(database)),
       options.proofMapping,
       (
         transaction: TransactionOf<D>,

package/src/drizzle/pg-passwords.ts

@@ -8,8 +8,10 @@ import type { AnyPgTable } from "drizzle-orm/pg-core";
 import { Effect, Context } from "effect";
 import type { SqlError } from "effect/sql/SqlError";
 
+import { nativeDatabase } from "./native-database";
 import type { PasswordPersistenceMapping, PasswordRegistrationMapping } from "./password-model";
 import type { PasswordRegistrationAuthority } from "./password-registration";
+import { CurrentPasswordSql } from "./password-sql";
 import type { PasswordSqlQuery } from "./password-sql";
 import {
   coordinateTargetPasswordPersistence,
@@ -18,24 +20,30 @@ import {
   makeTargetPasswordRegistrationServices,
   sqlClientPasswordStandaloneGuard,
 } from "./password-target";
+import { Database as DatabaseService } from "./pg-database";
 import type { ProofPersistenceMapping } from "./proof-model";
 import type { ProofSqlQuery } from "./proof-sql";
 import { sqlClientProofStandaloneGuard } from "./proof-target";
+import {
+  type TransactionService,
+  acquireTransactionService,
+  transactionService,
+} from "./standalone-guard";
 import type { SuppliedService } from "./SuppliedService";
 
 type Database = PostgresDatabase<AnyRelations> | PgliteDatabase<AnyRelations>;
 type TransactionOf<D extends Database> = Parameters<Parameters<D["transaction"]>[0]>[0];
 
-const configuration = (database: Database) => ({
+const configuration = (service: TransactionService | undefined) => ({
   mode: "interactive" as const,
   locking: true,
-  standaloneGuard: sqlClientPasswordStandaloneGuard(database),
+  standaloneGuard: sqlClientPasswordStandaloneGuard(service),
   insertIfAbsent: (query: PasswordSqlQuery) => query.onConflictDoNothing(),
   generatedSubjectRows: (query: PasswordSqlQuery) => query.returning(),
   proof: {
     mode: "interactive" as const,
     locking: true,
-    standaloneGuard: sqlClientProofStandaloneGuard(database),
+    standaloneGuard: sqlClientProofStandaloneGuard(service),
     insertIfAbsent: (query: ProofSqlQuery) => query.onConflictDoNothing(),
   },
 });
@@ -63,7 +71,6 @@ export const makePgPasswordPersistenceServices = <
   M extends AnyPgTable,
   NativeId,
 >(
-  database: Database,
   mapping: PasswordMapping<S, I, C, AC, A, RS, CE, M, NativeId>,
   proofMapping?: ProofPersistenceMapping<
     any,
@@ -80,7 +87,10 @@ export const makePgPasswordPersistenceServices = <
     any
   >,
 ) =>
-  makeTargetPasswordPersistenceServices(database, mapping, configuration(database), proofMapping);
+  Effect.flatMap(
+    Effect.map(acquireTransactionService(DatabaseService), configuration),
+    (configuration) => makeTargetPasswordPersistenceServices(mapping, configuration, proofMapping),
+  ).pipe(Effect.provideServiceEffect(CurrentPasswordSql, nativeDatabase(DatabaseService)));
 
 export function coordinatePgPasswordPersistence<
   D extends Database,
@@ -188,7 +198,7 @@ export function coordinatePgPasswordPersistence<
     coordinateTargetPasswordPersistence<TransactionOf<D>, Out, E, Exclude<R, PasswordPersistence>>(
       database,
       options.mapping,
-      configuration(database),
+      configuration(transactionService(database)),
       options.proofMapping,
       (
         transaction: TransactionOf<D>,
@@ -214,10 +224,12 @@ export const makePgPasswordRegistrationServices = <
   Rq extends AnyPgTable,
   NativeId,
 >(
-  database: Database,
   mapping: PasswordRegistrationMapping<Registration, S, I, C, AC, Rq, NativeId>,
 ) =>
-  makeTargetPasswordRegistrationServices<Registration>(database, mapping, configuration(database));
+  Effect.flatMap(
+    Effect.map(acquireTransactionService(DatabaseService), configuration),
+    (configuration) => makeTargetPasswordRegistrationServices<Registration>(mapping, configuration),
+  ).pipe(Effect.provideServiceEffect(CurrentPasswordSql, nativeDatabase(DatabaseService)));
 
 export function coordinatePgPasswordRegistration<
   TargetId,
@@ -319,7 +331,7 @@ export function coordinatePgPasswordRegistration<
     >(
       database,
       options.mapping,
-      configuration(database),
+      configuration(transactionService(database)),
       (
         transaction: TransactionOf<D>,
         services: { readonly registrationAuthority: PasswordRegistrationAuthority<Registration> },

package/src/drizzle/pg-proofs.ts

@@ -7,13 +7,21 @@ import type { AnyPgTable } from "drizzle-orm/pg-core";
 import { Effect, Context } from "effect";
 import type { SqlError } from "effect/sql/SqlError";
 
+import { nativeDatabase } from "./native-database";
+import { Database as DatabaseService } from "./pg-database";
 import type { ProofPersistenceMapping } from "./proof-model";
+import { CurrentProofSql } from "./proof-sql";
 import type { ProofSqlQuery } from "./proof-sql";
 import {
   coordinateTargetProofPersistence,
   makeTargetProofPersistenceServices,
   sqlClientProofStandaloneGuard,
 } from "./proof-target";
+import {
+  type TransactionService,
+  acquireTransactionService,
+  transactionService,
+} from "./standalone-guard";
 import type { SuppliedService } from "./SuppliedService";
 
 type Database = PostgresDatabase<AnyRelations> | PgliteDatabase<AnyRelations>;
@@ -46,10 +54,10 @@ type Mapping<
   NativeSubjectId
 >;
 
-const configuration = (database: Database) => ({
+const configuration = (service: TransactionService | undefined) => ({
   mode: "interactive" as const,
   locking: true,
-  standaloneGuard: sqlClientProofStandaloneGuard(database),
+  standaloneGuard: sqlClientProofStandaloneGuard(service),
   insertIfAbsent: (query: ProofSqlQuery) => query.onConflictDoNothing(),
 });
 
@@ -67,9 +75,12 @@ export const makePgProofPersistenceServices = <
   Cr extends AnyPgTable,
   NativeId,
 >(
-  database: Database,
   mapping: Mapping<Rq, S, G, Cn, Rs, A, F, C, Sub, I, Cr, NativeId>,
-) => makeTargetProofPersistenceServices(database, mapping, configuration(database));
+) =>
+  Effect.flatMap(
+    Effect.map(acquireTransactionService(DatabaseService), configuration),
+    (configuration) => makeTargetProofPersistenceServices(mapping, configuration),
+  ).pipe(Effect.provideServiceEffect(CurrentProofSql, nativeDatabase(DatabaseService)));
 
 export function coordinatePgProofPersistence<
   D extends Database,
@@ -174,7 +185,7 @@ export function coordinatePgProofPersistence<
     coordinateTargetProofPersistence<TransactionOf<D>, A, E, Exclude<R, ProofPersistence>>(
       database,
       options.mapping,
-      configuration(database),
+      configuration(transactionService(database)),
       (
         transaction: TransactionOf<D>,
         services: { readonly proofPersistence: ProofPersistence["Service"] },