@foldkit/markdown 0.1.2 → 0.2.1

package/README.md

@@ -41,7 +41,7 @@ If you run tests with Vitest, add `markdown()` with the same options to the `plu
 ## Render a document
 
 ```typescript
-import { Html, html } from 'foldkit/html'
+import { Html, type HtmlBuilder } from 'foldkit/html'
 
 import * as Markdown from '@foldkit/markdown'
 
@@ -50,11 +50,8 @@ import { type Message } from './message'
 
 const about = Markdown.decodeDocument(aboutRaw)
 
-const view = (): Html => {
-  const h = html<Message>()
-
-  return h.div([], [Markdown.view(about)])
-}
+const view = (h: HtmlBuilder<Message>): Html =>
+  h.div([], [Markdown.view(about)])
 ```
 
 `Markdown.view` renders every node through unstyled semantic defaults. Restyle any node by overriding its view:
@@ -111,7 +108,7 @@ 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:
 
 ```typescript
-import { Html, html } from 'foldkit/html'
+import { Html, type HtmlBuilder } from 'foldkit/html'
 
 import * as Markdown from '@foldkit/markdown'
 
@@ -119,10 +116,12 @@ import { Counter } from './counter'
 import { islandAttributes } from './islands'
 import { GotCounterMessage, type Message, type Model } from './message'
 
