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

package/src/drizzle/pg-passwords.ts

@@ -55,11 +55,9 @@ type PasswordMapping<
   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, A, M, NativeId>;
 
 export const makePgPasswordPersistenceServices = <
   S extends AnyPgTable,
@@ -67,12 +65,10 @@ export const makePgPasswordPersistenceServices = <
   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, A, M, NativeId>,
   proofMapping?: ProofPersistenceMapping<
     any,
     any,
@@ -103,8 +99,6 @@ export function coordinatePgPasswordPersistence<
   C extends AnyPgTable,
   AC extends AnyPgTable,
   A extends AnyPgTable,
-  RS extends AnyPgTable,
-  CE extends AnyPgTable,
   M extends AnyPgTable,
   NativeId,
   PM extends
@@ -118,7 +112,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, A, M, NativeId>;
     readonly proofMapping?: PM;
     readonly transaction?: never;
   },
@@ -136,8 +130,6 @@ export function coordinatePgPasswordPersistence<
   C extends AnyPgTable,
   AC extends AnyPgTable,
   A extends AnyPgTable,
-  RS extends AnyPgTable,
-  CE extends AnyPgTable,
   M extends AnyPgTable,
   NativeId,
   PM extends
@@ -153,7 +145,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, A, M, NativeId>;
     readonly proofMapping?: PM;
     readonly transaction: SuppliedService<TxId, NoInfer<TransactionOf<D>>, TxShape>;
   },
@@ -171,8 +163,6 @@ export function coordinatePgPasswordPersistence<
   C extends AnyPgTable,
   AC extends AnyPgTable,
   A extends AnyPgTable,
-  RS extends AnyPgTable,
-  CE extends AnyPgTable,
   M extends AnyPgTable,
   NativeId,
   PM extends
@@ -188,7 +178,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, A, M, NativeId>;
     readonly proofMapping?: PM;
     readonly transaction?: SuppliedService<TxId, NoInfer<TransactionOf<D>>, TxShape>;
   },

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

@@ -55,8 +55,6 @@ export const makeSqlitePasswordPreparedTarget = <
     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 +74,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, A, M, T, B, NativeId>;
       readonly proofMapping?:
         | PasswordPreparedProofMapping<PS, PC, PM, PSub, PI, PCr, PNativeId>
         | undefined;
@@ -111,8 +97,6 @@ export const makeSqlitePasswordPreparedTarget = <
     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 +118,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, A, M, T, B, NativeId>;
       readonly proofMapping?:
         | PasswordPreparedProofMapping<PS, PC, PM, PSub, PI, PCr, PNativeId>
         | undefined;
@@ -169,8 +141,6 @@ export const makeSqlitePasswordPreparedTarget = <
     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 +162,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, A, M, T, B, NativeId>;
       readonly proofMapping?:
         | PasswordPreparedProofMapping<PS, PC, PM, PSub, PI, PCr, PNativeId>
         | undefined;
@@ -250,8 +208,6 @@ export const makeSqlitePasswordPreparedTarget = <
       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 +220,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, A, M, T, B, NativeId>,
       proofMapping?: PasswordPreparedProofMapping<PS, PC, PM, PSub, PI, PCr, PNativeId>,
     ) =>
       Effect.flatMap(standaloneConfiguration, (configuration) =>

package/src/drizzle/sqlite-passwords.ts

@@ -70,11 +70,9 @@ type Mapping<
   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, A, M, NativeId>;
 
 export const makeSqlitePasswordPersistenceServices = <
   S extends AnySQLiteTable,
@@ -82,12 +80,10 @@ export const makeSqlitePasswordPersistenceServices = <
   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, A, M, NativeId>,
   configuration: PasswordTargetConfiguration,
   proofMapping?: ProofPersistenceMapping<
     any,
@@ -112,8 +108,6 @@ export const coordinateSqlitePasswordPersistence = <
   C extends AnySQLiteTable,
   AC extends AnySQLiteTable,
   A extends AnySQLiteTable,
-  RS extends AnySQLiteTable,
-  CE extends AnySQLiteTable,
   M extends AnySQLiteTable,
   NativeId,
   PM extends
@@ -124,7 +118,7 @@ export const coordinateSqlitePasswordPersistence = <
   R,
 >(
   database: D,
-  mapping: Mapping<S, I, C, AC, A, RS, CE, M, NativeId>,
+  mapping: Mapping<S, I, C, AC, A, M, NativeId>,
   configuration: PasswordTargetConfiguration,
   proofMapping: PM,
   owner: (
@@ -208,8 +202,6 @@ export const makeSqlitePasswordTarget = <
     C extends AnySQLiteTable,
     AC extends AnySQLiteTable,
     A extends AnySQLiteTable,
-    RS extends AnySQLiteTable,
-    CE extends AnySQLiteTable,
     M extends AnySQLiteTable,
     NativeId,
     PM extends
@@ -223,7 +215,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, A, M, NativeId>;
       readonly proofMapping?: PM;
       readonly transaction?: never;
     },
@@ -242,8 +234,6 @@ export const makeSqlitePasswordTarget = <
     C extends AnySQLiteTable,
     AC extends AnySQLiteTable,
     A extends AnySQLiteTable,
-    RS extends AnySQLiteTable,
-    CE extends AnySQLiteTable,
     M extends AnySQLiteTable,
     NativeId,
     PM extends
@@ -259,7 +249,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, A, M, NativeId>;
       readonly proofMapping?: PM;
       readonly transaction: SuppliedService<TxId, NoInfer<TransactionOf<Database>>, TxShape>;
     },
@@ -278,8 +268,6 @@ export const makeSqlitePasswordTarget = <
     C extends AnySQLiteTable,
     AC extends AnySQLiteTable,
     A extends AnySQLiteTable,
-    RS extends AnySQLiteTable,
-    CE extends AnySQLiteTable,
     M extends AnySQLiteTable,
     NativeId,
     PM extends
@@ -295,7 +283,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, A, M, NativeId>;
       readonly proofMapping?: PM;
       readonly transaction?: SuppliedService<TxId, NoInfer<TransactionOf<Database>>, TxShape>;
     },
