explico 0.2.0 → 0.4.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';
 
@@ -46,11 +47,23 @@ import {
   type ConsistencyDiagnostic,
 } from '../reference/consistency';
 import { validateNotationAlignment } from '../reference/curriculum-alignment';
+import { countDisplayEquations } from '../reference/equations.mjs';
+import { countKeyedJsxFloats } from '../reference/keyed-jsx-floats.mjs';
 import {
   validateEquations,
   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,
@@ -69,7 +82,11 @@ import type {
   NotationLessonInput,
   NotationPageBundle,
 } from '../reference/types';
-import type { CourseConfig } from './course-config';
+import { coursePartsOf, type CourseConfig } from './course-config';
+import {
+  resolveKnowledgeVersion,
+  type KnowledgeVersionDiagnostic,
+} from './knowledge-version';
 import {
   loadCurriculumCatalog,
   loadNotationDefinitions,
@@ -81,6 +98,7 @@ import {
   buildSidebar,
   deriveSources,
   isLessonSlug,
+  lessonIdFromSlug,
   type SidebarGroup,
 } from './lesson-derivation';
 
@@ -92,8 +110,20 @@ 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)`).
+ * v7 (part numbering): `lessons[].part` (the sidebar group's 1-based ordinal,
+ * now the number before the dot), `lessons[].chapter` redefined as the
+ * lesson's ordinal *within its part*, and `lessons[].numbering` — the
+ * per-kind offsets that make `n` run continuously across a part.
  */
-export const MANIFEST_SCHEMA_VERSION = 3;
+export const MANIFEST_SCHEMA_VERSION = 7;
 
 const REPOSITORY_ROOT = process.cwd();
 // Content is the top-level `content/` folder; the build output is `build/`
@@ -101,6 +131,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 {
@@ -154,6 +211,29 @@ export interface ManifestLesson {
   readonly id: string;
   /** Docs-loader slug, e.g. `bonds/price-yield-relationship`. */
   readonly slug: string;
+  /**
+   * The 1-based ordinal of the **part** this lesson sits in — its sidebar
+   * group's position in `courseConfig.parts`. It is the number before the dot
+   * in every equation, table, and figure number on the page: `(2.1)` is the
+   * first equation of part 2. See `docs/authoring/structure.md`.
+   */
+  readonly part: number;
+  /**
+   * The lesson's 1-based ordinal **within its part** (merged track order, then
+   * any unranked lessons by slug) — its chapter number. This orders the
+   * sidebar and the reading path; it does not appear in a float's number.
+   */
+  readonly chapter: number;
+  /**
+   * How many floats of each kind the earlier lessons of this part already
+   * used. The lesson's own floats continue from here, so a part's sequence
+   * runs unbroken across its chapters instead of restarting on every page.
+   */
+  readonly numbering: {
+    readonly equations: number;
+    readonly tables: number;
+    readonly figures: number;
+  };
   readonly file: string;
   readonly title: string;
   readonly description: string;
@@ -172,6 +252,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;
@@ -184,8 +274,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[];
@@ -207,6 +326,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[];
@@ -214,8 +343,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. */
@@ -395,6 +530,22 @@ 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(),
@@ -452,20 +603,96 @@ 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,
+    coursePartsOf(courseConfig),
   );
+
+  // Part and chapter, read straight off the sidebar so there is one
+  // lesson-ordering source and not two: a part is a sidebar group (parts in
+  // config order), a chapter is a lesson's position inside its part (merged
+  // track order, then slug). The part is what prefixes every equation / table
+  // / figure number — `(2.1)` is the first equation of part 2 — while `n`
+  // continues across the part's chapters rather than restarting on each page,
+  // so every lesson also needs the running count that precedes it.
+  // See `docs/authoring/structure.md`.
+  const bodyByLessonId = new Map(
+    notationInput.lessons.map((lesson) => [lesson.lessonId, lesson.body]),
+  );
+  const placementByLessonId = new Map<
+    string,
+    {
+      part: number;
+      chapter: number;
+      numbering: { equations: number; tables: number; figures: number };
+    }
+  >();
+  let partCursor = 0;
+  for (const group of sidebar) {
+    const lessonIds = group.items
+      .filter((item): item is string => typeof item === 'string')
+      .map(lessonIdFromSlug);
+    if (lessonIds.length === 0) continue; // the static Reference group
+    partCursor += 1;
+    // Running totals for this part, advanced one chapter at a time.
+    const used = { equations: 0, tables: 0, figures: 0 };
+    let chapterCursor = 0;
+    for (const lessonId of lessonIds) {
+      const body = bodyByLessonId.get(lessonId) ?? '';
+      placementByLessonId.set(lessonId, {
+        part: partCursor,
+        chapter: ++chapterCursor,
+        numbering: { ...used },
+      });
+      used.equations += countDisplayEquations(body);
+      used.tables += countKeyedJsxFloats(body, { tagName: 'Table' });
+      used.figures += countKeyedJsxFloats(body, { tagName: 'Figure' });
+    }
+  }
+
+  const floatInputs = (kind: 'equations' | 'tables' | 'figures') =>
+    notationInput.lessons.map((lesson) => {
+      const placement = placementByLessonId.get(lesson.lessonId);
+      return {
+        lessonId: lesson.lessonId,
+        slug: lesson.lessonId.replace(/\./g, '/'),
+        file: lesson.source.file,
+        body: lesson.body,
+        ...(placement
+          ? {
+              numbering: {
+                prefix: placement.part,
+                offset: placement.numbering[kind],
+              },
+            }
+          : {}),
+      };
+    });
+  const equationValidation = validateEquations(floatInputs('equations'));
   const equationsBySlug = new Map(
     Object.entries(equationValidation.numbersBySlug).map(([slug, table]) => [
       slug,
       Object.entries(table).map(([key, number]) => ({ key, number })),
     ]),
   );
+  const tableValidation = validateTables(floatInputs('tables'));
+  const tablesBySlug = new Map(
+    Object.entries(tableValidation.numbersBySlug).map(([slug, table]) => [
+      slug,
+      Object.entries(table).map(([key, number]) => ({ key, number })),
+    ]),
+  );
+  const figureValidation = validateFigures(floatInputs('figures'));
+  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) {
@@ -480,6 +707,16 @@ export async function compileManifest(
     lessons.push({
       id,
       slug: id.replace(/\./g, '/'),
+      // 0 = the lesson is not placed in any configured part; a curriculum
+      // diagnostic covers that separately, and both numbering paths then fall
+      // back to the legacy `##`-section scheme.
+      part: placementByLessonId.get(id)?.part ?? 0,
+      chapter: placementByLessonId.get(id)?.chapter ?? 0,
+      numbering: placementByLessonId.get(id)?.numbering ?? {
+        equations: 0,
+        tables: 0,
+        figures: 0,
+      },
       file: notationLesson.source.file,
       title: frontmatter.title,
       description: frontmatter.description,
@@ -491,6 +728,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) ?? [])
@@ -519,6 +758,9 @@ export async function compileManifest(
     catalog,
     lintIgnore: loadLintIgnore(),
     conventions: courseConfig.conventions,
+    ...(courseConfig.operators === undefined
+      ? {}
+      : { operators: courseConfig.operators }),
   });
 
   const rawNotation = [...loadNotationDefinitions()].sort((a, b) =>
@@ -530,17 +772,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,
@@ -558,6 +837,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,
@@ -565,8 +852,11 @@ export async function compileManifest(
       math: mathIssues,
       consistency: consistencyIssues,
       equations: equationValidation.diagnostics,
+      tables: tableValidation.diagnostics,
+      figures: figureValidation.diagnostics,
+      knowledge: knowledge.diagnostics,
     },
-    hashes: contentHashes(),
+    hashes,
   };
 }
 
@@ -620,13 +910,17 @@ export function readManifestSync(): Manifest {
 export async function loadManifest(
   courseConfig?: CourseConfig,
 ): Promise<Manifest> {
-  if (existsSync(MANIFEST_PATH)) return readManifestSync();
-  if (!courseConfig) {
-    throw new Error(
-      `${relative(REPOSITORY_ROOT, MANIFEST_PATH)} not found. Run \`pnpm validate:content\` first.`,
-    );
+  // A caller that has the course config is an authoring/build entry point. It
+  // must compile the current content tree even when a persisted manifest is
+  // present: using that file here can split the page in two, with remark
+  // seeing current frontmatter while Astro components render stale cards.
+  if (courseConfig) {
+    const manifest = await compileManifest(courseConfig);
+    writeManifest(manifest);
+    return manifest;
   }
-  const manifest = await compileManifest(courseConfig);
-  writeManifest(manifest);
-  return manifest;
+  if (existsSync(MANIFEST_PATH)) return readManifestSync();
+  throw new Error(
+    `${relative(REPOSITORY_ROOT, MANIFEST_PATH)} not found. Run \`pnpm validate:content\` first.`,
+  );
 }

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