foldkit 0.135.0 → 0.137.0

package/dist/command/interruptible/interruptible.js

@@ -1,6 +1,6 @@
-import { Array, Context, Effect, Fiber, Option, Predicate, Schema, } from 'effect';
+import { Array, Context, Effect, Fiber, Option, Schema } from 'effect';
 import { ts } from '../../schema/index.js';
-import { CommandDefinitionTypeId } from '../index.js';
+import { CommandDefinitionTypeId, brandAsDefinition } from '../brand.js';
 /** At least one in-flight Command held the interrupt key, and every holder
  *  has been stopped. Their declared result Messages are guaranteed never to
  *  dispatch. */
@@ -64,7 +64,7 @@ export const __CurrentRegistry = Context.Reference('foldkit/Command/Interruptibl
 // `register` but before `ensuring` attached, the fiber would die without
 // ever removing itself from the registry, and every later Interrupt would
 // report `Interrupted` against that dead entry forever.
-const registerKeyWhileRunning = (key, effect) => Effect.withFiber(fiber => Effect.gen(function* () {
+export const __registerKeyWhileRunning = (key, effect) => Effect.withFiber(fiber => Effect.gen(function* () {
     const registry = yield* __CurrentRegistry;
     return yield* Effect.uninterruptibleMask(restore => Effect.suspend(() => {
         registry.register(key, fiber);
@@ -76,16 +76,9 @@ const makeInterruptEffect = (key, toMessage) => Effect.gen(function* () {
     const outcome = yield* registry.interrupt(key);
     return toMessage(outcome);
 });
-const brandAsDefinition = (definition, name) => {
-    Object.defineProperty(definition, 'name', {
-        value: name,
-        configurable: true,
-    });
-    Object.defineProperty(definition, CommandDefinitionTypeId, {
-        value: CommandDefinitionTypeId,
-    });
-};
-const makeInterruptDefinitionNoArgs = (name, key) => {
+/** @internal Builds the `Interrupt` constructor for an interruptible definition
+ *  whose key is the Command name. Internal to the Command module. */
+export const __makeInterruptDefinitionNoArgs = (name, key) => {
     const interruptName = `${name}.Interrupt`;
     const definition = (toMessage) => ({
         name: interruptName,
@@ -96,7 +89,9 @@ const makeInterruptDefinitionNoArgs = (name, key) => {
     brandAsDefinition(definition, interruptName);
     return definition;
 };
-const makeInterruptDefinitionWithArgs = (name, toFullKey) => {
+/** @internal Builds the `Interrupt` constructor for an interruptible definition
+ *  whose key is derived from its args. Internal to the Command module. */
+export const __makeInterruptDefinitionWithArgs = (name, toFullKey) => {
     const interruptName = `${name}.Interrupt`;
     const definition = (keyArgs, toMessage) => {
         const key = toFullKey(keyArgs);
@@ -111,64 +106,3 @@ const makeInterruptDefinitionWithArgs = (name, toFullKey) => {
     brandAsDefinition(definition, interruptName);
     return definition;
 };
-export function define(name, ...rest) {
-    const [maybeArgs, maybeToKey] = rest;
-    const isArgsRecord = Predicate.isObject(maybeArgs) && !Schema.isSchema(maybeArgs);
-    if (!isArgsRecord) {
-        const key = name;
-        return (effect) => {
-            const definition = () => ({
-                name,
-                key,
-                effect: registerKeyWhileRunning(key, effect),
-                messageMappers: [],
-            });
-            brandAsDefinition(definition, name);
-            Object.defineProperty(definition, 'Interrupt', {
-                value: makeInterruptDefinitionNoArgs(name, key),
-            });
-            /* eslint-disable-next-line @typescript-eslint/consistent-type-assertions */
-            return definition;
-        };
-    }
-    const isToKeyFunction = Predicate.isFunction(maybeToKey) && !Schema.isSchema(maybeToKey);
-    if (!isToKeyFunction) {
-        const key = name;
-        return (effectBuilder) => {
-            const definition = (args) => ({
-                name,
-                args,
-                key,
-                effect: registerKeyWhileRunning(key, effectBuilder(args)),
-                messageMappers: [],
-            });
-            brandAsDefinition(definition, name);
-            Object.defineProperty(definition, 'Interrupt', {
-                value: makeInterruptDefinitionNoArgs(name, key),
-            });
-            /* eslint-disable-next-line @typescript-eslint/consistent-type-assertions */
-            return definition;
-        };
-    }
-    /* eslint-disable-next-line @typescript-eslint/consistent-type-assertions */
-    const toKey = maybeToKey;
-    const toFullKey = (keyArgs) => `${name}:${toKey(keyArgs)}`;
-    return (effectBuilder) => {
-        const definition = (args) => {
-            const key = toFullKey(args);
-            return {
-                name,
-                args,
-                key,
-                effect: registerKeyWhileRunning(key, effectBuilder(args)),
-                messageMappers: [],
-            };
-        };
-        brandAsDefinition(definition, name);
-        Object.defineProperty(definition, 'Interrupt', {
-            value: makeInterruptDefinitionWithArgs(name, toFullKey),
-        });
-        /* eslint-disable-next-line @typescript-eslint/consistent-type-assertions */
-        return definition;
-    };
-}

package/dist/command/interruptible/public.d.ts

@@ -1,3 +1,3 @@
 export type { DefinitionNoArgs, DefinitionWithArgs, DefinitionWithArgsNameKeyed, InterruptDefinitionNoArgs, InterruptDefinitionWithArgs, } from './index.js';
-export { define, Interrupted, NotFound, Outcome } from './index.js';
+export { Interrupted, NotFound, Outcome } from './index.js';
 //# sourceMappingURL=public.d.ts.map

package/dist/command/interruptible/public.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public.d.ts","sourceRoot":"","sources":["../../../src/command/interruptible/public.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,gBAAgB,EAChB,kBAAkB,EAClB,2BAA2B,EAC3B,yBAAyB,EACzB,2BAA2B,GAC5B,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA"}
+{"version":3,"file":"public.d.ts","sourceRoot":"","sources":["../../../src/command/interruptible/public.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,gBAAgB,EAChB,kBAAkB,EAClB,2BAA2B,EAC3B,yBAAyB,EACzB,2BAA2B,GAC5B,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA"}

package/dist/command/interruptible/public.js

@@ -1 +1 @@
-export { define, Interrupted, NotFound, Outcome } from './index.js';
+export { Interrupted, NotFound, Outcome } from './index.js';

package/dist/command/public.d.ts

@@ -1,4 +1,4 @@
-export type { Command, CommandDefinition, CommandDefinitionNoArgs, CommandDefinitionWithArgs, } from './index.js';
+export type { Command, CommandDefinition, CommandDefinitionNoArgs, CommandDefinitionWithArgs, InterruptOption, } from './index.js';
 export { CommandDefinitionTypeId, define, mapEffect, mapMessage, mapMessages, } from './index.js';
 export * as Interruptible from './interruptible/public.js';
 //# sourceMappingURL=public.d.ts.map

package/dist/command/public.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public.d.ts","sourceRoot":"","sources":["../../src/command/public.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,OAAO,EACP,iBAAiB,EACjB,uBAAuB,EACvB,yBAAyB,GAC1B,MAAM,YAAY,CAAA;AACnB,OAAO,EACL,uBAAuB,EACvB,MAAM,EACN,SAAS,EACT,UAAU,EACV,WAAW,GACZ,MAAM,YAAY,CAAA;AACnB,OAAO,KAAK,aAAa,MAAM,2BAA2B,CAAA"}
+{"version":3,"file":"public.d.ts","sourceRoot":"","sources":["../../src/command/public.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,OAAO,EACP,iBAAiB,EACjB,uBAAuB,EACvB,yBAAyB,EACzB,eAAe,GAChB,MAAM,YAAY,CAAA;AACnB,OAAO,EACL,uBAAuB,EACvB,MAAM,EACN,SAAS,EACT,UAAU,EACV,WAAW,GACZ,MAAM,YAAY,CAAA;AACnB,OAAO,KAAK,aAAa,MAAM,2BAA2B,CAAA"}

package/dist/file/select.d.ts

@@ -15,7 +15,7 @@ import type { File } from './file.js';
  *     Effect.map(
  *       Option.match({
  *         onNone: () => CancelledSelectResume(),
- *         onSome: file => SelectedResume({ file }),
+ *         onSome: file => CompletedSelectResume({ file }),
  *       }),
  *     ),
  *   ),
@@ -32,7 +32,7 @@ export declare const select: (accept: ReadonlyArray<string>) => Effect.Effect<Op
  * ```typescript
  * SelectAttachments(
  *   File.selectMultiple(['image/*', 'application/pdf']).pipe(
- *     Effect.map(files => SelectedAttachments({ files })),
+ *     Effect.map(files => CompletedSelectAttachments({ files })),
  *   ),
  * )
  * ```

package/dist/file/select.js

@@ -40,7 +40,7 @@ const openPicker = ({ accept, multiple, }) => Effect.callback((resume, signal) =
  *     Effect.map(
  *       Option.match({
  *         onNone: () => CancelledSelectResume(),
- *         onSome: file => SelectedResume({ file }),
+ *         onSome: file => CompletedSelectResume({ file }),
  *       }),
  *     ),
  *   ),
@@ -57,7 +57,7 @@ export const select = (accept) => openPicker({ accept, multiple: false }).pipe(E
  * ```typescript
  * SelectAttachments(
  *   File.selectMultiple(['image/*', 'application/pdf']).pipe(
- *     Effect.map(files => SelectedAttachments({ files })),
+ *     Effect.map(files => CompletedSelectAttachments({ files })),
  *   ),
  * )
  * ```

package/dist/http/http.d.ts

@@ -24,12 +24,9 @@ import { HttpClient } from 'effect/unstable/http';
  * ```typescript
  * import { Http } from 'foldkit'
  *
- * const FetchCount = Command.define(
- *   'FetchCount',
- *   SucceededFetchCount,
- *   FailedFetchCount,
- * )(
- *   Effect.gen(function* () {
+ * const FetchCount = Command.define('FetchCount', {
+ *   messages: [SucceededFetchCount, FailedFetchCount],
+ *   execute: Effect.gen(function* () {
  *     const client = yield* HttpClient.HttpClient
  *     const response = yield* client.get('/api/count')
  *     const { count } = yield* S.decodeUnknownEffect(CountResponse)(
@@ -42,7 +39,7 @@ import { HttpClient } from 'effect/unstable/http';
  *     ),
  *     Effect.provide(Http.layer),
  *   ),
- * )
+ * })
  * ```
  */
 export declare const layer: Layer.Layer<HttpClient.HttpClient>;

package/dist/http/http.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/http/http.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAC9B,OAAO,EAAmB,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAElE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CG;AACH,eAAO,MAAM,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAGpD,CAAA"}
+{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/http/http.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAC9B,OAAO,EAAmB,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAElE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,eAAO,MAAM,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAGpD,CAAA"}

package/dist/http/http.js

@@ -24,12 +24,9 @@ import { FetchHttpClient, HttpClient } from 'effect/unstable/http';
  * ```typescript
  * import { Http } from 'foldkit'
  *
- * const FetchCount = Command.define(
- *   'FetchCount',
- *   SucceededFetchCount,
- *   FailedFetchCount,
- * )(
- *   Effect.gen(function* () {
+ * const FetchCount = Command.define('FetchCount', {
+ *   messages: [SucceededFetchCount, FailedFetchCount],
+ *   execute: Effect.gen(function* () {
  *     const client = yield* HttpClient.HttpClient
  *     const response = yield* client.get('/api/count')
  *     const { count } = yield* S.decodeUnknownEffect(CountResponse)(
@@ -42,7 +39,7 @@ import { FetchHttpClient, HttpClient } from 'effect/unstable/http';
  *     ),
  *     Effect.provide(Http.layer),
  *   ),
- * )
+ * })
  * ```
  */
 export const layer = Layer.provide(FetchHttpClient.layer, Layer.succeed(HttpClient.TracerPropagationEnabled, false));

package/dist/port/port.d.ts

@@ -125,15 +125,14 @@ export declare const subscription: <Value, Encoded, Message>(port: Inbound<Value
  * Effect:
  *
  * ```ts
- * const ReportCount = Command.define(
- *   'ReportCount',
- *   { count: S.Number },
- *   CompletedReportCount,
- * )(({ count }) =>
- *   Port.emit(ports.outbound.countChanged, count).pipe(
- *     Effect.as(CompletedReportCount()),
- *   ),
- * )
+ * const ReportCount = Command.define('ReportCount', {
+ *   args: { count: S.Number },
+ *   messages: [CompletedReportCount],
+ *   execute: ({ count }) =>
+ *     Port.emit(ports.outbound.countChanged, count).pipe(
+ *       Effect.as(CompletedReportCount()),
+ *     ),
+ * })
  * ```
  *
  * When the program runs without an embed handle (started with `Runtime.run`),

package/dist/port/port.d.ts.map

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

package/dist/port/port.js

@@ -128,15 +128,14 @@ export const subscription = (port, toMessage) => persistent(Stream.map(stream(po
  * Effect:
  *
  * ```ts
- * const ReportCount = Command.define(
- *   'ReportCount',
- *   { count: S.Number },
- *   CompletedReportCount,
- * )(({ count }) =>
- *   Port.emit(ports.outbound.countChanged, count).pipe(
- *     Effect.as(CompletedReportCount()),
- *   ),
- * )
+ * const ReportCount = Command.define('ReportCount', {
+ *   args: { count: S.Number },
+ *   messages: [CompletedReportCount],
+ *   execute: ({ count }) =>
+ *     Port.emit(ports.outbound.countChanged, count).pipe(
+ *       Effect.as(CompletedReportCount()),
+ *     ),
+ * })
  * ```
  *
  * When the program runs without an embed handle (started with `Runtime.run`),

package/dist/test/apps/counter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"counter.d.ts","sourceRoot":"","sources":["../../../src/test/apps/counter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAsB,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAA;AAEvE,OAAO,KAAK,OAAO,MAAM,wBAAwB,CAAA;AACjD,OAAO,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAM5D,eAAO,MAAM,KAAK;;;EAGhB,CAAA;AACF,MAAM,MAAM,KAAK,GAAG,OAAO,KAAK,CAAC,IAAI,CAAA;AAIrC,eAAO,MAAM,gBAAgB,8EAAwB,CAAA;AACrD,eAAO,MAAM,gBAAgB,8EAAwB,CAAA;AACrD,eAAO,MAAM,YAAY,0EAAoB,CAAA;AAC7C,eAAO,MAAM,gBAAgB;;EAA0C,CAAA;AACvE,eAAO,MAAM,MAAM,oEAAc,CAAA;AACjC,eAAO,MAAM,WAAW,yEAAmB,CAAA;AAC3C,eAAO,MAAM,mBAAmB,iFAA2B,CAAA;AAC3D,eAAO,MAAM,qBAAqB,mFAA6B,CAAA;AAC/D,eAAO,MAAM,mBAAmB,iFAA2B,CAAA;AAC3D,eAAO,MAAM,mBAAmB;;EAAgD,CAAA;AAChF,eAAO,MAAM,gBAAgB;;EAA6C,CAAA;AAE1E,eAAO,MAAM,OAAO;;;;;;IAYlB,CAAA;AACF,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAA;AAIzC,eAAO,MAAM,UAAU;;;iBAIgC,CAAA;AAEvD,eAAO,MAAM,cAAc;;;;;iBAKyC,CAAA;AAIpE,eAAO,MAAM,YAAY,EAAE,KAA6B,CAAA;AAIxD,eAAO,MAAM,MAAM,GACjB,OAAO,KAAK,EACZ,SAAS,OAAO,KACf,SAAS,CAAC,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAmCxD,CAAA;AAIH,eAAO,MAAM,IAAI,GAAI,OAAO,KAAK,EAAE,GAAG,WAAW,CAAC,OAAO,CAAC,KAAG,IAe5D,CAAA"}
+{"version":3,"file":"counter.d.ts","sourceRoot":"","sources":["../../../src/test/apps/counter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAsB,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAA;AAEvE,OAAO,KAAK,OAAO,MAAM,wBAAwB,CAAA;AACjD,OAAO,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAM5D,eAAO,MAAM,KAAK;;;EAGhB,CAAA;AACF,MAAM,MAAM,KAAK,GAAG,OAAO,KAAK,CAAC,IAAI,CAAA;AAIrC,eAAO,MAAM,gBAAgB,8EAAwB,CAAA;AACrD,eAAO,MAAM,gBAAgB,8EAAwB,CAAA;AACrD,eAAO,MAAM,YAAY,0EAAoB,CAAA;AAC7C,eAAO,MAAM,gBAAgB;;EAA0C,CAAA;AACvE,eAAO,MAAM,MAAM,oEAAc,CAAA;AACjC,eAAO,MAAM,WAAW,yEAAmB,CAAA;AAC3C,eAAO,MAAM,mBAAmB,iFAA2B,CAAA;AAC3D,eAAO,MAAM,qBAAqB,mFAA6B,CAAA;AAC/D,eAAO,MAAM,mBAAmB,iFAA2B,CAAA;AAC3D,eAAO,MAAM,mBAAmB;;EAAgD,CAAA;AAChF,eAAO,MAAM,gBAAgB;;EAA6C,CAAA;AAE1E,eAAO,MAAM,OAAO;;;;;;IAYlB,CAAA;AACF,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAA;AAIzC,eAAO,MAAM,UAAU;;;iBAGrB,CAAA;AAEF,eAAO,MAAM,cAAc;;;;;iBAIzB,CAAA;AAIF,eAAO,MAAM,YAAY,EAAE,KAA6B,CAAA;AAIxD,eAAO,MAAM,MAAM,GACjB,OAAO,KAAK,EACZ,SAAS,OAAO,KACf,SAAS,CAAC,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAmCxD,CAAA;AAIH,eAAO,MAAM,IAAI,GAAI,OAAO,KAAK,EAAE,GAAG,WAAW,CAAC,OAAO,CAAC,KAAG,IAe5D,CAAA"}

package/dist/test/apps/counter.js

@@ -33,8 +33,15 @@ export const Message = S.Union([
     FailedFetchCount,
 ]);
 // COMMAND
-export const FetchCount = Command.define('FetchCount', SucceededFetchCount, FailedFetchCount)(Effect.sync(() => SucceededFetchCount({ count: 0 })));
-export const FetchCountById = Command.define('FetchCountById', { id: S.Number }, SucceededFetchCount, FailedFetchCount)(({ id }) => Effect.sync(() => SucceededFetchCount({ count: id })));
+export const FetchCount = Command.define('FetchCount', {
+    messages: [SucceededFetchCount, FailedFetchCount],
+    execute: Effect.sync(() => SucceededFetchCount({ count: 0 })),
+});
+export const FetchCountById = Command.define('FetchCountById', {
+    args: { id: S.Number },
+    messages: [SucceededFetchCount, FailedFetchCount],
+    execute: ({ id }) => Effect.sync(() => SucceededFetchCount({ count: id })),
+});
 // INIT
 export const initialModel = { count: 0, log: [] };
 // UPDATE

package/dist/test/apps/crashOnRender.d.ts

@@ -19,7 +19,7 @@ export declare const Model: S.Struct<{
 }>;
 export type Model = typeof Model.Type;
 export declare const ClickedReload: import("../../schema/index.js").CallableTaggedStruct<"ClickedReload", {}>;
-export declare const LoadedSources: import("../../schema/index.js").CallableTaggedStruct<"LoadedSources", {
+export declare const CompletedReloadSources: import("../../schema/index.js").CallableTaggedStruct<"CompletedReloadSources", {
     sources: S.$Array<S.Struct<{
         readonly kind: S.Literal<"Book">;
         readonly id: S.String;
@@ -34,7 +34,7 @@ export declare const SelectedSource: import("../../schema/index.js").CallableTag
 export declare const SubmittedNewSourceId: import("../../schema/index.js").CallableTaggedStruct<"SubmittedNewSourceId", {
     id: S.String;
 }>;
-export declare const Message: S.Union<readonly [import("../../schema/index.js").CallableTaggedStruct<"ClickedReload", {}>, import("../../schema/index.js").CallableTaggedStruct<"LoadedSources", {
+export declare const Message: S.Union<readonly [import("../../schema/index.js").CallableTaggedStruct<"ClickedReload", {}>, import("../../schema/index.js").CallableTaggedStruct<"CompletedReloadSources", {
     sources: S.$Array<S.Struct<{
         readonly kind: S.Literal<"Book">;
         readonly id: S.String;
@@ -50,7 +50,7 @@ export declare const Message: S.Union<readonly [import("../../schema/index.js").
 export type Message = typeof Message.Type;
 export declare const reloadedSources: ReadonlyArray<RawSource>;
 export declare const ReloadSources: Command.CommandDefinitionNoArgs<"ReloadSources", Effect.Effect<{
-    readonly _tag: "LoadedSources";
+    readonly _tag: "CompletedReloadSources";
     readonly sources: readonly {
         readonly kind: "Book";
         readonly id: string;

package/dist/test/apps/crashOnRender.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"crashOnRender.d.ts","sourceRoot":"","sources":["../../../src/test/apps/crashOnRender.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAc,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAA;AAE/D,OAAO,KAAK,OAAO,MAAM,wBAAwB,CAAA;AACjD,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAMhE,eAAO,MAAM,SAAS;;;EAGpB,CAAA;AACF,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAC,IAAI,CAAA;AAK7C,eAAO,MAAM,MAAM;;;EAGjB,CAAA;AACF,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC,IAAI,CAAA;AAEvC,eAAO,MAAM,KAAK;;;;;EAEhB,CAAA;AACF,MAAM,MAAM,KAAK,GAAG,OAAO,KAAK,CAAC,IAAI,CAAA;AAIrC,eAAO,MAAM,aAAa,2EAAqB,CAAA;AAC/C,eAAO,MAAM,aAAa;;;;;EAAsD,CAAA;AAChF,eAAO,MAAM,cAAc;;;;;EAA0C,CAAA;AACrE,eAAO,MAAM,oBAAoB;;EAA8C,CAAA;AAE/E,eAAO,MAAM,OAAO;;;;;;;;;;;;IAKlB,CAAA;AACF,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAA;AAMzC,eAAO,MAAM,eAAe,EAAE,aAAa,CAAC,SAAS,CAGpD,CAAA;AAED,eAAO,MAAM,aAAa;;;;;;iBAGoC,CAAA;AAI9D,eAAO,MAAM,YAAY,EAAE,aAAa,CAAC,SAAS,CAEjD,CAAA;AAED,eAAO,MAAM,gBAAgB,EAAE,aAAa,CAAC,SAAS,CAErD,CAAA;AAED,eAAO,MAAM,YAAY,EAAE,KAAiC,CAAA;AAI5D,eAAO,MAAM,MAAM,GACjB,OAAO,KAAK,EACZ,SAAS,OAAO,KACf,SAAS,CAAC,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAiBxD,CAAA;AAIH,eAAO,MAAM,IAAI,GAAI,OAAO,KAAK,EAAE,GAAG,WAAW,CAAC,OAAO,CAAC,KAAG,QA4B5D,CAAA"}
+{"version":3,"file":"crashOnRender.d.ts","sourceRoot":"","sources":["../../../src/test/apps/crashOnRender.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAc,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAA;AAE/D,OAAO,KAAK,OAAO,MAAM,wBAAwB,CAAA;AACjD,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAMhE,eAAO,MAAM,SAAS;;;EAGpB,CAAA;AACF,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAC,IAAI,CAAA;AAK7C,eAAO,MAAM,MAAM;;;EAGjB,CAAA;AACF,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC,IAAI,CAAA;AAEvC,eAAO,MAAM,KAAK;;;;;EAEhB,CAAA;AACF,MAAM,MAAM,KAAK,GAAG,OAAO,KAAK,CAAC,IAAI,CAAA;AAIrC,eAAO,MAAM,aAAa,2EAAqB,CAAA;AAC/C,eAAO,MAAM,sBAAsB;;;;;EAEjC,CAAA;AACF,eAAO,MAAM,cAAc;;;;;EAA0C,CAAA;AACrE,eAAO,MAAM,oBAAoB;;EAA8C,CAAA;AAE/E,eAAO,MAAM,OAAO;;;;;;;;;;;;IAKlB,CAAA;AACF,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAA;AAMzC,eAAO,MAAM,eAAe,EAAE,aAAa,CAAC,SAAS,CAGpD,CAAA;AAED,eAAO,MAAM,aAAa;;;;;;iBAGxB,CAAA;AAIF,eAAO,MAAM,YAAY,EAAE,aAAa,CAAC,SAAS,CAEjD,CAAA;AAED,eAAO,MAAM,gBAAgB,EAAE,aAAa,CAAC,SAAS,CAErD,CAAA;AAED,eAAO,MAAM,YAAY,EAAE,KAAiC,CAAA;AAI5D,eAAO,MAAM,MAAM,GACjB,OAAO,KAAK,EACZ,SAAS,OAAO,KACf,SAAS,CAAC,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAiBxD,CAAA;AAIH,eAAO,MAAM,IAAI,GAAI,OAAO,KAAK,EAAE,GAAG,WAAW,CAAC,OAAO,CAAC,KAAG,QA4B5D,CAAA"}

package/dist/test/apps/crashOnRender.js

@@ -19,12 +19,14 @@ export const Model = S.Struct({
 });
 // MESSAGE
 export const ClickedReload = m('ClickedReload');
-export const LoadedSources = m('LoadedSources', { sources: S.Array(RawSource) });
+export const CompletedReloadSources = m('CompletedReloadSources', {
+    sources: S.Array(RawSource),
+});
 export const SelectedSource = m('SelectedSource', { source: Source });
 export const SubmittedNewSourceId = m('SubmittedNewSourceId', { id: S.String });
 export const Message = S.Union([
     ClickedReload,
-    LoadedSources,
+    CompletedReloadSources,
     SelectedSource,
     SubmittedNewSourceId,
 ]);
@@ -35,7 +37,10 @@ export const reloadedSources = [
     { kind: 'Book', id: '1' },
     { kind: 'Book', id: '' },
 ];
-export const ReloadSources = Command.define('ReloadSources', LoadedSources)(Effect.succeed(LoadedSources({ sources: reloadedSources })));
+export const ReloadSources = Command.define('ReloadSources', {
+    messages: [CompletedReloadSources],
+    execute: Effect.succeed(CompletedReloadSources({ sources: reloadedSources })),
+});
 // INIT
 export const validSources = [
     { kind: 'Book', id: '1' },
@@ -47,7 +52,7 @@ export const initialModel = { sources: validSources };
 // UPDATE
 export const update = (model, message) => M.value(message).pipe(M.withReturnType(), M.tagsExhaustive({
     ClickedReload: () => [model, [ReloadSources()]],
-    LoadedSources: ({ sources }) => [
+    CompletedReloadSources: ({ sources }) => [
         evo(model, { sources: () => sources }),
         [],
     ],

package/dist/test/apps/drafts.d.ts

@@ -1,6 +1,5 @@
 import { Effect, Schema as S } from 'effect';
 import * as Command from '../../command/index.js';
-import * as Interruptible from '../../command/interruptible/index.js';
 import type { Document, HtmlBuilder } from '../../html/index.js';
 export declare const SaveStatus: S.Literals<readonly ["Editing", "Saving", "Saved"]>;
 export type SaveStatus = typeof SaveStatus.Type;
@@ -21,7 +20,7 @@ export declare const SaveDraftArgs: S.Struct<{
     readonly revision: S.Number;
 }>;
 export type SaveDraftArgs = typeof SaveDraftArgs.Type;
-export declare const SaveDraft: Interruptible.DefinitionWithArgsNameKeyed<"SaveDraft", {
+export declare const SaveDraft: import("../../command/interruptible/interruptible.js").DefinitionWithArgsNameKeyed<"SaveDraft", {
     readonly revision: S.Number;
 }, Effect.Effect<{
     readonly _tag: "SucceededSaveDraft";

package/dist/test/apps/drafts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"drafts.d.ts","sourceRoot":"","sources":["../../../src/test/apps/drafts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAc,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAA;AAExD,OAAO,KAAK,OAAO,MAAM,wBAAwB,CAAA;AACjD,OAAO,KAAK,aAAa,MAAM,sCAAsC,CAAA;AACrE,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAMhE,eAAO,MAAM,UAAU,qDAA6C,CAAA;AACpE,MAAM,MAAM,UAAU,GAAG,OAAO,UAAU,CAAC,IAAI,CAAA;AAE/C,eAAO,MAAM,KAAK;;;EAGhB,CAAA;AACF,MAAM,MAAM,KAAK,GAAG,OAAO,KAAK,CAAC,IAAI,CAAA;AAIrC,eAAO,MAAM,gBAAgB,8EAAwB,CAAA;AACrD,eAAO,MAAM,kBAAkB;;EAE7B,CAAA;AAEF,eAAO,MAAM,OAAO;;IAAkD,CAAA;AACtE,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAA;AAIzC,eAAO,MAAM,aAAa;;EAAmC,CAAA;AAC7D,MAAM,MAAM,aAAa,GAAG,OAAO,aAAa,CAAC,IAAI,CAAA;AAErD,eAAO,MAAM,SAAS;;;;;iBAIwD,CAAA;AAI9E,eAAO,MAAM,YAAY,EAAE,KAA0C,CAAA;AAIrE,eAAO,MAAM,MAAM,GACjB,OAAO,KAAK,EACZ,SAAS,OAAO,KACf,SAAS,CAAC,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAYxD,CAAA;AAIH,eAAO,MAAM,IAAI,GAAI,OAAO,KAAK,EAAE,GAAG,WAAW,CAAC,OAAO,CAAC,KAAG,QAU5D,CAAA"}
+{"version":3,"file":"drafts.d.ts","sourceRoot":"","sources":["../../../src/test/apps/drafts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAc,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAA;AAExD,OAAO,KAAK,OAAO,MAAM,wBAAwB,CAAA;AACjD,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAMhE,eAAO,MAAM,UAAU,qDAA6C,CAAA;AACpE,MAAM,MAAM,UAAU,GAAG,OAAO,UAAU,CAAC,IAAI,CAAA;AAE/C,eAAO,MAAM,KAAK;;;EAGhB,CAAA;AACF,MAAM,MAAM,KAAK,GAAG,OAAO,KAAK,CAAC,IAAI,CAAA;AAIrC,eAAO,MAAM,gBAAgB,8EAAwB,CAAA;AACrD,eAAO,MAAM,kBAAkB;;EAE7B,CAAA;AAEF,eAAO,MAAM,OAAO;;IAAkD,CAAA;AACtE,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAA;AAIzC,eAAO,MAAM,aAAa;;EAAmC,CAAA;AAC7D,MAAM,MAAM,aAAa,GAAG,OAAO,aAAa,CAAC,IAAI,CAAA;AAErD,eAAO,MAAM,SAAS;;;;;iBAMpB,CAAA;AAIF,eAAO,MAAM,YAAY,EAAE,KAA0C,CAAA;AAIrE,eAAO,MAAM,MAAM,GACjB,OAAO,KAAK,EACZ,SAAS,OAAO,KACf,SAAS,CAAC,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAYxD,CAAA;AAIH,eAAO,MAAM,IAAI,GAAI,OAAO,KAAK,EAAE,GAAG,WAAW,CAAC,OAAO,CAAC,KAAG,QAU5D,CAAA"}

package/dist/test/apps/drafts.js

@@ -1,5 +1,5 @@
 import { Effect, Match as M, Schema as S } from 'effect';
-import * as Interruptible from '../../command/interruptible/index.js';
+import * as Command from '../../command/index.js';
 import { m } from '../../message/index.js';
 import { evo } from '../../struct/index.js';
 // MODEL
@@ -16,7 +16,12 @@ export const SucceededSaveDraft = m('SucceededSaveDraft', {
 export const Message = S.Union([ClickedSaveDraft, SucceededSaveDraft]);
 // COMMAND
 export const SaveDraftArgs = S.Struct({ revision: S.Number });
-export const SaveDraft = Interruptible.define('SaveDraft', SaveDraftArgs.fields, SucceededSaveDraft)(({ revision }) => Effect.as(Effect.never, SucceededSaveDraft({ revision })));
+export const SaveDraft = Command.define('SaveDraft', {
+    args: SaveDraftArgs.fields,
+    messages: [SucceededSaveDraft],
+    interrupt: true,
+    execute: ({ revision }) => Effect.as(Effect.never, SucceededSaveDraft({ revision })),
+});
 // INIT
 export const initialModel = { revision: 0, status: 'Editing' };
 // UPDATE

package/dist/test/apps/formChild.d.ts

@@ -9,10 +9,10 @@ export declare const SucceededSubmit: import("../../schema/index.js").CallableTa
     id: S.String;
 }>;
 export declare const CancelledForm: import("../../schema/index.js").CallableTaggedStruct<"CancelledForm", {}>;
-export declare const CompletedReset: import("../../schema/index.js").CallableTaggedStruct<"CompletedReset", {}>;
+export declare const CompletedResetForm: import("../../schema/index.js").CallableTaggedStruct<"CompletedResetForm", {}>;
 export declare const ChildMessage: S.Union<readonly [import("../../schema/index.js").CallableTaggedStruct<"SubmittedForm", {}>, import("../../schema/index.js").CallableTaggedStruct<"SucceededSubmit", {
     id: S.String;
-}>, import("../../schema/index.js").CallableTaggedStruct<"CancelledForm", {}>, import("../../schema/index.js").CallableTaggedStruct<"CompletedReset", {}>]>;
+}>, import("../../schema/index.js").CallableTaggedStruct<"CancelledForm", {}>, import("../../schema/index.js").CallableTaggedStruct<"CompletedResetForm", {}>]>;
 export type ChildMessage = typeof ChildMessage.Type;
 export declare const RequestedSave: import("../../schema/index.js").CallableTaggedStruct<"RequestedSave", {
     id: S.String;
@@ -27,7 +27,7 @@ export declare const SubmitForm: Command.CommandDefinitionNoArgs<"SubmitForm", E
     readonly id: string;
 }, never, never>>;
 export declare const ResetForm: Command.CommandDefinitionNoArgs<"ResetForm", Effect.Effect<{
-    readonly _tag: "CompletedReset";
+    readonly _tag: "CompletedResetForm";
 }, never, never>>;
 export declare const initialChildModel: ChildModel;
 export declare const childUpdate: (_model: ChildModel, message: ChildMessage) => readonly [ChildModel, ReadonlyArray<Command.Command<ChildMessage>>, Option.Option<ChildOutMessage>];
@@ -42,13 +42,13 @@ export type ParentModel = typeof ParentModel.Type;
 export declare const GotChildMessage: import("../../schema/index.js").CallableTaggedStruct<"GotChildMessage", {
     message: S.Union<readonly [import("../../schema/index.js").CallableTaggedStruct<"SubmittedForm", {}>, import("../../schema/index.js").CallableTaggedStruct<"SucceededSubmit", {
         id: S.String;
-    }>, import("../../schema/index.js").CallableTaggedStruct<"CancelledForm", {}>, import("../../schema/index.js").CallableTaggedStruct<"CompletedReset", {}>]>;
+    }>, import("../../schema/index.js").CallableTaggedStruct<"CancelledForm", {}>, import("../../schema/index.js").CallableTaggedStruct<"CompletedResetForm", {}>]>;
 }>;
 export declare const CompletedParentReset: import("../../schema/index.js").CallableTaggedStruct<"CompletedParentReset", {}>;
 export declare const ParentMessage: S.Union<readonly [import("../../schema/index.js").CallableTaggedStruct<"GotChildMessage", {
     message: S.Union<readonly [import("../../schema/index.js").CallableTaggedStruct<"SubmittedForm", {}>, import("../../schema/index.js").CallableTaggedStruct<"SucceededSubmit", {
         id: S.String;
-    }>, import("../../schema/index.js").CallableTaggedStruct<"CancelledForm", {}>, import("../../schema/index.js").CallableTaggedStruct<"CompletedReset", {}>]>;
+    }>, import("../../schema/index.js").CallableTaggedStruct<"CancelledForm", {}>, import("../../schema/index.js").CallableTaggedStruct<"CompletedResetForm", {}>]>;
 }>, import("../../schema/index.js").CallableTaggedStruct<"CompletedParentReset", {}>]>;
 export type ParentMessage = typeof ParentMessage.Type;
 export declare const initialParentModel: ParentModel;

package/dist/test/apps/formChild.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"formChild.d.ts","sourceRoot":"","sources":["../../../src/test/apps/formChild.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAc,MAAM,EAAE,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAA;AAEhE,OAAO,KAAK,OAAO,MAAM,wBAAwB,CAAA;AAKjD,eAAO,MAAM,UAAU;;EAErB,CAAA;AACF,MAAM,MAAM,UAAU,GAAG,OAAO,UAAU,CAAC,IAAI,CAAA;AAI/C,eAAO,MAAM,aAAa,2EAAqB,CAAA;AAC/C,eAAO,MAAM,eAAe;;EAAyC,CAAA;AACrE,eAAO,MAAM,aAAa,2EAAqB,CAAA;AAC/C,eAAO,MAAM,cAAc,4EAAsB,CAAA;AAEjD,eAAO,MAAM,YAAY;;2JAKvB,CAAA;AACF,MAAM,MAAM,YAAY,GAAG,OAAO,YAAY,CAAC,IAAI,CAAA;AAInD,eAAO,MAAM,aAAa;;EAAuC,CAAA;AACjE,eAAO,MAAM,eAAe,6EAAuB,CAAA;AAEnD,eAAO,MAAM,eAAe;;iFAA4C,CAAA;AACxE,MAAM,MAAM,eAAe,GAAG,OAAO,eAAe,CAAC,IAAI,CAAA;AAIzD,eAAO,MAAM,UAAU;;;iBAG6B,CAAA;AAEpD,eAAO,MAAM,SAAS;;iBAGgB,CAAA;AAItC,eAAO,MAAM,iBAAiB,EAAE,UAA+B,CAAA;AAI/D,eAAO,MAAM,WAAW,GACtB,QAAQ,UAAU,EAClB,SAAS,YAAY,KACpB,SAAS,CACV,UAAU,EACV,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,EAC5C,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CA4B7B,CAAA;AAIH,eAAO,MAAM,WAAW;;;;;;EAItB,CAAA;AACF,MAAM,MAAM,WAAW,GAAG,OAAO,WAAW,CAAC,IAAI,CAAA;AAIjD,eAAO,MAAM,eAAe;;;;EAE1B,CAAA;AACF,eAAO,MAAM,oBAAoB,kFAA4B,CAAA;AAE7D,eAAO,MAAM,aAAa;;;;sFAAmD,CAAA;AAC7E,MAAM,MAAM,aAAa,GAAG,OAAO,aAAa,CAAC,IAAI,CAAA;AAIrD,eAAO,MAAM,kBAAkB,EAAE,WAIhC,CAAA;AAID,eAAO,MAAM,YAAY,GACvB,aAAa,WAAW,EACxB,SAAS,aAAa,KACrB,SAAS,CAAC,WAAW,EAAE,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAqCpE,CAAA"}
+{"version":3,"file":"formChild.d.ts","sourceRoot":"","sources":["../../../src/test/apps/formChild.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAc,MAAM,EAAE,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAA;AAEhE,OAAO,KAAK,OAAO,MAAM,wBAAwB,CAAA;AAKjD,eAAO,MAAM,UAAU;;EAErB,CAAA;AACF,MAAM,MAAM,UAAU,GAAG,OAAO,UAAU,CAAC,IAAI,CAAA;AAI/C,eAAO,MAAM,aAAa,2EAAqB,CAAA;AAC/C,eAAO,MAAM,eAAe;;EAAyC,CAAA;AACrE,eAAO,MAAM,aAAa,2EAAqB,CAAA;AAC/C,eAAO,MAAM,kBAAkB,gFAA0B,CAAA;AAEzD,eAAO,MAAM,YAAY;;+JAKvB,CAAA;AACF,MAAM,MAAM,YAAY,GAAG,OAAO,YAAY,CAAC,IAAI,CAAA;AAInD,eAAO,MAAM,aAAa;;EAAuC,CAAA;AACjE,eAAO,MAAM,eAAe,6EAAuB,CAAA;AAEnD,eAAO,MAAM,eAAe;;iFAA4C,CAAA;AACxE,MAAM,MAAM,eAAe,GAAG,OAAO,eAAe,CAAC,IAAI,CAAA;AAIzD,eAAO,MAAM,UAAU;;;iBAGrB,CAAA;AAEF,eAAO,MAAM,SAAS;;iBAGpB,CAAA;AAIF,eAAO,MAAM,iBAAiB,EAAE,UAA+B,CAAA;AAI/D,eAAO,MAAM,WAAW,GACtB,QAAQ,UAAU,EAClB,SAAS,YAAY,KACpB,SAAS,CACV,UAAU,EACV,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,EAC5C,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CA4B7B,CAAA;AAIH,eAAO,MAAM,WAAW;;;;;;EAItB,CAAA;AACF,MAAM,MAAM,WAAW,GAAG,OAAO,WAAW,CAAC,IAAI,CAAA;AAIjD,eAAO,MAAM,eAAe;;;;EAE1B,CAAA;AACF,eAAO,MAAM,oBAAoB,kFAA4B,CAAA;AAE7D,eAAO,MAAM,aAAa;;;;sFAAmD,CAAA;AAC7E,MAAM,MAAM,aAAa,GAAG,OAAO,aAAa,CAAC,IAAI,CAAA;AAIrD,eAAO,MAAM,kBAAkB,EAAE,WAIhC,CAAA;AAID,eAAO,MAAM,YAAY,GACvB,aAAa,WAAW,EACxB,SAAS,aAAa,KACrB,SAAS,CAAC,WAAW,EAAE,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAqCpE,CAAA"}

package/dist/test/apps/formChild.js

@@ -9,20 +9,26 @@ export const ChildModel = S.Struct({
 export const SubmittedForm = m('SubmittedForm');
 export const SucceededSubmit = m('SucceededSubmit', { id: S.String });
 export const CancelledForm = m('CancelledForm');
-export const CompletedReset = m('CompletedReset');
+export const CompletedResetForm = m('CompletedResetForm');
 export const ChildMessage = S.Union([
     SubmittedForm,
     SucceededSubmit,
     CancelledForm,
-    CompletedReset,
+    CompletedResetForm,
 ]);
 // CHILD OUT MESSAGE
 export const RequestedSave = m('RequestedSave', { id: S.String });
 export const RequestedCancel = m('RequestedCancel');
 export const ChildOutMessage = S.Union([RequestedSave, RequestedCancel]);
 // CHILD COMMAND
-export const SubmitForm = Command.define('SubmitForm', SucceededSubmit)(Effect.sync(() => SucceededSubmit({ id: 'abc' })));
-export const ResetForm = Command.define('ResetForm', CompletedReset)(Effect.sync(() => CompletedReset()));
+export const SubmitForm = Command.define('SubmitForm', {
+    messages: [SucceededSubmit],
+    execute: Effect.sync(() => SucceededSubmit({ id: 'abc' })),
+});
+export const ResetForm = Command.define('ResetForm', {
+    messages: [CompletedResetForm],
+    execute: Effect.sync(() => CompletedResetForm()),
+});
 // CHILD INIT
 export const initialChildModel = { status: 'Idle' };
 // CHILD UPDATE
@@ -42,7 +48,7 @@ export const childUpdate = (_model, message) => M.value(message).pipe(M.withRetu
         [],
         Option.some(RequestedCancel()),
     ],
-    CompletedReset: () => [{ status: 'Idle' }, [], Option.none()],
+    CompletedResetForm: () => [{ status: 'Idle' }, [], Option.none()],
 }));
 // PARENT MODEL
 export const ParentModel = S.Struct({

package/dist/test/apps/login.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../src/test/apps/login.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAc,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAA;AAExD,OAAO,KAAK,OAAO,MAAM,wBAAwB,CAAA;AACjD,OAAO,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAK5D,eAAO,MAAM,KAAK;;;;;;EAMhB,CAAA;AAEF,MAAM,MAAM,KAAK,GAAG,OAAO,KAAK,CAAC,IAAI,CAAA;AAIrC,eAAO,MAAM,YAAY;;EAAyC,CAAA;AAClE,eAAO,MAAM,eAAe;;EAA4C,CAAA;AACxE,eAAO,MAAM,cAAc,4EAAsB,CAAA;AACjD,eAAO,MAAM,qBAAqB;;EAEhC,CAAA;AACF,eAAO,MAAM,kBAAkB;;EAA+C,CAAA;AAC9E,eAAO,MAAM,aAAa,2EAAqB,CAAA;AAE/C,eAAO,MAAM,OAAO;;;;;;;;+EAOlB,CAAA;AACF,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAA;AAIzC,eAAO,MAAM,YAAY;;;iBAIyC,CAAA;AAIlE,eAAO,MAAM,YAAY,EAAE,KAM1B,CAAA;AAID,eAAO,MAAM,MAAM,GACjB,OAAO,KAAK,EACZ,SAAS,OAAO,KACf,SAAS,CAAC,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAyBxD,CAAA;AAIH,eAAO,MAAM,IAAI,GAAI,OAAO,KAAK,EAAE,GAAG,WAAW,CAAC,OAAO,CAAC,KAAG,IA8E5D,CAAA"}
+{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../src/test/apps/login.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAc,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAA;AAExD,OAAO,KAAK,OAAO,MAAM,wBAAwB,CAAA;AACjD,OAAO,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAK5D,eAAO,MAAM,KAAK;;;;;;EAMhB,CAAA;AAEF,MAAM,MAAM,KAAK,GAAG,OAAO,KAAK,CAAC,IAAI,CAAA;AAIrC,eAAO,MAAM,YAAY;;EAAyC,CAAA;AAClE,eAAO,MAAM,eAAe;;EAA4C,CAAA;AACxE,eAAO,MAAM,cAAc,4EAAsB,CAAA;AACjD,eAAO,MAAM,qBAAqB;;EAEhC,CAAA;AACF,eAAO,MAAM,kBAAkB;;EAA+C,CAAA;AAC9E,eAAO,MAAM,aAAa,2EAAqB,CAAA;AAE/C,eAAO,MAAM,OAAO;;;;;;;;+EAOlB,CAAA;AACF,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAA;AAIzC,eAAO,MAAM,YAAY;;;iBAGvB,CAAA;AAIF,eAAO,MAAM,YAAY,EAAE,KAM1B,CAAA;AAID,eAAO,MAAM,MAAM,GACjB,OAAO,KAAK,EACZ,SAAS,OAAO,KACf,SAAS,CAAC,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAyBxD,CAAA;AAIH,eAAO,MAAM,IAAI,GAAI,OAAO,KAAK,EAAE,GAAG,WAAW,CAAC,OAAO,CAAC,KAAG,IA8E5D,CAAA"}

package/dist/test/apps/login.js

@@ -27,7 +27,10 @@ export const Message = S.Union([
     ClickedLogout,
 ]);
 // COMMAND
-export const Authenticate = Command.define('Authenticate', SucceededAuthenticate, FailedAuthenticate)(Effect.sync(() => SucceededAuthenticate({ username: 'alice' })));
+export const Authenticate = Command.define('Authenticate', {
+    messages: [SucceededAuthenticate, FailedAuthenticate],
+    execute: Effect.sync(() => SucceededAuthenticate({ username: 'alice' })),
+});
 // INIT
 export const initialModel = {
     email: '',

package/dist/test/apps/resumeUpload.d.ts

@@ -8,7 +8,7 @@ export declare const Model: S.Struct<{
 }>;
 export type Model = typeof Model.Type;
 export declare const ClickedChooseResume: import("../../schema/index.js").CallableTaggedStruct<"ClickedChooseResume", {}>;
-export declare const SelectedResume: import("../../schema/index.js").CallableTaggedStruct<"SelectedResume", {
+export declare const CompletedSelectResume: import("../../schema/index.js").CallableTaggedStruct<"CompletedSelectResume", {
     file: S.Schema<File>;
 }>;
 export declare const CancelledSelectResume: import("../../schema/index.js").CallableTaggedStruct<"CancelledSelectResume", {}>;
@@ -17,7 +17,7 @@ export declare const SucceededReadPreview: import("../../schema/index.js").Calla
 }>;
 export declare const FailedReadPreview: import("../../schema/index.js").CallableTaggedStruct<"FailedReadPreview", {}>;
 export declare const ClickedRemoveResume: import("../../schema/index.js").CallableTaggedStruct<"ClickedRemoveResume", {}>;
-export declare const Message: S.Union<readonly [import("../../schema/index.js").CallableTaggedStruct<"ClickedChooseResume", {}>, import("../../schema/index.js").CallableTaggedStruct<"SelectedResume", {
+export declare const Message: S.Union<readonly [import("../../schema/index.js").CallableTaggedStruct<"ClickedChooseResume", {}>, import("../../schema/index.js").CallableTaggedStruct<"CompletedSelectResume", {
     file: S.Schema<File>;
 }>, import("../../schema/index.js").CallableTaggedStruct<"CancelledSelectResume", {}>, import("../../schema/index.js").CallableTaggedStruct<"SucceededReadPreview", {
     dataUrl: S.String;
@@ -26,7 +26,7 @@ export type Message = typeof Message.Type;
 export declare const SelectResume: Command.CommandDefinitionNoArgs<"SelectResume", Effect.Effect<{
     readonly _tag: "CancelledSelectResume";
 } | {
-    readonly _tag: "SelectedResume";
+    readonly _tag: "CompletedSelectResume";
     readonly file: File;
 }, never, never>>;
 export declare const ReadResumePreview: Command.CommandDefinitionWithArgs<"ReadResumePreview", {

package/dist/test/apps/resumeUpload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resumeUpload.d.ts","sourceRoot":"","sources":["../../../src/test/apps/resumeUpload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAsB,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAA;AAEhE,OAAO,KAAK,OAAO,MAAM,wBAAwB,CAAA;AAEjD,OAAO,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAM5D,eAAO,MAAM,KAAK;;;;EAIhB,CAAA;AAEF,MAAM,MAAM,KAAK,GAAG,OAAO,KAAK,CAAC,IAAI,CAAA;AAIrC,eAAO,MAAM,mBAAmB,iFAA2B,CAAA;AAC3D,eAAO,MAAM,cAAc;;EAEzB,CAAA;AACF,eAAO,MAAM,qBAAqB,mFAA6B,CAAA;AAC/D,eAAO,MAAM,oBAAoB;;EAE/B,CAAA;AACF,eAAO,MAAM,iBAAiB,+EAAyB,CAAA;AACvD,eAAO,MAAM,mBAAmB,iFAA2B,CAAA;AAE3D,eAAO,MAAM,OAAO;;;;oKAOlB,CAAA;AACF,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAA;AAIzC,eAAO,MAAM,YAAY;;;;;iBAaxB,CAAA;AAED,eAAO,MAAM,iBAAiB;;;;;;;iBAU7B,CAAA;AAID,eAAO,MAAM,YAAY,EAAE,KAI1B,CAAA;AAID,KAAK,YAAY,GAAG,SAAS,CAAC,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;AAE7E,eAAO,MAAM,MAAM,GAAI,OAAO,KAAK,EAAE,SAAS,OAAO,KAAG,YA+BrD,CAAA;AAsBH,eAAO,MAAM,IAAI,GAAI,OAAO,KAAK,EAAE,GAAG,WAAW,CAAC,OAAO,CAAC,KAAG,IAmB5D,CAAA"}
+{"version":3,"file":"resumeUpload.d.ts","sourceRoot":"","sources":["../../../src/test/apps/resumeUpload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAsB,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAA;AAEhE,OAAO,KAAK,OAAO,MAAM,wBAAwB,CAAA;AAEjD,OAAO,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAM5D,eAAO,MAAM,KAAK;;;;EAIhB,CAAA;AAEF,MAAM,MAAM,KAAK,GAAG,OAAO,KAAK,CAAC,IAAI,CAAA;AAIrC,eAAO,MAAM,mBAAmB,iFAA2B,CAAA;AAC3D,eAAO,MAAM,qBAAqB;;EAEhC,CAAA;AACF,eAAO,MAAM,qBAAqB,mFAA6B,CAAA;AAC/D,eAAO,MAAM,oBAAoB;;EAE/B,CAAA;AACF,eAAO,MAAM,iBAAiB,+EAAyB,CAAA;AACvD,eAAO,MAAM,mBAAmB,iFAA2B,CAAA;AAE3D,eAAO,MAAM,OAAO;;;;oKAOlB,CAAA;AACF,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAA;AAIzC,eAAO,MAAM,YAAY;;;;;iBAUvB,CAAA;AAEF,eAAO,MAAM,iBAAiB;;;;;;;iBAQ5B,CAAA;AAIF,eAAO,MAAM,YAAY,EAAE,KAI1B,CAAA;AAID,KAAK,YAAY,GAAG,SAAS,CAAC,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;AAE7E,eAAO,MAAM,MAAM,GAAI,OAAO,KAAK,EAAE,SAAS,OAAO,KAAG,YA+BrD,CAAA;AAsBH,eAAO,MAAM,IAAI,GAAI,OAAO,KAAK,EAAE,GAAG,WAAW,CAAC,OAAO,CAAC,KAAG,IAmB5D,CAAA"}