@yielded/auth-persistence-drizzle 0.1.0-beta.24 → 0.1.0-beta.26

package/src/drizzle/passkey-drivers.ts

@@ -1,13 +1,12 @@
-import { NativeDatabase } from "@yielded/auth-persistence/Adapter";
 import type { LifecycleHooks } from "@yielded/auth/Hooks";
 import { PasskeyPersistence } from "@yielded/auth/Passkey";
 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 type {
   PasskeyCredentialMapping,
-  PasskeyEnrollmentContextMapping,
   PasskeyMappingSource,
   PasskeyPersistenceMapping,
   PasskeyPersistenceServices,
@@ -16,17 +15,16 @@ import type {
   PasskeyRegistrationCeremonyMapping,
   PasskeyRegistrationCeremonyServices,
 } from "./passkey-registration-ceremony-model";
+import { makePasskeyWriteTarget } from "./passkey-write-drivers";
 import {
   type PasskeyCoordinatorError,
   coordinateTargetPasskey,
   coordinateTargetPasskeyRegistration,
   makeTargetPasskeyCredentials,
-  makeTargetPasskeyEnrollmentContext,
   makeTargetPasskeyPersistence,
   makeTargetPasskeyRegistration,
   type PasskeyTargetConfiguration,
-} from "./passkey-target";
-import { makePasskeyWriteTarget } from "./passkey-write-drivers";
+} from "./passkey/target";
 import type { SuppliedService } from "./SuppliedService";
 
 // oxlint-disable-next-line no-explicit-any -- inspect only the concrete database's installed generic transaction callback.
@@ -39,7 +37,7 @@ export const makePasskeyTarget = <
   D,
   T extends Table,
   Extra = unknown,
-  Synchronous extends boolean = false,
+  Provided extends D1BatchStatements = never,
 >(
   databaseService: Context.Service<DatabaseId, D>,
   configuration: PasskeyTargetConfiguration,
@@ -49,12 +47,7 @@ export const makePasskeyTarget = <
     S extends T,
     C extends T,
     F extends T,
-    O extends T,
-    H extends T,
-    M extends T,
     Flow extends T,
-    Admission extends T,
-    Charge extends T,
     N,
     A,
     E,
@@ -66,24 +59,16 @@ export const makePasskeyTarget = <
     acquire: Effect.Effect<Database, DatabaseError, DatabaseRequirements>,
     options: {
       readonly mapping: PasskeyMappingSource<
-        PasskeyPersistenceMapping<
-          PasskeyCredentialMapping<S, C, F, O, H, N>,
-          M,
-          Flow,
-          Admission,
-          Charge,
-          N
-        > &
-          Extra,
+        PasskeyPersistenceMapping<PasskeyCredentialMapping<S, C, F, N>, Flow, N> & Extra,
         RSetup
       >;
       readonly transaction?: never;
     },
-    body: Effect.Effect<A, E, Synchronous extends true ? NoInfer<PasskeyPersistence> : R>,
+    body: Effect.Effect<A, E, R>,
   ): Effect.Effect<
     A,
     PasskeyCoordinatorError<E> | DatabaseError,
-    | (Synchronous extends true ? never : Exclude<R, PasskeyPersistence>)
+    | Exclude<R, PasskeyPersistence | Provided>
     | Crypto.Crypto
     | LifecycleHooks
     | DatabaseRequirements
@@ -94,12 +79,7 @@ export const makePasskeyTarget = <
     S extends T,
     C extends T,
     F extends T,
-    O extends T,
-    H extends T,
-    M extends T,
     Flow extends T,
-    Admission extends T,
-    Charge extends T,
     N,
     A,
     E,
