@oml/markdown 0.14.17 → 0.16.0

package/out/template/types.d.ts

@@ -1,11 +1,9 @@
 export type TemplateValue = string | number | boolean | null | string[] | Record<string, unknown>;
 export type TemplateParameterType = 'iri' | 'string' | 'number' | 'boolean' | 'iri[]' | 'json';
-export type TemplateBindingSource = 'context.member' | 'context.ontology' | 'context.modelUri' | `context.selection[${number}]` | 'context.selection[*]' | 'user';
 export interface TemplateParameterDefinition {
     id: string;
     type: TemplateParameterType;
     required?: boolean;
-    from?: TemplateBindingSource;
     defaultValue?: TemplateValue;
     description?: string;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@oml/markdown",
     "description": "Markdown runtime and execution contracts for OML",
-    "version": "0.14.17",
+    "version": "0.16.0",
     "type": "module",
     "engines": {
         "node": ">=20.10.0",
@@ -56,7 +56,7 @@
     "dependencies": {
         "@antv/x6": "^3.1.6",
         "@dagrejs/dagre": "^2.0.4",
-        "@oml/owl": "0.14.17",
+        "@oml/owl": "0.16.0",
         "chart.js": "^4.4.0",
         "markdown-it": "^14.1.1",
         "reflect-metadata": "^0.2.2",

package/src/md/md-frontmatter.ts

@@ -22,7 +22,7 @@ export function extractLeadingFrontMatter(markdown: string): MarkdownFrontMatter
         const yamlData = parseYamlMap(yamlBody);
         return {
             raw: yamlMatch[1],
-            contextOntologyIri: extractContextIriFromData(yamlData) ?? extractContextIri(yamlMatch[1]),
+            ontology: extractOntologyFromData(yamlData) ?? extractOntology(yamlMatch[1]),
             data: yamlData,
         };
     }
@@ -30,29 +30,24 @@ export function extractLeadingFrontMatter(markdown: string): MarkdownFrontMatter
     if (tomlMatch) {
         return {
             raw: tomlMatch[1],
-            contextOntologyIri: extractContextIri(tomlMatch[1])
+            ontology: extractOntology(tomlMatch[1])
         };
     }
     return undefined;
 }
 
-export function extractContextIri(frontMatterRaw: string): string | undefined {
-    const match = /^ontologyIri\s*:\s*(.+)$/m.exec(frontMatterRaw)
-        ?? /^ontology\s*:\s*(.+)$/m.exec(frontMatterRaw);
+export function extractOntology(frontMatterRaw: string): string | undefined {
+    const match = /^ontology\s*:\s*(.+)$/m.exec(frontMatterRaw);
     if (!match) {
         return undefined;
     }
     return match[1].trim().replace(/^['"]|['"]$/g, '');
 }
 
-function extractContextIriFromData(data: Record<string, unknown> | undefined): string | undefined {
+function extractOntologyFromData(data: Record<string, unknown> | undefined): string | undefined {
     if (!data) {
         return undefined;
     }
-    const value = typeof data.ontologyIri === 'string'
-        ? data.ontologyIri
-        : typeof data.ontology === 'string'
-            ? data.ontology
-            : undefined;
+    const value = typeof data.ontology === 'string' ? data.ontology : undefined;
     return typeof value === 'string' ? value : undefined;
 }

package/src/md/md-runtime.ts

@@ -7,6 +7,8 @@ import { extractLeadingFrontMatter, stripLeadingFrontMatter } from './md-frontma
 import { MarkdownHandlerRegistry } from './md-registry.js';
 import { parseYamlMap } from './md-yaml.js';
 import type { ParsedCodeBlock, PreparedCodeBlock, PreparedMarkdownDocument } from './md-types.js';
+import { interpolateTemplateBody } from '../template/engine.js';
+import type { TemplateValue } from '../template/types.js';
 
 export class MarkdownPreviewRuntime {
     private readonly renderer: MarkdownIt;
@@ -18,20 +20,32 @@ export class MarkdownPreviewRuntime {
             typographer: false,
         });
         this.renderer.inline.ruler.before('link', 'wiki-link', wikilinkRule);
+        this.renderer.renderer.rules.fence = (tokens, idx): string => {
+            const token = tokens[idx];
+            const language = parseLanguage(token.info);
+            const parsed = parseBlockOptions(token.content);
+            const blockId = buildBlockId(language, parsed.content);
+            const langAttr = language ? ` class="language-${escAttr(language)}"` : '';
+            const escaped = escContent(token.content);
+            return `<pre data-oml-block-id="${escAttr(blockId)}"><code${langAttr}>${escaped}</code></pre>\n`;
+        };
     }
 
     prepare(markdown: string): PreparedMarkdownDocument {
         const frontMatter = extractLeadingFrontMatter(markdown);
         const stripped = stripLeadingFrontMatter(markdown);
-        const codeBlocks = this.parseCodeBlocks(stripped);
+        const body = frontMatter?.data && Object.keys(frontMatter.data).length > 0
+            ? interpolateTemplateBody(stripped, frontMatter.data as Record<string, TemplateValue>)
+            : stripped;
+        const codeBlocks = this.parseCodeBlocks(body);
         const executableBlocks = this.resolveExecutableBlocks(codeBlocks);
-        const renderedHtml = this.renderer.render(stripped);
+        const renderedHtml = this.renderer.render(body);
 
         return {
-            markdown: stripped,
+            markdown: body,
             renderedHtml,
             frontMatter,
-            contextOntologyIri: frontMatter?.contextOntologyIri,
+            ontology: frontMatter?.ontology,
             codeBlocks,
             executableBlocks
         };
@@ -51,7 +65,7 @@ export class MarkdownPreviewRuntime {
             const lineEnd = token.map?.[1] ?? lineStart;
             const parsed = parseBlockOptions(token.content);
             blocks.push({
-                id: buildBlockId(lineStart, lineEnd, language, parsed.content),
+                id: buildBlockId(language, parsed.content),
                 language,
                 meta,
                 content: parsed.content,
@@ -115,6 +129,14 @@ const wikilinkRule: RuleInline = (state, silent): boolean => {
     return true;
 };
 
+function escAttr(str: string): string {
+    return str.replace(/&/g, '&amp;').replace(/"/g, '&quot;');
+}
+
+function escContent(str: string): string {
+    return str.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+}
+
 function parseBlockOptions(content: string): { content: string; options?: Record<string, unknown> } {
     const normalized = content.replace(/^\uFEFF/, '');
     const match = /^(---\s*\r?\n[\s\S]*?\r?\n---\s*\r?\n?)([\s\S]*)$/.exec(normalized);
@@ -151,8 +173,8 @@ function parseMeta(info: string): string | undefined {
     return trimmed.slice(index + 1).trim() || undefined;
 }
 
-function buildBlockId(lineStart: number, lineEnd: number, language: string, content: string): string {
-    return `block-${lineStart}-${lineEnd}-${hash32(`${language}|${content}`)}`;
+function buildBlockId(language: string, content: string): string {
+    return `block-${language}-${hash32(`${language}|${content}`)}`;
 }
 
 function hash32(input: string): string {

package/src/md/md-types.ts

@@ -12,7 +12,7 @@ export interface ParsedCodeBlock {
 
 export interface MarkdownFrontMatter {
     raw: string;
-    contextOntologyIri?: string;
+    ontology?: string;
     data?: Record<string, unknown>;
 }
 
@@ -25,7 +25,7 @@ export interface PreparedMarkdownDocument {
     markdown: string;
     renderedHtml: string;
     frontMatter?: MarkdownFrontMatter;
-    contextOntologyIri?: string;
+    ontology?: string;
     codeBlocks: ParsedCodeBlock[];
     executableBlocks: PreparedCodeBlock[];
 }

package/src/renderers/table-renderer.ts

@@ -49,6 +49,14 @@ type TableRendererWindow = Window & typeof globalThis & {
     __omlSetPersistedTableUiState?: (blockId: string, state: PersistedTableUiState) => void;
 };
 
+function buildTableUiStateKey(blockId: string | undefined): string | undefined {
+    if (typeof blockId !== 'string' || blockId.length === 0) {
+        return undefined;
+    }
+    const pageKey = `${window.location.origin}${window.location.pathname}`;
+    return `${pageKey}::${blockId}`;
+}
+
 export class TableMarkdownBlockRenderer extends QueryMarkdownBlockRenderer {
     protected readonly tableKinds: ReadonlyArray<TableBlockKind> = ['table'];
 
@@ -165,8 +173,9 @@ export class TableMarkdownBlockRenderer extends QueryMarkdownBlockRenderer {
         const fullyExpandedTreeRows = isTree && treeModel
             ? this.flattenAllTreeRows(treeModel)
             : undefined;
-        const persistedState = blockId
-            ? (window as TableRendererWindow).__omlGetPersistedTableUiState?.(blockId)
+        const tableUiStateKey = buildTableUiStateKey(blockId);
+        const persistedState = tableUiStateKey
+            ? (window as TableRendererWindow).__omlGetPersistedTableUiState?.(tableUiStateKey)
             : undefined;
 
         const state = {
@@ -182,10 +191,10 @@ export class TableMarkdownBlockRenderer extends QueryMarkdownBlockRenderer {
         };
 
         const persistUiState = () => {
-            if (!blockId) {
+            if (!tableUiStateKey) {
                 return;
             }
-            (window as TableRendererWindow).__omlSetPersistedTableUiState?.(blockId, {
+            (window as TableRendererWindow).__omlSetPersistedTableUiState?.(tableUiStateKey, {
                 search: state.search,
                 pageSize: state.pageSize,
                 page: state.page,