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

package/src/drizzle/d1-sessions.ts

@@ -17,6 +17,7 @@ import { reportPersistenceFailure } from "@yielded/auth/Persistence";
 import type { SubjectId, TokenDigest } from "@yielded/auth/Schema";
 import {
   assessAuthentication,
+  AuthenticationCapture,
   snapshotSessionAuthenticationProvenance,
   AuthenticationAuthority,
   PendingAuthenticationInvalid,
@@ -557,13 +558,18 @@ const capture = Effect.fn("DrizzleD1Session.capture")(function* (
   subjectId: SubjectId,
   credentialIds: ReadonlyArray<string>,
 ): Effect.fn.Return<
-  AuthenticationRevision,
+  AuthenticationCapture,
   StaleAuthentication | D1AdapterFailure,
   CurrentD1PlanningDatabase
 > {
   const details = yield* captureDetails(mapping, subjectId, credentialIds);
 
-  return details.revision;
+  const requirement = yield* mapping.subject.decodeRequirement(details.subject);
+
+  return yield* Schema.decodeEffect(AuthenticationCapture)({
+    revision: details.revision,
+    requirement,
+  });
 });
 
 const requirement = Effect.fn("DrizzleD1Session.requirement")(function* (
@@ -1122,7 +1128,11 @@ export const makeD1StatefulSessions = <Claims>(
             input.evidence.revision.subjectId,
           );
 
-          if (input.pending === undefined && (yield* hasActiveFlow(mapping, input.evidence.flowId)))
+          if (
+            input.pending === undefined &&
+            (input.fresh !== true || input.handoffSourceSessionId !== undefined) &&
+            (yield* hasActiveFlow(mapping, input.evidence.flowId))
+          )
             return yield* SessionConflict.make({});
 
           const nativeSessionId = yield* allocate(
@@ -1169,7 +1179,10 @@ export const makeD1StatefulSessions = <Claims>(
           let condition = commitCondition;
           const statements: Statement<any>[] = [];
 
-          if (input.pending === undefined) {
+          if (
+            input.pending === undefined &&
+            (input.fresh !== true || input.handoffSourceSessionId !== undefined)
+          ) {
             const f = flowColumns(mapping);
 
             condition = and(
@@ -1205,7 +1218,7 @@ export const makeD1StatefulSessions = <Claims>(
                 ),
               ),
             );
-          } else {
+          } else if (input.pending !== undefined) {
             if (mapping.pending === undefined) return yield* invalidPending();
             const stored = yield* readPending(mapping, input.pending.digest);
 
@@ -1244,7 +1257,9 @@ export const makeD1StatefulSessions = <Claims>(
           CurrentD1PlanningDatabase
         >(() =>
           input.pending === undefined
-            ? recoverFlowOrStale(mapping, input.evidence.flowId)
+            ? input.fresh === true && input.handoffSourceSessionId === undefined
+              ? Effect.fail(stale())
+              : recoverFlowOrStale(mapping, input.evidence.flowId)
             : recoverPendingOrStale(mapping, input.pending, input.evidence.revision.subjectId),
         ),
       ),

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

@@ -29,7 +29,6 @@ export const makeMySqlPasswordPreparedPersistenceServices = <
   I extends AnyMySqlTable,
   C extends AnyMySqlTable,
   AC extends AnyMySqlTable,
-  A extends AnyMySqlTable,
   M extends AnyMySqlTable,
   T extends AnyMySqlTable,
   B extends AnyMySqlTable,
@@ -42,7 +41,7 @@ export const makeMySqlPasswordPreparedPersistenceServices = <
   PCr extends AnyMySqlTable = AnyMySqlTable,
   PNativeId = unknown,
 >(
-  mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, A, 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(
@@ -61,7 +60,6 @@ export function coordinateMySqlPasswordPreparedPersistence<
   I extends AnyMySqlTable,
   C extends AnyMySqlTable,
   AC extends AnyMySqlTable,
-  A extends AnyMySqlTable,
   M extends AnyMySqlTable,
   T extends AnyMySqlTable,
   B extends AnyMySqlTable,
@@ -81,7 +79,7 @@ export function coordinateMySqlPasswordPreparedPersistence<
 >(
   acquire: Effect.Effect<D, DatabaseError, DatabaseRequirements>,
   options: {
-    readonly mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, A, 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;
@@ -102,7 +100,6 @@ export function coordinateMySqlPasswordPreparedPersistence<
   I extends AnyMySqlTable,
   C extends AnyMySqlTable,
   AC extends AnyMySqlTable,
-  A extends AnyMySqlTable,
   M extends AnyMySqlTable,
   T extends AnyMySqlTable,
   B extends AnyMySqlTable,
@@ -124,7 +121,7 @@ export function coordinateMySqlPasswordPreparedPersistence<
 >(
   acquire: Effect.Effect<D, DatabaseError, DatabaseRequirements>,
   options: {
-    readonly mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, A, 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;
@@ -145,7 +142,6 @@ export function coordinateMySqlPasswordPreparedPersistence<
   I extends AnyMySqlTable,
   C extends AnyMySqlTable,
   AC extends AnyMySqlTable,
-  A extends AnyMySqlTable,
   M extends AnyMySqlTable,
   T extends AnyMySqlTable,
   B extends AnyMySqlTable,
@@ -167,7 +163,7 @@ export function coordinateMySqlPasswordPreparedPersistence<
 >(
   acquire: Effect.Effect<D, DatabaseError, DatabaseRequirements>,
   options: {
-    readonly mapping: PasswordPreparedPersistenceMapping<S, I, C, AC, A, 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/mysql-passwords.ts

@@ -55,21 +55,19 @@ type Mapping<
   I extends AnyMySqlTable,
   C extends AnyMySqlTable,
   AC extends AnyMySqlTable,
-  A extends AnyMySqlTable,
   M extends AnyMySqlTable,
   NativeId,
-> = PasswordPersistenceMapping<S, I, C, AC, A, M, NativeId>;
+> = PasswordPersistenceMapping<S, I, C, AC, M, NativeId>;
 
 export const makeMysqlPasswordPersistenceServices = <
   S extends AnyMySqlTable,
   I extends AnyMySqlTable,
   C extends AnyMySqlTable,
   AC extends AnyMySqlTable,
-  A extends AnyMySqlTable,
   M extends AnyMySqlTable,
   NativeId,
 >(
-  mapping: Mapping<S, I, C, AC, A, M, NativeId>,
+  mapping: Mapping<S, I, C, AC, M, NativeId>,
   proofMapping?: ProofPersistenceMapping<
     any,
     any,
@@ -99,7 +97,6 @@ export function coordinateMysqlPasswordPersistence<
   I extends AnyMySqlTable,
   C extends AnyMySqlTable,
   AC extends AnyMySqlTable,
-  A extends AnyMySqlTable,
   M extends AnyMySqlTable,
   NativeId,
   PM extends
@@ -113,7 +110,7 @@ export function coordinateMysqlPasswordPersistence<
 >(
   acquire: Effect.Effect<D, DatabaseError, DatabaseRequirements>,
   options: {
-    readonly mapping: Mapping<S, I, C, AC, A, M, NativeId>;
+    readonly mapping: Mapping<S, I, C, AC, M, NativeId>;
     readonly proofMapping?: PM;
     readonly transaction?: never;
   },
@@ -130,7 +127,6 @@ export function coordinateMysqlPasswordPersistence<
   I extends AnyMySqlTable,
   C extends AnyMySqlTable,
   AC extends AnyMySqlTable,
-  A extends AnyMySqlTable,
   M extends AnyMySqlTable,
   NativeId,
   PM extends
@@ -146,7 +142,7 @@ export function coordinateMysqlPasswordPersistence<
 >(
   acquire: Effect.Effect<D, DatabaseError, DatabaseRequirements>,
   options: {
-    readonly mapping: Mapping<S, I, C, AC, A, M, NativeId>;
+    readonly mapping: Mapping<S, I, C, AC, M, NativeId>;
     readonly proofMapping?: PM;
     readonly transaction: SuppliedService<TxId, NoInfer<TransactionOf<D>>, TxShape>;
   },
@@ -163,7 +159,6 @@ export function coordinateMysqlPasswordPersistence<
   I extends AnyMySqlTable,
   C extends AnyMySqlTable,
   AC extends AnyMySqlTable,
-  A extends AnyMySqlTable,
   M extends AnyMySqlTable,
   NativeId,
   PM extends
@@ -179,7 +174,7 @@ export function coordinateMysqlPasswordPersistence<
 >(
   acquire: Effect.Effect<D, DatabaseError, DatabaseRequirements>,
   options: {
-    readonly mapping: Mapping<S, I, C, AC, A, M, NativeId>;
+    readonly mapping: Mapping<S, I, C, AC, M, NativeId>;
     readonly proofMapping?: PM;
     readonly transaction?: SuppliedService<TxId, NoInfer<TransactionOf<D>>, TxShape>;
   },

package/src/drizzle/native-sql-table.ts

@@ -7,6 +7,7 @@ import {
 } from "@yielded/auth-persistence/Adapter";
 import {
   getTableColumns,
+  getTableName,
   is,
   Param,
   Placeholder,
@@ -16,6 +17,8 @@ import {
   type BuildQueryConfig,
   type SQLWrapper,
 } from "drizzle-orm";
+import { getTableConfig as getMysqlTableConfig, MySqlTable } from "drizzle-orm/mysql-core";
+import { getTableConfig as getPgTableConfig, PgTable } from "drizzle-orm/pg-core";
 import { Predicate } from "effect";
 import type { SqlClient } from "effect/sql/SqlClient";
 import * as Statement from "effect/sql/Statement";
@@ -157,6 +160,14 @@ export const makeDrizzleSqlTables = (
     const columns = getTableColumns(physical);
     const entries = Object.entries(columns);
 
+    const schema = is(physical, PgTable)
+      ? getPgTableConfig(physical).schema
+      : is(physical, MySqlTable)
+        ? getMysqlTableConfig(physical).schema
+        : undefined;
+
+    const table = { name: getTableName(physical), ...(schema === undefined ? {} : { schema }) };
+
     const getColumn = (key: string) => {
       const column = Object.hasOwn(columns, key) ? columns[key] : undefined;
 
@@ -180,6 +191,25 @@ export const makeDrizzleSqlTables = (
         ),
         as: bind,
         column: (key) => compile(reference(key)),
+        unencodedTextColumn: (key) => {
+          const column = getColumn(key);
+
+          return ["PgText", "PgVarchar", "SQLiteText", "MySqlText", "MySqlVarChar"].includes(
+            column.columnType,
+          ) &&
+            Predicate.hasProperty(column.mapToDriverValue, "isNoop") &&
+            column.mapToDriverValue.isNoop === true &&
+            Predicate.hasProperty(column.mapFromDriverValue, "isNoop") &&
+            column.mapFromDriverValue.isNoop === true &&
+            (dialect.codecs === undefined ||
+              (Predicate.hasProperty(dialect.codecs, "get") &&
+                typeof dialect.codecs.get === "function" &&
+                (["cast", "normalize", "castParam", "normalizeParam"] as const).every(
+                  (kind) => dialect.codecs?.get(column, kind) === undefined,
+                )))
+            ? { table, name: column.name }
+            : undefined;
+        },
         fields: (prefix) =>
           compile(
             sql.join(