@yielded/auth-persistence-drizzle 0.1.0-beta.17 → 0.1.0-beta.19

package/src/drizzle/sqlite-sessions.ts

@@ -12,7 +12,6 @@ import {
 import type { AnyRelations } from "drizzle-orm";
 import type { EffectLibsqlDatabase } from "drizzle-orm/effect-libsql";
 import type { EffectSQLiteBunDatabase } from "drizzle-orm/effect-sqlite-bun";
-import type { EffectSQLiteDoDatabase } from "drizzle-orm/effect-sqlite-do";
 import type { EffectSQLiteNodeDatabase } from "drizzle-orm/effect-sqlite-node";
 import type { EffectSQLiteWasmDatabase } from "drizzle-orm/effect-sqlite-wasm";
 import type { AnySQLiteTable } from "drizzle-orm/sqlite-core";
@@ -40,6 +39,7 @@ import {
   makeTargetSessionStepUpServices,
   coordinateTargetSessionStepUp,
 } from "./session-target";
+import type { DatabaseValue } from "./sqlite-do-database";
 import {
   type TransactionService,
   acquireTransactionService,
@@ -50,7 +50,7 @@ import type { SuppliedService } from "./SuppliedService";
 type Database =
   | EffectLibsqlDatabase<AnyRelations>
   | EffectSQLiteBunDatabase<AnyRelations>
-  | EffectSQLiteDoDatabase<AnyRelations>
+  | DatabaseValue<AnyRelations>
   | EffectSQLiteNodeDatabase<AnyRelations>
   | EffectSQLiteWasmDatabase<AnyRelations>;
 type TransactionOf<D extends Database> = Parameters<Parameters<D["transaction"]>[0]>[0];

package/src/drizzle/storage-validation.ts

@@ -1,7 +1,8 @@
 import {
   NativeDatabase,
   PersistenceMappingError,
-  validateStorage,
+  validateStorageBatch,
+  type StorageValidation,
 } from "@yielded/auth-persistence/Adapter";
 import { getTableColumns, getTableName, is, Table } from "drizzle-orm";
 import { getTableConfig as getMysqlTableConfig, MySqlTable } from "drizzle-orm/mysql-core";
@@ -243,6 +244,8 @@ export const validateDrizzleStorage = Effect.fnUntraced(
 
     const { $client: client } = yield* NativeDatabase;
 
+    const batches = new Map<"pg" | "mysql" | "sqlite", StorageValidation[]>();
+
     for (const plan of physical) {
       const pg = is(plan.table, PgTable);
       const mysql = is(plan.table, MySqlTable);
@@ -255,15 +258,21 @@ export const validateDrizzleStorage = Effect.fnUntraced(
 
       const columns = getTableColumns(plan.table);
 
-      yield* validateStorage(
-        pg ? "pg" : mysql ? "mysql" : "sqlite",
-        {
+      const dialect = pg ? "pg" : mysql ? "mysql" : "sqlite";
+      const batch = batches.get(dialect) ?? [];
+
+      batch.push({
+        table: {
           name: getTableName(plan.table),
           ...(schema === undefined ? {} : { schema }),
           columns: Object.fromEntries(plan.keys.map((key) => [key, { name: columns[key]!.name }])),
         },
-        [plan.keys],
-      ).pipe(
+        required: [plan.keys],
+      });
+      batches.set(dialect, batch);
+    }
+    for (const [dialect, requirements] of batches) {
+      yield* validateStorageBatch(dialect, requirements).pipe(
         Effect.provideService(SqlClient, client),
         Effect.mapError(() =>
           PersistenceMappingError.make({

package/src/drizzle/totp-state.ts

@@ -1,4 +1,3 @@
-import { randomId, digest } from "@yielded/auth-crypto";
 import { AuthenticationRequirement, SecurityRevision } from "@yielded/auth/Sessions";
 import {
   TotpUnavailable,
@@ -11,6 +10,7 @@ import {
 import { sql, type SQL } from "drizzle-orm";
 import { Context, Effect, Schema } from "effect";
 
+import { randomId, digest } from "./crypto";
 import { both, makeTransactionRows, type TransactionOwner } from "./transaction-owner";
 export const unavailable = () => TotpUnavailable.make({});
 
@@ -59,7 +59,7 @@ export const captureTotp = Effect.fn("TotpNative.capture")(function* (
   )
     return undefined;
 
-  const scope = scopeFor(mapping.moduleId, subjectId),
+  const scope = yield* scopeFor(mapping.moduleId, subjectId),
     found = yield* owner.read(factor.table, equal(factor.table, { [factor.scope]: scope }), {
       limit: 1,
     }),
@@ -140,7 +140,7 @@ export const mutateTotp = Effect.fn("TotpNative.mutate")(function* (
   const guards: SQL[] = [];
   const credentialGuards: { credentialId: string; condition: SQL }[] = [];
 
-  const commandScope = digest(
+  const commandScope = yield* digest(
     `effect-auth/totp/command/v1/${mapping.moduleId.length}:${mapping.moduleId}/${input.subjectId.length}:${input.subjectId}/${input.commandId}`,
   );
 
@@ -413,7 +413,7 @@ export const mutateTotp = Effect.fn("TotpNative.mutate")(function* (
               secret: null,
               pending: null,
               recoveryDigests: [],
-              revision: randomId(),
+              revision: yield* randomId,
             };
             semantic = true;
           }
@@ -428,7 +428,7 @@ export const mutateTotp = Effect.fn("TotpNative.mutate")(function* (
           secret: null,
           pending: null,
           recoveryDigests: [],
-          revision: randomId(),
+          revision: yield* randomId,
         };
       else {
         if (new Set(action.recoveryDigests).size !== 10) return reject;
@@ -436,7 +436,7 @@ export const mutateTotp = Effect.fn("TotpNative.mutate")(function* (
       }
     }
   }
-  next = { ...next, version: randomId() };
+  next = { ...next, version: yield* randomId };
 
   const subject = mapping.subject,
     factor = mapping.factor,
@@ -445,7 +445,7 @@ export const mutateTotp = Effect.fn("TotpNative.mutate")(function* (
   const subjectKey = { [subject.id]: nativeId };
 
   if (semantic) {
-    const revision = randomId(),
+    const revision = yield* randomId,
       updates = {
         [subject.securityRevision]: revision,
         [subject.factorEnabled]: subject.encodeEnabled(next.secret !== null),
@@ -500,7 +500,7 @@ export const mutateTotp = Effect.fn("TotpNative.mutate")(function* (
     const values = factor.encodeInsert({
       scope: commandScope,
       state: "totp-command/v1",
-      version: randomId(),
+      version: yield* randomId,
     });
 
     invariant(values[factor.scope] === commandScope && values[factor.state] === "totp-command/v1");

package/src/drizzle/totp-target.ts

@@ -1,4 +1,3 @@
-import { randomId } from "@yielded/auth-crypto";
 import { NativeDatabase } from "@yielded/auth-persistence/Adapter";
 import { LifecycleHooks } from "@yielded/auth/Hooks";
 import {
@@ -10,9 +9,10 @@ import {
 } from "@yielded/auth/Totp";
 import type { Table } from "drizzle-orm";
 /* oxlint-disable no-explicit-any -- shared native implementation; driver entrypoints retain exact database and table types. */
-import { Context, Effect, Schema } from "effect";
+import { type Crypto, Context, Effect, Schema } from "effect";
 import type { Statement } from "effect/sql/Statement";
 
+import { randomId } from "./crypto";
 import type { PersistenceMappingError } from "./model";
 import { nativeDatabase } from "./native-database";
 import { validateDrizzleStorage } from "./storage-validation";
@@ -164,7 +164,11 @@ export const coordinateTargetTotp = <M, A, E, R, RSetup = never>(
     services: TotpPersistenceServices,
     append: (statement: Statement<any>) => void,
   ) => Effect.Effect<A, E, R>,
-): Effect.Effect<A, TotpCoordinatorError<E>, R | RSetup | LifecycleHooks | NativeDatabase> =>
+): Effect.Effect<
+  A,
+  TotpCoordinatorError<E>,
+  R | RSetup | Crypto.Crypto | LifecycleHooks | NativeDatabase
+> =>
   Effect.gen(function* () {
     const original = yield* Effect.isEffect(source) ? source : Effect.succeed(source);
 
@@ -196,7 +200,7 @@ type TransactionOf<D> = D extends { readonly transaction: (...args: any[]) => an
   ? Parameters<Parameters<D["transaction"]>[0]>[0]
   : never;
 
-/** Concrete driver wrappers select transaction mode; cryptography always precedes these owners. */
+/** Concrete driver wrappers select transaction mode. */
 export const makeTotpTarget = <
   DatabaseId,
   D extends { readonly transaction: any },
@@ -230,6 +234,7 @@ export const makeTotpTarget = <
     A,
     TotpCoordinatorError<E> | DatabaseError,
     | (Synchronous extends true ? never : Exclude<R, TotpPersistence>)
+    | Crypto.Crypto
     | LifecycleHooks
     | RSetup
     | DatabaseRequirements
@@ -259,6 +264,7 @@ export const makeTotpTarget = <
     A,
     TotpCoordinatorError<E> | DatabaseError,
     | (Synchronous extends true ? never : Exclude<R, TotpPersistence | TxId>)
+    | Crypto.Crypto
     | LifecycleHooks
     | RSetup
     | DatabaseRequirements
@@ -287,7 +293,7 @@ export const makeTotpTarget = <
   ): Effect.Effect<
     A,
     TotpCoordinatorError<E> | DatabaseError,
-    Exclude<R, TotpPersistence> | LifecycleHooks | RSetup | DatabaseRequirements
+    Exclude<R, TotpPersistence> | Crypto.Crypto | LifecycleHooks | RSetup | DatabaseRequirements
   > {
     return Effect.flatMap(nativeDatabase(acquire), (database) =>
       coordinateTargetTotp(