@yielded/auth-persistence-drizzle 0.1.0-beta.1 → 0.1.0-beta.13

package/dist/drizzle/d1-phone.d.mts

@@ -1,21 +1,20 @@
 import { D1PhoneMapping, PhoneMapping, PhoneMappingSource, PhonePersistenceServices } from "./phone-model.mjs";
+import { Database as Database$1 } from "./d1-database.mjs";
 import { D1BatchStatements } from "./D1BatchStatements.mjs";
 import { PhoneCoordinatorError } from "./phone-target.mjs";
 import { AnyRelations } from "drizzle-orm";
 import { Effect } from "effect";
 import { LifecycleHooks } from "@yielded/auth/Hooks";
 import { PhoneAdmission, PhonePersistence, PhoneSignInTargets } from "@yielded/auth/PhoneOtp";
+import { EffectSQLiteD1Database } from "drizzle-orm/effect-d1";
 import { AnySQLiteTable } from "drizzle-orm/sqlite-core";
 import { D1Client } from "@effect/sql-d1/D1Client";
-import { EffectSQLiteD1Database } from "drizzle-orm/effect-d1";
 //#region src/drizzle/d1-phone.d.ts
 type Database = EffectSQLiteD1Database<AnyRelations> & {
   readonly $client: D1Client;
 };
 type Table$1 = AnySQLiteTable;
-export declare const makePhonePersistenceServices: <Database extends EffectSQLiteD1Database<import("drizzle-orm").TablesRelationalConfig> & {
-  readonly $client: D1Client;
-}, S extends Table$1, I extends Table$1, F extends Table$1, C extends Table$1, N, RSetup = never>(database: Database, mapping: PhoneMappingSource<PhoneMapping<S, I, C, F, N> & D1PhoneMapping, RSetup>) => Effect.Effect<PhonePersistenceServices, import("@yielded/auth-persistence/Adapter").PersistenceMappingError | import("@yielded/auth/PhoneOtp").PhoneConfigurationError, RSetup | LifecycleHooks>;
+export declare const makePhonePersistenceServices: <S extends Table$1, I extends Table$1, F extends Table$1, C extends Table$1, N, RSetup = never>(mapping: PhoneMappingSource<PhoneMapping<S, I, C, F, N> & D1PhoneMapping, RSetup>) => Effect.Effect<PhonePersistenceServices, import("@yielded/auth-persistence/Adapter").PersistenceMappingError | import("@yielded/auth/PhoneOtp").PhoneConfigurationError, Database$1 | LifecycleHooks | Exclude<RSetup, import("@yielded/auth-persistence/Adapter").NativeDatabase>>;
 export declare const coordinatePhonePersistence: <D extends Database, S extends Table$1, I extends Table$1, F extends Table$1, C extends Table$1, N, A, E, R, RSetup = never, DatabaseError = never, DatabaseRequirements = never>(acquire: Effect.Effect<D, DatabaseError, DatabaseRequirements>, options: {
   readonly mapping: PhoneMappingSource<PhoneMapping<S, I, C, F, N> & D1PhoneMapping, RSetup>;
 }, body: Effect.Effect<A, E, R>) => Effect.Effect<A, PhoneCoordinatorError<E> | DatabaseError, Exclude<R, PhonePersistence | PhoneAdmission | PhoneSignInTargets | D1BatchStatements> | LifecycleHooks | RSetup | DatabaseRequirements>;

package/dist/drizzle/d1-phone.mjs

@@ -1,3 +1,4 @@
+import { Database } from "./d1-database.mjs";
 import { D1BatchStatements } from "./D1BatchStatements.mjs";
 import { makeD1Owner } from "./d1-planning.mjs";
 import { coordinateTargetPhone, makePhoneTarget } from "./phone-target.mjs";
@@ -10,7 +11,7 @@ const configuration = {
 	locking: false,
 	standaloneGuard: () => Effect.void
 };