@@ -113,24 +93,20 @@ export const makePasskeyTarget = <
     acquire: Effect.Effect<Database, DatabaseError, DatabaseRequirements>,
     options: {
       readonly mapping: PasskeyMappingSource<
-        PasskeyPersistenceMapping<
-          PasskeyCredentialMapping<S, C, F, O, H, N>,
-          M,
-          Flow,
-          Admission,
-          Charge,
-          N
-        > &
-          Extra,
+        PasskeyPersistenceMapping<PasskeyCredentialMapping<S, C, F, N>, Flow, N> & Extra,
         RSetup
       >;
-      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<PasskeyPersistence | TxId> : R>,
+    body: Effect.Effect<A, E, R>,
   ): Effect.Effect<
     A,
     PasskeyCoordinatorError<E> | DatabaseError,
-    | (Synchronous extends true ? never : Exclude<R, PasskeyPersistence | TxId>)
+    | Exclude<R, PasskeyPersistence | TxId | Provided>
     | Crypto.Crypto
     | LifecycleHooks
     | DatabaseRequirements
@@ -141,12 +117,7 @@ export const makePasskeyTarget = <
     S extends T,
     C extends T,
     F extends T,
-    O extends T,
-    H extends T,
-    M extends T,
     Flow extends T,
-    Admission extends T,
-    Charge extends T,
     N,
     A,
     E,
@@ -160,15 +131,7 @@ export const makePasskeyTarget = <
     acquire: Effect.Effect<Database, DatabaseError, DatabaseRequirements>,
     options: {
       readonly mapping: PasskeyMappingSource<
-        PasskeyPersistenceMapping<
-          PasskeyCredentialMapping<S, C, F, O, H, N>,
-          M,
-          Flow,
-          Admission,
-          Charge,
-          N
-        > &
-          Extra,
+        PasskeyPersistenceMapping<PasskeyCredentialMapping<S, C, F, N>, Flow, N> & Extra,
         RSetup
       >;
       readonly transaction?: SuppliedService<TxId, NoInfer<TransactionOf<Database>>, TxShape>;
@@ -197,12 +160,7 @@ export const makePasskeyTarget = <
   }
   function coordinatePasskeyRegistrationCeremony<
     Database extends D,
-    M extends T,
     Flow extends T,
-    Admission extends T,
-    Charge extends T,
-    Intent extends T,
-    H extends T,
     A,
     E,
     R,
@@ -213,16 +171,16 @@ export const makePasskeyTarget = <
     acquire: Effect.Effect<Database, DatabaseError, DatabaseRequirements>,
     options: {
       readonly mapping: PasskeyMappingSource<
-        PasskeyRegistrationCeremonyMapping<M, Flow, Admission, Charge, Intent, H> & Extra,
+        PasskeyRegistrationCeremonyMapping<Flow> & Extra,
         RSetup
       >;
       readonly transaction?: never;
     },
-    body: Effect.Effect<A, E, Synchronous extends true ? NoInfer<PasskeyPersistence> : R>,
+    body: Effect.Effect<A, E, R>,
   ): Effect.Effect<
     A,
     PasskeyCoordinatorError<E> | DatabaseError,
-    | (Synchronous extends true ? never : Exclude<R, PasskeyPersistence>)
+    | Exclude<R, PasskeyPersistence | Provided>
     | Crypto.Crypto
     | LifecycleHooks
     | DatabaseRequirements
@@ -230,12 +188,7 @@ export const makePasskeyTarget = <
   >;
   function coordinatePasskeyRegistrationCeremony<
     Database extends D,
-    M extends T,
     Flow extends T,
-    Admission extends T,
-    Charge extends T,
-    Intent extends T,
-    H extends T,
     A,
     E,
     R,
@@ -248,16 +201,20 @@ export const makePasskeyTarget = <
     acquire: Effect.Effect<Database, DatabaseError, DatabaseRequirements>,
     options: {
       readonly mapping: PasskeyMappingSource<
-        PasskeyRegistrationCeremonyMapping<M, Flow, Admission, Charge, Intent, H> & Extra,
+        PasskeyRegistrationCeremonyMapping<Flow> & Extra,
         RSetup
       >;
-      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<PasskeyPersistence | TxId> : R>,
+    body: Effect.Effect<A, E, R>,
   ): Effect.Effect<
     A,
     PasskeyCoordinatorError<E> | DatabaseError,
