@pretextbook/pretext-html 0.9.0 → 0.10.0

package/dist/{cli-BUrNZxov.js → cli-BONFCRgl.js}

@@ -1,12 +1,12 @@
 import { readFile as W, writeFile as Z } from "node:fs/promises";
 import * as y from "node:process";
-import * as d from "node:path";
+import * as u from "node:path";
 import { fileURLToPath as Ae } from "node:url";
 import { fromXml as E } from "xast-util-from-xml";
 import { toXml as I } from "xast-util-to-xml";
 import { injectRevealBridge as Le } from "./reveal.js";
 import { injectThemeBridge as Me } from "./theme.js";
-const je = "ptxPreviewBannerDismissed", _e = "About live preview";
+const _e = "ptxPreviewBannerDismissed", je = "About live preview";
 function Q(e) {
   return e.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
 }
@@ -16,7 +16,7 @@ function Be(e) {
     `  <span class="ptx-preview-banner-text">${Q(e)}</span>`,
     '  <button type="button" class="ptx-preview-banner-dismiss" aria-label="Dismiss">&times;</button>',
     "</div>",
-    `<button type="button" id="ptx-preview-banner-restore" class="ptx-preview-banner-restore" hidden>${Q(_e)}</button>`
+    `<button type="button" id="ptx-preview-banner-restore" class="ptx-preview-banner-restore" hidden>${Q(je)}</button>`
   ].join(`
 `);
 }
