effect 4.0.0-beta.6 → 4.0.0-beta.62

package/dist/unstable/cluster/ClusterCron.js

@@ -38,7 +38,7 @@ export const make = options => {
   }), {
     shardGroup: options.shardGroup
   });
-  const skipIfOlderThan = Option.fromUndefinedOr(options.skipIfOlderThan).pipe(Option.map(Duration.fromDurationInputUnsafe), Option.getOrElse(() => Duration.days(1)));
+  const skipIfOlderThan = Option.fromUndefinedOr(options.skipIfOlderThan).pipe(Option.map(Duration.fromInputUnsafe), Option.getOrElse(() => Duration.days(1)));
   const effect = Effect.fnUntraced(function* (dateTime) {
     const now = yield* DateTime.now;
     if (DateTime.isLessThan(dateTime, DateTime.subtractDuration(now, skipIfOlderThan))) {

package/dist/unstable/cluster/ClusterCron.js.map

@@ -1 +1 @@
-{"version":3,"file":"ClusterCron.js","names":["Cron","DateTime","Duration","Effect","Exit","Layer","Option","PrimaryKey","Schedule","Schema","Rpc","ClusterSchema","Persisted","Uninterruptible","DeliverAt","Entity","Singleton","make","options","CronEntity","name","payload","CronPayload","annotate","ShardGroup","shardGroup","ClientTracingEnabled","InitialRun","gen","now","next","fromDateUnsafe","cron","entityId","calculateNextRunFromPrevious","formatIso","client","run","dateTime","discard","skipIfOlderThan","fromUndefinedOr","pipe","map","fromDurationInputUnsafe","getOrElse","days","effect","fnUntraced","isLessThan","subtractDuration","execute","orDie","EntityLayer","toLayer","makeClient","request","onExitPrimitive","exit","isFailure","logWarning","cause","tapCause","sandbox","retry","retryPolicy","annotateLogs","module","merge","exponential","either","spaced","Class","DateTimeUtc","symbol"],"sources":["../../../src/unstable/cluster/ClusterCron.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"ClusterCron.js","names":["Cron","DateTime","Duration","Effect","Exit","Layer","Option","PrimaryKey","Schedule","Schema","Rpc","ClusterSchema","Persisted","Uninterruptible","DeliverAt","Entity","Singleton","make","options","CronEntity","name","payload","CronPayload","annotate","ShardGroup","shardGroup","ClientTracingEnabled","InitialRun","gen","now","next","fromDateUnsafe","cron","entityId","calculateNextRunFromPrevious","formatIso","client","run","dateTime","discard","skipIfOlderThan","fromUndefinedOr","pipe","map","fromInputUnsafe","getOrElse","days","effect","fnUntraced","isLessThan","subtractDuration","execute","orDie","EntityLayer","toLayer","makeClient","request","onExitPrimitive","exit","isFailure","logWarning","cause","tapCause","sandbox","retry","retryPolicy","annotateLogs","module","merge","exponential","either","spaced","Class","DateTimeUtc","symbol"],"sources":["../../../src/unstable/cluster/ClusterCron.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/unstable/cluster/ClusterError.d.ts

@@ -8,7 +8,7 @@ import { EntityAddress } from "./EntityAddress.ts";
 import { RunnerAddress } from "./RunnerAddress.ts";
 import { SnowflakeFromString } from "./Snowflake.ts";
 declare const TypeId = "~effect/cluster/ClusterError";
-declare const EntityNotAssignedToRunner_base: Schema.ErrorClass<EntityNotAssignedToRunner, Schema.Struct<{
+declare const EntityNotAssignedToRunner_base: Schema.Class<EntityNotAssignedToRunner, Schema.Struct<{
     readonly _tag: Schema.tag<"EntityNotAssignedToRunner">;
     readonly address: typeof EntityAddress;
 }>, Cause.YieldableError>;
@@ -29,7 +29,7 @@ export declare class EntityNotAssignedToRunner extends EntityNotAssignedToRunner
      */
     static is(u: unknown): u is EntityNotAssignedToRunner;
 }
-declare const MalformedMessage_base: Schema.ErrorClass<MalformedMessage, Schema.Struct<{
+declare const MalformedMessage_base: Schema.Class<MalformedMessage, Schema.Struct<{
     readonly _tag: Schema.tag<"MalformedMessage">;
     readonly cause: Schema.Defect;
 }>, Cause.YieldableError>;
@@ -54,7 +54,7 @@ export declare class MalformedMessage extends MalformedMessage_base {
      */
     static refail: <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, MalformedMessage, R>;
 }
-declare const PersistenceError_base: Schema.ErrorClass<PersistenceError, Schema.Struct<{
+declare const PersistenceError_base: Schema.Class<PersistenceError, Schema.Struct<{
     readonly _tag: Schema.tag<"PersistenceError">;
     readonly cause: Schema.Defect;
 }>, Cause.YieldableError>;
@@ -75,7 +75,7 @@ export declare class PersistenceError extends PersistenceError_base {
      */
     static refail<A, E, R>(effect: Effect.Effect<A, E, R>): Effect.Effect<A, PersistenceError, R>;
 }
-declare const RunnerNotRegistered_base: Schema.ErrorClass<RunnerNotRegistered, Schema.Struct<{
+declare const RunnerNotRegistered_base: Schema.Class<RunnerNotRegistered, Schema.Struct<{
     readonly _tag: Schema.tag<"RunnerNotRegistered">;
     readonly address: typeof RunnerAddress;
 }>, Cause.YieldableError>;
@@ -92,7 +92,7 @@ export declare class RunnerNotRegistered extends RunnerNotRegistered_base {
      */
     readonly [TypeId] = "~effect/cluster/ClusterError";
 }
-declare const RunnerUnavailable_base: Schema.ErrorClass<RunnerUnavailable, Schema.Struct<{
+declare const RunnerUnavailable_base: Schema.Class<RunnerUnavailable, Schema.Struct<{
     readonly _tag: Schema.tag<"RunnerUnavailable">;
     readonly address: typeof RunnerAddress;
 }>, Cause.YieldableError>;
@@ -112,7 +112,7 @@ export declare class RunnerUnavailable extends RunnerUnavailable_base {
      */
     static is(u: unknown): u is RunnerUnavailable;
 }
-declare const MailboxFull_base: Schema.ErrorClass<MailboxFull, Schema.Struct<{
+declare const MailboxFull_base: Schema.Class<MailboxFull, Schema.Struct<{
     readonly _tag: Schema.tag<"MailboxFull">;
     readonly address: typeof EntityAddress;
 }>, Cause.YieldableError>;
@@ -132,7 +132,7 @@ export declare class MailboxFull extends MailboxFull_base {
      */
     static is(u: unknown): u is MailboxFull;
 }
-declare const AlreadyProcessingMessage_base: Schema.ErrorClass<AlreadyProcessingMessage, Schema.Struct<{
+declare const AlreadyProcessingMessage_base: Schema.Class<AlreadyProcessingMessage, Schema.Struct<{
     readonly _tag: Schema.tag<"AlreadyProcessingMessage">;
     readonly envelopeId: SnowflakeFromString;
     readonly address: typeof EntityAddress;

package/dist/unstable/cluster/ClusterSchema.d.ts

@@ -1,33 +1,54 @@
-import * as ServiceMap from "../../ServiceMap.ts";
+/**
+ * @since 4.0.0
+ */
+import * as Context from "../../Context.ts";
+import type * as Rpc from "../rpc/Rpc.ts";
 import type { EntityId } from "./EntityId.ts";
+import type { Request } from "./Envelope.ts";
+/**
+ * @since 4.0.0
+ * @category Annotations
+ */
+export declare const Persisted: Context.Reference<boolean>;
+/**
+ * Whether to wrap the request with a storage transaction, so sql queries are
+ * committed atomically.
+ *
+ * @since 4.0.0
+ * @category Annotations
+ */
+export declare const WithTransaction: Context.Reference<boolean>;
 /**
  * @since 4.0.0
  * @category Annotations
  */
-export declare const Persisted: ServiceMap.Reference<boolean>;
+export declare const Uninterruptible: Context.Reference<boolean | "server" | "client">;
 /**
  * @since 4.0.0
  * @category Annotations
  */
-export declare const Uninterruptible: ServiceMap.Reference<boolean | "server" | "client">;
+export declare const isUninterruptibleForServer: (context: Context.Context<never>) => boolean;
 /**
  * @since 4.0.0
  * @category Annotations
  */
-export declare const isUninterruptibleForServer: (context: ServiceMap.ServiceMap<never>) => boolean;
+export declare const isUninterruptibleForClient: (context: Context.Context<never>) => boolean;
 /**
  * @since 4.0.0
  * @category Annotations
  */
-export declare const isUninterruptibleForClient: (context: ServiceMap.ServiceMap<never>) => boolean;
+export declare const ShardGroup: Context.Reference<(entityId: EntityId) => string>;
 /**
  * @since 4.0.0
  * @category Annotations
  */
-export declare const ShardGroup: ServiceMap.Reference<(entityId: EntityId) => string>;
+export declare const ClientTracingEnabled: Context.Reference<boolean>;
 /**
+ * Dynamically transform the request annotations based on the request.
+ * This only applies to the requests handled by the Entity, not the client.
+ *
  * @since 4.0.0
  * @category Annotations
  */
-export declare const ClientTracingEnabled: ServiceMap.Reference<boolean>;
+export declare const Dynamic: Context.Reference<(annotations: Context.Context<never>, request: Request<Rpc.AnyWithProps>) => Context.Context<never>>;
 //# sourceMappingURL=ClusterSchema.d.ts.map

package/dist/unstable/cluster/ClusterSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClusterSchema.d.ts","sourceRoot":"","sources":["../../../src/unstable/cluster/ClusterSchema.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,UAAU,MAAM,qBAAqB,CAAA;AACjD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAE7C;;;GAGG;AACH,eAAO,MAAM,SAAS,+BAEpB,CAAA;AAEF;;;GAGG;AACH,eAAO,MAAM,eAAe,qDAG3B,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,0BAA0B,GAAI,SAAS,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,KAAG,OAGlF,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,0BAA0B,GAAI,SAAS,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,KAAG,OAGlF,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,UAAU,kCAAmC,QAAQ,KAAK,MAAM,CAG5E,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,oBAAoB,+BAE/B,CAAA"}
+{"version":3,"file":"ClusterSchema.d.ts","sourceRoot":"","sources":["../../../src/unstable/cluster/ClusterSchema.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAA;AAE3C,OAAO,KAAK,KAAK,GAAG,MAAM,eAAe,CAAA;AACzC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAE5C;;;GAGG;AACH,eAAO,MAAM,SAAS,4BAEpB,CAAA;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,4BAG3B,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,eAAe,kDAG3B,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,0BAA0B,GAAI,SAAS,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,KAAG,OAG5E,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,0BAA0B,GAAI,SAAS,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,KAAG,OAG5E,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,UAAU,+BAAgC,QAAQ,KAAK,MAAM,CAGzE,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,oBAAoB,4BAE/B,CAAA;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,OAAO,kCACJ,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAIpG,CAAA"}

package/dist/unstable/cluster/ClusterSchema.js

@@ -1,20 +1,30 @@
 /**
  * @since 4.0.0
  */
-import { constFalse, constTrue } from "../../Function.js";
-import * as ServiceMap from "../../ServiceMap.js";
+import * as Context from "../../Context.js";
+import { constFalse, constTrue, identity } from "../../Function.js";
 /**
  * @since 4.0.0
  * @category Annotations
  */
-export const Persisted = /*#__PURE__*/ServiceMap.Reference("effect/cluster/ClusterSchema/Persisted", {
+export const Persisted = /*#__PURE__*/Context.Reference("effect/cluster/ClusterSchema/Persisted", {
   defaultValue: constFalse
 });
 /**
+ * Whether to wrap the request with a storage transaction, so sql queries are
+ * committed atomically.
+ *
  * @since 4.0.0
  * @category Annotations
  */
-export const Uninterruptible = /*#__PURE__*/ServiceMap.Reference("effect/cluster/ClusterSchema/Uninterruptible", {
+export const WithTransaction = /*#__PURE__*/Context.Reference("effect/cluster/ClusterSchema/WithTransaction", {
+  defaultValue: constFalse
+});
+/**
+ * @since 4.0.0
+ * @category Annotations
+ */
+export const Uninterruptible = /*#__PURE__*/Context.Reference("effect/cluster/ClusterSchema/Uninterruptible", {
   defaultValue: constFalse
 });
 /**
@@ -22,7 +32,7 @@ export const Uninterruptible = /*#__PURE__*/ServiceMap.Reference("effect/cluster
  * @category Annotations
  */
 export const isUninterruptibleForServer = context => {
-  const value = ServiceMap.get(context, Uninterruptible);
+  const value = Context.get(context, Uninterruptible);
   return value === true || value === "server";
 };
 /**
@@ -30,21 +40,31 @@ export const isUninterruptibleForServer = context => {
  * @category Annotations
  */
 export const isUninterruptibleForClient = context => {
-  const value = ServiceMap.get(context, Uninterruptible);
+  const value = Context.get(context, Uninterruptible);
   return value === true || value === "client";
 };
 /**
  * @since 4.0.0
  * @category Annotations
  */
-export const ShardGroup = /*#__PURE__*/ServiceMap.Reference("effect/cluster/ClusterSchema/ShardGroup", {
+export const ShardGroup = /*#__PURE__*/Context.Reference("effect/cluster/ClusterSchema/ShardGroup", {
   defaultValue: () => _ => "default"
 });
 /**
  * @since 4.0.0
  * @category Annotations
  */
-export const ClientTracingEnabled = /*#__PURE__*/ServiceMap.Reference("effect/cluster/ClusterSchema/ClientTracingEnabled", {
+export const ClientTracingEnabled = /*#__PURE__*/Context.Reference("effect/cluster/ClusterSchema/ClientTracingEnabled", {
   defaultValue: constTrue
 });
+/**
+ * Dynamically transform the request annotations based on the request.
+ * This only applies to the requests handled by the Entity, not the client.
+ *
+ * @since 4.0.0
+ * @category Annotations
+ */
+export const Dynamic = /*#__PURE__*/Context.Reference("effect/cluster/ClusterSchema/Dynamic", {
+  defaultValue: () => identity
+});
 //# sourceMappingURL=ClusterSchema.js.map

package/dist/unstable/cluster/ClusterSchema.js.map

@@ -1 +1 @@
-{"version":3,"file":"ClusterSchema.js","names":["constFalse","constTrue","ServiceMap","Persisted","Reference","defaultValue","Uninterruptible","isUninterruptibleForServer","context","value","get","isUninterruptibleForClient","ShardGroup","_","ClientTracingEnabled"],"sources":["../../../src/unstable/cluster/ClusterSchema.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,SAASA,UAAU,EAAEC,SAAS,QAAQ,mBAAmB;AACzD,OAAO,KAAKC,UAAU,MAAM,qBAAqB;AAGjD;;;;AAIA,OAAO,MAAMC,SAAS,gBAAGD,UAAU,CAACE,SAAS,CAAU,wCAAwC,EAAE;EAC/FC,YAAY,EAAEL;CACf,CAAC;AAEF;;;;AAIA,OAAO,MAAMM,eAAe,gBAAGJ,UAAU,CAACE,SAAS,CACjD,8CAA8C,EAC9C;EAAEC,YAAY,EAAEL;AAAU,CAAE,CAC7B;AAED;;;;AAIA,OAAO,MAAMO,0BAA0B,GAAIC,OAAqC,IAAa;EAC3F,MAAMC,KAAK,GAAGP,UAAU,CAACQ,GAAG,CAACF,OAAO,EAAEF,eAAe,CAAC;EACtD,OAAOG,KAAK,KAAK,IAAI,IAAIA,KAAK,KAAK,QAAQ;AAC7C,CAAC;AAED;;;;AAIA,OAAO,MAAME,0BAA0B,GAAIH,OAAqC,IAAa;EAC3F,MAAMC,KAAK,GAAGP,UAAU,CAACQ,GAAG,CAACF,OAAO,EAAEF,eAAe,CAAC;EACtD,OAAOG,KAAK,KAAK,IAAI,IAAIA,KAAK,KAAK,QAAQ;AAC7C,CAAC;AAED;;;;AAIA,OAAO,MAAMG,UAAU,gBAAGV,UAAU,CAACE,SAAS,CAC5C,yCAAyC,EACzC;EAAEC,YAAY,EAAEA,CAAA,KAAOQ,CAAC,IAAK;AAAS,CAAE,CACzC;AAED;;;;AAIA,OAAO,MAAMC,oBAAoB,gBAAGZ,UAAU,CAACE,SAAS,CAAU,mDAAmD,EAAE;EACrHC,YAAY,EAAEJ;CACf,CAAC","ignoreList":[]}
+{"version":3,"file":"ClusterSchema.js","names":["Context","constFalse","constTrue","identity","Persisted","Reference","defaultValue","WithTransaction","Uninterruptible","isUninterruptibleForServer","context","value","get","isUninterruptibleForClient","ShardGroup","_","ClientTracingEnabled","Dynamic"],"sources":["../../../src/unstable/cluster/ClusterSchema.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,OAAO,KAAKA,OAAO,MAAM,kBAAkB;AAC3C,SAASC,UAAU,EAAEC,SAAS,EAAEC,QAAQ,QAAQ,mBAAmB;AAKnE;;;;AAIA,OAAO,MAAMC,SAAS,gBAAGJ,OAAO,CAACK,SAAS,CAAU,wCAAwC,EAAE;EAC5FC,YAAY,EAAEL;CACf,CAAC;AAEF;;;;;;;AAOA,OAAO,MAAMM,eAAe,gBAAGP,OAAO,CAACK,SAAS,CAC9C,8CAA8C,EAC9C;EAAEC,YAAY,EAAEL;AAAU,CAAE,CAC7B;AAED;;;;AAIA,OAAO,MAAMO,eAAe,gBAAGR,OAAO,CAACK,SAAS,CAC9C,8CAA8C,EAC9C;EAAEC,YAAY,EAAEL;AAAU,CAAE,CAC7B;AAED;;;;AAIA,OAAO,MAAMQ,0BAA0B,GAAIC,OAA+B,IAAa;EACrF,MAAMC,KAAK,GAAGX,OAAO,CAACY,GAAG,CAACF,OAAO,EAAEF,eAAe,CAAC;EACnD,OAAOG,KAAK,KAAK,IAAI,IAAIA,KAAK,KAAK,QAAQ;AAC7C,CAAC;AAED;;;;AAIA,OAAO,MAAME,0BAA0B,GAAIH,OAA+B,IAAa;EACrF,MAAMC,KAAK,GAAGX,OAAO,CAACY,GAAG,CAACF,OAAO,EAAEF,eAAe,CAAC;EACnD,OAAOG,KAAK,KAAK,IAAI,IAAIA,KAAK,KAAK,QAAQ;AAC7C,CAAC;AAED;;;;AAIA,OAAO,MAAMG,UAAU,gBAAGd,OAAO,CAACK,SAAS,CACzC,yCAAyC,EACzC;EAAEC,YAAY,EAAEA,CAAA,KAAOS,CAAC,IAAK;AAAS,CAAE,CACzC;AAED;;;;AAIA,OAAO,MAAMC,oBAAoB,gBAAGhB,OAAO,CAACK,SAAS,CAAU,mDAAmD,EAAE;EAClHC,YAAY,EAAEJ;CACf,CAAC;AAEF;;;;;;;AAOA,OAAO,MAAMe,OAAO,gBAAGjB,OAAO,CAACK,SAAS,CAGtC,sCAAsC,EACtC;EAAEC,YAAY,EAAEA,CAAA,KAAMH;AAAQ,CAAE,CACjC","ignoreList":[]}

package/dist/unstable/cluster/ClusterWorkflowEngine.d.ts

@@ -1,6 +1,7 @@
 import * as Effect from "../../Effect.ts";
 import * as Exit from "../../Exit.ts";
 import * as Layer from "../../Layer.ts";
+import * as Option from "../../Option.ts";
 import * as Schedule from "../../Schedule.ts";
 import * as Schema from "../../Schema.ts";
 import type * as Scope from "../../Scope.ts";
@@ -23,11 +24,12 @@ export declare const make: Effect.Effect<{
         readonly discard?: Discard | undefined;
         readonly suspendedRetrySchedule?: Schedule.Schedule<any, unknown> | undefined;
     }) => Effect.Effect<Discard extends true ? string : Success["Type"], Error["Type"], Payload["EncodingServices"] | Success["DecodingServices"] | Error["DecodingServices"]>;
-    readonly poll: <Name extends string, Payload extends Workflow.AnyStructSchema, Success extends Schema.Top, Error extends Schema.Top>(workflow: Workflow.Workflow<Name, Payload, Success, Error>, executionId: string) => Effect.Effect<Workflow.Result<Success["Type"], Error["Type"]> | undefined, never, Success["DecodingServices"] | Error["DecodingServices"]>;
+    readonly poll: <Name extends string, Payload extends Workflow.AnyStructSchema, Success extends Schema.Top, Error extends Schema.Top>(workflow: Workflow.Workflow<Name, Payload, Success, Error>, executionId: string) => Effect.Effect<Option.Option<Workflow.Result<Success["Type"], Error["Type"]>>, never, Success["DecodingServices"] | Error["DecodingServices"]>;
     readonly interrupt: (workflow: Workflow.Any, executionId: string) => Effect.Effect<void>;
+    readonly interruptUnsafe: (workflow: Workflow.Any, executionId: string) => Effect.Effect<void>;
     readonly resume: (workflow: Workflow.Any, executionId: string) => Effect.Effect<void>;
     readonly activityExecute: <Success extends Schema.Top, Error extends Schema.Top, R>(activity: Activity.Activity<Success, Error, R>, attempt: number) => Effect.Effect<Workflow.Result<Success["Type"], Error["Type"]>, never, Success["DecodingServices"] | Error["DecodingServices"] | R | WorkflowEngine.WorkflowInstance>;
-    readonly deferredResult: <Success extends Schema.Top, Error extends Schema.Top>(deferred: DurableDeferred.DurableDeferred<Success, Error>) => Effect.Effect<Exit.Exit<Success["Type"], Error["Type"]> | undefined, never, WorkflowEngine.WorkflowInstance>;
+    readonly deferredResult: <Success extends Schema.Top, Error extends Schema.Top>(deferred: DurableDeferred.DurableDeferred<Success, Error>) => Effect.Effect<Option.Option<Exit.Exit<Success["Type"], Error["Type"]>>, never, WorkflowEngine.WorkflowInstance>;
     readonly deferredDone: <Success extends Schema.Top, Error extends Schema.Top>(deferred: DurableDeferred.DurableDeferred<Success, Error>, options: {
         readonly workflowName: string;
         readonly executionId: string;

package/dist/unstable/cluster/ClusterWorkflowEngine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClusterWorkflowEngine.d.ts","sourceRoot":"","sources":["../../../src/unstable/cluster/ClusterWorkflowEngine.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAA;AACzC,OAAO,KAAK,IAAI,MAAM,eAAe,CAAA;AAGrC,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAA;AAIvC,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAA;AAC7C,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAA;AACzC,OAAO,KAAK,KAAK,KAAK,MAAM,gBAAgB,CAAA;AAI5C,OAAO,KAAK,QAAQ,MAAM,yBAAyB,CAAA;AACnD,OAAO,KAAK,YAAY,MAAM,6BAA6B,CAAA;AAC3D,OAAO,KAAK,eAAe,MAAM,gCAAgC,CAAA;AACjE,OAAO,KAAK,QAAQ,MAAM,yBAAyB,CAAA;AACnD,OAAO,KAAK,cAAc,MAAM,+BAA+B,CAAA;AAO/D,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAGpD,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAA;AAGzC;;;GAGG;AACH,eAAO,MAAM,IAAI;;;;;wBAiBe,CAAC;uCAIzB,CAAN;;;;;;;;;;;;;;;;;2DAicA,CAAA;AA0HF;;;GAGG;AACH,eAAO,MAAM,KAAK,EAAE,KAAK,CAAC,KAAK,CAC7B,cAAc,CAAC,cAAc,EAC7B,KAAK,EACL,QAAQ,CAAC,QAAQ,GAAG,cAAc,CAGnC,CAAA"}
+{"version":3,"file":"ClusterWorkflowEngine.d.ts","sourceRoot":"","sources":["../../../src/unstable/cluster/ClusterWorkflowEngine.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAA;AACzC,OAAO,KAAK,IAAI,MAAM,eAAe,CAAA;AAGrC,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAA;AAIzC,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAA;AAC7C,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAA;AACzC,OAAO,KAAK,KAAK,KAAK,MAAM,gBAAgB,CAAA;AAG5C,OAAO,KAAK,QAAQ,MAAM,yBAAyB,CAAA;AACnD,OAAO,KAAK,YAAY,MAAM,6BAA6B,CAAA;AAC3D,OAAO,KAAK,eAAe,MAAM,gCAAgC,CAAA;AACjE,OAAO,KAAK,QAAQ,MAAM,yBAAyB,CAAA;AACnD,OAAO,KAAK,cAAc,MAAM,+BAA+B,CAAA;AAS/D,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAGpD,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAA;AAGzC;;;GAGG;AACH,eAAO,MAAM,IAAI;;;;;wBAiBa,CAAC;uCAIvB,CAAR;;;;;;;;;;;;;;;;;;2DAkfE,CAAA;AAoIF;;;GAGG;AACH,eAAO,MAAM,KAAK,EAAE,KAAK,CAAC,KAAK,CAC7B,cAAc,CAAC,cAAc,EAC7B,KAAK,EACL,QAAQ,CAAC,QAAQ,GAAG,cAAc,CAGnC,CAAA"}

package/dist/unstable/cluster/ClusterWorkflowEngine.js

@@ -1,6 +1,7 @@
 /**
  * @since 4.0.0
  */
+import * as Context from "../../Context.js";
 import * as DateTime from "../../DateTime.js";
 import * as Duration from "../../Duration.js";
 import * as Effect from "../../Effect.js";
@@ -8,13 +9,13 @@ import * as Exit from "../../Exit.js";
 import * as Fiber from "../../Fiber.js";
 import * as Latch from "../../Latch.js";
 import * as Layer from "../../Layer.js";
+import * as Option from "../../Option.js";
 import * as PrimaryKey from "../../PrimaryKey.js";
 import * as RcMap from "../../RcMap.js";
 import * as Schedule from "../../Schedule.js";
 import * as Schema from "../../Schema.js";
-import * as ServiceMap from "../../ServiceMap.js";
 import * as Rpc from "../rpc/Rpc.js";
-import * as RpcServer from "../rpc/RpcServer.js";
+import { ClientAbort } from "../rpc/RpcSchema.js";
 import * as Activity from "../workflow/Activity.js";
 import * as DurableClock from "../workflow/DurableClock.js";
 import * as DurableDeferred from "../workflow/DurableDeferred.js";
@@ -26,6 +27,8 @@ import * as Entity from "./Entity.js";
 import * as EntityAddress from "./EntityAddress.js";
 import * as EntityId from "./EntityId.js";
 import * as EntityType from "./EntityType.js";
+import * as Envelope from "./Envelope.js";
+import * as Message from "./Message.js";
 import { MessageStorage } from "./MessageStorage.js";
 import * as Reply from "./Reply.js";
 import * as Sharding from "./Sharding.js";
@@ -78,14 +81,17 @@ export const make = /*#__PURE__*/Effect.gen(function* () {
     idleTimeToLive: "5 minutes"
   });
   const clockClient = yield* ClockEntity.client;
-  const requestIdFor = Effect.fnUntraced(function* (options) {
-    const shardGroup = ServiceMap.get(options.workflow.annotations, ClusterSchema.ShardGroup)(options.executionId);
+  const entityAddressFor = options => {
+    const shardGroup = Context.get(options.workflow.annotations, ClusterSchema.ShardGroup)(options.executionId);
     const entityId = EntityId.make(options.executionId);
-    const address = EntityAddress.make({
+    return EntityAddress.make({
       entityType: EntityType.make(options.entityType),
       entityId,
       shardId: sharding.getShardId(entityId, shardGroup)
     });
+  };
+  const requestIdFor = Effect.fnUntraced(function* (options) {
+    const address = entityAddressFor(options);
     return yield* storage.requestIdForPrimaryKey({
       address,
       tag: options.tag,
@@ -96,15 +102,16 @@ export const make = /*#__PURE__*/Effect.gen(function* () {
     const replies = yield* storage.repliesForUnfiltered([requestId]);
     const last = replies[replies.length - 1];
     if (last && last._tag === "WithExit") {
-      return last;
+      return Option.some(last);
     }
+    return Option.none();
   });
   const requestReply = Effect.fnUntraced(function* (options) {
     const requestId = yield* requestIdFor(options);
-    if (requestId === undefined) {
-      return undefined;
+    if (Option.isNone(requestId)) {
+      return Option.none();
     }
-    return yield* replyForRequestId(requestId);
+    return yield* replyForRequestId(requestId.value);
   });
   const resetActivityAttempt = Effect.fnUntraced(function* (options) {
     const requestId = yield* requestIdFor({
@@ -114,14 +121,14 @@ export const make = /*#__PURE__*/Effect.gen(function* () {
       tag: "activity",
       id: activityPrimaryKey(options.activity.name, options.attempt)
     });
-    if (requestId === undefined) return;
-    yield* sharding.reset(requestId);
+    if (Option.isNone(requestId)) return;
+    yield* sharding.reset(requestId.value);
   }, Effect.retry({
     times: 3,
     schedule: Schedule.exponential(250)
   }), Effect.orDie);
   const clearClock = Effect.fnUntraced(function* (options) {
-    const shardGroup = ServiceMap.get(options.workflow.annotations, ClusterSchema.ShardGroup)(options.executionId);
+    const shardGroup = Context.get(options.workflow.annotations, ClusterSchema.ShardGroup)(options.executionId);
     const entityId = EntityId.make(options.executionId);
     const shardId = sharding.getShardId(entityId, shardGroup);
     const clockAddress = EntityAddress.make({
@@ -139,9 +146,9 @@ export const make = /*#__PURE__*/Effect.gen(function* () {
       tag: "run",
       id: ""
     });
-    const maybeSuspended = maybeReply && maybeReply.exit._tag === "Success" && maybeReply.exit.value._tag === "Suspended" ? maybeReply : undefined;
-    if (maybeSuspended === undefined) return;
-    yield* sharding.reset(Snowflake.Snowflake(maybeSuspended.requestId));
+    const maybeSuspended = Option.filter(maybeReply, reply => reply.exit._tag === "Success" && reply.exit.value._tag === "Suspended");
+    if (Option.isNone(maybeSuspended)) return;
+    yield* sharding.reset(Snowflake.Snowflake(maybeSuspended.value.requestId));
     yield* sharding.pollStorage;
   });
   const sendResumeParent = Effect.fnUntraced(function* (options) {
@@ -152,16 +159,45 @@ export const make = /*#__PURE__*/Effect.gen(function* () {
       tag: "resume",
       id: ""
     });
-    if (requestId === undefined) {
+    if (Option.isNone(requestId)) {
       const client = (yield* RcMap.get(clientsPartial, options.workflowName))(options.executionId);
       return yield* client.resume({}, {
         discard: true
       });
     }
-    const reply = yield* replyForRequestId(requestId);
-    if (reply === undefined) return;
-    yield* sharding.reset(requestId);
+    const reply = yield* replyForRequestId(requestId.value);
+    if (Option.isNone(reply)) return;
+    yield* sharding.reset(requestId.value);
   }, Effect.scoped);
+  const interrupt = Effect.fnUntraced(function* (workflow, executionId) {
+    ensureEntity(workflow);
+    const requestId = yield* requestIdFor({
+      workflow,
+      entityType: `Workflow/${workflow.name}`,
+      executionId,
+      tag: "run",
+      id: ""
+    });
+    if (Option.isNone(requestId)) {
+      return Option.none();
+    }
+    const reply = yield* replyForRequestId(requestId.value);
+    const nonSuspendedReply = Option.filter(reply, reply => reply.exit._tag !== "Success" || reply.exit.value._tag !== "Suspended");
+    if (Option.isSome(nonSuspendedReply)) {
+      return Option.none();
+    }
+    yield* engine.deferredDone(InterruptSignal, {
+      workflowName: workflow.name,
+      executionId,
+      deferredName: InterruptSignal.name,
+      exit: Exit.void
+    });
+    return requestId;
+  }, Effect.retry({
+    while: e => e._tag === "PersistenceError",
+    times: 3,
+    schedule: Schedule.exponential(250)
+  }), Effect.orDie);
   const engine = WorkflowEngine.makeUnsafe({
     register: (workflow, execute) => Effect.suspend(() => sharding.registerEntity(ensureEntity(workflow), Effect.gen(function* () {
       const address = yield* Entity.CurrentAddress;
@@ -174,13 +210,13 @@ export const make = /*#__PURE__*/Effect.gen(function* () {
           if (payload[payloadParentKey]) {
             parent = payload[payloadParentKey];
           }
-          return execute(workflow.payloadSchema.makeUnsafe(payload), executionId).pipe(Effect.onExit(exit => {
-            const suspendOnFailure = ServiceMap.get(workflow.annotations, Workflow.SuspendOnFailure);
+          return execute(workflow.payloadSchema.make(payload), executionId).pipe(Effect.onExit(exit => {
+            const suspendOnFailure = Context.get(workflow.annotations, Workflow.SuspendOnFailure);
             if (!instance.suspended && !(suspendOnFailure && exit._tag === "Failure")) {
               return parent ? ensureSuccess(sendResumeParent(parent)) : Effect.void;
             }
             return engine.deferredResult(InterruptSignal).pipe(Effect.flatMap(maybeExit => {
-              if (maybeExit === undefined) {
+              if (Option.isNone(maybeExit)) {
                 return Effect.void;
               }
               instance.suspended = false;
@@ -205,14 +241,14 @@ export const make = /*#__PURE__*/Effect.gen(function* () {
               yield* latch.await;
               entry = activities.get(activityId);
             }
-            const contextMap = new Map(entry.services.mapUnsafe);
+            const contextMap = new Map(entry.context.mapUnsafe);
             contextMap.set(Activity.CurrentAttempt.key, payload.attempt);
             contextMap.set(WorkflowEngine.WorkflowInstance.key, instance);
-            return yield* entry.activity.executeEncoded.pipe(Effect.provideServices(ServiceMap.makeUnsafe(contextMap)));
+            return yield* entry.activity.executeEncoded.pipe(Effect.provideContext(Context.makeUnsafe(contextMap)));
           }).pipe(Workflow.intoResult, Effect.catchCause(cause => {
             // we only want to store interrupts as suspends when the
             // client requested it
-            const suspend = cause.reasons.some(f => f._tag === "Interrupt" && f.fiberId === RpcServer.fiberIdClientInterrupt);
+            const suspend = cause.reasons.some(f => f._tag === "Interrupt" && f.annotations.has(ClientAbort.key));
             if (suspend) {
               interruptedActivities.add(activityId);
               return Effect.succeed(new Workflow.Suspended({}));
@@ -260,38 +296,33 @@ export const make = /*#__PURE__*/Effect.gen(function* () {
         tag: "run",
         id: ""
       });
-      if (!reply) return undefined;
-      const exit = yield* Schema.decodeEffect(exitSchema)(reply.exit);
-      return yield* exit;
+      if (Option.isNone(reply)) return Option.none();
+      const exit = yield* Schema.decodeUnknownEffect(exitSchema)(reply.value.exit);
+      return Option.some(yield* exit);
     }, Effect.orDie),
-    interrupt: Effect.fnUntraced(function* (workflow, executionId) {
-      ensureEntity(workflow);
-      const reply = yield* requestReply({
-        workflow,
-        entityType: `Workflow/${workflow.name}`,
-        executionId,
-        tag: "run",
-        id: ""
-      });
-      const nonSuspendedReply = reply && (reply.exit._tag !== "Success" || reply.exit.value._tag !== "Suspended") ? reply : undefined;
-      if (nonSuspendedReply !== undefined) {
-        return;
-      }
-      yield* engine.deferredDone(InterruptSignal, {
-        workflowName: workflow.name,
-        executionId,
-        deferredName: InterruptSignal.name,
-        exit: Exit.void
-      });
-    }, Effect.retry({
-      while: e => e._tag === "PersistenceError",
-      times: 3,
-      schedule: Schedule.exponential(250)
-    }), Effect.orDie),
+    interrupt: (workflow, executionId) => Effect.asVoid(interrupt(workflow, executionId)),
+    interruptUnsafe: Effect.fnUntraced(function* (workflow, executionId) {
+      const requestId = yield* interrupt(workflow, executionId);
+      if (Option.isNone(requestId)) return;
+      const entity = ensureEntity(workflow);
+      const runRpc = entity.protocol.requests.get("run");
+      yield* Effect.orDie(sharding.sendOutgoing(new Message.OutgoingEnvelope({
+        rpc: runRpc,
+        envelope: new Envelope.Interrupt({
+          id: yield* sharding.getSnowflake,
+          address: entityAddressFor({
+            workflow,
+            entityType: `Workflow/${workflow.name}`,
+            executionId
+          }),
+          requestId: requestId.value
+        })
+      }), false));
+    }),
     resume: (workflow, executionId) => ensureSuccess(resume(workflow, executionId)),
     activityExecute: Effect.fnUntraced(function* (activity, attempt) {
-      const services = yield* Effect.services();
-      const instance = ServiceMap.get(services, WorkflowEngine.WorkflowInstance);
+      const services = yield* Effect.context();
+      const instance = Context.get(services, WorkflowEngine.WorkflowInstance);
       yield* Effect.annotateCurrentSpan("executionId", instance.executionId);
       const activityId = `${instance.executionId}/${activity.name}`;
       const client = (yield* RcMap.get(clientsPartial, instance.workflow.name))(instance.executionId);
@@ -299,17 +330,18 @@ export const make = /*#__PURE__*/Effect.gen(function* () {
         if (!activities.has(activityId)) {
           activities.set(activityId, {
             activity,
-            services
+            context: services
           });
           const latch = activityLatches.get(activityId);
           if (latch) {
-            yield* latch.release;
+            yield* latch.open;
             activityLatches.delete(activityId);
           }
         }
         const result = yield* Effect.orDie(client.activity({
           name: activity.name,
-          attempt
+          attempt,
+          withTransaction: Context.get(activity.annotations, ClusterSchema.WithTransaction)
         }));
         // If the activity has suspended and did not execute, we need to resume
         // it by resetting the attempt and re-executing.
@@ -333,11 +365,11 @@ export const make = /*#__PURE__*/Effect.gen(function* () {
       tag: "deferred",
       id: deferred.name
     })), Effect.map(reply => {
-      if (reply === undefined) {
-        return undefined;
+      if (Option.isNone(reply)) {
+        return Option.none();
       }
-      const decoded = decodeDeferredWithExit(reply);
-      return decoded.exit._tag === "Success" ? decoded.exit.value : decoded.exit;
+      const decoded = decodeDeferredWithExit(reply.value);
+      return Option.some(decoded.exit._tag === "Success" ? decoded.exit.value : decoded.exit);
     }), Effect.retry({
       while: e => e._tag === "PersistenceError",
       times: 3,
@@ -377,7 +409,8 @@ const ExitUnknown = /*#__PURE__*/Schema.Exit(AnyOrVoid, AnyOrVoid, Schema.Any);
 const ActivityRpc = /*#__PURE__*/Rpc.make("activity", {
   payload: {
     name: Schema.String,
-    attempt: Schema.Number
+    attempt: Schema.Number,
+    withTransaction: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false)))
   },
   primaryKey: ({
     attempt,
@@ -387,7 +420,7 @@ const ActivityRpc = /*#__PURE__*/Rpc.make("activity", {
     success: AnyOrVoid,
     error: AnyOrVoid
   })
-}).annotate(ClusterSchema.Persisted, true);
+}).annotate(ClusterSchema.Persisted, true).annotate(ClusterSchema.Dynamic, (annotations, request) => request.payload.withTransaction ? Context.add(annotations, ClusterSchema.WithTransaction, true) : annotations);
 const DeferredRpc = /*#__PURE__*/Rpc.make("deferred", {
   payload: {
     name: Schema.String,