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

package/package.json

@@ -1 +1 @@
-{"name":"@yielded/auth-persistence-drizzle","version":"0.1.0-beta.0","dependencies":{"@noble/hashes":"2.3.0","@yielded/auth":"0.1.0-beta.10","@yielded/auth-crypto":"0.1.0-beta.0","@yielded/auth-persistence":"0.1.0-beta.10"},"devDependencies":{"@effect/platform-bun":"4.0.0-rc.117","@effect/platform-node":"4.0.0-rc.117","@effect/sql-d1":"4.0.0-rc.117","@effect/sql-libsql":"4.0.0-rc.117","@effect/sql-mysql2":"4.0.0-rc.117","@effect/sql-pg":"4.0.0-rc.117","@effect/sql-pglite":"4.0.0-rc.117","@effect/sql-sqlite-bun":"4.0.0-rc.117","@effect/sql-sqlite-do":"4.0.0-rc.117","@effect/sql-sqlite-node":"4.0.0-rc.117","@effect/sql-sqlite-wasm":"4.0.0-rc.117","@effect/vitest":"4.0.0-rc.117","drizzle-orm":"1.0.0-rc.5-ab785fc","effect":"4.0.0-rc.117","typescript":"7.0.2","vite-plus":"1.0.0-rc.0"},"peerDependencies":{"@effect/sql-d1":">=4.0.0-rc.117","@effect/sql-libsql":">=4.0.0-rc.117","@effect/sql-mysql2":">=4.0.0-rc.117","@effect/sql-pg":">=4.0.0-rc.117","@effect/sql-pglite":">=4.0.0-rc.117","@effect/sql-sqlite-bun":">=4.0.0-rc.117","@effect/sql-sqlite-do":">=4.0.0-rc.117","@effect/sql-sqlite-node":">=4.0.0-rc.117","@effect/sql-sqlite-wasm":">=4.0.0-rc.117","drizzle-orm":">=1.0.0-rc.5-ab785fc","effect":"^4.0.0-rc.117"},"exports":{".":{"types":"./dist/index.d.mts","default":"./dist/index.mjs"},"./D1":{"types":"./dist/D1.d.mts","default":"./dist/D1.mjs"},"./Libsql":{"types":"./dist/Libsql.d.mts","default":"./dist/Libsql.mjs"},"./Mysql2":{"types":"./dist/Mysql2.d.mts","default":"./dist/Mysql2.mjs"},"./Pglite":{"types":"./dist/Pglite.d.mts","default":"./dist/Pglite.mjs"},"./Postgres":{"types":"./dist/Postgres.d.mts","default":"./dist/Postgres.mjs"},"./SqliteBun":{"types":"./dist/SqliteBun.d.mts","default":"./dist/SqliteBun.mjs"},"./SqliteDo":{"types":"./dist/SqliteDo.d.mts","default":"./dist/SqliteDo.mjs"},"./SqliteNode":{"types":"./dist/SqliteNode.d.mts","default":"./dist/SqliteNode.mjs"},"./SqliteWasm":{"types":"./dist/SqliteWasm.d.mts","default":"./dist/SqliteWasm.mjs"}},"description":"Drizzle persistence, table mappings, and migration adapters for Yielded Auth.","homepage":"https://yielded.dev/auth/","bugs":{"url":"https://github.com/yielded-dev/auth/issues"},"license":"MIT","repository":{"type":"git","url":"git+https://github.com/yielded-dev/auth.git","directory":"packages/auth-persistence-drizzle"},"files":["dist","src"],"type":"module","sideEffects":[],"publishConfig":{"access":"public"},"scripts":{"build":"vp pack","check":"tsc --noEmit -p tsconfig.json","test":"vp test --passWithNoTests","example:totp":"bun test/fixtures/totp-sqlite-bun.ts"},"peerDependenciesMeta":{"@effect/sql-d1":{"optional":true},"@effect/sql-libsql":{"optional":true},"@effect/sql-mysql2":{"optional":true},"@effect/sql-pg":{"optional":true},"@effect/sql-pglite":{"optional":true},"@effect/sql-sqlite-bun":{"optional":true},"@effect/sql-sqlite-do":{"optional":true},"@effect/sql-sqlite-node":{"optional":true},"@effect/sql-sqlite-wasm":{"optional":true}}}
+{"name":"@yielded/auth-persistence-drizzle","version":"0.1.0-beta.12","dependencies":{"@noble/hashes":"2.3.0","@yielded/auth":"0.1.0-beta.12","@yielded/auth-crypto":"0.1.0-beta.12","@yielded/auth-persistence":"0.1.0-beta.12"},"devDependencies":{"@effect/platform-bun":"4.0.0","@effect/platform-node":"4.0.0","@effect/sql-d1":"4.0.0","@effect/sql-libsql":"4.0.0","@effect/sql-mysql2":"4.0.0","@effect/sql-pg":"4.0.0","@effect/sql-pglite":"4.0.0","@effect/sql-sqlite-bun":"4.0.0","@effect/sql-sqlite-do":"4.0.0","@effect/sql-sqlite-node":"4.0.0","@effect/sql-sqlite-wasm":"4.0.0","@effect/vitest":"4.0.0","drizzle-orm":"1.0.0-rc.4","effect":"4.0.0","typescript":"7.0.2","vite-plus":"0.3.3"},"peerDependencies":{"@effect/sql-d1":">=4.0.0","@effect/sql-libsql":">=4.0.0","@effect/sql-mysql2":">=4.0.0","@effect/sql-pg":">=4.0.0","@effect/sql-pglite":">=4.0.0","@effect/sql-sqlite-bun":">=4.0.0","@effect/sql-sqlite-do":">=4.0.0","@effect/sql-sqlite-node":">=4.0.0","@effect/sql-sqlite-wasm":">=4.0.0","drizzle-orm":">=1.0.0-rc.4","effect":"^4.0.0"},"exports":{".":{"types":"./dist/index.d.mts","default":"./dist/index.mjs"},"./D1":{"types":"./dist/D1.d.mts","default":"./dist/D1.mjs"},"./Libsql":{"types":"./dist/Libsql.d.mts","default":"./dist/Libsql.mjs"},"./Mysql2":{"types":"./dist/Mysql2.d.mts","default":"./dist/Mysql2.mjs"},"./Pglite":{"types":"./dist/Pglite.d.mts","default":"./dist/Pglite.mjs"},"./Postgres":{"types":"./dist/Postgres.d.mts","default":"./dist/Postgres.mjs"},"./SqliteBun":{"types":"./dist/SqliteBun.d.mts","default":"./dist/SqliteBun.mjs"},"./SqliteDo":{"types":"./dist/SqliteDo.d.mts","default":"./dist/SqliteDo.mjs"},"./SqliteNode":{"types":"./dist/SqliteNode.d.mts","default":"./dist/SqliteNode.mjs"},"./SqliteWasm":{"types":"./dist/SqliteWasm.d.mts","default":"./dist/SqliteWasm.mjs"}},"description":"Drizzle persistence, table mappings, and migration adapters for Yielded Auth.","homepage":"https://yielded.dev/auth/","bugs":{"url":"https://github.com/yielded-dev/auth/issues"},"license":"MIT","repository":{"type":"git","url":"git+https://github.com/yielded-dev/auth.git","directory":"packages/auth-persistence-drizzle"},"files":["dist","src"],"type":"module","sideEffects":[],"publishConfig":{"access":"public"},"scripts":{"build":"vp pack","check":"tsc --noEmit -p tsconfig.json","test":"vp test --passWithNoTests","example:totp":"bun test/fixtures/totp-sqlite-bun.ts"},"peerDependenciesMeta":{"@effect/sql-d1":{"optional":true},"@effect/sql-libsql":{"optional":true},"@effect/sql-mysql2":{"optional":true},"@effect/sql-pg":{"optional":true},"@effect/sql-pglite":{"optional":true},"@effect/sql-sqlite-bun":{"optional":true},"@effect/sql-sqlite-do":{"optional":true},"@effect/sql-sqlite-node":{"optional":true},"@effect/sql-sqlite-wasm":{"optional":true}}}