@@ -85,7 +85,7 @@ function Ce() {
   return [
     "<script>",
     "(function () {",
-    "  var KEY = " + JSON.stringify(je) + ";",
+    "  var KEY = " + JSON.stringify(_e) + ";",
     '  var banner = document.getElementById("ptx-preview-banner");',
     '  var restore = document.getElementById("ptx-preview-banner-restore");',
     "  if (!banner || !restore) { return; }",
@@ -136,8 +136,8 @@ ${Ne}`;
   return n.replace(/<body([^>]*)>/i, `<body$1>${o}`);
 }
 async function de(e, r) {
-  const t = d.resolve(e), n = d.resolve(t, `.${d.posix.normalize(r)}`);
-  if (n !== t && !n.startsWith(t + d.sep)) {
+  const t = u.resolve(e), n = u.resolve(t, `.${u.posix.normalize(r)}`);
+  if (n !== t && !n.startsWith(t + u.sep)) {
     console.error(
       `pretext-html: refusing to serve ${r} from outside ${t}`
     );
@@ -161,10 +161,10 @@ function en(e) {
   fe = e;
 }
 function C() {
-  return fe ?? process.env.PRETEXT_HTML_ASSETS ?? d.resolve(d.dirname(Ae(import.meta.url)), "..", "assets");
+  return fe ?? process.env.PRETEXT_HTML_ASSETS ?? u.resolve(u.dirname(Ae(import.meta.url)), "..", "assets");
 }
 function We(e, r) {
-  return d.join(e, r);
+  return u.join(e, r);
 }
 const pe = "2.48.1", He = "8.2.4", Je = [
   "prefix-runtime.40bd1420d3277749.bundle.js",
@@ -195,13 +195,13 @@ function qe(e) {
     }
   );
 }
-const H = /* @__PURE__ */ new Map(), he = /* @__PURE__ */ new Map();
-let F, Ze = 0, me = de;
+const H = /* @__PURE__ */ new Map(), me = /* @__PURE__ */ new Map();
+let F, Ze = 0, he = de;
 function tn(e) {
-  me = e;
+  he = e;
 }
 function Qe(e, r) {
-  const t = typeof e == "string" ? e : e instanceof URL ? e.href : e.url, n = he.get(t);
+  const t = typeof e == "string" ? e : e instanceof URL ? e.href : e.url, n = me.get(t);
   if (n !== void 0)
     return Promise.resolve(new Response(n, { status: 200 }));
   let o;
@@ -215,7 +215,7 @@ function Qe(e, r) {
 }
 const et = '<?xml version="1.0"?><pretext-preview-missing-file/>';
 async function tt(e, r) {
-  const t = decodeURIComponent(new URL(r).pathname), n = await me(e, t);
+  const t = decodeURIComponent(new URL(r).pathname), n = await he(e, t);
   if (n === void 0)
     return new Response(et, { status: 200 });
   const o = typeof n == "string" ? n : new Uint8Array(n);
@@ -233,7 +233,7 @@ function nt(e) {
   H.delete(new URL(e).host);
 }
 function rt(e, r) {
-  we(), he.set(e, r);
+  we(), me.set(e, r);
 }
 const N = `<?xml version="1.0" encoding="UTF-8"?>
 <publication>
@@ -314,11 +314,11 @@ async function ut(e, r, t) {
 }
 async function J(e, r, t) {
   const n = E(e), o = {
-    projectDir: d.resolve(t),
-    stack: [d.resolve(r)]
+    projectDir: u.resolve(t),
+    stack: [u.resolve(r)]
   }, i = await P(
     n,
-    d.dirname(d.resolve(r)),
+    u.dirname(u.resolve(r)),
     { "": "" },
     o
   );
@@ -374,8 +374,8 @@ async function xe(e, r, t, n) {
     s = decodeURIComponent(i);
   } catch {
   }
-  const a = d.resolve(r, s);
-  if (a !== n.projectDir && !a.startsWith(n.projectDir + d.sep))
+  const a = u.resolve(r, s);
+  if (a !== n.projectDir && !a.startsWith(n.projectDir + u.sep))
     throw new Error(
       `xi:include escapes the project directory: ${i} (in ${o})`
     );
@@ -387,7 +387,7 @@ async function xe(e, r, t, n) {
     throw new Error(`xi:include nesting exceeds ${ne} levels`);
   const l = await M(a);
   if (l === void 0) {
-    const p = ht(e, t);
+    const p = mt(e, t);
     if (p)
       return await P(p, r, t, n), p.children;
     throw new Error(`xi:include target not found: ${i} (in ${o})`);
@@ -404,7 +404,7 @@ async function xe(e, r, t, n) {
   }
   n.stack.push(a);
   try {
-    await P(c, d.dirname(a), { "": "" }, n);
+    await P(c, u.dirname(a), { "": "" }, n);
   } finally {
     n.stack.pop();
   }
@@ -425,8 +425,8 @@ async function pt(e, r, t) {
     );
     if (!o)
       return;
-    const i = d.resolve(r), s = d.dirname(i), a = {
-      projectDir: d.resolve(t),
+    const i = u.resolve(r), s = u.dirname(i), a = {
+      projectDir: u.resolve(t),
       stack: [i]
     }, l = L({ "": "" }, o);
     for (const c of o.children) {
@@ -436,16 +436,16 @@ async function pt(e, r, t) {
       if (re(c))
         return await P(c, s, f, a), I(c);
       if (ve(c, f)) {
-        const h = (await xe(
+        const m = (await xe(
           c,
           s,
           f,
           a
         )).find(
-          (m) => m.type === "element" && re(m)
+          (h) => h.type === "element" && re(h)
         );
-        if (h)
-          return I(h);
+        if (m)
+          return I(m);
         continue;
       }
       break;
@@ -455,7 +455,7 @@ async function pt(e, r, t) {
     return;
   }
 }
-function ht(e, r) {
+function mt(e, r) {
   for (const t of e.children) {
     if (t.type !== "element")
       continue;
@@ -467,7 +467,7 @@ function ht(e, r) {
 function ye(e) {
   return typeof e == "object" && e !== null && e.type === "element";
 }
-function mt(e) {
+function ht(e) {
   return /^(pf|xhtml):/.test(e.name);
 }
 function wt(e, r, t) {
@@ -481,7 +481,7 @@ function wt(e, r, t) {
 function Te(e, r, t, n, o, i) {
   const s = dt(e) ?? n;
   let a, l;
-  if (mt(e))
+  if (ht(e))
     l = "root";
   else {
     const f = e.attributes.label ?? e.attributes["xml:id"];
@@ -554,7 +554,7 @@ const Ee = /* @__PURE__ */ new Set([
   "subtitle",
   "caption"
 ]);
-function b(e) {
+function g(e) {
   return e.type === "element";
 }
 function Ie(e) {
@@ -562,7 +562,7 @@ function Ie(e) {
 }
 function X(e, r) {
   for (const t of e.children) {
-    if (!b(t)) continue;
+    if (!g(t)) continue;
     if (Ie(t) === r) return t;
     const n = X(t, r);
     if (n) return n;
@@ -570,7 +570,7 @@ function X(e, r) {
 }
 function A(e, r) {
   for (const t of e.children) {
-    if (!b(t)) continue;
+    if (!g(t)) continue;
     if (t === r) return [t];
     const n = A(t, r);
     if (n) return [t, ...n];
@@ -586,7 +586,7 @@ function vt(e, r) {
 }
 function Pe(e) {
   if (!$e.has(e.name)) {
-    e.children = e.children.filter(b);
+    e.children = e.children.filter(g);
     for (const r of e.children)
       Pe(r);
   }
@@ -594,7 +594,7 @@ function Pe(e) {
 function U(e, r) {
   const t = [];
   for (const n of e.children)
-    b(n) && (r.has(n) || gt.has(n.name) || $e.has(n.name) ? t.push(n) : ke.has(n.name) && (U(n, r), t.push(n)));
+    g(n) && (r.has(n) || gt.has(n.name) || $e.has(n.name) ? t.push(n) : ke.has(n.name) && (U(n, r), t.push(n)));
   e.children = t;
 }
 function xt(e) {
@@ -610,14 +610,14 @@ function xt(e) {
           s && r.add(s);
     }
     for (const o of n.children)
-      b(o) && t(o);
+      g(o) && t(o);
   };
   return t(e), r;
 }
 function yt(e, r, t) {
   const n = (o) => {
     for (const [i, s] of o.children.entries())
-      if (b(s)) {
+      if (g(s)) {
         if (Ie(s) === r)
           return o.children[i] = t, !0;
         if (n(s)) return !0;
@@ -632,33 +632,33 @@ function Tt(e, r) {
   const n = A(e, t);
   if (!n) return;
   const o = n.filter(
-    (h) => h.name !== "pretext" && h.name !== "mathbook"
+    (m) => m.name !== "pretext" && m.name !== "mathbook"
   ), i = o[0], s = i?.name === "book" && i.children.some(
-    (h) => b(h) && h.name === "part"
+    (m) => g(m) && m.name === "part"
   ), a = vt(o, s), l = new Set(n), c = xt(t), f = /* @__PURE__ */ new Set();
   if (c.size > 0)
-    for (const h of c) {
-      const m = X(e, h);
-      if (!m || m === t) continue;
-      const R = A(e, m);
+    for (const m of c) {
+      const h = X(e, m);
+      if (!h || h === t) continue;
+      const R = A(e, h);
       if (!R) continue;
-      const g = [...R].reverse().find((w) => ke.has(w.name));
-      if (g && g !== t) {
-        f.add(g);
-        for (const w of A(e, g) ?? [])
-          l.add(w);
+      const v = [...R].reverse().find((b) => ke.has(b.name));
+      if (v && v !== t) {
+        f.add(v);
+        for (const b of A(e, v) ?? [])
+          l.add(b);
       }
     }
-  for (const h of n) {
-    if (h === t) break;
-    U(h, l);
+  for (const m of n) {
+    if (m === t) break;
+    U(m, l);
   }
-  for (const h of f)
-    Pe(h);
-  const p = e.children.find(b);
+  for (const m of f)
+    Pe(m);
+  const p = e.children.find(g);
   return p && !n.includes(p) && U(p, l), { content: I(e), divisionId: r, level: a };
 }
-const Et = "This live preview shows a single division, so links into the rest of the document do not work here.", St = /<a\b([^>]*)>/g, kt = /\sid="([^"]*)"/g, _ = /\shref="([^"]*)"/, $t = /\\href\{([^{}]*)\}/g, oe = /\stitle="([^"]*)"/;
+const Et = "This live preview shows a single division, so links into the rest of the document do not work here.", St = /<a\b([^>]*)>/g, kt = /\sid="([^"]*)"/g, j = /\shref="([^"]*)"/, $t = /\\href\{([^{}]*)\}/g, oe = /\stitle="([^"]*)"/;
 function It(e) {
   const r = /* @__PURE__ */ new Set();
   for (const t of e.matchAll(kt))
@@ -680,14 +680,14 @@ function ie(e, r) {
 function Rt(e, r = {}) {
   const t = r.offPageMessage ?? Et, n = It(e);
   return e.replace(St, (i, s) => {
-    const a = _.exec(s);
+    const a = j.exec(s);
     if (!a) return i;
     const l = ie(a[1], n);
     if (l.kind === "keep") return i;
     if (l.kind === "same-page")
-      return `<a${s.replace(_, ` href="#${l.id}"`)}>`;
+      return `<a${s.replace(j, ` href="#${l.id}"`)}>`;
     const c = oe.exec(s), f = Pt(t), p = c ? `${c[1]} — ${f}` : f;
-    return `<a${s.replace(_, "").replace(oe, "")} title="${p}" aria-disabled="true" style="cursor:default">`;
+    return `<a${s.replace(j, "").replace(oe, "")} title="${p}" aria-disabled="true" style="cursor:default">`;
   }).replace($t, (i, s) => {
     const a = ie(s, n);
     return a.kind === "same-page" ? `\\href{#${a.id}}` : i;
@@ -714,7 +714,7 @@ function Mt(e) {
     (r, t) => `from '${t}'`
   );
 }
-const jt = `https://cdn.jsdelivr.net/gh/PreTeXtBook/html-static@${pe}/dist/`, _t = {
+const _t = `https://cdn.jsdelivr.net/gh/PreTeXtBook/html-static@${pe}/dist/`, jt = {
   "cli.version": pe,
   // Colon-delimited: pretext-runestone.xsl splits them with str:tokenize.
   "rs-js": Je.join(":"),
@@ -724,7 +724,7 @@ const jt = `https://cdn.jsdelivr.net/gh/PreTeXtBook/html-static@${pe}/dist/`, _t
 function Bt(e) {
   return e.replace(
     /(<link\b[^>]*\bhref=["'])_static\//gi,
-    `$1${jt}_static/`
+    `$1${_t}_static/`
   );
 }
 function Ot(e) {
@@ -739,7 +739,7 @@ async function se(e) {
   return r;
 }
 async function Ct(e, r) {
-  const t = d.resolve(e), n = await M(t);
+  const t = u.resolve(e), n = await M(t);
   if (n !== void 0)
     return pt(n, t, r);
 }
@@ -754,23 +754,23 @@ ${o}
 </pretext>
 `;
 }
-async function Nt(e, r, t) {
-  const n = E(e).children.find(
-    (c) => c.type === "element"
-  ), o = n?.attributes["xml:id"];
-  if (!n || !o) return;
-  const i = d.resolve(r), s = await M(i);
-  if (s === void 0) return;
-  let a;
+async function Nt(e, r, t, n) {
+  const o = E(e).children.find(
+    (f) => f.type === "element"
+  ), i = o?.attributes["xml:id"];
+  if (!o || !i) return;
+  const s = u.resolve(r), a = n ?? await M(s);
+  if (a === void 0) return;
+  let l;
   try {
-    a = (await J(s, i, t)).tree;
+    l = (await J(a, s, t)).tree;
   } catch {
     return;
   }
-  if (!yt(a, o, n)) return;
-  const l = Tt(a, o);
-  if (l)
-    return { ...l, tree: a };
+  if (!yt(l, i, o)) return;
+  const c = Tt(l, i);
+  if (c)
+    return { ...c, tree: l };
 }
 let Re = !1;
 function Xt(e) {
@@ -838,111 +838,112 @@ function zt(e) {
 }
 async function le(e) {
   Lt(), Wt();
-  const { XmlDocument: r } = await De(), t = d.resolve(e.sourcePath), n = d.resolve(
-    e.projectDir ?? d.dirname(t)
-  ), o = e.sourceContent ?? await se(t), i = d.relative(n, t);
+  const { XmlDocument: r } = await De(), t = u.resolve(e.sourcePath), n = u.resolve(
+    e.projectDir ?? u.dirname(t)
+  ), o = e.sourceContent ?? await se(t), i = u.relative(n, t);
   if (i.startsWith(".."))
     throw new Error(
       `sourcePath (${t}) must live inside projectDir (${n})`
     );
-  const s = d.relative(
+  const s = u.relative(
     n,
-    d.resolve(e.mainSourcePath ?? t)
+    u.resolve(e.mainSourcePath ?? t)
   ), a = s.startsWith("..") ? i : s, l = be(n);
   try {
     let c, f = `${l}/__pretext-preview-publication.xml`;
     if (e.publicationPath) {
-      const u = d.resolve(e.publicationPath);
-      c = await se(u);
-      const v = d.relative(n, u);
-      v.startsWith("..") || (f = `${l}/${v.split(d.sep).join("/")}`);
+      const d = u.resolve(e.publicationPath);
+      c = await se(d);
+      const w = u.relative(n, d);
+      w.startsWith("..") || (f = `${l}/${w.split(u.sep).join("/")}`);
     }
-    let p, h;
+    let p, m;
     if (e.sourceMap) {
-      const u = await J(
+      const d = await J(
         o,
         t,
         n
       );
-      p = u.tree, h = u.content;
+      p = d.tree, m = d.content;
     } else
-      h = await ut(
+      m = await ut(
         o,
         t,
         n
       );
-    const m = e.target ?? bt(h), R = await Jt(e.xslDir ?? Dt(), m), g = ct(c, {
+    const h = e.target ?? bt(m), R = await Jt(e.xslDir ?? Dt(), h), v = ct(c, {
       cssTheme: e.cssTheme,
       revealTheme: e.revealTheme,
-      target: m
+      target: h
     });
-    rt(f, g);
-    const w = lt(g), z = d.dirname(d.resolve(n, a)), K = w.external !== void 0 && w.generated !== void 0 ? {
-      external: d.resolve(z, w.external),
-      generated: d.resolve(z, w.generated)
-    } : void 0, D = Ot(h);
+    rt(f, v);
+    const b = lt(v), z = u.dirname(u.resolve(n, a)), K = b.external !== void 0 && b.generated !== void 0 ? {
+      external: u.resolve(z, b.external),
+      generated: u.resolve(z, b.generated)
+    } : void 0, D = Ot(m);
     let V = { parentId: "root", position: 1 }, S, G = t;
     if (D !== "pretext" && D !== "mathbook") {
       if (!e.fragment)
         throw new Error(
           `The document root is <${D ?? "?"}>, not <pretext> — this looks like an xi:included fragment. Render the project's main source file instead, or pass the fragment option.`
         );
-      if (e.contextSourcePath) {
-        const u = await Nt(
-          h,
-          e.contextSourcePath,
-          n
+      if (e.contextSourcePath || e.contextSourceContent) {
+        const d = e.contextSourcePath ?? u.join(u.dirname(t), "__pretext-preview-context.ptx"), w = await Nt(
+          m,
+          d,
+          n,
+          e.contextSourceContent
         );
-        u && (h = u.content, p = e.sourceMap ? u.tree : void 0, G = d.resolve(e.contextSourcePath), S = { divisionId: u.divisionId, level: u.level });
+        w && (m = w.content, p = e.sourceMap ? w.tree : void 0, G = u.resolve(d), S = { divisionId: w.divisionId, level: w.level });
       }
       if (!S) {
-        const u = e.docinfo ?? (e.docinfoSourcePath ? await Ct(e.docinfoSourcePath, n) : void 0);
-        h = Ft(
-          h,
-          D,
+        const d = e.docinfo ?? (e.docinfoSourcePath ? await Ct(e.docinfoSourcePath, n) : void 0);
+        m = Ft(
           m,
-          u
-        ), V = { parentId: u?.trim() ? "root-1-2" : "root-1-1", position: 2 };
+          D,
+          h,
+          d
+        ), V = { parentId: d?.trim() ? "root-1-2" : "root-1-1", position: 2 };
       }
     }
-    const Y = p ? wt(p, G, V) : void 0, q = await r.fromString(h, {
-      url: `${l}/${a.split(d.sep).join("/")}`,
+    const Y = p ? wt(p, G, V) : void 0, q = await r.fromString(m, {
+      url: `${l}/${a.split(u.sep).join("/")}`,
       options: { noEnt: !0, dtdLoad: !0, huge: !0 }
     }), k = {
       publisher: $(f)
     };
-    for (const [u, v] of Object.entries(_t))
-      k[u] = $(v);
+    for (const [d, w] of Object.entries(jt))
+      k[d] = $(w);
     S && (k.subtree = $(S.divisionId), k["subtree-level"] = $(String(S.level)));
-    for (const [u, v] of Object.entries(e.stringParams ?? {}))
-      k[u] = $(v);
-    let j;
+    for (const [d, w] of Object.entries(e.stringParams ?? {}))
+      k[d] = $(w);
+    let _;
     try {
-      j = await R.apply(q, k);
-    } catch (u) {
-      throw ae(u), new Error(
+      _ = await R.apply(q, k);
+    } catch (d) {
+      throw ae(d), new Error(
         "PreTeXt XSLT transform failed; see the PTX:ERROR/PTX:FATAL messages on stderr for details.",
-        { cause: u }
+        { cause: d }
       );
     } finally {
       q.delete();
     }
     try {
-      let u = Mt(j.toHtmlString());
-      return u = Rt(u, {
+      let d = Mt(_.toHtmlString());
+      return d = Rt(d, {
         ...e.offPageMessage !== void 0 ? { offPageMessage: e.offPageMessage } : {}
-      }), (e.openKnowls ?? !0) && (u = qe(u)), m === "slides" ? (u = Bt(u), u = Le(u, e.revealView ?? "scroll", {
+      }), (e.openKnowls ?? !0) && (d = qe(d)), h === "slides" ? (d = Bt(d), d = Le(d, e.revealView ?? "scroll", {
         zoom: e.revealZoom
-      })) : e.theme && (u = Me(u, e.theme)), e.previewBanner && (u = Ue(u, e.previewBanner)), {
-        html: u,
-        target: m,
+      })) : e.theme && (d = Me(d, e.theme)), e.previewBanner && (d = Ue(d, e.previewBanner)), {
+        html: d,
+        target: h,
         ...Y ? { sourceMap: Y } : {},
         ...K ? { assetDirs: K } : {}
       };
-    } catch (u) {
-      throw ae(u), u;
+    } catch (d) {
+      throw ae(d), d;
     } finally {
-      j.delete();
+      _.delete();
     }
   } finally {
     nt(l);
@@ -1076,7 +1077,7 @@ async function rn(e) {
 }
 export {
   Et as O,
-  je as P,
+  _e as P,
   bt as a,
   Tt as b,
   vt as c,

package/dist/cli.js

@@ -1,6 +1,6 @@
 import "node:fs/promises";
 import "node:process";
-import { m as p, l as s } from "./cli-BUrNZxov.js";
+import { m as p, l as s } from "./cli-BONFCRgl.js";
 export {
   p as main,
   s as parseArgs

package/dist/index.browser.d.ts

@@ -14,6 +14,10 @@
  *    only as a virtual base for URL and xi:include resolution.
  *  - **`xi:include`s are not resolved from disk.** Pre-merge them, or pass the
  *    already-merged document as `sourceContent`.
+ *  - **Use `contextSourceContent`, not `contextSourcePath`**, to place a
+ *    fragment in its document for correct numbering and resolved `<xref>`s
+ *    (see `RenderOptions.contextSourceContent`) — `contextSourcePath` alone
+ *    is unreadable for the same reason `sourcePath` alone is.
  *  - **Assets come from jsDelivr by default**, version-pinned to this package.
  *    Call `setAssetsBase()` before the first render to self-host.
  */