@abreen/tada 1.5.0 → 1.5.2

package/build/generate-content-assets.ts

@@ -158,6 +158,7 @@ export class ContentRenderer {
           assetFiles,
           literateJavaOutputPaths,
           traceCache: this.traceCache,
+          javacAvailable: this.javacAvailable,
         }),
       );
       return assets;
@@ -316,8 +317,7 @@ export class ContentRenderer {
       log.info`Processing ${dirtySourceFiles.size} content ${noun}`;
     }
 
-    const hasLiterateJava = [...dirtySourceFiles].some(isLiterateJava);
-    if (hasLiterateJava && this.javacAvailable === undefined) {
+    if (this.javacAvailable === undefined && dirtySourceFiles.size > 0) {
       this.javacAvailable = checkJavac();
       if (!this.javacAvailable) {
         log.warn`javac was not found; literate Java pages will not include execution output`;

package/build/types.d.ts

@@ -89,6 +89,7 @@ export interface RenderPlainTextOptions {
       mtime: number;
     }
   >;
+  javacAvailable?: boolean;
 }
 
 /** Options for code page asset rendering */

package/build/utils/render.ts

@@ -179,6 +179,7 @@ export function renderPlainTextPageAsset({
   assetFiles,
   literateJavaOutputPaths,
   traceCache,
+  javacAvailable,
 }: RenderPlainTextOptions): Asset[] {
   const { dir, name, ext } = path.parse(filePath);
   const subPath = path.relative(contentDir, path.join(dir, name));
@@ -197,6 +198,7 @@ export function renderPlainTextPageAsset({
       contentDir,
       distDir,
       literateJavaOutputPaths,
+      javacAvailable,
     },
   );
 
@@ -339,6 +341,7 @@ function renderPlainTextContent(
     contentDir,
     distDir,
     literateJavaOutputPaths,
+    javacAvailable,
   }: {
     validateInternalLinks?: boolean;
     traceCache?: Map<
@@ -353,6 +356,7 @@ function renderPlainTextContent(
     contentDir?: string;
     distDir?: string;
     literateJavaOutputPaths?: Set<string>;
+    javacAvailable?: boolean;
   } = {},
 ): {
   content: string | null;
@@ -446,6 +450,7 @@ function renderPlainTextContent(
       distDir,
       applyBasePath,
       cache: traceCache,
+      javacAvailable,
     });
     params.renderTrace = helpers.renderTrace;
   }

package/build/utils/trace.ts

@@ -214,6 +214,7 @@ export interface TraceContext {
   distDir: string;
   applyBasePath: (subPath: string) => string;
   cache: Map<string, TraceResult>;
+  javacAvailable?: boolean;
 }
 
 export interface TraceResult {
@@ -223,10 +224,65 @@ 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 renderWidgetHtml({
+  highlightedSource,
+  manifestUrl,
+  totalSteps,
+}: {
+  highlightedSource: string;
+  manifestUrl?: string;
+  totalSteps?: number;
+}): string {
+  const svgAttrs = `aria-hidden='true' width='16' height='16' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'`;
+  const iconFirst = `<svg xmlns='http://www.w3.org/2000/svg' ${svgAttrs}><line x1='2' y1='6' x2='2' y2='18'/><polyline points='10 6 4 12 10 18'/><line x1='4' y1='12' x2='22' y2='12'/></svg>`;
+  const iconPrev = `<svg xmlns='http://www.w3.org/2000/svg' ${svgAttrs}><polyline points='10 6 4 12 10 18'/><line x1='4' y1='12' x2='22' y2='12'/></svg>`;
+  const iconNext = `<svg xmlns='http://www.w3.org/2000/svg' ${svgAttrs}><line x1='2' y1='12' x2='20' y2='12'/><polyline points='14 6 20 12 14 18'/></svg>`;
+  const iconLast = `<svg xmlns='http://www.w3.org/2000/svg' ${svgAttrs}><line x1='2' y1='12' x2='20' y2='12'/><polyline points='14 6 20 12 14 18'/><line x1='22' y1='6' x2='22' y2='18'/></svg>`;
+  const disabled = totalSteps === undefined;
+  const counterContent = disabled ? '--' : `1/${totalSteps}`;
+  const counterStyle = disabled
+    ? ''
+    : ` style="min-width: ${String(totalSteps).length * 2 + 1}ch"`;
+  const controls =
+    `<button class="trace-btn trace-first" disabled tabindex="-1" aria-label="First step" title="First step">${iconFirst}</button>` +
+    `<button class="trace-btn trace-prev" disabled tabindex="-1" aria-label="Previous step" title="Previous step">${iconPrev}</button>` +
+    `<span class="trace-step-counter"${counterStyle}>${counterContent}</span>` +
+    (disabled
+      ? `<button class="trace-btn trace-next" disabled tabindex="-1" aria-label="Next step" title="Next step">${iconNext}</button>`
+      : `<button class="trace-btn trace-next" aria-label="Next step" title="Next step">${iconNext}</button>`) +
+    (disabled
+      ? `<button class="trace-btn trace-last" disabled tabindex="-1" aria-label="Last step" title="Last step">${iconLast}</button>`
+      : `<button class="trace-btn trace-last" tabindex="-1" aria-label="Last step" title="Last step">${iconLast}</button>`);
+  const wrapperAttrs = manifestUrl
+    ? ` data-trace-manifest="${manifestUrl}"`
+    : '';
+  const wrapperClass = disabled
+    ? 'trace-widget trace-disabled'
+    : 'trace-widget';
+  return `<div class="${wrapperClass}"${wrapperAttrs}><noscript><p>This interactive trace requires JavaScript.</p></noscript><div class="trace-body"><div class="trace-toolbar"><div class="trace-controls" role="toolbar" aria-label="Trace navigation">${controls}</div></div><div class="trace-content"><div class="trace-diagram"></div><div class="trace-source-wrapper"><div class="trace-source">${highlightedSource}</div></div><pre class="trace-output"></pre></div></div></div>`;
+}
+
 export function createTraceHelpers(context: TraceContext): {
   renderTrace: (javaFile: string) => string;
 } {
-  const { filePath, contentDir, distDir, applyBasePath, cache } = context;
+  const {
+    filePath,
+    contentDir,
+    distDir,
+    applyBasePath,
+    cache,
+    javacAvailable,
+  } = context;
   const pageDir = path.dirname(filePath);
 
   function getOrRunTrace(javaFile: string): TraceResult {
@@ -266,15 +322,7 @@ export function createTraceHelpers(context: TraceContext): {
         { timeout: 60000, encoding: 'utf-8', maxBuffer: 50 * 1024 * 1024 },
       );
 
-      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';
-      const highlightedSource = renderCodeSegment(sourceLines, 1, lang, {
-        linkLineNumbers: false,
-      });
+      const highlightedSource = highlightSource(javaFile, source);
 
       const relDir = path
         .relative(contentDir, pageDir)
@@ -315,20 +363,20 @@ export function createTraceHelpers(context: TraceContext): {
 
   return {
     renderTrace: (javaFile: string): string => {
+      if (javacAvailable === false) {
+        log.warn`javac was not found; trace for ${B`${javaFile}`} will be disabled`;
+        const javaFilePath = path.resolve(pageDir, javaFile);
+        if (!fs.existsSync(javaFilePath)) {
+          throw new Error(`Trace target not found: ${javaFilePath}`);
+        }
+        const source = fs.readFileSync(javaFilePath, 'utf-8');
+        return renderWidgetHtml({
+          highlightedSource: highlightSource(javaFile, source),
+        });
+      }
       const { manifestUrl, highlightedSource, totalSteps } =
         getOrRunTrace(javaFile);
-      const svgAttrs = `aria-hidden='true' width='16' height='16' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'`;
-      const iconFirst = `<svg xmlns='http://www.w3.org/2000/svg' ${svgAttrs}><line x1='2' y1='6' x2='2' y2='18'/><polyline points='10 6 4 12 10 18'/><line x1='4' y1='12' x2='22' y2='12'/></svg>`;
-      const iconPrev = `<svg xmlns='http://www.w3.org/2000/svg' ${svgAttrs}><polyline points='10 6 4 12 10 18'/><line x1='4' y1='12' x2='22' y2='12'/></svg>`;
-      const iconNext = `<svg xmlns='http://www.w3.org/2000/svg' ${svgAttrs}><line x1='2' y1='12' x2='20' y2='12'/><polyline points='14 6 20 12 14 18'/></svg>`;
-      const iconLast = `<svg xmlns='http://www.w3.org/2000/svg' ${svgAttrs}><line x1='2' y1='12' x2='20' y2='12'/><polyline points='14 6 20 12 14 18'/><line x1='22' y1='6' x2='22' y2='18'/></svg>`;
-      const controls =
-        `<button class="trace-btn trace-first" disabled tabindex="-1" aria-label="First step" title="First step">${iconFirst}</button>` +
-        `<button class="trace-btn trace-prev" disabled tabindex="-1" aria-label="Previous step" title="Previous step">${iconPrev}</button>` +
-        `<span class="trace-step-counter" style="min-width: ${String(totalSteps).length * 2 + 1}ch">1/${totalSteps}</span>` +
-        `<button class="trace-btn trace-next" aria-label="Next step" title="Next step">${iconNext}</button>` +
-        `<button class="trace-btn trace-last" tabindex="-1" aria-label="Last step" title="Last step">${iconLast}</button>`;
-      return `<div class="trace-widget" data-trace-manifest="${manifestUrl}"><noscript><p>This interactive trace requires JavaScript.</p></noscript><div class="trace-body"><div class="trace-toolbar"><div class="trace-controls" role="toolbar" aria-label="Trace navigation">${controls}</div></div><div class="trace-content"><div class="trace-diagram"></div><div class="trace-source-wrapper"><div class="trace-source">${highlightedSource}</div></div><pre class="trace-output"></pre></div></div></div>`;
+      return renderWidgetHtml({ highlightedSource, manifestUrl, totalSteps });
     },
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abreen/tada",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "type": "module",
   "description": "A static site generator",
   "license": "MIT",
@@ -21,10 +21,11 @@
     "init/",
     "schema/",
     "types/",
-    "tsconfig.json"
+    "tsconfig.json",
+    "!**/*.test.ts"
   ],
   "scripts": {
-    "prepare": "husky && bun run scripts/check-deps.ts",
+    "prepare": "bunx husky && bun run scripts/check-deps.ts",
     "prepack": "bun run scripts/prepack.ts",
     "lint": "eslint src/ build/ bin/",
     "typecheck": "tsc --noEmit",

package/src/trace/index.ts

@@ -175,7 +175,15 @@ async function initWidget(root: HTMLElement, doc: Document): Promise<void> {
     return;
   }
 
-  const res = await fetch(manifestUrl);
+  let res: Response;
+  try {
+    res = await fetch(manifestUrl);
+  } catch {
+    return;
+  }
+  if (!res.ok) {
+    return;
+  }
   const manifest: TraceManifest = await res.json();
 
   const state: WidgetState = { manifest, chunks: new Map(), currentStep: 0 };

package/bin/validators.test.ts

@@ -1,205 +0,0 @@
-import { describe, expect, test } from 'bun:test';
-import type { SiteConfigInput } from '../build/types';
-import {
-  validateSymbol,
-  validateColor,
-  validateHue,
-  validateUrl,
-  validateBasePath,
-  createSiteConfig,
-} from './validators';
-
-describe('validateSymbol', () => {
-  test('accepts a single uppercase letter', () => {
-    expect(validateSymbol('A')).toBeNull();
-  });
-
-  test('accepts digits and uppercase letters up to 5 chars', () => {
-    expect(validateSymbol('CS 0')).toBeNull();
-    expect(validateSymbol('CS101')).toBeNull();
-    expect(validateSymbol('AB-CD')).toBeNull();
-  });
-
-  test('rejects empty string', () => {
-    expect(validateSymbol('')).not.toBeNull();
-  });
-
-  test('rejects value longer than 5 chars', () => {
-    expect(validateSymbol('TOOLONG')).not.toBeNull();
-  });
-
-  test('rejects lowercase letters', () => {
-    expect(validateSymbol('abc')).not.toBeNull();
-  });
-
-  test('rejects special characters', () => {
-    expect(validateSymbol('A@B')).not.toBeNull();
-    expect(validateSymbol('A.B')).not.toBeNull();
-  });
-});
-
-describe('validateColor', () => {
-  test('accepts CSS color names', () => {
-    expect(validateColor('red')).toBeNull();
-    expect(validateColor('tomato')).toBeNull();
-    expect(validateColor('blue')).toBeNull();
-  });
-
-  test('accepts hex colors', () => {
-    expect(validateColor('#f00')).toBeNull();
-    expect(validateColor('#ff0000')).toBeNull();
-    expect(validateColor('#c04040')).toBeNull();
-  });
-
-  test('accepts HSL colors', () => {
-    expect(validateColor('hsl(195 70% 40%)')).toBeNull();
-    expect(validateColor('hsl(195, 70%, 40%)')).toBeNull();
-    expect(validateColor('hsl(195deg 70% 40%)')).toBeNull();
-  });
-
-  test('accepts RGB colors', () => {
-    expect(validateColor('rgb(0 0 0)')).toBeNull();
-    expect(validateColor('rgb(255, 99, 71)')).toBeNull();
-  });
-
-  test('rejects empty string', () => {
-    expect(validateColor('')).not.toBeNull();
-  });
-
-  test('rejects invalid color strings', () => {
-    expect(validateColor('notacolor')).not.toBeNull();
-    expect(validateColor('hsl 195 70% 40%')).not.toBeNull();
-  });
-});
-
-describe('validateHue', () => {
-  test('accepts integer', () => {
-    expect(validateHue('0')).toBeNull();
-    expect(validateHue('180')).toBeNull();
-    expect(validateHue('360')).toBeNull();
-  });
-
-  test('accepts integer with deg suffix', () => {
-    expect(validateHue('90deg')).toBeNull();
-    expect(validateHue('360deg')).toBeNull();
-  });
-
-  test('rejects empty string', () => {
-    expect(validateHue('')).not.toBeNull();
-  });
-
-  test('rejects out of range', () => {
-    expect(validateHue('-1')).not.toBeNull();
-    expect(validateHue('361')).not.toBeNull();
-  });
-
-  test('rejects non-integer', () => {
-    expect(validateHue('1.5')).not.toBeNull();
-    expect(validateHue('abc')).not.toBeNull();
-  });
-});
-
-describe('validateUrl', () => {
-  test('accepts https URL', () => {
-    expect(validateUrl('https://example.edu')).toBeNull();
-  });
-
-  test('accepts http URL', () => {
-    expect(validateUrl('http://localhost')).toBeNull();
-  });
-
-  test('accepts URL with port', () => {
-    expect(validateUrl('http://localhost:8080')).toBeNull();
-  });
-
-  test('rejects empty string', () => {
-    expect(validateUrl('')).not.toBeNull();
-  });
-
-  test('rejects trailing slash', () => {
-    expect(validateUrl('https://example.edu/')).not.toBeNull();
-  });
-
-  test('rejects URL with path', () => {
-    expect(validateUrl('https://example.edu/foo')).not.toBeNull();
-  });
-
-  test('rejects non-http scheme', () => {
-    expect(validateUrl('ftp://example.edu')).not.toBeNull();
-  });
-
-  test('rejects bare domain', () => {
-    expect(validateUrl('example.edu')).not.toBeNull();
-  });
-});
-
-describe('validateBasePath', () => {
-  test('accepts root path', () => {
-    expect(validateBasePath('/')).toBeNull();
-  });
-
-  test('accepts simple path segment', () => {
-    expect(validateBasePath('/foo')).toBeNull();
-    expect(validateBasePath('/foo-bar')).toBeNull();
-    expect(validateBasePath('/cs101')).toBeNull();
-  });
-
-  test('rejects path without leading slash', () => {
-    expect(validateBasePath('foo')).not.toBeNull();
-  });
-
-  test('rejects trailing slash', () => {
-    expect(validateBasePath('/foo/')).not.toBeNull();
-  });
-
-  test('rejects spaces', () => {
-    expect(validateBasePath('/foo bar')).not.toBeNull();
-  });
-
-  test('rejects nested paths', () => {
-    expect(validateBasePath('/foo/bar')).not.toBeNull();
-  });
-});
-
-describe('createSiteConfig', () => {
-  const base: SiteConfigInput = {
-    title: 'Test Site',
-    symbol: 'TS',
-    themeColor: 'hsl(200 50% 40%)',
-    tintHue: '20',
-    tintAmount: '100',
-    defaultTimeZone: 'America/New_York',
-    base: 'https://example.edu',
-    basePath: '/',
-    internalDomains: ['example.edu'],
-    features: { search: true, code: true, favicon: false },
-  };
-
-  test('returns an object with all expected keys', () => {
-    const config = createSiteConfig(base);
-    expect(config).toMatchObject({
-      title: 'Test Site',
-      symbol: 'TS',
-      themeColor: 'hsl(200 50% 40%)',
-      base: 'https://example.edu',
-      basePath: '/',
-      internalDomains: ['example.edu'],
-      defaultTimeZone: 'America/New_York',
-      features: { search: true, code: true, favicon: false },
-      codeLanguages: { java: 'java', py: 'python' },
-      vars: {},
-    });
-  });
-
-  test('coerces tintHue and tintAmount to numbers', () => {
-    const config = createSiteConfig(base);
-    expect(config.tintHue).toBe(20);
-    expect(config.tintAmount).toBe(100);
-  });
-
-  test('coerces numeric string tintHue correctly', () => {
-    const config = createSiteConfig({ ...base, tintHue: '0', tintAmount: '0' });
-    expect(config.tintHue).toBe(0);
-    expect(config.tintAmount).toBe(0);
-  });
-});