@dogsbay/ssg 0.2.0-beta.142 → 0.2.0-beta.144

package/dist/package/THIRD-PARTY-NOTICES.txt

@@ -1,31 +1,31 @@
 Third-party software in @dogsbay/ssg (dist/package/)
 
 ========================================================================
-@dogsbay/elements@0.2.0-beta.142 (MIT)
+@dogsbay/elements@0.2.0-beta.144 (MIT)
 https://github.com/dogsbay/dogsbay.git
 
 Licensed under MIT; the package ships no licence file.
 
 ========================================================================
-@dogsbay/primitives@0.2.0-beta.142 (MIT)
+@dogsbay/primitives@0.2.0-beta.144 (MIT)
 https://github.com/dogsbay/dogsbay.git
 
 Licensed under MIT; the package ships no licence file.
 
 ========================================================================
-@dogsbay/render-html@0.2.0-beta.142 (MIT)
+@dogsbay/render-html@0.2.0-beta.144 (MIT)
 https://github.com/dogsbay/dogsbay.git
 
 Licensed under MIT; the package ships no licence file.
 
 ========================================================================
-@dogsbay/search@0.2.0-beta.142 (MIT)
+@dogsbay/search@0.2.0-beta.144 (MIT)
 https://github.com/dogsbay/dogsbay.git
 
 Licensed under MIT; the package ships no licence file.
 
 ========================================================================
-@dogsbay/ui@0.2.0-beta.142 (MIT)
+@dogsbay/ui@0.2.0-beta.144 (MIT)
 https://github.com/dogsbay/dogsbay.git
 
 Licensed under MIT; the package ships no licence file.

package/dist/package/browser.mjs

