tsondb 0.8.1 → 0.8.3

package/dist/src/shared/utils/markdown.d.ts

@@ -52,9 +52,13 @@ export type ListItemNode = {
 export type TableBlockNode = {
     kind: "table";
     caption?: InlineMarkdownNode[];
+    columns: TableColumnStyleBlockNode[];
     header: TableCellBlockNode[];
     rows: TableRowBlockNode[] | TableSectionBlockNode[];
 };
+export type TableColumnStyleBlockNode = {
+    alignment?: "left" | "center" | "right";
+};
 export type TableSectionBlockNode = {
     kind: "tableSection";
     header?: TableCellBlockNode[];

package/dist/src/shared/utils/markdown.js

@@ -293,11 +293,32 @@ const parseContentRowForSyntaxHighlighting = (row) => row.split(/(\|+)/).reduce(
         return [...acc, tableMarker(segment)];
     }
 }, []);
+const trimPipes = (text) => text.replace(/^\|/, "").replace(/\|$/, "");
+const parseTableAlignment = (text) => {
+    const trimmed = text.trim();
+    if (/^:-+:$/.test(trimmed)) {
+        return "center";
+    }
+    else if (/^:-+$/.test(trimmed)) {
+        return "left";
+    }
+    else if (/^-+:$/.test(trimmed)) {
+        return "right";
+    }
+    else {
+        return undefined;
+    }
+};
 const tableRule = {
     pattern: /^(?:(\|#)(.+?)(#\|)\n)?(\|)?(.+?(?:(?<!\\)\|.+?)+)((?<!\\)\|)?\n((?:\| *)?(?:-{3,}|:-{2,}|-{2,}:|:-+:)(?: *\| *(?:-{3,}|:-{2,}|-{2,}:|:-+:))*(?: *\|)?)((?:\n\|?.+?(?:(?<!\\)\|+.+?)*(?:(?<!\\)\|+)?)+)(\n{2,}|$)/,
-    map: ([_res, _captionMarkerStart, caption, _captionMarkerEnd, _headerMarkerStart, headers, _headerMarkerEnd, _bodySeparators, body, _trailingWhitespace,]) => omitUndefinedKeys({
+    map: ([_res, _captionMarkerStart, caption, _captionMarkerEnd, _headerMarkerStart, headers, _headerMarkerEnd, bodySeparators = "", body, _trailingWhitespace,]) => omitUndefinedKeys({
         kind: "table",
         caption: caption !== undefined ? parseInlineMarkdown(caption.trim(), false) : undefined,
+        columns: trimPipes(bodySeparators)
+            .split("|")
+            .map(col => omitUndefinedKeys({
+            alignment: parseTableAlignment(col),
+        })),
         header: headers ? parseContentRow(headers) : [],
         rows: body
             ?.split("\n")
@@ -488,7 +509,7 @@ const footnoteRule = {
 };
 const definitionListItemSeparatorPattern = /(^.+?(?=\n:)|\n\n[^: ].*?(?=\n:))/s;
 const definitionListRule = {
-    pattern: /((?:[^\n]+?(?:\n[^\n]+?)*)(?:\n: .+?(?:\n {2}.+?)*)+(?:\n\n(?:[^\n]+?(?:\n[^\n]+?)*)(?:\n: .+?(?:\n(?=\n)|\n {2}.+?)*))*)(\n{2,}|\s*$)/,
+    pattern: /^((?:[^\n]+?(?:\n[^\n]+?)*)(?:\n: .+?(?:\n {2}.+?)*)+(?:\n\n(?:[^\n]+?(?:\n[^\n]+?)*)(?:\n: .+?(?:\n(?=\n)|\n {2}.+?)*))*)(\n{2,}|\s*$)/,
     map: ([_res, content = "", _trailingWhitespace]) => {
         const definitionItemPairs = chunk(content.split(definitionListItemSeparatorPattern).slice(1), 2);
         const items = definitionItemPairs.map(([termsText = "", definitionsText = ""]) => {

package/dist/src/web/utils/BlockMarkdown.js

@@ -17,7 +17,7 @@ export const BlockMarkdown = ({ node, outerHeadingLevel = 0, insertBefore, }) =>
                 return (_jsxs(_Fragment, { children: [insertBefore, _jsx("ul", { children: node.content.map((item, ii) => (_jsx("li", { children: item.content.map((inline, iii) => (_jsx(InlineMarkdown, { node: inline }, iii))) }, ii))) })] }));
             }
         case "table":
-            return (_jsxs(_Fragment, { children: [insertBefore, _jsxs("table", { children: [node.caption !== undefined && (_jsx("caption", { children: node.caption.map((inline, ci) => (_jsx(InlineMarkdown, { node: inline }, ci))) })), _jsx("thead", { children: _jsx(TableRow, { cells: node.header, cellType: "th" }) }), checkTableRowsAreSections(node.rows) ? (node.rows.map((section, si) => (_jsxs("tbody", { children: [section.header && _jsx(TableRow, { cells: section.header, cellType: "th" }), section.rows.map((row, ri) => (_jsx(TableRow, { cells: row.cells }, ri)))] }, si)))) : (_jsx("tbody", { children: node.rows.map((row, ri) => (_jsx(TableRow, { cells: row.cells }, ri))) }))] })] }));
+            return (_jsxs(_Fragment, { children: [insertBefore, _jsxs("table", { children: [node.caption !== undefined && (_jsx("caption", { children: node.caption.map((inline, ci) => (_jsx(InlineMarkdown, { node: inline }, ci))) })), _jsx("thead", { children: _jsx(TableRow, { columns: node.columns, cells: node.header, cellType: "th" }) }), checkTableRowsAreSections(node.rows) ? (node.rows.map((section, si) => (_jsxs("tbody", { children: [section.header && (_jsx(TableRow, { columns: node.columns, cells: section.header, cellType: "th" })), section.rows.map((row, ri) => (_jsx(TableRow, { columns: node.columns, cells: row.cells }, ri)))] }, si)))) : (_jsx("tbody", { children: node.rows.map((row, ri) => (_jsx(TableRow, { columns: node.columns, cells: row.cells }, ri))) }))] })] }));
         case "container":
             return (_jsxs("div", { class: node.name, children: [insertBefore, node.content.map((childNode, i) => (_jsx(BlockMarkdown, { node: childNode, outerHeadingLevel: outerHeadingLevel }, i)))] }));
         case "footnote": {
@@ -30,7 +30,15 @@ export const BlockMarkdown = ({ node, outerHeadingLevel = 0, insertBefore, }) =>
             return assertExhaustive(node);
     }
 };
-const TableRow = ({ cells, cellType = "td", }) => {
+const TableRow = ({ columns, cells, cellType = "td", }) => {
     const CellTag = cellType;
-    return (_jsx("tr", { children: cells.map((tc, ci) => (_jsx(CellTag, { scope: cellType === "th" && cells.length === 1 ? "colgroup" : undefined, colSpan: tc.colSpan, children: tc.content.map((inline, cii) => (_jsx(InlineMarkdown, { node: inline }, cii))) }, ci))) }));
+    return (_jsx("tr", { children: cells.reduce(([elements, columnIndex], tc, ci) => [
+            [
+                ...elements,
+                _jsx(CellTag, { scope: cellType === "th" && cells.length === 1 ? "colgroup" : undefined, colSpan: tc.colSpan, style: columns[columnIndex]?.alignment
+                        ? { textAlign: columns[columnIndex].alignment }
+                        : undefined, children: tc.content.map((inline, cii) => (_jsx(InlineMarkdown, { node: inline }, cii))) }, ci),
+            ],
+            columnIndex + (tc.colSpan ?? 1),
+        ], [[], 0]) }));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsondb",
-  "version": "0.8.1",
+  "version": "0.8.3",
   "description": "",
   "license": "ISC",
   "author": "Lukas Obermann",