package/src/D1.ts

@@ -1,9 +1,12 @@
 import type { D1Client } from "@effect/sql-d1/D1Client";
 export { makeTotpPersistenceServices, coordinateTotpPersistence } from "./drizzle/d1-totp";
 import type { AnyRelations } from "drizzle-orm";
-import type { EffectSQLiteD1Database } from "drizzle-orm/effect-d1";
+import { type EffectSQLiteD1Database, makeWithDefaults } from "drizzle-orm/effect-d1";
 import type { AnySQLiteTable } from "drizzle-orm/sqlite-core";
 
+import { Database } from "./drizzle/d1-database";
+export { Database } from "./drizzle/d1-database";
+
 export {
   makeD1OAuthAccountsServices as makeOAuthAccountsServices,
   makeD1OAuthSignInServices as makeOAuthSignInServices,
@@ -52,30 +55,30 @@ export {
   makeD1EmailSignInServices as makeEmailSignInServices,
 } from "./drizzle/d1-emails";
 
-import { type AuthTables, type D1GeneratedIdentityMapping } from "./drizzle/model";
-import {
-  makeSqliteAuthServices,
-  makeSqliteAuthStoreServices,
-  makeSqliteOAuthStateServices,
-} from "./drizzle/sqlite";
-
-export {
-  makeD1ExternalIdentityServices as makeExternalIdentityServices,
-  makeD1SubjectProvisioningServices as makeSubjectProvisioningServices,
-  makeSqliteAuthStoreServices as makeAuthStoreServices,
-  makeSqliteOAuthStateServices as makeOAuthStateServices,
-};
+import type {
+  D1GeneratedIdentityMapping,
+  D1SubjectProvisioningMapping,
+  D1ExternalIdentityMapping,
+} from "./drizzle/model";
 
-export const commitMode = "batch" as const;
+export const makeSubjectProvisioningServices = <
+  Subject extends AnySQLiteTable,
+  Identifier extends AnySQLiteTable,
+  Request extends AnySQLiteTable,
+  NativeId,
+>(
+  mapping: D1SubjectProvisioningMapping<Subject, Identifier, Request, NativeId>,
+) => makeD1SubjectProvisioningServices(mapping);
 
-export const makeAuthServices = <
-  C extends AnySQLiteTable,
-  R extends AnySQLiteTable,
-  S extends AnySQLiteTable,
+export const makeExternalIdentityServices = <
+  Subject extends AnySQLiteTable,
+  External extends AnySQLiteTable,
+  NativeId,
 >(
-  database: EffectSQLiteD1Database<AnyRelations>,
-  mapping: AuthTables<C, R, S>,
-) => makeSqliteAuthServices(database, mapping);
+  mapping: D1ExternalIdentityMapping<Subject, External, NativeId>,
+) => makeD1ExternalIdentityServices(mapping);
+
+export const commitMode = "batch" as const;
 
 export const makeIdentityServices = <
   Subject extends AnySQLiteTable,