@@ -18,7 +18,7 @@ import {
 
 // src/core/build.ts
 import { dogsbayMdToTree, splitFrontmatter as splitFrontmatter2, treeToDogsbayMd } from "@dogsbay/format-dogsbay-md/browser";
-import { buildHreflangLinks, isMountRoot, missingTranslations, mountRefs, mountRootNote, namespaceNavGroup, placeMountedNav, prefixSlug as prefixSlug2, rewriteContentRefs } from "@dogsbay/site-files";
+import { buildHreflangLinks, isMountRoot, missingTranslations, mountRefs, mountRootNote, namespaceNavGroup, namespacePrefixes, placeMountedNav, prefixSlug as prefixSlug2, rewriteContentRefs } from "@dogsbay/site-files";
 
 // src/core/canonical.ts
 import { decideCanonical } from "@dogsbay/site-files";
@@ -1312,31 +1312,31 @@ var CLIENT_CANDIDATES = ['""', '"&"', '"\\\\$&")).join("|")})', '"\\\\$&")}"', '
 var SITE_NOTICES = `Third-party software in this site's _dogsbay/ files (dogsbay.js, site.css) and pages
 
 ========================================================================
-@dogsbay/elements@0.2.0-beta.142 (MIT)
+@dogsbay/elements@0.2.0-beta.144 (MIT)
 https://github.com/dogsbay/dogsbay.git
 
 Licensed under MIT; the package ships no licence file.
 
 ========================================================================
-@dogsbay/primitives@0.2.0-beta.142 (MIT)
+@dogsbay/primitives@0.2.0-beta.144 (MIT)
 https://github.com/dogsbay/dogsbay.git
 
 Licensed under MIT; the package ships no licence file.
 
 ========================================================================
-@dogsbay/render-html@0.2.0-beta.142 (MIT)
+@dogsbay/render-html@0.2.0-beta.144 (MIT)
 https://github.com/dogsbay/dogsbay.git
 
 Licensed under MIT; the package ships no licence file.
 
 ========================================================================
-@dogsbay/search@0.2.0-beta.142 (MIT)
+@dogsbay/search@0.2.0-beta.144 (MIT)
 https://github.com/dogsbay/dogsbay.git
 
 Licensed under MIT; the package ships no licence file.
 
 ========================================================================
-@dogsbay/ui@0.2.0-beta.142 (MIT)
+@dogsbay/ui@0.2.0-beta.144 (MIT)
 https://github.com/dogsbay/dogsbay.git
 
 Licensed under MIT; the package ships no licence file.
@@ -3079,7 +3079,8 @@ function linedDiagnostics(found, raw, body, parsed, after = "of the page after t
   const LINE = /\bline (\d+)/g;
   const shifted = (m) => m.replace(LINE, (_, n) => `line ${Number(n) + offset}`);
   const named = (d) => d.name === void 0 ? {} : { name: detach(d.name) };
-  const lined = (d) => ({ code: d.code, message: detach(shifted(d.message)), line: d.line + offset, ...named(d) });
+  const columns = (d) => ({ ...d.column === void 0 ? {} : { column: d.column }, ...d.endColumn === void 0 ? {} : { endColumn: d.endColumn } });
+  const lined = (d) => ({ code: d.code, message: detach(shifted(d.message)), line: d.line + offset, ...named(d), ...columns(d) });
   if (parsed === body) return found.map(lined);
   let asWritten;
   try {
@@ -3094,6 +3095,36 @@ function linedDiagnostics(found, raw, body, parsed, after = "of the page after t
     return { code: d.code, message: detach(d.message.replace(LINE, `line $1 ${after}`)), ...named(d) };
   });
 }
+function sourceLinesOf(tree, raw, body, parsed) {
+  const offset = raw.slice(0, raw.length - body.length).split("\n").length - 1;
+  let map = (line) => line + offset;
+  if (parsed !== body) {
+    const a = body.split("\n");
+    const b = parsed.split("\n");
+    if (a.length !== b.length || /\{[%#]/.test(body)) {
+      let head = 0;
+      while (head < a.length && head < b.length && a[head] === b[head]) head++;
+      let tail = 0;
+      while (tail < a.length - head && tail < b.length - head && a[a.length - 1 - tail] === b[b.length - 1 - tail]) tail++;
+      map = (line) => line <= head ? line + offset : line > b.length - tail ? line - (b.length - a.length) + offset : void 0;
+    }
+  }
+  const walk = (node) => {
+    if (Array.isArray(node)) {
+      for (const n of node) walk(n);
+      return;
+    }
+    if (!node || typeof node !== "object") return;
+    const meta = node.meta;
+    if (meta && typeof meta.line === "number") {
+      const to = map(meta.line);
+      if (to === void 0) delete meta.line;
+      else meta.line = to;
+    }
+    for (const v of Object.values(node)) if (v && typeof v === "object" && v !== meta) walk(v);
+  };
+  walk(tree);
+}
 var decoder = new TextDecoder();
 var DATA_DIRECTIVE_NODES = new Set(DATA_DIRECTIVES);
 var DEFAULT_DATA_CACHE_BYTES = 32 * 1024 * 1024;
@@ -3167,7 +3198,7 @@ function frontMatterCopy(fm) {
   }
 }
 function rebuildUnitLazy(ctx, unit) {
-  return buildUnit(unit, ctx.allUnits, ctx.cfg, ctx.input, ctx.highlighter, ctx.emit, ctx.report, ctx.phase, ctx.theme.templates, ctx.state, { lazy: true, diagnostics: ctx.diagnostics });
+  return buildUnit(unit, ctx.allUnits, ctx.cfg, ctx.input, ctx.highlighter, ctx.emit, ctx.report, ctx.phase, ctx.theme.templates, ctx.state, { lazy: true, diagnostics: ctx.diagnostics, dataLines: ctx.dataLines });
 }
 async function build(input, hooks = {}) {
   const t0 = now();
@@ -3228,10 +3259,10 @@ async function build(input, hooks = {}) {
   if (siteBase(cfg)) state.languages = await languageTables(cfg, allUnits, units, input.files, readText, frontMatterOf);
   const translations = await translationTables(cfg, allUnits, input.files, readText, input.includeDrafts === true, frontMatterOf);
   frontMatterOf = void 0;
-  hooks.context?.({ cfg, allUnits, input, highlighter, emit, warnings, problems, report, phase, theme, state, diagnostics: hooks.diagnostics });
+  hooks.context?.({ cfg, allUnits, input, highlighter, emit, warnings, problems, report, phase, theme, state, diagnostics: hooks.diagnostics, dataLines: hooks.dataLines });
   for (const unit of units) {
     classes = new Set(CLIENT_CANDIDATES);
-    const r = await buildUnit(unit, allUnits, cfg, input, highlighter, emit, report, phase, theme.templates, state, { keep: hooks.keep, lazy: hooks.lazy, diagnostics: hooks.diagnostics });
+    const r = await buildUnit(unit, allUnits, cfg, input, highlighter, emit, report, phase, theme.templates, state, { keep: hooks.keep, lazy: hooks.lazy, diagnostics: hooks.diagnostics, dataLines: hooks.dataLines });
     hooks.unitBuilt?.(unit, r, classes);
     pages += r.pages;
     assets += r.assets;
@@ -3284,7 +3315,7 @@ async function build(input, hooks = {}) {
     files: out,
     warnings,
     problems,
-    notes: [...state.notes.values()].flat(),
+    notes: [...state.notes.values()].flat().map((n) => n.message),
     config: cfg,
     stats: { pages, assets, units: units.length, ms: Math.round(now() - t0), msByPhase: roundAll(phase), highlightCache: highlighter.cacheStats(), ...state.parseCache ? { parseCache: state.parseCache.stats() } : {} }
   };
@@ -3394,7 +3425,7 @@ async function buildUnit(unit, allUnits, cfg, input, highlighter, emit, report,
     };
   };
   const namespaceOf = (p) => named.find((m) => p === m.namespace || p.startsWith(m.namespace + "/"))?.namespace ?? "";
-  const globalPrefixes = new Set(cfg.taxonomies.map((t2) => t2.path.split("/")[0]).filter(Boolean));
+  const globalPrefixes = /* @__PURE__ */ new Set([...cfg.taxonomies.map((t2) => t2.path.split("/")[0]).filter(Boolean), ...namespacePrefixes(cfg.sources.filter((s) => !s.mount))]);
   const mounts = [cfg.basePath, ...cfg.linkPrefixes ?? []].filter(Boolean);
   const prefix = unit.prefix ? unit.prefix + "/" : "";
   const label = unit.prefix || "/";
@@ -3695,7 +3726,8 @@ ${marker}${title}${marker}`, path, attributesOf(path), includesFor(path, read2),
       if (mount) {
         const there = infos.get(slug);
         if (there && isMountRoot(page.slug) && !there.virtual) {
-          notes.push(mountRootNote(m.mount, prefixSlug2(unit.prefix ? unit.prefix.split("/") : [], slug)));
+          const page2 = prefixSlug2(unit.prefix ? unit.prefix.split("/") : [], slug);
+          notes.push({ message: mountRootNote(m.mount, page2), file: srcOf(there), page: page2 });
           label2 = there.title;
           continue;
         }
@@ -3964,8 +3996,9 @@ ${marker}${title}${marker}`, path, attributesOf(path), includesFor(path, read2),
     t2 = now();
     let tree;
     try {
-      const parsed = dogsbayMdToTree(pre.text, mode.diagnostics ? { diagnostics: true } : void 0);
+      const parsed = dogsbayMdToTree(pre.text, mode.diagnostics || mode.dataLines ? { ...mode.diagnostics ? { diagnostics: true } : {}, ...mode.dataLines ? { sourceLines: true } : {} } : void 0);
       tree = parsed.tree;
+      if (mode.dataLines) sourceLinesOf(tree, raw, bodySrc, pre.text);
       if (mode.diagnostics) (diagnostics ??= []).push(...linedDiagnostics(parsed.diagnostics ?? [], raw, bodySrc, pre.text, templated === bodySrc ? "of the page with its data directives drawn" : void 0));
     } catch (e) {
       warn2("parse", `parse error: ${e.message}`);
@@ -4146,7 +4179,8 @@ ${marker}${title}${marker}`, path, attributesOf(path), includesFor(path, read2),
       imageZoom: cfg.imageZoom ? cfg.imageZoom.excludeInsideLinks ? "outside-links" : "all" : void 0,
       imageCaptions: cfg.imageCaptions,
       rawHtml: sanitizing ? (h) => sanitizeHtml(h, noteRemoved) : void 0,
-      embeddedEndpoints: apiLayout.wide ? apiLayout.embeddedEndpoints : void 0
+      embeddedEndpoints: apiLayout.wide ? apiLayout.embeddedEndpoints : void 0,
+      dataLines: mode.dataLines
     });
     let hasH1 = tree[0]?.type === "heading" && Number(tree[0].props?.level) === 1;
     const post = postNeighbours.has(info.slug) ? blog.get(info.slug) : void 0;
@@ -5014,7 +5048,7 @@ async function openDevSession(input, o = {}) {
     } catch (e) {
       throw inConfig(e, name);
     }
-    const nextConfig = { ...parsed, llmsTxt: o.llms === true && parsed.llmsTxt, search: o.search === false ? false : parsed.search };
+    const nextConfig = { ...parsed, llmsTxt: o.llms === true && parsed.llmsTxt, search: o.search === false ? false : parsed.search, math: o.math === false ? false : parsed.math };
     try {
       await build(
         // Drafts are shown while writing, as `dogsbay site dev` shows them.
@@ -5027,6 +5061,7 @@ async function openDevSession(input, o = {}) {
             watchScan(c, nextScan);
           },
           diagnostics: (f, list) => nextDiagnosed.set(f, list),
+          dataLines: o.dataLines,
           // A copy: the build keeps adding the classes of pages it renders later to its own set.
           unitBuilt: (unit, handle, classes) => nextUnits.set(unit.prefix, { unit, handle, classes: new Set(classes) })
         }
@@ -5046,6 +5081,7 @@ async function openDevSession(input, o = {}) {
     stale = /* @__PURE__ */ new Set();
     if (o.lazy) for (const u of units.values()) for (const p of u.handle.pageOuts) stale.add(p);
   };
+  const noteItems = () => [...ctx?.state.notes.values() ?? []].flat().map((n) => ({ ...n }));
   const unitOf = (path) => {
     let best;
     let bestLen = -1;
@@ -5147,8 +5183,9 @@ async function openDevSession(input, o = {}) {
       return unitForSitePath(path)?.handle.sourceForPage(path);
     },
     notes() {
-      return [...ctx?.state.notes.values() ?? []].flat();
+      return noteItems().map((n) => n.message);
     },
+    noteItems,
     takeWarnings() {
       const all = ctx?.warnings ?? [];
       const fresh = all.slice(taken);

package/dist/package/types/core/build.d.ts

@@ -201,11 +201,19 @@ export interface BuiltPage {
     /** The parsed body, after templating. */
     tree: TreeNode[];
 }
+/** A note (BuildResult.notes) as data: its text, and the page it is about when there is one. */
+export interface BuildNote {
+    message: string;
+    /** The page's source file, a project path (the content page standing as a mounted API's root). */
+    file?: string;
+    /** The page's path in the site (`3.32/reference/rest-api`), as the message names it. */
+    page?: string;
+}
 /** What the site-level files need from every unit. Small: a few strings per page. */
 export interface SiteState {
     redirects: RedirectInput[];
     /** What the build says about the content, not a problem, by unit prefix (replaced when a unit is built again). */
-    notes: Map<string, string[]>;
+    notes: Map<string, BuildNote[]>;
     /** The sidebar items kept between pages (src/theme/regions.ts). */
     navCache: NavCache;
     /** Site path ("en/latest/guide/x") → output file relative to the site root. */
@@ -309,6 +317,9 @@ export interface PageDiagnostic {
     line?: number;
     /** The directive's name, without colons, on `unknown-container` and `unknown-inline`. */
     name?: string;
+    /** The part of `line` meant, when the parser knows it: 1-based UTF-16 code units, `endColumn` exclusive. Only with `line`. */
+    column?: number;
+    endColumn?: number;
 }
 /**
  * The parser's diagnostics on `parsed` (the body after templating) with lines in the file: `line`,
@@ -318,6 +329,15 @@ export interface PageDiagnostic {
  * it names are the templated page's. Messages are detached (a session keeps them; some quote a line).
  */
 export declare function linedDiagnostics(found: ParseDiagnostic[], raw: string, body: string, parsed: string, after?: string): PageDiagnostic[];
+/**
+ * A page's block lines (`meta.line`, from the parser's `sourceLines`) as lines of its file: `parsed`
+ * is the body after templating, `body` as written, `raw` the file. The front matter moves every line
+ * by its length. Templating that keeps the line count (variables, one-line includes) keeps each
+ * line where it was. One that changes it (an include, a condition) keeps the lines before and after
+ * the change, and a block in between loses its line: a wrong line would scroll the editor elsewhere.
+ * Changes the tree in place.
+ */
+export declare function sourceLinesOf(tree: unknown, raw: string, body: string, parsed: string): void;
 /** A file's text, read now if it is lazy. */
 export declare function readText(c: FileContent): Promise<string>;
 /**
@@ -379,6 +399,7 @@ export interface BuildContext {
     theme: LoadedTheme;
     state: SiteState;
     diagnostics?: BuildHooks["diagnostics"];
+    dataLines?: boolean;
 }
 /** Internal: a dev session's view of a build (see src/core/dev.ts). */
 export interface BuildHooks {
@@ -392,6 +413,11 @@ export interface BuildHooks {
      * path, and the list (empty when it has none, so a fixed page clears).
      */
     diagnostics?: (file: string, list: PageDiagnostic[]) => void;
+    /**
+     * Mark each block with its line in the page's file (`data-line`, render-html's `dataLines`), for
+     * an editor's scroll sync. Lines templating moved are left out (`sourceLinesOf`).
+     */
+    dataLines?: boolean;
     unitBuilt?: (unit: BuildUnit, handle: UnitHandle, classes: Set<string>) => void;
 }
 /** Build one unit again without rendering its pages (they are rendered on request). */

package/dist/package/types/core/dev.d.ts

@@ -29,7 +29,7 @@
  * Node-free: the dev server (src/node/dev.ts) owns the file map and the
  * watcher, and updates `input.files` before calling `change`.
  */
-import { type BuildProblem, type PageDiagnostic, type BuildInput, type OutputContent } from "./build.js";
+import { type BuildNote, type BuildProblem, type PageDiagnostic, type BuildInput, type OutputContent } from "./build.js";
 import { type SiteConfig } from "./config.js";
 export interface DevSession {
     config: SiteConfig;
@@ -45,6 +45,8 @@ export interface DevSession {
     takeWarnings(): string[];
     /** What the site's build says that is not a problem (BuildResult.notes: a content page standing as a mounted API's root), as it stands now. */
     notes(): string[];
+    /** The same notes as data: each with the page it is about, its source file (a project path) and its path in the site. */
+    noteItems(): BuildNote[];
     /**
      * The same warnings as data, not handed out yet (its own count: taking one kind leaves the other):
      * the file each is about as a project path, with its line when known, and a code.
@@ -101,6 +103,13 @@ export interface DevOptions {
     search?: boolean;
     /** Build llms.txt, its section files and llms-full.txt at the start (default: no). */
     llms?: boolean;
+    /**
+     * Mark each block with its line in the page's file (`data-line`), for an editor's scroll sync.
+     * Lines templating moved are left out (`sourceLinesOf` in build.ts). Default: no.
+     */
+    dataLines?: boolean;
+    /** `false`: leave math as LaTeX (`<code class="math-display">` and inline), for a host that renders it itself. Default: as the config says. */
+    math?: boolean;
 }
 export declare function openDevSession(input: BuildInput & {
     configText?: string;

package/dist/package/types/package/browser.d.ts

@@ -19,7 +19,7 @@ export declare function openDevSession(input: BuildInput & {
     configText?: string;
 }, o?: DevOptions): Promise<DevSession>;
 export { prebuiltSiteCss };
-export type { BuildInput, BuildResult, FileContent, OutputContent, SinkContent, SiteCssBuilder, BuiltPage, HighlightPool, BuildProblem, PageDiagnostic } from "../core/build.js";
+export type { BuildInput, BuildResult, FileContent, OutputContent, SinkContent, SiteCssBuilder, BuiltPage, HighlightPool, BuildProblem, BuildNote, PageDiagnostic } from "../core/build.js";
 export { PageClashError } from "../core/build.js";
 export type { ChangeResult, DevOptions, DevSession } from "../core/dev.js";
 export { parseConfig, projectRoots, ConfigError, type SiteConfig, type DiagramEngine } from "../core/config.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dogsbay/ssg",
-  "version": "0.2.0-beta.142",
+  "version": "0.2.0-beta.144",
   "type": "module",
   "description": "Documentation static site generator for Dogsbay-MD that builds inside Cloudflare Workers and publishes sites that work offline",
   "license": "Apache-2.0",
@@ -49,38 +49,38 @@
     "tailwindcss": "^4.3.2"
   },
   "peerDependencies": {
-    "@dogsbay/elements": "0.2.0-beta.142",
-    "@dogsbay/format-dogsbay-md": "0.2.0-beta.142",
-    "@dogsbay/format-openapi": "0.2.0-beta.142",
-    "@dogsbay/format-topicmap": "0.2.0-beta.142",
-    "@dogsbay/highlight": "0.2.0-beta.142",
-    "@dogsbay/minja": "0.2.0-beta.142",
-    "@dogsbay/primitives": "0.2.0-beta.142",
-    "@dogsbay/render-html": "0.2.0-beta.142",
-    "@dogsbay/search": "0.2.0-beta.142",
-    "@dogsbay/serialize-core": "0.2.0-beta.142",
-    "@dogsbay/site-check": "0.2.0-beta.142",
-    "@dogsbay/site-files": "0.2.0-beta.142",
-    "@dogsbay/types": "0.2.0-beta.142"
+    "@dogsbay/elements": "0.2.0-beta.144",
+    "@dogsbay/format-dogsbay-md": "0.2.0-beta.144",
+    "@dogsbay/format-openapi": "0.2.0-beta.144",
+    "@dogsbay/format-topicmap": "0.2.0-beta.144",
+    "@dogsbay/highlight": "0.2.0-beta.144",
+    "@dogsbay/minja": "0.2.0-beta.144",
+    "@dogsbay/primitives": "0.2.0-beta.144",
+    "@dogsbay/render-html": "0.2.0-beta.144",
+    "@dogsbay/search": "0.2.0-beta.144",
+    "@dogsbay/serialize-core": "0.2.0-beta.144",
+    "@dogsbay/site-check": "0.2.0-beta.144",
+    "@dogsbay/site-files": "0.2.0-beta.144",
+    "@dogsbay/types": "0.2.0-beta.144"
   },
   "devDependencies": {
     "@axe-core/playwright": "^4.12.1",
     "@cloudflare/workers-types": "^5.20260921.1",
-    "@dogsbay/elements": "0.2.0-beta.142",
-    "@dogsbay/format-dogsbay-md": "0.2.0-beta.142",
-    "@dogsbay/format-openapi": "0.2.0-beta.142",
-    "@dogsbay/format-topicmap": "0.2.0-beta.142",
-    "@dogsbay/highlight": "0.2.0-beta.142",
-    "@dogsbay/icons": "0.2.0-beta.142",
-    "@dogsbay/minja": "0.2.0-beta.142",
-    "@dogsbay/primitives": "0.2.0-beta.142",
-    "@dogsbay/render-html": "0.2.0-beta.142",
-    "@dogsbay/search": "0.2.0-beta.142",
-    "@dogsbay/serialize-core": "0.2.0-beta.142",
-    "@dogsbay/site-check": "0.2.0-beta.142",
-    "@dogsbay/site-files": "0.2.0-beta.142",
-    "@dogsbay/types": "0.2.0-beta.142",
-    "@dogsbay/ui": "0.2.0-beta.142",
+    "@dogsbay/elements": "0.2.0-beta.144",
+    "@dogsbay/format-dogsbay-md": "0.2.0-beta.144",
+    "@dogsbay/format-openapi": "0.2.0-beta.144",
+    "@dogsbay/format-topicmap": "0.2.0-beta.144",
+    "@dogsbay/highlight": "0.2.0-beta.144",
+    "@dogsbay/icons": "0.2.0-beta.144",
+    "@dogsbay/minja": "0.2.0-beta.144",
+    "@dogsbay/primitives": "0.2.0-beta.144",
+    "@dogsbay/render-html": "0.2.0-beta.144",
+    "@dogsbay/search": "0.2.0-beta.144",
+    "@dogsbay/serialize-core": "0.2.0-beta.144",
+    "@dogsbay/site-check": "0.2.0-beta.144",
+    "@dogsbay/site-files": "0.2.0-beta.144",
+    "@dogsbay/types": "0.2.0-beta.144",
+    "@dogsbay/ui": "0.2.0-beta.144",
     "@mermanjs/web": "0.7.0",
     "@playwright/test": "1.61.1",
     "@types/node": "^22.10.0",