@effect/workflow 0.12.4 → 0.13.0

package/dist/esm/WorkflowEngine.js

@@ -1,12 +1,20 @@
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
+import * as Exit from "effect/Exit";
+import * as Fiber from "effect/Fiber";
+import * as FiberMap from "effect/FiberMap";
+import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
+import * as Schedule from "effect/Schedule";
+import * as Schema from "effect/Schema";
+import * as Workflow from "./Workflow.js";
 /**
- * @since 1.0.0
+ * @since 4.0.0
  * @category Services
  */
 export class WorkflowEngine extends /*#__PURE__*/Context.Tag("@effect/workflow/WorkflowEngine")() {}
 /**
- * @since 1.0.0
+ * @since 4.0.0
  * @category Services
  */
 export class WorkflowInstance extends /*#__PURE__*/Context.Tag("@effect/workflow/WorkflowEngine/WorkflowInstance")() {
@@ -24,4 +32,226 @@ export class WorkflowInstance extends /*#__PURE__*/Context.Tag("@effect/workflow
     });
   }
 }
+/**
+ * @since 4.0.0
+ * @category Constructors
+ */
+export const makeUnsafe = options => WorkflowEngine.of({
+  register: Effect.fnUntraced(function* (workflow, execute) {
+    const context = yield* Effect.context();
+    yield* options.register(workflow, (payload, executionId) => Effect.suspend(() => execute(payload, executionId)).pipe(Effect.mapInputContext(input => Context.merge(context, input))));
+  }),
+  execute: Effect.fnUntraced(function* (self, opts) {
+    const payload = opts.payload;
+    const executionId = opts.executionId;
+    const suspendedRetrySchedule = opts.suspendedRetrySchedule ?? defaultRetrySchedule;
+    yield* Effect.annotateCurrentSpan({
+      executionId
+    });
+    let result;
+    // link interruption with parent workflow
+    const parentInstance = yield* Effect.serviceOption(WorkflowInstance);
+    if (Option.isSome(parentInstance)) {
+      const instance = parentInstance.value;
+      yield* Effect.addFinalizer(() => {
+        if (!instance.interrupted || result?._tag === "Complete") {
+          return Effect.void;
+        }
+        return options.interrupt(self, executionId);
+      });
+    }
+    if (opts.discard) {
+      yield* options.execute(self, {
+        executionId,
+        payload: payload,
+        discard: true
+      });
+      return executionId;
+    }
+    const run = options.execute(self, {
+      executionId,
+      payload: payload,
+      discard: false,
+      parent: Option.getOrUndefined(parentInstance)
+    });
+    if (Option.isSome(parentInstance)) {
+      result = yield* Workflow.wrapActivityResult(run, result => result._tag === "Suspended");
+      if (result._tag === "Suspended") {
+        return yield* Workflow.suspend(parentInstance.value);
+      }
+      return yield* result.exit;
+    }
+    let sleep;
+    while (true) {
+      result = yield* run;
+      if (result._tag === "Complete") {
+        return yield* result.exit;
+      }
+      sleep ??= (yield* Schedule.driver(suspendedRetrySchedule)).next(void 0).pipe(Effect.catchAll(() => Effect.dieMessage(`${self.name}.execute: suspendedRetrySchedule exhausted`)));
+      yield* sleep;
+    }
+  }),
+  poll: options.poll,
+  interrupt: options.interrupt,
+  resume: options.resume,
+  activityExecute: Effect.fnUntraced(function* (activity, attempt) {
+    const result = yield* options.activityExecute(activity, attempt);
+    if (result._tag === "Suspended") {
+      return result;
+    }
+    const exit = yield* Effect.orDie(Schema.decode(activity.exitSchema)(result.exit));
+    return new Workflow.Complete({
+      exit
+    });
+  }),
+  deferredResult: Effect.fnUntraced(function* (deferred) {
+    const instance = yield* WorkflowInstance;
+    yield* Effect.annotateCurrentSpan({
+      executionId: instance.executionId
+    });
+    const exit = yield* options.deferredResult(deferred);
+    if (exit === undefined) {
+      return exit;
+    }
+    return yield* Effect.orDie(Schema.decodeUnknown(deferred.exitSchema)(exit));
+  }),
+  deferredDone: Effect.fnUntraced(function* (deferred, opts) {
+    return yield* options.deferredDone({
+      workflowName: opts.workflowName,
+      executionId: opts.executionId,
+      deferredName: opts.deferredName,
+      exit: yield* Schema.encode(deferred.exitSchema)(opts.exit)
+    });
+  }),
+  scheduleClock: options.scheduleClock
+});
+const defaultRetrySchedule = /*#__PURE__*/Schedule.exponential(200, 1.5).pipe(/*#__PURE__*/Schedule.either(/*#__PURE__*/Schedule.spaced(30000)));
+/**
+ * @since 1.0.0
+ * @category In-memory
+ */
+export const layerMemory = /*#__PURE__*/Layer.scoped(WorkflowEngine, /*#__PURE__*/Effect.gen(function* () {
+  const scope = yield* Effect.scope;
+  const workflows = new Map();
+  const executions = new Map();
+  const activities = new Map();
+  const resume = Effect.fnUntraced(function* (executionId) {
+    const state = executions.get(executionId);
+    if (!state) return;
+    const exit = state.fiber?.unsafePoll();
+    if (exit && exit._tag === "Success" && exit.value._tag === "Complete") {
+      return;
+    } else if (state.fiber && !exit) {
+      return;
+    }
+    const entry = workflows.get(state.instance.workflow.name);
+    const instance = WorkflowInstance.initial(state.instance.workflow, state.instance.executionId);
+    instance.interrupted = state.instance.interrupted;
+    state.instance = instance;
+    state.fiber = yield* state.execute(state.payload, state.instance.executionId).pipe(Effect.onExit(() => {
+      if (!instance.interrupted) {
+        return Effect.void;
+      }
+      instance.suspended = false;
+      return Effect.withFiberRuntime(fiber => Effect.interruptible(Fiber.interrupt(fiber)));
+    }), Workflow.intoResult, Effect.provideService(WorkflowInstance, instance), Effect.provideService(WorkflowEngine, engine), Effect.tap(result => {
+      if (!state.parent || result._tag !== "Complete") {
+        return Effect.void;
+      }
+      return Effect.forkIn(resume(state.parent), scope);
+    }), Effect.forkIn(entry.scope));
+  });
+  const deferredResults = new Map();
+  const clocks = yield* FiberMap.make();
+  const engine = makeUnsafe({
+    register: Effect.fnUntraced(function* (workflow, execute) {
+      workflows.set(workflow.name, {
+        workflow,
+        execute,
+        scope: yield* Effect.scope
+      });
+    }),
+    execute: Effect.fnUntraced(function* (workflow, options) {
+      const entry = workflows.get(workflow.name);
+      if (!entry) {
+        return yield* Effect.die(`Workflow ${workflow.name} is not registered`);
+      }
+      let state = executions.get(options.executionId);
+      if (!state) {
+        state = {
+          payload: options.payload,
+          execute: entry.execute,
+          instance: WorkflowInstance.initial(workflow, options.executionId),
+          fiber: undefined,
+          parent: options.parent?.executionId
+        };
+        executions.set(options.executionId, state);
+        yield* resume(options.executionId);
+      }
+      if (options.discard) return;
+      return yield* Fiber.join(state.fiber);
+    }),
+    interrupt: Effect.fnUntraced(function* (_workflow, executionId) {
+      const state = executions.get(executionId);
+      if (!state) return;
+      state.instance.interrupted = true;
+      yield* resume(executionId);
+    }),
+    resume(_workflow, executionId) {
+      return resume(executionId);
+    },
+    activityExecute: Effect.fnUntraced(function* (activity, attempt) {
+      const instance = yield* WorkflowInstance;
+      const activityId = `${instance.executionId}/${activity.name}/${attempt}`;
+      let state = activities.get(activityId);
+      if (state) {
+        const exit = state.exit;
+        if (exit && exit._tag === "Success" && exit.value._tag === "Suspended") {
+          state.exit = undefined;
+        } else if (exit) {
+          return yield* exit;
+        }
+      } else {
+        state = {
+          exit: undefined
+        };
+        activities.set(activityId, state);
+      }
+      const activityInstance = WorkflowInstance.initial(instance.workflow, instance.executionId);
+      activityInstance.interrupted = instance.interrupted;
+      return yield* activity.executeEncoded.pipe(Workflow.intoResult, Effect.provideService(WorkflowInstance, activityInstance), Effect.onExit(exit => {
+        state.exit = exit;
+        return Effect.void;
+      }));
+    }),
+    poll: (_workflow, executionId) => Effect.suspend(() => {
+      const state = executions.get(executionId);
+      if (!state) {
+        return Effect.succeed(undefined);
+      }
+      const exit = state.fiber?.unsafePoll();
+      return exit ?? Effect.succeed(undefined);
+    }),
+    deferredResult: Effect.fnUntraced(function* (deferred) {
+      const instance = yield* WorkflowInstance;
+      const id = `${instance.executionId}/${deferred.name}`;
+      return deferredResults.get(id);
+    }),
+    deferredDone: options => Effect.suspend(() => {
+      const id = `${options.executionId}/${options.deferredName}`;
+      if (deferredResults.has(id)) return Effect.void;
+      deferredResults.set(id, options.exit);
+      return resume(options.executionId);
+    }),
+    scheduleClock: (workflow, options) => engine.deferredDone(options.clock.deferred, {
+      workflowName: workflow.name,
+      executionId: options.executionId,
+      deferredName: options.clock.deferred.name,
+      exit: Exit.void
+    }).pipe(Effect.delay(options.clock.duration), FiberMap.run(clocks, `${options.executionId}/${options.clock.name}`, {
+      onlyIfMissing: true
+    }), Effect.asVoid)
+  });
+  return engine;
+}));
 //# sourceMappingURL=WorkflowEngine.js.map

