@foldkit/markdown 0.14.3-canary.76fa0d1ee2a5 → 0.14.3-canary.bfd880b1e6ca

package/README.md

@@ -111,21 +111,48 @@ import { islandAttributes } from './src/islands'
 markdown({ islands: islandAttributes })
 ```
 
-`islandsFor` pairs the same definitions with typed views: attributes arrive decoded through each island's schema, and the record must cover every declared name. State stays in your Model; the markdown only decides placement. The third argument is the zero-based occurrence of that island name in the document, for identifiers that must be unique per instance, like an `h.submodel` slotId:
+`islandsFor` pairs the same definitions with typed views: attributes arrive decoded through each island's schema, and the record must cover every declared name. State stays in your Model; the markdown only decides placement. The third argument is the zero-based occurrence of that island name in the document, for identifiers that must be unique per instance, like an `h.block` slotId:
 
 ```typescript
-import { Html, type HtmlBuilder } from 'foldkit/html'
+import { Schema } from 'effect'
+import { Block } from 'foldkit'
+import { makeApplicationDefinition } from 'foldkit'
+import type { Html } from 'foldkit/html'
+import { defineMessageUnion } from 'foldkit/message'
 
 import * as Markdown from '@foldkit/markdown'
 
-import { Counter } from './counter'
+import * as Counter from './counter'
 import { islandAttributes } from './islands'
-import { GotCounterMessage, type Message, type Model } from './message'
+
+const Model = Schema.Struct({ counter: Counter.Model })
+type Model = typeof Model.Type
+
+const Message = defineMessageUnion({
+  GotCounterMessage: { message: Counter.Message },
+})
+
+export const ApplicationDefinition = makeApplicationDefinition({
+  Model,
+  Message,
+})
+
+const CounterBinding = ApplicationDefinition.bindChild(Counter.block, {
+  field: 'counter',
+  parentMessage: Message.GotCounterMessage,
+})
+
+export const ApplicationComposition = ApplicationDefinition.makeComposition({
+  bindings: [CounterBinding],
+})
+type ApplicationViewBuilder = Block.ViewBuilderFor<
+  typeof ApplicationComposition
+>
 
 const postView = (
   model: Model,
   post: Markdown.MarkdownDocument,
-  h: HtmlBuilder<Message>,
+  h: ApplicationViewBuilder,
 ): Html =>
   Markdown.view(post, {
     islands: Markdown.islandsFor(islandAttributes, {
@@ -134,12 +161,12 @@ const postView = (
           [],
           [
             h.span([], [label ?? 'Counter']),
-            h.submodel({
-              slotId: `counter-${occurrenceIndex}`,
-              model: model.counter,
-              view: Counter.view,
-              toParentMessage: message => GotCounterMessage({ message }),
-            }),
+            h.block(
+              counter.embedView({
+                slotId: `counter-${occurrenceIndex}`,
+                model: model.counter,
+              }),
+            ),
           ],
         ),
       Note: (_attributes, content) =>

package/dist/view/view.d.ts

@@ -8,7 +8,7 @@ export type InlineContent = ReadonlyArray<Html | string>;
  * rendered nested blocks (empty for leaf directives), and the zero-based
  * occurrence of this island name in the document, in document order. Use the
  * occurrence index to derive identifiers that must be unique per instance,
- * such as an `h.submodel` slotId.
+ * such as an `h.block` slotId.
  */
 export type IslandView = (attributes: Readonly<globalThis.Record<string, string>>, content: ReadonlyArray<Html>, occurrenceIndex: number) => Html;
 /** Island views by directive name. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@foldkit/markdown",
-  "version": "0.14.3-canary.76fa0d1ee2a5",
+  "version": "0.14.3-canary.bfd880b1e6ca",
   "description": "Write markdown files, get Foldkit views with live islands.",
   "type": "module",
   "main": "./dist/index.js",
@@ -26,7 +26,7 @@
   ],
   "peerDependencies": {
     "effect": "4.0.0",
-    "foldkit": "0.168.0-canary.76fa0d1ee2a5",
+    "foldkit": "0.168.0-canary.bfd880b1e6ca",
     "vite": "^8.0.0"
   },
   "dependencies": {
@@ -40,7 +40,7 @@
     "@types/mdast": "^4.0.4",
     "@types/unist": "^3.0.3",
     "effect": "4.0.0",
-    "foldkit": "0.168.0-canary.76fa0d1ee2a5",
+    "foldkit": "0.168.0-canary.bfd880b1e6ca",
     "happy-dom": "^20.14.5",
     "mdast-util-directive": "^3.1.0",
     "rimraf": "^6.1.3",