@oml/markdown 0.16.1 → 0.16.3

package/out/static/browser-runtime.bundle.js

@@ -70733,7 +70733,16 @@ ${serialized}`;
       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 {
+        }
+      }
+      return new URL(href, baseHref).toString();
     } catch {
       return href;
     }
@@ -75574,6 +75583,20 @@ ${serialized}`;
   }
 
   // src/static/browser-runtime.ts
+  function expandWikilinksInHtml(html2) {
+    return html2.replace(/(<[^>]*>)|\[\[([^\]]+)\]\]/g, (match2, tag, iri) => {
+      if (tag !== void 0) {
+        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 match2;
+      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>`;
+    });
+  }
   var SUPPORTED = /* @__PURE__ */ new Set(["table", "tree", "graph", "chart", "diagram", "list", "text", "matrix", "table-editor"]);
   var wikilinkPreviewCard;
   var wikilinkPreviewHideTimer;
@@ -75723,7 +75746,12 @@ ${serialized}`;
       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);
+      }
     });
   }
   function isHoverPreviewEnabled(event) {
@@ -75801,7 +75829,7 @@ ${serialized}`;
     }
     const card = ensureWikilinkPreviewCard();
     const iframe = document.createElement("iframe");
-    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%";
@@ -76058,9 +76086,26 @@ ${serialized}`;
   function getScriptSparqlCache() {
     return parseJsonNode("oml-md-script-sparql-cache", {});
   }
-  var PYTHON_PANEL_CACHE_STORAGE_KEY = "oml-md-python-panel-cache-v1";
-  var R_PANEL_CACHE_STORAGE_KEY = "oml-md-r-panel-cache-v1";
-  var JS_PANEL_CACHE_STORAGE_KEY = "oml-md-js-panel-cache-v1";
+  function getScriptIncludeCache() {
+    return parseJsonNode("oml-md-script-include-cache", {});
+  }
+  function extractIncludePaths(code2) {
+    const re = /\binclude\s*\(\s*(?:"((?:[^"\\]|\\[\s\S])*)"|'((?:[^'\\]|\\[\s\S])*)'|`((?:[^`\\]|\\[\s\S])*)`)\s*\)/g;
+    const seen = /* @__PURE__ */ new Set();
+    let m;
+    while ((m = re.exec(code2)) !== null) {
+      seen.add(m[1] ?? m[2] ?? m[3]);
+    }
+    return [...seen];
+  }
+  function buildIncludePreamble(code2, cache5) {
+    const paths = extractIncludePaths(code2);
+    const parts = paths.map((p) => cache5[p] ?? "").filter(Boolean);
+    return parts.length > 0 ? parts.join("\n") + "\n" : "";
+  }
+  var PYTHON_PANEL_CACHE_STORAGE_KEY = "oml-md-python-panel-cache-v2";
+  var R_PANEL_CACHE_STORAGE_KEY = "oml-md-r-panel-cache-v2";
+  var JS_PANEL_CACHE_STORAGE_KEY = "oml-md-js-panel-cache-v2";
   var MAX_PYTHON_PANEL_CACHE_ENTRIES = 64;
   var MAX_R_PANEL_CACHE_ENTRIES = 64;
   var MAX_JS_PANEL_CACHE_ENTRIES = 64;
@@ -76159,7 +76204,7 @@ ${serialized}`;
   }
   function buildPythonPanelCacheKey(blockId, source, blockCache) {
     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, source, blockCache) {
     const page = `${window.location.origin}${window.location.pathname}${window.location.search}`;
@@ -76243,7 +76288,7 @@ ${serialized}`;
       const el = document.createElement("div");
       el.className = "oml-md-js-html-output";
       el.style.color = window.getComputedStyle(document.body).color;
-      el.innerHTML = html2;
+      el.innerHTML = expandWikilinksInHtml(html2);
       container.appendChild(el);
     };
     const appendText = (text4) => {
@@ -76256,6 +76301,13 @@ ${serialized}`;
     const display = (content9) => {
       if (typeof content9 === "string") {
         appendHtml(content9);
+      } else if (content9 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(content9);
+        container.appendChild(el);
       } else {
         appendText(String(content9));
       }
@@ -76265,6 +76317,10 @@ ${serialized}`;
     };
     const table2 = (result) => sparqlResultToHtmlTable(result);
     const load = async (url) => loadScript(url);
+    const update = async (_ops) => ({});
+    const interactive = (_html, _ops) => "";
+    const includeCache = getScriptIncludeCache();
+    const includePreamble = buildIncludePreamble(code2, includeCache);
     const savedLog = console.log;
     const savedWarn = console.warn;
     const savedError = console.error;
