chore: update commonmark & html converters to use text

also allow for content to be embedded in an arbitrary level for datasets, rather than eating the content
CondeNast · Mar 21, 2024 · 62f1e94 · 62f1e94
1 parent a848b44
commit 62f1e94
Show file tree

Hide file tree

Showing 5 changed files with 1,786 additions and 618 deletions.
diff --git a/packages/@atjson/offset-annotations/src/utils/convert-html-tables.ts b/packages/@atjson/offset-annotations/src/utils/convert-html-tables.ts
@@ -1,9 +1,9 @@
 import {
-  AdjacentBoundaryBehaviour,
   JSON,
   SliceAnnotation,
   compareAnnotations,
   Annotation,
+  TextAnnotation,
 } from "@atjson/document";
 
 import OffsetSource, { DataSet, Table, ColumnType } from "../index";
@@ -106,13 +106,12 @@ export function convertHTMLTablesToDataSet(
 
     if (headings.length) {
       headings.sort(compareAnnotations).forEach((headCell, index) => {
-        if (index !== 0) {
-          doc.insertText(
-            headCell.start,
-            " ",
-            AdjacentBoundaryBehaviour.preserveBoth
-          );
-        }
+        doc.addAnnotations(
+          new TextAnnotation({
+            start: headCell.start,
+            end: headCell.end,
+          })
+        );
 
         let slice = new SliceAnnotation({
           ...headCell,
@@ -154,8 +153,6 @@ export function convertHTMLTablesToDataSet(
     );
 
     tableRows.forEach((row) => {
-      doc.insertText(row.start, " ", AdjacentBoundaryBehaviour.preserveBoth);
-
       let rowEntries: [string, { slice: string; jsonValue: JSON }][] = [];
       doc
         .where(
@@ -168,10 +165,11 @@ export function convertHTMLTablesToDataSet(
         .sort(compareAnnotations)
         .forEach((bodyCell, index) => {
           if (index !== 0) {
-            doc.insertText(
-              bodyCell.start,
-              " ",
-              AdjacentBoundaryBehaviour.preserveBoth
+            doc.addAnnotations(
+              new TextAnnotation({
+                start: bodyCell.start,
+                end: bodyCell.end,
+              })
             );
           }
 

diff --git a/packages/@atjson/renderer-commonmark/src/index.ts b/packages/@atjson/renderer-commonmark/src/index.ts
@@ -739,7 +739,7 @@ export default class CommonmarkRenderer extends Renderer {
   }
 
   *DataSet(): Generator<void, string, string[]> {
-    return "";
+    return (yield).join("");
   }
 
   *Table(
@@ -750,7 +750,7 @@ export default class CommonmarkRenderer extends Renderer {
       return "";
     }
 
-    const previousState = this.state;
+    const previousState = { ...this.state };
     this.state.inlineOnly = true;
 
     const dataSet = context.document.blocks.find(

diff --git a/packages/@atjson/renderer-html/src/index.ts b/packages/@atjson/renderer-html/src/index.ts
@@ -175,8 +175,8 @@ export default class HTMLRenderer extends Renderer {
     return `<pre>${codeSnippet}</pre>`;
   }
 
-  *DataSet() {
-    return "";
+  *DataSet(): Iterator<void, string, string[]> {
+    return (yield).join("");
   }
 
   *Heading(heading: Block<Heading>) {