-const postView = (model: Model, post: Markdown.MarkdownDocument): Html => {
-  const h = html<Message>()
-
-  return Markdown.view(post, {
+const postView = (
+  model: Model,
+  post: Markdown.MarkdownDocument,
+  h: HtmlBuilder<Message>,
+): Html =>
+  Markdown.view(post, {
     islands: Markdown.islandsFor(islandAttributes, {
       Counter: ({ label }, _content, occurrenceIndex) =>
         h.div(
@@ -141,7 +140,6 @@ const postView = (model: Model, post: Markdown.MarkdownDocument): Html => {
         h.aside([h.Class('rounded border p-4')], content),
     }),
   })
-}
 ```
 
 Attribute values are strings on the wire, so transforming field schemas decode past them: `S.NumberFromString` turns `::Chart{height="240"}` into `height: number`. A plain `islands` record of untyped views (`Readonly<Record<string, IslandView>>`) also works when you want to skip the schemas.

package/dist/view/view.d.ts

@@ -59,7 +59,7 @@ export type ViewConfig = Readonly<{
  * const blogViews: Markdown.Views = {
  *   ...Markdown.defaultViews,
  *   Paragraph: (paragraph, content) =>
- *     h.p([h.Class('leading-relaxed text-stone-700')], content),
+ *     ih.p([ih.Class('leading-relaxed text-stone-700')], content),
  * }
  * ```
  */

package/dist/view/view.d.ts.map

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

package/dist/view/view.js

@@ -1,15 +1,14 @@
 import { Array, Match as M, Option, Record as Record_, Schema as S, } from 'effect';
-import { html } from 'foldkit/html';
-const h = html();
+import { inertHtml as ih } from 'foldkit/html';
 const titleAttribute = (maybeTitle) => Option.match(maybeTitle, {
     onNone: () => [],
-    onSome: title => [h.Title(title)],
+    onSome: title => [ih.Title(title)],
 });
 const startAttribute = (maybeStartNumber) => Option.match(maybeStartNumber, {
     onNone: () => [],
-    onSome: startNumber => [h.Start(startNumber)],
+    onSome: startNumber => [ih.Start(startNumber)],
 });
-const alignmentAttribute = (alignment) => M.value(alignment).pipe(M.when('None', () => []), M.when('Left', () => [h.Style({ 'text-align': 'left' })]), M.when('Center', () => [h.Style({ 'text-align': 'center' })]), M.when('Right', () => [h.Style({ 'text-align': 'right' })]), M.exhaustive);
+const alignmentAttribute = (alignment) => M.value(alignment).pipe(M.when('None', () => []), M.when('Left', () => [ih.Style({ 'text-align': 'left' })]), M.when('Center', () => [ih.Style({ 'text-align': 'center' })]), M.when('Right', () => [ih.Style({ 'text-align': 'right' })]), M.exhaustive);
 /**
  * Unstyled semantic defaults for every markdown node. Spread these into your
  * own record and replace the nodes you want to restyle:
@@ -19,7 +18,7 @@ const alignmentAttribute = (alignment) => M.value(alignment).pipe(M.when('None',
  * const blogViews: Markdown.Views = {
  *   ...Markdown.defaultViews,
  *   Paragraph: (paragraph, content) =>
- *     h.p([h.Class('leading-relaxed text-stone-700')], content),
+ *     ih.p([ih.Class('leading-relaxed text-stone-700')], content),
  * }
  * ```
  */
@@ -30,35 +29,35 @@ const alignmentAttribute = (alignment) => M.value(alignment).pipe(M.when('None',
 // whole document belongs on the consumer's key around the rendered output.
 export const defaultViews = {
     Text: ({ value }) => value,
-    InlineCode: ({ value }) => h.code([], [value]),
-    HardBreak: () => h.br([]),
-    Emphasis: (_emphasis, content) => h.em([], content),
-    Strong: (_strong, content) => h.strong([], content),
-    Strikethrough: (_strikethrough, content) => h.del([], content),
-    Link: ({ url, maybeTitle }, content) => h.a([h.Href(url), ...titleAttribute(maybeTitle)], content),
-    Image: ({ url, alt, maybeTitle }) => h.img([h.Src(url), h.Alt(alt), ...titleAttribute(maybeTitle)]),
-    Heading: ({ level }, content) => M.value(level).pipe(M.withReturnType(), M.when(1, () => h.h1([], content)), M.when(2, () => h.h2([], content)), M.when(3, () => h.h3([], content)), M.when(4, () => h.h4([], content)), M.when(5, () => h.h5([], content)), M.when(6, () => h.h6([], content)), M.exhaustive),
-    Paragraph: (_paragraph, content) => h.p([], content),
-    CodeBlock: ({ value }) => h.pre([], [h.code([], [value])]),
+    InlineCode: ({ value }) => ih.code([], [value]),
+    HardBreak: () => ih.br([]),
+    Emphasis: (_emphasis, content) => ih.em([], content),
+    Strong: (_strong, content) => ih.strong([], content),
+    Strikethrough: (_strikethrough, content) => ih.del([], content),
+    Link: ({ url, maybeTitle }, content) => ih.a([ih.Href(url), ...titleAttribute(maybeTitle)], content),
+    Image: ({ url, alt, maybeTitle }) => ih.img([ih.Src(url), ih.Alt(alt), ...titleAttribute(maybeTitle)]),
+    Heading: ({ level }, content) => M.value(level).pipe(M.withReturnType(), M.when(1, () => ih.h1([], content)), M.when(2, () => ih.h2([], content)), M.when(3, () => ih.h3([], content)), M.when(4, () => ih.h4([], content)), M.when(5, () => ih.h5([], content)), M.when(6, () => ih.h6([], content)), M.exhaustive),
+    Paragraph: (_paragraph, content) => ih.p([], content),
+    CodeBlock: ({ value }) => ih.pre([], [ih.code([], [value])]),
     List: ({ isOrdered, maybeStartNumber }, items) => {
         if (isOrdered) {
-            return h.ol(startAttribute(maybeStartNumber), items);
+            return ih.ol(startAttribute(maybeStartNumber), items);
         }
         else {
-            return h.ul([], items);
+            return ih.ul([], items);
         }
     },
-    ListItem: (_listItem, blocks) => h.li([], blocks),
-    Blockquote: (_blockquote, blocks) => h.blockquote([], blocks),
-    ThematicBreak: () => h.hr([]),
-    Table: (_table, headerRow, bodyRows) => h.table([], [h.thead([], [headerRow]), h.tbody([], bodyRows)]),
-    TableRow: (_tableRow, cells) => h.tr([], cells),
+    ListItem: (_listItem, blocks) => ih.li([], blocks),
+    Blockquote: (_blockquote, blocks) => ih.blockquote([], blocks),
+    ThematicBreak: () => ih.hr([]),
+    Table: (_table, headerRow, bodyRows) => ih.table([], [ih.thead([], [headerRow]), ih.tbody([], bodyRows)]),
+    TableRow: (_tableRow, cells) => ih.tr([], cells),
     TableCell: (_tableCell, content, alignment, isHeader) => {
         if (isHeader) {
-            return h.th(alignmentAttribute(alignment), content);
+            return ih.th(alignmentAttribute(alignment), content);
         }
         else {
-            return h.td(alignmentAttribute(alignment), content);
+            return ih.td(alignmentAttribute(alignment), content);
         }
     },
 };
@@ -161,4 +160,4 @@ export const viewBlocks = (document, config = {}) => {
  * {@link defaultViews} unless overridden in `config.views`, and every Island
  * directive renders through the matching entry in `config.islands`.
  */
-export const view = (document, config = {}) => h.div([], viewBlocks(document, config));
+export const view = (document, config = {}) => ih.div([], viewBlocks(document, config));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@foldkit/markdown",
-  "version": "0.1.2",
+  "version": "0.2.1",
   "description": "Write markdown files, get Foldkit views with live islands.",
   "type": "module",
   "main": "./dist/index.js",
@@ -46,7 +46,7 @@
     "typescript": "^6.0.3",
     "vite": "^8.0.16",
     "vitest": "^4.1.9",
-    "foldkit": "0.133.0"
+    "foldkit": "0.135.0"
   },
   "keywords": [
     "foldkit",