-const { makePhonePersistenceServices } = makePhoneTarget(configuration);
+const { makePhonePersistenceServices } = makePhoneTarget(Database, configuration);
 const coordinatePhonePersistence = (acquire, options, body) => Effect.flatMap(acquire, (database) => coordinateTargetPhone(database, options.mapping, configuration, (_transaction, services, append) => Effect.gen(function* () {
 	const original = services.phonePersistence;
 	const nativeCollector = D1BatchStatements.of({ append: (statement) => Effect.sync(() => append(statement)) });

package/dist/drizzle/d1-phone.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"d1-phone.mjs","names":["PhoneUnavailable"],"sources":["../../src/drizzle/d1-phone.ts"],"sourcesContent":["import type { D1Client } from \"@effect/sql-d1/D1Client\";\nimport type { LifecycleHooks } from \"@yielded/auth/Hooks\";\nimport {\n  PhoneOtpUnavailable as PhoneUnavailable,\n  PhoneAdmission,\n  PhonePersistence,\n  PhoneSignInTargets,\n} from \"@yielded/auth/PhoneOtp\";\nimport type { AnyRelations } from \"drizzle-orm\";\nimport type { EffectSQLiteD1Database } from \"drizzle-orm/effect-d1\";\nimport type { AnySQLiteTable } from \"drizzle-orm/sqlite-core\";\nimport { Context, Effect } from \"effect\";\n\nimport { makeD1Owner } from \"./d1-planning\";\nimport { D1BatchStatements } from \"./D1BatchStatements\";\nimport type { D1PhoneMapping, PhoneMapping, PhoneMappingSource } from \"./phone-model\";\nimport { coordinateTargetPhone, makePhoneTarget, type PhoneCoordinatorError } from \"./phone-target\";\ntype Database = EffectSQLiteD1Database<AnyRelations> & { readonly $client: D1Client };\ntype Table = AnySQLiteTable;\n\nconst configuration = {\n  mode: \"batch\" as const,\n  dialect: \"sqlite\" as const,\n  locking: false,\n  standaloneGuard: () => Effect.void,\n};\n\n/** Reads use a primary D1 session; observations and expiry are asserted in the same batch. */\nconst target = makePhoneTarget<Database, Table, D1PhoneMapping>(configuration);\n\nexport const { makePhonePersistenceServices } = target;\n\nexport const coordinatePhonePersistence = <\n  D extends Database,\n  S extends Table,\n  I extends Table,\n  F extends Table,\n  C extends Table,\n  N,\n  A,\n  E,\n  R,\n  RSetup = never,\n  DatabaseError = never,\n  DatabaseRequirements = never,\n>(\n  acquire: Effect.Effect<D, DatabaseError, DatabaseRequirements>,\n  options: {\n    readonly mapping: PhoneMappingSource<PhoneMapping<S, I, C, F, N> & D1PhoneMapping, RSetup>;\n  },\n  body: Effect.Effect<A, E, R>,\n): Effect.Effect<\n  A,\n  PhoneCoordinatorError<E> | DatabaseError,\n  | Exclude<R, PhonePersistence | PhoneAdmission | PhoneSignInTargets | D1BatchStatements>\n  | LifecycleHooks\n  | RSetup\n  | DatabaseRequirements\n> =>\n  Effect.flatMap(acquire, (database) =>\n    coordinateTargetPhone(\n      database,\n      options.mapping,\n      configuration,\n      (_transaction, services, append) =>\n        Effect.gen(function* () {\n          const original = services.phonePersistence;\n\n          const nativeCollector = D1BatchStatements.of({\n            append: (statement) => Effect.sync(() => append(statement)),\n          });\n\n          const owner = yield* makeD1Owner(PhoneUnavailable.make({})).pipe(\n            Effect.provideService(D1BatchStatements, nativeCollector),\n          );\n\n          const service: PhonePersistence[\"Service\"] = {\n            target: (input) => owner.run(original.target(input)),\n            mutate: (input, prepare) => owner.run(original.mutate(input, prepare)),\n          };\n\n          const provided = Context.make(PhonePersistence, service).pipe(\n            Context.add(D1BatchStatements, owner.collector),\n            Context.add(PhoneAdmission, {\n              admit: (input) => owner.run(services.phoneAdmission.admit(input)),\n              cleanup: (input) => owner.run(services.phoneAdmission.cleanup(input)),\n            }),\n            Context.add(PhoneSignInTargets, {\n              lookup: (input) => owner.run(services.phoneSignInTargets.lookup(input)),\n            }),\n          );\n\n          return yield* owner.close(Effect.provideContext(body, provided));\n        }),\n    ),\n  );\n"],"mappings":";;;;;;AAoBA,MAAM,gBAAgB;CACpB,MAAM;CACN,SAAS;CACT,SAAS;CACT,uBAAuB,OAAO;AAChC;AAKA,MAAa,EAAE,iCAFA,gBAAiD,aAEhB;AAEhD,MAAa,8BAcX,SACA,SAGA,SASA,OAAO,QAAQ,UAAU,aACvB,sBACE,UACA,QAAQ,SACR,gBACC,cAAc,UAAU,WACvB,OAAO,IAAI,aAAa;CACtB,MAAM,WAAW,SAAS;CAE1B,MAAM,kBAAkB,kBAAkB,GAAG,EAC3C,SAAS,cAAc,OAAO,WAAW,OAAO,SAAS,CAAC,EAC5D,CAAC;CAED,MAAM,QAAQ,OAAO,YAAYA,oBAAiB,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAC1D,OAAO,eAAe,mBAAmB,eAAe,CAC1D;CAOA,MAAM,WAAW,QAAQ,KAAK,kBAAkB;EAJ9C,SAAS,UAAU,MAAM,IAAI,SAAS,OAAO,KAAK,CAAC;EACnD,SAAS,OAAO,YAAY,MAAM,IAAI,SAAS,OAAO,OAAO,OAAO,CAAC;CAGjB,CAAC,CAAC,CAAC,KACvD,QAAQ,IAAI,mBAAmB,MAAM,SAAS,GAC9C,QAAQ,IAAI,gBAAgB;EAC1B,QAAQ,UAAU,MAAM,IAAI,SAAS,eAAe,MAAM,KAAK,CAAC;EAChE,UAAU,UAAU,MAAM,IAAI,SAAS,eAAe,QAAQ,KAAK,CAAC;CACtE,CAAC,GACD,QAAQ,IAAI,oBAAoB,EAC9B,SAAS,UAAU,MAAM,IAAI,SAAS,mBAAmB,OAAO,KAAK,CAAC,EACxE,CAAC,CACH;CAEA,OAAO,OAAO,MAAM,MAAM,OAAO,eAAe,MAAM,QAAQ,CAAC;AACjE,CAAC,CACL,CACF"}
+{"version":3,"file":"d1-phone.mjs","names":["DatabaseService","PhoneUnavailable"],"sources":["../../src/drizzle/d1-phone.ts"],"sourcesContent":["import type { D1Client } from \"@effect/sql-d1/D1Client\";\nimport type { LifecycleHooks } from \"@yielded/auth/Hooks\";\nimport {\n  PhoneOtpUnavailable as PhoneUnavailable,\n  PhoneAdmission,\n  PhonePersistence,\n  PhoneSignInTargets,\n} from \"@yielded/auth/PhoneOtp\";\nimport type { AnyRelations } from \"drizzle-orm\";\nimport type { EffectSQLiteD1Database } from \"drizzle-orm/effect-d1\";\nimport type { AnySQLiteTable } from \"drizzle-orm/sqlite-core\";\nimport { Context, Effect } from \"effect\";\n\nimport { Database as DatabaseService } from \"./d1-database\";\nimport { makeD1Owner } from \"./d1-planning\";\nimport { D1BatchStatements } from \"./D1BatchStatements\";\nimport type { D1PhoneMapping, PhoneMapping, PhoneMappingSource } from \"./phone-model\";\nimport { coordinateTargetPhone, makePhoneTarget, type PhoneCoordinatorError } from \"./phone-target\";\ntype Database = EffectSQLiteD1Database<AnyRelations> & { readonly $client: D1Client };\ntype Table = AnySQLiteTable;\n\nconst configuration = {\n  mode: \"batch\" as const,\n  dialect: \"sqlite\" as const,\n  locking: false,\n  standaloneGuard: () => Effect.void,\n};\n\n/** Reads use a primary D1 session; observations and expiry are asserted in the same batch. */\nconst target = makePhoneTarget<DatabaseService, Database, Table, D1PhoneMapping>(\n  DatabaseService,\n  configuration,\n);\n\nexport const { makePhonePersistenceServices } = target;\n\nexport const coordinatePhonePersistence = <\n  D extends Database,\n  S extends Table,\n  I extends Table,\n  F extends Table,\n  C extends Table,\n  N,\n  A,\n  E,\n  R,\n  RSetup = never,\n  DatabaseError = never,\n  DatabaseRequirements = never,\n>(\n  acquire: Effect.Effect<D, DatabaseError, DatabaseRequirements>,\n  options: {\n    readonly mapping: PhoneMappingSource<PhoneMapping<S, I, C, F, N> & D1PhoneMapping, RSetup>;\n  },\n  body: Effect.Effect<A, E, R>,\n): Effect.Effect<\n  A,\n  PhoneCoordinatorError<E> | DatabaseError,\n  | Exclude<R, PhonePersistence | PhoneAdmission | PhoneSignInTargets | D1BatchStatements>\n  | LifecycleHooks\n  | RSetup\n  | DatabaseRequirements\n> =>\n  Effect.flatMap(acquire, (database) =>\n    coordinateTargetPhone(\n      database,\n      options.mapping,\n      configuration,\n      (_transaction, services, append) =>\n        Effect.gen(function* () {\n          const original = services.phonePersistence;\n\n          const nativeCollector = D1BatchStatements.of({\n            append: (statement) => Effect.sync(() => append(statement)),\n          });\n\n          const owner = yield* makeD1Owner(PhoneUnavailable.make({})).pipe(\n            Effect.provideService(D1BatchStatements, nativeCollector),\n          );\n\n          const service: PhonePersistence[\"Service\"] = {\n            target: (input) => owner.run(original.target(input)),\n            mutate: (input, prepare) => owner.run(original.mutate(input, prepare)),\n          };\n\n          const provided = Context.make(PhonePersistence, service).pipe(\n            Context.add(D1BatchStatements, owner.collector),\n            Context.add(PhoneAdmission, {\n              admit: (input) => owner.run(services.phoneAdmission.admit(input)),\n              cleanup: (input) => owner.run(services.phoneAdmission.cleanup(input)),\n            }),\n            Context.add(PhoneSignInTargets, {\n              lookup: (input) => owner.run(services.phoneSignInTargets.lookup(input)),\n            }),\n          );\n\n          return yield* owner.close(Effect.provideContext(body, provided));\n        }),\n    ),\n  );\n"],"mappings":";;;;;;;AAqBA,MAAM,gBAAgB;CACpB,MAAM;CACN,SAAS;CACT,SAAS;CACT,uBAAuB,OAAO;AAChC;AAQA,MAAa,EAAE,iCALA,gBACbA,UACA,aAG8C;AAEhD,MAAa,8BAcX,SACA,SAGA,SASA,OAAO,QAAQ,UAAU,aACvB,sBACE,UACA,QAAQ,SACR,gBACC,cAAc,UAAU,WACvB,OAAO,IAAI,aAAa;CACtB,MAAM,WAAW,SAAS;CAE1B,MAAM,kBAAkB,kBAAkB,GAAG,EAC3C,SAAS,cAAc,OAAO,WAAW,OAAO,SAAS,CAAC,EAC5D,CAAC;CAED,MAAM,QAAQ,OAAO,YAAYC,oBAAiB,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAC1D,OAAO,eAAe,mBAAmB,eAAe,CAC1D;CAOA,MAAM,WAAW,QAAQ,KAAK,kBAAkB;EAJ9C,SAAS,UAAU,MAAM,IAAI,SAAS,OAAO,KAAK,CAAC;EACnD,SAAS,OAAO,YAAY,MAAM,IAAI,SAAS,OAAO,OAAO,OAAO,CAAC;CAGjB,CAAC,CAAC,CAAC,KACvD,QAAQ,IAAI,mBAAmB,MAAM,SAAS,GAC9C,QAAQ,IAAI,gBAAgB;EAC1B,QAAQ,UAAU,MAAM,IAAI,SAAS,eAAe,MAAM,KAAK,CAAC;EAChE,UAAU,UAAU,MAAM,IAAI,SAAS,eAAe,QAAQ,KAAK,CAAC;CACtE,CAAC,GACD,QAAQ,IAAI,oBAAoB,EAC9B,SAAS,UAAU,MAAM,IAAI,SAAS,mBAAmB,OAAO,KAAK,CAAC,EACxE,CAAC,CACH;CAEA,OAAO,OAAO,MAAM,MAAM,OAAO,eAAe,MAAM,QAAQ,CAAC;AACjE,CAAC,CACL,CACF"}

package/dist/drizzle/d1-planning.d.mts

@@ -1,8 +1,8 @@
 import "./D1BatchStatements.mjs";
 import { AnyRelations } from "drizzle-orm";
 import { Context, Effect } from "effect";
-import { D1Client } from "@effect/sql-d1/D1Client";
 import { EffectSQLiteD1Database } from "drizzle-orm/effect-d1";
+import { D1Client } from "@effect/sql-d1/D1Client";
 //#region src/drizzle/d1-planning.d.ts
 export type D1PlanningDatabase = EffectSQLiteD1Database<AnyRelations> & {
   readonly $client: D1Client;

package/dist/drizzle/d1-proofs.d.mts

@@ -1,21 +1,22 @@
 import "./model.mjs";
 import { D1ProofPersistenceMapping } from "./proof-model.mjs";
+import { Database as Database$1 } from "./d1-database.mjs";
 import { D1BatchStatements } from "./D1BatchStatements.mjs";
 import "./d1-planning.mjs";
 import { AnyRelations, SQL, Table } from "drizzle-orm";
 import { Effect } from "effect";
 import { CurrentCommitJournal, HookConfigurationError, LifecycleHooks, PreparedCommit } from "@yielded/auth/Hooks";
 import { PrepareProofCommit, ProofAttemptDecision, ProofBinding, ProofCleanupResult, ProofCompletionDecision, ProofCompletionPlan, ProofDeliveryClaim, ProofDeliveryOutcome, ProofPersistence, ProofPolicy, ProofRequestConflict, ProofUnavailable, ProofVersion } from "@yielded/auth/Proofs";
+import { EffectSQLiteD1Database } from "drizzle-orm/effect-d1";
 import { AnySQLiteTable } from "drizzle-orm/sqlite-core";
 import { Statement } from "effect/sql/Statement";
 import { D1Client } from "@effect/sql-d1/D1Client";
-import { EffectSQLiteD1Database } from "drizzle-orm/effect-d1";
 import "drizzle-orm/effect-core";
 //#region src/drizzle/d1-proofs.d.ts
 type Database = EffectSQLiteD1Database<AnyRelations> & {
   readonly $client: D1Client;
 };
-export declare const makeD1ProofPersistenceServices: <Rq extends AnySQLiteTable, S extends AnySQLiteTable, G extends AnySQLiteTable, Cn extends AnySQLiteTable, Rs extends AnySQLiteTable, A extends AnySQLiteTable, F extends AnySQLiteTable, C extends AnySQLiteTable, Sub extends AnySQLiteTable, I extends AnySQLiteTable, Cr extends AnySQLiteTable, NativeId>(database: Database, mapping: D1ProofPersistenceMapping<Rq, S, G, Cn, Rs, A, F, C, Sub, I, Cr, NativeId>) => Effect.Effect<{
+export declare const makeD1ProofPersistenceServices: <Rq extends AnySQLiteTable, S extends AnySQLiteTable, G extends AnySQLiteTable, Cn extends AnySQLiteTable, Rs extends AnySQLiteTable, A extends AnySQLiteTable, F extends AnySQLiteTable, C extends AnySQLiteTable, Sub extends AnySQLiteTable, I extends AnySQLiteTable, Cr extends AnySQLiteTable, NativeId>(mapping: D1ProofPersistenceMapping<Rq, S, G, Cn, Rs, A, F, C, Sub, I, Cr, NativeId>) => Effect.Effect<{
   proofPersistence: {
     readonly issue: <A_1>(input: {
       readonly record: import("@yielded/auth/Proofs").ProofRecord;
@@ -65,7 +66,7 @@ export declare const makeD1ProofPersistenceServices: <Rq extends AnySQLiteTable,
       readonly limit: number;
     }, prepare: PrepareProofCommit<ProofCleanupResult, A_1>) => Effect.Effect<PreparedCommit<A_1>, ProofUnavailable>;
   };
-}, never, LifecycleHooks>;
+}, never, Database$1 | LifecycleHooks>;
 type CoordinatorError<E> = E | ProofUnavailable | HookConfigurationError;
 /**
  * Owns one proof transition plus application statements in one D1 batch. It

package/dist/drizzle/d1-proofs.mjs

@@ -1,6 +1,7 @@
 import { requiredProofConstraints } from "./proof-model.mjs";
 import { PersistenceMappingError, column, isMappedConstraintConflict, updateValues } from "./model.mjs";
 import { balancedD1And } from "./d1-generated-statement.mjs";
+import { Database } from "./d1-database.mjs";
 import { D1BatchStatements } from "./D1BatchStatements.mjs";
 import { CurrentD1PlanningDatabase, makeD1Owner } from "./d1-planning.mjs";
 import { and, count, eq, gte, inArray, isNull, lte, notExists, or, sql } from "drizzle-orm";
@@ -730,7 +731,8 @@ const makeProofPlans = (mapping) => {
 		})
 	};
 };
-const makeD1ProofPersistenceServices = (database, mapping) => Effect.gen(function* () {
+const makeD1ProofPersistenceServices = Effect.fnUntraced(function* (mapping) {
+	const database = yield* Database;
 	const hooks = yield* LifecycleHooks;
 	const plans = makeProofPlans(mapping);
 	const run = (plan) => Effect.gen(function* () {