create-foldkit-app 0.35.1 → 0.35.2

package/dist/templates/examples/todo/src/main.ts

@@ -14,7 +14,7 @@ import { Command, Runtime, type Update } from 'foldkit'
 import { Document, Html, HtmlBuilder } from 'foldkit/html'
 import { defineMessageUnion } from 'foldkit/message'
 import { defineTaggedUnion } from 'foldkit/schema'
-import { evo } from 'foldkit/struct'
+import { modifyFields } from 'foldkit/struct'
 
 import { BrowserKeyValueStore } from '@effect/platform-browser'
 import { Button, Checkbox, Input } from '@foldkit/ui'
@@ -104,13 +104,13 @@ type UpdateReturn = Update.Return<Model, Message>
 export const update = (model: Model, message: Message) =>
   Message.match<UpdateReturn>(message, {
     UpdatedNewTodo: ({ text }) => ({
-      model: evo(model, {
+      model: modifyFields(model, {
         newTodoText: () => text,
       }),
     }),
 
     UpdatedEditingTodo: ({ text }) => ({
-      model: evo(model, {
+      model: modifyFields(model, {
         editing: () =>
           EditingState.match(model.editing, {
             NotEditing: () => model.editing,
@@ -141,7 +141,7 @@ export const update = (model: Model, message: Message) =>
       const updatedTodos = [...model.todos, newTodo]
 
       return {
-        model: evo(model, {
+        model: modifyFields(model, {
           todos: () => updatedTodos,
           newTodoText: () => '',
         }),
@@ -153,7 +153,7 @@ export const update = (model: Model, message: Message) =>
       const updatedTodos = Array.filter(model.todos, todo => todo.id !== id)
 
       return {
-        model: evo(model, {
+        model: modifyFields(model, {
           todos: () => updatedTodos,
         }),
         commands: [SaveTodos({ todos: updatedTodos })],
@@ -163,12 +163,12 @@ export const update = (model: Model, message: Message) =>
     ToggledTodo: ({ id }) => {
       const updatedTodos = Array.map(model.todos, todo =>
         todo.id === id
-          ? evo(todo, { completed: completed => !completed })
+          ? modifyFields(todo, { completed: completed => !completed })
           : todo,
       )
 
       return {
-        model: evo(model, {
+        model: modifyFields(model, {
           todos: () => updatedTodos,
         }),
         commands: [SaveTodos({ todos: updatedTodos })],
@@ -178,7 +178,7 @@ export const update = (model: Model, message: Message) =>
     StartedEditing: ({ id }) => {
       const maybeTodo = Array.findFirst(model.todos, todo => todo.id === id)
       return {
-        model: evo(model, {
+        model: modifyFields(model, {
           editing: () =>
             EditingState.Editing({
               id,
@@ -198,7 +198,7 @@ export const update = (model: Model, message: Message) =>
         Editing: ({ id, text }) => {
           if (String.isEmpty(String.trim(text))) {
             return {
-              model: evo(model, {
+              model: modifyFields(model, {
                 editing: () => EditingState.NotEditing(),
               }),
             }
@@ -206,12 +206,12 @@ export const update = (model: Model, message: Message) =>
 
           const updatedTodos = Array.map(model.todos, todo =>
             todo.id === id
-              ? evo(todo, { text: () => String.trim(text) })
+              ? modifyFields(todo, { text: () => String.trim(text) })
               : todo,
           )
 
           return {
-            model: evo(model, {
+            model: modifyFields(model, {
               todos: () => updatedTodos,
               editing: () => EditingState.NotEditing(),
             }),
@@ -221,7 +221,7 @@ export const update = (model: Model, message: Message) =>
       }),
 
     CancelledEdit: () => ({
-      model: evo(model, {
+      model: modifyFields(model, {
         editing: () => EditingState.NotEditing(),
       }),
     }),
@@ -229,13 +229,13 @@ export const update = (model: Model, message: Message) =>
     ToggledAll: () => {
       const allCompleted = Array.every(model.todos, todo => todo.completed)
       const updatedTodos = Array.map(model.todos, todo =>
-        evo(todo, {
+        modifyFields(todo, {
           completed: () => !allCompleted,
         }),
       )
 
       return {
-        model: evo(model, {
+        model: modifyFields(model, {
           todos: () => updatedTodos,
         }),
         commands: [SaveTodos({ todos: updatedTodos })],
@@ -246,7 +246,7 @@ export const update = (model: Model, message: Message) =>
       const updatedTodos = Array.filter(model.todos, todo => !todo.completed)
 
       return {
-        model: evo(model, {
+        model: modifyFields(model, {
           todos: () => updatedTodos,
         }),
         commands: [SaveTodos({ todos: updatedTodos })],
@@ -254,13 +254,13 @@ export const update = (model: Model, message: Message) =>
     },
 
     SelectedFilter: ({ filter }) => ({
-      model: evo(model, {
+      model: modifyFields(model, {
         filter: () => filter,
       }),
     }),
 
     SucceededSaveTodos: ({ todos }) => ({
-      model: evo(model, {
+      model: modifyFields(model, {
         todos: () => todos,
       }),
     }),

package/dist/templates/examples/todo/src/scene.test.ts

@@ -10,7 +10,7 @@ import {
   text,
   type,
 } from 'foldkit/scene'
-import { evo } from 'foldkit/struct'
+import { modifyFields } from 'foldkit/struct'
 import { describe, test } from 'vitest'
 
 import {
@@ -30,7 +30,7 @@ const emptyModel: Model = {
   editing: EditingState.NotEditing(),
 }
 
-const modelWithTodos: Model = evo(emptyModel, {
+const modelWithTodos: Model = modifyFields(emptyModel, {
   todos: () => [
     { id: 'abc', text: 'Buy milk', completed: false, createdAt: 1000 },
     { id: 'def', text: 'Walk the dog', completed: false, createdAt: 2000 },
@@ -93,7 +93,7 @@ describe('view', () => {
 
   test('toggle a todo by clicking its checkbox', () => {
     const toggledTodos = modelWithTodos.todos.map(todo =>
-      todo.id === 'abc' ? evo(todo, { completed: () => true }) : todo,
+      todo.id === 'abc' ? modifyFields(todo, { completed: () => true }) : todo,
     )
 
     scene(
@@ -147,7 +147,7 @@ describe('view', () => {
 
   test('mark all complete toggles all todos', () => {
     const allCompletedTodos = modelWithTodos.todos.map(todo =>
-      evo(todo, { completed: () => true }),
+      modifyFields(todo, { completed: () => true }),
     )
 
     scene(

package/dist/templates/examples/todo/src/story.test.ts

@@ -1,6 +1,6 @@
 import { Array, Option } from 'effect'
 import { Command, given, message, model, story } from 'foldkit/story'
-import { evo } from 'foldkit/struct'
+import { modifyFields } from 'foldkit/struct'
 import { describe, expect, test } from 'vitest'
 
 import {
@@ -40,7 +40,7 @@ const doneTask = {
   createdAt: 3000,
 }
 
-const modelWithTodos: Model = evo(emptyModel, {
+const modelWithTodos: Model = modifyFields(emptyModel, {
   todos: () => [buyMilk, walkDog, doneTask],
 })
 
@@ -49,7 +49,7 @@ describe('update', () => {
     test('AddedTodo with text produces a GenerateTodo Command', () => {
       story(
         update,
-        given(evo(emptyModel, { newTodoText: () => 'Buy milk' })),
+        given(modifyFields(emptyModel, { newTodoText: () => 'Buy milk' })),
         message(Message.AddedTodo()),
         Command.expectHas(GenerateTodo),
         Command.resolve(
@@ -85,7 +85,7 @@ describe('update', () => {
     test('AddedTodo with empty text is ignored', () => {
       story(
         update,
-        given(evo(emptyModel, { newTodoText: () => '' })),
+        given(modifyFields(emptyModel, { newTodoText: () => '' })),
         message(Message.AddedTodo()),
         Command.expectNone(),
       )
@@ -94,7 +94,7 @@ describe('update', () => {
     test('AddedTodo with whitespace-only text is ignored', () => {
       story(
         update,
-        given(evo(emptyModel, { newTodoText: () => '   ' })),
+        given(modifyFields(emptyModel, { newTodoText: () => '   ' })),
         message(Message.AddedTodo()),
         Command.expectNone(),
       )
@@ -115,7 +115,9 @@ describe('update', () => {
   describe('toggle and delete', () => {
     test('ToggledTodo flips the completed state', () => {
       const toggledTodos = modelWithTodos.todos.map(todo =>
-        todo.id === 'abc' ? evo(todo, { completed: () => true }) : todo,
+        todo.id === 'abc'
+          ? modifyFields(todo, { completed: () => true })
+          : todo,
       )
 
       story(
@@ -137,7 +139,9 @@ describe('update', () => {
 
     test('ToggledTodo on completed todo marks it active', () => {
       const toggledTodos = modelWithTodos.todos.map(todo =>
-        todo.id === 'ghi' ? evo(todo, { completed: () => false }) : todo,
+        todo.id === 'ghi'
+          ? modifyFields(todo, { completed: () => false })
+          : todo,
       )
 
       story(
@@ -195,7 +199,7 @@ describe('update', () => {
     })
 
     test('UpdatedEditingTodo updates the editing text', () => {
-      const editingModel: Model = evo(modelWithTodos, {
+      const editingModel: Model = modifyFields(modelWithTodos, {
         editing: () => EditingState.Editing({ id: 'abc', text: 'Buy milk' }),
       })
 
@@ -212,13 +216,15 @@ describe('update', () => {
     })
 
     test('SavedEdit updates the todo text and exits editing', () => {
-      const editingModel: Model = evo(modelWithTodos, {
+      const editingModel: Model = modifyFields(modelWithTodos, {
         editing: () =>
           EditingState.Editing({ id: 'abc', text: 'Buy oat milk' }),
       })
 
       const editedTodos = modelWithTodos.todos.map(todo =>
-        todo.id === 'abc' ? evo(todo, { text: () => 'Buy oat milk' }) : todo,
+        todo.id === 'abc'
+          ? modifyFields(todo, { text: () => 'Buy oat milk' })
+          : todo,
       )
 
       story(
@@ -240,7 +246,7 @@ describe('update', () => {
     })
 
     test('SavedEdit with empty text exits editing without saving', () => {
-      const editingModel: Model = evo(modelWithTodos, {
+      const editingModel: Model = modifyFields(modelWithTodos, {
         editing: () => EditingState.Editing({ id: 'abc', text: '   ' }),
       })
 
@@ -260,7 +266,7 @@ describe('update', () => {
     })
 
     test('CancelledEdit exits editing without changes', () => {
-      const editingModel: Model = evo(modelWithTodos, {
+      const editingModel: Model = modifyFields(modelWithTodos, {
         editing: () =>
           EditingState.Editing({ id: 'abc', text: 'Changed text' }),
       })
@@ -283,7 +289,7 @@ describe('update', () => {
   describe('bulk operations', () => {
     test('ToggledAll marks all todos completed when some are active', () => {
       const allCompletedTodos = modelWithTodos.todos.map(todo =>
-        evo(todo, { completed: () => true }),
+        modifyFields(todo, { completed: () => true }),
       )
 
       story(
@@ -303,15 +309,15 @@ describe('update', () => {
     })
 
     test('ToggledAll marks all todos active when all are completed', () => {
-      const allCompletedModel: Model = evo(emptyModel, {
+      const allCompletedModel: Model = modifyFields(emptyModel, {
         todos: () =>
           modelWithTodos.todos.map(todo =>
-            evo(todo, { completed: () => true }),
+            modifyFields(todo, { completed: () => true }),
           ),
       })
 
       const allActiveTodos = allCompletedModel.todos.map(todo =>
-        evo(todo, { completed: () => false }),
+        modifyFields(todo, { completed: () => false }),
       )
 
       story(

package/dist/templates/examples/ui-showcase/package.json

@@ -9,10 +9,10 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@effect/platform-browser": "4.0.0-rc.115",
+    "@effect/platform-browser": "4.0.0-rc.116",
     "@foldkit/ui": "workspace:*",
     "clsx": "^2.1.1",
-    "effect": "4.0.0-rc.115",
+    "effect": "4.0.0-rc.116",
     "foldkit": "workspace:*"
   },
   "devDependencies": {

package/dist/templates/examples/ui-showcase/src/main.ts

@@ -13,7 +13,7 @@ import { Document, Html, HtmlBuilder } from 'foldkit/html'
 import { defineMessageUnion } from 'foldkit/message'
 import { UrlRequest, load, pushUrl } from 'foldkit/navigation'
 import { defineRouteUnion, literal } from 'foldkit/route'
-import { evo } from 'foldkit/struct'
+import { modifyFields } from 'foldkit/struct'
 import { Url, toString as urlToString } from 'foldkit/url'
 
 import { Dialog, Nav } from '@foldkit/ui'
@@ -211,21 +211,24 @@ const toUiMessage = (message: UiMessage): Message =>
 const foldUi = Update.foldChild({
   update: uiUpdate,
   read: (model: Model) => Option.some(model.uiModel),
-  write: (model, nextUiModel) => evo(model, { uiModel: () => nextUiModel }),
+  write: (model, nextUiModel) =>
+    modifyFields(model, { uiModel: () => nextUiModel }),
   toParentMessage: toUiMessage,
 })
 
 const foldUiOpenMobileMenu = Update.foldChildStep({
   update: openMobileMenu,
   read: (model: Model) => Option.some(model.uiModel),
-  write: (model, nextUiModel) => evo(model, { uiModel: () => nextUiModel }),
+  write: (model, nextUiModel) =>
+    modifyFields(model, { uiModel: () => nextUiModel }),
   toParentMessage: toUiMessage,
 })
 
 const foldUiCloseMobileMenu = Update.foldChildStep({
   update: closeMobileMenu,
   read: (model: Model) => Option.some(model.uiModel),
-  write: (model, nextUiModel) => evo(model, { uiModel: () => nextUiModel }),
+  write: (model, nextUiModel) =>
+    modifyFields(model, { uiModel: () => nextUiModel }),
   toParentMessage: toUiMessage,
 })
 
@@ -251,7 +254,7 @@ export const update = (model: Model, message: Message) =>
     ChangedUrl: ({ url }) =>
       Update.combine(model, [
         stepModel => ({
-          model: evo(stepModel, { route: () => urlToAppRoute(url) }),
+          model: modifyFields(stepModel, { route: () => urlToAppRoute(url) }),
         }),
         foldUiCloseMobileMenu,
       ]),

package/dist/templates/examples/ui-showcase/src/story.test.ts

@@ -1,7 +1,7 @@
 import { Option } from 'effect'
 import { Calendar } from 'foldkit'
 import { Command, given, message, model, story } from 'foldkit/story'
-import { evo } from 'foldkit/struct'
+import { modifyFields } from 'foldkit/struct'
 import { fromString } from 'foldkit/url'
 import { describe, expect, test } from 'vitest'
 
@@ -98,8 +98,8 @@ describe('update', () => {
 
   describe('mobile menu', () => {
     test('navigating to a new URL closes the mobile menu dialog', () => {
-      const modelWithOpenMenu: Model = evo(initialModel, {
-        uiModel: evo({
+      const modelWithOpenMenu: Model = modifyFields(initialModel, {
+        uiModel: modifyFields({
           mobileMenuDialog: () =>
             Dialog.boot({
               id: 'mobile-menu',

package/dist/templates/examples/ui-showcase/src/ui/init.ts

@@ -167,7 +167,10 @@ export const uiInit = (today: Calendar.CalendarDate): InitReturn => ({
       id: 'vertical-tabs-demo',
     }),
     verticalTabsDemoTab: 'Foldkit',
-    toastDemo: Toast.init({ id: 'toast-demo' }),
+    toastDemo: Toast.init({
+      id: 'toast-demo',
+      swipeToDismiss: {},
+    }),
     tooltipBasicDemo: Tooltip.init({ id: 'tooltip-basic-demo' }),
     tooltipNoDelayDemo: Tooltip.init({
       id: 'tooltip-no-delay-demo',

package/dist/templates/examples/ui-showcase/src/ui/subscriptions.ts

@@ -4,6 +4,7 @@ import { DragAndDrop, Slider, VirtualList } from '@foldkit/ui'
 
 import { Message as UiMessage } from './message'
 import type { UiModel } from './model'
+import { Toast } from './toast'
 
 const dragAndDropSubscriptions = Subscription.lift({
   dragPointer: DragAndDrop.subscriptions.documentPointer,
@@ -46,10 +47,19 @@ const virtualListVariableDemoSubscriptions = Subscription.lift({
     UiMessage.GotVirtualListVariableDemoMessage({ message }),
 })
 
+const toastDemoSubscriptions = Subscription.lift(Toast.subscriptions)<
+  UiModel,
+  UiMessage
+>({
+  toChildModel: model => model.toastDemo,
+  toParentMessage: message => UiMessage.GotToastDemoMessage({ message }),
+})
+
 export const subscriptions = Subscription.aggregate(
   dragAndDropSubscriptions,
   sliderRatingSubscriptions,
   sliderVolumeSubscriptions,
   virtualListDemoSubscriptions,
   virtualListVariableDemoSubscriptions,
+  toastDemoSubscriptions,
 )