@oml/markdown 0.10.0 → 0.12.0

package/out/renderers/renderer.js

@@ -1,4 +1,5 @@
 // Copyright (c) 2026 Modelware. All rights reserved.
+import { appendInlineValue, createWikiLinkElement, isUrlValue, shortLabelFromIri } from './wikilink-utils.js';
 let iriLabelSnapshot;
 export function setIriLabelSnapshot(snapshot) {
     if (!snapshot) {
@@ -88,6 +89,41 @@ export class BaseMarkdownBlockRenderer {
     }
 }
 export class QueryMarkdownBlockRenderer extends BaseMarkdownBlockRenderer {
+    renderCellValue(raw, typedValue) {
+        const value = document.createElement('span');
+        value.className = 'table-value';
+        const entries = typedValue?.values ?? [];
+        if (entries.length > 0) {
+            entries.forEach((entry, index) => {
+                if (index > 0) {
+                    value.appendChild(document.createTextNode(' '));
+                }
+                value.appendChild(this.renderValueToken(entry));
+            });
+            return value;
+        }
+        const display = this.formatCellDisplayText(raw, typedValue);
+        const fragment = document.createElement('span');
+        fragment.className = 'table-value-part';
+        fragment.dataset.value = display;
+        appendInlineValue(fragment, display);
+        value.appendChild(fragment);
+        return value;
+    }
+    formatCellDisplayText(raw, typedValue) {
+        if (typedValue?.values?.length) {
+            return typedValue.values.map((entry) => {
+                if (entry.kind === 'iri') {
+                    return shortLabelFromIri(entry.value);
+                }
+                if (entry.kind === 'bnode') {
+                    return `_:${entry.value}`;
+                }
+                return entry.value;
+            }).join(' ');
+        }
+        return raw;
+    }
     getBlockSource(result) {
         return result.blockSource;
     }
@@ -97,6 +133,33 @@ export class QueryMarkdownBlockRenderer extends BaseMarkdownBlockRenderer {
     getBlockRange(result) {
         return { start: result.blockLineStart, end: result.blockLineEnd };
     }
+    renderValueToken(entry) {
+        const fragment = document.createElement('span');
+        fragment.className = 'table-value-part';
+        fragment.dataset.value = entry.value;
+        if (entry.kind === 'iri') {
+            if (isBuiltInOntologyIri(entry.value)) {
+                appendInlineValue(fragment, shortLabelFromIri(entry.value));
+            }
+            else {
+                fragment.appendChild(createWikiLinkElement(entry.value, shortLabelFromIri(entry.value)));
+            }
+            return fragment;
+        }
+        if (entry.kind === 'bnode') {
+            appendInlineValue(fragment, `_:${entry.value}`);
+            return fragment;
+        }
+        if (isUrlValue(entry.value)) {
+            const link = document.createElement('a');
+            link.href = entry.value;
+            link.textContent = entry.value;
+            fragment.appendChild(link);
+            return fragment;
+        }
+        appendInlineValue(fragment, entry.value);
+        return fragment;
+    }
 }
 export class CanvasMarkdownBlockRenderer extends QueryMarkdownBlockRenderer {
     canRender(result) {
@@ -111,4 +174,39 @@ export class CanvasMarkdownBlockRenderer extends QueryMarkdownBlockRenderer {
         return container;
     }
 }
+const BUILT_IN_ONTOLOGY_IRIS = new Set([
+    'http://opencaesar.io/oml',
+    'http://www.w3.org/2001/XMLSchema',
+    'http://www.w3.org/1999/02/22-rdf-syntax-ns',
+    'http://www.w3.org/2000/01/rdf-schema',
+    'http://www.w3.org/2002/07/owl',
+    'http://www.w3.org/2003/11/swrl',
+    'http://www.w3.org/2003/11/swrlb',
+]);
+function ontologyLookupKeyFromIri(value) {
+    const iri = String(value ?? '').trim().replace(/^<|>$/g, '');
+    if (!iri || !/^[A-Za-z][A-Za-z0-9+.-]*:[^\s]+$/.test(iri)) {
+        return undefined;
+    }
+    const hashIndex = iri.indexOf('#');
+    if (hashIndex >= 0) {
+        return normalizeOntologyLookupKey(iri.slice(0, hashIndex + 1));
+    }
+    const schemeIndex = iri.indexOf('://');
+    const slashIndex = iri.lastIndexOf('/');
+    if (slashIndex > schemeIndex + 2) {
+        return normalizeOntologyLookupKey(iri.slice(0, slashIndex + 1));
+    }
+    return normalizeOntologyLookupKey(iri);
+}
+function normalizeOntologyLookupKey(value) {
+    return value.trim().replace(/^<|>$/g, '').replace(/[\/#]+$/, '');
+}
+function isBuiltInOntologyIri(iri) {
+    const key = ontologyLookupKeyFromIri(iri);
+    if (!key) {
+        return false;
+    }
+    return BUILT_IN_ONTOLOGY_IRIS.has(normalizeOntologyLookupKey(key));
+}
 //# sourceMappingURL=renderer.js.map

package/out/renderers/renderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../src/renderers/renderer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../src/renderers/renderer.ts"],"names":[],"mappings":"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"}

package/out/renderers/table-renderer.d.ts

@@ -1,5 +1,5 @@
 import { QueryMarkdownBlockRenderer, type TableBlockKind } from './renderer.js';
-import type { MdBlockExecutionResult } from './types.js';
+import type { MdBlockExecutionResult, MdTableCell } from './types.js';
 type TableEditorActionKind = 'add' | 'remove' | 'validate' | 'link' | 'undo' | 'redo' | 'ai' | 'properties';
 type TableEditorActionContext = {
     action: TableEditorActionKind;
@@ -48,7 +48,7 @@ export declare class TableMarkdownBlockRenderer extends QueryMarkdownBlockRender
     protected shouldIgnoreRowDoubleClick(_event: MouseEvent): boolean;
     protected onRowDoubleClick(_context: Omit<TableEditorActionContext, 'action'>): void;
     protected dispatchTableEditorAction(context: TableEditorActionContext): void;
-    protected renderInteractiveTable(columns: string[], rows: string[][], stylesheet: CompiledTableStyleRule[], options: Record<string, unknown> | undefined, blockSource?: string): HTMLElement;
+    protected renderInteractiveTable(columns: string[], rows: string[][], rowsTyped: MdTableCell[][] | undefined, stylesheet: CompiledTableStyleRule[], options: Record<string, unknown> | undefined, blockSource?: string, blockId?: string): HTMLElement;
     protected extractTypeOptions(_blockSource: string | undefined): string[];
     private resolveTreeSourceRows;
     private filterTreeRowsBySearch;
@@ -58,6 +58,7 @@ export declare class TableMarkdownBlockRenderer extends QueryMarkdownBlockRender
     private renderTreeCell;
     private createTreeActionButton;
     private applyFiltersAndSorting;
+    private getDisplayFilterCells;
     private applyStylesheet;
     private matchesRule;
     private resolveValueTargets;
@@ -67,6 +68,7 @@ export declare class TableMarkdownBlockRenderer extends QueryMarkdownBlockRender
     private installColumnResizeHandle;
     private autosizeColumnWidth;
     private measureTreePrefixWidth;
+    private measureRenderedCellContentWidth;
     private resolveFont;
     private measureTextWidth;
     protected formatCellDisplayValue(raw: string, _context: {
@@ -76,6 +78,14 @@ export declare class TableMarkdownBlockRenderer extends QueryMarkdownBlockRender
         options?: Record<string, unknown>;
     }): string;
     private renderValue;
+    protected createUploadCsvButton(_columns: string[], _rows: Array<{
+        index: number;
+        cells: string[];
+    }>, _isTree: boolean, _blockSource: string | undefined): HTMLElement | undefined;
+    protected transformCsvDownloadData(columns: string[], rows: string[][]): {
+        columns: string[];
+        rows: string[][];
+    };
     private requestCsvDownload;
     private requestTreeJsonDownload;
     private createTreeJsonKeys;

package/out/renderers/table-renderer.js

@@ -1,6 +1,6 @@
 // Copyright (c) 2026 Modelware. All rights reserved.
 import { QueryMarkdownBlockRenderer } from './renderer.js';
-import { appendTokenizedValueParts, isIriValue, shortLabelFromIri } from './wikilink-utils.js';
+import { shortLabelFromIri } from './wikilink-utils.js';
 export class TableMarkdownBlockRenderer extends QueryMarkdownBlockRenderer {
     constructor() {
         super(...arguments);
@@ -16,7 +16,7 @@ export class TableMarkdownBlockRenderer extends QueryMarkdownBlockRenderer {
         const container = this.createResultContainer(result.status);
         container.classList.add('oml-md-result-table');
         const stylesheet = compileTableStylesheet(result.options);
-        const tableRoot = this.renderInteractiveTable(result.payload?.columns ?? [], result.payload?.rows ?? [], stylesheet, result.options, result.blockSource);
+        const tableRoot = this.renderInteractiveTable(result.payload?.columns ?? [], result.payload?.rows ?? [], result.payload?.rowsTyped, stylesheet, result.options, result.blockSource, result.blockId);
         if (typeof result.blockId === 'string' && result.blockId.length > 0) {
             tableRoot.dataset.tableBlockId = result.blockId;
         }
@@ -39,11 +39,15 @@ export class TableMarkdownBlockRenderer extends QueryMarkdownBlockRenderer {
         const event = new CustomEvent('oml-table-editor-action', { detail: context });
         window.dispatchEvent(event);
     }
-    renderInteractiveTable(columns, rows, stylesheet, options, blockSource) {
+    renderInteractiveTable(columns, rows, rowsTyped, stylesheet, options, blockSource, blockId) {
         const root = document.createElement('div');
         root.className = 'table-root graph-root';
         const isTree = this.tableKinds.includes('tree');
-        const allRowsWithIndex = rows.map((cells, index) => ({ index, cells }));
+        const allRowsWithIndex = rows.map((cells, index) => ({
+            index,
+            cells,
+            typedCells: rowsTyped?.[index],
+        }));
         const containmentColumns = isTree ? resolveContainmentColumns(columns, options) : [];
         const baseVisibleColumnIndexes = isTree
             ? columns.map((_, index) => index).filter((index) => !containmentColumns.includes(index))
@@ -52,6 +56,7 @@ export class TableMarkdownBlockRenderer extends QueryMarkdownBlockRenderer {
         const baseRowsWithIndex = allRowsWithIndex.map((row) => ({
             ...row,
             cells: baseVisibleColumnIndexes.map((columnIndex) => row.cells[columnIndex] ?? ''),
+            typedCells: baseVisibleColumnIndexes.map((columnIndex) => row.typedCells?.[columnIndex]),
         }));
         const selectorRowsByIndex = new Map(baseRowsWithIndex.map((row) => [row.index, row]));
         const baseColumnContexts = createColumnContexts(baseVisibleColumns, baseRowsWithIndex);
@@ -61,7 +66,18 @@ export class TableMarkdownBlockRenderer extends QueryMarkdownBlockRenderer {
         const rowsWithIndex = allRowsWithIndex.map((row) => ({
             ...row,
             cells: visibleColumnIndexes.map((columnIndex) => row.cells[columnIndex] ?? ''),
+            typedCells: visibleColumnIndexes.map((columnIndex) => row.typedCells?.[columnIndex]),
         }));
+        root.__omlAiContext = {
+            columns: visibleColumns.slice(),
+            rows: rowsWithIndex
+                .map((row) => ({
+                iri: (row.cells[0] ?? '').trim(),
+                cells: row.cells.slice(),
+            }))
+                .filter((row) => row.iri.length > 0),
+            blockSource,
+        };
         const columnContexts = createColumnContexts(visibleColumns, rowsWithIndex);
         const treeModel = isTree
             ? this.createTreeModel(columns, allRowsWithIndex, visibleColumnIndexes, options)
@@ -69,17 +85,33 @@ export class TableMarkdownBlockRenderer extends QueryMarkdownBlockRenderer {
         const fullyExpandedTreeRows = isTree && treeModel
             ? this.flattenAllTreeRows(treeModel)
             : undefined;
+        const persistedState = blockId
+            ? window.__omlGetPersistedTableUiState?.(blockId)
+            : undefined;
         const state = {
-            search: '',
-            pageSize: 50,
-            page: 0,
-            sortKey: '',
-            sortDir: 'asc',
-            hasUserSort: false,
+            search: persistedState?.search ?? '',
+            pageSize: persistedState?.pageSize ?? 50,
+            page: persistedState?.page ?? 0,
+            sortKey: persistedState?.sortKey ?? '',
+            sortDir: persistedState?.sortDir ?? 'asc',
+            hasUserSort: persistedState?.hasUserSort ?? false,
             columnWidths: new Array(columns.length).fill(undefined),
             initialAutosizeApplied: false,
             expanded: new Set(treeModel?.expandableNodes ?? []),
         };
+        const persistUiState = () => {
+            if (!blockId) {
+                return;
+            }
+            window.__omlSetPersistedTableUiState?.(blockId, {
+                search: state.search,
+                pageSize: state.pageSize,
+                page: state.page,
+                sortKey: state.sortKey,
+                sortDir: state.sortDir,
+                hasUserSort: state.hasUserSort,
+            });
+        };
         const controls = document.createElement('div');
         controls.className = 'table-controls';
         const controlsLeft = document.createElement('div');
@@ -95,9 +127,11 @@ export class TableMarkdownBlockRenderer extends QueryMarkdownBlockRenderer {
             }
             pageSize.appendChild(option);
         }
+        pageSize.value = String(state.pageSize);
         pageSize.addEventListener('change', () => {
             state.pageSize = Number.parseInt(pageSize.value, 10);
             state.page = 0;
+            persistUiState();
             renderPage();
         });
         if (!isTree) {
@@ -123,9 +157,11 @@ export class TableMarkdownBlockRenderer extends QueryMarkdownBlockRenderer {
         searchInput.type = 'search';
         searchInput.className = 'tree-filter';
         searchInput.placeholder = 'Filter...';
+        searchInput.value = state.search;
         searchInput.addEventListener('input', () => {
             state.search = searchInput.value.trim().toLowerCase();
             state.page = 0;
+            persistUiState();
             renderPage();
         });
         controlsRight.appendChild(searchInput);
@@ -146,16 +182,21 @@ export class TableMarkdownBlockRenderer extends QueryMarkdownBlockRenderer {
         downloadButton.appendChild(iconSvg);
         downloadButton.addEventListener('click', () => {
             const sourceRows = isTree && treeModel
-                ? this.resolveTreeSourceRows(treeModel, visibleColumns, state.expanded, state.search)
+                ? this.resolveTreeSourceRows(treeModel, visibleColumns, state.expanded, state.search, blockSource, options)
                 : rowsWithIndex;
             if (isTree && treeModel) {
                 this.requestTreeJsonDownload(visibleColumns, treeModel, sourceRows);
                 return;
             }
-            const filtered = this.applyFiltersAndSorting(columns, sourceRows, state);
-            this.requestCsvDownload(visibleColumns, filtered.map((entry) => entry.cells));
+            const filtered = this.applyFiltersAndSorting(visibleColumns, sourceRows, state, blockSource, options);
+            const csvExport = this.transformCsvDownloadData(visibleColumns, filtered.map((entry) => entry.cells));
+            this.requestCsvDownload(csvExport.columns, csvExport.rows);
         });
         controlsRight.appendChild(downloadButton);
+        const uploadButton = this.createUploadCsvButton(visibleColumns, rowsWithIndex, isTree, blockSource);
+        if (uploadButton) {
+            controlsRight.appendChild(uploadButton);
+        }
         controls.appendChild(controlsLeft);
         controls.appendChild(controlsRight);
         root.appendChild(controls);
@@ -191,6 +232,7 @@ export class TableMarkdownBlockRenderer extends QueryMarkdownBlockRenderer {
             }
             if (state.page > 0) {
                 state.page -= 1;
+                persistUiState();
                 renderPage();
             }
         });
@@ -198,10 +240,11 @@ export class TableMarkdownBlockRenderer extends QueryMarkdownBlockRenderer {
             if (isTree) {
                 return;
             }
-            const filtered = this.applyFiltersAndSorting(columns, rowsWithIndex, state);
+            const filtered = this.applyFiltersAndSorting(visibleColumns, rowsWithIndex, state, blockSource, options);
             const totalPages = Math.max(1, Math.ceil(filtered.length / state.pageSize));
             if (state.page < totalPages - 1) {
                 state.page += 1;
+                persistUiState();
                 renderPage();
             }
         });
@@ -218,9 +261,11 @@ export class TableMarkdownBlockRenderer extends QueryMarkdownBlockRenderer {
         root.appendChild(footer);
         const renderPage = () => {
             const sourceRows = isTree && treeModel
-                ? this.resolveTreeSourceRows(treeModel, visibleColumns, state.expanded, state.search)
+                ? this.resolveTreeSourceRows(treeModel, visibleColumns, state.expanded, state.search, blockSource, options)
                 : rowsWithIndex;
-            const filtered = isTree ? sourceRows.slice() : this.applyFiltersAndSorting(columns, sourceRows, state);
+            const filtered = isTree
+                ? sourceRows.slice()
+                : this.applyFiltersAndSorting(visibleColumns, sourceRows, state, blockSource, options);
             const total = filtered.length;
             const totalTreeRows = isTree
                 ? (fullyExpandedTreeRows?.length ?? total)
@@ -228,6 +273,7 @@ export class TableMarkdownBlockRenderer extends QueryMarkdownBlockRenderer {
             const totalPages = isTree ? 1 : Math.max(1, Math.ceil(total / state.pageSize));
             if (!isTree && state.page >= totalPages) {
                 state.page = totalPages - 1;
+                persistUiState();
             }
             const gridTemplateColumns = this.buildGridTemplate(visibleColumns.length, state.columnWidths);
             headerRow.innerHTML = '';
@@ -255,6 +301,7 @@ export class TableMarkdownBlockRenderer extends QueryMarkdownBlockRenderer {
                         }
                         state.hasUserSort = true;
                         state.page = 0;
+                        persistUiState();
                         renderPage();
                     });
                 }
@@ -281,6 +328,7 @@ export class TableMarkdownBlockRenderer extends QueryMarkdownBlockRenderer {
                 const rowContext = createRowContext(baseVisibleColumns, selectorRow);
                 for (let columnIndex = 0; columnIndex < visibleColumns.length; columnIndex += 1) {
                     const value = rowEntry.cells[columnIndex] ?? '';
+                    const typedValue = rowEntry.typedCells?.[columnIndex];
                     const td = document.createElement('div');
                     td.className = 'table-cell';
                     const valueElement = this.renderValue(this.formatCellDisplayValue(value, {
@@ -288,7 +336,7 @@ export class TableMarkdownBlockRenderer extends QueryMarkdownBlockRenderer {
                         columns: visibleColumns,
                         blockSource,
                         options,
-                    }));
+                    }), typedValue);
                     if (isTree && columnIndex === 0) {
                         const treeCell = this.renderTreeCell(valueElement, rowEntry, treeModel, state.expanded, () => renderPage());
                         td.appendChild(treeCell);
@@ -355,13 +403,13 @@ export class TableMarkdownBlockRenderer extends QueryMarkdownBlockRenderer {
     extractTypeOptions(_blockSource) {
         return [];
     }
-    resolveTreeSourceRows(model, columns, expanded, search) {
+    resolveTreeSourceRows(model, columns, expanded, search, blockSource, options) {
         if (search) {
-            return this.filterTreeRowsBySearch(model, columns, search);
+            return this.filterTreeRowsBySearch(model, columns, search, blockSource, options);
         }
         return this.flattenTreeRows(model, expanded);
     }
-    filterTreeRowsBySearch(model, columns, search) {
+    filterTreeRowsBySearch(model, columns, search, blockSource, options) {
         const fullyExpanded = this.flattenTreeRows(model, new Set(model.expandableNodes));
         const matchedIds = new Set();
         for (const row of fullyExpanded) {
@@ -369,7 +417,7 @@ export class TableMarkdownBlockRenderer extends QueryMarkdownBlockRenderer {
             if (!nodeId) {
                 continue;
             }
-            if (matchesFilterQuery(columns, row.cells, search)) {
+            if (matchesFilterQuery(columns, this.getDisplayFilterCells(row, columns, blockSource, options), search)) {
                 matchedIds.add(nodeId);
             }
         }
@@ -405,6 +453,7 @@ export class TableMarkdownBlockRenderer extends QueryMarkdownBlockRenderer {
         const projectRow = (row) => ({
             ...row,
             cells: visibleColumnIndexes.map((columnIndex) => row.cells[columnIndex] ?? ''),
+            typedCells: visibleColumnIndexes.map((columnIndex) => row.typedCells?.[columnIndex]),
         });
         for (const row of allRows) {
             const id = row.cells[idColumnIndex] ?? '';
@@ -449,7 +498,7 @@ export class TableMarkdownBlockRenderer extends QueryMarkdownBlockRenderer {
                         const syntheticAll = new Array(allColumns.length).fill('');
                         syntheticAll[idColumnIndex] = child;
                         const synthetic = visibleColumnIndexes.map((columnIndex) => syntheticAll[columnIndex] ?? '');
-                        const syntheticRow = { index: allRows.length + rowsById.size, cells: synthetic };
+                        const syntheticRow = { index: allRows.length + rowsById.size, cells: synthetic, typedCells: new Array(visibleColumnIndexes.length).fill(undefined) };
                         rowsById.set(child, syntheticRow);
                         order.push(child);
                     }
@@ -588,9 +637,9 @@ export class TableMarkdownBlockRenderer extends QueryMarkdownBlockRenderer {
         button.appendChild(iconSvg);
         return button;
     }
-    applyFiltersAndSorting(columns, rows, state) {
+    applyFiltersAndSorting(columns, rows, state, blockSource, options) {
         const filtered = state.search
-            ? rows.filter((row) => matchesFilterQuery(columns, row.cells, state.search))
+            ? rows.filter((row) => matchesFilterQuery(columns, this.getDisplayFilterCells(row, columns, blockSource, options), state.search))
             : rows.slice();
         if (!state.hasUserSort) {
             return filtered;
@@ -606,6 +655,21 @@ export class TableMarkdownBlockRenderer extends QueryMarkdownBlockRenderer {
             return a.localeCompare(b, undefined, { numeric: true, sensitivity: 'base' }) * dir;
         });
     }
+    getDisplayFilterCells(row, columns, blockSource, options) {
+        return columns.map((_, columnIndex) => {
+            const raw = row.cells[columnIndex] ?? '';
+            const typedValue = row.typedCells?.[columnIndex];
+            if (typedValue?.values?.length) {
+                return this.formatCellDisplayText(raw, typedValue);
+            }
+            return this.formatCellDisplayValue(raw, {
+                columnIndex,
+                columns,
+                blockSource,
+                options,
+            });
+        });
+    }
     applyStylesheet(cellElement, valueElement, rules, contexts) {
         for (const rule of rules) {
             if (rule.target !== 'value') {
@@ -740,13 +804,12 @@ export class TableMarkdownBlockRenderer extends QueryMarkdownBlockRenderer {
     }
     autosizeColumnWidth(columnIndex, columns, rows, referenceCellOrFont, headerFontOverride) {
         const headerText = `${columns[columnIndex] ?? ''} ▲`;
-        const values = rows.map((row) => formatCellDisplayText(row.cells[columnIndex] ?? ''));
         const valueFont = typeof referenceCellOrFont === 'string'
             ? referenceCellOrFont
             : this.resolveFont(referenceCellOrFont);
         const headerFont = headerFontOverride ?? valueFont;
-        const widestValue = values.reduce((max, text) => {
-            const width = this.measureTextWidth(text, valueFont);
+        const widestValue = rows.reduce((max, row) => {
+            const width = this.measureRenderedCellContentWidth(row, columnIndex, columns, valueFont);
             return Math.max(max, width);
         }, 0);
         const headerWidth = this.measureTextWidth(headerText, headerFont);
@@ -774,6 +837,34 @@ export class TableMarkdownBlockRenderer extends QueryMarkdownBlockRenderer {
             return Math.max(max, prefix);
         }, 0);
     }
+    measureRenderedCellContentWidth(row, columnIndex, columns, font) {
+        const rawValue = row.cells[columnIndex] ?? '';
+        const typedValue = row.typedCells?.[columnIndex];
+        const formattedValue = this.formatCellDisplayValue(rawValue, {
+            columnIndex,
+            columns,
+        });
+        const valueElement = this.renderValue(formattedValue, typedValue);
+        const decorated = this.decorateCellValueElement({
+            row: { index: row.index, cells: row.cells },
+            columnIndex,
+            columns,
+            value: rawValue,
+            valueElement,
+        });
+        const probe = document.createElement('div');
+        probe.style.position = 'fixed';
+        probe.style.left = '-10000px';
+        probe.style.top = '-10000px';
+        probe.style.visibility = 'hidden';
+        probe.style.whiteSpace = 'nowrap';
+        probe.style.font = font;
+        probe.appendChild(decorated);
+        document.body.appendChild(probe);
+        const width = probe.getBoundingClientRect().width;
+        probe.remove();
+        return width;
+    }
     resolveFont(referenceCell) {
         const computed = window.getComputedStyle(referenceCell);
         const lineHeight = computed.lineHeight && computed.lineHeight !== 'normal' ? computed.lineHeight : computed.fontSize;
@@ -791,11 +882,14 @@ export class TableMarkdownBlockRenderer extends QueryMarkdownBlockRenderer {
     formatCellDisplayValue(raw, _context) {
         return raw;
     }
-    renderValue(raw) {
-        const value = document.createElement('span');
-        value.className = 'table-value';
-        appendTokenizedValueParts(value, raw, 'table-value-part');
-        return value;
+    renderValue(raw, typedValue) {
+        return this.renderCellValue(raw, typedValue);
+    }
+    createUploadCsvButton(_columns, _rows, _isTree, _blockSource) {
+        return undefined;
+    }
+    transformCsvDownloadData(columns, rows) {
+        return { columns, rows };
     }
     requestCsvDownload(columns, rows) {
         if (columns.length === 0) {
@@ -1124,13 +1218,6 @@ function resolveHiddenColumns(columns, columnContexts, rules) {
     }
     return hidden;
 }
-function formatCellDisplayText(raw) {
-    const parts = raw.split(/[\s,]+/).filter((entry) => entry.length > 0);
-    if (parts.length === 0) {
-        return raw;
-    }
-    return parts.map((part) => isIriValue(part) ? shortLabelFromIri(part) : part).join(' ');
-}
 function matchesFilterQuery(columns, cells, rawQuery) {
     const terms = parseFilterTerms(rawQuery);
     if (terms.length === 0) {