explico 0.1.1 → 0.3.0

package/src/compiler/manifest.ts

@@ -34,6 +34,7 @@ import {
   readdirSync,
   writeFileSync,
 } from 'node:fs';
+import { createRequire } from 'node:module';
 import { dirname, join, relative } from 'node:path';
 import { parseFrontmatter } from '@astrojs/markdown-remark';
 
@@ -51,13 +52,26 @@ import {
   type EquationDiagnostic,
   type EquationLabelRecord,
 } from '../reference/equations-validate';
+import {
+  validateTables,
+  type TableDiagnostic,
+  type TableLabelRecord,
+} from '../reference/tables-validate';
+import {
+  validateFigures,
+  type FigureDiagnostic,
+  type FigureLabelRecord,
+} from '../reference/figures-validate';
 import {
   gateContentMath,
   type MathGateDiagnostic,
 } from '../reference/gate-math';
 import { loadLintIgnore } from '../reference/lint-ignore';
 import { buildNotationRegistry } from '../reference/registry';
+import { formulaGlyphScope } from '../reference/gloss';
+import type { GlyphScopeEntry } from '../reference/gloss';
 import { resolveReferenceId } from '../reference/references';
+import type { NotationGlossEntry } from '../reference/types';
 import type {
   EditorialStatus,
   NotationBacklink,
@@ -67,6 +81,10 @@ import type {
   NotationPageBundle,
 } from '../reference/types';
 import type { CourseConfig } from './course-config';
+import {
+  resolveKnowledgeVersion,
+  type KnowledgeVersionDiagnostic,
+} from './knowledge-version';
 import {
   loadCurriculumCatalog,
   loadNotationDefinitions,
@@ -78,6 +96,7 @@ import {
   buildSidebar,
   deriveSources,
   isLessonSlug,
+  lessonIdFromSlug,
   type SidebarGroup,
 } from './lesson-derivation';
 
@@ -89,8 +108,16 @@ import {
  * `diagnostics.consistency` (Tier-3 corpus checks).
  * v3 (D7): `equations` (labelled display equations + cross-page number table),
  * `lessons[].equations`, and `diagnostics.equations`.
+ * v4 (F-tables-figures): `tables`/`figures` (same shape as `equations`, for
+ * `<Table>`/`<Figure>`), `lessons[].tables`/`lessons[].figures`, and
+ * `diagnostics.tables`/`diagnostics.figures`.
+ * v5 (about): `about` (engine identity from `explico`'s `package.json`, the
+ * course's reader-facing `about` block, and the knowledge version resolved
+ * against `content/CHANGELOG.md`) and `diagnostics.knowledge`.
+ * v6 (chapter numbering): `lessons[].chapter` — the lesson's 1-based course
+ * ordinal, the chapter in every equation/table/figure number (`(2.1)`).
  */
-export const MANIFEST_SCHEMA_VERSION = 3;
+export const MANIFEST_SCHEMA_VERSION = 6;
 
 const REPOSITORY_ROOT = process.cwd();
 // Content is the top-level `content/` folder; the build output is `build/`
@@ -98,6 +125,33 @@ const REPOSITORY_ROOT = process.cwd();
 const CONTENT_ROOT = join(REPOSITORY_ROOT, 'content');
 export const MANIFEST_PATH = join(REPOSITORY_ROOT, 'build', 'manifest.json');
 
+interface EnginePackage {
+  readonly name: string;
+  readonly version: string;
+  readonly homepage?: string;
+}
+
+/**
+ * `explico`'s own identity — the golden source for the engine version the About
+ * panel shows (the README points here, not a literal).
+ *
+ * Resolved as the bare specifier `explico/package.json` (a published `exports`
+ * entry, and a package self-reference inside this repo) through `createRequire`,
+ * so it survives being re-bundled by a course's Astro build — a relative
+ * `../../package.json` would follow the *bundle* location, not the source's.
+ * Lazy + cached: importing this module for `readManifestSync` must stay free of
+ * filesystem side effects; only `compileManifest` needs the value.
+ */
+let enginePackage: EnginePackage | undefined;
+function readEnginePackage(): EnginePackage {
+  if (!enginePackage) {
+    enginePackage = createRequire(import.meta.url)(
+      'explico/package.json',
+    ) as EnginePackage;
+  }
+  return enginePackage;
+}
+
 // --- shape ------------------------------------------------------------
 
 export interface ManifestCitation {
@@ -137,12 +191,26 @@ export interface ManifestLessonNotation {
   readonly seeAlso: readonly string[];
   readonly units?: string;
   readonly formula?: string;
+  /** Symbols the formula names that have no card of their own (D15). */
+  readonly glosses: readonly NotationGlossEntry[];
+  /**
+   * Entry-scoped glyph table for `formula` — the entry, its glosses, and any
+   * card the formula names. Precomputed here because the whole card set lives
+   * in the compiler, not in the page component.
+   */
+  readonly formulaScope: readonly GlyphScopeEntry[];
 }
 
 export interface ManifestLesson {
   readonly id: string;
   /** Docs-loader slug, e.g. `bonds/price-yield-relationship`. */
   readonly slug: string;
+  /**
+   * The lesson's 1-based ordinal in the course (merged track order, then any
+   * unranked lessons by slug). It is the chapter in every equation, table, and
+   * figure number on the page — `(2.1)` is the first equation of chapter 2.
+   */
+  readonly chapter: number;
   readonly file: string;
   readonly title: string;
   readonly description: string;
@@ -161,6 +229,16 @@ export interface ManifestLesson {
     readonly key: string;
     readonly number: string;
   }[];
+  /** Keyed `<Table>` elements in appearance order. */
+  readonly tables: readonly {
+    readonly key: string;
+    readonly number: string;
+  }[];
+  /** Keyed `<Figure>` elements in appearance order. */
+  readonly figures: readonly {
+    readonly key: string;
+    readonly number: string;
+  }[];
   readonly notation: {
     readonly bindings: readonly {
       readonly key: string;
@@ -173,8 +251,37 @@ export interface ManifestLesson {
   };
 }
 
+/** The reader-facing "about this material" bundle — the `[?]` panel's data. */
+export interface ManifestAbout {
+  /** `explico`'s own identity, from its `package.json` (the version's golden source). */
+  readonly engine: {
+    readonly name: string;
+    readonly version: string;
+    readonly homepage?: string;
+  };
+  readonly material: { readonly name: string; readonly summary: string };
+  /** The course's knowledge version — semver over the content, engine-independent. */
+  readonly knowledge: {
+    readonly version: string;
+    /** Date of the newest `content/CHANGELOG.md` entry, if it has one. */
+    readonly date?: string;
+    /** Bullet notes from that entry. */
+    readonly notes: readonly string[];
+    /** Content fingerprint at compile time — ties the shown version to a build. */
+    readonly contentTree: string;
+  };
+  readonly authors: readonly {
+    readonly name: string;
+    readonly contact?: string;
+  }[];
+  readonly disclaimer: string;
+  readonly changelogHref?: string;
+}
+
 export interface Manifest {
   readonly schemaVersion: number;
+  /** Reader-facing identity + versions (the `[?]` About panel). */
+  readonly about: ManifestAbout;
   readonly notation: {
     readonly definitions: readonly NotationDefinitionRecord[];
     readonly bundles: readonly NotationPageBundle[];
@@ -196,6 +303,16 @@ export interface Manifest {
     /** `slug -> { eqKey: number }` — passed to `remarkNotation` for `[[slug#eq:key]]`. */
     readonly numbersBySlug: Record<string, Record<string, string>>;
   };
+  /** Keyed-float identity for `<Table>` — same shape as `equations`. */
+  readonly tables: {
+    readonly labels: readonly TableLabelRecord[];
+    readonly numbersBySlug: Record<string, Record<string, string>>;
+  };
+  /** Keyed-float identity for `<Figure>` — same shape as `equations`. */
+  readonly figures: {
+    readonly labels: readonly FigureLabelRecord[];
+    readonly numbersBySlug: Record<string, Record<string, string>>;
+  };
   readonly diagnostics: {
     readonly curriculum: readonly CurriculumIssue[];
     readonly notation: readonly NotationDiagnostic[];
@@ -203,8 +320,14 @@ export interface Manifest {
     readonly math: readonly MathGateDiagnostic[];
     /** Tier-3 corpus consistency checks (D6). Warnings only. */
     readonly consistency: readonly ConsistencyDiagnostic[];
+    /** Knowledge-version checks (C3): `about.version` vs `content/CHANGELOG.md`. Warnings only. */
+    readonly knowledge: readonly KnowledgeVersionDiagnostic[];
     /** Equation-identity checks (D7): `eq-duplicate-key`, `eq-ref-resolves` (error); `eq-key-unused` (warning). */
     readonly equations: readonly EquationDiagnostic[];
+    /** `<Table>` identity checks (F-tables-figures) — same codes, `tab-` prefixed. */
+    readonly tables: readonly TableDiagnostic[];
+    /** `<Figure>` identity checks (F-tables-figures) — same codes, `fig-` prefixed. */
+    readonly figures: readonly FigureDiagnostic[];
   };
   readonly hashes: {
     /** `sha256` of every content source file, keyed by repo-relative path. */
@@ -306,6 +429,7 @@ function lessonNotationBundle(
   bundle: NotationPageBundle | undefined,
   definitionsById: ReadonlyMap<string, NotationDefinitionRecord>,
   resolution: readonly ManifestNotationResolution[],
+  cardsByKey: ReadonlyMap<string, GlyphScopeEntry>,
 ): ManifestLesson['notation'] {
   const definitions: ManifestLessonNotation[] = [];
   for (const definitionId of bundle?.definitionIds ?? []) {
@@ -320,6 +444,16 @@ function lessonNotationBundle(
       summary: definition.summary,
       editorialStatus: definition.status,
       seeAlso: [...definition.seeAlso],
+      glosses: [...definition.glosses],
+      formulaScope: formulaGlyphScope({
+        key: definition.key,
+        notation: definition.notation,
+        glosses: definition.glosses,
+        cardsByKey,
+        ...(definition.formula === undefined
+          ? {}
+          : { formula: definition.formula }),
+      }),
       ...(definition.units === undefined ? {} : { units: definition.units }),
       ...(definition.formula === undefined
         ? {}
@@ -373,12 +507,36 @@ function lessonFrontmatterById(): Map<
 export async function compileManifest(
   courseConfig: CourseConfig,
 ): Promise<Manifest> {
+  // `about` became required in explico 0.3.0. A course upgrading from 0.2.x
+  // hits this before the raw `Cannot read properties of undefined` further
+  // down; the message names the fix and the guide.
+  if (
+    courseConfig.about === undefined ||
+    courseConfig.about.version === undefined ||
+    courseConfig.about.authors === undefined ||
+    courseConfig.about.disclaimer === undefined
+  ) {
+    throw new Error(
+      "course.config.ts is missing a complete `about` block (required since explico 0.3.0): " +
+        "`about: { version, authors: [{ name }], disclaimer, materialName?, summary?, changelogHref? }`. " +
+        'See docs/authoring/migrating.md (§ 0.2.x → 0.3.0) in the installed package.',
+    );
+  }
+
   const [catalog, notationInput] = await Promise.all([
     loadCurriculumCatalog(),
     loadNotationRegistryInput(),
   ]);
 
   const registry = buildNotationRegistry(notationInput);
+  // Cards a `formula` may name with `\explain{key}` (D15). Shared entries
+  // only: a page-local symbol is not addressable from another entry.
+  const cardsByKey = new Map<string, GlyphScopeEntry>(
+    notationInput.sharedDefinitions.map((definition) => [
+      definition.key,
+      { key: definition.key, notation: definition.notation },
+    ]),
+  );
   const definitionsById = new Map(
     registry.definitions.map((definition) => [definition.id, definition]),
   );
@@ -422,20 +580,57 @@ export async function compileManifest(
   );
   const frontmatterById = lessonFrontmatterById();
 
-  const equationValidation = validateEquations(
-    notationInput.lessons.map((lesson) => ({
-      lessonId: lesson.lessonId,
-      slug: lesson.lessonId.replace(/\./g, '/'),
-      file: lesson.source.file,
-      body: lesson.body,
-    })),
+  const lessonSlugs = [...notationInput.lessons]
+    .map((lesson) => lesson.lessonId.replace(/\./g, '/'))
+    .sort();
+  const sidebar = buildSidebar(
+    catalog.tracks.map((track) => ({ id: track.id, lessons: track.lessons })),
+    lessonSlugs,
+    courseConfig.sections,
   );
+
+  // A lesson's chapter is its position when the sidebar is read top to bottom
+  // (sections in config order, lessons within a section by merged track order
+  // then slug). It prefixes every equation / table / figure number on the page
+  // (`(2.1)` = first equation of chapter 2). Derived from `sidebar` so there is
+  // one lesson-ordering source, not two.
+  const chapterByLessonId = new Map<string, number>();
+  let chapterCursor = 0;
+  for (const group of sidebar) {
+    for (const item of group.items) {
+      if (typeof item !== 'string') continue; // the static Reference group
+      chapterByLessonId.set(lessonIdFromSlug(item), ++chapterCursor);
+    }
+  }
+
+  const keyedFloatLessonInputs = notationInput.lessons.map((lesson) => ({
+    lessonId: lesson.lessonId,
+    slug: lesson.lessonId.replace(/\./g, '/'),
+    file: lesson.source.file,
+    body: lesson.body,
+    chapter: chapterByLessonId.get(lesson.lessonId),
+  }));
+  const equationValidation = validateEquations(keyedFloatLessonInputs);
   const equationsBySlug = new Map(
     Object.entries(equationValidation.numbersBySlug).map(([slug, table]) => [
       slug,
       Object.entries(table).map(([key, number]) => ({ key, number })),
     ]),
   );
+  const tableValidation = validateTables(keyedFloatLessonInputs);
+  const tablesBySlug = new Map(
+    Object.entries(tableValidation.numbersBySlug).map(([slug, table]) => [
+      slug,
+      Object.entries(table).map(([key, number]) => ({ key, number })),
+    ]),
+  );
+  const figureValidation = validateFigures(keyedFloatLessonInputs);
+  const figuresBySlug = new Map(
+    Object.entries(figureValidation.numbersBySlug).map(([slug, table]) => [
+      slug,
+      Object.entries(table).map(([key, number]) => ({ key, number })),
+    ]),
+  );
 
   const lessons: ManifestLesson[] = [];
   for (const notationLesson of notationInput.lessons) {
@@ -450,6 +645,10 @@ export async function compileManifest(
     lessons.push({
       id,
       slug: id.replace(/\./g, '/'),
+      // 0 = the lesson is not placed in any configured section; a curriculum
+      // diagnostic covers that separately, and both numbering paths then fall
+      // back to the legacy `##`-section scheme.
+      chapter: chapterByLessonId.get(id) ?? 0,
       file: notationLesson.source.file,
       title: frontmatter.title,
       description: frontmatter.description,
@@ -461,6 +660,8 @@ export async function compileManifest(
       sources: deriveSources(notationLesson.body),
       citations: lessonCitations(notationLesson.body),
       equations: equationsBySlug.get(id.replace(/\./g, '/')) ?? [],
+      tables: tablesBySlug.get(id.replace(/\./g, '/')) ?? [],
+      figures: figuresBySlug.get(id.replace(/\./g, '/')) ?? [],
       prereqEdges: sortEdges(
         teaches.flatMap((to) =>
           (prerequisitesById.get(to) ?? [])
@@ -476,6 +677,7 @@ export async function compileManifest(
           definitionsById,
           availableDefinitionIds,
         ),
+        cardsByKey,
       ),
     });
   }
@@ -488,6 +690,9 @@ export async function compileManifest(
     catalog,
     lintIgnore: loadLintIgnore(),
     conventions: courseConfig.conventions,
+    ...(courseConfig.operators === undefined
+      ? {}
+      : { operators: courseConfig.operators }),
   });
 
   const rawNotation = [...loadNotationDefinitions()].sort((a, b) =>
@@ -499,17 +704,54 @@ export async function compileManifest(
   const sources = [...loadSourceRecords()].sort(byId);
   const tracks = catalog.tracks.map((entry) => ({ ...entry })).sort(byId);
 
-  const lessonSlugs = [...notationInput.lessons]
-    .map((lesson) => lesson.lessonId.replace(/\./g, '/'))
-    .sort();
-  const sidebar = buildSidebar(
-    catalog.tracks.map((track) => ({ id: track.id, lessons: track.lessons })),
-    lessonSlugs,
-    courseConfig.sections,
-  );
+  const hashes = contentHashes();
+
+  // Knowledge version (C3): `about.version` vs the newest `content/CHANGELOG.md`
+  // entry. Every finding is a Tier-3 warning; the resolved entry feeds the
+  // `[?]` About panel.
+  const knowledgeChangelogPath = join(CONTENT_ROOT, 'CHANGELOG.md');
+  const knowledge = resolveKnowledgeVersion({
+    changelogText: existsSync(knowledgeChangelogPath)
+      ? readFileSync(knowledgeChangelogPath, 'utf8')
+      : undefined,
+    declaredVersion: courseConfig.about.version,
+    file: relative(REPOSITORY_ROOT, knowledgeChangelogPath).replace(/\\/g, '/'),
+  });
+
+  const enginePkg = readEnginePackage();
+  const about: ManifestAbout = {
+    engine: {
+      name: enginePkg.name,
+      version: enginePkg.version,
+      ...(enginePkg.homepage === undefined
+        ? {}
+        : { homepage: enginePkg.homepage }),
+    },
+    material: {
+      name: courseConfig.about.materialName ?? courseConfig.title,
+      summary: courseConfig.about.summary ?? courseConfig.description,
+    },
+    knowledge: {
+      version: knowledge.version,
+      ...(knowledge.latest?.date === undefined
+        ? {}
+        : { date: knowledge.latest.date }),
+      notes: knowledge.latest?.notes ?? [],
+      contentTree: hashes.contentTree,
+    },
+    authors: courseConfig.about.authors.map((author) => ({
+      name: author.name,
+      ...(author.contact === undefined ? {} : { contact: author.contact }),
+    })),
+    disclaimer: courseConfig.about.disclaimer,
+    ...(courseConfig.about.changelogHref === undefined
+      ? {}
+      : { changelogHref: courseConfig.about.changelogHref }),
+  };
 
   return {
     schemaVersion: MANIFEST_SCHEMA_VERSION,
+    about,
     notation: {
       definitions: registry.definitions,
       bundles: registry.bundles,
@@ -527,6 +769,14 @@ export async function compileManifest(
       labels: equationValidation.labels,
       numbersBySlug: equationValidation.numbersBySlug,
     },
+    tables: {
+      labels: tableValidation.labels,
+      numbersBySlug: tableValidation.numbersBySlug,
+    },
+    figures: {
+      labels: figureValidation.labels,
+      numbersBySlug: figureValidation.numbersBySlug,
+    },
     diagnostics: {
       curriculum: curriculumIssues,
       notation: registry.diagnostics,
@@ -534,8 +784,11 @@ export async function compileManifest(
       math: mathIssues,
       consistency: consistencyIssues,
       equations: equationValidation.diagnostics,
+      tables: tableValidation.diagnostics,
+      figures: figureValidation.diagnostics,
+      knowledge: knowledge.diagnostics,
     },
-    hashes: contentHashes(),
+    hashes,
   };
 }
 

package/src/components/CurriculumMap.astro

@@ -2,6 +2,7 @@
 import { getCollection } from 'astro:content';
 import { loadManifest } from '../compiler/manifest';
 import { isLessonSlug, lessonIdFromSlug } from '../compiler/lesson-derivation';
+import Diagram, { type DiagramEdge, type DiagramNode } from './diagram/Diagram.astro';
 
 const [tracks, docs, competencies, manifest] = await Promise.all([
   getCollection('tracks'),
@@ -22,6 +23,20 @@ const lessonById = new Map(
 const competencyById = new Map(
   competencies.map((entry) => [entry.data.id, entry.data]),
 );
+
+// The dependency graph is read straight off the authored `prerequisites`
+// lists — no separate content to keep in sync, and the same data the build's
+// DAG/cycle validator already checks.
+const competencyNodes: DiagramNode[] = competencies.map(({ data }) => ({
+  id: data.id,
+  text: data.title,
+}));
+const competencyEdges: DiagramEdge[] = competencies.flatMap(({ data }) =>
+  data.prerequisites.map((prerequisiteId) => ({
+    from: prerequisiteId,
+    to: data.id,
+  })),
+);
 ---
 
 {
@@ -110,6 +125,18 @@ const competencyById = new Map(
     The build rejects unknown references, cycles, invalid lesson ordering, and
     insufficient assessment coverage.
   </p>
+
+  {
+    competencyNodes.length > 0 && (
+      <Diagram
+        id="competency-graph"
+        label="Competency dependency graph"
+        nodes={competencyNodes}
+        edges={competencyEdges}
+      />
+    )
+  }
+
   <ol class="competency-map">
     {
       competencies

package/src/components/HoverPanel.astro

@@ -11,6 +11,14 @@
  * Extra attributes (e.g. `data-notation-panel`, `data-citation-panel`) are
  * forwarded to the `<aside>` so each layer keeps the hook its tests and pin
  * controls already reference.
+ *
+ * `tabindex="-1"`: never in the tab order, but a valid target for
+ * `panel.focus()`. A layer that lets the reader click deeper into the panel's
+ * own content (D15's in-panel navigation) needs somewhere stable to move
+ * focus to before it replaces whatever the reader just clicked — otherwise
+ * removing the focused node drops focus to nothing, and the shared
+ * `focusout` handler in `./hover-panel.ts` reads that as "the reader left"
+ * and closes the panel it was just asked to update.
  */
 export interface Props {
   /** Element id — pin controls point `aria-controls` at it. */
@@ -31,8 +39,17 @@ const { id, label, class: className, ...rest } = Astro.props;
   aria-live="polite"
   aria-atomic="true"
   hidden
+  tabindex="-1"
   {...rest}
 >
+  <button
+    class="hover-panel-close"
+    type="button"
+    data-hover-panel-close
+    aria-label="Close"
+  >
+    <span aria-hidden="true">&times;</span>
+  </button>
   <slot />
 </aside>
 
@@ -48,6 +65,7 @@ const { id, label, class: className, ...rest } = Astro.props;
       width: min(23rem, calc(100vw - 1.5rem));
       overflow: auto;
       padding: 1rem;
+      padding-inline-end: 2.4rem;
       border: 1px solid var(--sl-color-gray-5);
       border-top: 0.25rem solid var(--sl-color-accent);
       border-radius: 0.65rem;
@@ -57,6 +75,30 @@ const { id, label, class: className, ...rest } = Astro.props;
       font-size: var(--sl-text-sm);
     }
 
+    .hover-panel-close {
+      position: absolute;
+      top: 0.5rem;
+      right: 0.5rem;
+      width: 1.6rem;
+      height: 1.6rem;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      padding: 0;
+      border: 0;
+      border-radius: 0.35rem;
+      color: var(--sl-color-gray-3);
+      background: transparent;
+      font-size: 1.15rem;
+      line-height: 1;
+      cursor: pointer;
+    }
+
+    .hover-panel-close:hover {
+      color: var(--sl-color-text);
+      background: var(--sl-color-gray-6);
+    }
+
     /* Slotted fields carry the owning layer's scope, not this component's, so
        the descendant match must be global. */
     .hover-panel :global(:focus-visible) {

package/src/components/citation/CitationLayer.astro

@@ -108,6 +108,7 @@ import HoverPanel from '../HoverPanel.astro';
 
     createHoverPanel({
       panel,
+      groupId: 'citation',
       triggerFrom: markerFrom,
       keyFor: (element) => element.dataset.citationNumber ?? null,
       render,