foldkit 0.135.0 → 0.137.0

package/dist/test/apps/resumeUpload.js

@@ -11,7 +11,7 @@ export const Model = S.Struct({
 });
 // MESSAGE
 export const ClickedChooseResume = m('ClickedChooseResume');
-export const SelectedResume = m('SelectedResume', {
+export const CompletedSelectResume = m('CompletedSelectResume', {
     file: File.File,
 });
 export const CancelledSelectResume = m('CancelledSelectResume');
@@ -22,18 +22,25 @@ export const FailedReadPreview = m('FailedReadPreview');
 export const ClickedRemoveResume = m('ClickedRemoveResume');
 export const Message = S.Union([
     ClickedChooseResume,
-    SelectedResume,
+    CompletedSelectResume,
     CancelledSelectResume,
     SucceededReadPreview,
     FailedReadPreview,
     ClickedRemoveResume,
 ]);
 // COMMAND
-export const SelectResume = Command.define('SelectResume', SelectedResume, CancelledSelectResume)(File.select(['application/pdf']).pipe(Effect.map(Option.match({
-    onNone: () => CancelledSelectResume(),
-    onSome: file => SelectedResume({ file }),
-}))));
-export const ReadResumePreview = Command.define('ReadResumePreview', { file: File.File }, SucceededReadPreview, FailedReadPreview)(({ file }) => File.readAsDataUrl(file).pipe(Effect.map(dataUrl => SucceededReadPreview({ dataUrl })), Effect.catch(() => Effect.succeed(FailedReadPreview()))));
+export const SelectResume = Command.define('SelectResume', {
+    messages: [CompletedSelectResume, CancelledSelectResume],
+    execute: File.select(['application/pdf']).pipe(Effect.map(Option.match({
+        onNone: () => CancelledSelectResume(),
+        onSome: file => CompletedSelectResume({ file }),
+    }))),
+});
+export const ReadResumePreview = Command.define('ReadResumePreview', {
+    args: { file: File.File },
+    messages: [SucceededReadPreview, FailedReadPreview],
+    execute: ({ file }) => File.readAsDataUrl(file).pipe(Effect.map(dataUrl => SucceededReadPreview({ dataUrl })), Effect.catch(() => Effect.succeed(FailedReadPreview()))),
+});
 // INIT
 export const initialModel = {
     maybeResume: Option.none(),
@@ -42,7 +49,7 @@ export const initialModel = {
 };
 export const update = (model, message) => M.value(message).pipe(M.withReturnType(), M.tagsExhaustive({
     ClickedChooseResume: () => [model, [SelectResume()]],
-    SelectedResume: ({ file }) => [
+    CompletedSelectResume: ({ file }) => [
         evo(model, {
             maybeResume: () => Option.some(file),
             maybePreviewDataUrl: () => Option.none(),

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

@@ -53,17 +53,17 @@ export declare const UploadFileArgs: S.Struct<{
 export type UploadFileArgs = typeof UploadFileArgs.Type;
 export declare const UploadFile: Interruptible.DefinitionWithArgs<"UploadFile", {
     readonly uploadId: S.Number;
-}, {
+}, Pick<{
     readonly uploadId: number;
-}, Effect.Effect<{
+}, "uploadId">, Effect.Effect<{
     readonly _tag: "SucceededUploadFile";
     readonly uploadId: number;
 }, never, never>>;
 export declare const CancelUploadFile: ({ uploadId }: UploadFileArgs) => Readonly<{
     name: "UploadFile.Interrupt";
-    args: {
+    args: Pick<{
         readonly uploadId: number;
-    };
+    }, "uploadId">;
     interruptsKey: string;
     effect: Effect.Effect<{
         readonly _tag: "CompletedCancelUploadFile";

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

@@ -1 +1 @@
-{"version":3,"file":"uploads.d.ts","sourceRoot":"","sources":["../../../src/test/apps/uploads.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,aAAa,MAAM,sCAAsC,CAAA;AACrE,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAMhE,eAAO,MAAM,YAAY,mEAKvB,CAAA;AACF,MAAM,MAAM,YAAY,GAAG,OAAO,YAAY,CAAC,IAAI,CAAA;AAEnD,eAAO,MAAM,MAAM;;;EAGjB,CAAA;AACF,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC,IAAI,CAAA;AAEvC,eAAO,MAAM,KAAK;;;;;;EAGhB,CAAA;AACF,MAAM,MAAM,KAAK,GAAG,OAAO,KAAK,CAAC,IAAI,CAAA;AAIrC,eAAO,MAAM,kBAAkB,gFAA0B,CAAA;AACzD,eAAO,MAAM,kBAAkB;;EAE7B,CAAA;AACF,eAAO,MAAM,mBAAmB;;EAE9B,CAAA;AACF,eAAO,MAAM,mBAAmB;;EAE9B,CAAA;AACF,eAAO,MAAM,gBAAgB;;EAAgD,CAAA;AAC7E,eAAO,MAAM,yBAAyB;;;EAGpC,CAAA;AAEF,eAAO,MAAM,OAAO;;;;;;;;;;;IAOlB,CAAA;AACF,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAA;AAIzC,eAAO,MAAM,cAAc;;EAAmC,CAAA;AAC9D,MAAM,MAAM,cAAc,GAAG,OAAO,cAAc,CAAC,IAAI,CAAA;AAEvD,eAAO,MAAM,UAAU;;;;;;;iBAMwD,CAAA;AAE/E,eAAO,MAAM,gBAAgB,GAAI,cAAc,cAAc;;;;;;;;;;;;;;;EAG1D,CAAA;AAIH,eAAO,MAAM,YAAY,EAAE,KAAoC,CAAA;AAS/D,eAAO,MAAM,MAAM,GACjB,OAAO,KAAK,EACZ,SAAS,OAAO,KACf,SAAS,CAAC,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAiDxD,CAAA;AAIH,eAAO,MAAM,IAAI,GAAI,OAAO,KAAK,EAAE,GAAG,WAAW,CAAC,OAAO,CAAC,KAAG,QAyB5D,CAAA"}
+{"version":3,"file":"uploads.d.ts","sourceRoot":"","sources":["../../../src/test/apps/uploads.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,aAAa,MAAM,sCAAsC,CAAA;AACrE,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAMhE,eAAO,MAAM,YAAY,mEAKvB,CAAA;AACF,MAAM,MAAM,YAAY,GAAG,OAAO,YAAY,CAAC,IAAI,CAAA;AAEnD,eAAO,MAAM,MAAM;;;EAGjB,CAAA;AACF,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC,IAAI,CAAA;AAEvC,eAAO,MAAM,KAAK;;;;;;EAGhB,CAAA;AACF,MAAM,MAAM,KAAK,GAAG,OAAO,KAAK,CAAC,IAAI,CAAA;AAIrC,eAAO,MAAM,kBAAkB,gFAA0B,CAAA;AACzD,eAAO,MAAM,kBAAkB;;EAE7B,CAAA;AACF,eAAO,MAAM,mBAAmB;;EAE9B,CAAA;AACF,eAAO,MAAM,mBAAmB;;EAE9B,CAAA;AACF,eAAO,MAAM,gBAAgB;;EAAgD,CAAA;AAC7E,eAAO,MAAM,yBAAyB;;;EAGpC,CAAA;AAEF,eAAO,MAAM,OAAO;;;;;;;;;;;IAOlB,CAAA;AACF,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAA;AAIzC,eAAO,MAAM,cAAc;;EAAmC,CAAA;AAC9D,MAAM,MAAM,cAAc,GAAG,OAAO,cAAc,CAAC,IAAI,CAAA;AAEvD,eAAO,MAAM,UAAU;;;;;;;iBASrB,CAAA;AAEF,eAAO,MAAM,gBAAgB,GAAI,cAAc,cAAc;;;;;;;;;;;;;;;EAG1D,CAAA;AAIH,eAAO,MAAM,YAAY,EAAE,KAAoC,CAAA;AAS/D,eAAO,MAAM,MAAM,GACjB,OAAO,KAAK,EACZ,SAAS,OAAO,KACf,SAAS,CAAC,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAiDxD,CAAA;AAIH,eAAO,MAAM,IAAI,GAAI,OAAO,KAAK,EAAE,GAAG,WAAW,CAAC,OAAO,CAAC,KAAG,QAyB5D,CAAA"}

package/dist/test/apps/uploads.js

@@ -1,4 +1,5 @@
 import { Array, Effect, Match as M, Number, Schema as S } from 'effect';
+import * as Command from '../../command/index.js';
 import * as Interruptible from '../../command/interruptible/index.js';
 import { m } from '../../message/index.js';
 import { evo } from '../../struct/index.js';
@@ -43,7 +44,15 @@ export const Message = S.Union([
 ]);
 // COMMAND
 export const UploadFileArgs = S.Struct({ uploadId: S.Number });
-export const UploadFile = Interruptible.define('UploadFile', UploadFileArgs.fields, ({ uploadId }) => String(uploadId), SucceededUploadFile, FailedUploadFile)(({ uploadId }) => Effect.as(Effect.never, SucceededUploadFile({ uploadId })));
+export const UploadFile = Command.define('UploadFile', {
+    args: UploadFileArgs.fields,
+    messages: [SucceededUploadFile, FailedUploadFile],
+    interrupt: {
+        keyFields: ['uploadId'],
+        toKey: ({ uploadId }) => String(uploadId),
+    },
+    execute: ({ uploadId }) => Effect.as(Effect.never, SucceededUploadFile({ uploadId })),
+});
 export const CancelUploadFile = ({ uploadId }) => UploadFile.Interrupt({ uploadId }, outcome => CompletedCancelUploadFile({ uploadId, outcome }));
 // INIT
 export const initialModel = { uploadId: 0, uploads: [] };

package/dist/test/internal.d.ts

@@ -12,7 +12,7 @@ import { type MountDefinition } from '../mount/index.js';
  *  without the test restating it. Absent on synthetic matchers built for
  *  formatting; treated as empty then.
  *
- *  `key` is present on Commands built with `Command.Interruptible.define`:
+ *  `key` is present on Commands built with an interruptible `Command.define`:
  *  such Commands may stay pending across Messages (they model long-running
  *  work). `interruptsKey` is present on Interrupt Commands: resolving one
  *  drops every pending Command holding that key, mirroring the runtime
@@ -144,7 +144,7 @@ export declare const assertExactCommands: (commands: ReadonlyArray<AnyCommand>,
 /** Throws if there are any pending Commands. */
 export declare const assertZeroCommands: (commands: ReadonlyArray<AnyCommand>) => void;
 /** Throws when trying to send a message with unresolved Commands. Keyed
- *  Commands (built with `Command.Interruptible.define`) and Interrupt
+ *  Commands (built with an interruptible `Command.define`) and Interrupt
  *  Commands are exempt: they model in-flight async work that legitimately
  *  stays pending while later Messages arrive, so a story can dispatch the
  *  Message that interrupts a keyed Command, or keep typing while a

package/dist/test/internal.js

@@ -164,7 +164,7 @@ export const assertZeroCommands = (commands) => {
     }
 };
 /** Throws when trying to send a message with unresolved Commands. Keyed
- *  Commands (built with `Command.Interruptible.define`) and Interrupt
+ *  Commands (built with an interruptible `Command.define`) and Interrupt
  *  Commands are exempt: they model in-flight async work that legitimately
  *  stays pending while later Messages arrive, so a story can dispatch the
  *  Message that interrupts a keyed Command, or keep typing while a

package/dist/test/scene.d.ts

@@ -64,7 +64,7 @@ type SceneCommandInstance<ResultMessage = unknown> = Readonly<{
 }>;
 /** A Command Definition accepted by `Scene.Command.resolve` as a name matcher:
  *  a plain `Command.define` Definition or an interruptible
- *  `Command.Interruptible.define` Definition. Both carry the
+ *  interruptible `Command.define` Definition. Both carry the
  *  `CommandDefinitionTypeId` brand and match by name at runtime, so `resolve`
  *  accepts either, the way `expectHas`/`expectExact` already do. */
 type ResolvableCommandDefinition<Name extends string, ResultMessage> = CommandDefinition<Name, ResultMessage> | Interruptible.DefinitionNoArgs<Name, Effect.Effect<ResultMessage, any, any>> | Interruptible.DefinitionWithArgs<Name, any, any, Effect.Effect<ResultMessage, any, any>> | Interruptible.DefinitionWithArgsNameKeyed<Name, any, Effect.Effect<ResultMessage, any, any>>;

package/dist/test/story.d.ts

@@ -13,7 +13,7 @@ type AnyCommandInstance<ResultMessage = unknown> = Readonly<{
 }>;
 /** A Command Definition accepted by `Story.Command.resolve` as a name matcher:
  *  a plain `Command.define` Definition or an interruptible
- *  `Command.Interruptible.define` Definition. Both carry the
+ *  interruptible `Command.define` Definition. Both carry the
  *  `CommandDefinitionTypeId` brand and match by name at runtime, so `resolve`
  *  accepts either, the way `expectHas`/`expectExact` already do. */
 type ResolvableCommandDefinition<Name extends string, ResultMessage> = CommandDefinition<Name, ResultMessage> | Interruptible.DefinitionNoArgs<Name, Effect.Effect<ResultMessage, any, any>> | Interruptible.DefinitionWithArgs<Name, any, any, Effect.Effect<ResultMessage, any, any>> | Interruptible.DefinitionWithArgsNameKeyed<Name, any, Effect.Effect<ResultMessage, any, any>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foldkit",
-  "version": "0.135.0",
+  "version": "0.137.0",
   "description": "A TypeScript frontend framework, built on Effect and architected like Elm",
   "type": "module",
   "main": "./dist/index.js",