@@ -76284,8 +76340,11 @@ ${serialized}`;
     try {
       const AsyncFunction = Object.getPrototypeOf(async function() {
       }).constructor;
-      const fn = new AsyncFunction("display", "query", "table", "load", code2);
-      await fn(display, query, table2, load);
+      const include = async (_path) => {
+      };
+      const finalCode = includePreamble ? includePreamble + code2 : code2;
+      const fn = new AsyncFunction("display", "query", "table", "load", "update", "interactive", "include", finalCode);
+      await fn(display, query, table2, load, update, interactive, include);
       clearStatus();
       return {};
     } catch (error2) {
@@ -76321,8 +76380,11 @@ ${serialized}`;
         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);
         }
       }
@@ -76437,6 +76499,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('{{', '
').replace('}}', '')
+    for k, v in kwargs.items():
+        code = code.replace(f'{{{k}}}', str(v))
+    code = code.replace('
', '{').replace('', '}')
+    result = await _js_eval(code)
+    return result.to_py() if hasattr(result, 'to_py') else result
 `;
   var pyodideExecQueue = Promise.resolve();
   async function executePyCode(code2, blockCache, container) {
@@ -76466,7 +76545,7 @@ def table(data):
       const el = document.createElement("div");
       el.className = "oml-md-js-html-output";
       el.style.color = window.getComputedStyle(document.body).color;
-      el.innerHTML = html2;
+      el.innerHTML = expandWikilinksInHtml(html2);
       container.appendChild(el);
     };
     const appendText = (text4) => {
@@ -76491,11 +76570,18 @@ def table(data):
     }
     pyodide.globals.set("_js_display", appendHtml);
     pyodide.globals.set("_js_query", (sparql) => blockCache[sparql] ?? { success: false, columns: [], rows: [], error: "SPARQL not pre-fetched" });
+    pyodide.globals.set("_js_update", async (_opsJson) => ({}));
+    pyodide.globals.set("_js_eval", async (code3) => {
+      const AsyncFunction = Object.getPrototypeOf(async function() {
+      }).constructor;
+      return new AsyncFunction(code3)();
+    });
     pyodide.setStdout({ batched: appendText });
     pyodide.setStderr({ batched: () => {
     } });
+    const preamble = buildIncludePreamble(code2, getScriptIncludeCache());
     try {
-      await pyodide.runPythonAsync(code2);
+      await pyodide.runPythonAsync(preamble ? preamble + code2 : code2);
       clearStatus();
       return {};
     } catch (error2) {
@@ -76521,6 +76607,9 @@ def table(data):
       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);
@@ -76571,6 +76660,21 @@ 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('{{', '
', code, fixed=TRUE)
+    code <- gsub('}}', '', code, fixed=TRUE)
+    for (nm in names(args)) {
+        code <- gsub(paste0('{', nm, '}'), as.character(args[[nm]]), code, fixed=TRUE)
+    }
+    code <- gsub('
', '{', code, fixed=TRUE)
+    code <- gsub('', '}', code, fixed=TRUE)
+    webr::eval_js(paste0('(async()=>{
+', code, '
+})()'))
+}
 `;
   function buildRDataFrameCode(result, varName) {
     const rStr = (s) => '"' + s.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\n").replace(/\r/g, "") + '"';
@@ -76647,7 +76751,7 @@ ${colDefs},
       const el = document.createElement("div");
       el.className = "oml-md-js-html-output";
       el.style.color = window.getComputedStyle(document.body).color;
-      el.innerHTML = html2;
+      el.innerHTML = expandWikilinksInHtml(html2);
       container.appendChild(el);
     };
     const appendText = (text4) => {
@@ -76676,11 +76780,15 @@ ${colDefs},
       clearStatus();
       return { error: `R bootstrap failed: ${e instanceof Error ? e.message : String(e)}` };
     }
+    const includePreamble = buildIncludePreamble(code2, getScriptIncludeCache());
     let finalCode = code2;
     if (prefetchResults.length > 0) {
       const queryMap = new Map(prefetchResults.map((r) => [r.sparql, r.varName]));
       finalCode = prefetchResults.map((r) => r.preamble).join("\n") + "\n" + rewriteRQueryCalls(code2, queryMap);
     }
+    if (includePreamble) {
+      finalCode = includePreamble + finalCode;
+    }
     try {
       await webR.evalRVoid(
         ".oml_buf_ <- character(0)\ntryCatch({\n" + finalCode + '\n}, error = function(e) { .oml_buf_ <<- c(.oml_buf_, paste0("Error: ", conditionMessage(e))) })\n'
@@ -76712,6 +76820,9 @@ ${colDefs},
       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);