@@ -468,12 +456,10 @@ export const makeSqlitePasswordTarget = <
       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, A, M, NativeId>,
       proofMapping?: ProofPersistenceMapping<
         any,
         any,

package/src/drizzle/storage-validation.ts

@@ -25,10 +25,6 @@ const uniquePlans: Readonly<Record<string, readonly [string, ReadonlyArray<strin
     "authorityCredential",
     ["subjectId", "credentialId"],
   ],
-  "unique(charge.moduleId,charge.action,charge.scopeKind,charge.scopeKey,charge.attemptId)": [
-    "charge",
-    ["moduleId", "action", "scopeKind", "scopeKey", "attemptId"],
-  ],
   "unique(command.moduleId,command.commandId)": ["command", ["moduleId", "commandId"]],
   "unique(connectedAdmission.admissionId)": ["admission", ["admissionId"]],
   "unique(connectedClient.clientKey)": ["client", ["clientKey"]],
@@ -88,10 +84,6 @@ const uniquePlans: Readonly<Record<string, readonly [string, ReadonlyArray<strin
   "unique(ownership.identityKey)": ["ownership", ["identityKey"]],
   "unique(pending.digest)": ["pending", ["digest"]],
   "unique(pending.flowId)": ["pending", ["flowId"]],
-  "unique(rateScope.moduleId,rateScope.action,rateScope.scopeKind,rateScope.scopeKey)": [
-    "rateScope",
-    ["moduleId", "action", "scopeKind", "scopeKey"],
-  ],
   "unique(rateScope.moduleId,rateScope.purpose,rateScope.action,rateScope.scopeKind,rateScope.scopeKey)":
     ["rateScope", ["moduleId", "purpose", "action", "scopeKind", "scopeKey"]],
   "unique(registration.moduleId,registration.requestId)": [

package/src/index.ts

@@ -40,22 +40,18 @@ export {
   type PasswordAttemptState,
   type PasswordAttemptTable,
   type PasswordAuthorityCredentialTable,
-  type PasswordChargeTable,
   type PasswordCommandTable,
   type PasswordConstraintClassifier,
   type PasswordCredentialTable,
   type PasswordD1Clock,
   type PasswordIdentifierTable,
   type PasswordPersistenceMapping,
-  type PasswordRateScopeKind,
-  type PasswordRateScopeTable,
   type PasswordRegistrationConstraintClassifier,
   type PasswordRegistrationIntent,
   type PasswordRegistrationMapping,
   type PasswordRegistrationProvisioning,
   type PasswordRegistrationState,
   type PasswordRegistrationTable,
-  type PasswordScopeKeys,
   type PasswordSubjectTable,
   type RequiredPasswordConstraints,
   type RequiredPasswordRegistrationConstraints,

package/src/internal/drizzle-postgres.ts

@@ -17,6 +17,7 @@ import {
 import type { Effect } from "effect";
 import type { SqlClient } from "effect/sql/SqlClient";
 
+import { makeDrizzleSqlTables } from "../drizzle/native-sql-table";
 import { drizzleQueryOperations } from "../drizzle/query-operations";
 
 const makeTable = (definition: StorageTable) =>
@@ -78,6 +79,7 @@ export const postgresPersistence = <R>(acquire: Effect.Effect<object, never, R |
     makeTable,
     describe,
     operations: drizzleQueryOperations,
+    nativeTables: makeDrizzleSqlTables,
     acquire,
     passkeys: makeComposedPasskeys(drizzleQueryOperations),
   });

package/src/internal/drizzle-sqlite.ts

@@ -16,6 +16,7 @@ import {
 import type { Effect } from "effect";
 import type { SqlClient } from "effect/sql/SqlClient";
 
+import { makeDrizzleSqlTables } from "../drizzle/native-sql-table";
 import { drizzleQueryOperations } from "../drizzle/query-operations";
 
 const makeTable = (definition: StorageTable) =>
@@ -76,6 +77,7 @@ export const sqlitePersistence = <R>(acquire: Effect.Effect<object, never, R | S
     makeTable,
     describe,
     operations: drizzleQueryOperations,
+    nativeTables: makeDrizzleSqlTables,
     acquire,
     passkeys: makeComposedPasskeys(drizzleQueryOperations),
   });