tsondb 0.8.5 → 0.10.0

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

@@ -24,7 +24,7 @@ const boldWithItalicRule = {
     }),
 };
 const italicWithBoldRule = {
-    pattern: /(?<![\\*]|[\\*]\*.*)\*(?=\*\*|[^*])([^*]*?\*\*[^*]*?\*\*[^*]*?)(?<=[^\\*]|[^\\]\*\*)\*(?!\*)/,
+    pattern: /(?<![\\*]|[^\\]\*.*)\*(?=\*\*|[^*])([^*]*?\*\*[^*]*?\*\*[^*]*?)(?<=[^\\*]|[^\\]\*\*)\*(?!\*)/,
     map: (result, parseInside) => ({
         kind: "italic",
         content: parseInside(result[1] ?? ""),
@@ -494,7 +494,7 @@ const addIndentationToSyntax = (nodes, nextUpperNode) => nodes.reduce((accNodes,
     }
 }, []);
 const footnoteRule = {
-    pattern: /^\[\^([a-zA-Z0-9*]+?)\]: (.+?(?:\n(?: {2}.+)?)*)(\n{2,}|\s*$)/,
+    pattern: /^\[\^([a-zA-Z0-9]+?)\]: (.+?(?:\n(?: {2}.+)?)*)(\n{2,}|\s*$)/,
     map: ([_match, label = "", content = "", _trailingWhitespace]) => ({
         kind: "footnote",
         label: label,

package/dist/src/web/utils/BlockMarkdown.d.ts

@@ -4,6 +4,7 @@ type Props = {
     node: BlockMarkdownNode;
     outerHeadingLevel?: number;
     insertBefore?: preact.ComponentChildren;
+    footnoteLabelSuffix?: string;
 };
 export declare const BlockMarkdown: FunctionalComponent<Props>;
 export {};

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

@@ -1,8 +1,10 @@
+import { createElement as _createElement } from "preact";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "preact/jsx-runtime";
 import { checkTableRowsAreSections, } from "../../shared/utils/markdown.js";
 import { assertExhaustive } from "../../shared/utils/typeSafety.js";
 import { InlineMarkdown } from "./InlineMarkdown.js";
-export const BlockMarkdown = ({ node, outerHeadingLevel = 0, insertBefore, }) => {
+export const BlockMarkdown = ({ node, outerHeadingLevel = 0, insertBefore, footnoteLabelSuffix = ")", }) => {
+    const inheritableProps = { outerHeadingLevel, footnoteLabelSuffix };
     switch (node.kind) {
         case "paragraph":
             return (_jsxs("p", { children: [insertBefore, node.content.map((inline, ii) => (_jsx(InlineMarkdown, { node: inline }, ii)))] }));
@@ -19,13 +21,14 @@ export const BlockMarkdown = ({ node, outerHeadingLevel = 0, insertBefore, }) =>
         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, { 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)))] }));
+            return (_jsxs("div", { class: node.name, children: [insertBefore, node.content.map((childNode, i) => (_createElement(BlockMarkdown, { ...inheritableProps, key: i, node: childNode })))] }));
         case "footnote": {
-            const label = (_jsxs(_Fragment, { children: [_jsxs("span", { class: "footnote-label", children: [node.label, /^\*+$/.test(node.label) ? ")" : ":"] }), " "] }));
-            return (_jsxs("div", { role: "note", children: [insertBefore, node.content.map((n, i) => (_jsx(BlockMarkdown, { node: n, outerHeadingLevel: outerHeadingLevel, insertBefore: label }, i)))] }));
+            const isNumeric = /^\d+$/.test(node.label);
+            const label = (_jsxs(_Fragment, { children: [_jsxs("span", { class: "footnote__label" + (isNumeric ? " footnote__label--numeric" : ""), "data-reference": node.label, style: { "--label": isNumeric ? Number.parseInt(node.label) : node.label }, children: [_jsx("span", { class: "footnote-label", children: node.label }), footnoteLabelSuffix] }), " "] }));
+            return (_jsxs("div", { role: "note", class: "footnote", children: [insertBefore, node.content.map((n, i) => (_createElement(BlockMarkdown, { ...inheritableProps, key: i, node: n, insertBefore: label })))] }));
         }
         case "definitionList":
-            return (_jsxs(_Fragment, { children: [insertBefore, _jsx("dl", { children: node.content.map((item, ii) => (_jsxs("div", { children: [item.terms.map((term, ti) => (_jsx("dt", { children: term.map((inline, iii) => (_jsx(InlineMarkdown, { node: inline }, iii))) }, ti))), item.definitions.map((definition, di) => (_jsx("dd", { children: definition.map((n, i) => (_jsx(BlockMarkdown, { node: n, outerHeadingLevel: outerHeadingLevel }, i))) }, di)))] }, ii))) })] }));
+            return (_jsxs(_Fragment, { children: [insertBefore, _jsx("dl", { children: node.content.map((item, ii) => (_jsxs("div", { children: [item.terms.map((term, ti) => (_jsx("dt", { children: term.map((inline, iii) => (_jsx(InlineMarkdown, { node: inline }, iii))) }, ti))), item.definitions.map((definition, di) => (_jsx("dd", { children: definition.map((n, i) => (_createElement(BlockMarkdown, { ...inheritableProps, key: i, node: n }))) }, di)))] }, ii))) })] }));
         default:
             return assertExhaustive(node);
     }

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

@@ -22,8 +22,10 @@ export const InlineMarkdown = ({ node }) => {
             const trailingNodes = node.content.slice(attributesEnd);
             return (_jsxs("span", { class: "attributed", ...Object.fromEntries(Object.entries(node.attributes).map(([k, v]) => [`data-${k}`, v.toString()])), children: [leadingNodes.map((inline, i) => (_jsx(InlineMarkdown, { node: inline }, i))), Array.from({ length: count }, (_, i) => (_jsxs(Fragment, { children: [_jsx("span", { class: "attributed__name", children: _jsx(InlineMarkdown, { node: attributes[i * 4] ?? emptyNode }) }), _jsx("span", { class: "attributed__separator", children: _jsx(InlineMarkdown, { node: attributes[i * 4 + 1] ?? emptyNode }) }), _jsx("span", { class: "attributed__value", children: _jsx(InlineMarkdown, { node: attributes[i * 4 + 2] ?? emptyNode }) }), i < count - 1 && (_jsx("span", { class: "attributed__separator", children: _jsx(InlineMarkdown, { node: attributes[i * 4 + 3] ?? emptyNode }) }))] }, `attr-${(i + 1).toString()}`))), trailingNodes.map((inline, i) => (_jsx(InlineMarkdown, { node: inline }, i)))] }));
         }
-        case "footnoteRef":
-            return /^\*+$/.test(node.label) ? (_jsx("span", { class: "footnote-ref", children: node.label })) : (_jsx("sup", { class: "footnote-ref", children: node.label }));
+        case "footnoteRef": {
+            const isNumeric = /^\d+$/.test(node.label);
+            return (_jsx("sup", { class: "footnote-ref" + (isNumeric ? " footnote-ref--numeric" : ""), "data-reference": node.label, style: { "--label": isNumeric ? Number.parseInt(node.label) : node.label }, children: _jsx("span", { class: "footnote-label", children: node.label }) }));
+        }
         case "text":
             return node.content;
         default:

package/dist/src/web/utils/Markdown.d.ts

@@ -3,6 +3,7 @@ type Props = {
     class?: string;
     string: string;
     outerHeadingLevel?: number;
+    footnoteLabelSuffix?: string;
 };
 export declare const Markdown: FunctionalComponent<Props>;
 export {};

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

@@ -1,9 +1,9 @@
 import { jsx as _jsx, Fragment as _Fragment } from "preact/jsx-runtime";
 import { parseBlockMarkdown } from "../../shared/utils/markdown.js";
 import { BlockMarkdown } from "./BlockMarkdown.js";
-export const Markdown = ({ class: className, string, outerHeadingLevel, }) => {
+export const Markdown = ({ class: className, string, outerHeadingLevel, footnoteLabelSuffix, }) => {
     const blocks = parseBlockMarkdown(string);
-    const blockElements = blocks.map((block, i) => (_jsx(BlockMarkdown, { node: block, outerHeadingLevel: outerHeadingLevel }, `md-block-${i.toString()}`)));
+    const blockElements = blocks.map((block, i) => (_jsx(BlockMarkdown, { node: block, outerHeadingLevel: outerHeadingLevel, footnoteLabelSuffix: footnoteLabelSuffix }, `md-block-${i.toString()}`)));
     if (className) {
         return _jsx("div", { class: className, children: blockElements });
     }

package/package.json

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