@@ -84,9 +87,8 @@ export const makeIdentityServices = <
   Request extends AnySQLiteTable,
   NativeId,
 >(
-  database: EffectSQLiteD1Database<AnyRelations> & { readonly $client: D1Client },
   mapping: D1GeneratedIdentityMapping<Subject, Identifier, External, Request, NativeId>,
-) => makeD1IdentityServices(database, mapping);
+) => makeD1IdentityServices(mapping);
 
 export {
   makeD1SessionStepUpServices as makeSessionStepUpServices,
@@ -100,16 +102,22 @@ export {
 
 export { passwordPreparedPersistenceLayer } from "./drizzle/password-prepared-target";
 
-import { Effect } from "effect";
+import { Effect, Layer } from "effect";
 
 import { makeD1OAuthConnectedTarget } from "./drizzle/oauth-connected-drivers";
 import type { OAuthD1Mapping } from "./drizzle/oauth-model";
 
 const connectedTarget = makeD1OAuthConnectedTarget<
+  Database,
   EffectSQLiteD1Database<AnyRelations> & { readonly $client: D1Client },
   AnySQLiteTable<{ dialect: "sqlite" }>,
   OAuthD1Mapping
->({ mode: "batch", dialect: "sqlite", locking: false, standaloneGuard: () => Effect.void });
+>(Database, {
+  mode: "batch",
+  dialect: "sqlite",
+  locking: false,
+  standaloneGuard: () => Effect.void,
+});
 
 export const {
   makeOAuthConnectedServices,
@@ -134,3 +142,6 @@ export {
 export { D1BatchStatements } from "./drizzle/D1BatchStatements";
 
 export { makePhonePersistenceServices, coordinatePhonePersistence } from "./drizzle/d1-phone";
+
+/** Construct Drizzle from the driver's SQL-client Layer. */
+export const databaseLayer = Layer.effect(Database, makeWithDefaults({}));

package/src/Libsql.ts

@@ -1,37 +1,28 @@
-import { requireStandalone as standalone } from "@yielded/auth-persistence/Adapter";
+import { NativeDatabase, requireStandalone as standalone } from "@yielded/auth-persistence/Adapter";
 import { EmailUnavailable } from "@yielded/auth/Email";
-import { AuthStoreError } from "@yielded/auth/Errors";
 import { PasswordUnavailable } from "@yielded/auth/Password";
 import { ProofUnavailable } from "@yielded/auth/Proofs";
 import { SessionUnavailable } from "@yielded/auth/Sessions";
 import type { AnyRelations } from "drizzle-orm";
 import { type EffectLibsqlDatabase, makeWithDefaults } from "drizzle-orm/effect-libsql";
 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, EffectLibsqlDatabase<AnyRelations>>()(
+  "effect-auth/persistence-drizzle/Libsql/Database",
+) {}
+
+/** Construct Drizzle from the driver's SQL-client Layer. */
+export const databaseLayer = Layer.effect(Database, makeWithDefaults({}));
 
 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 { makeSqliteEmailTarget, sqliteEmailConfiguration } from "./drizzle/sqlite-emails";
 import {
   makeSqliteExternalIdentityServices,
@@ -42,30 +33,28 @@ import { makeSqlitePasswordTarget, sqlitePasswordConfiguration } from "./drizzle
 import { makeSqliteProofTarget, sqliteProofConfiguration } from "./drizzle/sqlite-proofs";
 import { makeSqliteSessionTarget, sqliteSessionConfiguration } from "./drizzle/sqlite-sessions";
 
-const requireStandalone = standalone(() =>
-  AuthStoreError.make({
-    message: "Use the decision consume API inside an outer database transaction",
-  }),
-);
-
 const requireStandaloneSession = standalone(() => SessionUnavailable.make({}));
 const requireStandaloneProof = standalone(() => ProofUnavailable.make({}));
 const requireStandalonePassword = standalone(() => PasswordUnavailable.make({}));
 const requireStandaloneEmail = standalone(() => EmailUnavailable.make({}));
 
-const sessionTarget = makeSqliteSessionTarget<EffectLibsqlDatabase<AnyRelations>>(
+const sessionTarget = makeSqliteSessionTarget<Database, EffectLibsqlDatabase<AnyRelations>>(
+  Database,
   sqliteSessionConfiguration("interactive", requireStandaloneSession),
 );
 
-const proofTarget = makeSqliteProofTarget<EffectLibsqlDatabase<AnyRelations>>(
+const proofTarget = makeSqliteProofTarget<Database, EffectLibsqlDatabase<AnyRelations>>(
+  Database,
   sqliteProofConfiguration("interactive", requireStandaloneProof),
 );
 
-const passwordTarget = makeSqlitePasswordTarget<EffectLibsqlDatabase<AnyRelations>>(
+const passwordTarget = makeSqlitePasswordTarget<Database, EffectLibsqlDatabase<AnyRelations>>(
+  Database,
   sqlitePasswordConfiguration("interactive", requireStandalonePassword, requireStandaloneProof),
 );
 
-const emailTarget = makeSqliteEmailTarget<EffectLibsqlDatabase<AnyRelations>>(
+const emailTarget = makeSqliteEmailTarget<Database, EffectLibsqlDatabase<AnyRelations>>(
+  Database,
   sqliteEmailConfiguration("interactive", requireStandaloneEmail, requireStandaloneProof),
 );
 
@@ -101,25 +90,6 @@ export const {
 
 export const commitMode = "interactive" as const;
 
-export const makeAuthStoreServices = <C extends AnySQLiteTable, R extends AnySQLiteTable>(
-  database: EffectLibsqlDatabase<AnyRelations>,
-  mapping: AuthStoreTables<C, R>,
-) => makeSqliteAuthStoreServices(database, mapping, requireStandalone);
-
-export const makeOAuthStateServices = <S extends AnySQLiteTable>(
-  database: EffectLibsqlDatabase<AnyRelations>,
-  mapping: OAuthStateTables<S>,
-) => makeSqliteOAuthStateServices(database, mapping, requireStandalone);
-
-export const makeAuthServices = <
-  C extends AnySQLiteTable,
-  R extends AnySQLiteTable,
-  S extends AnySQLiteTable,
->(
-  database: EffectLibsqlDatabase<AnyRelations>,
-  mapping: AuthTables<C, R, S>,
-) => makeSqliteAuthServices(database, mapping, requireStandalone);
-
 export const makeIdentityServices = <
   Subject extends AnySQLiteTable,
   Identifier extends AnySQLiteTable,
@@ -127,9 +97,11 @@ export const makeIdentityServices = <
   Request extends AnySQLiteTable,
   NativeId,
 >(
-  database: EffectLibsqlDatabase<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,
@@ -137,22 +109,30 @@ export const makeSubjectProvisioningServices = <
   Request extends AnySQLiteTable,
   NativeId,
 >(
-  database: EffectLibsqlDatabase<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: EffectLibsqlDatabase<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<EffectLibsqlDatabase<AnyRelations>>(
+const passwordPreparedTarget = makeSqlitePasswordPreparedTarget<
+  Database,
+  EffectLibsqlDatabase<AnyRelations>
+>(
+  Database,
   sqlitePasswordConfiguration("interactive", requireStandalonePassword, requireStandaloneProof),
 );
 
@@ -165,9 +145,10 @@ import { makeOAuthTarget } from "./drizzle/oauth-drivers";
 import { sqlClientOAuthStandaloneGuard } from "./drizzle/oauth-target";
 
 const oauthTarget = makeOAuthTarget<
+  Database,
   EffectLibsqlDatabase<AnyRelations>,
   AnySQLiteTable<{ dialect: "sqlite" }>
->({
+>(Database, {
   mode: "interactive",
   dialect: "sqlite",
   locking: false,
@@ -193,9 +174,10 @@ import { makePasskeyTarget } from "./drizzle/passkey-drivers";
 import { sqlClientPasskeyStandaloneGuard } from "./drizzle/passkey-target";
 
 const passkeyTarget = makePasskeyTarget<
+  Database,
   EffectLibsqlDatabase<AnyRelations>,
   AnySQLiteTable<{ dialect: "sqlite" }>
->({
+>(Database, {
   mode: "interactive",
   dialect: "sqlite",
   locking: false,
@@ -218,9 +200,10 @@ export const {
 import { makeTotpTarget, sqlClientTotpStandaloneGuard } from "./drizzle/totp-target";
 
 const totpTarget = makeTotpTarget<
+  Database,
   EffectLibsqlDatabase<AnyRelations>,
   AnySQLiteTable<{ dialect: "sqlite" }>
->({
+>(Database, {
   mode: "interactive",
   dialect: "sqlite",
   locking: false,
@@ -232,9 +215,10 @@ export const { makeTotpPersistenceServices, coordinateTotpPersistence } = totpTa
 import { makePhoneTarget, sqlClientPhoneStandaloneGuard } from "./drizzle/phone-target";
 
 const phoneTarget = makePhoneTarget<
+  Database,
   EffectLibsqlDatabase<AnyRelations>,
   AnySQLiteTable<{ dialect: "sqlite" }>
->({
+>(Database, {
   mode: "interactive",
   dialect: "sqlite",
   locking: false,

package/src/Mysql2.ts

@@ -1,22 +1,22 @@
 import type { AnyRelations } from "drizzle-orm";
-import type { EffectMysql2Database } from "drizzle-orm/effect-mysql2";
+import { type EffectMysql2Database, makeWithDefaults } from "drizzle-orm/effect-mysql2";
 import type { AnyMySqlTable } from "drizzle-orm/mysql-core";
-
-import type { AuthTables, IdentityTables } from "./drizzle/model";
-import {
-  coordinateMysqlAuthStoreTransaction,
-  coordinateMysqlAuthTransaction,
-  coordinateMysqlOAuthStateTransaction,
-  makeMysqlAuthServices,
-  makeMysqlAuthStoreServices,
-  makeMysqlOAuthStateServices,
-} from "./drizzle/mysql";
+import { Layer } from "effect";
+
+import type {
+  IdentityTables,
+  SubjectProvisioningTables,
+  ExternalIdentityTables,
+} from "./drizzle/model";
+import { Database } from "./drizzle/mysql-database";
 import {
   makeMysqlExternalIdentityServices,
   makeMysqlIdentityServices,
   makeMysqlSubjectProvisioningServices,
 } from "./drizzle/mysql-identity";
 
+export { Database } from "./drizzle/mysql-database";
+
 export {
   coordinateMysqlAuthenticationAuthority as coordinateAuthenticationAuthority,
   coordinateMysqlPendingAuthentication as coordinatePendingAuthentication,
@@ -48,26 +48,24 @@ export {
   makeMysqlEmailSignInServices as makeEmailSignInServices,
 } from "./drizzle/mysql-emails";
 
-export {
-  coordinateMysqlAuthStoreTransaction as coordinateAuthStoreTransaction,
-  coordinateMysqlAuthTransaction as coordinateAuthTransaction,
-  coordinateMysqlOAuthStateTransaction as coordinateOAuthStateTransaction,
-  makeMysqlAuthStoreServices as makeAuthStoreServices,
-  makeMysqlExternalIdentityServices as makeExternalIdentityServices,
-  makeMysqlOAuthStateServices as makeOAuthStateServices,
-  makeMysqlSubjectProvisioningServices as makeSubjectProvisioningServices,
-};
-
-export const commitMode = "interactive" as const;
+export const makeSubjectProvisioningServices = <
+  Subject extends AnyMySqlTable,
+  Identifier extends AnyMySqlTable,
+  Request extends AnyMySqlTable,
+  NativeId,
+>(
+  mapping: SubjectProvisioningTables<Subject, Identifier, Request, NativeId>,
+) => makeMysqlSubjectProvisioningServices(mapping);
 
-export const makeAuthServices = <
-  C extends AnyMySqlTable,
-  R extends AnyMySqlTable,
-  S extends AnyMySqlTable,
+export const makeExternalIdentityServices = <
+  Subject extends AnyMySqlTable,
+  External extends AnyMySqlTable,
+  NativeId,
 >(
-  database: EffectMysql2Database<AnyRelations>,
-  mapping: AuthTables<C, R, S>,
-) => makeMysqlAuthServices(database, mapping);
+  mapping: ExternalIdentityTables<Subject, External, NativeId>,
+) => makeMysqlExternalIdentityServices(mapping);
+
+export const commitMode = "interactive" as const;
 
 export const makeIdentityServices = <
   Subject extends AnyMySqlTable,
@@ -76,9 +74,8 @@ export const makeIdentityServices = <
   Request extends AnyMySqlTable,
   NativeId,
 >(
-  database: EffectMysql2Database<AnyRelations>,
   mapping: IdentityTables<Subject, Identifier, External, Request, NativeId>,
-) => makeMysqlIdentityServices(database, mapping);
+) => makeMysqlIdentityServices(mapping);
 
 export {
   makeMysqlSessionStepUpServices as makeSessionStepUpServices,
@@ -97,9 +94,10 @@ import { mysqlOAuthTransaction } from "./drizzle/oauth-mysql";
 import { sqlClientOAuthStandaloneGuard } from "./drizzle/oauth-target";
 
 const oauthTarget = makeOAuthTarget<
+  Database,
   EffectMysql2Database<AnyRelations>,
   AnyMySqlTable<{ dialect: "mysql" }>
->({
+>(Database, {
   mode: "interactive",
   dialect: "mysql",
   locking: true,
@@ -128,9 +126,10 @@ import { sqlClientPasskeyStandaloneGuard } from "./drizzle/passkey-target";
 import { mysqlTransaction } from "./drizzle/transaction-mysql";
 
 const passkeyTarget = makePasskeyTarget<
+  Database,
   EffectMysql2Database<AnyRelations>,
   AnyMySqlTable<{ dialect: "mysql" }>
->({
+>(Database, {
   mode: "interactive",
   dialect: "mysql",
   locking: true,
@@ -155,9 +154,10 @@ import { unavailable as totpUnavailable } from "./drizzle/totp-state";
 import { makeTotpTarget, sqlClientTotpStandaloneGuard } from "./drizzle/totp-target";
 
 const totpTarget = makeTotpTarget<
+  Database,
   EffectMysql2Database<AnyRelations>,
   AnyMySqlTable<{ dialect: "mysql" }>
->({
+>(Database, {
   mode: "interactive",
   dialect: "mysql",
   locking: true,
@@ -171,9 +171,10 @@ import { unavailable as phoneUnavailable } from "./drizzle/phone-state";
 import { makePhoneTarget, sqlClientPhoneStandaloneGuard } from "./drizzle/phone-target";
 
 const phoneTarget = makePhoneTarget<
+  Database,
   EffectMysql2Database<AnyRelations>,
   AnyMySqlTable<{ dialect: "mysql" }>
->({
+>(Database, {
   mode: "interactive",
   dialect: "mysql",
   locking: true,
@@ -182,3 +183,6 @@ const phoneTarget = makePhoneTarget<
 });
 
 export const { makePhonePersistenceServices, coordinatePhonePersistence } = phoneTarget;
+
+/** Construct Drizzle from the driver's SQL-client Layer. */
+export const databaseLayer = Layer.effect(Database, makeWithDefaults({}));

package/src/Pglite.ts

@@ -1,20 +1,21 @@
 import type { AnyRelations } from "drizzle-orm";
 import { type EffectPgDatabase, makeWithDefaults } from "drizzle-orm/effect-pglite";
 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({}));