@abreen/tada 1.15.8 → 1.15.9

package/build/bundle.ts

@@ -19,6 +19,19 @@ import type { SiteVariables } from './types';
 import timezones from '../src/timezone/timezones.json' with { type: 'json' };
 import pkg from '../package.json' with { type: 'json' };
 
+interface BunBuildPlugin {
+  name: string;
+  setup(build: PluginBuilder): void;
+}
+
+interface CoverageHooks {
+  createBundlePlugin(): BunBuildPlugin;
+}
+
+interface CoverageGlobal {
+  __tadaCoverage?: CoverageHooks;
+}
+
 export function getBundleNaming(): string {
   const version = pkg.version.replace(/[^a-zA-Z0-9.-]/g, '-');
   return `[name].bundle.tada-${version}.[ext]`;
@@ -92,9 +105,7 @@ function createDefine(
   };
 }
 
-function createScssPlugin(siteVariables: SiteVariables) {
-  const themeDir = renderThemeScss(siteVariables);
-
+function createScssPlugin(themeDir: string) {
   return {
     name: 'scss',
     setup(build: PluginBuilder) {
@@ -108,6 +119,12 @@ function createScssPlugin(siteVariables: SiteVariables) {
   };
 }
 
+function getCoverageBundlePlugin(): BunBuildPlugin | null {
+  return (
+    (globalThis as CoverageGlobal).__tadaCoverage?.createBundlePlugin() ?? null
+  );
+}
+
 export async function bundle(
   siteVariables: SiteVariables,
   { mode = 'development', distDir }: { mode?: string; distDir?: string } = {},
@@ -121,30 +138,42 @@ export async function bundle(
     path.resolve(packageDir, 'src/critical.scss'),
   ];
 
-  const result = await Bun.build({
-    entrypoints,
-    outdir: resolvedDistDir,
-    naming: getBundleNaming(),
-    minify: mode === 'production',
-    sourcemap: isDev ? 'inline' : 'none',
-    define: createDefine(siteVariables, isDev),
-    external: ['*.woff2'],
-    plugins: [createScssPlugin(siteVariables)],
-  });
+  const themeDir = renderThemeScss(siteVariables);
 
-  if (!result.success) {
-    const messages = result.logs
-      .filter(log => log.level === 'error')
-      .map(log => log.message || String(log));
-    throw new Error(`Bundle failed:\n${messages.join('\n')}`);
+  try {
+    const plugins = [createScssPlugin(themeDir)];
+    const coverageBundlePlugin = getCoverageBundlePlugin();
+    if (coverageBundlePlugin) {
+      plugins.push(coverageBundlePlugin);
+    }
+
+    const result = await Bun.build({
+      entrypoints,
+      outdir: resolvedDistDir,
+      naming: getBundleNaming(),
+      minify: mode === 'production',
+      sourcemap: isDev ? 'inline' : 'none',
+      define: createDefine(siteVariables, isDev),
+      external: ['*.woff2'],
+      plugins,
+    });
+
+    if (!result.success) {
+      const messages = result.logs
+        .filter(log => log.level === 'error')
+        .map(log => log.message || String(log));
+      throw new Error(`Bundle failed:\n${messages.join('\n')}`);
+    }
+
+    // Return the output filenames for asset tag injection
+    const assetFiles = result.outputs.map(output =>
+      toPosix(path.relative(resolvedDistDir, output.path)),
+    );
+
+    return assetFiles;
+  } finally {
+    fs.rmSync(themeDir, { recursive: true, force: true });
   }
-
-  // Return the output filenames for asset tag injection
-  const assetFiles = result.outputs.map(output =>
-    toPosix(path.relative(resolvedDistDir, output.path)),
-  );
-
-  return assetFiles;
 }
 
-export { renderThemeScss, createDefine };
+export { renderThemeScss };

package/build/colors.ts

@@ -12,11 +12,11 @@ export const R = style(['red']);
 export const G = style(['green']);
 export const B = style(['blue']);
 export const Y = style(['yellow']);
-export const L = style(['blackBright']);
+export const L = style(['gray']);
 export const P = style(['magenta']);
 export const I = style(['italic', 'bold']);
 
 export const Ri = style(['inverse', 'red']);
 export const Gi = style(['inverse', 'green']);
 export const Yi = style(['inverse', 'yellow']);
-export const Li = style(['inverse', 'blackBright']);
+export const Li = style(['inverse', 'gray']);

package/build/config-files.ts

@@ -5,7 +5,7 @@ export type SiteEnv = 'dev' | 'prod';
 export type SiteConfigName = 'site.dev' | 'site.prod';
 export type ProjectConfigName = 'nav' | 'authors';
 export type ConfigName = SiteConfigName | ProjectConfigName;
-export type ProjectConfigExtension = '.yaml' | '.yml' | '.json';
+type ProjectConfigExtension = '.yaml' | '.yml' | '.json';
 
 export interface ResolvedProjectConfigFile<
   Name extends ConfigName = ConfigName,
@@ -18,21 +18,21 @@ export interface ResolvedProjectConfigFile<
   required: boolean;
 }
 
-export const CONFIG_FILE_EXTENSIONS = ['.yaml', '.yml', '.json'] as const;
-export const DEFAULT_CONFIG_FILE_EXTENSION = '.yaml' as const;
+const CONFIG_FILE_EXTENSIONS = ['.yaml', '.yml', '.json'] as const;
+const DEFAULT_CONFIG_FILE_EXTENSION = '.yaml' as const;
 
-export const SITE_CONFIG_BASE_NAMES = {
+const SITE_CONFIG_BASE_NAMES = {
   dev: 'site.dev',
   prod: 'site.prod',
 } as const satisfies Record<SiteEnv, SiteConfigName>;
 
-export const PROJECT_CONFIG_BASE_NAMES = {
+const PROJECT_CONFIG_BASE_NAMES = {
   nav: 'nav',
   authors: 'authors',
 } as const satisfies Record<ProjectConfigName, ProjectConfigName>;
 
-export const REQUIRED_PROJECT_CONFIG_NAMES = ['nav'] as const;
-export const OPTIONAL_PROJECT_CONFIG_NAMES = ['authors'] as const;
+const REQUIRED_PROJECT_CONFIG_NAMES = ['nav'] as const;
+const OPTIONAL_PROJECT_CONFIG_NAMES = ['authors'] as const;
 export const PROJECT_CONFIG_NAMES = [
   ...REQUIRED_PROJECT_CONFIG_NAMES,
   ...OPTIONAL_PROJECT_CONFIG_NAMES,
@@ -66,7 +66,7 @@ export function getProjectConfigBaseName(
   return PROJECT_CONFIG_BASE_NAMES[name];
 }
 
-export function getSupportedConfigFileNames(baseName: string): string[] {
+function getSupportedConfigFileNames(baseName: string): string[] {
   return CONFIG_FILE_EXTENSIONS.map(ext => `${baseName}${ext}`);
 }
 
@@ -83,21 +83,17 @@ export function getSupportedConfigFileNamesText(baseName: string): string {
   return joinWithOr(getSupportedConfigFileNames(baseName));
 }
 
-export function getDefaultConfigFileName(baseName: string): string {
+function getDefaultConfigFileName(baseName: string): string {
   return `${baseName}${DEFAULT_CONFIG_FILE_EXTENSION}`;
 }
 
-export function getDefaultConfigFilePath(
+function getDefaultConfigFilePath(
   projectDir: string,
   baseName: string,
 ): string {
   return path.join(projectDir, getDefaultConfigFileName(baseName));
 }
 
-export function getDefaultSiteConfigFileName(env: SiteEnv): string {
-  return getDefaultConfigFileName(getSiteConfigBaseName(env));
-}
-
 export function getDefaultSiteConfigPath(
   projectDir: string,
   env: SiteEnv,
@@ -105,12 +101,6 @@ export function getDefaultSiteConfigPath(
   return getDefaultConfigFilePath(projectDir, getSiteConfigBaseName(env));
 }
 
-export function getDefaultProjectConfigFileName(
-  name: ProjectConfigName,
-): string {
-  return getDefaultConfigFileName(getProjectConfigBaseName(name));
-}
-
 export function getDefaultProjectConfigFilePath(
   projectDir: string,
   name: ProjectConfigName,
@@ -118,7 +108,7 @@ export function getDefaultProjectConfigFilePath(
   return getDefaultConfigFilePath(projectDir, getProjectConfigBaseName(name));
 }
 
-export function resolveConfigFile<Name extends ConfigName = ConfigName>(
+function resolveConfigFile<Name extends ConfigName = ConfigName>(
   projectDir: string,
   {
     name,

package/build/config-loader.ts

@@ -115,7 +115,7 @@ function interpolateConfigValue(
   return value;
 }
 
-export function loadResolvedConfigFile<
+function loadResolvedConfigFile<
   T = unknown,
   Name extends ConfigName = ConfigName,
 >(

package/build/external-links-plugin.ts

@@ -175,6 +175,7 @@ export default function externalLinks(
       const newClassAttr = classAttr ? `${classAttr} external` : 'external';
       token.attrSet('class', newClassAttr);
       token.attrSet('target', '_blank');
+      token.attrSet('rel', 'noopener noreferrer');
       log.debug`${href} -> "${newClassAttr}"`;
 
       const closeIdx = findMatchingClose(children, i);

package/build/generate-favicon.ts

@@ -158,5 +158,3 @@ export async function generateFavicons(
   );
   fs.writeFileSync(path.join(distDir, `${filenameBase}.ico`), icoBuffer);
 }
-
-export { createFaviconSvg };

package/build/generate-web-app-manifest.ts

@@ -67,5 +67,3 @@ export function generateWebAppManifest(
     JSON.stringify(manifest),
   );
 }
-
-export { createManifest };

package/build/pdf-text.ts

@@ -8,12 +8,12 @@ interface MutoolOutput {
   stderr: string;
 }
 
-export interface PdfPage {
+interface PdfPage {
   pageNumber: number;
   content: string;
 }
 
-export interface PdfExtractResult {
+interface PdfExtractResult {
   pages: PdfPage[];
   hasExtractedText: boolean;
 }

package/build/reachability.ts

@@ -37,7 +37,7 @@ function resolveTargetToAssetTarget(target: string): string | null {
   return path.posix.extname(normalizedTarget) ? normalizedTarget : null;
 }
 
-export function collectOutgoingHtmlAssetPaths(
+function collectOutgoingHtmlAssetPaths(
   analysis: HtmlOutputAnalysis,
   knownHtmlAssetPaths: Set<string>,
 ): string[] {

package/build/site-variables.ts

@@ -1,6 +1,6 @@
 import { bundledLanguages } from 'shiki';
 import type { BundledLanguage } from 'shiki';
-import { getSiteConfigBaseName, type SiteEnv } from './config-files';
+import type { SiteEnv } from './config-files';
 import { loadSiteConfig } from './config-loader';
 import { compile as compileJsonSchema, doValidation } from './json-schema';
 import { getProjectDir } from './utils/paths';
@@ -163,8 +163,6 @@ export function getProdSiteVariables(): SiteVariables {
   return getSiteVariables('prod');
 }
 
-export { getSiteConfigBaseName };
-
 function getValidatedSiteConfigRoot(
   value: unknown,
   fileName: string,

package/build/template-globals.ts

@@ -23,6 +23,7 @@ interface TemplateGlobals {
   readableDate: (date: string | Date | null | undefined) => string;
   classNames: (obj: Record<string, unknown>) => string;
   cx: (obj: Record<string, unknown>) => string;
+  encodeAuthoredUrl: (value: string) => string;
   renderTimeZoneChooser: () => string;
 }
 
@@ -51,10 +52,16 @@ export default function createTemplateGlobals(
     readableDate,
     classNames,
     cx: classNames,
+    encodeAuthoredUrl,
     renderTimeZoneChooser,
   };
 }
 
+// Encode raw authored URL text, but preserve percent escapes authors already wrote.
+export function encodeAuthoredUrl(value: string): string {
+  return encodeURI(value).replace(/%25([0-9a-fA-F]{2})/g, '%$1');
+}
+
 function isoDate(str: string | null | undefined): string | null {
   if (str == null || str == '') {
     return null;

package/build/templates.ts

@@ -144,4 +144,4 @@ function compileAndSetValidator(
   validators[name] = compileJsonSchema(schema);
 }
 
-export { getHtmlTemplatesDir, getProjectConfigDir };
+export { getProjectConfigDir };

package/build/util.ts

@@ -1,37 +1,16 @@
-export {
-  addGeneratedRouteAliases,
-  getProcessedExts,
-  getSourceOutputPaths,
-  getSourceTargetPaths,
-  isBuildContentSource,
-} from './source-model';
-export {
-  getBuildContentFiles,
-  getContentFiles,
-  getContentOutputRelPaths,
-  getContentSourceOutputRelPaths,
-  getFilesByExtensions,
-  getValidInternalTargets,
-  shouldSkipContentFile,
-} from './utils/content-files';
-export { extensionIsMarkdown, isPartial } from './utils/file-types';
-export { createMarkdown } from './utils/markdown';
+export { getFilesByExtensions } from './utils/content-files';
 export {
   createApplyBasePath,
   getContentDir,
   getDistDir,
   getPackageDir,
-  getProjectDir,
   getPublicDir,
   normalizeOutputPath,
   toPosix,
 } from './utils/paths';
 export {
-  injectAssetTags,
-  preparePageTemplateHtml,
   renderCodePageAsset,
   renderCopiedContentAsset,
   renderLiterateJavaPageAsset,
   renderPlainTextPageAsset,
 } from './utils/render';
-export { parseFrontMatter } from './utils/front-matter';

package/build/utils/literate-java.ts

@@ -32,7 +32,7 @@ export function runJavac(
   }
 }
 
-export function getExecError(err: unknown): string {
+function getExecError(err: unknown): string {
   const execErr = err as { stderr?: Buffer; message: string };
   return execErr.stderr ? execErr.stderr.toString() : execErr.message;
 }

package/build/utils/markdown-partials.ts

@@ -23,7 +23,7 @@ interface MarkdownPartialsEnv {
   [PARTIAL_CONTEXT_STACK_KEY]?: MarkdownPartialContext[];
 }
 
-export interface MarkdownPartialsOptions {
+interface MarkdownPartialsOptions {
   filePath: string;
   templateParams: Record<string, unknown>;
   dependencyCollector?: RenderDependencyCollector;

package/build/utils/shiki-highlighter.ts

@@ -64,10 +64,7 @@ export async function initHighlighter(
   }
 }
 
-export function getHighlighter(): HighlighterGeneric<
-  BundledLanguage,
-  BundledTheme
-> {
+function getHighlighter(): HighlighterGeneric<BundledLanguage, BundledTheme> {
   if (!highlighter) {
     throw new Error('Shiki highlighter not initialized');
   }

package/build/utils/trace-layout.ts

@@ -33,7 +33,7 @@ const MIN_VALUE_WIDTH = 40;
 const MIN_ARRAY_CELL_WIDTH = 48;
 
 /** Information collected about a heap object across all trace steps. */
-export interface ObjectInfo {
+interface ObjectInfo {
   id: string;
   type: string;
   firstStep: number;
@@ -61,7 +61,7 @@ export interface ObjectInfo {
 }
 
 /** A tree node used to build the hierarchy for d3-flextree. */
-export interface TreeNode {
+interface TreeNode {
   id: string;
   width: number;
   height: number;

package/build/validate-config-links.ts

@@ -1,4 +1,5 @@
 import path from 'path';
+import { encodeAuthoredUrl } from './template-globals';
 import { normalizeOutputPath } from './utils/paths';
 
 interface NavLink {
@@ -24,6 +25,51 @@ function requireRootRelativePath(
   return `${errorPrefix} must start with "/": "${value}"`;
 }
 
+const SPECIAL_URL_SCHEMES = new Set([
+  'file',
+  'ftp',
+  'http',
+  'https',
+  'ws',
+  'wss',
+]);
+
+function isValidAbsoluteAuthorUrl(value: string): boolean {
+  if (value.trim() !== value) {
+    return false;
+  }
+
+  const schemeMatch = value.match(/^([a-zA-Z][a-zA-Z0-9+.-]*):/);
+  if (!schemeMatch) {
+    return false;
+  }
+
+  const scheme = schemeMatch[1].toLowerCase();
+  if (
+    SPECIAL_URL_SCHEMES.has(scheme) &&
+    !value.startsWith(`${schemeMatch[1]}://`)
+  ) {
+    return false;
+  }
+
+  try {
+    new URL(encodeAuthoredUrl(value));
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function getInternalHrefTarget(href: string): string {
+  const { pathname } = splitHref(href);
+  const normalized = normalizeOutputPath(pathname);
+  try {
+    return normalizeOutputPath(decodeURIComponent(normalized));
+  } catch {
+    return normalized;
+  }
+}
+
 export function validateNavLinks(
   navData: unknown,
   validTargets: Set<string>,
@@ -97,6 +143,10 @@ export function validateAuthorLinks(
     }
 
     if (author.url) {
+      if (isValidAbsoluteAuthorUrl(author.url)) {
+        continue;
+      }
+
       const urlRootRelativeError = requireRootRelativePath(
         author.url,
         `${fileName}: url for "${key}"`,
@@ -104,7 +154,7 @@ export function validateAuthorLinks(
       if (urlRootRelativeError) {
         errors.push(urlRootRelativeError);
       } else {
-        const urlPath = normalizeOutputPath(author.url);
+        const urlPath = getInternalHrefTarget(author.url);
         if (!validTargets.has(urlPath)) {
           errors.push(`${fileName}: broken url for "${key}": "${author.url}"`);
         }

package/build/watch/config-paths.ts

@@ -6,7 +6,7 @@ import {
 } from '../config-files';
 import { getProjectConfigDir } from '../templates';
 
-export type WatchConfigPathKind = 'site' | 'nav' | 'authors';
+type WatchConfigPathKind = 'site' | 'nav' | 'authors';
 
 function getConfigPathEntries(): Array<{
   kind: WatchConfigPathKind;

package/build/watch/planner.ts

@@ -14,7 +14,7 @@ export interface TadaIncrementalWatchPlan {
   publicToRemove: Set<string>;
 }
 
-export type TadaWatchPlan = { kind: 'full' } | TadaIncrementalWatchPlan;
+type TadaWatchPlan = { kind: 'full' } | TadaIncrementalWatchPlan;
 
 export function diffAuthorKeys(previous: unknown, next: unknown): Set<string> {
   const previousMap =

package/build/watch/snapshot.ts

@@ -1,11 +1,8 @@
 import fs from 'fs';
 import path from 'path';
-import { normalizeOutputPath } from '../util';
 import {
   type TadaProjectScan,
   assertNoOutputPathConflicts,
-  scanProject,
-  updateProjectScan,
 } from '../source-model';
 import type { Asset, HtmlOutputAnalysis, SiteVariables } from '../types';
 import type { TadaBuildMeta } from './compiler-types';
@@ -60,7 +57,7 @@ function buildReverseMap(
   return reverse;
 }
 
-export function collectOutputOwners(snapshot: {
+function collectOutputOwners(snapshot: {
   contentRecords: Map<string, TadaSourceRecord>;
   publicRecords: Map<string, TadaSourceRecord>;
 }): Map<string, TadaOutputOwner> {
@@ -164,7 +161,7 @@ export function collectSourceHtmlAnalysis(
   return htmlAnalysisByOutputPath;
 }
 
-export function collectHtmlAssetsByPath(
+function collectHtmlAssetsByPath(
   contentRecords: Map<string, TadaSourceRecord>,
 ): Map<string, string> {
   const htmlAssetsByPath = new Map<string, string>();
@@ -178,7 +175,7 @@ export function collectHtmlAssetsByPath(
   return htmlAssetsByPath;
 }
 
-export function collectHtmlAnalysisByPath(
+function collectHtmlAnalysisByPath(
   contentRecords: Map<string, TadaSourceRecord>,
 ): Map<string, HtmlOutputAnalysis> {
   const htmlAnalysisByPath = new Map<string, HtmlOutputAnalysis>();
@@ -201,13 +198,4 @@ export function createBuildMeta(snapshot: TadaSnapshot): TadaBuildMeta {
   };
 }
 
-export function normalizeInternalTarget(target: string): string {
-  return normalizeOutputPath(target);
-}
-
-export {
-  assertNoOutputPathConflicts,
-  scanProject,
-  updateProjectScan,
-  type TadaProjectScan,
-};
+export { assertNoOutputPathConflicts, type TadaProjectScan };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abreen/tada",
-  "version": "1.15.8",
+  "version": "1.15.9",
   "type": "module",
   "description": "A static site generator",
   "license": "MIT",
@@ -33,7 +33,7 @@
     "check-deps": "bun run scripts/check-deps.ts",
     "init-example": "bun run bin/tada.ts init example --no-interactive",
     "iew": "bun run scripts/init-example-watch.ts",
-    "lint": "eslint src/ build/ bin/",
+    "lint": "eslint src/ build/ bin/ templates/*.test.ts",
     "lint:sass": "bun run scripts/lint-sass.ts",
     "typecheck": "tsc --noEmit",
     "format": "prettier --write \"**/*.{ts,js,scss,json}\"",
@@ -61,7 +61,6 @@
     "chokidar": "^4.0.3",
     "culori": "^4.0.2",
     "d3-flextree": "^2.1.2",
-    "d3-hierarchy": "^3.1.2",
     "fontkit": "^2.0.4",
     "front-matter": "^4.0.2",
     "java-parser": "^3.0.1",
@@ -101,7 +100,6 @@
     "@types/bun": "^1.3.12",
     "@types/culori": "^4.0.1",
     "@types/d3-flextree": "^2.1.4",
-    "@types/d3-hierarchy": "^3.1.7",
     "@types/fontkit": "^2.0.9",
     "@types/istanbul-lib-coverage": "^2.0.6",
     "@types/istanbul-lib-instrument": "^1.7.8",
@@ -109,12 +107,14 @@
     "@types/istanbul-reports": "^3.0.4",
     "@types/lodash": "^4.17.24",
     "@types/markdown-it-container": "^4.0.0",
+    "@types/node": "^25.6.0",
     "eslint": "^10.2.1",
     "husky": "^9.1.7",
     "istanbul-lib-coverage": "^3.2.2",
     "istanbul-lib-instrument": "^6.0.3",
     "istanbul-lib-report": "^3.0.1",
     "istanbul-reports": "^3.2.0",
+    "knip": "^6.11.0",
     "lint-staged": "^16.4.0",
     "postcss-scss": "^4.0.9",
     "prettier": "^3.8.3",
@@ -122,7 +122,7 @@
     "stylelint": "^17.8.0",
     "stylelint-config-recess-order": "^7.7.0",
     "stylelint-config-standard-scss": "^17.0.0",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "typescript-eslint": "^8.58.2"
   }
 }

package/schema/authors.schema.json

@@ -6,7 +6,7 @@
     "properties": {
       "name": { "type": "string" },
       "avatar": { "type": "string", "pattern": "^\\/[-a-zA-Z0-9_./#]*$" },
-      "url": { "type": "string", "pattern": "^\\/[-a-zA-Z0-9_./#]*$" }
+      "url": { "type": "string", "minLength": 1 }
     },
     "additionalProperties": false
   }

package/src/navigate/runtime.ts

@@ -130,6 +130,14 @@ function getLocationKey(window: Window): string {
   );
 }
 
+function isAbortError(err: unknown): boolean {
+  return err instanceof Error && err.name === 'AbortError';
+}
+
+function isActiveNavigation(controller: AbortController): boolean {
+  return currentAbortController === controller && !controller.signal.aborted;
+}
+
 export function initNavigation(window: Window): void {
   currentAbortController = null;
   historyIndex = 0;
@@ -191,6 +199,8 @@ export async function navigateToUrl(
 
   const controller = new AbortController();
   currentAbortController = controller;
+  document.documentElement.classList.remove('nav-forward', 'nav-back');
+  cleanupViewTransitionNames(document);
 
   const header = document.querySelector('header');
   header?.classList.add('loading');
@@ -199,21 +209,46 @@ export async function navigateToUrl(
   try {
     response = await globals.fetch(url, { signal: controller.signal });
   } catch (err: unknown) {
+    if (!isActiveNavigation(controller)) {
+      return;
+    }
     header?.classList.remove('loading');
-    if (err instanceof Error && err.name === 'AbortError') {
+    if (isAbortError(err)) {
       return;
     }
     globals.setLocationHref(window, url);
     return;
   }
 
+  if (!isActiveNavigation(controller)) {
+    return;
+  }
+
   if (!response.ok) {
     header?.classList.remove('loading');
     globals.setLocationHref(window, url);
     return;
   }
 
-  const html = await response.text();
+  let html: string;
+  try {
+    html = await response.text();
+  } catch (err: unknown) {
+    if (!isActiveNavigation(controller)) {
+      return;
+    }
+    header?.classList.remove('loading');
+    if (isAbortError(err)) {
+      return;
+    }
+    globals.setLocationHref(window, url);
+    return;
+  }
+
+  if (!isActiveNavigation(controller)) {
+    return;
+  }
+
   header?.classList.remove('loading');
 
   const DOMParserCtor = (window as unknown as { DOMParser: typeof DOMParser })
@@ -233,7 +268,11 @@ export async function navigateToUrl(
 
   const parsed = new URL(url);
 
-  const doSwap = () => {
+  const doSwap = (): boolean => {
+    if (!isActiveNavigation(controller)) {
+      return false;
+    }
+
     teardownPerPageComponents();
     swapContent(document, newDoc);
     updateHead(document, newDoc);
@@ -257,6 +296,7 @@ export async function navigateToUrl(
 
     scrollByIndex.set(historyIndex, window.scrollY);
     scrollByLocation.set(getLocationKey(window), window.scrollY);
+    return true;
   };
 
   const transitionDoc = document as Document & {
@@ -295,7 +335,9 @@ export async function navigateToUrl(
     );
 
     const transition = transitionDoc.startViewTransition(() => {
-      doSwap();
+      if (!doSwap()) {
+        return;
+      }
 
       const newTitleEl = document.querySelector('.title-and-info');
       const newHeaderHeight =
@@ -323,13 +365,23 @@ export async function navigateToUrl(
     });
 
     await transition.finished;
+    if (!isActiveNavigation(controller)) {
+      return;
+    }
+
     document.documentElement.classList.remove('nav-forward', 'nav-back');
     cleanupViewTransitionNames(document);
   } else {
-    doSwap();
+    if (!doSwap()) {
+      return;
+    }
   }
 
   await mountPerPageComponents(window);
+  if (!isActiveNavigation(controller)) {
+    return;
+  }
+
   currentAbortController = null;
   dispatchNavigationEvent(window);
 }

package/src/page-update/index.ts

@@ -11,7 +11,7 @@ import { globals } from '../globals';
 
 const POLL_INTERVAL_MS = 600_000;
 
-export interface PageUpdateOptions {
+interface PageUpdateOptions {
   pollIntervalMs?: number;
   refreshPage?: (window: Window) => Promise<void>;
 }

package/src/search/index.ts

@@ -40,11 +40,6 @@ interface Pagefind {
 
 let pagefind: Pagefind | null = null;
 
-// Unit tests need to clear the module-scoped Pagefind instance between cases.
-export function resetPagefindForTest() {
-  pagefind = null;
-}
-
 type SubResult = { title: string; url: string; excerpt: string };
 
 type State = {

package/src/search/pdf-utils.ts

@@ -1,4 +1,4 @@
-export type SubResult = { title: string; url: string; excerpt: string };
+type SubResult = { title: string; url: string; excerpt: string };
 export type Result = {
   title: string;
   titleHtml: string | null;

package/src/slides/index.ts

@@ -1,5 +1,5 @@
 interface TraceToolbarState {
-  hidden: boolean;
+  hidden: HTMLElement['hidden'];
   ariaHidden: string | null;
 }
 

package/src/timezone/index.ts

@@ -1,50 +1,14 @@
+import {
+  DEFAULT_PERIOD_STYLE,
+  detectPeriodStyle,
+  normalizeHM,
+  to12Hour,
+  type PeriodStyle,
+} from './time-format';
+
 const STORAGE_KEY = 'timezoneSelection';
 const TIMEZONE_SELECT_LABEL = 'Time zone';
 
-type PeriodStyle = [am: string, pm: string];
-
-const DEFAULT_PERIOD_STYLE: PeriodStyle = ['a.m.', 'p.m.'];
-
-const PERIOD_PATTERNS: { pattern: RegExp; style: PeriodStyle }[] = [
-  { pattern: /[AP]\.M\./, style: ['A.M.', 'P.M.'] },
-  { pattern: /[AP]M/, style: ['AM', 'PM'] },
-  { pattern: /[ap]\.m\./, style: ['a.m.', 'p.m.'] },
-  { pattern: /[ap]m/, style: ['am', 'pm'] },
-];
-
-export function detectPeriodStyle(text: string): PeriodStyle | null {
-  for (const { pattern, style } of PERIOD_PATTERNS) {
-    if (pattern.test(text)) {
-      return style;
-    }
-  }
-  return null;
-}
-
-function pad(n: number | string) {
-  return String(n).padStart(2, '0');
-}
-
-export function to12Hour(
-  h: number,
-  m: number,
-  style: PeriodStyle | null = DEFAULT_PERIOD_STYLE,
-) {
-  const hour12 = ((h + 11) % 12) + 1;
-  if (!style) {
-    return `${hour12}:${pad(m)}`;
-  }
-  const period = h >= 12 ? style[1] : style[0];
-  return `${hour12}:${pad(m)} ${period}`;
-}
-
-export function normalizeHM(totalMinutes: number) {
-  const mins = ((totalMinutes % 1440) + 1440) % 1440;
-  const h = Math.floor(mins / 60);
-  const m = mins % 60;
-  return [h, m] as const;
-}
-
 function getDayShift(totalMinutes: number) {
   // Negative partial days like -30 minutes should still count as the previous day.
   return Math.floor(totalMinutes / 1440);

package/src/timezone/time-format.ts

@@ -0,0 +1,43 @@
+export type PeriodStyle = [am: string, pm: string];
+
+export const DEFAULT_PERIOD_STYLE: PeriodStyle = ['a.m.', 'p.m.'];
+
+const PERIOD_PATTERNS: { pattern: RegExp; style: PeriodStyle }[] = [
+  { pattern: /[AP]\.M\./, style: ['A.M.', 'P.M.'] },
+  { pattern: /[AP]M/, style: ['AM', 'PM'] },
+  { pattern: /[ap]\.m\./, style: ['a.m.', 'p.m.'] },
+  { pattern: /[ap]m/, style: ['am', 'pm'] },
+];
+
+export function detectPeriodStyle(text: string): PeriodStyle | null {
+  for (const { pattern, style } of PERIOD_PATTERNS) {
+    if (pattern.test(text)) {
+      return style;
+    }
+  }
+  return null;
+}
+
+function pad(n: number | string) {
+  return String(n).padStart(2, '0');
+}
+
+export function to12Hour(
+  h: number,
+  m: number,
+  style: PeriodStyle | null = DEFAULT_PERIOD_STYLE,
+) {
+  const hour12 = ((h + 11) % 12) + 1;
+  if (!style) {
+    return `${hour12}:${pad(m)}`;
+  }
+  const period = h >= 12 ? style[1] : style[0];
+  return `${hour12}:${pad(m)} ${period}`;
+}
+
+export function normalizeHM(totalMinutes: number) {
+  const mins = ((totalMinutes % 1440) + 1440) % 1440;
+  const h = Math.floor(mins / 60);
+  const m = mins % 60;
+  return [h, m] as const;
+}

package/src/toc/index.ts

@@ -1,14 +1,14 @@
 import { debounce } from '../util';
+import {
+  alertToTableItem,
+  getHighlightIndexes,
+  headingToTableItem,
+  switchCurrent,
+  type Dinkus,
+} from './model';
 
 const LATENCY_MS = 50;
 
-export type HeadingLevel = '1' | '2' | '3' | '4' | '5' | '6';
-export type AlertType = 'warning' | 'note';
-
-export type Alert = { type: AlertType; title: string };
-export type Heading = { level: HeadingLevel; innerHtml: string; id: string };
-export type Dinkus = { type: 'dinkus' };
-
 function getContainer(parent: HTMLElement): HTMLElement | null {
   return parent.querySelector('nav.toc');
 }
@@ -40,27 +40,6 @@ function scrollIfNeeded(element: HTMLElement, doc: Document) {
   container.scrollTo({ top: desiredScrollTop });
 }
 
-export function getHighlightIndexes(items: (Heading | Alert | Dinkus)[]) {
-  const indexes: (number | null)[] = [];
-  let currentHeadingIndex: number | null = null;
-  let tocIndex = 0;
-
-  items.forEach(item => {
-    if (!('level' in item) && item.type === 'dinkus') {
-      return;
-    }
-
-    if ('level' in item) {
-      currentHeadingIndex = tocIndex;
-    }
-
-    indexes.push(currentHeadingIndex ?? tocIndex);
-    tocIndex++;
-  });
-
-  return indexes;
-}
-
 function getHeadingsAndAlerts(
   parent: HTMLElement,
 ): (HTMLHeadingElement | HTMLDivElement)[] {
@@ -97,57 +76,6 @@ function getViewportActivationPoint(win: Window, doc: Document) {
   return headerOffset + (win.innerHeight - headerOffset) / 3;
 }
 
-export function headingToTableItem(el: HTMLHeadingElement): Heading {
-  const level = el.tagName[1] as HeadingLevel;
-
-  const subtitle = el.querySelector('.heading-subtitle');
-  const subtitleText = subtitle?.textContent || '';
-  let mainText = el.textContent || '';
-
-  if (mainText.length > 0 && subtitleText.length > 0) {
-    mainText = mainText.replace(subtitleText, '').trim();
-    return {
-      level,
-      id: el.id,
-      innerHtml: `${mainText}: <span class="heading-subtitle">${subtitleText}</span>`,
-    };
-  }
-  return { level, id: el.id, innerHtml: el.innerHTML };
-}
-
-export function alertToTableItem(el: HTMLElement): Alert | null {
-  const classes = el.className
-    .split(' ')
-    .map(cl => cl.trim())
-    .filter(cl => cl != 'alert');
-
-  const firstClass = classes[0];
-  if (firstClass === 'warning' || firstClass === 'note') {
-    let title = el.querySelector('.title')?.innerHTML;
-    if (!title) {
-      if (firstClass === 'warning') {
-        title = 'Warning';
-      } else {
-        title = 'Note';
-      }
-    }
-
-    return { type: firstClass, title };
-  }
-
-  return null;
-}
-
-export function switchCurrent(
-  oldCurrent: HTMLElement | null,
-  newCurrent: HTMLElement,
-) {
-  if (oldCurrent) {
-    oldCurrent.classList.remove('current');
-  }
-  newCurrent.classList.add('current');
-}
-
 export default (window: Window) => {
   const toc = window.document.querySelector('nav.toc') as HTMLElement;
   if (toc == null) {

package/src/toc/model.ts

@@ -0,0 +1,78 @@
+type HeadingLevel = '1' | '2' | '3' | '4' | '5' | '6';
+type AlertType = 'warning' | 'note';
+
+export type Alert = { type: AlertType; title: string };
+export type Heading = { level: HeadingLevel; innerHtml: string; id: string };
+export type Dinkus = { type: 'dinkus' };
+
+export function getHighlightIndexes(items: (Heading | Alert | Dinkus)[]) {
+  const indexes: (number | null)[] = [];
+  let currentHeadingIndex: number | null = null;
+  let tocIndex = 0;
+
+  items.forEach(item => {
+    if (!('level' in item) && item.type === 'dinkus') {
+      return;
+    }
+
+    if ('level' in item) {
+      currentHeadingIndex = tocIndex;
+    }
+
+    indexes.push(currentHeadingIndex ?? tocIndex);
+    tocIndex++;
+  });
+
+  return indexes;
+}
+
+export function headingToTableItem(el: HTMLHeadingElement): Heading {
+  const level = el.tagName[1] as HeadingLevel;
+
+  const subtitle = el.querySelector('.heading-subtitle');
+  const subtitleText = subtitle?.textContent || '';
+  let mainText = el.textContent || '';
+
+  if (mainText.length > 0 && subtitleText.length > 0) {
+    mainText = mainText.replace(subtitleText, '').trim();
+    return {
+      level,
+      id: el.id,
+      innerHtml: `${mainText}: <span class="heading-subtitle">${subtitleText}</span>`,
+    };
+  }
+  return { level, id: el.id, innerHtml: el.innerHTML };
+}
+
+export function alertToTableItem(el: HTMLElement): Alert | null {
+  const classes = el.className
+    .split(' ')
+    .map(cl => cl.trim())
+    .filter(cl => cl != 'alert');
+
+  const firstClass = classes[0];
+  if (firstClass === 'warning' || firstClass === 'note') {
+    let title = el.querySelector('.title')?.innerHTML;
+    if (!title) {
+      if (firstClass === 'warning') {
+        title = 'Warning';
+      } else {
+        title = 'Note';
+      }
+    }
+
+    return { type: firstClass, title };
+  }
+
+  return null;
+}
+
+export function switchCurrent(
+  oldCurrent: HTMLElement | null,
+  newCurrent: HTMLElement,
+) {
+  if (oldCurrent) {
+    oldCurrent.classList.remove('current');
+  }
+  newCurrent.classList.add('current');
+}

package/templates/_author.html

@@ -1,14 +1,14 @@
 <aside class="author">
   Written by
   <% if (page.author.url) { %>
-  <a href="<%= page.author.url %>">
+  <a href="<%- encodeAuthoredUrl(page.author.url) %>">
   <% } %>
   <span class="text"><%= page.author.name %></span>
   <% if (page.author.avatar) { %>
   <img
     width="32"
     height="32"
-    src="<%= page.author.avatar %>"
+    src="<%- encodeAuthoredUrl(page.author.avatar) %>"
     alt="Picture of <%= page.author.name %>"
     class="avatar"
   />

package/templates/_footer.html

@@ -1,5 +1,5 @@
 <% if (site.features.footer) { %>
 <footer data-pagefind-ignore>
-  <p>Built using <a href="https://github.com/abreen/Tada" target="_blank">Tada</a> <%= tadaVersion %></p>
+  <p>Built using <a href="https://github.com/abreen/Tada" target="_blank" rel="noopener noreferrer">Tada</a> <%= tadaVersion %></p>
 </footer>
 <% } %>

package/templates/_heading.html

@@ -1,6 +1,6 @@
 <div class="title-and-info" data-pagefind-body>
   <% if (page.parent) { %>
-  <a class="breadcrumb" href="<%= page.parent %>" data-pagefind-ignore><%= page.parentLabel %></a>
+  <a class="breadcrumb" href="<%- encodeAuthoredUrl(page.parent) %>" data-pagefind-ignore><%= page.parentLabel %></a>
   <% } %>
   <h1 data-pagefind-weight="10" data-pagefind-meta="title_html[data-title-html]" data-title-html="<%- page.titleHtml %>"><%= page.titleHtml %></h1>
 

package/templates/_nav.html

@@ -7,8 +7,8 @@
         <li>
           <a
             class="<%= cx({disabled: link.disabled, external: link.external}) %>"
-            <% if (!link.disabled) { %>href="<%= link.internal || link.external %>"<% } %>
-            <% if (link.external) { %>target="_blank"<% } %>
+            <% if (!link.disabled) { %>href="<%- encodeAuthoredUrl(link.internal || link.external) %>"<% } %>
+            <% if (link.external) { %>target="_blank" rel="noopener noreferrer"<% } %>
           >
             <%= link.text %></a>
         </li>