@oml/markdown 0.16.1 → 0.16.3

package/out/template/engine.js

@@ -6,17 +6,17 @@ export function renderTemplate(template, invocation) {
     return {
         output,
         values: bound.values,
-        missingRequired: bound.missingRequired
     };
 }
 export function interpolateTemplateBody(source, values) {
-    return source.replace(/\$\{([A-Za-z_][A-Za-z0-9_]*)\}/g, (_match, key) => {
+    return source.replace(/\$\{([A-Za-z_][A-Za-z0-9_]*)(?:\|([^|}]*)(?:\|([^}]*))?)?\}/g, (_match, key, delimiter, entryTemplate) => {
         if (!(key in values)) {
             return _match;
         }
         const value = values[key];
         if (Array.isArray(value)) {
-            return value.map((entry) => String(entry)).join(', ');
+            const format = (entry) => entryTemplate ? entryTemplate.replace('%s', entry) : entry;
+            return value.map((entry) => format(String(entry))).join(delimiter ?? ', ');
         }
         if (value === null || value === undefined) {
             return '';

package/out/template/engine.js.map

@@ -1 +1 @@
-{"version":3,"file":"engine.js","sourceRoot":"","sources":["../../src/template/engine.ts"],"names":[],"mappings":"AAAA,qDAAqD;AAErD,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AASrD,MAAM,UAAU,cAAc,CAC1B,QAA4B,EAC5B,UAA8B;IAE9B,MAAM,KAAK,GAAG,sBAAsB,CAAC,QAAQ,EAAE,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;IACpF,MAAM,MAAM,GAAG,uBAAuB,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACpE,OAAO;QACH,MAAM;QACN,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,eAAe,EAAE,KAAK,CAAC,eAAe;KACzC,CAAC;AACN,CAAC;AAED,MAAM,UAAU,uBAAuB,CACnC,MAAc,EACd,MAA+C;IAE/C,OAAO,MAAM,CAAC,OAAO,CAAC,iCAAiC,EAAE,CAAC,MAAc,EAAE,GAAW,EAAU,EAAE;QAC7F,IAAI,CAAC,CAAC,GAAG,IAAI,MAAM,CAAC,EAAE,CAAC;YACnB,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1D,CAAC;QACD,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxC,OAAO,EAAE,CAAC;QACd,CAAC;QACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC5B,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACjC,CAAC;QACD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC,CAAC,CAAC;AACP,CAAC"}
+{"version":3,"file":"engine.js","sourceRoot":"","sources":["../../src/template/engine.ts"],"names":[],"mappings":"AAAA,qDAAqD;AAErD,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAQrD,MAAM,UAAU,cAAc,CAC1B,QAA4B,EAC5B,UAA8B;IAE9B,MAAM,KAAK,GAAG,sBAAsB,CAAC,QAAQ,EAAE,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;IACpF,MAAM,MAAM,GAAG,uBAAuB,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACpE,OAAO;QACH,MAAM;QACN,MAAM,EAAE,KAAK,CAAC,MAAM;KACvB,CAAC;AACN,CAAC;AAED,MAAM,UAAU,uBAAuB,CACnC,MAAc,EACd,MAA+C;IAE/C,OAAO,MAAM,CAAC,OAAO,CAAC,8DAA8D,EAAE,CAAC,MAAc,EAAE,GAAW,EAAE,SAA6B,EAAE,aAAiC,EAAU,EAAE;QAC5L,IAAI,CAAC,CAAC,GAAG,IAAI,MAAM,CAAC,EAAE,CAAC;YACnB,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACvB,MAAM,MAAM,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YAC7F,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,CAAC;QAC/E,CAAC;QACD,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxC,OAAO,EAAE,CAAC;QACd,CAAC;QACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC5B,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACjC,CAAC;QACD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC,CAAC,CAAC;AACP,CAAC"}

package/out/template/types.d.ts

@@ -75,5 +75,4 @@ export interface TemplateResolutionResult {
 }
 export interface TemplateBindResult {
     values: Record<string, TemplateValue>;
-    missingRequired: string[];
 }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@oml/markdown",
     "description": "Markdown runtime and execution contracts for OML",
-    "version": "0.16.1",
+    "version": "0.16.3",
     "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.16.1",
+        "@oml/owl": "0.16.3",
         "chart.js": "^4.4.0",
         "markdown-it": "^14.1.1",
         "reflect-metadata": "^0.2.2",

package/src/renderers/diagram-renderer.ts

@@ -2967,7 +2967,17 @@ function normalizeImageHref(href: string): string {
         return href;
     }
     try {
-        return new URL(href, window.location.href).toString();
+        const params = new URLSearchParams(window.location.search);
+        const isPreviewFrame = params.get('_oml_preview') === '1';
+        let baseHref = document.baseURI || window.location.href;
+        if (isPreviewFrame && window.parent && window.parent !== window) {
+            try {
+                baseHref = window.parent.document.baseURI || window.parent.location.href || baseHref;
+            } catch {
+                // Ignore cross-origin access errors and keep current document base.
+            }
+        }
+        return new URL(href, baseHref).toString();
     } catch {
         return href;
     }

package/src/static/browser-runtime.ts

@@ -1,7 +1,26 @@
 // Copyright (c) 2026 Modelware. All rights reserved.
 
 import { createMarkdownRendererRegistry } from '../renderers/registry.js';
-import { setIriLabelSnapshot } from '../renderers/renderer.js';
+import { setIriLabelSnapshot, displayLabelFromIri } from '../renderers/renderer.js';
+
+// Replace [[iri]] tokens in an HTML string with wikilink anchors, skipping content inside tags.
+function expandWikilinksInHtml(html: string): string {
+    return html.replace(/(<[^>]*>)|\[\[([^\]]+)\]\]/g, (match, tag: string | undefined, iri: string | undefined) => {
+        if (tag !== undefined) {
+            // Only pass through real HTML tags: <tagname, </tagname, <!-- , <!doctype, <?.
+            // Tag names are letters/digits/hyphens only — no colons or slashes.
+            // <http://...> fails because ':' immediately follows the tag name letters.
+            if (/^<[!?]/.test(tag) || /^<\/?[a-zA-Z][a-zA-Z0-9-]*(?:[\s>\/]|$)/.test(tag)) return tag;
+            return tag.replace(/</g, '&lt;').replace(/>/g, '&gt;');
+        }
+        const trimmed = (iri ?? '').trim();
+        if (!trimmed) return match;
+        const label = displayLabelFromIri(trimmed);
+        const safeIri = trimmed.replace(/&/g, '&amp;').replace(/"/g, '&quot;');
+        const safeLabel = label.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+        return `<a class="wikilink" iri="${safeIri}" href="#" title="${safeIri}">${safeLabel}</a>`;
+    });
+}
 
 const SUPPORTED = new Set(['table', 'tree', 'graph', 'chart', 'diagram', 'list', 'text', 'matrix', 'table-editor']);
 
@@ -199,7 +218,12 @@ function setupIriNavigationHandler(
         if (!href) {
             return;
         }
-        window.location.assign(href);
+        const targetHref = new URL(href, document.baseURI).toString();
+        if (window.parent && window.parent !== window) {
+            window.parent.postMessage({ type: 'oml-md:navigate', href: targetHref }, '*');
+        } else {
+            window.location.assign(targetHref);
+        }
     });
 }
 
@@ -294,7 +318,7 @@ async function scheduleIriPreview(
     // Create iframe to show the linked page
     const iframe = document.createElement('iframe');
     // Add preview mode parameter to prevent nested previews
-    const iframeSrc = new URL(href, window.location.href);
+    const iframeSrc = new URL(href, document.baseURI);
     iframeSrc.searchParams.set('_oml_preview', '1');
     iframe.src = iframeSrc.toString();
     iframe.style.width = '100%';
@@ -626,9 +650,29 @@ function getScriptSparqlCache(): Record<string, Record<string, QueryResult>> {
     return parseJsonNode<Record<string, Record<string, QueryResult>>>('oml-md-script-sparql-cache', {});
 }
 
-const PYTHON_PANEL_CACHE_STORAGE_KEY = 'oml-md-python-panel-cache-v1';
-const R_PANEL_CACHE_STORAGE_KEY = 'oml-md-r-panel-cache-v1';
-const JS_PANEL_CACHE_STORAGE_KEY = 'oml-md-js-panel-cache-v1';
+function getScriptIncludeCache(): Record<string, string> {
+    return parseJsonNode<Record<string, string>>('oml-md-script-include-cache', {});
+}
+
+function extractIncludePaths(code: string): string[] {
+    const re = /\binclude\s*\(\s*(?:"((?:[^"\\]|\\[\s\S])*)"|'((?:[^'\\]|\\[\s\S])*)'|`((?:[^`\\]|\\[\s\S])*)`)\s*\)/g;
+    const seen = new Set<string>();
+    let m: RegExpExecArray | null;
+    while ((m = re.exec(code)) !== null) {
+        seen.add(m[1] ?? m[2] ?? m[3]);
+    }
+    return [...seen];
+}
+
+function buildIncludePreamble(code: string, cache: Record<string, string>): string {
+    const paths = extractIncludePaths(code);
+    const parts = paths.map((p) => cache[p] ?? '').filter(Boolean);
+    return parts.length > 0 ? parts.join('\n') + '\n' : '';
+}
+
+const PYTHON_PANEL_CACHE_STORAGE_KEY = 'oml-md-python-panel-cache-v2';
+const R_PANEL_CACHE_STORAGE_KEY = 'oml-md-r-panel-cache-v2';
+const JS_PANEL_CACHE_STORAGE_KEY = 'oml-md-js-panel-cache-v2';
 const MAX_PYTHON_PANEL_CACHE_ENTRIES = 64;
 const MAX_R_PANEL_CACHE_ENTRIES = 64;
 const MAX_JS_PANEL_CACHE_ENTRIES = 64;
@@ -737,7 +781,7 @@ function rememberJsPanelCache(key: string, html: string): void {
 
 function buildPythonPanelCacheKey(blockId: string, source: string, blockCache: Record<string, QueryResult>): string {
     const page = `${window.location.origin}${window.location.pathname}${window.location.search}`;
-    return `python|${page}|${blockId}|${hash32(source)}|${hash32(JSON.stringify(blockCache))}`;
+    return `python-v2|${page}|${blockId}|${hash32(source)}|${hash32(JSON.stringify(blockCache))}`;
 }
 
 function buildRPanelCacheKey(blockId: string, source: string, blockCache: Record<string, QueryResult>): string {
@@ -841,7 +885,7 @@ async function executeJsCode(
         const el = document.createElement('div');
         el.className = 'oml-md-js-html-output';
         el.style.color = window.getComputedStyle(document.body).color;
-        el.innerHTML = html;
+        el.innerHTML = expandWikilinksInHtml(html);
         container.appendChild(el);
     };
     const appendText = (text: string): void => {
@@ -852,13 +896,28 @@ async function executeJsCode(
         container.appendChild(pre);
     };
     const display = (content: unknown): void => {
-        if (typeof content === 'string') { appendHtml(content); } else { appendText(String(content)); }
+        if (typeof content === 'string') {
+            appendHtml(content);
+        } else if (content instanceof Node) {
+            clearStatus();
+            const el = document.createElement('div');
+            el.className = 'oml-md-js-html-output';
+            el.style.color = window.getComputedStyle(document.body).color;
+            el.appendChild(content);
+            container.appendChild(el);
+        } else {
+            appendText(String(content));
+        }
     };
     const query = async (sparql: string): Promise<QueryResult> => {
         return blockCache[sparql] ?? { success: false, columns: [], rows: [], error: 'SPARQL not pre-fetched for this query' };
     };
     const table = (result: QueryResult): string => sparqlResultToHtmlTable(result);
     const load = async (url: string): Promise<void> => loadScript(url);
+    const update = async (_ops: unknown): Promise<{ errors?: unknown[] }> => ({});
+    const interactive = (_html: string, _ops: unknown): string => '';
+    const includeCache = getScriptIncludeCache();
+    const includePreamble = buildIncludePreamble(code, includeCache);
 
     const savedLog = console.log;
     const savedWarn = console.warn;
@@ -874,8 +933,10 @@ async function executeJsCode(
     };
     try {
         const AsyncFunction = Object.getPrototypeOf(async function () { /* */ }).constructor as new (...a: string[]) => (...a: unknown[]) => Promise<void>;
-        const fn = new AsyncFunction('display', 'query', 'table', 'load', code);
-        await fn(display, query, table, load);
+        const include = async (_path: string): Promise<void> => { /* content already prepended */ };
+        const finalCode = includePreamble ? includePreamble + code : code;
+        const fn = new AsyncFunction('display', 'query', 'table', 'load', 'update', 'interactive', 'include', finalCode);
+        await fn(display, query, table, load, update, interactive, include);
         clearStatus();
         return {};
     } catch (error) {
@@ -914,8 +975,11 @@ async function applyJsBlocks(): Promise<void> {
             const panel = makeScriptPanel();
             pre.replaceWith(panel);
             const result = await executeJsCode(source, blockCache, panel);
+            if (!panel.isConnected) {
+                continue;
+            }
             appendResult(panel, result);
-            if (!result.error) {
+            if (!result.error && !panel.querySelector('.oml-md-js-empty')) {
                 rememberJsPanelCache(cacheKey, panel.innerHTML);
             }
         }
@@ -1065,6 +1129,23 @@ def table(data):
         for r in rows
     )
     display(f'<div class="oml-md-table-wrapper"><table class="oml-md-table"><thead><tr>{hdr}</tr></thead><tbody>{bdy}</tbody></table></div>')
+
+async def update(_operations):
+    return {}
+
+def interactive(_html, _operations):
+    return ''
+
+def include(_path):
+    pass
+
+async def js(code, **kwargs):
+    code = code.replace('{{', '\x01').replace('}}', '\x02')
+    for k, v in kwargs.items():
+        code = code.replace(f'{{{k}}}', str(v))
+    code = code.replace('\x01', '{').replace('\x02', '}')
+    result = await _js_eval(code)
+    return result.to_py() if hasattr(result, 'to_py') else result
 `;
 
 let pyodideExecQueue: Promise<unknown> = Promise.resolve();
@@ -1101,7 +1182,7 @@ async function _executePyCode(
         const el = document.createElement('div');
         el.className = 'oml-md-js-html-output';
         el.style.color = window.getComputedStyle(document.body).color;
-        el.innerHTML = html;
+        el.innerHTML = expandWikilinksInHtml(html);
         container.appendChild(el);
     };
     const appendText = (text: string): void => {
@@ -1128,10 +1209,17 @@ async function _executePyCode(
     pyodide.globals.set('_js_display', appendHtml);
     pyodide.globals.set('_js_query', (sparql: string) =>
         blockCache[sparql] ?? { success: false, columns: [], rows: [], error: 'SPARQL not pre-fetched' });
+    pyodide.globals.set('_js_update', async (_opsJson: string) => ({}));
+    pyodide.globals.set('_js_eval', async (code: string) => {
+        // eslint-disable-next-line no-new-func
+        const AsyncFunction = Object.getPrototypeOf(async function () { /* */ }).constructor as new (...a: string[]) => () => Promise<unknown>;
+        return new AsyncFunction(code)();
+    });
     pyodide.setStdout({ batched: appendText });
     pyodide.setStderr({ batched: () => { /* suppress library noise */ } });
+    const preamble = buildIncludePreamble(code, getScriptIncludeCache());
     try {
-        await pyodide.runPythonAsync(code);
+        await pyodide.runPythonAsync(preamble ? preamble + code : code);
         clearStatus();
         return {};
     } catch (error) {
@@ -1158,6 +1246,9 @@ async function applyPyBlocks(): Promise<void> {
         const panel = makeScriptPanel();
         pre.replaceWith(panel);
         const result = await executePyCode(source, blockCache, panel);
+        if (!panel.isConnected) {
+            continue;
+        }
         appendResult(panel, result);
         if (!result.error) {
             rememberPythonPanelCache(cacheKey, panel.innerHTML);
@@ -1221,6 +1312,19 @@ load <- function(pkg) {
     if (!requireNamespace(pkg, quietly=TRUE)) { webr::install(pkg) }
     library(pkg, character.only=TRUE)
 }
+interactive <- function(html, operations) ''
+include <- function(path) invisible(NULL)
+js <- function(code, ...) {
+    args <- list(...)
+    code <- gsub('{{', '\x01', code, fixed=TRUE)
+    code <- gsub('}}', '\x02', code, fixed=TRUE)
+    for (nm in names(args)) {
+        code <- gsub(paste0('{', nm, '}'), as.character(args[[nm]]), code, fixed=TRUE)
+    }
+    code <- gsub('\x01', '{', code, fixed=TRUE)
+    code <- gsub('\x02', '}', code, fixed=TRUE)
+    webr::eval_js(paste0('(async()=>{\n', code, '\n})()'))
+}
 `;
 
 function buildRDataFrameCode(result: QueryResult, varName: string): string {
@@ -1298,7 +1402,7 @@ async function executeRCode(
         const el = document.createElement('div');
         el.className = 'oml-md-js-html-output';
         el.style.color = window.getComputedStyle(document.body).color;
-        el.innerHTML = html;
+        el.innerHTML = expandWikilinksInHtml(html);
         container.appendChild(el);
     };
     const appendText = (text: string): void => {
@@ -1327,11 +1431,13 @@ async function executeRCode(
         clearStatus();
         return { error: `R bootstrap failed: ${e instanceof Error ? e.message : String(e)}` };
     }
+    const includePreamble = buildIncludePreamble(code, getScriptIncludeCache());
     let finalCode = code;
     if (prefetchResults.length > 0) {
         const queryMap = new Map(prefetchResults.map((r) => [r.sparql, r.varName] as [string, string]));
         finalCode = prefetchResults.map((r) => r.preamble).join('\n') + '\n' + rewriteRQueryCalls(code, queryMap);
     }
+    if (includePreamble) { finalCode = includePreamble + finalCode; }
     try {
         await webR.evalRVoid(
             '.oml_buf_ <- character(0)\n' +
@@ -1367,6 +1473,9 @@ async function applyRBlocks(): Promise<void> {
         const panel = makeScriptPanel();
         pre.replaceWith(panel);
         const result = await executeRCode(source, blockCache, panel);
+        if (!panel.isConnected) {
+            continue;
+        }
         appendResult(panel, result);
         if (!result.error) {
             rememberRPanelCache(cacheKey, panel.innerHTML);

package/src/template/binder.ts

@@ -8,8 +8,13 @@ export function bindTemplateParameters(
     explicitArgs: Readonly<Record<string, TemplateValue>> = {}
 ): TemplateBindResult {
     const values: Record<string, TemplateValue> = {};
-    const missingRequired: string[] = [];
     const parameters = template.parameters ?? [];
+    const declaredIds = new Set(parameters.map((p) => p.id));
+    for (const argId of Object.keys(explicitArgs)) {
+        if (!declaredIds.has(argId)) {
+            throw new Error(`Unknown template parameter: ${argId}`);
+        }
+    }
     for (const parameter of parameters) {
         const explicit = explicitArgs[parameter.id];
         if (explicit !== undefined) {
@@ -22,12 +27,11 @@ export function bindTemplateParameters(
             continue;
         }
         if (parameter.required) {
-            missingRequired.push(parameter.id);
-            continue;
+            throw new Error(`Missing required template parameter: ${parameter.id}`);
         }
         values[parameter.id] = naturalDefaultValue(parameter.type);
     }
-    return { values, missingRequired };
+    return { values };
 }
 
 function resolveTemplateDefaultValue(
@@ -92,8 +96,9 @@ function resolveContextToken(token: string, context: TemplateInvocationContext):
 function coerceParameterValue(parameter: TemplateParameterDefinition, value: TemplateValue): TemplateValue {
     switch (parameter.type) {
         case 'string':
-        case 'iri':
             return coerceString(parameter, value);
+        case 'iri':
+            return coerceIri(parameter, value);
         case 'number':
             return coerceNumber(parameter, value);
         case 'boolean':
@@ -115,6 +120,18 @@ function coerceString(parameter: TemplateParameterDefinition, value: TemplateVal
     throw new Error(`Template parameter '${parameter.id}' must be a string.`);
 }
 
+function coerceIri(parameter: TemplateParameterDefinition, value: TemplateValue): string {
+    if (typeof value !== 'string') {
+        throw new Error(`Template parameter '${parameter.id}' must be a valid IRI.`);
+    }
+    try {
+        new URL(value);
+    } catch {
+        throw new Error(`Template parameter '${parameter.id}' must be a valid IRI, got: ${value}`);
+    }
+    return value;
+}
+
 function coerceNumber(parameter: TemplateParameterDefinition, value: TemplateValue): number {
     if (typeof value === 'number' && Number.isFinite(value)) {
         return value;
@@ -144,18 +161,30 @@ function coerceBoolean(parameter: TemplateParameterDefinition, value: TemplateVa
     throw new Error(`Template parameter '${parameter.id}' must be a boolean.`);
 }
 
+function validateIriArrayEntries(parameter: TemplateParameterDefinition, entries: string[]): string[] {
+    for (const entry of entries) {
+        try {
+            new URL(entry);
+        } catch {
+            throw new Error(`Template parameter '${parameter.id}' contains an invalid IRI: ${entry}`);
+        }
+    }
+    return entries;
+}
+
 function coerceIriArray(parameter: TemplateParameterDefinition, value: TemplateValue): string[] {
     if (Array.isArray(value) && value.every((entry) => typeof entry === 'string')) {
-        return value;
+        return validateIriArrayEntries(parameter, value as string[]);
     }
     if (typeof value === 'string') {
         const normalized = value.trim();
         if (!normalized) {
             return [];
         }
-        return normalized.split(',').map((entry) => entry.trim()).filter((entry) => entry.length > 0);
+        const entries = normalized.split(',').map((entry) => entry.trim()).filter((entry) => entry.length > 0);
+        return validateIriArrayEntries(parameter, entries);
     }
-    throw new Error(`Template parameter '${parameter.id}' must be an array of strings.`);
+    throw new Error(`Template parameter '${parameter.id}' must be an array of IRIs.`);
 }
 
 function coerceJson(parameter: TemplateParameterDefinition, value: TemplateValue): TemplateValue {

package/src/template/engine.ts

@@ -6,7 +6,6 @@ import type { TemplateDefinition, TemplateInvocation, TemplateValue } from './ty
 export interface TemplateRenderResult {
     output: string;
     values: Record<string, TemplateValue>;
-    missingRequired: string[];
 }
 
 export function renderTemplate(
@@ -18,7 +17,6 @@ export function renderTemplate(
     return {
         output,
         values: bound.values,
-        missingRequired: bound.missingRequired
     };
 }
 
@@ -26,13 +24,14 @@ export function interpolateTemplateBody(
     source: string,
     values: Readonly<Record<string, TemplateValue>>
 ): string {
-    return source.replace(/\$\{([A-Za-z_][A-Za-z0-9_]*)\}/g, (_match: string, key: string): string => {
+    return source.replace(/\$\{([A-Za-z_][A-Za-z0-9_]*)(?:\|([^|}]*)(?:\|([^}]*))?)?\}/g, (_match: string, key: string, delimiter: string | undefined, entryTemplate: string | undefined): string => {
         if (!(key in values)) {
             return _match;
         }
         const value = values[key];
         if (Array.isArray(value)) {
-            return value.map((entry) => String(entry)).join(', ');
+            const format = (entry: string) => entryTemplate ? entryTemplate.replace('%s', entry) : entry;
+            return value.map((entry) => format(String(entry))).join(delimiter ?? ', ');
         }
         if (value === null || value === undefined) {
             return '';

package/src/template/types.ts

@@ -97,5 +97,4 @@ export interface TemplateResolutionResult {
 
 export interface TemplateBindResult {
     values: Record<string, TemplateValue>;
-    missingRequired: string[];
 }