@hajimism/dek 0.5.1 → 0.6.1

package/src/core/document.ts

@@ -4,6 +4,7 @@ import { escapeAttr, escapeHtml } from "./escape.ts";
 import { collectSlidesHtml, htmlShell } from "./html.ts";
 import { type OgpImage, ogpHead } from "./ogp.ts";
 import { PAGE_ID, type PageMode, pageConfigAttrs } from "./page.ts";
+import type { PluginPage } from "./plugin.ts";
 import {
   nextPresenterTitle,
   presenterSlides,
@@ -49,14 +50,19 @@ export type PageTarget =
 /** The deck at `dir`, rendered for `target`. */
 export function renderDeckHtml(
   dir: string,
-  options: { playerScript: string; target: PageTarget },
+  options: { playerScript: string; target: PageTarget; plugins?: PluginPage[] },
 ): string {
   return renderDeckDocument(resolveDeck(dir).deck, options);
 }
 
 export function renderDeckDocument(
   deck: ProjectDeck,
-  options: { playerScript: string; target: PageTarget },
+  options: {
+    playerScript: string;
+    target: PageTarget;
+    /** Each plugin's page; only the player and the build carry them (ADR 33). */
+    plugins?: PluginPage[];
+  },
 ): string {
   const { target } = options;
   const mode: PageMode =
@@ -160,7 +166,8 @@ export function renderDeckDocument(
   ${slideScriptTags(slideScripts)}
   <script>${options.playerScript}</script>
   ${target.kind === "dev" ? `<script>${target.liveReloadScript}</script>` : ""}
-  ${target.kind === "dev" && includeNotes ? `<script>${target.annotateScript}</script>` : ""}`,
+  ${target.kind === "dev" && includeNotes ? `<script>${target.annotateScript}</script>` : ""}
+  ${pluginPagesHtml(target, options.plugins ?? [])}`,
   });
 }
 
@@ -225,6 +232,24 @@ function renderKeyHintHtml(lang: string): string {
   return `<div id="${PAGE_ID.hint}" role="status"><span><kbd>s</kbd>${labels.rail}</span><span><kbd>p</kbd>${labels.presenter}</span></div>`;
 }
 
+/**
+ * The plugins' pages, after the player, which gives them `dek.plugin`: their keys and data as one
+ * JSON block, then each script in name order. Only the player and the build carry them; the
+ * presenter view and a video, like every still page, never do.
+ */
+function pluginPagesHtml(target: PageTarget, plugins: PluginPage[]): string {
+  const carried = target.kind === "build" || (target.kind === "dev" && target.mode === "player");
+  if (!carried || plugins.length === 0) {
+    return "";
+  }
+  const ordered = plugins.toSorted((a, b) => a.name.localeCompare(b.name));
+  const config = Object.fromEntries(ordered.map(({ name, keys, data }) => [name, { keys, data }]));
+  return [
+    `<script type="application/json" id="${PAGE_ID.plugins}">${jsonForScript(config)}</script>`,
+    ...ordered.map(({ script }) => `<script>${script.replace(/<\/(script)/gi, "<\\/$1")}</script>`),
+  ].join("\n  ");
+}
+
 function jsonForScript(value: unknown): string {
   return JSON.stringify(value).replace(/</g, "\\u003c");
 }

package/src/core/lint/script.ts

@@ -1,7 +1,7 @@
 import { type Diagnostic, diag } from "../diagnostic.ts";
 import type { DekError } from "../error.ts";
 import { ScriptError } from "../parse.ts";
-import { scriptLines } from "../script-lines.ts";
+import { scriptLines, slugAtLine } from "../script-lines.ts";
 import type { LintContext } from "./context.ts";
 
 /** DEK004: a section id or a beat id used twice. */
@@ -56,7 +56,6 @@ export function strayHeadingDiagnostics(ctx: LintContext): Diagnostic[] {
   if (!script) {
     return [];
   }
-  const starts = deck.deck.sections.map((section) => ({ line: section.line, slug: section.slug }));
   const diagnostics: Diagnostic[] = [];
   // What the parser reads as text, a code block or a comment, is not a heading here either.
   for (const [offset, { text, literal }] of scriptLines(script.body).entries()) {
@@ -65,8 +64,7 @@ export function strayHeadingDiagnostics(ctx: LintContext): Diagnostic[] {
       continue;
     }
     const line = script.bodyStartLine + offset;
-    // Under a slide heading it belongs to that slide; above the first, to the deck.
-    const slug = starts.filter((start) => start.line < line).at(-1)?.slug;
+    const slug = slugAtLine(deck.deck.sections, line);
     diagnostics.push(
       diag("DEK044", {
         message: `${"#".repeat(level)} heading is not a slide or a beat; it is read as spoken text`,

package/src/core/page.ts

@@ -7,6 +7,7 @@ import { escapeAttr } from "./escape.ts";
 export const PAGE_ID = {
   deck: "deck",
   data: "dek-data",
+  plugins: "dek-plugins",
   shell: "dek-shell",
   rail: "dek-rail",
   railResize: "dek-rail-resize",