@yielded/auth-persistence-drizzle 0.1.0-beta.25 → 0.1.0-beta.27

package/src/drizzle/oauth-drivers.ts

@@ -1,4 +1,3 @@
-import { NativeDatabase } from "@yielded/auth-persistence/Adapter";
 import type { LifecycleHooks } from "@yielded/auth/Hooks";
 import {
   OAuthAccountsPersistence,
@@ -8,7 +7,8 @@ import {
 import type { Table } from "drizzle-orm";
 import { type Crypto, Effect, Context } from "effect";
 
-import { nativeDatabase } from "./native-database";
+import type { D1BatchStatements } from "./D1BatchStatements";
+import { NativeDatabase, nativeDatabase } from "./native-database";
 import { makeOAuthConnectedTarget } from "./oauth-connected-drivers";
 import type {
   OAuthAccountsMapping,
@@ -41,7 +41,8 @@ export const makeOAuthTarget = <
   DatabaseId,
   D,
   T extends Table,
-  Synchronous extends boolean = false,
+  Extra = unknown,
+  Provided extends D1BatchStatements = never,
 >(
   databaseService: Context.Service<DatabaseId, D>,
   configuration: OAuthTargetConfiguration,
@@ -62,14 +63,14 @@ export const makeOAuthTarget = <
   >(
     acquire: Effect.Effect<Database, DatabaseError, DatabaseRequirements>,
     options: {
-      readonly mapping: OAuthSignInMapping<S, O, C, AC, F, N>;
+      readonly mapping: OAuthSignInMapping<S, O, C, AC, F, N> & Extra;
       readonly transaction?: never;
     },
-    body: Effect.Effect<A, E, Synchronous extends true ? NoInfer<OAuthSignInPersistence> : R>,
+    body: Effect.Effect<A, E, R>,
   ): Effect.Effect<
     A,
     OAuthCoordinatorError<E> | DatabaseError,
-    | (Synchronous extends true ? never : Exclude<R, OAuthSignInPersistence>)
+    | Exclude<R, OAuthSignInPersistence | Provided>
     | Crypto.Crypto
     | LifecycleHooks
     | DatabaseRequirements
@@ -92,18 +93,18 @@ export const makeOAuthTarget = <
   >(
     acquire: Effect.Effect<Database, DatabaseError, DatabaseRequirements>,
     options: {
-      readonly mapping: OAuthSignInMapping<S, O, C, AC, F, N>;
-      readonly transaction: SuppliedService<TxId, NoInfer<TransactionOf<Database>>, TxShape>;
+      readonly mapping: OAuthSignInMapping<S, O, C, AC, F, N> & Extra;
+      readonly transaction: SuppliedService<
+        TxId,
+        NoInfer<[Provided] extends [never] ? TransactionOf<Database> : never>,
+        TxShape
+      >;
     },
-    body: Effect.Effect<
-      A,
-      E,
-      Synchronous extends true ? NoInfer<OAuthSignInPersistence | TxId> : R
-    >,
+    body: Effect.Effect<A, E, R>,
   ): Effect.Effect<
     A,
     OAuthCoordinatorError<E> | DatabaseError,
-    | (Synchronous extends true ? never : Exclude<R, OAuthSignInPersistence | TxId>)
+    | Exclude<R, OAuthSignInPersistence | TxId | Provided>
     | Crypto.Crypto
     | LifecycleHooks
     | DatabaseRequirements
@@ -126,7 +127,7 @@ export const makeOAuthTarget = <
   >(
     acquire: Effect.Effect<Database, DatabaseError, DatabaseRequirements>,
     options: {
-      readonly mapping: OAuthSignInMapping<S, O, C, AC, F, N>;
+      readonly mapping: OAuthSignInMapping<S, O, C, AC, F, N> & Extra;
       readonly transaction?: SuppliedService<TxId, NoInfer<TransactionOf<Database>>, TxShape>;
     },
     body: Effect.Effect<A, E, R>,
@@ -161,12 +162,7 @@ export const makeOAuthTarget = <
   }
   function coordinateOAuthRegistrationIntents<
     Database extends D,
-    S extends T,
     O extends T,
-    C extends T,
-    AC extends T,
-    F extends T,
-    TA extends T,
     I extends T,
     N,
     A,
@@ -177,26 +173,21 @@ export const makeOAuthTarget = <
   >(
     acquire: Effect.Effect<Database, DatabaseError, DatabaseRequirements>,
     options: {
-      readonly mapping: OAuthRegistrationIntentMapping<S, O, C, AC, F, TA, I, N>;
+      readonly mapping: OAuthRegistrationIntentMapping<O, I, N> & Extra;
       readonly transaction?: never;
     },
-    body: Effect.Effect<A, E, Synchronous extends true ? NoInfer<OAuthRegistrationIntents> : R>,
+    body: Effect.Effect<A, E, R>,
   ): Effect.Effect<
     A,
     OAuthCoordinatorError<E> | DatabaseError,
-    | (Synchronous extends true ? never : Exclude<R, OAuthRegistrationIntents>)
+    | Exclude<R, OAuthRegistrationIntents | Provided>
     | Crypto.Crypto
     | LifecycleHooks
     | DatabaseRequirements
   >;
   function coordinateOAuthRegistrationIntents<
     Database extends D,
-    S extends T,
     O extends T,
-    C extends T,
-    AC extends T,
-    F extends T,
-    TA extends T,
     I extends T,
     N,
     A,
@@ -209,30 +200,25 @@ export const makeOAuthTarget = <
   >(
     acquire: Effect.Effect<Database, DatabaseError, DatabaseRequirements>,
     options: {
-      readonly mapping: OAuthRegistrationIntentMapping<S, O, C, AC, F, TA, I, N>;
-      readonly transaction: SuppliedService<TxId, NoInfer<TransactionOf<Database>>, TxShape>;
+      readonly mapping: OAuthRegistrationIntentMapping<O, I, N> & Extra;
+      readonly transaction: SuppliedService<
+        TxId,
+        NoInfer<[Provided] extends [never] ? TransactionOf<Database> : never>,
+        TxShape
+      >;
     },
-    body: Effect.Effect<
-      A,
-      E,
-      Synchronous extends true ? NoInfer<OAuthRegistrationIntents | TxId> : R
-    >,
+    body: Effect.Effect<A, E, R>,
   ): Effect.Effect<
     A,
     OAuthCoordinatorError<E> | DatabaseError,
-    | (Synchronous extends true ? never : Exclude<R, OAuthRegistrationIntents | TxId>)
+    | Exclude<R, OAuthRegistrationIntents | TxId | Provided>
     | Crypto.Crypto
     | LifecycleHooks
     | DatabaseRequirements
   >;
   function coordinateOAuthRegistrationIntents<
     Database extends D,
-    S extends T,
     O extends T,
-    C extends T,
-    AC extends T,
-    F extends T,
-    TA extends T,
     I extends T,
     N,
     A,
@@ -245,7 +231,7 @@ export const makeOAuthTarget = <
   >(
     acquire: Effect.Effect<Database, DatabaseError, DatabaseRequirements>,
     options: {
-      readonly mapping: OAuthRegistrationIntentMapping<S, O, C, AC, F, TA, I, N>;
+      readonly mapping: OAuthRegistrationIntentMapping<O, I, N> & Extra;
       readonly transaction?: SuppliedService<TxId, NoInfer<TransactionOf<Database>>, TxShape>;
     },
     body: Effect.Effect<A, E, R>,
@@ -289,8 +275,6 @@ export const makeOAuthTarget = <
     C extends T,
     AC extends T,
     F extends T,
-    TA extends T,
-    U extends T,
     N,
     A,
     E,
@@ -300,14 +284,14 @@ export const makeOAuthTarget = <
   >(
     acquire: Effect.Effect<Database, DatabaseError, DatabaseRequirements>,
     options: {
-      readonly mapping: OAuthAccountsMapping<S, O, C, AC, F, TA, U, N>;
+      readonly mapping: OAuthAccountsMapping<S, O, C, AC, F, N> & Extra;
       readonly transaction?: never;
     },
-    body: Effect.Effect<A, E, Synchronous extends true ? NoInfer<OAuthAccountsPersistence> : R>,
+    body: Effect.Effect<A, E, R>,
   ): Effect.Effect<
     A,
     OAuthCoordinatorError<E> | DatabaseError,
-    | (Synchronous extends true ? never : Exclude<R, OAuthAccountsPersistence>)
+    | Exclude<R, OAuthAccountsPersistence | Provided>
     | Crypto.Crypto
     | LifecycleHooks
     | DatabaseRequirements
@@ -319,8 +303,6 @@ export const makeOAuthTarget = <
     C extends T,
     AC extends T,
     F extends T,
-    TA extends T,
-    U extends T,
     N,
     A,
     E,
@@ -332,18 +314,18 @@ export const makeOAuthTarget = <
   >(
     acquire: Effect.Effect<Database, DatabaseError, DatabaseRequirements>,
     options: {
-      readonly mapping: OAuthAccountsMapping<S, O, C, AC, F, TA, U, N>;
-      readonly transaction: SuppliedService<TxId, NoInfer<TransactionOf<Database>>, TxShape>;
+      readonly mapping: OAuthAccountsMapping<S, O, C, AC, F, N> & Extra;
+      readonly transaction: SuppliedService<
+        TxId,
+        NoInfer<[Provided] extends [never] ? TransactionOf<Database> : never>,
+        TxShape
+      >;
     },
-    body: Effect.Effect<
-      A,
-      E,
-      Synchronous extends true ? NoInfer<OAuthAccountsPersistence | TxId> : R
-    >,
+    body: Effect.Effect<A, E, R>,
   ): Effect.Effect<
     A,
     OAuthCoordinatorError<E> | DatabaseError,
-    | (Synchronous extends true ? never : Exclude<R, OAuthAccountsPersistence | TxId>)
+    | Exclude<R, OAuthAccountsPersistence | TxId | Provided>
     | Crypto.Crypto
     | LifecycleHooks
     | DatabaseRequirements
@@ -355,8 +337,6 @@ export const makeOAuthTarget = <
     C extends T,
     AC extends T,
     F extends T,
-    TA extends T,
-    U extends T,
     N,
     A,
     E,
@@ -368,7 +348,7 @@ export const makeOAuthTarget = <
   >(
     acquire: Effect.Effect<Database, DatabaseError, DatabaseRequirements>,
     options: {
-      readonly mapping: OAuthAccountsMapping<S, O, C, AC, F, TA, U, N>;
+      readonly mapping: OAuthAccountsMapping<S, O, C, AC, F, N> & Extra;
       readonly transaction?: SuppliedService<TxId, NoInfer<TransactionOf<Database>>, TxShape>;
     },
     body: Effect.Effect<A, E, R>,
@@ -413,9 +393,7 @@ export const makeOAuthTarget = <
     O extends T,
     C extends T,
     AC extends T,
-    TA extends T,
     I extends T,
-    Rq extends T,
     N,
     A,
     E,
@@ -425,18 +403,15 @@ export const makeOAuthTarget = <
   >(
     acquire: Effect.Effect<Database, DatabaseError, DatabaseRequirements>,
     options: {
-      readonly mapping: OAuthRegistrationMapping<NoInfer<Registration>, S, O, C, AC, TA, I, Rq, N>;
+      readonly mapping: OAuthRegistrationMapping<NoInfer<Registration>, S, O, C, AC, I, N> & Extra;
       readonly target: SuppliedService<TargetId, OAuthRegistrationAuthority<Registration>>;
       readonly transaction?: never;
     },
-    body: Effect.Effect<A, E, Synchronous extends true ? NoInfer<TargetId> : R>,
+    body: Effect.Effect<A, E, R>,
   ): Effect.Effect<
     A,
     OAuthCoordinatorError<E> | DatabaseError,
-    | (Synchronous extends true ? never : Exclude<R, TargetId>)
-    | Crypto.Crypto
-    | LifecycleHooks
-    | DatabaseRequirements
+    Exclude<R, TargetId | Provided> | Crypto.Crypto | LifecycleHooks | DatabaseRequirements
   >;
   function coordinateOAuthRegistration<
     Database extends D,
@@ -446,9 +421,7 @@ export const makeOAuthTarget = <
     O extends T,
     C extends T,
     AC extends T,
-    TA extends T,
     I extends T,
-    Rq extends T,
     N,
     A,
     E,
@@ -460,18 +433,19 @@ export const makeOAuthTarget = <
   >(
     acquire: Effect.Effect<Database, DatabaseError, DatabaseRequirements>,
     options: {
-      readonly mapping: OAuthRegistrationMapping<NoInfer<Registration>, S, O, C, AC, TA, I, Rq, N>;
+      readonly mapping: OAuthRegistrationMapping<NoInfer<Registration>, S, O, C, AC, I, N> & Extra;
       readonly target: SuppliedService<TargetId, OAuthRegistrationAuthority<Registration>>;
-      readonly transaction: SuppliedService<TxId, NoInfer<TransactionOf<Database>>, TxShape>;
+      readonly transaction: SuppliedService<
+        TxId,
+        NoInfer<[Provided] extends [never] ? TransactionOf<Database> : never>,
+        TxShape
+      >;
     },
-    body: Effect.Effect<A, E, Synchronous extends true ? NoInfer<TargetId | TxId> : R>,
+    body: Effect.Effect<A, E, R>,
   ): Effect.Effect<
     A,
     OAuthCoordinatorError<E> | DatabaseError,
-    | (Synchronous extends true ? never : Exclude<R, TargetId | TxId>)
-    | Crypto.Crypto
-    | LifecycleHooks
-    | DatabaseRequirements
+    Exclude<R, TargetId | TxId | Provided> | Crypto.Crypto | LifecycleHooks | DatabaseRequirements
   >;
   function coordinateOAuthRegistration<
     Database extends D,
@@ -481,9 +455,7 @@ export const makeOAuthTarget = <
     O extends T,
     C extends T,
     AC extends T,
-    TA extends T,
     I extends T,
-    Rq extends T,
     N,
     A,
     E,
@@ -495,7 +467,7 @@ export const makeOAuthTarget = <
   >(
     acquire: Effect.Effect<Database, DatabaseError, DatabaseRequirements>,
     options: {
-      readonly mapping: OAuthRegistrationMapping<NoInfer<Registration>, S, O, C, AC, TA, I, Rq, N>;
+      readonly mapping: OAuthRegistrationMapping<NoInfer<Registration>, S, O, C, AC, I, N> & Extra;
       readonly target: SuppliedService<TargetId, OAuthRegistrationAuthority<Registration>>;
       readonly transaction?: SuppliedService<TxId, NoInfer<TransactionOf<Database>>, TxShape>;
     },
@@ -532,7 +504,7 @@ export const makeOAuthTarget = <
   }
 
   return {
-    ...makeOAuthConnectedTarget<DatabaseId, D, T, {}, Synchronous>(databaseService, configuration),
+    ...makeOAuthConnectedTarget<DatabaseId, D, T, Extra, Provided>(databaseService, configuration),
     coordinateOAuthSignIn,
     coordinateOAuthRegistrationIntents,
     coordinateOAuthAccounts,
@@ -542,32 +514,21 @@ export const makeOAuthTarget = <
       C extends T,
       AC extends T,
       F extends T,
-      TA extends T,
-      U extends T,
       N,
     >(
-      mapping: OAuthAccountsMapping<S, O, C, AC, F, TA, U, N>,
+      mapping: OAuthAccountsMapping<S, O, C, AC, F, N> & Extra,
     ) =>
       makeTargetOAuthAccountsServices(mapping, configuration).pipe(
         Effect.provideServiceEffect(NativeDatabase, nativeDatabase(databaseService)),
       ),
     makeOAuthSignInServices: <S extends T, O extends T, C extends T, AC extends T, F extends T, N>(
-      mapping: OAuthSignInMapping<S, O, C, AC, F, N>,
+      mapping: OAuthSignInMapping<S, O, C, AC, F, N> & Extra,
     ) =>
       makeTargetOAuthSignInServices(mapping, configuration).pipe(
         Effect.provideServiceEffect(NativeDatabase, nativeDatabase(databaseService)),
       ),
-    makeOAuthRegistrationIntentServices: <
-      S extends T,
-      O extends T,
-      C extends T,
-      AC extends T,
-      F extends T,
-      TA extends T,
-      I extends T,
-      N,
-    >(
-      mapping: OAuthRegistrationIntentMapping<S, O, C, AC, F, TA, I, N>,
+    makeOAuthRegistrationIntentServices: <O extends T, I extends T, N>(
+      mapping: OAuthRegistrationIntentMapping<O, I, N> & Extra,
     ) =>
       makeTargetOAuthRegistrationIntentServices(mapping, configuration).pipe(
         Effect.provideServiceEffect(NativeDatabase, nativeDatabase(databaseService)),
@@ -578,12 +539,10 @@ export const makeOAuthTarget = <
       O extends T,
       C extends T,
       AC extends T,
-      TA extends T,
       I extends T,
-      R extends T,
       N,
     >(
-      mapping: OAuthRegistrationMapping<Registration, S, O, C, AC, TA, I, R, N>,
+      mapping: OAuthRegistrationMapping<Registration, S, O, C, AC, I, N> & Extra,
     ) =>
       makeTargetOAuthRegistrationServices<Registration>(mapping, configuration).pipe(
         Effect.provideServiceEffect(NativeDatabase, nativeDatabase(databaseService)),

package/src/drizzle/oauth-model.ts

@@ -4,21 +4,14 @@ import type { SQL, Table } from "drizzle-orm";
 import type { DrizzleTableModel } from "./table-model";
 
 export {
-  type OAuthFlowState,
-  type OAuthTupleState,
-  type OAuthRegistrationState,
   type OAuthAction,
   type OAuthEligibilityFact,
   type OAuthD1Mapping,
+  type OAuthRegistrationAuthority,
   requiredOAuthSignInConstraints,
-  requiredOAuthTupleConstraints,
   requiredOAuthRegistrationConstraints,
-  requiredOAuthAccountsConstraints,
-  type OAuthRegistrationAuthority,
 } from "@yielded/auth-persistence/Adapter";
 
-/** The engine writes every critical column explicitly after applying the pure
- * consumer encoder. Native instant values must roundtrip without precision loss. */
 export type OAuthClock = Shared.OAuthClock<SQL>;
 
 export type OAuthSubjectReadTable<S extends Table> = Shared.OAuthSubjectReadTable<
@@ -33,14 +26,12 @@ export type OAuthSubjectTable<S extends Table> = Shared.OAuthSubjectTable<
 
 export type OAuthOwnershipReadTable<O extends Table, N> = Shared.OAuthOwnershipReadTable<
   DrizzleTableModel<O>,
-  N,
-  SQL
+  N
 >;
 
 export type OAuthOwnershipTable<O extends Table, N> = Shared.OAuthOwnershipTable<
   DrizzleTableModel<O>,
-  N,
-  SQL
+  N
 >;
 
 export type OAuthCredentialReadTable<C extends Table> = Shared.OAuthCredentialReadTable<
@@ -65,51 +56,36 @@ export type OAuthAuthorityTable<C extends Table, N> = Shared.OAuthAuthorityTable
   SQL
 >;
 
-/** Both purposes may use the same physical table. Shared tables share module/flow
- * and module/command uniqueness. The snapshot has the exact purpose-specific core
- * codec; terminal writes erase it, while identity, claim and retention columns remain. */
 export type OAuthFlowTable<F extends Table> = Shared.OAuthFlowTable<DrizzleTableModel<F>>;
 
-export type OAuthTupleAuthorityTable<T extends Table, N> = Shared.OAuthTupleAuthorityTable<
-  DrizzleTableModel<T>,
-  N
->;
-
 export type OAuthRegistrationIntentTable<I extends Table> = Shared.OAuthRegistrationIntentTable<
   DrizzleTableModel<I>
 >;
 
-export type OAuthRegistrationCommandTable<
-  R extends Table,
-  Registration,
-> = Shared.OAuthRegistrationCommandTable<DrizzleTableModel<R>, Registration>;
-
-export type OAuthUnlinkCommandTable<U extends Table> = Shared.OAuthUnlinkCommandTable<
-  DrizzleTableModel<U>
->;
-
-/** Each descriptor reads only its own subject-scoped method rows. The native row
- * projector and SQL condition must express the same installed method eligibility.
- * All source/identifier/policy mutations advance subject securityRevision. D1 also
- * guards exact selected IDs/versions and absence/count assumptions, never just a
- * stale boolean. An over-limit graph fails closed rather than truncating. */
 export type OAuthEligibilityTable<T extends Table, N> = Shared.OAuthEligibilityTable<
   DrizzleTableModel<T>,
   N,
   SQL
 >;
 
-/** Authenticated command replay uses current subject status and this additional
- * nonconsuming SQL policy. It never consumes a fresh action factor. */
-export type OAuthMetadataPolicy<N> = Shared.OAuthMetadataPolicy<N, SQL>;
-
 export type OAuthCleanupTable<T extends Table, N> = Shared.OAuthCleanupTable<
   DrizzleTableModel<T>,
   N,
   SQL
 >;
 
-export type OAuthRegistrationEligibility<N> = Shared.OAuthRegistrationEligibility<N, SQL>;
+export type OAuthRegistrationGuardTable<
+  T extends Table,
+  Registration,
+  N,
+> = Shared.OAuthRegistrationGuardTable<DrizzleTableModel<T>, Registration, N, SQL>;
+
+export type OAuthRegistrationGuardDescriptor<Registration, N> =
+  Shared.OAuthRegistrationGuardDescriptor<Registration, N, SQL, Table>;
+
+export type OAuthEligibilityDescriptor<N> = Shared.OAuthEligibilityDescriptor<N, SQL, Table>;
+
+export type OAuthCleanupDescriptor<N> = Shared.OAuthCleanupDescriptor<N, SQL, Table>;
 
 export type OAuthSignInMapping<
   S extends Table,
@@ -128,64 +104,29 @@ export type OAuthSignInMapping<
   SQL
 >;
 
-export type OAuthOwnershipMutation<
-  T extends Table,
-  O extends Table,
-  N,
-> = Shared.OAuthOwnershipMutation<DrizzleTableModel<T>, DrizzleTableModel<O>, N, SQL>;
-
-export type OAuthRegistrationIntentMapping<
+export type OAuthAccountsMapping<
   S extends Table,
   O extends Table,
   C extends Table,
   AC extends Table,
   F extends Table,
-  T extends Table,
-  I extends Table,
   N,
-> = Shared.OAuthRegistrationIntentMapping<
+> = Shared.OAuthAccountsMapping<
   DrizzleTableModel<S>,
   DrizzleTableModel<O>,
   DrizzleTableModel<C>,
   DrizzleTableModel<AC>,
   DrizzleTableModel<F>,
-  DrizzleTableModel<T>,
-  DrizzleTableModel<I>,
-  N,
-  SQL
->;
-
-export type OAuthRegistrationBase<
-  Registration,
-  T extends Table,
-  O extends Table,
-  I extends Table,
-  R extends Table,
-  N,
-> = Shared.OAuthRegistrationBase<
-  Registration,
-  DrizzleTableModel<T>,
-  DrizzleTableModel<O>,
-  DrizzleTableModel<I>,
-  DrizzleTableModel<R>,
   N,
   SQL,
   Table
 >;
 
-export type OAuthRegistrationGuardTable<
-  T extends Table,
-  Registration,
+export type OAuthRegistrationIntentMapping<
+  O extends Table,
+  I extends Table,
   N,
-> = Shared.OAuthRegistrationGuardTable<DrizzleTableModel<T>, Registration, N, SQL>;
-
-export type OAuthRegistrationGuardDescriptor<Registration, N> =
-  Shared.OAuthRegistrationGuardDescriptor<Registration, N, SQL, Table>;
-
-export const oauthRegistrationGuardTable = <T extends Table, Registration, N>(
-  input: OAuthRegistrationGuardTable<T, Registration, N>,
-): OAuthRegistrationGuardDescriptor<Registration, N> =>
-  Shared.oauthRegistrationGuardTable<DrizzleTableModel<T>, Registration, N, SQL>(input);
+> = Shared.OAuthRegistrationIntentMapping<DrizzleTableModel<O>, DrizzleTableModel<I>, N, SQL>;
 
 export type OAuthRegistrationMapping<
   Registration,
@@ -193,9 +134,7 @@ export type OAuthRegistrationMapping<
   O extends Table,
   C extends Table,
   AC extends Table,
-  T extends Table,
   I extends Table,
-  R extends Table,
   N,
 > = Shared.OAuthRegistrationMapping<
   Registration,
@@ -203,62 +142,18 @@ export type OAuthRegistrationMapping<
   DrizzleTableModel<O>,
   DrizzleTableModel<C>,
   DrizzleTableModel<AC>,
-  DrizzleTableModel<T>,
   DrizzleTableModel<I>,
-  DrizzleTableModel<R>,
   N,
   SQL,
   Table
 >;
 
-/** Heterogeneous descriptors are made by typed factories and projected privately. */
-export type OAuthEligibilityDescriptor<N> = Shared.OAuthEligibilityDescriptor<N, SQL, Table>;
-
-export const oauthEligibilityTable = <T extends Table, N>(
-  input: OAuthEligibilityTable<T, N>,
-): OAuthEligibilityDescriptor<N> =>
+export const oauthEligibilityTable = <T extends Table, N>(input: OAuthEligibilityTable<T, N>) =>
   Shared.oauthEligibilityTable<DrizzleTableModel<T>, N, SQL>(input);
 
-export type OAuthCleanupDescriptor<N> = Shared.OAuthCleanupDescriptor<N, SQL, Table>;
-
-export const oauthCleanupTable = <T extends Table, N>(
-  input: OAuthCleanupTable<T, N>,
-): OAuthCleanupDescriptor<N> => Shared.oauthCleanupTable<DrizzleTableModel<T>, N, SQL>(input);
-
-/** A stable application/reference lock acquired before an ownership target.
- * Missing rows retain ownership. Conditions use detached native IDs; every
- * writer of the guarded reference follows the same order. */
-export type OAuthReferenceGuardTable<T extends Table, N> = Shared.OAuthReferenceGuardTable<
-  DrizzleTableModel<T>,
-  N,
-  SQL
->;
-
-export type OAuthReferenceGuardDescriptor<N> = Shared.OAuthReferenceGuardDescriptor<N, SQL, Table>;
-
-export const oauthReferenceGuardTable = <T extends Table, N>(
-  input: OAuthReferenceGuardTable<T, N>,
-): OAuthReferenceGuardDescriptor<N> =>
-  Shared.oauthReferenceGuardTable<DrizzleTableModel<T>, N, SQL>(input);
+export const oauthCleanupTable = <T extends Table, N>(input: OAuthCleanupTable<T, N>) =>
+  Shared.oauthCleanupTable<DrizzleTableModel<T>, N, SQL>(input);
 
-export type OAuthAccountsMapping<
-  S extends Table,
-  O extends Table,
-  C extends Table,
-  AC extends Table,
-  F extends Table,
-  T extends Table,
-  U extends Table,
-  N,
-> = Shared.OAuthAccountsMapping<
-  DrizzleTableModel<S>,
-  DrizzleTableModel<O>,
-  DrizzleTableModel<C>,
-  DrizzleTableModel<AC>,
-  DrizzleTableModel<F>,
-  DrizzleTableModel<T>,
-  DrizzleTableModel<U>,
-  N,
-  SQL,
-  Table
->;
+export const oauthRegistrationGuardTable = <T extends Table, Registration, N>(
+  input: OAuthRegistrationGuardTable<T, Registration, N>,
+) => Shared.oauthRegistrationGuardTable<DrizzleTableModel<T>, Registration, N, SQL>(input);