fix: refactor conversion logic

packages/@atjson/source-commonmark/src/converter/tables.ts → packages/@atjson/offset-annotations/src/utils/convert-html-tables.ts

@@ -4,14 +4,13 @@ import {
   SliceAnnotation,
   compareAnnotations,
 } from "@atjson/document";
-import OffsetSource, {
-  DataSet,
-  Table,
-  ColumnType,
-} from "@atjson/offset-annotations";
-
-export function convertTables(doc: OffsetSource): void {
-  doc.where({ type: "-commonmark-table" }).forEach((table) => {
+import OffsetSource, { DataSet, Table, ColumnType } from "../index";
+
+export function convertHTMLTablesToDataSet(
+  doc: OffsetSource,
+  vendor: string
+): void {
+  doc.where({ type: `-${vendor}-table` }).forEach((table) => {
     let dataColumnHeaders: {
       name: string;
       slice: string;
@@ -25,6 +24,7 @@ export function convertTables(doc: OffsetSource): void {
     doc
       .where(
         (annotation) =>
+          annotation.vendorPrefix === vendor &&
           annotation.type === "th" &&
           annotation.start >= table.start &&
           annotation.end <= table.end
@@ -69,6 +69,7 @@ export function convertTables(doc: OffsetSource): void {
 
     let tableRows = doc.where(
       (annotation) =>
+        annotation.vendorPrefix === vendor &&
         annotation.type === "tr" &&
         annotation.start >= table.start &&
         annotation.end <= table.end
@@ -81,6 +82,7 @@ export function convertTables(doc: OffsetSource): void {
       doc
         .where(
           (annotation) =>
+            annotation.vendorPrefix === vendor &&
             annotation.type === "td" &&
             annotation.start >= row.start &&
             annotation.end <= row.end
@@ -148,6 +150,6 @@ export function convertTables(doc: OffsetSource): void {
     doc.replaceAnnotation(table, dataSet, dataSetSlice, offsetTable);
   });
 
-  doc.where({ type: "-commonmark-thead" }).remove();
-  doc.where({ type: "-commonmark-tbody" }).remove();
+  doc.where({ type: `-${vendor}-thead` }).remove();
+  doc.where({ type: `-${vendor}-tbody` }).remove();
 }

packages/@atjson/offset-annotations/src/utils/index.ts

@@ -1,5 +1,11 @@
 import { getClosestAspectRatio } from "./aspect-ratios";
 import * as SocialURLs from "./social-urls";
 import * as VideoURLs from "./video-urls";
+import { convertHTMLTablesToDataSet } from "./convert-html-tables";
 
-export { getClosestAspectRatio, SocialURLs, VideoURLs };
+export {
+  convertHTMLTablesToDataSet,
+  getClosestAspectRatio,
+  SocialURLs,
+  VideoURLs,
+};

packages/@atjson/source-commonmark/src/converter/index.ts

@@ -1,6 +1,9 @@
-import OffsetSource, { CodeBlock, Image } from "@atjson/offset-annotations";
+import OffsetSource, {
+  CodeBlock,
+  Image,
+  convertHTMLTablesToDataSet,
+} from "@atjson/offset-annotations";
 import CommonmarkSource from "../source";
-import { convertTables } from "./tables";
 
 CommonmarkSource.defineConverterTo(
   OffsetSource,
@@ -90,7 +93,7 @@ CommonmarkSource.defineConverterTo(
       .set({ type: "-offset-paragraph" });
     doc.where({ type: "-commonmark-strong" }).set({ type: "-offset-bold" });
 
-    convertTables(doc);
+    convertHTMLTablesToDataSet(doc, "commonmark");
 
     return doc;
   }

packages/@atjson/source-html/src/converter/index.ts

@@ -3,6 +3,7 @@ import OffsetSource, {
   CodeBlock,
   List,
   IframeEmbed,
+  convertHTMLTablesToDataSet,
 } from "@atjson/offset-annotations";
 import { OrderedList } from "../annotations";
 import HTMLSource from "../source";
@@ -174,5 +175,7 @@ HTMLSource.defineConverterTo(OffsetSource, function HTMLToOffset(doc) {
 
   doc.where(isSmallCaps).set({ type: "-offset-small-caps", attributes: {} });
 
+  convertHTMLTablesToDataSet(doc, "html");
+
   return doc;
 });

packages/@atjson/source-html/test/converter.test.ts

@@ -1419,5 +1419,10 @@ describe("@atjson/source-html", () => {
         `);
       });
     });
+
+    describe("tables", () => {
+      test.todo("commonmark-like tables convert correctly");
+      test.todo("non-commonmark tables are correctly dropped");
+    });
   });
 });