@portabletext/markdown 1.2.0 → 1.3.1

package/dist/index.js

@@ -156,8 +156,14 @@ const DefaultBlockSpacingRenderer = ({
   value,
   listIndex
 }) => {
-  const listStyle = value.listItem || "bullet", level = value.level || 1;
-  return listStyle === "number" ? `${"   ".repeat(level - 1)}${listIndex ?? 1}. ${children}` : `${"   ".repeat(level - 1)}- ${children}`;
+  const listStyle = value.listItem || "bullet", level = value.level || 1, indent = "   ".repeat(level - 1);
+  if (listStyle === "number")
+    return `${indent}${listIndex ?? 1}. ${children}`;
+  if (listStyle === "task") {
+    const marker = "checked" in value && typeof value.checked == "boolean" && value.checked ? "[x]" : "[ ]";
+    return `${indent}- ${marker} ${children}`;
+  }
+  return `${indent}- ${children}`;
 }, DefaultUnknownListItemRenderer = ({
   children
 }) => `- ${children}
@@ -221,27 +227,22 @@ ${value.code}
   const alt = escapeImageAndLinkText(value.alt ?? ""), title = value.title ? ` "${escapeImageAndLinkTitle(value.title)}"` : "";
   return `![${alt}](${value.src}${title})`;
 }, DefaultTableRenderer = ({ value, renderNode }) => {
-  const headerRows = value.headerRows || 0, rows = value.rows, lines = [], getCellText = (cellBlocks) => cellBlocks.map(
+  const rows = value.rows, headerRow = rows.at(0);
+  if (!headerRow)
+    return "";
+  const getCellText = (cellBlocks) => cellBlocks.map(
     (block, index) => renderNode({
       node: block,
       index,
       isInline: !1,
       renderNode
     })
-  ).join(" ").trim();
-  for (let i = 0; i < headerRows; i++) {
-    const row = rows[i];
-    if (row) {
-      const cellTexts = row.cells.map((cell) => getCellText(cell.value));
-      lines.push(`| ${cellTexts.join(" | ")} |`);
-    }
-  }
-  if (headerRows > 0 && rows[0]) {
-    const separators = rows[0].cells.map(() => " --- ");
-    lines.push(`|${separators.join("|")}|`);
-  }
-  for (let i = headerRows; i < rows.length; i++) {
-    const row = rows[i];
+  ).join(" ").trim(), lines = [], headerCells = headerRow.cells.map((cell) => getCellText(cell.value));
+  lines.push(`| ${headerCells.join(" | ")} |`);
+  const separators = headerRow.cells.map(() => " --- ");
+  lines.push(`|${separators.join("|")}|`);
+  for (let i = 1; i < rows.length; i++) {
+    const row = rows.at(i);
     if (row) {
       const cellTexts = row.cells.map((cell) => getCellText(cell.value));
       lines.push(`| ${cellTexts.join(" | ")} |`);
@@ -264,7 +265,52 @@ ${value.code}
 `);
   return `> [!${value.tone.toUpperCase()}]
 ${prefixed}`;
