@effect-app/infra 4.0.0-beta.99 → 4.0.0

package/dist/ClusterServiceBus.d.ts

@@ -0,0 +1,67 @@
+import { type ServiceBusClientOptions, type ServiceBusMessage, type ServiceBusReceiverOptions, type ServiceBusSenderOptions, type SubscribeOptions } from "@azure/service-bus";
+import * as Context from "effect-app/Context";
+import * as Effect from "effect-app/Effect";
+import * as Layer from "effect-app/Layer";
+import type * as MessageStorage from "effect/cluster/MessageStorage";
+import type * as RunnerHealth from "effect/cluster/RunnerHealth";
+import * as Runners from "effect/cluster/Runners";
+import type * as RunnerStorage from "effect/cluster/RunnerStorage";
+import * as Sharding from "effect/cluster/Sharding";
+import type * as ShardingConfig from "effect/cluster/ShardingConfig";
+import * as Snowflake from "effect/cluster/Snowflake";
+import * as Scope from "effect/Scope";
+export interface ClusterServiceBusSender {
+    readonly sendMessages: (messages: ServiceBusMessage) => Promise<void>;
+    readonly close: () => Promise<void>;
+}
+export interface ClusterServiceBusSubscription {
+    readonly close: () => Promise<void>;
+}
+export interface ClusterServiceBusReceiver {
+    readonly subscribe: (handlers: {
+        readonly processMessage: () => Promise<void>;
+        readonly processError: (args: {
+            readonly error: Error;
+            readonly entityPath?: string | undefined;
+            readonly errorSource: string;
+            readonly fullyQualifiedNamespace: string;
+        }) => Promise<void>;
+    }, options?: SubscribeOptions | undefined) => ClusterServiceBusSubscription;
+    readonly close: () => Promise<void>;
+}
+export interface ClusterServiceBusClient {
+    readonly createSender: (topicName: string, options?: ServiceBusSenderOptions | undefined) => ClusterServiceBusSender;
+    readonly createReceiver: (topicName: string, subscriptionName: string, options?: ServiceBusReceiverOptions | undefined) => ClusterServiceBusReceiver;
+    readonly close: () => Promise<void>;
+}
+declare const ClusterServiceBus_base: Context.ServiceClass<ClusterServiceBus, "@effect-app/infra/ClusterServiceBus", {
+    readonly client: ClusterServiceBusClient;
+}>;
+export declare class ClusterServiceBus extends ClusterServiceBus_base {
+}
+export interface TopicOptions {
+    readonly topicName: string;
+    readonly senderOptions?: ServiceBusSenderOptions | undefined;
+}
+export interface SubscriptionOptions extends TopicOptions {
+    readonly subscriptionName: string;
+    readonly receiverOptions?: ServiceBusReceiverOptions | undefined;
+    readonly subscribeOptions?: SubscribeOptions | undefined;
+}
+export interface StorageNotification {
+    readonly _tag: "EffectClusterStorageNotification";
+    readonly envelopeId: string;
+    readonly requestId: string;
+    readonly shardId: string;
+    readonly entityType: string;
+    readonly entityId: string;
+}
+export declare const layerClient: (connectionString: string, options?: ServiceBusClientOptions | undefined) => Layer.Layer<ClusterServiceBus>;
+export declare const layerClientFrom: (client: ClusterServiceBusClient) => Layer.Layer<ClusterServiceBus>;
+export declare const makeRunners: (options: TopicOptions) => Effect.Effect<Runners.Runners["Service"], never, ClusterServiceBus | MessageStorage.MessageStorage | ShardingConfig.ShardingConfig | Snowflake.Generator | Scope.Scope>;
+export declare const layerRunners: (options: TopicOptions) => Layer.Layer<Runners.Runners, never, ClusterServiceBus | MessageStorage.MessageStorage | ShardingConfig.ShardingConfig>;
+export declare const makeStoragePoller: (options: SubscriptionOptions) => Effect.Effect<void, never, ClusterServiceBus | Sharding.Sharding | Scope.Scope>;
+export declare const layerStoragePoller: (options: SubscriptionOptions) => Layer.Layer<never, never, ClusterServiceBus | Sharding.Sharding>;
+export declare const layer: (options: SubscriptionOptions) => Layer.Layer<Sharding.Sharding | Runners.Runners, never, ClusterServiceBus | MessageStorage.MessageStorage | RunnerHealth.RunnerHealth | RunnerStorage.RunnerStorage | ShardingConfig.ShardingConfig>;
+export {};
+//# sourceMappingURL=ClusterServiceBus.d.ts.map

