@wizzlethorpe/vaults 0.7.0 → 0.7.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +8 -7
- package/dist/build.js +450 -123
- package/dist/build.js.map +1 -1
- package/dist/commands/build.js +2 -1
- package/dist/commands/build.js.map +1 -1
- package/dist/commands/password.js +1 -1
- package/dist/commands/password.js.map +1 -1
- package/dist/commands/patreon.js +24 -20
- package/dist/commands/patreon.js.map +1 -1
- package/dist/commands/preview.js +5 -4
- package/dist/commands/preview.js.map +1 -1
- package/dist/commands/push.js +7 -8
- package/dist/commands/push.js.map +1 -1
- package/dist/config.js +21 -10
- package/dist/config.js.map +1 -1
- package/dist/escape.js +29 -0
- package/dist/escape.js.map +1 -0
- package/dist/favicon.js +3 -36
- package/dist/favicon.js.map +1 -1
- package/dist/foundry-importer.js +61 -0
- package/dist/foundry-importer.js.map +1 -0
- package/dist/images.js +0 -30
- package/dist/images.js.map +1 -1
- package/dist/index.js +3 -2
- package/dist/index.js.map +1 -1
- package/dist/migrate/0.6-legacy-auth-settings.js +3 -5
- package/dist/migrate/0.6-legacy-auth-settings.js.map +1 -1
- package/dist/migrate/0.7-vaults-dir.js +4 -0
- package/dist/migrate/0.7-vaults-dir.js.map +1 -1
- package/dist/migrate/registry.js +1 -7
- package/dist/migrate/registry.js.map +1 -1
- package/dist/paths.js +21 -6
- package/dist/paths.js.map +1 -1
- package/dist/render/auth-template.js +21 -142
- package/dist/render/auth-template.js.map +1 -1
- package/dist/render/bases.js +56 -44
- package/dist/render/bases.js.map +1 -1
- package/dist/render/callouts.js +29 -10
- package/dist/render/callouts.js.map +1 -1
- package/dist/render/embed.js +124 -26
- package/dist/render/embed.js.map +1 -1
- package/dist/render/extensions.js +68 -0
- package/dist/render/extensions.js.map +1 -0
- package/dist/render/external-links.js +32 -0
- package/dist/render/external-links.js.map +1 -0
- package/dist/render/frontmatter.js +17 -0
- package/dist/render/frontmatter.js.map +1 -0
- package/dist/render/handlers/assets.js +48 -15
- package/dist/render/handlers/assets.js.map +1 -1
- package/dist/render/handlers/builtin/battlemap.js +199 -0
- package/dist/render/handlers/builtin/battlemap.js.map +1 -0
- package/dist/render/handlers/builtin/dice.js +1 -1
- package/dist/render/handlers/builtin/dice.js.map +1 -1
- package/dist/render/handlers/builtin/fm-code.js +50 -0
- package/dist/render/handlers/builtin/fm-code.js.map +1 -0
- package/dist/render/handlers/builtin/fm.js +6 -12
- package/dist/render/handlers/builtin/fm.js.map +1 -1
- package/dist/render/handlers/builtin/gallery.js +103 -0
- package/dist/render/handlers/builtin/gallery.js.map +1 -0
- package/dist/render/handlers/builtin/index.js +6 -1
- package/dist/render/handlers/builtin/index.js.map +1 -1
- package/dist/render/handlers/builtin/inline-format.js +26 -0
- package/dist/render/handlers/builtin/inline-format.js.map +1 -0
- package/dist/render/handlers/builtin/statblock.js +158 -18
- package/dist/render/handlers/builtin/statblock.js.map +1 -1
- package/dist/render/handlers/dispatch.js +15 -20
- package/dist/render/handlers/dispatch.js.map +1 -1
- package/dist/render/handlers/types.js +41 -21
- package/dist/render/handlers/types.js.map +1 -1
- package/dist/render/image-srcs.js +42 -0
- package/dist/render/image-srcs.js.map +1 -0
- package/dist/render/layout.js +60 -9
- package/dist/render/layout.js.map +1 -1
- package/dist/render/pipeline.js +23 -10
- package/dist/render/pipeline.js.map +1 -1
- package/dist/render/preview.js +53 -18
- package/dist/render/preview.js.map +1 -1
- package/dist/render/slug.js +5 -0
- package/dist/render/slug.js.map +1 -1
- package/dist/render/styles.js +92 -14
- package/dist/render/styles.js.map +1 -1
- package/dist/render/wikilink.js +15 -4
- package/dist/render/wikilink.js.map +1 -1
- package/dist/scan.js +1 -1
- package/dist/scan.js.map +1 -1
- package/dist/settings.js +16 -1
- package/dist/settings.js.map +1 -1
- package/dist/version.js +36 -0
- package/dist/version.js.map +1 -0
- package/package.json +2 -1
package/dist/render/layout.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { htmlEscape as esc, htmlAttr as attr } from "../escape.js";
|
|
1
2
|
/**
|
|
2
3
|
* Standalone 404 page using the same shell as a regular article (sidebar,
|
|
3
4
|
* search, sitemap), so a missing page still leaves the reader inside the
|
|
@@ -19,7 +20,7 @@ export function renderLayout(input) {
|
|
|
19
20
|
const breadcrumbs = renderBreadcrumbs(input.pagePath, input.vaultName);
|
|
20
21
|
const sitemap = renderSitemap(input.pages, input.pagePath);
|
|
21
22
|
return `<!doctype html>
|
|
22
|
-
<html lang="en">
|
|
23
|
+
<html lang="en" data-theme="${attr(input.theme)}">
|
|
23
24
|
<head>
|
|
24
25
|
<meta charset="utf-8">
|
|
25
26
|
<meta name="viewport" content="width=device-width,initial-scale=1">
|
|
@@ -29,6 +30,7 @@ export function renderLayout(input) {
|
|
|
29
30
|
<link rel="stylesheet" href="/user.css">
|
|
30
31
|
${input.hasHandlerCss ? `<link rel="stylesheet" href="/_handlers.css">` : ""}${input.hasHandlerJs ? `\n<script src="/_handlers.js" defer></script>` : ""}
|
|
31
32
|
${renderSocialMeta(input)}
|
|
33
|
+
${THEME_BOOT_SCRIPT}
|
|
32
34
|
</head>
|
|
33
35
|
<body${input.centerImages ? ` class="center-images"` : ""}${input.defaultImageWidth ? ` style="--default-img-width: ${attr(input.defaultImageWidth)}"` : ""}>
|
|
34
36
|
<div class="app-grid">
|
|
@@ -38,7 +40,12 @@ ${renderSocialMeta(input)}
|
|
|
38
40
|
<input id="vault-search" type="search" placeholder="Search…" aria-label="Search vault" autocomplete="off">
|
|
39
41
|
<div class="search-results" role="listbox"></div>
|
|
40
42
|
</div>
|
|
41
|
-
|
|
43
|
+
<div class="sidebar-row">
|
|
44
|
+
<button id="theme-toggle" type="button" class="theme-toggle" aria-label="Toggle dark mode" title="Toggle dark mode">
|
|
45
|
+
<span class="theme-toggle-icon" aria-hidden="true"></span>
|
|
46
|
+
</button>
|
|
47
|
+
${input.authConfigured ? '<div class="auth-box" id="vault-auth"></div>' : ''}
|
|
48
|
+
</div>
|
|
42
49
|
${sitemap}
|
|
43
50
|
</aside>
|
|
44
51
|
<main>
|
|
@@ -64,6 +71,7 @@ ${TOC_SCRIPT}
|
|
|
64
71
|
${SEARCH_SCRIPT}
|
|
65
72
|
${LIGHTBOX_SCRIPT}
|
|
66
73
|
${AUTH_SCRIPT}
|
|
74
|
+
${THEME_TOGGLE_SCRIPT}
|
|
67
75
|
${BASES_SCRIPT}
|
|
68
76
|
${FRONTMATTER_SCRIPT}
|
|
69
77
|
</body>
|
|
@@ -241,12 +249,6 @@ function sitemapItem(p, currentPath) {
|
|
|
241
249
|
const cur = p.path === currentPath ? ' aria-current="page"' : "";
|
|
242
250
|
return `<li><a href="${attr(href)}"${cur} class="internal internal-link">${esc(p.title)}</a></li>`;
|
|
243
251
|
}
|
|
244
|
-
function esc(s) {
|
|
245
|
-
return s.replace(/&/g, "&").replace(/</g, "<").replace(/>/g, ">");
|
|
246
|
-
}
|
|
247
|
-
function attr(s) {
|
|
248
|
-
return s.replace(/&/g, "&").replace(/"/g, """);
|
|
249
|
-
}
|
|
250
252
|
// Opens the Explorer <details> on desktop so its [open] state matches the
|
|
251
253
|
// CSS-forced visibility. On mobile we leave it closed so the user has a
|
|
252
254
|
// collapsed sitemap by default.
|
|
@@ -375,7 +377,7 @@ const AUTH_SCRIPT = `<script>
|
|
|
375
377
|
box.classList.remove('auth-signed-out');
|
|
376
378
|
box.classList.add('auth-signed-in');
|
|
377
379
|
box.innerHTML =
|
|
378
|
-
'<div class="auth-status"
|
|
380
|
+
'<div class="auth-status"><strong>' + esc(role) + '</strong></div>' +
|
|
379
381
|
'<a class="auth-action" href="/logout?next=' + next + '">Sign out</a>';
|
|
380
382
|
} else {
|
|
381
383
|
box.classList.remove('auth-signed-in');
|
|
@@ -392,6 +394,55 @@ const AUTH_SCRIPT = `<script>
|
|
|
392
394
|
function esc(s) { return String(s).replace(/[<>&]/g, c => ({'<':'<','>':'>','&':'&'}[c])); }
|
|
393
395
|
})();
|
|
394
396
|
</script>`;
|
|
397
|
+
// Boot script: runs in <head> before any paint so the visitor's stored theme
|
|
398
|
+
// preference (or the OS preference for "auto") wins immediately, no
|
|
399
|
+
// flash-of-wrong-theme. Reads localStorage.vaultTheme; falls back to the
|
|
400
|
+
// data-theme value the server emitted on <html>. Sets an effective-theme
|
|
401
|
+
// data attribute the toggle uses to flip the icon without re-deriving.
|
|
402
|
+
const THEME_BOOT_SCRIPT = `<script>
|
|
403
|
+
(function () {
|
|
404
|
+
try {
|
|
405
|
+
const html = document.documentElement;
|
|
406
|
+
const stored = localStorage.getItem('vaultTheme');
|
|
407
|
+
if (stored === 'light' || stored === 'dark' || stored === 'auto') html.setAttribute('data-theme', stored);
|
|
408
|
+
} catch (e) { /* localStorage may be blocked; the SSR data-theme stays in effect */ }
|
|
409
|
+
})();
|
|
410
|
+
</script>`;
|
|
411
|
+
// Click handler: cycles through light → dark → auto, persisting to
|
|
412
|
+
// localStorage. The button icon swaps based on the effective theme so the
|
|
413
|
+
// affordance always shows what's currently active. Listens for OS-pref
|
|
414
|
+
// changes too so the icon updates live when the visitor flips their
|
|
415
|
+
// system theme while on the page.
|
|
416
|
+
const THEME_TOGGLE_SCRIPT = `<script>
|
|
417
|
+
(function () {
|
|
418
|
+
const btn = document.getElementById('theme-toggle');
|
|
419
|
+
if (!btn) return;
|
|
420
|
+
const html = document.documentElement;
|
|
421
|
+
const mql = window.matchMedia('(prefers-color-scheme: dark)');
|
|
422
|
+
const SUN = '<svg viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="4"/><path d="M12 2v2M12 20v2M4.93 4.93l1.41 1.41M17.66 17.66l1.41 1.41M2 12h2M20 12h2M4.93 19.07l1.41-1.41M17.66 6.34l1.41-1.41"/></svg>';
|
|
423
|
+
const MOON = '<svg viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 12.79A9 9 0 1 1 11.21 3 7 7 0 0 0 21 12.79z"/></svg>';
|
|
424
|
+
const icon = btn.querySelector('.theme-toggle-icon');
|
|
425
|
+
function effective() {
|
|
426
|
+
const t = html.getAttribute('data-theme') || 'auto';
|
|
427
|
+
if (t === 'light' || t === 'dark') return t;
|
|
428
|
+
return mql.matches ? 'dark' : 'light';
|
|
429
|
+
}
|
|
430
|
+
function paint() {
|
|
431
|
+
const eff = effective();
|
|
432
|
+
if (icon) icon.innerHTML = eff === 'dark' ? SUN : MOON;
|
|
433
|
+
btn.setAttribute('aria-pressed', eff === 'dark' ? 'true' : 'false');
|
|
434
|
+
btn.title = eff === 'dark' ? 'Switch to light mode' : 'Switch to dark mode';
|
|
435
|
+
}
|
|
436
|
+
paint();
|
|
437
|
+
mql.addEventListener('change', paint);
|
|
438
|
+
btn.addEventListener('click', function () {
|
|
439
|
+
const next = effective() === 'dark' ? 'light' : 'dark';
|
|
440
|
+
html.setAttribute('data-theme', next);
|
|
441
|
+
try { localStorage.setItem('vaultTheme', next); } catch (e) { /* blocked storage */ }
|
|
442
|
+
paint();
|
|
443
|
+
});
|
|
444
|
+
})();
|
|
445
|
+
</script>`;
|
|
395
446
|
const LIGHTBOX_SCRIPT = `<script>
|
|
396
447
|
(function () {
|
|
397
448
|
let onKey = null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"layout.js","sourceRoot":"","sources":["../../src/render/layout.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"layout.js","sourceRoot":"","sources":["../../src/render/layout.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,IAAI,GAAG,EAAE,QAAQ,IAAI,IAAI,EAAE,MAAM,cAAc,CAAC;AAoCnE;;;;GAIG;AACH,MAAM,UAAU,SAAS,CAAC,KAAyE;IACjG,MAAM,IAAI,GAAG;4CAC6B,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,iBAAiB,CAAC;IAChF,OAAO,YAAY,CAAC;QAClB,GAAG,KAAK;QACR,KAAK,EAAE,gBAAgB;QACvB,sEAAsE;QACtE,QAAQ,EAAE,YAAY;QACtB,QAAQ,EAAE,IAAI;QACd,SAAS,EAAE,EAAE;KACd,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,KAAkB;IAC7C,MAAM,WAAW,GAAG,iBAAiB,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IACvE,MAAM,OAAO,GAAG,aAAa,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IAE3D,OAAO;8BACqB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;;;;SAItC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC;;;;EAIjD,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,+CAA+C,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,+CAA+C,CAAC,CAAC,CAAC,EAAE;EACtJ,gBAAgB,CAAC,KAAK,CAAC;EACvB,iBAAiB;;OAEZ,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,gCAAgC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;;;gCAG3H,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC;;;;;;;;;QAS5C,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,8CAA8C,CAAC,CAAC,CAAC,EAAE;;MAE5E,OAAO;;;;QAIL,gBAAgB,CAAC,WAAW,EAAE,KAAK,CAAC,eAAe,CAAC;QACpD,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QACvD,KAAK,CAAC,QAAQ;QACd,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC;;MAE1C,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,+BAA+B,KAAK,CAAC,UAAU,WAAW,CAAC,CAAC,CAAC,EAAE;;;;;;;MAOlF,eAAe,CAAC,KAAK,CAAC,SAAS,CAAC;;;EAGpC,oBAAoB;EACpB,oBAAoB;EACpB,UAAU;EACV,aAAa;EACb,eAAe;EACf,WAAW;EACX,mBAAmB;EACnB,YAAY;EACZ,kBAAkB;;QAEZ,CAAC;AACT,CAAC;AAED,SAAS,eAAe,CAAC,SAAqB;IAC5C,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IACtC,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QAChC,MAAM,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7F,OAAO,gBAAgB,IAAI,CAAC,IAAI,CAAC,oCAAoC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC;IAC/F,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACZ,OAAO,oDAAoD,KAAK,iBAAiB,CAAC;AACpF,CAAC;AAED;;;;;;GAMG;AACH,SAAS,gBAAgB,CACvB,eAAuB,EACvB,eAAmC;IAEnC,MAAM,WAAW,GAAG,2BAA2B,CAAC,eAAe,CAAC,CAAC;IACjE,IAAI,CAAC,eAAe,IAAI,CAAC,WAAW;QAAE,OAAO,EAAE,CAAC;IAChD,MAAM,UAAU,GAAG,WAAW;QAC5B,CAAC,CAAC,kCAAkC,WAAW,QAAQ;QACvD,CAAC,CAAC,EAAE,CAAC;IACP,OAAO,4BAA4B,eAAe,GAAG,UAAU,QAAQ,CAAC;AAC1E,CAAC;AAED;;;;;;;;;GASG;AACH,SAAS,2BAA2B,CAAC,IAAwB;IAC3D,IAAI,CAAC,IAAI;QAAE,OAAO,EAAE,CAAC;IACrB,OAAO;;;;;;;;;;;;;;;4CAemC,GAAG,CAAC,IAAI,CAAC;cACvC,CAAC;AACf,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAkB;IAC1C,MAAM,IAAI,GAAa,EAAE,CAAC;IAC1B,MAAM,SAAS,GAAG,GAAG,KAAK,CAAC,KAAK,MAAM,KAAK,CAAC,SAAS,EAAE,CAAC;IACxD,IAAI,CAAC,IAAI,CAAC,sCAAsC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACrE,IAAI,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;IACzD,IAAI,CAAC,IAAI,CAAC,0CAA0C,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC/E,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;QACrB,IAAI,CAAC,IAAI,CAAC,sCAAsC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC5E,IAAI,CAAC,IAAI,CAAC,0DAA0D,CAAC,CAAC;QACtE,IAAI,CAAC,IAAI,CAAC,uCAAuC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAC/E,CAAC;SAAM,CAAC;QACN,IAAI,CAAC,IAAI,CAAC,8CAA8C,CAAC,CAAC;IAC5D,CAAC;IACD,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC;AAED,SAAS,UAAU,CAAC,KAAyB,EAAE,SAA6B;IAC1E,IAAI,CAAC,KAAK,IAAI,CAAC,SAAS;QAAE,OAAO,EAAE,CAAC;IACpC,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,SAAS,IAAI,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;QAC9D,6EAA6E;QAC7E,KAAK,CAAC,IAAI,CAAC,iCAAiC,OAAO,CAAC,SAAS,CAAC,KAAK,UAAU,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;IAC5G,CAAC;IACD,IAAI,KAAK;QAAE,KAAK,CAAC,IAAI,CAAC,iCAAiC,OAAO,CAAC,KAAK,CAAC,KAAK,UAAU,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAC7G,OAAO,0BAA0B,KAAK,CAAC,IAAI,CAAC,mCAAmC,CAAC,QAAQ,CAAC;AAC3F,CAAC;AAED,SAAS,OAAO,CAAC,IAAY;IAC3B,OAAO,IAAI,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;AAC7C,CAAC;AAED,SAAS,UAAU,CAAC,IAAY;IAC9B,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC;IAChC,OAAO,CAAC,CAAC,kBAAkB,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC;AAC5F,CAAC;AAED,SAAS,iBAAiB,CAAC,QAAgB,EAAE,SAAiB;IAC5D,+DAA+D;IAC/D,IAAI,QAAQ,KAAK,YAAY;QAAE,OAAO,EAAE,CAAC;IACzC,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACxD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,OAAO;QAAE,OAAO,EAAE,CAAC;IAC1D,2EAA2E;IAC3E,iEAAiE;IACjE,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,OAAO;QAAE,KAAK,CAAC,GAAG,EAAE,CAAC;IACzE,MAAM,MAAM,GAAG,CAAC,eAAe,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IACrD,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;QACxB,MAAM,MAAM,GAAG,CAAC,KAAK,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;QACtC,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3C,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,GAAG,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC3E,MAAM,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,uBAAuB,MAAM,CAAC,IAAI,CAAC,oCAAoC,CAAC,QAAQ,CAAC;AAC1F,CAAC;AAQD,SAAS,aAAa,CAAC,KAAiB,EAAE,WAAmB;IAC3D,MAAM,IAAI,GAAe,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,GAAG,EAAE,EAAE,CAAC;IACxE,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;QACtB,uEAAuE;QACvE,4EAA4E;QAC5E,IAAI,CAAC,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;YAAE,SAAS;QACpE,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAChC,IAAI,IAAI,GAAG,IAAI,CAAC;QAChB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC1C,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAE,CAAC;YACzB,IAAI,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACxC,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,KAAK,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,GAAG,EAAE,EAAE,CAAC;gBAC3D,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YACrC,CAAC;YACD,IAAI,GAAG,KAAK,CAAC;QACf,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACrB,CAAC;IAED,sEAAsE;IACtE,kEAAkE;IAClE,iEAAiE;IACjE,OAAO,0GAA0G,UAAU,CAAC,IAAI,EAAE,EAAE,EAAE,WAAW,CAAC,uBAAuB,CAAC;AAC5K,CAAC;AAED,SAAS,UAAU,CAAC,IAAgB,EAAE,UAAkB,EAAE,WAAmB;IAC3E,IAAI,IAAI,GAAG,EAAE,CAAC;IACd,0EAA0E;IAC1E,6EAA6E;IAC7E,KAAK,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACtF,MAAM,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QAC/D,MAAM,IAAI,GAAG,gBAAgB,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/D,MAAM,IAAI,GAAG,GAAG,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;QACjF,IAAI,IAAI,sCAAsC,IAAI,4EAA4E,IAAI,CAAC,IAAI,CAAC,yBAAyB,GAAG,CAAC,IAAI,CAAC,0CAA0C,UAAU,CAAC,GAAG,EAAE,UAAU,EAAE,WAAW,CAAC,sBAAsB,CAAC;IACrR,CAAC;IACD,KAAK,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QAC7E,IAAI,IAAI,WAAW,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;IACtC,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,UAAU,CAAC,CAAS,EAAE,CAAS;IACtC,OAAO,CAAC,CAAC,aAAa,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CAAC;AAC/E,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAgB,EAAE,WAAmB;IAC7D,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC;QAAE,OAAO,IAAI,CAAC;IAChE,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC;QAC3C,IAAI,gBAAgB,CAAC,GAAG,EAAE,WAAW,CAAC;YAAE,OAAO,IAAI,CAAC;IACtD,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,WAAW,CAAC,CAAW,EAAE,WAAmB;IACnD,MAAM,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7F,MAAM,GAAG,GAAG,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,EAAE,CAAC;IACjE,OAAO,gBAAgB,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,mCAAmC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC;AACrG,CAAC;AAED,0EAA0E;AAC1E,wEAAwE;AACxE,gCAAgC;AAChC,MAAM,oBAAoB,GAAG;;;;;;UAMnB,CAAC;AAEX,MAAM,oBAAoB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UA0FnB,CAAC;AAEX,MAAM,UAAU,GAAG;;;;;;;;;;;;;;;;UAgBT,CAAC;AAEX,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;UA0BV,CAAC;AAEX,6EAA6E;AAC7E,oEAAoE;AACpE,yEAAyE;AACzE,yEAAyE;AACzE,uEAAuE;AACvE,MAAM,iBAAiB,GAAG;;;;;;;;UAQhB,CAAC;AAEX,mEAAmE;AACnE,0EAA0E;AAC1E,uEAAuE;AACvE,oEAAoE;AACpE,kCAAkC;AAClC,MAAM,mBAAmB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UA6BlB,CAAC;AAEX,MAAM,eAAe,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;UA0Bd,CAAC;AAEX,MAAM,aAAa,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAiFZ,CAAC;AAEX,MAAM,YAAY,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAiGX,CAAC;AAEX,0EAA0E;AAC1E,wEAAwE;AACxE,2EAA2E;AAC3E,iDAAiD;AACjD,MAAM,kBAAkB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UA8CjB,CAAC"}
|
package/dist/render/pipeline.js
CHANGED
|
@@ -9,26 +9,32 @@ import rehypeStringify from "rehype-stringify";
|
|
|
9
9
|
import matter from "gray-matter";
|
|
10
10
|
import { wikiLinkPlugin } from "./wikilink.js";
|
|
11
11
|
import { embedPlugin } from "./embed.js";
|
|
12
|
+
import { externalLinksPlugin } from "./external-links.js";
|
|
13
|
+
import { imageSrcsPlugin } from "./image-srcs.js";
|
|
12
14
|
import { calloutPlugin } from "./callouts.js";
|
|
13
15
|
import { basesPlugin } from "./bases.js";
|
|
14
16
|
import { handlersPlugin } from "./handlers/dispatch.js";
|
|
15
|
-
import { htmlEscape } from "
|
|
17
|
+
import { htmlEscape } from "../escape.js";
|
|
18
|
+
import { extractH1 } from "./frontmatter.js";
|
|
16
19
|
const sanitizeSchema = {
|
|
17
20
|
...defaultSchema,
|
|
18
21
|
clobberPrefix: "",
|
|
19
22
|
// Bases emit interactive HTML beyond what the default schema allows:
|
|
20
23
|
// <input> (filter), <button> (tab buttons + dialog actions). Add them
|
|
21
24
|
// and the attributes they need to function.
|
|
22
|
-
tagNames: [...(defaultSchema.tagNames ?? []), "input", "button"],
|
|
25
|
+
tagNames: [...(defaultSchema.tagNames ?? []), "input", "button", "audio", "video", "source"],
|
|
23
26
|
attributes: {
|
|
24
27
|
...defaultSchema.attributes,
|
|
25
28
|
// role + aria-selected/haspopup/label ride on tabs, dialogs, etc.
|
|
26
29
|
// `hidden` is essential — Bases tab panels and card-filter rows toggle
|
|
27
30
|
// it from JS to show/hide elements. Without it on the allowlist the
|
|
28
31
|
// initial render shows everything because the sanitizer strips it.
|
|
29
|
-
"*": [...(defaultSchema.attributes?.["*"] ?? []), "className", "role", "ariaSelected", "ariaLabel", "ariaHaspopup", "tabindex", "hidden"],
|
|
32
|
+
"*": [...(defaultSchema.attributes?.["*"] ?? []), "className", "role", "ariaSelected", "ariaPressed", "ariaLabel", "ariaHaspopup", "tabindex", "hidden"],
|
|
30
33
|
img: ["src", "alt", "width", "height", "loading"],
|
|
31
|
-
|
|
34
|
+
audio: ["src", "controls", "preload", "loop", "muted"],
|
|
35
|
+
video: ["src", "controls", "preload", "loop", "muted", "width", "height", "poster"],
|
|
36
|
+
source: ["src", "type"],
|
|
37
|
+
a: ["href", "title", "className", "id", "target", "rel"],
|
|
32
38
|
div: ["className", "data*", "role"],
|
|
33
39
|
span: ["className", "data*"],
|
|
34
40
|
code: ["className", "title"],
|
|
@@ -38,14 +44,20 @@ const sanitizeSchema = {
|
|
|
38
44
|
tr: ["className", "data*"],
|
|
39
45
|
input: ["type", "placeholder", "className", "ariaLabel"],
|
|
40
46
|
button: ["type", "className", "data*", "role", "ariaSelected", "ariaLabel", "ariaHaspopup", "tabindex", "title"],
|
|
47
|
+
// Foldable callouts emit <details open>; the default schema allows
|
|
48
|
+
// `open` on <summary> only.
|
|
49
|
+
details: ["className", "data*", "open"],
|
|
41
50
|
},
|
|
42
51
|
// The default schema forces <input> to type=checkbox and disabled=true
|
|
43
52
|
// to safely render GFM task lists. We don't render task lists here, and
|
|
44
53
|
// the Bases filter input needs to be a writable search box, so reset.
|
|
45
54
|
required: { ...(defaultSchema.required ?? {}), input: {} },
|
|
46
55
|
};
|
|
47
|
-
export async function renderMarkdown(source, context, fallbackTitle) {
|
|
48
|
-
const parsed =
|
|
56
|
+
export async function renderMarkdown(source, context, fallbackTitle, preParsed) {
|
|
57
|
+
const parsed = preParsed ?? (() => {
|
|
58
|
+
const m = matter(source);
|
|
59
|
+
return { data: (m.data ?? {}), content: m.content };
|
|
60
|
+
})();
|
|
49
61
|
const fm = parsed.data;
|
|
50
62
|
const outlinks = [];
|
|
51
63
|
const warnings = [];
|
|
@@ -80,6 +92,11 @@ export async function renderMarkdown(source, context, fallbackTitle) {
|
|
|
80
92
|
// process anything inside the table.
|
|
81
93
|
.use(basesPlugin({ context, warnings }))
|
|
82
94
|
.use(embedPlugin({ context, warnings }))
|
|
95
|
+
// Normalise plain markdown image URLs (``) to the
|
|
96
|
+
// absolute slugified URL the build emits. Sits after embedPlugin (which
|
|
97
|
+
// handles the wikilink form) so both shapes converge on the same output.
|
|
98
|
+
.use(imageSrcsPlugin({ context }))
|
|
99
|
+
.use(externalLinksPlugin())
|
|
83
100
|
.use(wikiLinkPlugin({ context, outlinks, warnings }))
|
|
84
101
|
.use(remarkRehype, { allowDangerousHtml: true })
|
|
85
102
|
.use(rehypeRaw)
|
|
@@ -92,8 +109,4 @@ export async function renderMarkdown(source, context, fallbackTitle) {
|
|
|
92
109
|
|| fallbackTitle;
|
|
93
110
|
return { html: String(file), title, frontmatter: fm, outlinks, warnings };
|
|
94
111
|
}
|
|
95
|
-
function extractH1(markdown) {
|
|
96
|
-
const m = /^#\s+(.+)$/m.exec(markdown);
|
|
97
|
-
return m ? m[1].trim() : null;
|
|
98
|
-
}
|
|
99
112
|
//# sourceMappingURL=pipeline.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipeline.js","sourceRoot":"","sources":["../../src/render/pipeline.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,WAAW,MAAM,cAAc,CAAC;AACvC,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,YAAY,MAAM,eAAe,CAAC;AACzC,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,cAAc,EAAE,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,UAAU,MAAM,aAAa,CAAC;AACrC,OAAO,eAAe,MAAM,kBAAkB,CAAC;AAC/C,OAAO,MAAM,MAAM,aAAa,CAAC;AAEjC,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"pipeline.js","sourceRoot":"","sources":["../../src/render/pipeline.ts"],"names":[],"mappings":"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"}
|
package/dist/render/preview.js
CHANGED
|
@@ -2,24 +2,62 @@ import { unified } from "unified";
|
|
|
2
2
|
import remarkParse from "remark-parse";
|
|
3
3
|
import remarkGfm from "remark-gfm";
|
|
4
4
|
import remarkRehype from "remark-rehype";
|
|
5
|
+
import rehypeRaw from "rehype-raw";
|
|
5
6
|
import rehypeSanitize, { defaultSchema } from "rehype-sanitize";
|
|
6
7
|
import rehypeStringify from "rehype-stringify";
|
|
7
8
|
import { slugify } from "./slug.js";
|
|
9
|
+
import { stripFrontmatter } from "./frontmatter.js";
|
|
10
|
+
import { handlersPlugin } from "./handlers/dispatch.js";
|
|
11
|
+
import { htmlEscape } from "../escape.js";
|
|
8
12
|
const SUMMARY_CHARS = 320;
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
.use(remarkRehype)
|
|
13
|
-
.use(rehypeSanitize, {
|
|
13
|
+
// Span/code className survive sanitisation so handler output like
|
|
14
|
+
// <span class="fm-value">…</span> keeps its styling hook in the popover.
|
|
15
|
+
const previewSanitizeSchema = {
|
|
14
16
|
...defaultSchema,
|
|
15
|
-
// Strip away anything heavy or risky for a tiny popover.
|
|
16
17
|
tagNames: defaultSchema.tagNames?.filter((t) => !["img", "iframe", "video"].includes(t)),
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
18
|
+
attributes: {
|
|
19
|
+
...defaultSchema.attributes,
|
|
20
|
+
"*": [...(defaultSchema.attributes?.["*"] ?? []), "className"],
|
|
21
|
+
code: ["className", "title"],
|
|
22
|
+
},
|
|
23
|
+
};
|
|
24
|
+
// handlersPlugin needs a HandlerContext; an empty no-op plugin keeps the
|
|
25
|
+
// pipeline shape identical when no handler context is supplied so we don't
|
|
26
|
+
// have to fork the chain type.
|
|
27
|
+
const noopRemarkPlugin = () => () => { };
|
|
28
|
+
function buildPipeline(opts) {
|
|
29
|
+
// allowDangerousHtml + rehypeRaw are needed so HTML emitted by handlers
|
|
30
|
+
// (e.g. fm's <span>) survives into the rendered output instead of being
|
|
31
|
+
// dropped as raw nodes at the markdown→hast boundary.
|
|
32
|
+
return unified()
|
|
33
|
+
.use(remarkParse)
|
|
34
|
+
.use(remarkGfm)
|
|
35
|
+
.use(opts ? handlersPlugin({
|
|
36
|
+
registry: opts.registry,
|
|
37
|
+
context: {
|
|
38
|
+
pagePath: opts.pagePath,
|
|
39
|
+
frontmatter: opts.frontmatter,
|
|
40
|
+
render: opts.renderContext,
|
|
41
|
+
escape: htmlEscape,
|
|
42
|
+
},
|
|
43
|
+
}) : noopRemarkPlugin)
|
|
44
|
+
.use(remarkRehype, { allowDangerousHtml: true })
|
|
45
|
+
.use(rehypeRaw)
|
|
46
|
+
.use(rehypeSanitize, previewSanitizeSchema)
|
|
47
|
+
.use(rehypeStringify);
|
|
48
|
+
}
|
|
49
|
+
export async function buildPreview(rawMarkdown, title, opts) {
|
|
50
|
+
// Strip frontmatter, Obsidian %% comments %%, and fenced code blocks
|
|
51
|
+
// before walking the body. Code fences render as a wall of source text
|
|
52
|
+
// in a tiny hover popover, which looks worse than just omitting them —
|
|
53
|
+
// same rationale as the table skip in truncateMarkdown.
|
|
54
|
+
const body = stripFrontmatter(rawMarkdown)
|
|
55
|
+
.replace(/%%[\s\S]*?%%/g, "")
|
|
56
|
+
.replace(/^```[\s\S]*?^```[^\n]*$/gm, "")
|
|
57
|
+
.replace(/^~~~[\s\S]*?^~~~[^\n]*$/gm, "")
|
|
58
|
+
.trim();
|
|
59
|
+
const pipeline = buildPipeline(opts);
|
|
60
|
+
const summary = await renderSnippet(body, pipeline);
|
|
23
61
|
const headings = {};
|
|
24
62
|
// Match headings even when nested inside a callout/blockquote.
|
|
25
63
|
const sectionRe = /^(?:>\s*)?(#{1,6})\s+(.+)$/gm;
|
|
@@ -34,7 +72,7 @@ export async function buildPreview(rawMarkdown, title) {
|
|
|
34
72
|
const anchor = slugify(headingTitle);
|
|
35
73
|
headings[anchor] = {
|
|
36
74
|
title: headingTitle,
|
|
37
|
-
summary: await renderSnippet(sectionBody),
|
|
75
|
+
summary: await renderSnippet(sectionBody, pipeline),
|
|
38
76
|
};
|
|
39
77
|
}
|
|
40
78
|
return { title, summary, headings };
|
|
@@ -43,11 +81,11 @@ export async function buildPreview(rawMarkdown, title) {
|
|
|
43
81
|
* Truncate the markdown to the first ~SUMMARY_CHARS of body content (skipping
|
|
44
82
|
* headings, image embeds, tables) and render it to sanitised HTML.
|
|
45
83
|
*/
|
|
46
|
-
async function renderSnippet(source) {
|
|
84
|
+
async function renderSnippet(source, pipeline) {
|
|
47
85
|
const truncated = truncateMarkdown(source.trim(), SUMMARY_CHARS);
|
|
48
86
|
if (!truncated)
|
|
49
87
|
return "";
|
|
50
|
-
const file = await
|
|
88
|
+
const file = await pipeline.process(truncated);
|
|
51
89
|
return String(file).trim();
|
|
52
90
|
}
|
|
53
91
|
function truncateMarkdown(source, maxChars) {
|
|
@@ -75,7 +113,4 @@ function truncateMarkdown(source, maxChars) {
|
|
|
75
113
|
}
|
|
76
114
|
return out.join("\n\n");
|
|
77
115
|
}
|
|
78
|
-
function stripFrontmatter(s) {
|
|
79
|
-
return s.replace(/^---\r?\n[\s\S]*?\r?\n---\r?\n?/, "");
|
|
80
|
-
}
|
|
81
116
|
//# sourceMappingURL=preview.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preview.js","sourceRoot":"","sources":["../../src/render/preview.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,WAAW,MAAM,cAAc,CAAC;AACvC,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,YAAY,MAAM,eAAe,CAAC;AACzC,OAAO,cAAc,EAAE,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,eAAe,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"preview.js","sourceRoot":"","sources":["../../src/render/preview.ts"],"names":[],"mappings":"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"}
|
package/dist/render/slug.js
CHANGED
|
@@ -9,4 +9,9 @@ export function slugify(name) {
|
|
|
9
9
|
.replace(/[^a-z0-9]+/g, "-")
|
|
10
10
|
.replace(/^-+|-+$/g, "");
|
|
11
11
|
}
|
|
12
|
+
// Historical alias retained for the bases plugin. The "sibling-import
|
|
13
|
+
// avoidance" comment in bases.ts predates the current shape of slug.ts (which
|
|
14
|
+
// has no imports of its own), so a direct re-export is fine — the alias is
|
|
15
|
+
// kept so existing call sites don't churn.
|
|
16
|
+
export { slugify as slugifySimple };
|
|
12
17
|
//# sourceMappingURL=slug.js.map
|
package/dist/render/slug.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slug.js","sourceRoot":"","sources":["../../src/render/slug.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,gFAAgF;AAChF,MAAM,UAAU,OAAO,CAAC,IAAY;IAClC,OAAO,IAAI;SACR,SAAS,CAAC,MAAM,CAAC;SACjB,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;SACrB,WAAW,EAAE;SACb,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;SACrB,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC;SAC3B,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;AAC7B,CAAC"}
|
|
1
|
+
{"version":3,"file":"slug.js","sourceRoot":"","sources":["../../src/render/slug.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,gFAAgF;AAChF,MAAM,UAAU,OAAO,CAAC,IAAY;IAClC,OAAO,IAAI;SACR,SAAS,CAAC,MAAM,CAAC;SACjB,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;SACrB,WAAW,EAAE;SACb,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;SACrB,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC;SAC3B,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;AAC7B,CAAC;AAED,sEAAsE;AACtE,8EAA8E;AAC9E,2EAA2E;AAC3E,2CAA2C;AAC3C,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,CAAC"}
|
package/dist/render/styles.js
CHANGED
|
@@ -1,25 +1,42 @@
|
|
|
1
1
|
// Theme + layout styles for the rendered wiki. Self-contained, no build step.
|
|
2
2
|
// Single light theme: parchment + scarlet.
|
|
3
3
|
/**
|
|
4
|
-
* Per-vault theme overrides. When `accent_color
|
|
5
|
-
* settings.md, append this
|
|
6
|
-
* shades (--accent-soft,
|
|
7
|
-
*
|
|
4
|
+
* Per-vault theme overrides. When any of `accent_color`, `bg_color`,
|
|
5
|
+
* `accent_color_dark`, `bg_color_dark` are set in settings.md, append this
|
|
6
|
+
* block after DEFAULT_CSS so it wins. The derived shades (--accent-soft,
|
|
7
|
+
* --wikilink-bg, --rule, etc) are recomputed via color-mix so they stay
|
|
8
|
+
* coherent with whatever colors the user picked.
|
|
9
|
+
*
|
|
10
|
+
* Dark overrides target both the explicit `[data-theme="dark"]` selector
|
|
11
|
+
* and the auto/prefers-dark form, so a vault setting `bg_color_dark`
|
|
12
|
+
* applies whether the visitor forced dark or arrived via OS preference.
|
|
8
13
|
*/
|
|
9
14
|
export function renderThemeOverride(opts) {
|
|
10
15
|
const blocks = [];
|
|
11
16
|
if (opts.lightAccent)
|
|
12
17
|
blocks.push(accentBlock(":root", opts.lightAccent));
|
|
13
18
|
if (opts.lightBg)
|
|
14
|
-
blocks.push(bgBlock(":root", opts.lightBg));
|
|
19
|
+
blocks.push(bgBlock(":root", opts.lightBg, "light"));
|
|
20
|
+
if (opts.darkAccent) {
|
|
21
|
+
blocks.push(accentBlock(`:root[data-theme="dark"]`, opts.darkAccent));
|
|
22
|
+
blocks.push(`@media (prefers-color-scheme: dark) {\n${accentBlock(` :root[data-theme="auto"]`, opts.darkAccent)}\n}`);
|
|
23
|
+
}
|
|
24
|
+
if (opts.darkBg) {
|
|
25
|
+
blocks.push(bgBlock(`:root[data-theme="dark"]`, opts.darkBg, "dark"));
|
|
26
|
+
blocks.push(`@media (prefers-color-scheme: dark) {\n${bgBlock(` :root[data-theme="auto"]`, opts.darkBg, "dark")}\n}`);
|
|
27
|
+
}
|
|
15
28
|
if (!blocks.length)
|
|
16
29
|
return "";
|
|
17
30
|
return "\n\n/* User theme overrides (settings.md) */\n" + blocks.join("\n");
|
|
18
31
|
}
|
|
19
|
-
|
|
32
|
+
/** `--rule` is a slightly off-bg shade for hairlines + borders. In light
|
|
33
|
+
* mode that means "darker than bg"; in dark mode the relationship inverts
|
|
34
|
+
* to "lighter than bg" or the rule disappears against the background. */
|
|
35
|
+
function bgBlock(selector, color, mode) {
|
|
36
|
+
const tint = mode === "light" ? "#000" : "#fff";
|
|
20
37
|
return `${selector} {
|
|
21
38
|
--bg: ${color};
|
|
22
|
-
--rule: color-mix(in srgb, ${color} 85%,
|
|
39
|
+
--rule: color-mix(in srgb, ${color} 85%, ${tint});
|
|
23
40
|
}`;
|
|
24
41
|
}
|
|
25
42
|
function accentBlock(selector, color) {
|
|
@@ -38,6 +55,24 @@ export const DEFAULT_CSS = `:root {
|
|
|
38
55
|
--max-width: 56rem;
|
|
39
56
|
font-family: 'Iowan Old Style', 'Palatino Linotype', Georgia, serif;
|
|
40
57
|
}
|
|
58
|
+
/* Dark palette: deep warm bg, brighter scarlet for readable contrast.
|
|
59
|
+
Activates when settings.theme = "dark", or when the visitor's OS prefers
|
|
60
|
+
dark and settings.theme = "auto". The light defaults above are the base;
|
|
61
|
+
these vars override only when [data-theme=...] matches. */
|
|
62
|
+
:root[data-theme="dark"] {
|
|
63
|
+
--bg: #1d1a17; --fg: #e8dec8; --muted: #9a8e78;
|
|
64
|
+
--accent: #d35550; --accent-soft: #e87a75; --accent-fg: #1d1a17;
|
|
65
|
+
--rule: #3a342d;
|
|
66
|
+
--wikilink-bg: rgba(211,85,80,0.16); --wikilink-bg-hover: rgba(211,85,80,0.28);
|
|
67
|
+
}
|
|
68
|
+
@media (prefers-color-scheme: dark) {
|
|
69
|
+
:root[data-theme="auto"] {
|
|
70
|
+
--bg: #1d1a17; --fg: #e8dec8; --muted: #9a8e78;
|
|
71
|
+
--accent: #d35550; --accent-soft: #e87a75; --accent-fg: #1d1a17;
|
|
72
|
+
--rule: #3a342d;
|
|
73
|
+
--wikilink-bg: rgba(211,85,80,0.16); --wikilink-bg-hover: rgba(211,85,80,0.28);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
41
76
|
* { box-sizing: border-box; }
|
|
42
77
|
body { margin: 0; background: var(--bg); color: var(--fg); line-height: 1.6; }
|
|
43
78
|
a { color: var(--accent); text-decoration: none; }
|
|
@@ -63,8 +98,18 @@ article a.internal.new, article a.internal.is-unresolved { opacity: 0.7; font-st
|
|
|
63
98
|
.app-grid {
|
|
64
99
|
display: grid; grid-template-columns: 15rem minmax(0, 56rem) 17rem;
|
|
65
100
|
gap: 2.5rem; max-width: 96rem; margin: 0 auto; padding: 1.5rem;
|
|
66
|
-
|
|
67
|
-
|
|
101
|
+
/* Sticky-footer plumbing: the grid fills the viewport so the main
|
|
102
|
+
column can stretch even when the article is short, and the flex
|
|
103
|
+
column inside main (below) pushes the footer to its bottom. */
|
|
104
|
+
min-height: 100vh; box-sizing: border-box;
|
|
105
|
+
}
|
|
106
|
+
main {
|
|
107
|
+
display: flex; flex-direction: column;
|
|
108
|
+
padding: 2rem 0 0; min-width: 0;
|
|
109
|
+
}
|
|
110
|
+
/* Article grows to absorb spare space; the footer falls naturally to
|
|
111
|
+
the bottom of main whatever the article's intrinsic height. */
|
|
112
|
+
main > article { flex: 1 0 auto; }
|
|
68
113
|
.sidebar { padding: 1.5rem 1.5rem 1.5rem 0; border-right: 1px solid var(--rule); font-size: 0.9rem; display: flex; flex-direction: column; gap: 0.6rem; }
|
|
69
114
|
/* Visual break between the header group (brand/search/auth) and the sitemap. */
|
|
70
115
|
.sidebar > nav:last-child { margin-top: 0.9rem; padding-top: 0.9rem; border-top: 1px solid var(--rule); }
|
|
@@ -78,7 +123,7 @@ main { padding: 2rem 0 4rem; min-width: 0; }
|
|
|
78
123
|
.app-grid { grid-template-columns: 1fr; gap: 0; padding: 0.75rem; max-width: 100%; }
|
|
79
124
|
.sidebar { border: none; padding: 0.5rem 0 0; }
|
|
80
125
|
.rightbar { display: none; }
|
|
81
|
-
main { padding: 0.5rem 0
|
|
126
|
+
main { padding: 0.5rem 0 0; }
|
|
82
127
|
article h1 { font-size: 2rem; }
|
|
83
128
|
article h2 { font-size: 1.4rem; }
|
|
84
129
|
}
|
|
@@ -121,6 +166,37 @@ main { padding: 2rem 0 4rem; min-width: 0; }
|
|
|
121
166
|
.search-result-folder { font-size: 0.72rem; color: var(--muted); text-transform: uppercase; letter-spacing: 0.05em; margin-top: 0.15rem; }
|
|
122
167
|
.search-empty { padding: 0.75rem; color: var(--muted); font-style: italic; font-size: 0.85rem; }
|
|
123
168
|
|
|
169
|
+
/* Sidebar row that holds the theme toggle (always present) and, on
|
|
170
|
+
multi-role builds, the auth box. Lays them out left-to-right with the
|
|
171
|
+
auth box absorbing remaining width so its existing button styling stays
|
|
172
|
+
correct regardless of theme-toggle width. */
|
|
173
|
+
.sidebar-row {
|
|
174
|
+
display: flex; align-items: center; gap: 0.5rem;
|
|
175
|
+
}
|
|
176
|
+
.sidebar-row > .auth-box { flex: 1; min-width: 0; }
|
|
177
|
+
|
|
178
|
+
/* Theme toggle: small square icon button matching the auth-box height so
|
|
179
|
+
they line up. Sun icon when current theme is dark (click → switch to
|
|
180
|
+
light); moon icon when current is light. The script paints the icon. */
|
|
181
|
+
.theme-toggle {
|
|
182
|
+
flex: 0 0 auto;
|
|
183
|
+
display: inline-flex; align-items: center; justify-content: center;
|
|
184
|
+
width: 2rem; height: 2rem;
|
|
185
|
+
padding: 0; margin: 0;
|
|
186
|
+
background: transparent;
|
|
187
|
+
color: var(--accent);
|
|
188
|
+
border: 1px solid var(--rule);
|
|
189
|
+
border-radius: 4px;
|
|
190
|
+
cursor: pointer;
|
|
191
|
+
transition: background 0.12s ease, border-color 0.12s ease, color 0.12s ease;
|
|
192
|
+
}
|
|
193
|
+
.theme-toggle:hover {
|
|
194
|
+
background: var(--wikilink-bg);
|
|
195
|
+
border-color: var(--accent-soft);
|
|
196
|
+
}
|
|
197
|
+
.theme-toggle .theme-toggle-icon { display: inline-flex; }
|
|
198
|
+
.theme-toggle .theme-toggle-icon svg { display: block; }
|
|
199
|
+
|
|
124
200
|
/* Auth box; sits under the search box; populated by JS from a non-HttpOnly
|
|
125
201
|
display cookie set by the Function on login. */
|
|
126
202
|
.auth-box {
|
|
@@ -145,7 +221,8 @@ main { padding: 2rem 0 4rem; min-width: 0; }
|
|
|
145
221
|
width: 100%;
|
|
146
222
|
display: block;
|
|
147
223
|
text-align: center;
|
|
148
|
-
padding: 0.
|
|
224
|
+
padding: 0.55rem 0.75rem;
|
|
225
|
+
line-height: 1;
|
|
149
226
|
border-radius: 4px;
|
|
150
227
|
border: 1px solid var(--accent);
|
|
151
228
|
background: transparent;
|
|
@@ -165,7 +242,8 @@ main { padding: 2rem 0 4rem; min-width: 0; }
|
|
|
165
242
|
/* Signed-in auth UI: keep status on the left and present Sign out as a
|
|
166
243
|
right-side action split by a divider. */
|
|
167
244
|
.auth-box.auth-signed-in {
|
|
168
|
-
|
|
245
|
+
height: 2rem;
|
|
246
|
+
padding: 0 0.35rem 0 0.65rem;
|
|
169
247
|
flex-wrap: nowrap;
|
|
170
248
|
gap: 0;
|
|
171
249
|
}
|
|
@@ -182,12 +260,12 @@ main { padding: 2rem 0 4rem; min-width: 0; }
|
|
|
182
260
|
align-items: center;
|
|
183
261
|
justify-content: center;
|
|
184
262
|
margin-left: auto;
|
|
185
|
-
padding: 0.
|
|
263
|
+
padding: 0.25rem 0.6rem;
|
|
186
264
|
border-left: 1px solid var(--rule);
|
|
187
265
|
border-radius: 0;
|
|
188
266
|
text-decoration: none;
|
|
189
267
|
font-weight: 600;
|
|
190
|
-
line-height: 1
|
|
268
|
+
line-height: 1;
|
|
191
269
|
white-space: nowrap;
|
|
192
270
|
}
|
|
193
271
|
.auth-box.auth-signed-in .auth-action:hover {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"styles.js","sourceRoot":"","sources":["../../src/render/styles.ts"],"names":[],"mappings":"AAAA,8EAA8E;AAC9E,2CAA2C;AAE3C
|
|
1
|
+
{"version":3,"file":"styles.js","sourceRoot":"","sources":["../../src/render/styles.ts"],"names":[],"mappings":"AAAA,8EAA8E;AAC9E,2CAA2C;AAE3C;;;;;;;;;;GAUG;AACH,MAAM,UAAU,mBAAmB,CAAC,IAKnC;IACC,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,IAAI,CAAC,WAAW;QAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;IAC1E,IAAI,IAAI,CAAC,OAAO;QAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IACvE,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;QACpB,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,0BAA0B,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;QACtE,MAAM,CAAC,IAAI,CAAC,0CAA0C,WAAW,CAAC,4BAA4B,EAAE,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IACzH,CAAC;IACD,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QAChB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,0BAA0B,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;QACtE,MAAM,CAAC,IAAI,CAAC,0CAA0C,OAAO,CAAC,4BAA4B,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IACzH,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IAC9B,OAAO,gDAAgD,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC9E,CAAC;AAED;;0EAE0E;AAC1E,SAAS,OAAO,CAAC,QAAgB,EAAE,KAAa,EAAE,IAAsB;IACtE,MAAM,IAAI,GAAG,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;IAChD,OAAO,GAAG,QAAQ;UACV,KAAK;+BACgB,KAAK,SAAS,IAAI;EAC/C,CAAC;AACH,CAAC;AAED,SAAS,WAAW,CAAC,QAAgB,EAAE,KAAa;IAClD,OAAO,GAAG,QAAQ;cACN,KAAK;sCACmB,KAAK;sCACL,KAAK;4CACC,KAAK;EAC/C,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAu0B1B,CAAC"}
|
package/dist/render/wikilink.js
CHANGED
|
@@ -1,8 +1,13 @@
|
|
|
1
1
|
import { findAndReplace } from "mdast-util-find-and-replace";
|
|
2
2
|
import { slugify } from "./slug.js";
|
|
3
|
-
// Matches [[Page]], [[Page|alias]], [[Page#anchor]], [[Page#anchor|alias]]
|
|
4
|
-
//
|
|
5
|
-
|
|
3
|
+
// Matches [[Page]], [[Page|alias]], [[Page#anchor]], [[Page#anchor|alias]],
|
|
4
|
+
// and chained [[Page#H1#H2]] (Obsidian's nested-heading form). Negative
|
|
5
|
+
// lookbehind blocks ![[embed]] from being consumed here.
|
|
6
|
+
//
|
|
7
|
+
// The anchor capture allows `#` so chained headings parse as a single
|
|
8
|
+
// anchor string; the resolver below splits on `#` and uses the deepest
|
|
9
|
+
// segment for the URL fragment.
|
|
10
|
+
const WIKILINK_RE = /(?<!!)(?<!\[)\[\[([^\[\]|#\n]+?)(?:#([^\[\]|\n]+?))?(?:\|([^\[\]#\n]+?))?\]\]/g;
|
|
6
11
|
export function wikiLinkPlugin(opts) {
|
|
7
12
|
return () => (tree) => {
|
|
8
13
|
findAndReplace(tree, [
|
|
@@ -10,7 +15,13 @@ export function wikiLinkPlugin(opts) {
|
|
|
10
15
|
WIKILINK_RE,
|
|
11
16
|
(_match, rawName, rawAnchor, rawAlias) => {
|
|
12
17
|
const name = rawName.trim();
|
|
13
|
-
|
|
18
|
+
// Chained heading anchors like `H1#H2` resolve to the deepest segment
|
|
19
|
+
// (the actual heading the reader lands on); the URL fragment is just
|
|
20
|
+
// that final slug since rehype-slug emits one slug per heading.
|
|
21
|
+
const rawAnchorTrimmed = rawAnchor?.trim();
|
|
22
|
+
const anchor = rawAnchorTrimmed?.includes("#")
|
|
23
|
+
? rawAnchorTrimmed.split("#").map((s) => s.trim()).filter(Boolean).pop()
|
|
24
|
+
: rawAnchorTrimmed;
|
|
14
25
|
const display = rawAlias?.trim() ?? name;
|
|
15
26
|
const slug = slugify(name);
|
|
16
27
|
// Resolution order:
|