@abreen/tada 1.7.0 → 1.7.1

package/build/utils/trace.ts

@@ -5,7 +5,7 @@ import { execFileSync } from 'child_process';
 import { makeLogger } from '../log';
 import { B } from '../colors';
 import { normalizeOutputPath, toPosix } from './paths';
-import { hasMainMethod } from './literate-java';
+import { hasMainMethod, runJavac, splitLines } from './literate-java';
 import { renderCodeSegment } from './code';
 import { computeLayout } from './trace-layout';
 import { generateStepSvg } from './trace-svg';
@@ -90,19 +90,10 @@ function ensureTracerCompiled(): string {
 
   log.debug`Compiling TraceRunner.java into ${tempDir}`;
 
-  try {
-    execFileSync('javac', ['-d', tempDir, sourceFile], {
-      timeout: 30000,
-      stdio: ['pipe', 'pipe', 'pipe'],
-    });
-  } catch (err: unknown) {
-    const execErr = err as { stderr?: Buffer; message: string };
-    const stderr = execErr.stderr ? execErr.stderr.toString() : execErr.message;
-    fs.rmSync(tempDir, { recursive: true, force: true });
-    throw new Error(`Failed to compile TraceRunner.java:\n${stderr}`, {
-      cause: err,
-    });
-  }
+  runJavac(['-d', tempDir, sourceFile], {
+    tempDir,
+    label: 'Failed to compile TraceRunner.java',
+  });
 
   tracerClassDir = tempDir;
   return tempDir;
@@ -111,27 +102,17 @@ function ensureTracerCompiled(): string {
 function compileTargetFile(javaFilePath: string): string {
   const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'tada-trace-target-'));
 
-  try {
-    execFileSync(
-      'javac',
-      [
-        '-g',
-        '-d',
-        tempDir,
-        '-sourcepath',
-        path.dirname(javaFilePath),
-        javaFilePath,
-      ],
-      { timeout: 30000, stdio: ['pipe', 'pipe', 'pipe'] },
-    );
-  } catch (err: unknown) {
-    const execErr = err as { stderr?: Buffer; message: string };
-    const stderr = execErr.stderr ? execErr.stderr.toString() : execErr.message;
-    fs.rmSync(tempDir, { recursive: true, force: true });
-    throw new Error(`Compilation failed for ${javaFilePath}:\n${stderr}`, {
-      cause: err,
-    });
-  }
+  runJavac(
+    [
+      '-g',
+      '-d',
+      tempDir,
+      '-sourcepath',
+      path.dirname(javaFilePath),
+      javaFilePath,
+    ],
+    { tempDir, label: `Compilation failed for ${javaFilePath}` },
+  );
 
   return tempDir;
 }
@@ -224,14 +205,10 @@ export interface TraceResult {
   mtime: number;
 }
 
