create-foldkit-app 0.35.1 → 0.35.2

package/dist/templates/examples/query-sync/src/scene.test.ts

@@ -1,6 +1,6 @@
 import { Option } from 'effect'
 import { expect, given, placeholder, role, scene, text } from 'foldkit/scene'
-import { evo } from 'foldkit/struct'
+import { modifyFields } from 'foldkit/struct'
 import { describe, test } from 'vitest'
 
 import { Listbox } from '@foldkit/ui'
@@ -40,7 +40,7 @@ describe('view', () => {
     scene(
       { update, view },
       given(
-        evo(browseModel, {
+        modifyFields(browseModel, {
           route: () =>
             AppRoute.Browse({
               search: Option.some('Tyranno'),
@@ -58,7 +58,7 @@ describe('view', () => {
     scene(
       { update, view },
       given(
-        evo(browseModel, {
+        modifyFields(browseModel, {
           route: () =>
             AppRoute.Browse({
               search: Option.some('zzzNoMatch'),
@@ -76,7 +76,7 @@ describe('view', () => {
     scene(
       { update, view },
       given(
-        evo(browseModel, {
+        modifyFields(browseModel, {
           route: () => AppRoute.NotFound({ path: '/oops' }),
         }),
       ),

package/dist/templates/examples/query-sync/src/story.test.ts

@@ -1,6 +1,6 @@
 import { Option } from 'effect'
 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'
 
@@ -104,7 +104,7 @@ describe('update', () => {
       story(
         update,
         given(
-          evo(browseModel, {
+          modifyFields(browseModel, {
             route: () =>
               AppRoute.Browse({
                 search: Option.some('foo'),

package/dist/templates/examples/route-transitions/package.json

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

package/dist/templates/examples/route-transitions/src/main.ts

@@ -5,7 +5,7 @@ import { defineMessageUnion } from 'foldkit/message'
 import { UrlRequest, load, pushUrl } from 'foldkit/navigation'
 import { Transition } from 'foldkit/route'
 import { defineTaggedUnion } from 'foldkit/schema'
-import { evo } from 'foldkit/struct'
+import { modifyFields } from 'foldkit/struct'
 import { Url, toString as urlToString } from 'foldkit/url'
 
 import { type Painting, findPaintingWithIndex, paintings } from './data'
@@ -128,7 +128,7 @@ const nextSequenceNumber = (
 const logTransition =
   (transition: AppTransition): Step =>
   model => ({
-    model: evo(model, {
+    model: modifyFields(model, {
       transitionLog: transitionLog =>
         pipe(
           transitionLog,
@@ -148,7 +148,7 @@ const loadCatalogOnGalleryEntry =
     Transition.isEntering(transition, 'Gallery') &&
     model.catalogStatus !== 'Loading'
       ? {
-          model: evo(model, { catalogStatus: () => 'Loading' }),
+          model: modifyFields(model, { catalogStatus: () => 'Loading' }),
           commands: [LoadCatalog()],
         }
       : { model }
@@ -159,7 +159,7 @@ const loadPaintingOnEntry =
     Option.match(Transition.entered(transition, 'Painting'), {
       onNone: () => ({ model }),
       onSome: ({ paintingId }) => ({
-        model: evo(model, {
+        model: modifyFields(model, {
           paintingStatus: () => PaintingStatus.Loading({ paintingId }),
         }),
         commands: [LoadPainting({ paintingId })],
@@ -175,7 +175,7 @@ const reloadPaintingOnIdChange =
         previousRoute.paintingId === nextRoute.paintingId
           ? { model }
           : {
-              model: evo(model, {
+              model: modifyFields(model, {
                 paintingStatus: () =>
                   PaintingStatus.Loading({
                     paintingId: nextRoute.paintingId,
@@ -229,31 +229,31 @@ export const update = (model: Model, message: Message) =>
       const nextRoute = urlToAppRoute(url)
       const transition = Transition.make(model.route, nextRoute)
       return handleTransition(
-        evo(model, { route: () => nextRoute }),
+        modifyFields(model, { route: () => nextRoute }),
         transition,
       )
     },
 
     SucceededLoadCatalog: () => ({
-      model: evo(model, { catalogStatus: () => 'Ready' }),
+      model: modifyFields(model, { catalogStatus: () => 'Ready' }),
     }),
 
     SucceededLoadPainting: ({ paintingId }) =>
       model.paintingStatus._tag === 'Loading' &&
       model.paintingStatus.paintingId === paintingId
         ? {
-            model: evo(model, {
+            model: modifyFields(model, {
               paintingStatus: () => PaintingStatus.Ready({ paintingId }),
             }),
           }
         : { model },
 
     UpdatedStudioDraft: ({ value }) => ({
-      model: evo(model, { studioDraft: () => value }),
+      model: modifyFields(model, { studioDraft: () => value }),
     }),
 
     SucceededSaveDraft: ({ draft }) => ({
-      model: evo(model, { maybeSavedDraft: () => Option.some(draft) }),
+      model: modifyFields(model, { maybeSavedDraft: () => Option.some(draft) }),
     }),
   })
 

package/dist/templates/examples/route-transitions/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 { fromString } from 'foldkit/url'
 import { describe, expect, test } from 'vitest'
 
@@ -81,7 +81,11 @@ describe('update', () => {
   test('re-entering the gallery while a catalog load is in flight does not fire another', () => {
     story(
       update,
-      given(evo(modelOn(AppRoute.Home()), { catalogStatus: () => 'Loading' })),
+      given(
+        modifyFields(modelOn(AppRoute.Home()), {
+          catalogStatus: () => 'Loading',
+        }),
+      ),
       message(
         Message.ChangedUrl({ url: urlOrThrow('http://localhost/gallery') }),
       ),
@@ -121,7 +125,7 @@ describe('update', () => {
     story(
       update,
       given(
-        evo(modelOn(AppRoute.Painting({ paintingId: 1 })), {
+        modifyFields(modelOn(AppRoute.Painting({ paintingId: 1 })), {
           paintingStatus: () => PaintingStatus.Ready({ paintingId: 1 }),
         }),
       ),
@@ -153,7 +157,7 @@ describe('update', () => {
     story(
       update,
       given(
-        evo(modelOn(AppRoute.Painting({ paintingId: 1 })), {
+        modifyFields(modelOn(AppRoute.Painting({ paintingId: 1 })), {
           paintingStatus: () => PaintingStatus.Ready({ paintingId: 1 }),
         }),
       ),
@@ -173,7 +177,7 @@ describe('update', () => {
     story(
       update,
       given(
-        evo(modelOn(AppRoute.Painting({ paintingId: 2 })), {
+        modifyFields(modelOn(AppRoute.Painting({ paintingId: 2 })), {
           paintingStatus: () => PaintingStatus.Loading({ paintingId: 2 }),
         }),
       ),
@@ -190,7 +194,7 @@ describe('update', () => {
     story(
       update,
       given(
-        evo(modelOn(AppRoute.Studio()), {
+        modifyFields(modelOn(AppRoute.Studio()), {
           studioDraft: () => 'half-finished thought',
         }),
       ),

package/dist/templates/examples/routing/package.json

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

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

@@ -3,7 +3,7 @@ import { Command, Runtime, Subscription, Update } from 'foldkit'
 import { Document, Html, HtmlBuilder } from 'foldkit/html'
 import { defineMessageUnion } from 'foldkit/message'
 import { UrlRequest, load, pushUrl } from 'foldkit/navigation'
-import { evo } from 'foldkit/struct'
+import { modifyFields } from 'foldkit/struct'
 import { Url, toString as urlToString } from 'foldkit/url'
 
 import {
@@ -105,7 +105,7 @@ const foldPeopleEntry = <Input>(
     update,
     read: model => Option.some(model.peoplePage),
     write: (model, nextPeoplePage) =>
-      evo(model, { peoplePage: () => nextPeoplePage }),
+      modifyFields(model, { peoplePage: () => nextPeoplePage }),
     toParentMessage: message => Message.GotPeopleMessage({ message }),
   })
 
@@ -115,7 +115,7 @@ const foldPeopleRouteChanged = foldPeopleEntry(People.informRouteChanged)
 
 const setRoute =
   (nextRoute: AppRoute): Update.Step<Model, Message> =>
-  model => ({ model: evo(model, { route: () => nextRoute }) })
+  model => ({ model: modifyFields(model, { route: () => nextRoute }) })
 
 export const update = (model: Model, message: Message) =>
   Message.match<UpdateReturn>(message, {
@@ -160,28 +160,24 @@ export const update = (model: Model, message: Message) =>
 // SUBSCRIPTION
 
 export const subscriptions = Subscription.make<Model, Message>()(() => ({
-  shortcuts: Subscription.persistent(
-    Subscription.keyboardShortcuts<Message>({
+  keyBindings: Subscription.persistent(
+    Subscription.keyBindings<Message>({
       bindings: [
         {
-          shortcut: ['G', 'H'],
-          toMessage: () =>
-            Message.EnteredNavigationShortcut({ shortcut: 'GH' }),
+          keys: ['G', 'H'],
+          mapEvent: () => Message.EnteredNavigationShortcut({ shortcut: 'GH' }),
         },
         {
-          shortcut: ['G', 'P'],
-          toMessage: () =>
-            Message.EnteredNavigationShortcut({ shortcut: 'GP' }),
+          keys: ['G', 'P'],
+          mapEvent: () => Message.EnteredNavigationShortcut({ shortcut: 'GP' }),
         },
         {
-          shortcut: ['G', 'F'],
-          toMessage: () =>
-            Message.EnteredNavigationShortcut({ shortcut: 'GF' }),
+          keys: ['G', 'F'],
+          mapEvent: () => Message.EnteredNavigationShortcut({ shortcut: 'GF' }),
         },
         {
-          shortcut: ['G', 'N'],
-          toMessage: () =>
-            Message.EnteredNavigationShortcut({ shortcut: 'GN' }),
+          keys: ['G', 'N'],
+          mapEvent: () => Message.EnteredNavigationShortcut({ shortcut: 'GN' }),
         },
       ],
     }),

package/dist/templates/examples/routing/src/page/people.ts

@@ -4,7 +4,7 @@ import { Html, HtmlBuilder } from 'foldkit/html'
 import { defineMessageUnion } from 'foldkit/message'
 import { pushUrl } from 'foldkit/navigation'
 import { defineTaggedUnion } from 'foldkit/schema'
-import { evo } from 'foldkit/struct'
+import { modifyFields } from 'foldkit/struct'
 
 import { Button, Input } from '@foldkit/ui'
 
@@ -149,7 +149,7 @@ export type UpdateReturn = Update.Return<Model, Message>
 export const update = (model: Model, message: Message) =>
   Message.match<UpdateReturn>(message, {
     ChangedSearchInput: ({ value }) => ({
-      model: evo(model, { searchInput: () => value }),
+      model: modifyFields(model, { searchInput: () => value }),
     }),
 
     SubmittedSearch: () => ({
@@ -164,7 +164,7 @@ export const update = (model: Model, message: Message) =>
     ChangedRoute: ({ route }) => {
       const searchText = routeSearchText(route)
       return {
-        model: evo(model, {
+        model: modifyFields(model, {
           searchInput: () => searchText,
           searchHistory: searchHistory =>
             addSearchToHistory(searchHistory, searchText),
@@ -175,7 +175,7 @@ export const update = (model: Model, message: Message) =>
     },
 
     SucceededFetchPeople: ({ query, people: fetchedPeople }) => ({
-      model: evo(model, {
+      model: modifyFields(model, {
         results: () => SearchResults.Loaded({ query, people: fetchedPeople }),
       }),
     }),

package/dist/templates/examples/shopping-cart/package.json

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

package/dist/templates/examples/shopping-cart/src/domain/cart.ts

@@ -1,5 +1,5 @@
 import { Array, Number, Option, Predicate, Schema, pipe } from 'effect'
-import { evo } from 'foldkit/struct'
+import { modifyFields } from 'foldkit/struct'
 
 import { CartItem, Item } from './item'
 
@@ -26,7 +26,7 @@ export const addItem =
       onSome: () =>
         mapCartItem(
           item.id,
-          evo({
+          modifyFields({
             quantity: Number.increment,
           }),
         )(cart),
@@ -43,7 +43,7 @@ export const changeQuantity = (itemId: string, quantity: number) =>
     ? removeItem(itemId)
     : mapCartItem(
         itemId,
-        evo({
+        modifyFields({
           quantity: () => quantity,
         }),
       )
@@ -51,7 +51,7 @@ export const changeQuantity = (itemId: string, quantity: number) =>
 export const incrementQuantity = (itemId: string) =>
   mapCartItem(
     itemId,
-    evo({
+    modifyFields({
       quantity: Number.increment,
     }),
   )

package/dist/templates/examples/shopping-cart/src/main.ts

@@ -3,7 +3,7 @@ import { Command, Runtime, Update } from 'foldkit'
 import { Document, Html, HtmlBuilder } from 'foldkit/html'
 import { defineMessageUnion } from 'foldkit/message'
 import { UrlRequest, load, pushUrl } from 'foldkit/navigation'
-import { evo } from 'foldkit/struct'
+import { modifyFields } from 'foldkit/struct'
 import { Url, toString as urlToString } from 'foldkit/url'
 
 import { products } from './data/products'
@@ -87,16 +87,16 @@ const foldProductsOutMessage = Products.OutMessage.match<
 >({
   AddedToCart:
     ({ item }) =>
-    model => ({ model: evo(model, { cart: Cart.addItem(item) }) }),
+    model => ({ model: modifyFields(model, { cart: Cart.addItem(item) }) }),
   IncrementedQuantity:
     ({ itemId }) =>
     model => ({
-      model: evo(model, { cart: Cart.incrementQuantity(itemId) }),
+      model: modifyFields(model, { cart: Cart.incrementQuantity(itemId) }),
     }),
   DecrementedQuantity:
     ({ itemId }) =>
     model => ({
-      model: evo(model, { cart: Cart.decrementQuantity(itemId) }),
+      model: modifyFields(model, { cart: Cart.decrementQuantity(itemId) }),
     }),
 })
 
@@ -104,7 +104,7 @@ const foldProducts = Update.foldChild({
   update: Products.update,
   read: (model: Model) => Option.some(model.productsPage),
   write: (model, nextProductsPage) =>
-    evo(model, { productsPage: () => nextProductsPage }),
+    modifyFields(model, { productsPage: () => nextProductsPage }),
   toParentMessage: message => Message.GotProductsMessage({ message }),
   foldOutMessage: foldProductsOutMessage,
 })
@@ -128,7 +128,7 @@ export const update = (model: Model, message: Message) =>
       }),
 
     ChangedUrl: ({ url }) => ({
-      model: evo(model, {
+      model: modifyFields(model, {
         route: () => urlToAppRoute(url),
       }),
     }),
@@ -136,37 +136,37 @@ export const update = (model: Model, message: Message) =>
     GotProductsMessage: ({ message }) => foldProducts(model, message),
 
     ClickedIncrementQuantity: ({ itemId }) => ({
-      model: evo(model, {
+      model: modifyFields(model, {
         cart: Cart.incrementQuantity(itemId),
       }),
     }),
 
     ClickedDecrementQuantity: ({ itemId }) => ({
-      model: evo(model, {
+      model: modifyFields(model, {
         cart: Cart.decrementQuantity(itemId),
       }),
     }),
 
     ClickedRemoveCartItem: ({ itemId }) => ({
-      model: evo(model, {
+      model: modifyFields(model, {
         cart: Cart.removeItem(itemId),
       }),
     }),
 
     ClickedClearCart: () => ({
-      model: evo(model, {
+      model: modifyFields(model, {
         cart: () => [],
       }),
     }),
 
     UpdatedDeliveryInstructions: ({ value }) => ({
-      model: evo(model, {
+      model: modifyFields(model, {
         deliveryInstructions: () => value,
       }),
     }),
 
     ClickedPlaceOrder: () => ({
-      model: evo(model, {
+      model: modifyFields(model, {
         orderPlaced: () => true,
         cart: () => [],
         deliveryInstructions: () => '',

package/dist/templates/examples/shopping-cart/src/page/products.ts

@@ -2,7 +2,7 @@ import { Array, Effect, Option, Schema } from 'effect'
 import { Command, Submodel, type Update } from 'foldkit'
 import { defineMessageUnion } from 'foldkit/message'
 import { replaceUrl } from 'foldkit/navigation'
-import { evo } from 'foldkit/struct'
+import { modifyFields } from 'foldkit/struct'
 
 import { Button, Input } from '@foldkit/ui'
 
@@ -68,7 +68,7 @@ export const update = (model: Model, message: Message) =>
       CompletedReplaceSearchUrl: () => ({ model }),
 
       ChangedSearchInput: ({ value }) => ({
-        model: evo(model, { searchText: () => value }),
+        model: modifyFields(model, { searchText: () => value }),
         commands: [
           ReplaceSearchUrl({
             url: productsRouter({

package/dist/templates/examples/shopping-cart/src/scene.test.ts

@@ -1,6 +1,6 @@
 import { Option } from 'effect'
 import { click, expect, given, role, scene, text } from 'foldkit/scene'
-import { evo } from 'foldkit/struct'
+import { modifyFields } from 'foldkit/struct'
 import { describe, test } from 'vitest'
 
 import { products } from './data/products'
@@ -34,7 +34,7 @@ describe('view', () => {
     scene(
       { update, view },
       given(
-        evo(baseModel, {
+        modifyFields(baseModel, {
           cart: () => [
             { item: apple, quantity: 2 },
             { item: banana, quantity: 3 },
@@ -56,7 +56,7 @@ describe('view', () => {
   test('the Cart route shows the empty state when no items have been added', () => {
     scene(
       { update, view },
-      given(evo(baseModel, { route: () => AppRoute.Cart() })),
+      given(modifyFields(baseModel, { route: () => AppRoute.Cart() })),
       expect(role('heading', { name: 'Shopping Cart' })).toExist(),
       expect(text('Your cart is empty')).toExist(),
     )
@@ -66,7 +66,7 @@ describe('view', () => {
     scene(
       { update, view },
       given(
-        evo(baseModel, {
+        modifyFields(baseModel, {
           cart: () => [{ item: apple, quantity: 2 }],
           route: () => AppRoute.Cart(),
         }),
@@ -82,7 +82,7 @@ describe('view', () => {
   test('the Checkout route shows the empty state when the cart is empty', () => {
     scene(
       { update, view },
-      given(evo(baseModel, { route: () => AppRoute.Checkout() })),
+      given(modifyFields(baseModel, { route: () => AppRoute.Checkout() })),
       expect(role('heading', { name: 'Checkout' })).toExist(),
       expect(text('Your cart is empty')).toExist(),
     )
@@ -92,7 +92,7 @@ describe('view', () => {
     scene(
       { update, view },
       given(
-        evo(baseModel, {
+        modifyFields(baseModel, {
           cart: () => [{ item: apple, quantity: 2 }],
           route: () => AppRoute.Checkout(),
         }),
@@ -108,7 +108,7 @@ describe('view', () => {
     scene(
       { update, view },
       given(
-        evo(baseModel, {
+        modifyFields(baseModel, {
           cart: () => [{ item: apple, quantity: 1 }],
           route: () => AppRoute.Checkout(),
         }),
@@ -122,7 +122,9 @@ describe('view', () => {
     scene(
       { update, view },
       given(
-        evo(baseModel, { route: () => AppRoute.NotFound({ path: '/oops' }) }),
+        modifyFields(baseModel, {
+          route: () => AppRoute.NotFound({ path: '/oops' }),
+        }),
       ),
       expect(role('heading', { name: '404 - Page Not Found' })).toExist(),
       expect(text('The path "/oops" was not found.')).toExist(),

package/dist/templates/examples/shopping-cart/src/story.test.ts

@@ -1,6 +1,6 @@
 import { Option } from 'effect'
 import { 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'
 
@@ -126,7 +126,7 @@ describe('update', () => {
       story(
         update,
         given(
-          evo(baseModel, {
+          modifyFields(baseModel, {
             cart: () => [{ item: apple, quantity: 1 }],
           }),
         ),
@@ -141,7 +141,7 @@ describe('update', () => {
       story(
         update,
         given(
-          evo(baseModel, {
+          modifyFields(baseModel, {
             cart: () => [{ item: apple, quantity: 2 }],
           }),
         ),
@@ -156,7 +156,7 @@ describe('update', () => {
       story(
         update,
         given(
-          evo(baseModel, {
+          modifyFields(baseModel, {
             cart: () => [{ item: apple, quantity: 1 }],
           }),
         ),
@@ -171,7 +171,7 @@ describe('update', () => {
       story(
         update,
         given(
-          evo(baseModel, {
+          modifyFields(baseModel, {
             cart: () => [
               { item: apple, quantity: 2 },
               { item: banana, quantity: 1 },
@@ -190,7 +190,7 @@ describe('update', () => {
       story(
         update,
         given(
-          evo(baseModel, {
+          modifyFields(baseModel, {
             cart: () => [{ item: apple, quantity: 2 }],
           }),
         ),
@@ -222,7 +222,7 @@ describe('update', () => {
       story(
         update,
         given(
-          evo(baseModel, {
+          modifyFields(baseModel, {
             cart: () => [{ item: apple, quantity: 2 }],
             deliveryInstructions: () => 'Knock loudly',
           }),

package/dist/templates/examples/slow-warnings/package.json

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

package/dist/templates/examples/slow-warnings/src/handleSlow.test.ts

@@ -1,4 +1,4 @@
-import { evo } from 'foldkit/struct'
+import { modifyFields } from 'foldkit/struct'
 import { describe, expect, test, vi } from 'vitest'
 
 import { Message, type Model, handleSlow } from './main'
@@ -21,7 +21,7 @@ describe('handleSlow', () => {
         durationMs: 12,
         thresholdMs: 4,
         previousModel: initialModel,
-        nextModel: evo(initialModel, {
+        nextModel: modifyFields(initialModel, {
           activeWorkload: () => 'Update',
         }),
         message: Message.ClickedRunUpdateWork(),