@abreen/tada 1.13.4 → 1.13.9

package/build/watch/snapshot.ts

@@ -8,6 +8,7 @@ import {
   updateProjectScan,
 } from '../source-model';
 import type { Asset, HtmlOutputAnalysis, SiteVariables } from '../types';
+import type { TadaBuildMeta } from './compiler-types';
 
 export interface TadaSourceRecord {
   sourcePath: string;
@@ -21,28 +22,24 @@ export interface TadaSourceRecord {
   authorKey?: string;
 }
 
+export interface TadaOutputOwner {
+  kind: 'content' | 'public';
+  sourcePath: string;
+}
+
 export interface TadaSnapshot {
   siteVariables: SiteVariables;
   assetFiles: string[];
   navData: unknown;
   authorsData: unknown;
-  processedExts: Set<string>;
   contentRecords: Map<string, TadaSourceRecord>;
   publicRecords: Map<string, TadaSourceRecord>;
-  outputOwners: Map<string, { kind: 'content' | 'public'; sourcePath: string }>;
+  outputOwners: Map<string, TadaOutputOwner>;
   reversePartialDeps: Map<string, Set<string>>;
   reverseTraceDeps: Map<string, Set<string>>;
   reverseInternalTargetDeps: Map<string, Set<string>>;
   reverseAuthorDeps: Map<string, Set<string>>;
-  contentFiles: Set<string>;
-  buildContentFiles: Set<string>;
-  publicFiles: Set<string>;
-  literateJavaOutputPaths: Set<string>;
-  contentOwners: Map<string, string>;
-  publicOwners: Map<string, string>;
-  sourceOutputPaths: Map<string, Set<string>>;
-  sourceTargetPaths: Map<string, Set<string>>;
-  validTargets: Set<string>;
+  scan: TadaProjectScan;
 }
 
 function buildReverseMap(
@@ -63,22 +60,11 @@ function buildReverseMap(
   return reverse;
 }
 
-function cloneSetMap(
-  source: Map<string, Set<string>>,
-): Map<string, Set<string>> {
-  return new Map(
-    [...source.entries()].map(([key, values]) => [key, new Set(values)]),
-  );
-}
-
 export function collectOutputOwners(snapshot: {
   contentRecords: Map<string, TadaSourceRecord>;
   publicRecords: Map<string, TadaSourceRecord>;
-}): Map<string, { kind: 'content' | 'public'; sourcePath: string }> {
-  const owners = new Map<
-    string,
-    { kind: 'content' | 'public'; sourcePath: string }
-  >();
+}): Map<string, TadaOutputOwner> {
+  const owners = new Map<string, TadaOutputOwner>();
 
   for (const record of snapshot.contentRecords.values()) {
     for (const outputPath of record.outputs.keys()) {
@@ -116,23 +102,12 @@ export function createSnapshot({
   publicRecords: Map<string, TadaSourceRecord>;
 }): TadaSnapshot {
   const allRecords = [...contentRecords.values()];
-  const reverseAuthorDeps = new Map<string, Set<string>>();
-  for (const record of allRecords) {
-    if (!record.authorKey) {
-      continue;
-    }
-    if (!reverseAuthorDeps.has(record.authorKey)) {
-      reverseAuthorDeps.set(record.authorKey, new Set());
-    }
-    reverseAuthorDeps.get(record.authorKey)!.add(record.sourcePath);
-  }
 
   return {
     siteVariables,
     assetFiles,
     navData,
     authorsData,
-    processedExts: scan.processedExts,
     contentRecords,
     publicRecords,
     outputOwners: collectOutputOwners({ contentRecords, publicRecords }),
@@ -145,16 +120,10 @@ export function createSnapshot({
       allRecords,
       record => record.internalTargets,
     ),
-    reverseAuthorDeps,
-    contentFiles: new Set(scan.contentFiles),
-    buildContentFiles: new Set(scan.buildContentFiles),
-    publicFiles: new Set(scan.publicFiles),
-    literateJavaOutputPaths: new Set(scan.literateJavaOutputPaths),
-    contentOwners: new Map(scan.contentOwners),
-    publicOwners: new Map(scan.publicOwners),
-    sourceOutputPaths: cloneSetMap(scan.sourceOutputPaths),
-    sourceTargetPaths: cloneSetMap(scan.sourceTargetPaths),
-    validTargets: new Set(scan.validTargets),
+    reverseAuthorDeps: buildReverseMap(allRecords, record =>
+      record.authorKey ? [record.authorKey] : [],
+    ),
+    scan,
   };
 }
 
@@ -214,14 +183,24 @@ export function collectHtmlAnalysisByPath(
 ): Map<string, HtmlOutputAnalysis> {
   const htmlAnalysisByPath = new Map<string, HtmlOutputAnalysis>();
   for (const record of contentRecords.values()) {
-    for (const [outputPath, analysis] of record.htmlAnalysisByOutputPath ||
-      new Map<string, HtmlOutputAnalysis>()) {
+    if (!record.htmlAnalysisByOutputPath) {
+      continue;
+    }
+    for (const [outputPath, analysis] of record.htmlAnalysisByOutputPath) {
       htmlAnalysisByPath.set(outputPath, cloneHtmlOutputAnalysis(analysis));
     }
   }
   return htmlAnalysisByPath;
 }
 
+export function createBuildMeta(snapshot: TadaSnapshot): TadaBuildMeta {
+  return {
+    htmlAssetsByPath: collectHtmlAssetsByPath(snapshot.contentRecords),
+    htmlAnalysisByPath: collectHtmlAnalysisByPath(snapshot.contentRecords),
+    siteVariables: snapshot.siteVariables,
+  };
+}
+
 export function normalizeInternalTarget(target: string): string {
   return normalizeOutputPath(target);
 }

package/build/watch/types.d.ts

@@ -0,0 +1,84 @@
+import type { ChokidarOptions } from 'chokidar';
+import type { TadaBuildMeta } from './compiler-types';
+import type { TadaSnapshot } from './snapshot';
+
+export type WatchEventKind = 'add' | 'change' | 'unlink';
+
+export interface FileChange {
+  path: string;
+  kind: WatchEventKind;
+}
+
+export interface ChangeBatch {
+  changes: FileChange[];
+}
+
+export interface WatchTarget {
+  path: string;
+  chokidar?: ChokidarOptions;
+  filter?: (filePath: string) => boolean;
+}
+
+export interface WatchDiagnostic {
+  message: string;
+}
+
+export interface WriteFileMutation {
+  kind: 'write';
+  path: string;
+  content: string | Buffer;
+}
+
+export interface DeleteFileMutation {
+  kind: 'delete';
+  path: string;
+}
+
+export type FileMutation = WriteFileMutation | DeleteFileMutation;
+
+export interface ReplaceRootCommitPlan {
+  kind: 'replace-root';
+  stagedPath: string;
+  targetPath: string;
+}
+
+export interface ApplyMutationsCommitPlan {
+  kind: 'apply-mutations';
+  rootDir: string;
+  mutations: FileMutation[];
+}
+
+export type CommitPlan = ReplaceRootCommitPlan | ApplyMutationsCommitPlan;
+
+export type CompilerBuildResult =
+  | {
+      ok: true;
+      snapshot: TadaSnapshot;
+      commit: CommitPlan;
+      meta: TadaBuildMeta;
+    }
+  | { ok: false; diagnostics: WatchDiagnostic[] };
+
+export interface WatchCompiler {
+  getWatchTargets(): WatchTarget[];
+  build(
+    snapshot: TadaSnapshot | undefined,
+    batch?: ChangeBatch,
+  ): Promise<CompilerBuildResult>;
+}
+
+export type WatchLifecycleEvent =
+  | { kind: 'watching' }
+  | { kind: 'build-started'; batch?: ChangeBatch }
+  | { kind: 'build-succeeded'; batch?: ChangeBatch; meta: TadaBuildMeta }
+  | {
+      kind: 'build-failed';
+      batch?: ChangeBatch;
+      diagnostics: WatchDiagnostic[];
+    };
+
+export interface WatchEngineOptions {
+  compiler: WatchCompiler;
+  debounceMs?: number;
+  onEvent?: (event: WatchLifecycleEvent) => void | Promise<void>;
+}

package/build/watch/validation.ts

@@ -2,7 +2,7 @@ import { B } from '../colors';
 import { makeLogger } from '../log';
 import { config, getConfigFileName } from '../templates';
 import { validateConfigLinks } from '../validate-config-links';
-import type { WatchDiagnostic } from '../../watch/types';
+import type { WatchDiagnostic } from './types';
 import { assertNoOutputPathConflicts, type TadaProjectScan } from './snapshot';
 
 const log = makeLogger(import.meta.url);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abreen/tada",
-  "version": "1.13.4",
+  "version": "1.13.9",
   "type": "module",
   "description": "A static site generator",
   "license": "MIT",
@@ -15,7 +15,6 @@
   "files": [
     "bin/",
     "build/",
-    "watch/",
     "src/",
     "templates/",
     "fonts/",

package/src/_base.scss

@@ -38,12 +38,13 @@ body {
    * Enable Inter's features:
    * liga - standard ligatures
    * calt - contextual alternates
-   * ss03 - round quotes & commas (legibility)
-   * cv01 - alternate 1 (style)
-   * cv05 - lower case L with tail (legibility)
-   * cv10 - capital G with spur (style)
+   * ss07 - square punctuation
+   * ss08 - square quotes
+   * cv01 - alternate 1
+   * cv08 - uppercase I with serif
+   * cv10 - capital G with spur
    */
-  font-feature-settings: 'liga', 'calt', 'ss03', 'cv01', 'cv05', 'cv10';
+  font-feature-settings: 'liga', 'calt', 'ss07', 'ss08', 'cv01', 'cv08', 'cv10';
   line-height: var(--line-height);
   color: var(--fg-color);
   background-color: var(--bg-color);

package/src/slides/index.ts

@@ -9,6 +9,8 @@ interface SlidesPresentDetail {
   slideIndex?: number;
 }
 
+const FULLSCREEN_STORAGE_KEY = 'slidesFullscreen';
+
 function isInteractive(
   view: Window & typeof globalThis,
   target: EventTarget | null,
@@ -83,6 +85,16 @@ export default function mountSlides(window: Window): void | (() => void) {
     presentButton.disabled = false;
   }
   if (fullscreenCheckbox) {
+    try {
+      const stored = window.localStorage.getItem(FULLSCREEN_STORAGE_KEY);
+      if (stored === 'false') {
+        fullscreenCheckbox.checked = false;
+      } else if (stored === 'true') {
+        fullscreenCheckbox.checked = true;
+      }
+    } catch {
+      // ignored
+    }
     fullscreenCheckbox.disabled = false;
   }
 
@@ -365,6 +377,20 @@ export default function mountSlides(window: Window): void | (() => void) {
     exitPresentation();
   }
 
+  function handleFullscreenPreferenceChange(): void {
+    if (!fullscreenCheckbox) {
+      return;
+    }
+    try {
+      window.localStorage.setItem(
+        FULLSCREEN_STORAGE_KEY,
+        String(fullscreenCheckbox.checked),
+      );
+    } catch {
+      // Ignore storage errors so the checkbox remains usable.
+    }
+  }
+
   function handleFullscreenChange(): void {
     if (
       isPresenting &&
@@ -460,6 +486,10 @@ export default function mountSlides(window: Window): void | (() => void) {
   }
 
   presentButton?.addEventListener('click', handlePresentClick);
+  fullscreenCheckbox?.addEventListener(
+    'change',
+    handleFullscreenPreferenceChange,
+  );
   closeButton.addEventListener('click', handleCloseClick);
   document.addEventListener('fullscreenchange', handleFullscreenChange);
   window.addEventListener('keydown', handleKeydown);
@@ -470,6 +500,10 @@ export default function mountSlides(window: Window): void | (() => void) {
   return () => {
     exitPresentation();
     presentButton?.removeEventListener('click', handlePresentClick);
+    fullscreenCheckbox?.removeEventListener(
+      'change',
+      handleFullscreenPreferenceChange,
+    );
     closeButton.removeEventListener('click', handleCloseClick);
     document.removeEventListener('fullscreenchange', handleFullscreenChange);
     window.removeEventListener('keydown', handleKeydown);

package/src/style.scss

@@ -121,7 +121,7 @@ a.footnote-ref {
 
 a.footnote-ref,
 .footnote-marker {
-  font-feature-settings: 'ss06';
+  font-feature-settings: 'ss06'; // squared numbers
 }
 
 .footnote-item {

package/src/trace/index.ts

@@ -58,13 +58,20 @@ async function goToStep(
 }
 
 function updateSourceHighlight(panel: HTMLElement, currentLine: number): void {
-  panel.querySelectorAll('.line-number').forEach(ln => {
-    ln.classList.remove('trace-line-active');
-  });
-  const el = panel.querySelector(`.line-number[data-line="${currentLine}"]`);
-  if (el) {
-    el.classList.add('trace-line-active');
-    const elRect = el.getBoundingClientRect();
+  panel
+    .querySelectorAll(
+      '.code-row.trace-line-active, .line-number.trace-line-active',
+    )
+    .forEach(el => {
+      el.classList.remove('trace-line-active');
+    });
+  const lineNumber = panel.querySelector(
+    `.line-number[data-line="${currentLine}"]`,
+  );
+  const row = lineNumber?.closest('.code-row') as HTMLElement | null;
+  if (row) {
+    row.classList.add('trace-line-active');
+    const elRect = row.getBoundingClientRect();
     const panelRect = panel.getBoundingClientRect();
     panel.scrollTop += elRect.top - panelRect.top - panel.clientHeight / 2;
   }

package/src/trace/style.scss

@@ -112,16 +112,17 @@
     }
   }
 
-  .line-number.trace-line-active {
-    font-weight: bold;
-    color: var(--fg-color);
-
-    &::before {
-      position: absolute;
-      left: 0;
-      margin-right: 0.25em;
-      line-height: 1.3;
-      content: '\25B6';
+  .code-row.trace-line-active {
+    background: var(--bg-trace-line-active);
+
+    .line-number {
+      font-weight: bold;
+      color: var(--fg-color);
+      background: var(--bg-trace-line-active);
+    }
+
+    code {
+      background: none;
     }
   }
 }

package/templates/_theme.scss

@@ -32,6 +32,7 @@
   --bg2-color-translucent: hsl(
     var(--tint-hue) calc(12% * var(--tint-amount)) 92% / 66%
   );
+  --bg-trace-line-active: <%= bgTraceLineActive %>;
   --box-shadow: 0 2px 9px
     hsl(var(--tint-hue) calc(85% * var(--tint-amount)) 10% / 25%);
   --backdrop-filter: blur(10px);
@@ -87,6 +88,7 @@
     --bg2-color-translucent: hsl(
       var(--tint-hue) calc(12% * var(--tint-amount)) 12% / 66%
     );
+    --bg-trace-line-active: <%= bgTraceLineActiveDark %>;
     --box-shadow: 0 3px 8px
       hsl(var(--tint-hue) calc(33% * var(--tint-amount)) 8% / 70%);
     --link-active-color: #fff;

package/templates/default.html

@@ -7,7 +7,7 @@
     <div class="slides-header" data-pagefind-ignore>
       <button type="button" data-slides-present disabled>Present</button>
       <label>
-        <input type="checkbox" data-slides-fullscreen checked disabled>
+        <input id="slides-fullscreen" type="checkbox" data-slides-fullscreen checked disabled>
         Full screen
       </label>
     </div>