@oml/markdown 0.16.2 → 0.16.4

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;
     }
@@ -75737,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) {
@@ -75815,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%";
@@ -76072,6 +76086,23 @@ ${serialized}`;
   function getScriptSparqlCache() {
     return parseJsonNode("oml-md-script-sparql-cache", {});
   }
+  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";
@@ -76287,7 +76318,9 @@ ${serialized}`;
     const table2 = (result) => sparqlResultToHtmlTable(result);
     const load = async (url) => loadScript(url);
     const update = async (_ops) => ({});
-    const interactive = (html2, _ops) => html2;
+    const interactive = (_html, _ops) => "";
+    const includeCache = getScriptIncludeCache();
+    const includePreamble = buildIncludePreamble(code2, includeCache);
     const savedLog = console.log;
     const savedWarn = console.warn;
     const savedError = console.error;
@@ -76307,8 +76340,11 @@ ${serialized}`;
     try {
       const AsyncFunction = Object.getPrototypeOf(async function() {
       }).constructor;
-      const fn = new AsyncFunction("display", "query", "table", "load", "update", "interactive", code2);
-      await fn(display, query, table2, load, update, interactive);
+      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) {
@@ -76348,7 +76384,7 @@ ${serialized}`;
           continue;
         }
         appendResult(panel, result);
-        if (!result.error) {
+        if (!result.error && !panel.querySelector(".oml-md-js-empty")) {
           rememberJsPanelCache(cacheKey, panel.innerHTML);
         }
       }
@@ -76467,8 +76503,11 @@ def table(data):
 async def update(_operations):
     return {}
 
-def interactive(html, _operations):
-    return str(html)
+def interactive(_html, _operations):
+    return ''
+
+def include(_path):
+    pass
 
 async def js(code, **kwargs):
     code = code.replace('{{', '
').replace('}}', '')
@@ -76540,8 +76579,9 @@ async def js(code, **kwargs):
     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) {
@@ -76620,7 +76660,8 @@ load <- function(pkg) {
     if (!requireNamespace(pkg, quietly=TRUE)) { webr::install(pkg) }
     library(pkg, character.only=TRUE)
 }
-interactive <- function(html, operations) as.character(html)
+interactive <- function(html, operations) ''
+include <- function(path) invisible(NULL)
 js <- function(code, ...) {
     args <- list(...)
     code <- gsub('{{', '
', code, fixed=TRUE)
@@ -76739,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'