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

package/src/Postgres.ts

@@ -1,20 +1,21 @@
 import type { AnyRelations } from "drizzle-orm";
 import { type EffectPgDatabase, makeWithDefaults } from "drizzle-orm/effect-postgres";
 import type { AnyPgTable } from "drizzle-orm/pg-core";
-import { Effect } from "effect";
-
-import type { AuthTables, IdentityTables } from "./drizzle/model";
+import { Effect, Layer } from "effect";
+
+import type {
+  IdentityTables,
+  SubjectProvisioningTables,
+  ExternalIdentityTables,
+} from "./drizzle/model";
+import { Database } from "./drizzle/pg-database";
 import {
-  coordinatePgAuthStoreTransaction,
-  coordinatePgAuthTransaction,
-  coordinatePgOAuthStateTransaction,
-  makePgAuthServices,
-  makePgAuthStoreServices,
   makePgExternalIdentityServices,
   makePgIdentityServices,
-  makePgOAuthStateServices,
   makePgSubjectProvisioningServices,
-} from "./drizzle/pg";
+} from "./drizzle/pg-identity";
+
+export { Database } from "./drizzle/pg-database";
 
 export {
   coordinatePgAuthenticationAuthority as coordinateAuthenticationAuthority,
@@ -47,22 +48,24 @@ export {
   makePgEmailSignInServices as makeEmailSignInServices,
 } from "./drizzle/pg-emails";
 
-export {
-  coordinatePgAuthStoreTransaction as coordinateAuthStoreTransaction,
-  coordinatePgAuthTransaction as coordinateAuthTransaction,
-  coordinatePgOAuthStateTransaction as coordinateOAuthStateTransaction,
-  makePgAuthStoreServices as makeAuthStoreServices,
-  makePgExternalIdentityServices as makeExternalIdentityServices,
-  makePgOAuthStateServices as makeOAuthStateServices,
-  makePgSubjectProvisioningServices as makeSubjectProvisioningServices,
-};
+export const makeSubjectProvisioningServices = <
+  Subject extends AnyPgTable,
+  Identifier extends AnyPgTable,
+  Request extends AnyPgTable,
+  NativeId,
+>(
+  mapping: SubjectProvisioningTables<Subject, Identifier, Request, NativeId>,
+) => makePgSubjectProvisioningServices(mapping);
 
-export const commitMode = "interactive" as const;
+export const makeExternalIdentityServices = <
+  Subject extends AnyPgTable,
+  External extends AnyPgTable,
+  NativeId,
+>(
+  mapping: ExternalIdentityTables<Subject, External, NativeId>,
+) => makePgExternalIdentityServices(mapping);
 
-export const makeAuthServices = <C extends AnyPgTable, R extends AnyPgTable, S extends AnyPgTable>(
-  database: EffectPgDatabase<AnyRelations>,
-  mapping: AuthTables<C, R, S>,
-) => makePgAuthServices(database, mapping);
+export const commitMode = "interactive" as const;
 
 export const makeIdentityServices = <
   Subject extends AnyPgTable,
@@ -71,9 +74,8 @@ export const makeIdentityServices = <
   Request extends AnyPgTable,
   NativeId,
 >(
-  database: EffectPgDatabase<AnyRelations>,
   mapping: IdentityTables<Subject, Identifier, External, Request, NativeId>,
-) => makePgIdentityServices(database, mapping);
+) => makePgIdentityServices(mapping);
 
 export {
   makePgSessionStepUpServices as makeSessionStepUpServices,
@@ -90,7 +92,11 @@ export { passwordPreparedPersistenceLayer } from "./drizzle/password-prepared-ta
 import { makeOAuthTarget } from "./drizzle/oauth-drivers";
 import { sqlClientOAuthStandaloneGuard } from "./drizzle/oauth-target";
 
-const oauthTarget = makeOAuthTarget<EffectPgDatabase<AnyRelations>, AnyPgTable<{ dialect: "pg" }>>({
+const oauthTarget = makeOAuthTarget<
+  Database,
+  EffectPgDatabase<AnyRelations>,
+  AnyPgTable<{ dialect: "pg" }>
+>(Database, {
   mode: "interactive",
   dialect: "pg",
   locking: true,
@@ -116,9 +122,10 @@ import { makePasskeyTarget } from "./drizzle/passkey-drivers";
 import { sqlClientPasskeyStandaloneGuard } from "./drizzle/passkey-target";
 
 const passkeyTarget = makePasskeyTarget<
+  Database,
   EffectPgDatabase<AnyRelations>,
   AnyPgTable<{ dialect: "pg" }>
->({
+>(Database, {
   mode: "interactive",
   dialect: "pg",
   locking: true,
@@ -140,7 +147,11 @@ export const {
 
 import { makeTotpTarget, sqlClientTotpStandaloneGuard } from "./drizzle/totp-target";
 
-const totpTarget = makeTotpTarget<EffectPgDatabase<AnyRelations>, AnyPgTable<{ dialect: "pg" }>>({
+const totpTarget = makeTotpTarget<
+  Database,
+  EffectPgDatabase<AnyRelations>,
+  AnyPgTable<{ dialect: "pg" }>
+>(Database, {
   mode: "interactive",
   dialect: "pg",
   locking: true,
@@ -151,7 +162,11 @@ export const { makeTotpPersistenceServices, coordinateTotpPersistence } = totpTa
 
 import { makePhoneTarget, sqlClientPhoneStandaloneGuard } from "./drizzle/phone-target";
 
-const phoneTarget = makePhoneTarget<EffectPgDatabase<AnyRelations>, AnyPgTable<{ dialect: "pg" }>>({
+const phoneTarget = makePhoneTarget<
+  Database,
+  EffectPgDatabase<AnyRelations>,
+  AnyPgTable<{ dialect: "pg" }>
+>(Database, {
   mode: "interactive",
   dialect: "pg",
   locking: true,
@@ -172,3 +187,6 @@ export const AuthPersistence = {
     ),
   ),
 };
+
+/** Construct Drizzle from the driver's SQL-client Layer. */
+export const databaseLayer = Layer.effect(Database, makeWithDefaults({}));

package/src/SqliteBun.ts

@@ -1,32 +1,25 @@
+import { NativeDatabase } from "@yielded/auth-persistence/Adapter";
 import type { AnyRelations } from "drizzle-orm";
 import { type EffectSQLiteBunDatabase, makeWithDefaults } from "drizzle-orm/effect-sqlite-bun";
 import type { AnySQLiteTable } from "drizzle-orm/sqlite-core";
-import { Effect } from "effect";
+import { Context, Effect, Layer } from "effect";
 
+import { nativeDatabase } from "./drizzle/native-database";
+
+/** The application-owned Drizzle database used to construct persistence services. */
+export class Database extends Context.Service<Database, EffectSQLiteBunDatabase<AnyRelations>>()(
+  "effect-auth/persistence-drizzle/SqliteBun/Database",
+) {}
+
+/** Construct Drizzle from the driver's SQL-client Layer. */
+export const databaseLayer = Layer.effect(Database, makeWithDefaults({}));
+
+import { sqlClientEmailStandaloneGuard } from "./drizzle/email-target";
 import type {
-  AuthStoreTables,
-  AuthTables,
   ExternalIdentityTables,
   IdentityTables,
-  OAuthStateTables,
   SubjectProvisioningTables,
 } from "./drizzle/model";
-import {
-  coordinateSqliteAuthStoreTransaction,
-  coordinateSqliteAuthTransaction,
-  coordinateSqliteOAuthStateTransaction,
-  makeSqliteAuthServices,
-  makeSqliteAuthStoreServices,
-  makeSqliteOAuthStateServices,
-} from "./drizzle/sqlite";
-
-export {
-  coordinateSqliteAuthStoreTransaction as coordinateAuthStoreTransaction,
-  coordinateSqliteAuthTransaction as coordinateAuthTransaction,
-  coordinateSqliteOAuthStateTransaction as coordinateOAuthStateTransaction,
-};
-
-import { sqlClientEmailStandaloneGuard } from "./drizzle/email-target";
 import { sqlClientPasswordStandaloneGuard } from "./drizzle/password-target";
 import { sqlClientProofStandaloneGuard } from "./drizzle/proof-target";
 import { sqlClientSessionStandaloneGuard } from "./drizzle/session-target";
@@ -40,28 +33,34 @@ import { makeSqlitePasswordTarget, sqlitePasswordConfiguration } from "./drizzle
 import { makeSqliteProofTarget, sqliteProofConfiguration } from "./drizzle/sqlite-proofs";
 import { makeSqliteSessionTarget, sqliteSessionConfiguration } from "./drizzle/sqlite-sessions";
 
-const sessionTarget = makeSqliteSessionTarget<EffectSQLiteBunDatabase<AnyRelations>>((database) =>
-  sqliteSessionConfiguration("interactive", sqlClientSessionStandaloneGuard(database)),
+const sessionTarget = makeSqliteSessionTarget<Database, EffectSQLiteBunDatabase<AnyRelations>>(
+  Database,
+  (service) => sqliteSessionConfiguration("interactive", sqlClientSessionStandaloneGuard(service)),
 );
 
-const proofTarget = makeSqliteProofTarget<EffectSQLiteBunDatabase<AnyRelations>>((database) =>
-  sqliteProofConfiguration("interactive", sqlClientProofStandaloneGuard(database)),
+const proofTarget = makeSqliteProofTarget<Database, EffectSQLiteBunDatabase<AnyRelations>>(
+  Database,
+  (service) => sqliteProofConfiguration("interactive", sqlClientProofStandaloneGuard(service)),
 );
 
-const passwordTarget = makeSqlitePasswordTarget<EffectSQLiteBunDatabase<AnyRelations>>((database) =>
-  sqlitePasswordConfiguration(
-    "interactive",
-    sqlClientPasswordStandaloneGuard(database),
-    sqlClientProofStandaloneGuard(database),
-  ),
+const passwordTarget = makeSqlitePasswordTarget<Database, EffectSQLiteBunDatabase<AnyRelations>>(
+  Database,
+  (service) =>
+    sqlitePasswordConfiguration(
+      "interactive",
+      sqlClientPasswordStandaloneGuard(service),
+      sqlClientProofStandaloneGuard(service),
+    ),
 );
 
-const emailTarget = makeSqliteEmailTarget<EffectSQLiteBunDatabase<AnyRelations>>((database) =>
-  sqliteEmailConfiguration(
-    "interactive",
-    sqlClientEmailStandaloneGuard(database),
-    sqlClientProofStandaloneGuard(database),
-  ),
+const emailTarget = makeSqliteEmailTarget<Database, EffectSQLiteBunDatabase<AnyRelations>>(
+  Database,
+  (service) =>
+    sqliteEmailConfiguration(
+      "interactive",
+      sqlClientEmailStandaloneGuard(service),
+      sqlClientProofStandaloneGuard(service),
+    ),
 );
 
 export const {
@@ -96,25 +95,6 @@ export const {
 
 export const commitMode = "interactive" as const;
 
-export const makeAuthStoreServices = <C extends AnySQLiteTable, R extends AnySQLiteTable>(
-  database: EffectSQLiteBunDatabase<AnyRelations>,
-  mapping: AuthStoreTables<C, R>,
-) => makeSqliteAuthStoreServices(database, mapping);
-
-export const makeOAuthStateServices = <S extends AnySQLiteTable>(
-  database: EffectSQLiteBunDatabase<AnyRelations>,
-  mapping: OAuthStateTables<S>,
-) => makeSqliteOAuthStateServices(database, mapping);
-
-export const makeAuthServices = <
-  C extends AnySQLiteTable,
-  R extends AnySQLiteTable,
-  S extends AnySQLiteTable,
->(
-  database: EffectSQLiteBunDatabase<AnyRelations>,
-  mapping: AuthTables<C, R, S>,
-) => makeSqliteAuthServices(database, mapping);
-
 export const makeIdentityServices = <
   Subject extends AnySQLiteTable,
   Identifier extends AnySQLiteTable,
@@ -122,9 +102,11 @@ export const makeIdentityServices = <
   Request extends AnySQLiteTable,
   NativeId,
 >(
-  database: EffectSQLiteBunDatabase<AnyRelations>,
   mapping: IdentityTables<Subject, Identifier, External, Request, NativeId>,
-) => makeSqliteIdentityServices(database, mapping, "interactive");
+) =>
+  makeSqliteIdentityServices(mapping, "interactive").pipe(
+    Effect.provideServiceEffect(NativeDatabase, nativeDatabase(Database)),
+  );
 
 export const makeSubjectProvisioningServices = <
   Subject extends AnySQLiteTable,
@@ -132,28 +114,33 @@ export const makeSubjectProvisioningServices = <
   Request extends AnySQLiteTable,
   NativeId,
 >(
-  database: EffectSQLiteBunDatabase<AnyRelations>,
   mapping: SubjectProvisioningTables<Subject, Identifier, Request, NativeId>,
-) => makeSqliteSubjectProvisioningServices(database, mapping, "interactive");
+) =>
+  makeSqliteSubjectProvisioningServices(mapping, "interactive").pipe(
+    Effect.provideServiceEffect(NativeDatabase, nativeDatabase(Database)),
+  );
 
 export const makeExternalIdentityServices = <
   Subject extends AnySQLiteTable,
   External extends AnySQLiteTable,
   NativeId,
 >(
-  database: EffectSQLiteBunDatabase<AnyRelations>,
   mapping: ExternalIdentityTables<Subject, External, NativeId>,
-) => makeSqliteExternalIdentityServices(database, mapping);
+) =>
+  makeSqliteExternalIdentityServices(mapping).pipe(
+    Effect.provideServiceEffect(NativeDatabase, nativeDatabase(Database)),
+  );
 
 import { makeSqlitePasswordPreparedTarget } from "./drizzle/sqlite-password-prepared";
 
 const passwordPreparedTarget = makeSqlitePasswordPreparedTarget<
+  Database,
   EffectSQLiteBunDatabase<AnyRelations>
->((database) =>
+>(Database, (service) =>
   sqlitePasswordConfiguration(
     "interactive",
-    sqlClientPasswordStandaloneGuard(database),
-    sqlClientProofStandaloneGuard(database),
+    sqlClientPasswordStandaloneGuard(service),
+    sqlClientProofStandaloneGuard(service),
   ),
 );
 
@@ -166,9 +153,10 @@ import { makeOAuthTarget } from "./drizzle/oauth-drivers";
 import { sqlClientOAuthStandaloneGuard } from "./drizzle/oauth-target";
 
 const oauthTarget = makeOAuthTarget<
+  Database,
   EffectSQLiteBunDatabase<AnyRelations>,
   AnySQLiteTable<{ dialect: "sqlite" }>
->({
+>(Database, {
   mode: "interactive",
   dialect: "sqlite",
   locking: false,
@@ -194,9 +182,10 @@ import { makePasskeyTarget } from "./drizzle/passkey-drivers";
 import { sqlClientPasskeyStandaloneGuard } from "./drizzle/passkey-target";
 
 const passkeyTarget = makePasskeyTarget<
+  Database,
   EffectSQLiteBunDatabase<AnyRelations>,
   AnySQLiteTable<{ dialect: "sqlite" }>
->({
+>(Database, {
   mode: "interactive",
   dialect: "sqlite",
   locking: false,
@@ -219,9 +208,10 @@ export const {
 import { makeTotpTarget, sqlClientTotpStandaloneGuard } from "./drizzle/totp-target";
 
 const totpTarget = makeTotpTarget<
+  Database,
   EffectSQLiteBunDatabase<AnyRelations>,
   AnySQLiteTable<{ dialect: "sqlite" }>
->({
+>(Database, {
   mode: "interactive",
   dialect: "sqlite",
   locking: false,
@@ -233,9 +223,10 @@ export const { makeTotpPersistenceServices, coordinateTotpPersistence } = totpTa
 import { makePhoneTarget, sqlClientPhoneStandaloneGuard } from "./drizzle/phone-target";
 
 const phoneTarget = makePhoneTarget<
+  Database,
   EffectSQLiteBunDatabase<AnyRelations>,
   AnySQLiteTable<{ dialect: "sqlite" }>
->({
+>(Database, {
   mode: "interactive",
   dialect: "sqlite",
   locking: false,