-function highlightSource(javaFile: string, source: string): string {
-  const sourceLines = source.split('\n');
-  if (sourceLines[sourceLines.length - 1] === '') {
-    sourceLines.pop();
-  }
-  const ext = path.extname(javaFile).slice(1).toLowerCase();
-  const lang = ext === 'java' ? 'java' : 'text';
-  return renderCodeSegment(sourceLines, 1, lang, { linkLineNumbers: false });
+function highlightSource(source: string): string {
+  return renderCodeSegment(splitLines(source), 1, 'java', {
+    linkLineNumbers: false,
+  });
 }
 
 function renderWidgetHtml({
@@ -322,7 +299,7 @@ export function createTraceHelpers(context: TraceContext): {
         { timeout: 60000, encoding: 'utf-8', maxBuffer: 50 * 1024 * 1024 },
       );
 
-      const highlightedSource = highlightSource(javaFile, source);
+      const highlightedSource = highlightSource(source);
 
       const relDir = toPosix(path.relative(contentDir, pageDir));
       const traceOutputDir = path.join(distDir, relDir, '_traces', className);
@@ -367,9 +344,7 @@ export function createTraceHelpers(context: TraceContext): {
           throw new Error(`Trace target not found: ${javaFilePath}`);
         }
         const source = fs.readFileSync(javaFilePath, 'utf-8');
-        return renderWidgetHtml({
-          highlightedSource: highlightSource(javaFile, source),
-        });
+        return renderWidgetHtml({ highlightedSource: highlightSource(source) });
       }
       const { manifestUrl, highlightedSource, totalSteps } =
         getOrRunTrace(javaFile);

package/build/validate-internal-links-plugin.ts

@@ -1,6 +1,7 @@
 import type MarkdownIt from 'markdown-it';
 import type Token from 'markdown-it/lib/token.mjs';
 import path from 'path';
+import { isInternalLink } from './utils/link';
 import { makeLogger } from './log';
 
 const log = makeLogger(import.meta.url);
@@ -17,14 +18,6 @@ function stripQueryAndHash(href: string): string {
   return href.split('#')[0].split('?')[0];
 }
 
-function isExternalOrAnchor(href: string): boolean {
-  if (!href || href.startsWith('#') || href.startsWith('//')) {
-    return true;
-  }
-
-  return /^[a-zA-Z][a-zA-Z\d+.-]*:/.test(href);
-}
-
 function normalizePathname(pathname: string): string {
   const normalized = path.posix.normalize(pathname);
   if (normalized === '.') {
@@ -142,7 +135,7 @@ export default function validateInternalLinks(
     }
 
     const href = rawHref.trim();
-    if (!href || isExternalOrAnchor(href)) {
+    if (!href || !isInternalLink(href)) {
       return;
     }
 

package/build/watch-reload-client.ts

@@ -2,12 +2,10 @@ declare const __WEBSOCKET_PORT__: number;
 
 (function () {
   const style = document.createElement('style');
-  style.textContent = [
-    'body.loading-cursor,',
-    'body.loading-cursor * {',
-    '  cursor: wait !important;',
-    '}',
-  ].join('\n');
+  style.textContent = `body.loading-cursor,
+body.loading-cursor * {
+  cursor: wait !important;
+}`;
   document.head.appendChild(style);
 
   const ws = new WebSocket(`ws://localhost:${__WEBSOCKET_PORT__}`);

package/build/watch.ts

@@ -2,7 +2,7 @@ import fs from 'fs';
 import path from 'path';
 import chokidar from 'chokidar';
 import WebSocket, { WebSocketServer } from 'ws';
-import type { SiteVariables, WatchState } from './types';
+import type { SiteVariables, WatchState, ContentRenderResult } from './types';
 import { B } from './colors';
 import { makeLogger, printFlair } from './log';
 import { getDevSiteVariables } from './site-variables';
@@ -36,7 +36,7 @@ export async function runWatch(options: {
   httpPort?: number;
   wsPort?: number;
 }): Promise<void> {
-  const httpPort = options.httpPort ?? null;
+  const httpPort = options.httpPort;
   const WEBSOCKET_PORT = options.wsPort ?? 35729;
   const DEBOUNCE_MS = 300;
   const RELOAD_CLIENT_PATH = path.resolve(
@@ -69,7 +69,6 @@ export async function runWatch(options: {
 
   let webSocketsReady = false;
   let watcherReady = false;
-  let webServerReady = false;
   let webServerTimeout: ReturnType<typeof setTimeout> | undefined;
   let serveStarted = false;
 
@@ -117,30 +116,23 @@ export async function runWatch(options: {
   // Dev server
 
   function serve(): void {
+    webServerTimeout = setTimeout(() => {
+      log.error`Web server failed to report within 10 seconds, exiting`;
+      process.exit(3);
+    }, 10000);
+
     startServer({
-      port: httpPort ?? undefined,
+      port: httpPort,
       distDir,
-      onReady: _port => {
-        webServerReady = true;
+      onReady: () => {
         clearTimeout(webServerTimeout);
       },
     });
-
-    webServerTimeout = setTimeout(() => {
-      if (webServerReady) {
-        return;
-      }
-      log.error`Web server failed to report within 10 seconds, exiting`;
-      process.exit(3);
-    }, 10000);
   }
 
   // Path helpers
 
   function toContentMarkdownPath(filePath: string): string | null {
-    if (!filePath) {
-      return null;
-    }
     const ext = path.extname(filePath).toLowerCase();
     if (!['.md', '.markdown'].includes(ext)) {
       return null;
@@ -156,9 +148,6 @@ export async function runWatch(options: {
   }
 
   function toPublicRelativePath(filePath: string): string | null {
-    if (!filePath) {
-      return null;
-    }
     const normalizedPublicDir = path.resolve(publicDir) + path.sep;
     const normalizedFilePath = path.resolve(filePath);
     if (!normalizedFilePath.startsWith(normalizedPublicDir)) {
@@ -185,14 +174,39 @@ export async function runWatch(options: {
   const pendingChanges = new Set<string>();
   let rebuilding = false;
 
-  async function initialBuild(): Promise<void> {
-    siteVariables = getDevSiteVariables();
+  function onBuildSuccess(result?: ContentRenderResult): void {
+    printFlair();
+    if (!serveStarted) {
+      serveStarted = true;
+      serve();
+    }
+    broadcast('reload');
+    if (pagefindRunner && result) {
+      pagefindRunner.update(distDir, result.htmlAssetsByPath);
+      setImmediate(() => pagefindRunner!.run());
+    }
+  }
+
+  function copyChangedPublicFiles(changes: Set<string>): void {
+    for (const filePath of changes) {
+      if (classifyChange(filePath) !== 'public') {
+        continue;
+      }
+      const absPath = path.resolve(filePath);
+      if (fs.existsSync(absPath)) {
+        copyPublicFile(publicDir, distDir, absPath, contentAssetRelPaths);
+        const rel = toPosix(path.relative(publicDir, absPath));
+        publicRelPaths.add(rel);
+      }
+    }
+  }
+
+  async function buildFromConfig(
+    copyAssets: boolean,
+  ): Promise<ContentRenderResult> {
     processedExtSet = new Set(
       getProcessedExtensions(Object.keys(siteVariables.codeLanguages || {})),
     );
-    fs.mkdirSync(distDir, { recursive: true });
-
-    compileTemplates(siteVariables);
     contentRenderer = new ContentRenderer(siteVariables);
     changeDetector = new ContentChangeDetector(siteVariables);
 
@@ -200,6 +214,7 @@ export async function runWatch(options: {
       pagefindRunner = new WatchPagefindRunner(siteVariables);
     }
 
+    compileTemplates(siteVariables);
     await contentRenderer.initHighlighter();
 
     assetFiles = [
@@ -215,15 +230,24 @@ export async function runWatch(options: {
       generateWebAppManifest(siteVariables, distDir);
     }
 
-    publicRelPaths = copyPublicFiles(publicDir, distDir);
-    contentAssetRelPaths = copyContentAssets(
-      contentDir,
-      distDir,
-      [...processedExtSet],
-      publicRelPaths,
-    );
+    if (copyAssets) {
+      publicRelPaths = copyPublicFiles(publicDir, distDir);
+      contentAssetRelPaths = copyContentAssets(
+        contentDir,
+        distDir,
+        [...processedExtSet],
+        publicRelPaths,
+      );
+    }
+
+    return contentRenderer.processContent({ distDir, assetFiles });
+  }
+
+  async function initialBuild(): Promise<void> {
+    siteVariables = getDevSiteVariables();
+    fs.mkdirSync(distDir, { recursive: true });
 
-    const result = contentRenderer.processContent({ distDir, assetFiles });
+    const result = await buildFromConfig(true);
 
     for (const err of result.errors) {
       log.error`${err.message}`;
@@ -231,12 +255,10 @@ export async function runWatch(options: {
 
     if (result.errors.length === 0) {
       printFlair();
-
       if (pagefindRunner) {
         pagefindRunner.update(distDir, result.htmlAssetsByPath);
         setImmediate(() => pagefindRunner!.run());
       }
-
       if (!serveStarted) {
         serveStarted = true;
         serve();
@@ -293,47 +315,13 @@ export async function runWatch(options: {
       if (categories.has('config')) {
         log.event`Site config changed, restarting`;
         siteVariables = getDevSiteVariables();
-        processedExtSet = new Set(
-          getProcessedExtensions(
-            Object.keys(siteVariables.codeLanguages || {}),
-          ),
-        );
-        contentRenderer = new ContentRenderer(siteVariables);
-        changeDetector = new ContentChangeDetector(siteVariables);
-        if (isFeatureEnabled(siteVariables, 'search')) {
-          pagefindRunner = new WatchPagefindRunner(siteVariables);
-        }
-        compileTemplates(siteVariables);
-        await contentRenderer.initHighlighter();
-
-        assetFiles = [
-          ...(await bundle(siteVariables, { mode: 'development' })),
-          ...(await bundleReloadClient()),
-        ];
-
-        copyFonts(distDir);
-        copyKatexAssets(distDir);
 
-        if (isFeatureEnabled(siteVariables, 'favicon')) {
-          await generateFavicons(siteVariables, distDir);
-          generateWebAppManifest(siteVariables, distDir);
-        }
-
-        const result = contentRenderer.processContent({ distDir, assetFiles });
+        const result = await buildFromConfig(false);
         for (const err of result.errors) {
           log.error`${err.message}`;
         }
         if (result.errors.length === 0) {
-          printFlair();
-          if (!serveStarted) {
-            serveStarted = true;
-            serve();
-          }
-          broadcast('reload');
-          if (pagefindRunner) {
-            pagefindRunner.update(distDir, result.htmlAssetsByPath);
-            setImmediate(() => pagefindRunner!.run());
-          }
+          onBuildSuccess(result);
           succeeded = true;
         }
         return;
@@ -341,18 +329,8 @@ export async function runWatch(options: {
 
       // Public file changed, copy just that file
       if (categories.has('public') && !categories.has('content')) {
-        for (const filePath of changes) {
-          if (classifyChange(filePath) === 'public') {
-            const absPath = path.resolve(filePath);
-            if (fs.existsSync(absPath)) {
-              copyPublicFile(publicDir, distDir, absPath, contentAssetRelPaths);
-              const rel = toPosix(path.relative(publicDir, absPath));
-              publicRelPaths.add(rel);
-            }
-          }
-        }
-        printFlair();
-        broadcast('reload');
+        copyChangedPublicFiles(changes);
+        onBuildSuccess();
         succeeded = true;
         return;
       }
@@ -381,16 +359,7 @@ export async function runWatch(options: {
 
       // Copy any changed public files too
       if (categories.has('public')) {
-        for (const filePath of changes) {
-          if (classifyChange(filePath) === 'public') {
-            const absPath = path.resolve(filePath);
-            if (fs.existsSync(absPath)) {
-              copyPublicFile(publicDir, distDir, absPath, contentAssetRelPaths);
-              const rel = toPosix(path.relative(publicDir, absPath));
-              publicRelPaths.add(rel);
-            }
-          }
-        }
+        copyChangedPublicFiles(changes);
       }
 
       // Copy any changed non-processed content files (images, PDFs, etc.)
@@ -428,17 +397,7 @@ export async function runWatch(options: {
       }
 
       if (result.errors.length === 0) {
-        printFlair();
-        if (!serveStarted) {
-          serveStarted = true;
-          serve();
-        }
-        broadcast('reload');
-
-        if (pagefindRunner) {
-          pagefindRunner.update(distDir, result.htmlAssetsByPath);
-          setImmediate(() => pagefindRunner!.run());
-        }
+        onBuildSuccess(result);
         succeeded = true;
       }
     } catch (err) {
@@ -511,11 +470,10 @@ export async function runWatch(options: {
       watcher.on('add', onFileChange);
       watcher.on('unlink', onFileChange);
 
-      let configWatcherReady = false;
-      let contentWatcherReady = false;
+      let watchersReady = 0;
 
       function onWatcherReady(): void {
-        if (!configWatcherReady || !contentWatcherReady) {
+        if (++watchersReady < 2) {
           return;
         }
         watcherReady = true;
@@ -526,15 +484,8 @@ export async function runWatch(options: {
         log.info`Watching for changes...`;
       }
 
-      configWatcher.on('ready', () => {
-        configWatcherReady = true;
-        onWatcherReady();
-      });
-
-      watcher.on('ready', () => {
-        contentWatcherReady = true;
-        onWatcherReady();
-      });
+      configWatcher.on('ready', onWatcherReady);
+      watcher.on('ready', onWatcherReady);
     });
 
   // Return a promise that never resolves (watch mode runs until killed)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abreen/tada",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "type": "module",
   "description": "A static site generator",
   "license": "MIT",
@@ -78,7 +78,7 @@
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",
-    "@playwright/test": "1.56.1",
+    "@playwright/test": "^1.59.1",
     "@saintedlama/lcov-parse": "^1.0.1",
     "@types/bun": "^1.3.10",
     "@types/culori": "^4.0.1",

package/src/_base.scss

@@ -106,6 +106,7 @@ pre {
   padding: var(--gap);
 
   code {
+    font-size: inherit;
     padding: 0;
   }
 }

package/src/literate/style.scss

@@ -60,6 +60,7 @@ body.literate .literate-code-output {
 
   @media (width >= 924px) {
     grid-template-columns: 1fr 1fr;
+    align-items: start;
 
     > pre:last-child {
       min-width: 150px;

package/src/print/style.scss

@@ -30,10 +30,25 @@
 
   pre,
   tt,
-  :not(pre) > code {
+  code {
     border: 1px solid #ccc;
   }
 
+  pre {
+    white-space: pre-wrap;
+  }
+
+  pre code {
+    border: none;
+  }
+
+  .code-body pre,
+  .code-prose-content code,
+  .file-header tt,
+  .file-header code {
+    border: none;
+  }
+
   // .alert strips the default padding from inline code (since it also
   // strips the background). In print we add a border, so restore the
   // padding so the border doesn't hug the text.

package/templates/_theme.scss

@@ -53,7 +53,6 @@
   --font-weight: 400;
   --line-height: 1.7;
 
-  // Use em units to specify a size relative to normal body text
   --mono-font-size: 0.94em;
   --mono-line-height: 1.5;
   --mono-border-radius: 0.375em;