package/dist/esm/WorkflowEngine.js.map

@@ -1 +1 @@
-{"version":3,"file":"WorkflowEngine.js","names":["Context","Effect","WorkflowEngine","Tag","WorkflowInstance","initial","workflow","executionId","of","suspended","interrupted","cause","undefined","activityState","count","latch","unsafeMakeLatch"],"sources":["../../src/WorkflowEngine.ts"],"sourcesContent":[null],"mappings":"AAIA,OAAO,KAAKA,OAAO,MAAM,gBAAgB;AACzC,OAAO,KAAKC,MAAM,MAAM,eAAe;AASvC;;;;AAIA,OAAM,MAAOC,cAAe,sBAAQF,OAAO,CAACG,GAAG,CAAC,iCAAiC,CAAC,EA+F/E;AAEH;;;;AAIA,OAAM,MAAOC,gBAAiB,sBAAQJ,OAAO,CAACG,GAAG,CAAC,kDAAkD,CAAC,EAkClG;EACD,OAAOE,OAAOA,CAACC,QAAsB,EAAEC,WAAmB;IACxD,OAAOH,gBAAgB,CAACI,EAAE,CAAC;MACzBD,WAAW;MACXD,QAAQ;MACRG,SAAS,EAAE,KAAK;MAChBC,WAAW,EAAE,KAAK;MAClBC,KAAK,EAAEC,SAAS;MAChBC,aAAa,EAAE;QACbC,KAAK,EAAE,CAAC;QACRC,KAAK,EAAEd,MAAM,CAACe,eAAe;;KAEhC,CAAC;EACJ","ignoreList":[]}
+{"version":3,"file":"WorkflowEngine.js","names":["Context","Effect","Exit","Fiber","FiberMap","Layer","Option","Schedule","Schema","Workflow","WorkflowEngine","Tag","WorkflowInstance","initial","workflow","executionId","of","suspended","interrupted","cause","undefined","activityState","count","latch","unsafeMakeLatch","makeUnsafe","options","register","fnUntraced","execute","context","payload","suspend","pipe","mapInputContext","input","merge","self","opts","suspendedRetrySchedule","defaultRetrySchedule","annotateCurrentSpan","result","parentInstance","serviceOption","isSome","instance","value","addFinalizer","_tag","void","interrupt","discard","run","parent","getOrUndefined","wrapActivityResult","exit","sleep","driver","next","catchAll","dieMessage","name","poll","resume","activityExecute","activity","attempt","orDie","decode","exitSchema","Complete","deferredResult","deferred","decodeUnknown","deferredDone","workflowName","deferredName","encode","scheduleClock","exponential","either","spaced","layerMemory","scoped","gen","scope","workflows","Map","executions","activities","state","get","fiber","unsafePoll","entry","onExit","withFiberRuntime","interruptible","intoResult","provideService","engine","tap","forkIn","deferredResults","clocks","make","set","die","join","_workflow","activityId","activityInstance","executeEncoded","succeed","id","has","clock","delay","duration","onlyIfMissing","asVoid"],"sources":["../../src/WorkflowEngine.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect/workflow",
-  "version": "0.12.4",
+  "version": "0.13.0",
   "description": "Durable workflows for Effect",
   "license": "MIT",
   "repository": {
@@ -11,10 +11,10 @@
   "sideEffects": [],
   "homepage": "https://effect.website",
   "peerDependencies": {
-    "effect": "^3.19.3",
-    "@effect/experimental": "^0.57.1",
-    "@effect/platform": "^0.93.2",
-    "@effect/rpc": "^0.72.1"
+    "effect": "^3.19.5",
+    "@effect/experimental": "^0.57.3",
+    "@effect/platform": "^0.93.3",
+    "@effect/rpc": "^0.72.2"
   },
   "publishConfig": {
     "provenance": true

package/src/Activity.ts

@@ -73,6 +73,7 @@ export interface Any {
   readonly name: string
   readonly successSchema: Schema.Schema.Any
   readonly errorSchema: Schema.Schema.All
+  readonly execute: Effect.Effect<any, any, any>
   readonly executeEncoded: Effect.Effect<any, any, any>
 }
 
@@ -228,19 +229,13 @@ const makeExecute = Effect.fnUntraced(function*<
   const attempt = yield* CurrentAttempt
   yield* Effect.annotateCurrentSpan({ executionId: instance.executionId })
   const result = yield* Workflow.wrapActivityResult(
-    engine.activityExecute({
-      activity,
-      attempt
-    }),
+    engine.activityExecute(activity, attempt),
     (_) => _._tag === "Suspended"
   )
   if (result._tag === "Suspended") {
     return yield* Workflow.suspend(instance)
   }
-  const exit = yield* Effect.orDie(
-    Schema.decode(activity.exitSchema)(result.exit)
-  )
-  return yield* exit
+  return yield* result.exit
 }, (effect, activity) =>
   Effect.withSpan(effect, activity.name, {
     captureStackTrace: false

package/src/DurableClock.ts

@@ -98,8 +98,7 @@ export const sleep: (
   const engine = yield* EngineTag
   const instance = yield* InstanceTag
   const clock = make(options)
-  yield* engine.scheduleClock({
-    workflow: instance.workflow,
+  yield* engine.scheduleClock(instance.workflow, {
     executionId: instance.executionId,
     clock
   })

package/src/DurableDeferred.ts

@@ -9,7 +9,7 @@ import * as Effect from "effect/Effect"
 import * as Encoding from "effect/Encoding"
 import * as Exit from "effect/Exit"
 import { dual } from "effect/Function"
-import * as Option from "effect/Option"
+import * as Predicate from "effect/Predicate"
 import * as Schema from "effect/Schema"
 import type * as Activity from "./Activity.js"
 import * as Workflow from "./Workflow.js"
@@ -39,7 +39,7 @@ export interface DurableDeferred<
   readonly name: string
   readonly successSchema: Success
   readonly errorSchema: Error
-  readonly exitSchema: Schema.Exit<Success, Error, typeof Schema.Defect>
+  readonly exitSchema: Schema.ExitFromSelf<Success, Error, typeof Schema.Defect>
   readonly withActivityAttempt: Effect.Effect<DurableDeferred<Success, Error>>
 }
 
@@ -52,7 +52,7 @@ export interface Any {
   readonly name: string
   readonly successSchema: Schema.Schema.Any
   readonly errorSchema: Schema.Schema.All
-  readonly exitSchema: Schema.Exit<any, any, any>
+  readonly exitSchema: Schema.ExitFromSelf<any, any, any>
 }
 
 /**
@@ -70,7 +70,7 @@ export const make = <
   name,
   successSchema: options?.success ?? Schema.Void as any,
   errorSchema: options?.error ?? Schema.Never as any,
-  exitSchema: Schema.Exit({
+  exitSchema: Schema.ExitFromSelf({
     success: options?.success ?? Schema.Void as any,
     failure: options?.error ?? Schema.Never as any,
     defect: Schema.Defect
@@ -111,13 +111,14 @@ const await_: <Success extends Schema.Schema.Any, Error extends Schema.Schema.Al
 >(self: DurableDeferred<Success, Error>) {
   const engine = yield* EngineTag
   const instance = yield* InstanceTag
-  const oexit = yield* Workflow.wrapActivityResult(engine.deferredResult(self), Option.isNone)
-  if (Option.isNone(oexit)) {
+  const exit = yield* Workflow.wrapActivityResult(
+    engine.deferredResult(self),
+    Predicate.isUndefined
+  )
+  if (exit === undefined) {
     return yield* Workflow.suspend(instance)
   }
-  return yield* Effect.flatten(Effect.orDie(
-    Schema.decodeUnknown(self.exitSchema)(oexit.value)
-  ))
+  return yield* exit
 })
 
 export {
@@ -165,19 +166,15 @@ export const into: {
   Effect.contextWithEffect((context: Context.Context<WorkflowEngine | WorkflowInstance>) => {
     const engine = Context.get(context, EngineTag)
     const instance = Context.get(context, InstanceTag)
-    return Effect.onExit(
-      effect,
-      Effect.fnUntraced(function*(exit) {
-        if (instance.suspended) return
-        const encodedExit = yield* Effect.orDie(Schema.encode(self.exitSchema)(exit))
-        yield* engine.deferredDone({
-          workflowName: instance.workflow.name,
-          executionId: instance.executionId,
-          deferredName: self.name,
-          exit: encodedExit as any
-        })
+    return Effect.onExit(effect, (exit) => {
+      if (instance.suspended) return Effect.void
+      return engine.deferredDone(self, {
+        workflowName: instance.workflow.name,
+        executionId: instance.executionId,
+        deferredName: self.name,
+        exit
       })
-    )
+    })
   }))
 
 /**
@@ -218,11 +215,9 @@ export const raceAll = <
   })
   return Effect.gen(function*() {
     const engine = yield* EngineTag
-    const oexit = yield* Workflow.wrapActivityResult(engine.deferredResult(deferred), Option.isNone)
-    if (Option.isSome(oexit)) {
-      return yield* (Effect.flatten(Effect.orDie(
-        Schema.decodeUnknown(deferred.exitSchema)(oexit.value)
-      )) as Effect.Effect<any, any, any>)
+    const exit = yield* Workflow.wrapActivityResult(engine.deferredResult(deferred), Predicate.isUndefined)
+    if (exit) {
+      return yield* (Effect.flatten(exit) as Effect.Effect<any, any, any>)
     }
     return yield* into(Effect.raceAll(options.effects), deferred)
   })
@@ -443,14 +438,13 @@ export const done: {
   ) {
     const engine = yield* EngineTag
     const token = TokenParsed.fromString(options.token)
-    const exit = yield* Schema.encode(self.exitSchema)(options.exit)
-    yield* engine.deferredDone({
+    yield* engine.deferredDone(self, {
       workflowName: token.workflowName,
       executionId: token.executionId,
       deferredName: token.deferredName,
-      exit: exit as any
+      exit: options.exit
     })
-  }, Effect.orDie)
+  })
 )
 
 /**

package/src/Workflow.ts

@@ -13,7 +13,7 @@ import * as Option from "effect/Option"
 import type { Pipeable } from "effect/Pipeable"
 import * as Predicate from "effect/Predicate"
 import * as PrimaryKey from "effect/PrimaryKey"
-import * as Schedule from "effect/Schedule"
+import type * as Schedule from "effect/Schedule"
 import * as Schema from "effect/Schema"
 import type * as AST from "effect/SchemaAST"
 import type * as Scope from "effect/Scope"
@@ -151,7 +151,7 @@ export interface Workflow<
       executionId: string
     ) => Effect.Effect<Success["Type"], Error["Type"], R>
   ) => Layer.Layer<
-    WorkflowEngine,
+    never,
     never,
     | WorkflowEngine
     | Exclude<R, WorkflowEngine | WorkflowInstance | Execution<Name> | Scope.Scope>
@@ -278,7 +278,6 @@ export const make = <
     readonly annotations?: Context.Context<never>
   }
 ): Workflow<Name, Payload extends Schema.Struct.Fields ? Schema.Struct<Payload> : Payload, Success, Error> => {
-  const suspendedRetrySchedule = options.suspendedRetrySchedule ?? defaultRetrySchedule
   const makeExecutionId = (payload: any) => makeHashDigest(`${options.name}-${options.idempotencyKey(payload)}`)
   const self: Workflow<Name, any, Success, Error> = {
     [TypeId]: TypeId,
@@ -305,65 +304,19 @@ export const make = <
         const engine = yield* EngineTag
         const executionId = yield* makeExecutionId(payload)
         yield* Effect.annotateCurrentSpan({ executionId })
-
-        const parentInstance = yield* Effect.serviceOption(InstanceTag)
-        let result: Result<unknown, unknown>
-        if (Option.isSome(parentInstance)) {
-          const instance = parentInstance.value
-          yield* Effect.addFinalizer(() => {
-            if (!instance.interrupted || result?._tag === "Complete") {
-              return Effect.void
-            }
-            return engine.interrupt(self, executionId)
-          })
-        }
-
-        if (opts?.discard) {
-          yield* engine.execute({
-            workflow: self,
-            executionId,
-            payload,
-            discard: true
-          })
-          return executionId
-        }
-        const run = engine.execute({
-          workflow: self,
+        return yield* engine.execute(self, {
           executionId,
           payload,
-          discard: false,
-          parent: Option.getOrUndefined(parentInstance)
+          discard: opts?.discard,
+          suspendedRetrySchedule: options.suspendedRetrySchedule
         })
-        if (Option.isSome(parentInstance)) {
-          result = yield* run
-          if (result._tag === "Suspended" && !result.cause) {
-            yield* engine.resume(self, executionId)
-            result = yield* wrapActivityResult(run, (result) => result._tag === "Suspended")
-          }
-          if (result._tag === "Suspended") {
-            return yield* suspend(parentInstance.value)
-          }
-          return yield* result.exit as Exit.Exit<Success["Type"], Error["Type"]>
-        }
-
-        let sleep: Effect.Effect<any> | undefined
-        while (true) {
-          result = yield* run
-          if (result._tag === "Complete") {
-            return yield* result.exit as Exit.Exit<Success["Type"], Error["Type"]>
-          }
-          sleep ??= (yield* Schedule.driver(suspendedRetrySchedule)).next(void 0).pipe(
-            Effect.catchAll(() => Effect.dieMessage(`${options.name}.execute: suspendedRetrySchedule exhausted`))
-          )
-          yield* sleep
-        }
       },
       Effect.withSpan(`${options.name}.execute`, { captureStackTrace: false })
     ),
     poll: Effect.fnUntraced(
       function*(executionId: string) {
         const engine = yield* EngineTag
-        return yield* engine.poll({ workflow: self, executionId })
+        return yield* engine.poll(self, executionId)
       },
       (effect, executionId) =>
         Effect.withSpan(effect, `${options.name}.poll`, {
@@ -394,14 +347,9 @@ export const make = <
         })
     ),
     toLayer: (execute) =>
-      Layer.scopedContext(Effect.gen(function*() {
-        const context = yield* Effect.context<WorkflowEngine>()
-        const engine = Context.get(context, EngineTag)
-        yield* engine.register(self, (payload, executionId) =>
-          Effect.suspend(() => execute(payload, executionId)).pipe(
-            Effect.mapInputContext((input) => Context.merge(context, input))
-          ) as any)
-        return EngineTag.context(engine)
+      Layer.scopedDiscard(Effect.gen(function*() {
+        const engine = yield* EngineTag
+        return yield* engine.register(self, execute)
       })) as any,
     executionId: (payload) => makeExecutionId(self.payloadSchema.make(payload)),
     withCompensation
@@ -410,10 +358,6 @@ export const make = <
   return self
 }
 
-const defaultRetrySchedule = Schedule.exponential(200, 1.5).pipe(
-  Schedule.union(Schedule.spaced(30000))
-)
-
 /**
  * @since 1.0.0
  * @category Constructors