-    | (Synchronous extends true ? never : Exclude<R, PasskeyPersistence | TxId>)
+    | Exclude<R, PasskeyPersistence | TxId | Provided>
     | Crypto.Crypto
     | LifecycleHooks
     | DatabaseRequirements
@@ -265,12 +222,7 @@ export const makePasskeyTarget = <
   >;
   function coordinatePasskeyRegistrationCeremony<
     Database extends D,
-    M extends T,
     Flow extends T,
-    Admission extends T,
-    Charge extends T,
-    Intent extends T,
-    H extends T,
     A,
     E,
     R,
@@ -283,7 +235,7 @@ export const makePasskeyTarget = <
     acquire: Effect.Effect<Database, DatabaseError, DatabaseRequirements>,
     options: {
       readonly mapping: PasskeyMappingSource<
-        PasskeyRegistrationCeremonyMapping<M, Flow, Admission, Charge, Intent, H> & Extra,
+        PasskeyRegistrationCeremonyMapping<Flow> & Extra,
         RSetup
       >;
       readonly transaction?: SuppliedService<TxId, NoInfer<TransactionOf<Database>>, TxShape>;
@@ -312,81 +264,31 @@ export const makePasskeyTarget = <
   }
 
   return {
-    ...makePasskeyWriteTarget<DatabaseId, D, T, Extra, Synchronous>(databaseService, configuration),
-    makePasskeyCredentialServices: <
-      S extends T,
-      C extends T,
-      F extends T,
-      O extends T,
-      H extends T,
-      N,
-      RSetup = never,
-    >(
-      mapping: PasskeyMappingSource<PasskeyCredentialMapping<S, C, F, O, H, N> & Extra, RSetup>,
+    ...makePasskeyWriteTarget<DatabaseId, D, T, Extra, Provided>(databaseService, configuration),
+    makePasskeyCredentialServices: <S extends T, C extends T, F extends T, N, RSetup = never>(
+      mapping: PasskeyMappingSource<PasskeyCredentialMapping<S, C, F, N> & Extra, RSetup>,
     ) =>
       makeTargetPasskeyCredentials(mapping, configuration).pipe(
         Effect.provideServiceEffect(NativeDatabase, nativeDatabase(databaseService)),
       ),
-    makePasskeyEnrollmentContextServices: <
-      S extends T,
-      C extends T,
-      F extends T,
-      O extends T,
-      H extends T,
-      M extends T,
-      N,
-      RSetup = never,
-    >(
-      mapping: PasskeyMappingSource<
-        PasskeyEnrollmentContextMapping<PasskeyCredentialMapping<S, C, F, O, H, N>, M, N> & Extra,
-        RSetup
-      >,
-    ) =>
-      makeTargetPasskeyEnrollmentContext(mapping, configuration).pipe(
-        Effect.provideServiceEffect(NativeDatabase, nativeDatabase(databaseService)),
-      ),
     makePasskeyPersistenceServices: <
       S extends T,
       C extends T,
       F extends T,
-      O extends T,
-      H extends T,
-      M extends T,
       Flow extends T,
-      Admission extends T,
-      Charge extends T,
       N,
       RSetup = never,
     >(
       mapping: PasskeyMappingSource<
-        PasskeyPersistenceMapping<
-          PasskeyCredentialMapping<S, C, F, O, H, N>,
-          M,
-          Flow,
-          Admission,
-          Charge,
-          N
-        > &
-          Extra,
+        PasskeyPersistenceMapping<PasskeyCredentialMapping<S, C, F, N>, Flow, N> & Extra,
         RSetup
       >,
     ) =>
       makeTargetPasskeyPersistence(mapping, configuration).pipe(
         Effect.provideServiceEffect(NativeDatabase, nativeDatabase(databaseService)),
       ),
-    makePasskeyRegistrationCeremonyServices: <
-      M extends T,
-      Flow extends T,
-      Admission extends T,
-      Charge extends T,
-      Intent extends T,
-      H extends T,
-      RSetup = never,
-    >(
-      mapping: PasskeyMappingSource<
-        PasskeyRegistrationCeremonyMapping<M, Flow, Admission, Charge, Intent, H> & Extra,
-        RSetup
-      >,
+    makePasskeyRegistrationCeremonyServices: <Flow extends T, RSetup = never>(
+      mapping: PasskeyMappingSource<PasskeyRegistrationCeremonyMapping<Flow> & Extra, RSetup>,
     ) =>
       makeTargetPasskeyRegistration(mapping, configuration).pipe(
         Effect.provideServiceEffect(NativeDatabase, nativeDatabase(databaseService)),

package/src/drizzle/passkey-model.ts

@@ -1,4 +1,4 @@
-import * as Shared from "@yielded/auth-persistence/Adapter";
+import type * as Shared from "@yielded/auth-persistence/Adapter";
 import type { SQL, Table } from "drizzle-orm";
 
 import type { DrizzleTableModel } from "./table-model";
@@ -7,22 +7,16 @@ export {
   type PasskeyMappingSource,
   type PasskeyCredentialServices,
   type PasskeyPersistenceServices,
-  type PasskeyEnrollmentContextServices,
   passkeyCredentialsLayer,
   passkeyPersistenceLayer,
-  passkeyEnrollmentContextLayer,
   type PasskeySubjectIdCodec,
   requiredPasskeyCredentialConstraints,
-  type PasskeyFlowState,
   type PasskeyFlowInsert,
-  type PasskeyChargeKind,
-  type PasskeyChargeInsert,
   requiredPasskeyPersistenceConstraints,
   type D1PasskeyMapping,
 } from "@yielded/auth-persistence/Adapter";
 
 export type PasskeyColumn<T extends Table> = Shared.PasskeyColumn<DrizzleTableModel<T>>;
-
 export type PasskeyClock = Shared.PasskeyClock<SQL>;
 
 export type PasskeySubjectReadTable<T extends Table, N> = Shared.PasskeySubjectReadTable<
@@ -36,118 +30,46 @@ export type PasskeyFactorReadTable<T extends Table> = Shared.PasskeyFactorReadTa
   SQL
 >;
 
-/** decode uses only these declared columns. Counter columns are native integral
- * numbers; BS may use a consumer enum. Name/creation metadata is not required. */
 export type PasskeyCredentialReadTable<T extends Table, N> = Shared.PasskeyCredentialReadTable<
   DrizzleTableModel<T>,
   N,
   SQL
 >;
 
-export type PasskeyCredentialOwnershipTable<
-  T extends Table,
-  N,
-> = Shared.PasskeyCredentialOwnershipTable<DrizzleTableModel<T>, N, SQL>;
-
-/** Reservations do not manufacture a subject; bound handles are RP-global. */
-export type PasskeyHandleReadTable<T extends Table> = Shared.PasskeyHandleReadTable<
-  DrizzleTableModel<T>
->;
-
-export type PasskeyHandleReservationTable<T extends Table> = Shared.PasskeyHandleReservationTable<
-  DrizzleTableModel<T>,
-  SQL
->;
-
-export type PasskeyHandleOwnershipTable<T extends Table, N> = Shared.PasskeyHandleOwnershipTable<
-  DrizzleTableModel<T>,
-  N,
-  SQL
->;
-
 export type PasskeyCredentialMapping<
   S extends Table,
   C extends Table,
   F extends Table,
-  Ownership extends Table,
-  Handle extends Table,
   N,
 > = Shared.PasskeyCredentialMapping<
   DrizzleTableModel<S>,
   DrizzleTableModel<C>,
   DrizzleTableModel<F>,
-  DrizzleTableModel<Ownership>,
-  DrizzleTableModel<Handle>,
   N,
   SQL
 >;
 
-export type PasskeyPolicyGuard = Shared.PasskeyPolicyGuard<SQL>;
-
-export const passkeyPolicyGuard = <T extends Table>(input: {
-  readonly scope: string;
-  readonly table: T;
-  readonly columns: ReadonlyArray<PasskeyColumn<T>>;
-  readonly where: (moduleId: string) => SQL;
-  readonly condition: (moduleId: string) => SQL;
-}): PasskeyPolicyGuard => Shared.passkeyPolicyGuard<DrizzleTableModel<T>, SQL>(input);
-
-export type PasskeyModuleTable<T extends Table> = Shared.PasskeyModuleTable<
-  DrizzleTableModel<T>,
-  SQL
->;
-
 export type PasskeyFlowTable<T extends Table> = Shared.PasskeyFlowTable<DrizzleTableModel<T>>;
 
-export type PasskeyAdmissionTable<T extends Table> = Shared.PasskeyAdmissionTable<
-  DrizzleTableModel<T>
->;
-
-/** Charge scope is canonical core identity text; this subject-free descriptor
- * can count all purposes without decoding any unrelated native subject. */
-export type PasskeyChargeTable<T extends Table> = Shared.PasskeyChargeTable<DrizzleTableModel<T>>;
-
-export type PasskeyCeremonyMapping<
-  Module extends Table,
-  Flow extends Table,
-  Admission extends Table,
-  Charge extends Table,
-> = Shared.PasskeyCeremonyMapping<
-  DrizzleTableModel<Module>,
+export type PasskeyCeremonyMapping<Flow extends Table> = Shared.PasskeyCeremonyMapping<
   DrizzleTableModel<Flow>,
-  DrizzleTableModel<Admission>,
-  DrizzleTableModel<Charge>,
   SQL
 >;
 
 type CredentialTable<Read> = Read extends {
-  readonly credential: {
-    readonly table: infer T extends Table;
-  };
+  readonly credential: { readonly table: infer T extends Table };
 }
   ? T
   : never;
 
 export type PasskeyPersistenceMapping<
   Read,
-  Module extends Table,
   Flow extends Table,
-  Admission extends Table,
-  Charge extends Table,
   N,
 > = Shared.PasskeyPersistenceMapping<
   Read,
-  DrizzleTableModel<Module>,
   DrizzleTableModel<Flow>,
-  DrizzleTableModel<Admission>,
-  DrizzleTableModel<Charge>,
   N,
   SQL,
   DrizzleTableModel<CredentialTable<Read>>
 >;
-
-export type PasskeyEnrollmentContextMapping<
-  Read,
-  Module extends Table,
-  N,
-> = Shared.PasskeyEnrollmentContextMapping<Read, DrizzleTableModel<Module>, N, SQL>;

package/src/drizzle/passkey-registration-ceremony-model.ts

@@ -3,30 +3,10 @@ import type { SQL, Table } from "drizzle-orm";
 
 import type { DrizzleTableModel } from "./table-model";
 
-export {
-  type PasskeyRegistrationCeremonyCapabilities,
-  type PasskeyRegistrationCeremonyServices,
-  requiredPasskeyRegistrationCeremonyConstraints,
+export type {
+  PasskeyRegistrationCeremonyCapabilities,
+  PasskeyRegistrationCeremonyServices,
 } from "@yielded/auth-persistence/Adapter";
 
-/** Read-only custody supplied by a separate registration issuance authority.
- * No application payload codec, subject codec or provisioning callback runs here. */
-export type PasskeyRegistrationIntentReadTable<T extends Table> =
-  Shared.PasskeyRegistrationIntentReadTable<DrizzleTableModel<T>, SQL>;
-
-export type PasskeyRegistrationCeremonyMapping<
-  Module extends Table,
-  Flow extends Table,
-  Admission extends Table,
-  Charge extends Table,
-  Intent extends Table,
-  Handle extends Table,
-> = Shared.PasskeyRegistrationCeremonyMapping<
-  DrizzleTableModel<Module>,
-  DrizzleTableModel<Flow>,
-  DrizzleTableModel<Admission>,
-  DrizzleTableModel<Charge>,
-  DrizzleTableModel<Intent>,
-  DrizzleTableModel<Handle>,
-  SQL
->;
+export type PasskeyRegistrationCeremonyMapping<Flow extends Table> =
+  Shared.PasskeyRegistrationCeremonyMapping<DrizzleTableModel<Flow>, SQL>;