-}, DefaultUnknownTypeRenderer = ({
+}, DefaultBlockquoteObjectRenderer = ({ value, renderNode }) => value.content.map(
+  (block, index) => renderNode({
+    node: { ...block, style: "normal" },
+    index,
+    isInline: !1,
+    renderNode
+  })
+).join(`
+
+`).split(`
+`).map((line) => line === "" ? ">" : `> ${line}`).join(`
+`), DefaultListRenderer = ({ value, renderNode }) => {
+  const itemSeparator = value.items.some((item) => item.content.filter(
+    (block) => block._type !== "list"
+  ).length > 1) ? `
+
+` : `
+`;
+  return value.items.map((item, itemIndex) => {
+    const marker = getListMarker(value.kind, itemIndex, item.checked), indentWidth = value.kind === "task" ? 2 : marker.length, indent = " ".repeat(indentWidth), renderedBlocks = item.content.map((block, blockIndex) => ({
+      isNestedList: block._type === "list",
+      text: renderNode({
+        node: block,
+        index: blockIndex,
+        isInline: !1,
+        renderNode
+      })
+    })), [first, ...rest] = renderedBlocks, head = `${marker}${first?.text ?? ""}`.trimEnd();
+    if (rest.length === 0)
+      return head;
+    const tail = rest.map((rendered) => {
+      const indented = rendered.text.split(`
+`).map((line) => line === "" ? "" : `${indent}${line}`).join(`
+`);
+      return rendered.isNestedList ? `
+${indented}` : `
+
+${indented}`;
+    }).join("");
+    return `${head}${tail}`;
+  }).join(itemSeparator);
+};
+function getListMarker(kind, itemIndex, checked) {
+  return kind === "number" ? `${itemIndex + 1}. ` : kind === "task" ? checked ? "- [x] " : "- [ ] " : "- ";
+}
+const DefaultUnknownTypeRenderer = ({
   value,
   isInline
 }) => {
@@ -363,6 +409,8 @@ const normalStyleDefinition = {
   name: "number"
 }, defaultUnorderedListItemDefinition = {
   name: "bullet"
+}, defaultTaskListItemDefinition = {
+  name: "task"
 }, defaultStrongDecoratorDefinition = {
   name: "strong"
 }, defaultEmDecoratorDefinition = {
@@ -409,6 +457,9 @@ const normalStyleDefinition = {
   ]
 }, defaultSchema = compileSchema(
   defineSchema({
+    block: {
+      fields: [{ name: "checked", type: "boolean" }]
+    },
     styles: [
       normalStyleDefinition,
       h1StyleDefinition,
@@ -421,7 +472,8 @@ const normalStyleDefinition = {
     ],
     lists: [
       defaultOrderedListItemDefinition,
-      defaultUnorderedListItemDefinition
+      defaultUnorderedListItemDefinition,
+      defaultTaskListItemDefinition
     ],
     decorators: [
       defaultStrongDecoratorDefinition,
@@ -525,7 +577,8 @@ const codeBlockMatcher = ({ context, value, isInline }) => {
   },
   listItem: {
     number: buildListItemMatcher(defaultOrderedListItemDefinition),
-    bullet: buildListItemMatcher(defaultUnorderedListItemDefinition)
+    bullet: buildListItemMatcher(defaultUnorderedListItemDefinition),
+    task: buildListItemMatcher(defaultTaskListItemDefinition)
   },
   marks: {
     strong: buildDecoratorMatcher(defaultStrongDecoratorDefinition),
@@ -577,11 +630,51 @@ function markdownToPortableText(markdown, options) {
     html: !0,
     linkify: !0,
     typographer: !0
-  }).enable(["strikethrough", "table"]).use(alert).parse(markdown, {}), portableText = [];
+  }).enable(["strikethrough", "table"]).use(alert).parse(markdown, {}), taskCheckedByListItemIndex = /* @__PURE__ */ new Map();
+  for (let i = 0; i < tokens.length; i++) {
+    if (tokens[i]?.type !== "list_item_open")
+      continue;
+    let inlineIndex = -1;
+    for (let j = i + 1; j < tokens.length; j++) {
+      const candidate = tokens[j];
+      if (candidate) {
+        if (candidate.type === "list_item_close")
+          break;
+        if (candidate.type === "inline") {
+          inlineIndex = j;
+          break;
+        }
+      }
+    }
+    if (inlineIndex === -1)
+      continue;
+    const inlineToken = tokens[inlineIndex];
+    if (!inlineToken)
+      continue;
+    const match = inlineToken.content.match(/^\[([ xX])\] /);
+    if (!match)
+      continue;
+    const checked = match[1] !== " ";
+    taskCheckedByListItemIndex.set(i, checked), inlineToken.content = inlineToken.content.slice(match[0].length);
+    const firstChild = inlineToken.children?.[0];
+    firstChild && typeof firstChild.content == "string" && (firstChild.content = firstChild.content.slice(match[0].length));
+  }
+  const portableText = [];
   let currentBlock = null;
   const currentListStack = [], markDefRefs = [];
-  let currentMarkDefs = [], currentBlockquoteStyle = null, inListItem = !1, calloutStartIndex = null, calloutType = null, currentTable = null, currentTableRow = null, inTableHead = !1;
-  const startBlock = (style) => {
+  let currentMarkDefs = [], currentBlockquoteStyle = null, inListItem = !1, calloutStartIndex = null, calloutStartTarget = null, calloutType = null;
+  const blockquoteStack = [];
+  let currentTable = null, currentTableRow = null, inTableHead = !1;
+  const listContainerStack = [], blockTarget = () => {
+    for (let i = listContainerStack.length - 1; i >= 0; i--) {
+      const frame = listContainerStack[i];
+      if (frame && frame.currentItem)
+        return frame.currentItem.content;
+    }
+    return portableText;
+  }, pushBlock = (block) => {
+    blockTarget().push(block);
+  }, startBlock = (style) => {
     flushBlock(), currentBlock = {
       _type: "block",
       style,
@@ -595,7 +688,7 @@ function markdownToPortableText(markdown, options) {
       _key: consolidatedOptions.keyGenerator(),
       text: "",
       marks: []
-    }), currentBlock.markDefs = currentMarkDefs, portableText.push(currentBlock), currentBlock = null, currentMarkDefs = []);
+    }), currentBlock.markDefs = currentMarkDefs, pushBlock(currentBlock), currentBlock = null, currentMarkDefs = []);
   }, addSpan = (text) => {
     if (text.length === 0)
       return;
@@ -614,7 +707,7 @@ function markdownToPortableText(markdown, options) {
       text,
       marks: [...markDefRefs]
     });
-  }, listLevel = () => currentListStack.length, ensureListBlock = (listItem) => {
+  }, listLevel = () => currentListStack.length, ensureListBlock = (listItem, checked) => {
     if (!currentBlock) {
       const style = currentBlockquoteStyle ?? consolidatedOptions.block.normal({
         context: { schema: consolidatedOptions.schema }
@@ -623,533 +716,679 @@ function markdownToPortableText(markdown, options) {
     }
     if (!currentBlock)
       throw new Error("Expected current block");
-    (currentBlock.listItem !== listItem || currentBlock.level !== listLevel()) && (currentBlock.listItem = listItem, currentBlock.level = listLevel());
+    (currentBlock.listItem !== listItem || currentBlock.level !== listLevel()) && (currentBlock.listItem = listItem, currentBlock.level = listLevel()), checked !== void 0 && (currentBlock.checked = checked);
   };
-  for (const token of tokens)
-    switch (token.type) {
-      // Paragraphs
-      case "paragraph_open": {
-        if (inListItem) {
-          if (!currentBlock) {
-            const listType = currentListStack.at(-1);
-            listType && ensureListBlock(listType);
+  for (let tokenIndex = 0; tokenIndex < tokens.length; tokenIndex++) {
+    const token = tokens[tokenIndex];
+    if (token)
+      switch (token.type) {
+        // Paragraphs
+        case "paragraph_open": {
+          if (inListItem) {
+            if (listContainerStack.at(-1)) {
+              if (!currentBlock) {
+                const style2 = currentBlockquoteStyle ?? consolidatedOptions.block.normal({
+                  context: { schema: consolidatedOptions.schema }
+                }) ?? "normal";
+                startBlock(style2);
+              }
+              break;
+            }
+            if (!currentBlock) {
+              const listType = currentListStack.at(-1);
+              listType && ensureListBlock(listType);
+            }
+            break;
           }
+          const style = currentBlockquoteStyle ?? consolidatedOptions.block.normal({
+            context: { schema: consolidatedOptions.schema }
+          });
+          if (!style) {
+            console.warn('No default style found, using "normal"'), startBlock("normal");
+            break;
+          }
+          startBlock(style);
           break;
         }
-        const style = currentBlockquoteStyle ?? consolidatedOptions.block.normal({
-          context: { schema: consolidatedOptions.schema }
-        });
-        if (!style) {
-          console.warn('No default style found, using "normal"'), startBlock("normal");
-          break;
-        }
-        startBlock(style);
-        break;
-      }
-      case "paragraph_close":
-        if (inListItem)
+        case "paragraph_close":
+          if (inListItem) {
+            listContainerStack.at(-1) && flushBlock();
+            break;
+          }
+          flushBlock();
           break;
-        flushBlock();
-        break;
-      // Headings
-      case "heading_open": {
-        const level = Number(token?.tag?.slice(1)), headingMatcher = {
-          1: consolidatedOptions.block.h1,
-          2: consolidatedOptions.block.h2,
-          3: consolidatedOptions.block.h3,
-          4: consolidatedOptions.block.h4,
-          5: consolidatedOptions.block.h5,
-          6: consolidatedOptions.block.h6
-        }[level], style = headingMatcher?.({
-          context: { schema: consolidatedOptions.schema }
-        }) ?? consolidatedOptions.block.normal({
-          context: { schema: consolidatedOptions.schema }
-        });
-        if (!style) {
-          console.warn('No heading style found, using "normal"'), startBlock("normal");
+        // Headings
+        case "heading_open": {
+          const level = Number(token?.tag?.slice(1)), headingMatcher = {
+            1: consolidatedOptions.block.h1,
+            2: consolidatedOptions.block.h2,
+            3: consolidatedOptions.block.h3,
+            4: consolidatedOptions.block.h4,
+            5: consolidatedOptions.block.h5,
+            6: consolidatedOptions.block.h6
+          }[level], style = headingMatcher?.({
+            context: { schema: consolidatedOptions.schema }
+          }) ?? consolidatedOptions.block.normal({
+            context: { schema: consolidatedOptions.schema }
+          });
+          if (!style) {
+            console.warn('No heading style found, using "normal"'), startBlock("normal");
+            break;
+          }
+          startBlock(style);
           break;
         }
-        startBlock(style);
-        break;
-      }
-      case "heading_close":
-        flushBlock();
-        break;
-      // Blockquote
-      case "blockquote_open": {
-        flushBlock(), currentBlockquoteStyle = consolidatedOptions.block.blockquote({
-          context: { schema: consolidatedOptions.schema }
-        }) ?? consolidatedOptions.block.normal({
-          context: { schema: consolidatedOptions.schema }
-        }) ?? "normal";
-        break;
-      }
-      case "blockquote_close": {
-        flushBlock(), currentBlockquoteStyle = null;
-        break;
-      }
-      // Lists
-      case "bullet_list_open": {
-        const listItem = consolidatedOptions.listItem.bullet({
-          context: { schema: consolidatedOptions.schema }
-        });
-        if (!listItem) {
-          currentListStack.push(null);
+        case "heading_close":
+          flushBlock();
+          break;
+        // Blockquote
+        case "blockquote_open": {
+          if (flushBlock(), consolidatedOptions.types.blockquote) {
+            const startTarget = blockTarget();
+            blockquoteStack.push({
+              startTarget,
+              startIndex: startTarget.length
+            });
+            break;
+          }
+          currentBlockquoteStyle = consolidatedOptions.block.blockquote({
+            context: { schema: consolidatedOptions.schema }
+          }) ?? consolidatedOptions.block.normal({
+            context: { schema: consolidatedOptions.schema }
+          }) ?? "normal";
           break;
         }
-        currentListStack.push(listItem);
-        break;
-      }
-      case "ordered_list_open": {
-        const listItem = consolidatedOptions.listItem.number({
-          context: { schema: consolidatedOptions.schema }
-        });
-        if (!listItem) {
-          currentListStack.push(null);
+        case "blockquote_close": {
+          if (flushBlock(), consolidatedOptions.types.blockquote && blockquoteStack.length > 0) {
+            const frame = blockquoteStack.pop();
+            if (frame) {
+              const contentBlocks = frame.startTarget.splice(
+                frame.startIndex
+              ), blockquoteObject = consolidatedOptions.types.blockquote({
+                context: {
+                  schema: consolidatedOptions.schema,
+                  keyGenerator: consolidatedOptions.keyGenerator
+                },
+                value: { content: contentBlocks },
+                isInline: !1
+              });
+              if (blockquoteObject)
+                pushBlock(blockquoteObject);
+              else {
+                const blockquoteStyle = consolidatedOptions.block.blockquote({
+                  context: { schema: consolidatedOptions.schema }
+                }) ?? consolidatedOptions.block.normal({
+                  context: { schema: consolidatedOptions.schema }
+                }) ?? "blockquote";
+                for (const block of contentBlocks)
+                  block._type === "block" ? pushBlock({
+                    ...block,
+                    style: blockquoteStyle
+                  }) : pushBlock(block);
+              }
+            }
+            break;
+          }
+          currentBlockquoteStyle = null;
           break;
         }
-        currentListStack.push(listItem);
-        break;
-      }
-      case "bullet_list_close":
-      case "ordered_list_close":
-        currentListStack.pop();
-        break;
-      case "list_item_open": {
-        const listType = currentListStack.at(-1);
-        if (listType === void 0)
-          throw new Error("Expected an open list");
-        if (currentBlock && flushBlock(), listType === null) {
-          const style = currentBlockquoteStyle ?? consolidatedOptions.block.normal({
+        // Lists
+        case "bullet_list_open": {
+          if (flushBlock(), consolidatedOptions.types.list) {
+            listContainerStack.push({
+              kind: "bullet",
+              items: [],
+              currentItem: null
+            }), currentListStack.push(null);
+            break;
+          }
+          const listItem = consolidatedOptions.listItem.bullet({
             context: { schema: consolidatedOptions.schema }
           });
-          style ? startBlock(style) : (console.warn('No default style found, using "normal"'), startBlock("normal")), inListItem = !0;
+          if (listContainerStack.push(null), !listItem) {
+            currentListStack.push(null);
+            break;
+          }
+          currentListStack.push(listItem);
           break;
         }
-        ensureListBlock(listType), inListItem = !0;
-        break;
-      }
-      case "list_item_close":
-        inListItem = !1, flushBlock();
-        break;
-      // Code fences / blocks
-      case "fence": {
-        flushBlock();
-        const language = token.info.trim() || void 0, code = token.content.replace(/\n$/, ""), codeObject = consolidatedOptions.types.code({
-          context: {
-            schema: consolidatedOptions.schema,
-            keyGenerator: consolidatedOptions.keyGenerator
-          },
-          value: { language, code },
-          isInline: !1
-        });
-        if (!codeObject) {
-          const style = consolidatedOptions.block.normal({
+        case "ordered_list_open": {
+          if (flushBlock(), consolidatedOptions.types.list) {
+            listContainerStack.push({
+              kind: "number",
+              items: [],
+              currentItem: null
+            }), currentListStack.push(null);
+            break;
+          }
+          const listItem = consolidatedOptions.listItem.number({
             context: { schema: consolidatedOptions.schema }
           });
-          style ? startBlock(style) : (console.warn('No default style found, using "normal"'), startBlock("normal")), addSpan(code), flushBlock();
+          if (listContainerStack.push(null), !listItem) {
+            currentListStack.push(null);
+            break;
+          }
+          currentListStack.push(listItem);
           break;
         }
-        portableText.push(codeObject);
-        break;
-      }
-      // Horizontal rule
-      case "hr": {
-        flushBlock();
-        const hrObject = consolidatedOptions.types.horizontalRule({
-          context: {
-            schema: consolidatedOptions.schema,
-            keyGenerator: consolidatedOptions.keyGenerator
-          },
-          value: {},
-          isInline: !1
-        });
-        if (!hrObject) {
-          const style = consolidatedOptions.block.normal({
-            context: { schema: consolidatedOptions.schema }
-          });
-          style ? startBlock(style) : (console.warn('No default style found, using "normal"'), startBlock("normal")), addSpan("---"), flushBlock();
+        case "bullet_list_close":
+        case "ordered_list_close": {
+          const frame = listContainerStack.pop();
+          if (currentListStack.pop(), frame && consolidatedOptions.types.list) {
+            const kind = frame.items.some(
+              (item) => "checked" in item
+            ) ? "task" : frame.kind, listObject = consolidatedOptions.types.list({
+              context: {
+                schema: consolidatedOptions.schema,
+                keyGenerator: consolidatedOptions.keyGenerator
+              },
+              value: { kind, items: frame.items },
+              isInline: !1
+            });
+            if (listObject)
+              pushBlock(listObject);
+            else {
+              const flatListItem = (kind === "task" ? consolidatedOptions.listItem.task?.({
+                context: { schema: consolidatedOptions.schema }
+              }) : kind === "number" ? consolidatedOptions.listItem.number({
+                context: { schema: consolidatedOptions.schema }
+              }) : consolidatedOptions.listItem.bullet({
+                context: { schema: consolidatedOptions.schema }
+              })) ?? null, level = listContainerStack.length + 1;
+              for (const item of frame.items)
+                for (const block of item.content)
+                  if (block._type === "block" && flatListItem !== null && !("listItem" in block)) {
+                    const flatBlock = {
+                      ...block,
+                      listItem: flatListItem,
+                      level,
+                      ...item.checked === void 0 ? {} : { checked: item.checked }
+                    };
+                    pushBlock(flatBlock);
+                  } else
+                    pushBlock(block);
+            }
+          }
           break;
         }
-        portableText.push(hrObject);
-        break;
-      }
-      // HTML block
-      case "html_block": {
-        flushBlock();
-        const htmlContent = token.content.trim();
-        if (!htmlContent)
+        case "list_item_open": {
+          const frame = listContainerStack.at(-1);
+          if (currentBlock && flushBlock(), frame) {
+            const taskChecked2 = taskCheckedByListItemIndex.get(tokenIndex);
+            frame.currentItem = {
+              _type: "list-item",
+              _key: consolidatedOptions.keyGenerator(),
+              ...taskChecked2 === void 0 ? {} : { checked: taskChecked2 },
+              content: []
+            }, inListItem = !0;
+            break;
+          }
+          const baseListType = currentListStack.at(-1);
+          if (baseListType === void 0)
+            throw new Error("Expected an open list");
+          const taskChecked = taskCheckedByListItemIndex.get(tokenIndex);
+          let listType = baseListType, checked;
+          if (taskChecked !== void 0) {
+            const taskListType = consolidatedOptions.listItem.task?.({
+              context: { schema: consolidatedOptions.schema }
+            });
+            taskListType && (listType = taskListType, checked = taskChecked);
+          }
+          if (listType === null) {
+            const style = currentBlockquoteStyle ?? consolidatedOptions.block.normal({
+              context: { schema: consolidatedOptions.schema }
+            });
+            style ? startBlock(style) : (console.warn('No default style found, using "normal"'), startBlock("normal")), inListItem = !0;
+            break;
+          }
+          ensureListBlock(listType, checked), inListItem = !0;
           break;
-        const htmlObject = consolidatedOptions.types.html({
-          context: {
-            schema: consolidatedOptions.schema,
-            keyGenerator: consolidatedOptions.keyGenerator
-          },
-          value: { html: htmlContent },
-          isInline: !1
-        });
-        if (!htmlObject) {
-          const style = consolidatedOptions.block.normal({
-            context: { schema: consolidatedOptions.schema }
-          });
-          style ? startBlock(style) : (console.warn('No default style found, using "normal"'), startBlock("normal")), addSpan(htmlContent), flushBlock();
+        }
+        case "list_item_close": {
+          const frame = listContainerStack.at(-1);
+          if (frame && frame.currentItem) {
+            flushBlock(), frame.items.push(frame.currentItem), frame.currentItem = null, inListItem = !1;
+            break;
+          }
+          inListItem = !1, flushBlock();
           break;
         }
-        portableText.push(htmlObject);
-        break;
-      }
-      case "code_block": {
-        flushBlock();
-        const code = token.content.replace(/\n$/, ""), codeObject = consolidatedOptions.types.code({
-          context: {
-            schema: consolidatedOptions.schema,
-            keyGenerator: consolidatedOptions.keyGenerator
-          },
-          value: { language: void 0, code },
-          isInline: !1
-        });
-        if (codeObject)
-          portableText.push(codeObject);
-        else {
-          const style = consolidatedOptions.block.normal({
-            context: { schema: consolidatedOptions.schema }
+        // Code fences / blocks
+        case "fence": {
+          flushBlock();
+          const language = token.info.trim() || void 0, code = token.content.replace(/\n$/, ""), codeObject = consolidatedOptions.types.code({
+            context: {
+              schema: consolidatedOptions.schema,
+              keyGenerator: consolidatedOptions.keyGenerator
+            },
+            value: { language, code },
+            isInline: !1
           });
-          style ? startBlock(style) : (console.warn('No default style found, using "normal"'), startBlock("normal")), addSpan(code), flushBlock();
-        }
-        break;
-      }
-      // Tables
-      case "table_open":
-        flushBlock(), currentTable = { rows: [], headerRows: 0 };
-        break;
-      case "table_close": {
-        if (!currentTable)
+          if (!codeObject) {
+            const style = consolidatedOptions.block.normal({
+              context: { schema: consolidatedOptions.schema }
+            });
+            style ? startBlock(style) : (console.warn('No default style found, using "normal"'), startBlock("normal")), addSpan(code), flushBlock();
+            break;
+          }
+          pushBlock(codeObject);
           break;
-        if (consolidatedOptions.types.table) {
-          const tableObject = consolidatedOptions.types.table({
+        }
+        // Horizontal rule
+        case "hr": {
+          flushBlock();
+          const hrObject = consolidatedOptions.types.horizontalRule({
             context: {
               schema: consolidatedOptions.schema,
               keyGenerator: consolidatedOptions.keyGenerator
             },
-            value: {
-              rows: currentTable.rows,
-              headerRows: currentTable.headerRows > 0 ? currentTable.headerRows : void 0
-            },
+            value: {},
             isInline: !1
           });
-          tableObject ? portableText.push(tableObject) : flattenTable(currentTable, portableText);
-        } else
-          flattenTable(currentTable, portableText);
-        currentTable = null;
-        break;
-      }
-      case "thead_open":
-        inTableHead = !0;
-        break;
-      case "thead_close":
-        inTableHead = !1;
-        break;
-      case "tbody_open":
-      case "tbody_close":
-        break;
-      case "tr_open":
-        currentTableRow = [];
-        break;
-      case "tr_close":
-        currentTable && currentTableRow && (currentTable.rows.push({
-          _key: consolidatedOptions.keyGenerator(),
-          _type: "row",
-          cells: currentTableRow
-        }), inTableHead && currentTable.headerRows++), currentTableRow = null;
-        break;
-      case "th_open":
-      case "td_open": {
-        const style = consolidatedOptions.block.normal({
-          context: { schema: consolidatedOptions.schema }
-        });
-        style ? startBlock(style) : (console.warn('No default style found, using "normal"'), startBlock("normal"));
-        break;
-      }
-      case "th_close":
-      case "td_close": {
-        flushBlock();
-        const cellBlocks = [];
-        if (portableText.length > 0) {
-          const lastBlock = portableText.at(-1);
-          lastBlock && lastBlock._type === "block" && cellBlocks.push(portableText.pop());
-        }
-        cellBlocks.length === 0 && cellBlocks.push({
-          _type: "block",
-          style: consolidatedOptions.block.normal({
-            context: { schema: consolidatedOptions.schema }
-          }) || "normal",
-          children: [
-            {
-              _type: consolidatedOptions.schema.span.name,
-              _key: consolidatedOptions.keyGenerator(),
-              text: "",
-              marks: []
-            }
-          ],
-          _key: consolidatedOptions.keyGenerator(),
-          markDefs: []
-        });
-        const firstBlock = cellBlocks[0];
-        if (cellBlocks.length === 1 && firstBlock && firstBlock._type === "block" && "children" in firstBlock && Array.isArray(firstBlock.children) && firstBlock.children.length === 1) {
-          const onlyChild = firstBlock.children[0];
-          typeof onlyChild == "object" && onlyChild !== null && "_type" in onlyChild && onlyChild._type !== consolidatedOptions.schema.span.name && onlyChild._type === "image" && (cellBlocks[0] = onlyChild);
+          if (!hrObject) {
+            const style = consolidatedOptions.block.normal({
+              context: { schema: consolidatedOptions.schema }
+            });
+            style ? startBlock(style) : (console.warn('No default style found, using "normal"'), startBlock("normal")), addSpan("---"), flushBlock();
+            break;
+          }
+          pushBlock(hrObject);
+          break;
         }
-        currentTableRow !== null && currentTableRow.push({
-          _type: "cell",
-          _key: consolidatedOptions.keyGenerator(),
-          value: cellBlocks
-        });
-        break;
-      }
-      // Inline container
-      case "inline": {
-        const inTableCell = currentTableRow !== null;
-        if (token.children?.length === 1 && token.children[0]?.type === "image") {
-          const imageToken = token.children[0];
-          if (!imageToken)
+        // HTML block
+        case "html_block": {
+          flushBlock();
+          const htmlContent = token.content.trim();
+          if (!htmlContent)
             break;
-          const src = imageToken.attrs?.find(([name]) => name === "src")?.at(1) || "", alt = unescapeImageAndLinkText(imageToken.content || ""), title = imageToken.attrs?.find(([name]) => name === "title")?.at(1) || void 0, blockImageObject = consolidatedOptions.types.image({
+          const htmlObject = consolidatedOptions.types.html({
             context: {
               schema: consolidatedOptions.schema,
               keyGenerator: consolidatedOptions.keyGenerator
             },
-            value: { src, alt, title },
+            value: { html: htmlContent },
             isInline: !1
           });
-          if (blockImageObject) {
-            inTableCell ? currentBlock && "children" in currentBlock && currentBlock.children.push(
-              blockImageObject
-            ) : (currentBlock && "children" in currentBlock && currentBlock.children.length > 0 ? flushBlock() : (currentBlock = null, currentMarkDefs = []), portableText.push(blockImageObject));
+          if (!htmlObject) {
+            const style = consolidatedOptions.block.normal({
+              context: { schema: consolidatedOptions.schema }
+            });
+            style ? startBlock(style) : (console.warn('No default style found, using "normal"'), startBlock("normal")), addSpan(htmlContent), flushBlock();
             break;
           }
-          const inlineImageObject = consolidatedOptions.types.image({
+          pushBlock(htmlObject);
+          break;
+        }
+        case "code_block": {
+          flushBlock();
+          const code = token.content.replace(/\n$/, ""), codeObject = consolidatedOptions.types.code({
             context: {
               schema: consolidatedOptions.schema,
               keyGenerator: consolidatedOptions.keyGenerator
             },
-            value: { src, alt, title },
-            isInline: !0
+            value: { language: void 0, code },
+            isInline: !1
           });
-          if (inlineImageObject) {
-            if (!currentBlock)
-              if (inListItem) {
-                const listType = currentListStack.at(-1);
-                listType && ensureListBlock(listType);
-              } else {
-                const style = consolidatedOptions.block.normal({
-                  context: { schema: consolidatedOptions.schema }
-                });
-                style && startBlock(style);
-              }
-            currentBlock && "children" in currentBlock && currentBlock.children.push(
-              inlineImageObject
-            );
+          if (codeObject)
+            pushBlock(codeObject);
+          else {
+            const style = consolidatedOptions.block.normal({
+              context: { schema: consolidatedOptions.schema }
+            });
+            style ? startBlock(style) : (console.warn('No default style found, using "normal"'), startBlock("normal")), addSpan(code), flushBlock();
+          }
+          break;
+        }
+        // Tables
+        case "table_open":
+          flushBlock(), currentTable = { rows: [], headerRows: 0 };
+          break;
+        case "table_close": {
+          if (!currentTable)
             break;
+          if (consolidatedOptions.types.table) {
+            const tableObject = consolidatedOptions.types.table({
+              context: {
+                schema: consolidatedOptions.schema,
+                keyGenerator: consolidatedOptions.keyGenerator
+              },
+              value: {
+                rows: currentTable.rows,
+                headerRows: currentTable.headerRows > 0 ? currentTable.headerRows : void 0
+              },
+              isInline: !1
+            });
+            tableObject ? pushBlock(tableObject) : flattenTable(
+              currentTable,
+              blockTarget()
+            );
+          } else
+            flattenTable(currentTable, blockTarget());
+          currentTable = null;
+          break;
+        }
+        case "thead_open":
+          inTableHead = !0;
+          break;
+        case "thead_close":
+          inTableHead = !1;
+          break;
+        case "tbody_open":
+        case "tbody_close":
+          break;
+        case "tr_open":
+          currentTableRow = [];
+          break;
+        case "tr_close":
+          currentTable && currentTableRow && (currentTable.rows.push({
+            _key: consolidatedOptions.keyGenerator(),
+            _type: "row",
+            cells: currentTableRow
+          }), inTableHead && currentTable.headerRows++), currentTableRow = null;
+          break;
+        case "th_open":
+        case "td_open": {
+          const style = consolidatedOptions.block.normal({
+            context: { schema: consolidatedOptions.schema }
+          });
+          style ? startBlock(style) : (console.warn('No default style found, using "normal"'), startBlock("normal"));
+          break;
+        }
+        case "th_close":
+        case "td_close": {
+          flushBlock();
+          const cellBlocks = [], target = blockTarget();
+          if (target.length > 0) {
+            const lastBlock = target.at(-1);
+            lastBlock && lastBlock._type === "block" && cellBlocks.push(target.pop());
+          }
+          cellBlocks.length === 0 && cellBlocks.push({
+            _type: "block",
+            style: consolidatedOptions.block.normal({
+              context: { schema: consolidatedOptions.schema }
+            }) || "normal",
+            children: [
+              {
+                _type: consolidatedOptions.schema.span.name,
+                _key: consolidatedOptions.keyGenerator(),
+                text: "",
+                marks: []
+              }
+            ],
+            _key: consolidatedOptions.keyGenerator(),
+            markDefs: []
+          });
+          const firstBlock = cellBlocks[0];
+          if (cellBlocks.length === 1 && firstBlock && firstBlock._type === "block" && "children" in firstBlock && Array.isArray(firstBlock.children) && firstBlock.children.length === 1) {
+            const onlyChild = firstBlock.children[0];
+            typeof onlyChild == "object" && onlyChild !== null && "_type" in onlyChild && onlyChild._type !== consolidatedOptions.schema.span.name && onlyChild._type === "image" && (cellBlocks[0] = onlyChild);
           }
-          addSpan(`![${alt}](${src})`);
+          currentTableRow !== null && currentTableRow.push({
+            _type: "cell",
+            _key: consolidatedOptions.keyGenerator(),
+            value: cellBlocks
+          });
           break;
         }
-        for (const childToken of token.children ?? [])
-          switch (childToken.type) {
-            case "text":
-              addSpan(childToken.content);
+        // Inline container
+        case "inline": {
+          const inTableCell = currentTableRow !== null;
+          if (token.children?.length === 1 && token.children[0]?.type === "image") {
+            const imageToken = token.children[0];
+            if (!imageToken)
               break;
-            case "softbreak":
-            case "hardbreak":
-              addSpan(`
-`);
-              break;
-            case "code_inline": {
-              const decorator = consolidatedOptions.marks.code({
-                context: { schema: consolidatedOptions.schema }
-              });
-              if (!decorator) {
-                addSpan(childToken.content);
-                break;
-              }
-              markDefRefs.push(decorator), addSpan(childToken.content);
-              const index = markDefRefs.lastIndexOf(decorator);
-              index !== -1 && markDefRefs.splice(index, 1);
+            const src = imageToken.attrs?.find(([name]) => name === "src")?.at(1) || "", alt = unescapeImageAndLinkText(imageToken.content || ""), title = imageToken.attrs?.find(([name]) => name === "title")?.at(1) || void 0, blockImageObject = consolidatedOptions.types.image({
+              context: {
+                schema: consolidatedOptions.schema,
+                keyGenerator: consolidatedOptions.keyGenerator
+              },
+              value: { src, alt, title },
+              isInline: !1
+            });
+            if (blockImageObject) {
+              inTableCell ? currentBlock && "children" in currentBlock && currentBlock.children.push(
+                blockImageObject
+              ) : (currentBlock && "children" in currentBlock && currentBlock.children.length > 0 ? flushBlock() : (currentBlock = null, currentMarkDefs = []), pushBlock(blockImageObject));
               break;
             }
-            case "strong_open": {
-              const decorator = consolidatedOptions.marks.strong({
-                context: { schema: consolidatedOptions.schema }
-              });
-              if (!decorator)
-                break;
-              markDefRefs.push(decorator);
+            const inlineImageObject = consolidatedOptions.types.image({
+              context: {
+                schema: consolidatedOptions.schema,
+                keyGenerator: consolidatedOptions.keyGenerator
+              },
+              value: { src, alt, title },
+              isInline: !0
+            });
+            if (inlineImageObject) {
+              if (!currentBlock)
+                if (inListItem)
+                  if (listContainerStack.at(-1)) {
+                    const style = consolidatedOptions.block.normal({
+                      context: { schema: consolidatedOptions.schema }
+                    }) ?? "normal";
+                    startBlock(style);
+                  } else {
+                    const listType = currentListStack.at(-1);
+                    listType && ensureListBlock(listType);
+                  }
+                else {
+                  const style = consolidatedOptions.block.normal({
+                    context: { schema: consolidatedOptions.schema }
+                  });
+                  style && startBlock(style);
+                }
+              currentBlock && "children" in currentBlock && currentBlock.children.push(
+                inlineImageObject
+              );
               break;
             }
-            case "strong_close": {
-              const decorator = consolidatedOptions.marks.strong({
-                context: { schema: consolidatedOptions.schema }
-              });
-              if (!decorator)
+            addSpan(`![${alt}](${src})`);
+            break;
+          }
+          for (const childToken of token.children ?? [])
+            switch (childToken.type) {
+              case "text":
+                addSpan(childToken.content);
                 break;
-              const index = markDefRefs.lastIndexOf(decorator);
-              index !== -1 && markDefRefs.splice(index, 1);
-              break;
-            }
-            case "em_open": {
-              const decorator = consolidatedOptions.marks.em({
-                context: { schema: consolidatedOptions.schema }
-              });
-              if (!decorator)
+              case "softbreak":
+              case "hardbreak":
+                addSpan(`
+`);
                 break;
-              markDefRefs.push(decorator);
-              break;
-            }
-            case "em_close": {
-              const decorator = consolidatedOptions.marks.em({
-                context: { schema: consolidatedOptions.schema }
-              });
-              if (!decorator)
+              case "code_inline": {
+                const decorator = consolidatedOptions.marks.code({
+                  context: { schema: consolidatedOptions.schema }
+                });
+                if (!decorator) {
+                  addSpan(childToken.content);
+                  break;
+                }
+                markDefRefs.push(decorator), addSpan(childToken.content);
+                const index = markDefRefs.lastIndexOf(decorator);
+                index !== -1 && markDefRefs.splice(index, 1);
                 break;
-              const index = markDefRefs.lastIndexOf(decorator);
-              index !== -1 && markDefRefs.splice(index, 1);
-              break;
-            }
-            case "s_open": {
-              const decorator = consolidatedOptions.marks.strikeThrough({
-                context: { schema: consolidatedOptions.schema }
-              });
-              if (!decorator)
+              }
+              case "strong_open": {
+                const decorator = consolidatedOptions.marks.strong({
+                  context: { schema: consolidatedOptions.schema }
+                });
+                if (!decorator)
+                  break;
+                markDefRefs.push(decorator);
                 break;
-              markDefRefs.push(decorator);
-              break;
-            }
-            case "s_close": {
-              const decorator = consolidatedOptions.marks.strikeThrough({
-                context: { schema: consolidatedOptions.schema }
-              });
-              if (!decorator)
+              }
+              case "strong_close": {
+                const decorator = consolidatedOptions.marks.strong({
+                  context: { schema: consolidatedOptions.schema }
+                });
+                if (!decorator)
+                  break;
+                const index = markDefRefs.lastIndexOf(decorator);
+                index !== -1 && markDefRefs.splice(index, 1);
                 break;
-              const index = markDefRefs.lastIndexOf(decorator);
-              index !== -1 && markDefRefs.splice(index, 1);
-              break;
-            }
-            case "link_open": {
-              const href = childToken.attrs?.find(([name]) => name === "href")?.at(1);
-              if (!href)
+              }
+              case "em_open": {
+                const decorator = consolidatedOptions.marks.em({
+                  context: { schema: consolidatedOptions.schema }
+                });
+                if (!decorator)
+                  break;
+                markDefRefs.push(decorator);
                 break;
-              const title = childToken.attrs?.find(([name]) => name === "title")?.at(1), linkObject = consolidatedOptions.marks.link({
-                context: {
-                  schema: consolidatedOptions.schema,
-                  keyGenerator: consolidatedOptions.keyGenerator
-                },
-                value: { href, title }
-              });
-              if (!linkObject)
+              }
+              case "em_close": {
+                const decorator = consolidatedOptions.marks.em({
+                  context: { schema: consolidatedOptions.schema }
+                });
+                if (!decorator)
+                  break;
+                const index = markDefRefs.lastIndexOf(decorator);
+                index !== -1 && markDefRefs.splice(index, 1);
                 break;
-              currentMarkDefs.push(linkObject), markDefRefs.push(linkObject._key);
-              break;
-            }
-            case "link_close": {
-              const markDefKeys = new Set(currentMarkDefs.map((d) => d._key));
-              let lastLinkIndex;
-              for (const markDefRef of markDefRefs.reverse())
-                if (markDefKeys.has(markDefRef)) {
-                  lastLinkIndex = markDefRefs.indexOf(markDefRef);
+              }
+              case "s_open": {
+                const decorator = consolidatedOptions.marks.strikeThrough({
+                  context: { schema: consolidatedOptions.schema }
+                });
+                if (!decorator)
                   break;
-                }
-              if (lastLinkIndex !== void 0) {
-                const realIndex = markDefRefs.length - 1 - lastLinkIndex;
-                markDefRefs.splice(realIndex, 1);
+                markDefRefs.push(decorator);
+                break;
               }
-              break;
-            }
-            case "image": {
-              const src = childToken.attrs?.find(([name]) => name === "src")?.at(1) || "", alt = unescapeImageAndLinkText(childToken.content || ""), inlineImageObject = consolidatedOptions.types.image({
-                context: {
-                  schema: consolidatedOptions.schema,
-                  keyGenerator: consolidatedOptions.keyGenerator
-                },
-                value: { src, alt, title: void 0 },
-                isInline: !0
-              });
-              if (inlineImageObject) {
-                if (!currentBlock) {
-                  const style2 = consolidatedOptions.block.normal({
-                    context: { schema: consolidatedOptions.schema }
-                  });
-                  style2 ? startBlock(style2) : (console.warn('No default style found, using "normal"'), startBlock("normal"));
+              case "s_close": {
+                const decorator = consolidatedOptions.marks.strikeThrough({
+                  context: { schema: consolidatedOptions.schema }
+                });
+                if (!decorator)
+                  break;
+                const index = markDefRefs.lastIndexOf(decorator);
+                index !== -1 && markDefRefs.splice(index, 1);
+                break;
+              }
+              case "link_open": {
+                const href = childToken.attrs?.find(([name]) => name === "href")?.at(1);
+                if (!href)
+                  break;
+                const title = childToken.attrs?.find(([name]) => name === "title")?.at(1), linkObject = consolidatedOptions.marks.link({
+                  context: {
+                    schema: consolidatedOptions.schema,
+                    keyGenerator: consolidatedOptions.keyGenerator
+                  },
+                  value: { href, title }
+                });
+                if (!linkObject)
+                  break;
+                currentMarkDefs.push(linkObject), markDefRefs.push(linkObject._key);
+                break;
+              }
+              case "link_close": {
+                const markDefKeys = new Set(currentMarkDefs.map((d) => d._key));
+                let lastLinkIndex;
+                for (const markDefRef of markDefRefs.reverse())
+                  if (markDefKeys.has(markDefRef)) {
+                    lastLinkIndex = markDefRefs.indexOf(markDefRef);
+                    break;
+                  }
+                if (lastLinkIndex !== void 0) {
+                  const realIndex = markDefRefs.length - 1 - lastLinkIndex;
+                  markDefRefs.splice(realIndex, 1);
                 }
-                if (!currentBlock)
-                  throw new Error("Expected current block after startBlock");
-                currentBlock.children.push(
-                  inlineImageObject
-                );
                 break;
               }
-              const blockImageObject = consolidatedOptions.types.image({
-                context: {
-                  schema: consolidatedOptions.schema,
-                  keyGenerator: consolidatedOptions.keyGenerator
-                },
-                value: { src, alt, title: void 0 },
-                isInline: !1
-              });
-              if (!blockImageObject) {
-                addSpan(`![${alt}](${src})`);
+              case "image": {
+                const src = childToken.attrs?.find(([name]) => name === "src")?.at(1) || "", alt = unescapeImageAndLinkText(childToken.content || ""), inlineImageObject = consolidatedOptions.types.image({
+                  context: {
+                    schema: consolidatedOptions.schema,
+                    keyGenerator: consolidatedOptions.keyGenerator
+                  },
+                  value: { src, alt, title: void 0 },
+                  isInline: !0
+                });
+                if (inlineImageObject) {
+                  if (!currentBlock) {
+                    const style2 = consolidatedOptions.block.normal({
+                      context: { schema: consolidatedOptions.schema }
+                    });
+                    style2 ? startBlock(style2) : (console.warn('No default style found, using "normal"'), startBlock("normal"));
+                  }
+                  if (!currentBlock)
+                    throw new Error("Expected current block after startBlock");
+                  currentBlock.children.push(
+                    inlineImageObject
+                  );
+                  break;
+                }
+                const blockImageObject = consolidatedOptions.types.image({
+                  context: {
+                    schema: consolidatedOptions.schema,
+                    keyGenerator: consolidatedOptions.keyGenerator
+                  },
+                  value: { src, alt, title: void 0 },
+                  isInline: !1
+                });
+                if (!blockImageObject) {
+                  addSpan(`![${alt}](${src})`);
+                  break;
+                }
+                if (inTableCell) {
+                  currentBlock && "children" in currentBlock && currentBlock.children.push(
+                    blockImageObject
+                  );
+                  break;
+                }
+                flushBlock(), pushBlock(blockImageObject);
+                const style = consolidatedOptions.block.normal({
+                  context: { schema: consolidatedOptions.schema }
+                });
+                style && startBlock(style);
                 break;
               }
-              if (inTableCell) {
-                currentBlock && "children" in currentBlock && currentBlock.children.push(
-                  blockImageObject
-                );
+              case "html_inline": {
+                consolidatedOptions.html.inline === "text" && addSpan(childToken.content);
                 break;
               }
-              flushBlock(), portableText.push(blockImageObject);
-              const style = consolidatedOptions.block.normal({
-                context: { schema: consolidatedOptions.schema }
-              });
-              style && startBlock(style);
-              break;
-            }
-            case "html_inline": {
-              consolidatedOptions.html.inline === "text" && addSpan(childToken.content);
-              break;
             }
+          break;
+        }
+        // Callouts (GFM alerts)
+        case "alert_open": {
+          flushBlock(), calloutStartTarget = blockTarget(), calloutStartIndex = calloutStartTarget.length, calloutType = token.markup, currentBlockquoteStyle = consolidatedOptions.block.blockquote({
+            context: { schema: consolidatedOptions.schema }
+          }) ?? consolidatedOptions.block.normal({
+            context: { schema: consolidatedOptions.schema }
+          }) ?? "normal";
+          break;
+        }
+        case "alert_title":
+          break;
+        case "alert_close": {
+          if (flushBlock(), calloutStartIndex !== null && calloutType !== null && calloutStartTarget !== null) {
+            const contentBlocks = calloutStartTarget.splice(
+              calloutStartIndex
+            ), calloutObject = consolidatedOptions.types.callout?.({
+              context: {
+                schema: consolidatedOptions.schema,
+                keyGenerator: consolidatedOptions.keyGenerator
+              },
+              value: { tone: calloutType, content: contentBlocks },
+              isInline: !1
+            });
+            if (calloutObject)
+              pushBlock(calloutObject);
+            else
+              for (const block of contentBlocks)
+                pushBlock(block);
           }
-        break;
-      }
-      // Callouts (GFM alerts)
-      case "alert_open": {
-        flushBlock(), calloutStartIndex = portableText.length, calloutType = token.markup, currentBlockquoteStyle = consolidatedOptions.block.blockquote({
-          context: { schema: consolidatedOptions.schema }
-        }) ?? consolidatedOptions.block.normal({
-          context: { schema: consolidatedOptions.schema }
-        }) ?? "normal";
-        break;
-      }
-      case "alert_title":
-        break;
-      case "alert_close": {
-        if (flushBlock(), calloutStartIndex !== null && calloutType !== null) {
-          const contentBlocks = portableText.splice(calloutStartIndex), calloutObject = consolidatedOptions.types.callout?.({
-            context: {
-              schema: consolidatedOptions.schema,
-              keyGenerator: consolidatedOptions.keyGenerator
-            },
-            value: { tone: calloutType, content: contentBlocks },
-            isInline: !1
-          });
-          calloutObject ? portableText.push(calloutObject) : portableText.push(...contentBlocks);
+          calloutStartIndex = null, calloutStartTarget = null, calloutType = null, currentBlockquoteStyle = null;
+          break;
         }
-        calloutStartIndex = null, calloutType = null, currentBlockquoteStyle = null;
-        break;
       }
-    }
+  }
   return flushBlock(), portableText;
 }
 export {
   DefaultBlockSpacingRenderer,
+  DefaultBlockquoteObjectRenderer,
   DefaultBlockquoteRenderer,
   DefaultCalloutRenderer,
   DefaultCodeBlockRenderer,
@@ -1167,6 +1406,7 @@ export {
   DefaultImageRenderer,
   DefaultLinkRenderer,
   DefaultListItemRenderer,
+  DefaultListRenderer,
   DefaultNormalRenderer,
   DefaultStrikeThroughRenderer,
   DefaultStrongRenderer,