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

package/src/drizzle/password-model.ts

@@ -4,11 +4,6 @@ import type { SQL, Table } from "drizzle-orm";
 import type { DrizzleTableModel } from "./table-model";
 
 export {
-  type PasswordAttemptAction,
-  type PasswordAttemptState,
-  type PasswordRateScopeKind,
-  type PasswordScopeKeys,
-  type PasswordAttemptRecord,
   type RequiredPasswordConstraints,
   requiredPasswordConstraints,
   type PasswordConstraintClassifier,
@@ -46,19 +41,6 @@ export type PasswordCredentialTable<
   NativeSubjectId
 >;
 
-export type PasswordAttemptTable<
-  Attempt extends Table,
-  NativeSubjectId,
-> = Shared.PasswordAttemptTable<DrizzleTableModel<Attempt>, NativeSubjectId>;
-
-export type PasswordRateScopeTable<RateScope extends Table> = Shared.PasswordRateScopeTable<
-  DrizzleTableModel<RateScope>
->;
-
-export type PasswordChargeTable<Charge extends Table> = Shared.PasswordChargeTable<
-  DrizzleTableModel<Charge>
->;
-
 export type PasswordCommandTable<Command extends Table> = Shared.PasswordCommandTable<
   DrizzleTableModel<Command>
 >;
@@ -70,9 +52,6 @@ export type PasswordPersistenceMapping<
   Identifier extends Table,
   Credential extends Table,
   AuthorityCredential extends Table,
-  Attempt extends Table,
-  RateScope extends Table,
-  Charge extends Table,
   Command extends Table,
   NativeSubjectId,
 > = Shared.PasswordPersistenceMapping<
@@ -80,9 +59,6 @@ export type PasswordPersistenceMapping<
   DrizzleTableModel<Identifier>,
   DrizzleTableModel<Credential>,
   DrizzleTableModel<AuthorityCredential>,
-  DrizzleTableModel<Attempt>,
-  DrizzleTableModel<RateScope>,
-  DrizzleTableModel<Charge>,
   DrizzleTableModel<Command>,
   NativeSubjectId,
   SQL
@@ -93,9 +69,6 @@ export type D1PasswordPersistenceMapping<
   Identifier extends Table,
   Credential extends Table,
   AuthorityCredential extends Table,
-  Attempt extends Table,
-  RateScope extends Table,
-  Charge extends Table,
   Command extends Table,
   NativeSubjectId,
 > = Shared.D1PasswordPersistenceMapping<
@@ -103,9 +76,6 @@ export type D1PasswordPersistenceMapping<
   DrizzleTableModel<Identifier>,
   DrizzleTableModel<Credential>,
   DrizzleTableModel<AuthorityCredential>,
-  DrizzleTableModel<Attempt>,
-  DrizzleTableModel<RateScope>,
-  DrizzleTableModel<Charge>,
   DrizzleTableModel<Command>,
   NativeSubjectId,
   SQL
@@ -152,9 +122,6 @@ export type AnyPasswordPersistenceMapping = PasswordPersistenceMapping<
   Table,
   Table,
   Table,
-  Table,
-  Table,
-  Table,
   unknown
 >;
 

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

@@ -86,9 +86,6 @@ export interface PasswordPreparedPersistenceMapping<
   Identifier extends Table,
   Credential extends Table,
   AuthorityCredential extends Table,
-  Attempt extends Table,
-  RateScope extends Table,
-  Charge extends Table,
   Command extends Table,
   Intent extends Table,
   Admission extends Table,
@@ -99,9 +96,6 @@ export interface PasswordPreparedPersistenceMapping<
     Identifier,
     Credential,
     AuthorityCredential,
-    Attempt,
-    RateScope,
-    Charge,
     Command,
     NativeSubjectId
   >;
@@ -118,9 +112,6 @@ export type D1PasswordPreparedPersistenceMapping<
   Identifier extends Table,
   Credential extends Table,
   AuthorityCredential extends Table,
-  Attempt extends Table,
-  RateScope extends Table,
-  Charge extends Table,
   Command extends Table,
   Intent extends Table,
   Admission extends Table,
@@ -130,9 +121,6 @@ export type D1PasswordPreparedPersistenceMapping<
   Identifier,
   Credential,
   AuthorityCredential,
-  Attempt,
-  RateScope,
-  Charge,
   Command,
   Intent,
   Admission,
@@ -145,9 +133,6 @@ export type D1PasswordPreparedPersistenceMapping<
     Identifier,
     Credential,
     AuthorityCredential,
-    Attempt,
-    RateScope,
-    Charge,
     Command,
     NativeSubjectId
   >;
@@ -252,8 +237,5 @@ export type AnyPasswordPreparedPersistenceMapping = PasswordPreparedPersistenceM
   Table,
   Table,
   Table,
-  Table,
-  Table,
-  Table,
   unknown
 >;

package/src/drizzle/password-sql.ts

@@ -1,13 +1,16 @@
 import { makePasswordKernel } from "@yielded/auth-persistence/Adapter";
 
+import { makeDrizzleSqlTables } from "./native-sql-table";
 import { completeProofPlanIn } from "./proof-sql";
 import { drizzleQueryOperations } from "./query-operations";
 export type { PasswordSqlQuery } from "@yielded/auth-persistence/Adapter";
 export type { PasswordSqlDatabase } from "@yielded/auth-persistence/Adapter";
 export { CurrentPasswordSql } from "@yielded/auth-persistence/Adapter";
+
 export type { PasswordSqlConfiguration } from "@yielded/auth-persistence/Adapter";
 
 export const { makeSqlPasswordPersistence, passwordSqlKernel } = makePasswordKernel(
   drizzleQueryOperations,
   { completeProofPlanIn },
+  makeDrizzleSqlTables,
 );

package/src/drizzle/password-target.ts

@@ -1,4 +1,9 @@
-import type { NativeDatabase } from "@yielded/auth-persistence/Adapter";
+import {
+  CurrentPasswordPreparedTransaction,
+  type NativeDatabase,
+  type PasswordPreparedPostcondition,
+  PasswordPreparedPostconditions,
+} from "@yielded/auth-persistence/Adapter";
 import {
   coordinateCommit,
   hasCommitScope,
@@ -7,7 +12,7 @@ import {
 } from "@yielded/auth/Hooks";
 import { PasswordUnavailable, PasswordPersistence } from "@yielded/auth/Password";
 /* oxlint-disable no-explicit-any -- public driver wrappers restore concrete Drizzle generics. */
-import { type Context, Effect, Layer } from "effect";
+import { Cause, type Context, Effect, Layer } from "effect";
 import type * as SqlError from "effect/sql/SqlError";
 
 import {
@@ -154,7 +159,10 @@ export const coordinateTargetPasswordPersistence = <Transaction, A, E, R>(
       () =>
         database.transaction((transaction) =>
           Effect.gen(function* () {
-            return yield* owner(transaction, {
+            const postconditions: Array<PasswordPreparedPostcondition> = [];
+            let acceptingPostconditions = true;
+
+            const value = yield* owner(transaction, {
               passwordPersistence: yield* makeSqlPasswordPersistence(
                 mapping,
                 passwordOptions(configuration, proofMapping, true),
@@ -164,7 +172,36 @@ export const coordinateTargetPasswordPersistence = <Transaction, A, E, R>(
                   transaction as unknown as PasswordSqlDatabase,
                 ),
               ),
-            });
+            }).pipe(
+              Effect.provideService(PasswordPreparedPostconditions, {
+                register: (check) => {
+                  if (!acceptingPostconditions) return false;
+                  postconditions.push(check);
+
+                  return true;
+                },
+              }),
+              Effect.ensuring(
+                Effect.sync(() => {
+                  acceptingPostconditions = false;
+                }),
+              ),
+            );
+
+            // Application work in this transaction must not change what the
+            // password mutations committed to; a failure here rolls back both.
+            for (const check of postconditions)
+              yield* check.pipe(
+                Effect.provideService(
+                  CurrentPasswordPreparedTransaction,
+                  transaction as unknown as PasswordSqlDatabase,
+                ),
+                Effect.catchCause((cause) =>
+                  Effect.failCause(Cause.map(cause, () => PasswordUnavailable.make({}))),
+                ),
+              );
+
+            return value;
           }),
         ),
       { mode: configuration.mode },

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

@@ -30,9 +30,6 @@ export const makePgPasswordPreparedPersistenceServices = <
   I extends AnyPgTable,
   C extends AnyPgTable,
   AC extends AnyPgTable,
-  A extends AnyPgTable,
-  RS extends AnyPgTable,
-  CE extends AnyPgTable,
   M extends AnyPgTable,
   T extends AnyPgTable,
   B extends AnyPgTable,
@@ -45,7 +42,7 @@ export const makePgPasswordPreparedPersistenceServices = <
   PCr extends AnyPgTable = AnyPgTable,
   PNativeId = unknown,
 >(
-  mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, A, RS, CE, M, T, B, NativeId>,
+  mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, M, T, B, NativeId>,
   proofMapping?: PasswordPreparedProofMapping<PS, PC, PM, PSub, PI, PCr, PNativeId>,
 ) =>
   Effect.flatMap(
@@ -64,9 +61,6 @@ export function coordinatePgPasswordPreparedPersistence<
   I extends AnyPgTable,
   C extends AnyPgTable,
   AC extends AnyPgTable,
-  A extends AnyPgTable,
-  RS extends AnyPgTable,
-  CE extends AnyPgTable,
   M extends AnyPgTable,
   T extends AnyPgTable,
   B extends AnyPgTable,
@@ -86,7 +80,7 @@ export function coordinatePgPasswordPreparedPersistence<
 >(
   acquire: Effect.Effect<D, DatabaseError, DatabaseRequirements>,
   options: {
-    readonly mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, A, RS, CE, M, T, B, NativeId>;
+    readonly mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, M, T, B, NativeId>;
     readonly proofMapping?:
       | PasswordPreparedProofMapping<PS, PC, PM, PSub, PI, PCr, PNativeId>
       | undefined;
@@ -107,9 +101,6 @@ export function coordinatePgPasswordPreparedPersistence<
   I extends AnyPgTable,
   C extends AnyPgTable,
   AC extends AnyPgTable,
-  A extends AnyPgTable,
-  RS extends AnyPgTable,
-  CE extends AnyPgTable,
   M extends AnyPgTable,
   T extends AnyPgTable,
   B extends AnyPgTable,
@@ -131,7 +122,7 @@ export function coordinatePgPasswordPreparedPersistence<
 >(
   acquire: Effect.Effect<D, DatabaseError, DatabaseRequirements>,
   options: {
-    readonly mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, A, RS, CE, M, T, B, NativeId>;
+    readonly mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, M, T, B, NativeId>;
     readonly proofMapping?:
       | PasswordPreparedProofMapping<PS, PC, PM, PSub, PI, PCr, PNativeId>
       | undefined;
@@ -152,9 +143,6 @@ export function coordinatePgPasswordPreparedPersistence<
   I extends AnyPgTable,
   C extends AnyPgTable,
   AC extends AnyPgTable,
-  A extends AnyPgTable,
-  RS extends AnyPgTable,
-  CE extends AnyPgTable,
   M extends AnyPgTable,
   T extends AnyPgTable,
   B extends AnyPgTable,
@@ -176,7 +164,7 @@ export function coordinatePgPasswordPreparedPersistence<
 >(
   acquire: Effect.Effect<D, DatabaseError, DatabaseRequirements>,
   options: {
-    readonly mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, A, RS, CE, M, T, B, NativeId>;
+    readonly mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, M, T, B, NativeId>;
     readonly proofMapping?:
       | PasswordPreparedProofMapping<PS, PC, PM, PSub, PI, PCr, PNativeId>
       | undefined;

package/src/drizzle/pg-passwords.ts

@@ -54,25 +54,19 @@ type PasswordMapping<
   I extends AnyPgTable,
   C extends AnyPgTable,
   AC extends AnyPgTable,
-  A extends AnyPgTable,
-  RS extends AnyPgTable,
-  CE extends AnyPgTable,
   M extends AnyPgTable,
   NativeId,
-> = PasswordPersistenceMapping<S, I, C, AC, A, RS, CE, M, NativeId>;
+> = PasswordPersistenceMapping<S, I, C, AC, M, NativeId>;
 
 export const makePgPasswordPersistenceServices = <
   S extends AnyPgTable,
   I extends AnyPgTable,
   C extends AnyPgTable,
   AC extends AnyPgTable,
-  A extends AnyPgTable,
-  RS extends AnyPgTable,
-  CE extends AnyPgTable,
   M extends AnyPgTable,
   NativeId,
 >(
-  mapping: PasswordMapping<S, I, C, AC, A, RS, CE, M, NativeId>,
+  mapping: PasswordMapping<S, I, C, AC, M, NativeId>,
   proofMapping?: ProofPersistenceMapping<
     any,
     any,
@@ -102,9 +96,6 @@ export function coordinatePgPasswordPersistence<
   I extends AnyPgTable,
   C extends AnyPgTable,
   AC extends AnyPgTable,
-  A extends AnyPgTable,
-  RS extends AnyPgTable,
-  CE extends AnyPgTable,
   M extends AnyPgTable,
   NativeId,
   PM extends
@@ -118,7 +109,7 @@ export function coordinatePgPasswordPersistence<
 >(
   acquire: Effect.Effect<D, DatabaseError, DatabaseRequirements>,
   options: {
-    readonly mapping: PasswordMapping<S, I, C, AC, A, RS, CE, M, NativeId>;
+    readonly mapping: PasswordMapping<S, I, C, AC, M, NativeId>;
     readonly proofMapping?: PM;
     readonly transaction?: never;
   },
@@ -135,9 +126,6 @@ export function coordinatePgPasswordPersistence<
   I extends AnyPgTable,
   C extends AnyPgTable,
   AC extends AnyPgTable,
-  A extends AnyPgTable,
-  RS extends AnyPgTable,
-  CE extends AnyPgTable,
   M extends AnyPgTable,
   NativeId,
   PM extends
@@ -153,7 +141,7 @@ export function coordinatePgPasswordPersistence<
 >(
   acquire: Effect.Effect<D, DatabaseError, DatabaseRequirements>,
   options: {
-    readonly mapping: PasswordMapping<S, I, C, AC, A, RS, CE, M, NativeId>;
+    readonly mapping: PasswordMapping<S, I, C, AC, M, NativeId>;
     readonly proofMapping?: PM;
     readonly transaction: SuppliedService<TxId, NoInfer<TransactionOf<D>>, TxShape>;
   },
@@ -170,9 +158,6 @@ export function coordinatePgPasswordPersistence<
   I extends AnyPgTable,
   C extends AnyPgTable,
   AC extends AnyPgTable,
-  A extends AnyPgTable,
-  RS extends AnyPgTable,
-  CE extends AnyPgTable,
   M extends AnyPgTable,
   NativeId,
   PM extends
@@ -188,7 +173,7 @@ export function coordinatePgPasswordPersistence<
 >(
   acquire: Effect.Effect<D, DatabaseError, DatabaseRequirements>,
   options: {
-    readonly mapping: PasswordMapping<S, I, C, AC, A, RS, CE, M, NativeId>;
+    readonly mapping: PasswordMapping<S, I, C, AC, M, NativeId>;
     readonly proofMapping?: PM;
     readonly transaction?: SuppliedService<TxId, NoInfer<TransactionOf<D>>, TxShape>;
   },

package/src/drizzle/query-operations.ts

@@ -6,11 +6,13 @@ import {
   asc,
   or,
   eq,
+  ne,
   gt,
   gte,
   lte,
   inArray,
   isNull,
+  isNotNull,
   notExists,
   sql,
   getTableColumns,
@@ -26,11 +28,13 @@ const operations = {
   asc,
   or,
   eq,
+  ne,
   gt,
   gte,
   lte,
   inArray,
   isNull,
+  isNotNull,
   notExists,
   sql,
   getTableColumns,

package/src/drizzle/session-sql.ts

@@ -1,5 +1,6 @@
 import { makeSessionKernel } from "@yielded/auth-persistence/Adapter";
 
+import { makeDrizzleSqlTables } from "./native-sql-table";
 import { drizzleQueryOperations } from "./query-operations";
 export type { SessionSqlDatabase } from "@yielded/auth-persistence/Adapter";
 export { CurrentSessionSql } from "@yielded/auth-persistence/Adapter";
@@ -11,4 +12,4 @@ export const {
   makeSqlStatefulSessions,
   makeSqlSignedValidity,
   makeSqlSessionStepUp,
-} = makeSessionKernel(drizzleQueryOperations);
+} = makeSessionKernel(drizzleQueryOperations, makeDrizzleSqlTables);

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

@@ -54,9 +54,6 @@ export const makeSqlitePasswordPreparedTarget = <
     I extends AnySQLiteTable,
     C extends AnySQLiteTable,
     AC extends AnySQLiteTable,
-    A extends AnySQLiteTable,
-    RS extends AnySQLiteTable,
-    CE extends AnySQLiteTable,
     M extends AnySQLiteTable,
     T extends AnySQLiteTable,
     B extends AnySQLiteTable,
@@ -76,19 +73,7 @@ export const makeSqlitePasswordPreparedTarget = <
   >(
     acquire: Effect.Effect<Database, DatabaseError, DatabaseRequirements>,
     options: {
-      readonly mapping: PasswordPreparedPersistenceMapping<
-        S,
-        I,
-        C,
-        AC,
-        A,
-        RS,
-        CE,
-        M,
-        T,
-        B,
-        NativeId
-      >;
+      readonly mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, M, T, B, NativeId>;
       readonly proofMapping?:
         | PasswordPreparedProofMapping<PS, PC, PM, PSub, PI, PCr, PNativeId>
         | undefined;
@@ -110,9 +95,6 @@ export const makeSqlitePasswordPreparedTarget = <
     I extends AnySQLiteTable,
     C extends AnySQLiteTable,
     AC extends AnySQLiteTable,
-    A extends AnySQLiteTable,
-    RS extends AnySQLiteTable,
-    CE extends AnySQLiteTable,
     M extends AnySQLiteTable,
     T extends AnySQLiteTable,
     B extends AnySQLiteTable,
@@ -134,19 +116,7 @@ export const makeSqlitePasswordPreparedTarget = <
   >(
     acquire: Effect.Effect<Database, DatabaseError, DatabaseRequirements>,
     options: {
-      readonly mapping: PasswordPreparedPersistenceMapping<
-        S,
-        I,
-        C,
-        AC,
-        A,
-        RS,
-        CE,
-        M,
-        T,
-        B,
-        NativeId
-      >;
+      readonly mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, M, T, B, NativeId>;
       readonly proofMapping?:
         | PasswordPreparedProofMapping<PS, PC, PM, PSub, PI, PCr, PNativeId>
         | undefined;
@@ -168,9 +138,6 @@ export const makeSqlitePasswordPreparedTarget = <
     I extends AnySQLiteTable,
     C extends AnySQLiteTable,
     AC extends AnySQLiteTable,
-    A extends AnySQLiteTable,
-    RS extends AnySQLiteTable,
-    CE extends AnySQLiteTable,
     M extends AnySQLiteTable,
     T extends AnySQLiteTable,
     B extends AnySQLiteTable,
@@ -192,19 +159,7 @@ export const makeSqlitePasswordPreparedTarget = <
   >(
     acquire: Effect.Effect<Database, DatabaseError, DatabaseRequirements>,
     options: {
-      readonly mapping: PasswordPreparedPersistenceMapping<
-        S,
-        I,
-        C,
-        AC,
-        A,
-        RS,
-        CE,
-        M,
-        T,
-        B,
-        NativeId
-      >;
+      readonly mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, M, T, B, NativeId>;
       readonly proofMapping?:
         | PasswordPreparedProofMapping<PS, PC, PM, PSub, PI, PCr, PNativeId>
         | undefined;
@@ -249,9 +204,6 @@ export const makeSqlitePasswordPreparedTarget = <
       I extends AnySQLiteTable,
       C extends AnySQLiteTable,
       AC extends AnySQLiteTable,
-      A extends AnySQLiteTable,
-      RS extends AnySQLiteTable,
-      CE extends AnySQLiteTable,
       M extends AnySQLiteTable,
       T extends AnySQLiteTable,
       B extends AnySQLiteTable,
@@ -264,7 +216,7 @@ export const makeSqlitePasswordPreparedTarget = <
       PCr extends AnySQLiteTable = AnySQLiteTable,
       PNativeId = unknown,
     >(
-      mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, A, RS, CE, M, T, B, NativeId>,
+      mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, M, T, B, NativeId>,
       proofMapping?: PasswordPreparedProofMapping<PS, PC, PM, PSub, PI, PCr, PNativeId>,
     ) =>
       Effect.flatMap(standaloneConfiguration, (configuration) =>

package/src/drizzle/sqlite-passwords.ts

@@ -69,25 +69,19 @@ type Mapping<
   I extends AnySQLiteTable,
   C extends AnySQLiteTable,
   AC extends AnySQLiteTable,
-  A extends AnySQLiteTable,
-  RS extends AnySQLiteTable,
-  CE extends AnySQLiteTable,
   M extends AnySQLiteTable,
   NativeId,
-> = PasswordPersistenceMapping<S, I, C, AC, A, RS, CE, M, NativeId>;
+> = PasswordPersistenceMapping<S, I, C, AC, M, NativeId>;
 
 export const makeSqlitePasswordPersistenceServices = <
   S extends AnySQLiteTable,
   I extends AnySQLiteTable,
   C extends AnySQLiteTable,
   AC extends AnySQLiteTable,
-  A extends AnySQLiteTable,
-  RS extends AnySQLiteTable,
-  CE extends AnySQLiteTable,
   M extends AnySQLiteTable,
   NativeId,
 >(
-  mapping: Mapping<S, I, C, AC, A, RS, CE, M, NativeId>,
+  mapping: Mapping<S, I, C, AC, M, NativeId>,
   configuration: PasswordTargetConfiguration,
   proofMapping?: ProofPersistenceMapping<
     any,
@@ -111,9 +105,6 @@ export const coordinateSqlitePasswordPersistence = <
   I extends AnySQLiteTable,
   C extends AnySQLiteTable,
   AC extends AnySQLiteTable,
-  A extends AnySQLiteTable,
-  RS extends AnySQLiteTable,
-  CE extends AnySQLiteTable,
   M extends AnySQLiteTable,
   NativeId,
   PM extends
@@ -124,7 +115,7 @@ export const coordinateSqlitePasswordPersistence = <
   R,
 >(
   database: D,
-  mapping: Mapping<S, I, C, AC, A, RS, CE, M, NativeId>,
+  mapping: Mapping<S, I, C, AC, M, NativeId>,
   configuration: PasswordTargetConfiguration,
   proofMapping: PM,
   owner: (
@@ -207,9 +198,6 @@ export const makeSqlitePasswordTarget = <
     I extends AnySQLiteTable,
     C extends AnySQLiteTable,
     AC extends AnySQLiteTable,
-    A extends AnySQLiteTable,
-    RS extends AnySQLiteTable,
-    CE extends AnySQLiteTable,
     M extends AnySQLiteTable,
     NativeId,
     PM extends
@@ -223,7 +211,7 @@ export const makeSqlitePasswordTarget = <
   >(
     acquire: Effect.Effect<Database, DatabaseError, DatabaseRequirements>,
     options: {
-      readonly mapping: Mapping<S, I, C, AC, A, RS, CE, M, NativeId>;
+      readonly mapping: Mapping<S, I, C, AC, M, NativeId>;
       readonly proofMapping?: PM;
       readonly transaction?: never;
     },
@@ -241,9 +229,6 @@ export const makeSqlitePasswordTarget = <
     I extends AnySQLiteTable,
     C extends AnySQLiteTable,
     AC extends AnySQLiteTable,
-    A extends AnySQLiteTable,
-    RS extends AnySQLiteTable,
-    CE extends AnySQLiteTable,
     M extends AnySQLiteTable,
     NativeId,
     PM extends
@@ -259,7 +244,7 @@ export const makeSqlitePasswordTarget = <
   >(
     acquire: Effect.Effect<Database, DatabaseError, DatabaseRequirements>,
     options: {
-      readonly mapping: Mapping<S, I, C, AC, A, RS, CE, M, NativeId>;
+      readonly mapping: Mapping<S, I, C, AC, M, NativeId>;
       readonly proofMapping?: PM;
       readonly transaction: SuppliedService<TxId, NoInfer<TransactionOf<Database>>, TxShape>;
     },
@@ -277,9 +262,6 @@ export const makeSqlitePasswordTarget = <
     I extends AnySQLiteTable,
     C extends AnySQLiteTable,
     AC extends AnySQLiteTable,
-    A extends AnySQLiteTable,
-    RS extends AnySQLiteTable,
-    CE extends AnySQLiteTable,
     M extends AnySQLiteTable,
     NativeId,
     PM extends
@@ -295,7 +277,7 @@ export const makeSqlitePasswordTarget = <
   >(
     acquire: Effect.Effect<Database, DatabaseError, DatabaseRequirements>,
     options: {
-      readonly mapping: Mapping<S, I, C, AC, A, RS, CE, M, NativeId>;
+      readonly mapping: Mapping<S, I, C, AC, M, NativeId>;
       readonly proofMapping?: PM;
       readonly transaction?: SuppliedService<TxId, NoInfer<TransactionOf<Database>>, TxShape>;
     },
@@ -467,13 +449,10 @@ export const makeSqlitePasswordTarget = <
       I extends AnySQLiteTable,
       C extends AnySQLiteTable,
       AC extends AnySQLiteTable,
-      A extends AnySQLiteTable,
-      RS extends AnySQLiteTable,
-      CE extends AnySQLiteTable,
       M extends AnySQLiteTable,
       NativeId,
     >(
-      mapping: Mapping<S, I, C, AC, A, RS, CE, M, NativeId>,
+      mapping: Mapping<S, I, C, AC, M, NativeId>,
       proofMapping?: ProofPersistenceMapping<
         any,
         any,