package/dist/ClusterServiceBus.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ClusterServiceBus.d.ts","sourceRoot":"","sources":["../src/ClusterServiceBus.ts"],"names":[],"mappings":"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"}

package/dist/ClusterServiceBus.js

@@ -0,0 +1,84 @@
+import { ServiceBusClient } from "@azure/service-bus";
+import * as Context from "effect-app/Context";
+import * as Effect from "effect-app/Effect";
+import * as Layer from "effect-app/Layer";
+import * as ClusterError from "effect/cluster/ClusterError";
+import { Persisted } from "effect/cluster/ClusterSchema";
+import * as Runners from "effect/cluster/Runners";
+import * as Sharding from "effect/cluster/Sharding";
+import * as Snowflake from "effect/cluster/Snowflake";
+import * as Data from "effect/Data";
+import * as Schema from "effect/Schema";
+import * as Scope from "effect/Scope";
+export class ClusterServiceBus extends Context.Service()("@effect-app/infra/ClusterServiceBus") {
+}
+export const layerClient = (connectionString, options) => Layer.effect(ClusterServiceBus, Effect.acquireRelease(Effect.sync(() => ClusterServiceBus.of({ client: new ServiceBusClient(connectionString, options) })), ({ client }) => Effect.promise(() => client.close()).pipe(Effect.ignore)));
+export const layerClientFrom = (client) => Layer.succeed(ClusterServiceBus)(ClusterServiceBus.of({ client }));
+export const makeRunners = Effect.fnUntraced(function* (options) {
+    const serviceBus = yield* ClusterServiceBus;
+    const scope = yield* Effect.scope;
+    const sender = serviceBus.client.createSender(options.topicName, options.senderOptions);
+    yield* Scope.addFinalizer(scope, Effect.promise(() => sender.close()).pipe(Effect.ignore));
+    const publish = (message) => Effect
+        .tryPromise({
+        try: () => sender.sendMessages(storageNotification(message)),
+        catch: (cause) => new ServiceBusPublishError({ cause })
+    })
+        .pipe(Effect.catch((cause) => Effect.logDebug("Could not publish cluster storage notification", cause)));
+    return yield* Runners.make({
+        codecFor: Schema.toCodecJson,
+        ping: (address) => Effect.fail(new ClusterError.RunnerUnavailable({ address })),
+        send: ({ address, message }) => {
+            const persisted = Context.get(message.rpc.annotations, Persisted);
+            return (persisted ? publish(message) : Effect.void).pipe(Effect.andThen(Effect.fail(new ClusterError.RunnerUnavailable({ address }))));
+        },
+        notify: ({ message }) => publish(message),
+        onRunnerUnavailable: () => Effect.void
+    });
+});
+export const layerRunners = (options) => Layer.effect(Runners.Runners, makeRunners(options)).pipe(Layer.provide(Snowflake.layerGenerator));
+export const makeStoragePoller = Effect.fnUntraced(function* (options) {
+    const serviceBus = yield* ClusterServiceBus;
+    const sharding = yield* Sharding.Sharding;
+    const scope = yield* Effect.scope;
+    const receiver = serviceBus.client.createReceiver(options.topicName, options.subscriptionName, {
+        receiveMode: "receiveAndDelete",
+        ...options.receiverOptions
+    });
+    const subscription = receiver.subscribe({
+        processMessage: () => Effect.runPromise(sharding.pollStorage.pipe(Effect.catchCause((cause) => Effect.logDebug("Could not wake cluster storage poller", cause)))),
+        processError: (args) => Effect.runPromise(Effect.logDebug("Error receiving cluster storage notification", args.error).pipe(Effect.annotateLogs({
+            entityPath: args.entityPath,
+            errorSource: args.errorSource,
+            fullyQualifiedNamespace: args.fullyQualifiedNamespace
+        })))
+    }, options.subscribeOptions);
+    yield* Scope.addFinalizer(scope, Effect.promise(() => subscription.close()).pipe(Effect.andThen(Effect.promise(() => receiver.close())), Effect.ignore));
+});
+export const layerStoragePoller = (options) => Layer.effectDiscard(makeStoragePoller(options));
+export const layer = (options) => {
+    const sharding = Sharding.layer.pipe(Layer.provideMerge(layerRunners(options)));
+    return Layer.merge(sharding, layerStoragePoller(options).pipe(Layer.provide(sharding)));
+};
+const storageNotification = (message) => {
+    const envelope = message.envelope;
+    const envelopeId = envelope._tag === "Request" ? envelope.requestId : envelope.id;
+    const body = {
+        _tag: "EffectClusterStorageNotification",
+        envelopeId: String(envelopeId),
+        requestId: String(envelope.requestId),
+        shardId: envelope.address.shardId.toString(),
+        entityType: envelope.address.entityType,
+        entityId: envelope.address.entityId
+    };
+    return {
+        body,
+        contentType: "application/json",
+        correlationId: body.requestId,
+        messageId: body.envelopeId,
+        subject: body._tag
+    };
+};
+class ServiceBusPublishError extends Data.TaggedError("ServiceBusPublishError") {
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ2x1c3RlclNlcnZpY2VCdXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvQ2x1c3RlclNlcnZpY2VCdXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGdCQUFnQixFQUE2SSxNQUFNLG9CQUFvQixDQUFBO0FBQ2hNLE9BQU8sS0FBSyxPQUFPLE1BQU0sb0JBQW9CLENBQUE7QUFDN0MsT0FBTyxLQUFLLE1BQU0sTUFBTSxtQkFBbUIsQ0FBQTtBQUMzQyxPQUFPLEtBQUssS0FBSyxNQUFNLGtCQUFrQixDQUFBO0FBQ3pDLE9BQU8sS0FBSyxZQUFZLE1BQU0sNkJBQTZCLENBQUE7QUFDM0QsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLDhCQUE4QixDQUFBO0FBSXhELE9BQU8sS0FBSyxPQUFPLE1BQU0sd0JBQXdCLENBQUE7QUFFakQsT0FBTyxLQUFLLFFBQVEsTUFBTSx5QkFBeUIsQ0FBQTtBQUVuRCxPQUFPLEtBQUssU0FBUyxNQUFNLDBCQUEwQixDQUFBO0FBQ3JELE9BQU8sS0FBSyxJQUFJLE1BQU0sYUFBYSxDQUFBO0FBRW5DLE9BQU8sS0FBSyxNQUFNLE1BQU0sZUFBZSxDQUFBO0FBQ3ZDLE9BQU8sS0FBSyxLQUFLLE1BQU0sY0FBYyxDQUFBO0FBd0NyQyxNQUFNLE9BQU8saUJBQWtCLFNBQVEsT0FBTyxDQUFDLE9BQU8sRUFFbEQsQ0FBQyxxQ0FBcUMsQ0FBQztDQUFHO0FBc0I5QyxNQUFNLENBQUMsTUFBTSxXQUFXLEdBQUcsQ0FDekIsZ0JBQXdCLEVBQ3hCLE9BQTZDLEVBQ2IsRUFBRSxDQUNsQyxLQUFLLENBQUMsTUFBTSxDQUNWLGlCQUFpQixFQUNqQixNQUFNLENBQUMsY0FBYyxDQUNuQixNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLGlCQUFpQixDQUFDLEVBQUUsQ0FBQyxFQUFFLE1BQU0sRUFBRSxJQUFJLGdCQUFnQixDQUFDLGdCQUFnQixFQUFFLE9BQU8sQ0FBQyxFQUFF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

package/dist/{api/ContextProvider.d.ts → ContextProvider.d.ts}

@@ -1,7 +1,10 @@
-import { Context, Effect, Layer, type NonEmptyReadonlyArray, type Scope } from "effect-app";
+import type { NonEmptyReadonlyArray } from "effect-app/Array";
+import * as Context from "effect-app/Context";
+import * as Effect from "effect-app/Effect";
+import * as Layer from "effect-app/Layer";
+import type * as Scope from "effect/Scope";
 import { type HttpRouter } from "effect-app/http";
 import { type EffectGenUtils } from "effect-app/utils/gen";
-import { type Yieldable } from "effect/Effect";
 import { type ContextTagWithDefault, type GetContext, type LayerUtils } from "./layerUtils.js";
 export interface ContextProviderId {
     _tag: "ContextProvider";
@@ -11,14 +14,14 @@ export interface ContextProviderId {
  * each service is an effect which builds some context for each request
  */
 type TDepsArr<TDeps extends ReadonlyArray<any>> = {
-    [K in keyof TDeps]: TDeps[K] extends ContextTagWithDefault.Base<Effect.Effect<Context.Context<infer _1>, never, infer _R>> ? [_R] extends [HttpRouter.Provided] ? TDeps[K] : `HttpLayerRouter.Provided is the only requirement ${TDeps[K]["Service"]["_tag"]}'s returned effect can have` : TDeps[K] extends (ContextTagWithDefault.Base<(() => Generator<infer _YW, infer _1, infer _2>)>) ? [_YW] extends [never] ? TDeps[K] : [_YW] extends [Yieldable<any, infer _2, never, infer _R>] ? [_R] extends [HttpRouter.Provided] ? TDeps[K] : `HttpLayerRouter.Provided is the only requirement ${TDeps[K]["Service"]["_tag"]}'s returned effect can have` : "WTF are you yielding man?" : `You cannot throw errors from providers`;
+    [K in keyof TDeps]: TDeps[K] extends ContextTagWithDefault.Base<Effect.Effect<Context.Context<infer _1>, never, infer _R>> ? [_R] extends [HttpRouter.Provided] ? TDeps[K] : `HttpLayerRouter.Provided is the only requirement ${TDeps[K]["Service"]["_tag"]}'s returned effect can have` : TDeps[K] extends (ContextTagWithDefault.Base<(() => Generator<infer _YW, infer _1, infer _2>)>) ? [_YW] extends [never] ? TDeps[K] : [_YW] extends [Effect.Effect<any, never, infer _R>] ? [_R] extends [HttpRouter.Provided] ? TDeps[K] : `HttpLayerRouter.Provided is the only requirement ${TDeps[K]["Service"]["_tag"]}'s returned effect can have` : "WTF are you yielding man?" : `You cannot throw errors from providers`;
 };
 export declare const mergeContextProviders: <TDeps extends ReadonlyArray<any>>(...deps: TDepsArr<TDeps>) => {
     dependencies: { [K in keyof TDeps]: TDeps[K]["Default"]; };
     effect: Effect.Effect<Effect.Effect<Context.Context<GetContext<EffectGenUtils.Success<Context.Service.Shape<TDeps[number]>>>>, never, EffectGenUtils.Context<Context.Service.Shape<TDeps[number]>>>, LayerUtils.GetLayersError<{ [K in keyof TDeps]: TDeps[K]["Default"]; }>, LayerUtils.GetLayersSuccess<{ [K in keyof TDeps]: TDeps[K]["Default"]; }>>;
 };
 export declare const ContextProvider: <ContextProviderA, MakeContextProviderE, MakeContextProviderR, ContextProviderR extends Scope.Scope, Dependencies extends NonEmptyReadonlyArray<Layer.Any>>(input: {
-    effect: Effect.Effect<Effect.Effect<ContextProviderA, never, ContextProviderR> | (() => Generator<Yieldable<any, any, never, ContextProviderR>, ContextProviderA, any>), MakeContextProviderE, MakeContextProviderR | Scope.Scope>;
+    effect: Effect.Effect<Effect.Effect<ContextProviderA, never, ContextProviderR> | (() => Generator<Effect.Effect<any, never, ContextProviderR>, ContextProviderA>), MakeContextProviderE, MakeContextProviderR | Scope.Scope>;
     dependencies?: Dependencies;
 }) => Context.Service<ContextProviderId, Effect.Effect<ContextProviderA, never, ContextProviderR>> & {
     Default: Layer.Layer<ContextProviderId, MakeContextProviderE | LayerUtils.GetLayersError<Dependencies>, Exclude<MakeContextProviderR, LayerUtils.GetLayersSuccess<Dependencies>> | LayerUtils.GetLayersContext<Dependencies>>;

package/dist/ContextProvider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ContextProvider.d.ts","sourceRoot":"","sources":["../src/ContextProvider.ts"],"names":[],"mappings":"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"}

package/dist/ContextProvider.js

@@ -0,0 +1,40 @@
+import * as Context from "effect-app/Context";
+import * as Effect from "effect-app/Effect";
+import * as Layer from "effect-app/Layer";
+import { pipe } from "effect/Function";
+import { mergeContexts } from "./layerUtils.js";
+// Note: the type here must be aligned with MergedContextProvider
+export const mergeContextProviders = (
+// long life to reverse mapped types
+...deps) => ({
+    dependencies: deps.map((_) => _.Default),
+    effect: Effect.gen(function* () {
+        // uses the tags to request the context providers
+        const makers = yield* Effect.all(deps);
+        return Effect
+            .gen(function* () {
+            const services = makers.map((handle, i) => ({
+                maker: deps[i],
+                handle: handle[Symbol.toStringTag] === "GeneratorFunction" ? Effect.fnUntraced(handle)() : handle
+            }));
+            // services are effects which return some Context.Context<...>
+            const context = yield* mergeContexts(services);
+            return context;
+        });
+    })
+});
+// Effect Rpc Middleware: for single tag providing, we could use Provides, for providing Context or Layer (bad boy) we could use Wrap..
+export const ContextProvider = (input) => {
+    const ctx = Context.Service("ContextProvider");
+    const e = input.effect.pipe(Effect.map((eg) => eg[Symbol.toStringTag] === "GeneratorFunction" ? Effect.fnUntraced(eg)() : eg));
+    const l = Layer.effect(ctx, e);
+    return Object.assign(ctx, {
+        Default: l.pipe(input.dependencies ? Layer.provide([...input.dependencies]) : (_) => _)
+    });
+};
+// Note: the type here must be aligned with mergeContextProviders
+export const MergedContextProvider = (
+// long life to reverse mapped types
+...deps) => pipe(deps, (_) => mergeContextProviders(..._), (_) => ContextProvider(_));
+export const EmptyContextProvider = ContextProvider({ effect: Effect.succeed(Effect.succeed(Context.empty())) });
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29udGV4dFByb3ZpZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL0NvbnRleHRQcm92aWRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEtBQUssT0FBTyxNQUFNLG9CQUFvQixDQUFBO0FBQzdDLE9BQU8sS0FBSyxNQUFNLE1BQU0sbUJBQW1CLENBQUE7QUFDM0MsT0FBTyxLQUFLLEtBQUssTUFBTSxrQkFBa0IsQ0FBQTtBQUN6QyxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0saUJBQWlCLENBQUE7QUFLdEMsT0FBTyxFQUFnRSxhQUFhLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQTtBQTBDN0csaUVBQWlFO0FBQ2pFLE1BQU0sQ0FBQyxNQUFNLHFCQUFxQixHQUFHO0FBR25DLG9DQUFvQztBQUNwQyxHQUFHLElBQXFCLEVBY3hCLEVBQUUsQ0FBQyxDQUFDO0lBQ0osWUFBWSxFQUFFLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFFLENBQVMsQ0FBQyxPQUFPLENBQVE7SUFDeEQsTUFBTSxFQUFFLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDO1FBQzFCLGlEQUFpRDtRQUNqRCxNQUFNLE1BQU0sR0FBRyxLQUFLLENBQUMsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLElBQWEsQ0FBQyxDQUFBO1FBQy9DLE9BQU8sTUFBTTthQUNWLEdBQUcsQ0FBQyxRQUFRLENBQUM7WUFDWixNQUFNLFFBQVEsR0FBSSxNQUFnQixDQUFDLEdBQUcsQ0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQ3BEO2dCQUNFLEtBQUssRUFBRSxJQUFJLENBQUMsQ0FBQyxDQUFDO2dCQUNkLE1BQU0sRUFBRSxNQUFNLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxLQUFLLG1CQUFtQixDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLE1BQU07YUFDbEcsQ0FDRixDQUFDLENBQUE7WUFDRiw4REFBOEQ7WUFDOUQsTUFBTSxPQUFPLEdBQUcsS0FBSyxDQUFDLENBQUMsYUFBYSxDQUFDLFFBQWUsQ0FBQyxDQUFBO1lBQ3JELE9BQU8sT0FBTyxDQUFBO1FBQ2hCLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFRO0NBQ1YsQ0FBQyxDQUFBO0FBRUYsdUlBQXVJO0FBQ3ZJLE1BQU0sQ0FBQyxNQUFNLGVBQWUsR0FBRyxDQU83QixLQVdDLEVBQ0QsRUFBRTtJQUNGLE1BQU0sR0FBRyxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBSXpCLGlCQUFpQixDQUNsQixDQUFBO0lBQ0QsTUFBTSxDQUFDLEdBQUcsS0FBSyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQ3pCLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFFLEVBQVUsQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLEtBQUssbUJBQW1CLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsRUFBUyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQ2xILENBQUE7SUFDRCxNQUFNLENBQUMsR0FBRyxLQUFLLENBQUMsTUFBTSxDQUFDLEdBQUcsRUFBRSxDQUFRLENBQUMsQ0FBQTtJQUNyQyxPQUFPLE1BQU0sQ0FBQyxNQUFNLENBQUMsR0FBRyxFQUFFO1FBQ3hCLE9BQU8sRUFBRSxDQUFDLENBQUMsSUFBSSxDQUNiLEtBQUssQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQyxHQUFHLEtBQUssQ0FBQyxZQUFZLENBQWdDLENBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFNLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FPbEg7S0FDRixDQUFDLENBQUE7QUFDSixDQUFDLENBQUE7QUFFRCxpRUFBaUU7QUFDakUsTUFBTSxDQUFDLE1BQU0scUJBQXFCLEdBQUc7QUFHbkMsb0NBQW9DO0FBQ3BDLEdBQUcsSUFBcUIsRUFDeEIsRUFBRSxDQUNGLElBQUksQ0FDRixJQUFxRCxFQUNyRCxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMscUJBQXFCLENBQUMsR0FBRyxDQUFDLENBQUMsRUFDbEMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLGVBQWUsQ0FBQyxDQUFRLENBQUMsQ0FpQmpDLENBQUE7QUFFSCxNQUFNLENBQUMsTUFBTSxvQkFBb0IsR0FBRyxlQUFlLENBQUMsRUFBRSxNQUFNLEVBQUUsTUFBTSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFBIn0=

package/dist/Emailer/Sendgrid.d.ts

@@ -1,168 +1,132 @@
-import type { EmailData } from "@sendgrid/helpers/classes/email-address.js";
-import type { MailContent } from "@sendgrid/helpers/classes/mail.js";
-import { Array } from "effect-app";
-import { Emailer, type EmailMsg, type SendgridConfig } from "./service.js";
+import * as Array from "effect-app/Array";
+import { type EmailData, Emailer, type EmailMsg } from "effect-app/Emailer";
+import * as Redacted from "effect/Redacted";
+export interface SendgridConfig {
+    defaultReplyTo?: EmailData;
+    subjectPrefix: string;
+    realMail: boolean;
+    defaultFrom: EmailData;
+    apiKey: Redacted.Redacted;
+    /**
+     * Email address used for fake/test recipients. Use `{i}` as a placeholder for
+     * an auto-incrementing index to ensure uniqueness.
+     *
+     * @example "test+{i}@example.com"
+     */
+    fakeMailAddress: string;
+}
 export declare function Sendgrid(config: SendgridConfig): import("effect/Layer").Layer<Emailer, never, never>;
 /**
  * @hidden
  */
-export declare function renderMessage(forceFake: boolean): (msg: EmailMsg) => {
-    to: EmailData | EmailData[];
-    cc: EmailData | EmailData[];
-    bcc: EmailData | EmailData[];
+export declare function renderMessage(forceFake: boolean, fakeMailAddress: string): (msg: EmailMsg) => {
+    from: EmailData;
     replyTo?: EmailData;
-    sendAt?: number;
     subject?: string;
-    text: string;
-    html?: string;
-    templateId?: string;
-    personalizations?: import("@sendgrid/helpers/classes/personalization.js").PersonalizationData[];
-    attachments?: import("@sendgrid/helpers/classes/attachment.js").AttachmentData[];
-    ipPoolName?: string;
-    batchId?: string;
-    sections?: {
-        [key: string]: string;
-    };
-    headers?: {
-        [key: string]: string;
-    };
-    categories?: string[];
-    category?: string;
-    customArgs?: {
-        [key: string]: any;
-    };
-    asm?: import("@sendgrid/helpers/classes/mail.js").ASMOptions;
-    mailSettings?: import("@sendgrid/helpers/classes/mail.js").MailSettings;
-    trackingSettings?: import("@sendgrid/helpers/classes/mail.js").TrackingSettings;
-    substitutions?: {
-        [key: string]: string;
-    };
-    substitutionWrappers?: string[];
     isMultiple?: boolean;
-    dynamicTemplateData?: {
-        [key: string]: any;
-    };
-    hideWarnings?: boolean;
-    replyToList?: import("@sendgrid/helpers/classes/email-address.js").EmailJSON | import("@sendgrid/helpers/classes/email-address.js").EmailJSON[];
-    from: import("./service.js").EmailData;
+    text: string;
+    to: ({
+        name: string;
+        email: string;
+    } | EmailData)[] | {
+        name: string;
+        email: string;
+    } | EmailData;
+    cc: ({
+        name: string;
+        email: string;
+    } | EmailData)[] | {
+        name: string;
+        email: string;
+    } | EmailData;
+    bcc: ({
+        name: string;
+        email: string;
+    } | EmailData)[] | {
+        name: string;
+        email: string;
+    } | EmailData;
 } | {
-    to: EmailData | EmailData[];
-    cc: EmailData | EmailData[];
-    bcc: EmailData | EmailData[];
+    from: EmailData;
     replyTo?: EmailData;
-    sendAt?: number;
     subject?: string;
-    text?: string;
-    html: string;
-    templateId?: string;
-    personalizations?: import("@sendgrid/helpers/classes/personalization.js").PersonalizationData[];
-    attachments?: import("@sendgrid/helpers/classes/attachment.js").AttachmentData[];
-    ipPoolName?: string;
-    batchId?: string;
-    sections?: {
-        [key: string]: string;
-    };
-    headers?: {
-        [key: string]: string;
-    };
-    categories?: string[];
-    category?: string;
-    customArgs?: {
-        [key: string]: any;
-    };
-    asm?: import("@sendgrid/helpers/classes/mail.js").ASMOptions;
-    mailSettings?: import("@sendgrid/helpers/classes/mail.js").MailSettings;
-    trackingSettings?: import("@sendgrid/helpers/classes/mail.js").TrackingSettings;
-    substitutions?: {
-        [key: string]: string;
-    };
-    substitutionWrappers?: string[];
     isMultiple?: boolean;
-    dynamicTemplateData?: {
-        [key: string]: any;
-    };
-    hideWarnings?: boolean;
-    replyToList?: import("@sendgrid/helpers/classes/email-address.js").EmailJSON | import("@sendgrid/helpers/classes/email-address.js").EmailJSON[];
-    from: import("./service.js").EmailData;
+    html: string;
+    to: ({
+        name: string;
+        email: string;
+    } | EmailData)[] | {
+        name: string;
+        email: string;
+    } | EmailData;
+    cc: ({
+        name: string;
+        email: string;
+    } | EmailData)[] | {
+        name: string;
+        email: string;
+    } | EmailData;
+    bcc: ({
+        name: string;
+        email: string;
+    } | EmailData)[] | {
+        name: string;
+        email: string;
+    } | EmailData;
 } | {
-    to: EmailData | EmailData[];
-    cc: EmailData | EmailData[];
-    bcc: EmailData | EmailData[];
+    from: EmailData;
     replyTo?: EmailData;
-    sendAt?: number;
     subject?: string;
-    text?: string;
-    html?: string;
-    templateId: string;
-    personalizations?: import("@sendgrid/helpers/classes/personalization.js").PersonalizationData[];
-    attachments?: import("@sendgrid/helpers/classes/attachment.js").AttachmentData[];
-    ipPoolName?: string;
-    batchId?: string;
-    sections?: {
-        [key: string]: string;
-    };
-    headers?: {
-        [key: string]: string;
-    };
-    categories?: string[];
-    category?: string;
-    customArgs?: {
-        [key: string]: any;
-    };
-    asm?: import("@sendgrid/helpers/classes/mail.js").ASMOptions;
-    mailSettings?: import("@sendgrid/helpers/classes/mail.js").MailSettings;
-    trackingSettings?: import("@sendgrid/helpers/classes/mail.js").TrackingSettings;
-    substitutions?: {
-        [key: string]: string;
-    };
-    substitutionWrappers?: string[];
     isMultiple?: boolean;
-    dynamicTemplateData?: {
-        [key: string]: any;
-    };
-    hideWarnings?: boolean;
-    replyToList?: import("@sendgrid/helpers/classes/email-address.js").EmailJSON | import("@sendgrid/helpers/classes/email-address.js").EmailJSON[];
-    from: import("./service.js").EmailData;
+    templateId: string;
+    to: ({
+        name: string;
+        email: string;
+    } | EmailData)[] | {
+        name: string;
+        email: string;
+    } | EmailData;
+    cc: ({
+        name: string;
+        email: string;
+    } | EmailData)[] | {
+        name: string;
+        email: string;
+    } | EmailData;
+    bcc: ({
+        name: string;
+        email: string;
+    } | EmailData)[] | {
+        name: string;
+        email: string;
+    } | EmailData;
 } | {
-    to: EmailData | EmailData[];
-    cc: EmailData | EmailData[];
-    bcc: EmailData | EmailData[];
+    from: EmailData;
     replyTo?: EmailData;
-    sendAt?: number;
     subject?: string;
-    text?: string;
-    html?: string;
-    templateId?: string;
-    personalizations?: import("@sendgrid/helpers/classes/personalization.js").PersonalizationData[];
-    attachments?: import("@sendgrid/helpers/classes/attachment.js").AttachmentData[];
-    ipPoolName?: string;
-    batchId?: string;
-    sections?: {
-        [key: string]: string;
-    };
-    headers?: {
-        [key: string]: string;
-    };
-    categories?: string[];
-    category?: string;
-    customArgs?: {
-        [key: string]: any;
-    };
-    asm?: import("@sendgrid/helpers/classes/mail.js").ASMOptions;
-    mailSettings?: import("@sendgrid/helpers/classes/mail.js").MailSettings;
-    trackingSettings?: import("@sendgrid/helpers/classes/mail.js").TrackingSettings;
-    substitutions?: {
-        [key: string]: string;
-    };
-    substitutionWrappers?: string[];
     isMultiple?: boolean;
-    dynamicTemplateData?: {
-        [key: string]: any;
-    };
-    hideWarnings?: boolean;
-    replyToList?: import("@sendgrid/helpers/classes/email-address.js").EmailJSON | import("@sendgrid/helpers/classes/email-address.js").EmailJSON[];
-    from: import("./service.js").EmailData;
-    content: Array.NonEmptyReadonlyArray<MailContent>;
+    content: Array.NonEmptyReadonlyArray<import("effect-app/Emailer").EmailContentPart>;
+    to: ({
+        name: string;
+        email: string;
+    } | EmailData)[] | {
+        name: string;
+        email: string;
+    } | EmailData;
+    cc: ({
+        name: string;
+        email: string;
+    } | EmailData)[] | {
+        name: string;
+        email: string;
+    } | EmailData;
+    bcc: ({
+        name: string;
+        email: string;
+    } | EmailData)[] | {
+        name: string;
+        email: string;
+    } | EmailData;
 };
 /**
  * @hidden

package/dist/Emailer/Sendgrid.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Sendgrid.d.ts","sourceRoot":"","sources":["../../src/Emailer/Sendgrid.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4CAA4C,CAAA;AAC3E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAA;AAEpE,OAAO,EAAE,KAAK,EAAiC,MAAM,YAAY,CAAA;AAIjE,OAAO,EAAE,OAAO,EAAE,KAAK,QAAQ,EAA6B,KAAK,cAAc,EAAiB,MAAM,cAAc,CAAA;AAwDpH,wBAAgB,QAAQ,CAAC,MAAM,EAAE,cAAc,uDAE9C;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,SAAS,EAAE,OAAO,SAWpC,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAOnB;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,EAAE,EAAE,SAAS,WAO1C"}
+{"version":3,"file":"Sendgrid.d.ts","sourceRoot":"","sources":["../../src/Emailer/Sendgrid.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AAEzC,OAAO,EAAE,KAAK,SAAS,EAAE,OAAO,EAAE,KAAK,QAAQ,EAA4C,MAAM,oBAAoB,CAAA;AAGrH,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAI3C,MAAM,WAAW,cAAc;IAC7B,cAAc,CAAC,EAAE,SAAS,CAAA;IAC1B,aAAa,EAAE,MAAM,CAAA;IACrB,QAAQ,EAAE,OAAO,CAAA;IACjB,WAAW,EAAE,SAAS,CAAA;IACtB,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAA;IACzB;;;;;OAKG;IACH,eAAe,EAAE,MAAM,CAAA;CACxB;AA6DD,wBAAgB,QAAQ,CAAC,MAAM,EAAE,cAAc,uDAE9C;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,SAAS,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,SAY7D,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAOnB;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,EAAE,EAAE,SAAS,WAO1C"}