@astryxdesign/cli 0.6.3-canary.b7cc8b8 → 0.6.3-canary.bcf01fe

package/api/docs/_adapter.d.mts

@@ -16,40 +16,43 @@
  */
 export function loadDocsCatalog(cwd?: string): Promise<DocsCatalog>;
 /**
- * @param {string} docPath
- * @param {{lang?: string|null}} [opts]
- * @returns {Promise<import('./docs.type.mjs').DocsDetailResponse['data']>}
+ * The overlay languages a topic ships for its own file or any extension.
+ * @param {import('../../foundation/discovery/docs-discovery.mjs').DocsTopicEntry} entry
+ * @returns {string[]}
  */
-export function loadReferenceDocs(docPath: string, { lang }?: {
-    lang?: string | null;
-}): Promise<import("./docs.type.mjs").DocsDetailResponse["data"]>;
+export function overlayLanguages(entry: import("../../foundation/discovery/docs-discovery.mjs").DocsTopicEntry): string[];
 /**
- * Load one catalog entry: its own doc, plus any extension an integration
- * merged onto it, in configuration order.
- *
- * A localization overlay applies to each file before the extensions are
- * merged, so an extension written in the base language stays readable under
- * `--dense`/`--zh` (it replaces its own sections and leaves the rest
- * translated) rather than being dropped.
- *
+ * One topic, lowered for `lang`: overlaid, extensions merged, keys stamped.
+ * Memoized per catalog, so a read that references a topic twice loads it once.
+ * Every read of the catalog shares the memoized node, so it is frozen; the
+ * lenses hand readers copies.
+ * @param {DocsCatalog} catalog
  * @param {import('../../foundation/discovery/docs-discovery.mjs').DocsTopicEntry} entry
- * @param {{lang?: string|null}} [opts]
- * @returns {Promise<import('./docs.type.mjs').DocsDetailResponse['data']>}
+ * @param {string | null} [lang]
+ * @returns {Promise<import('../../foundation/doc-compiler/compile.mjs').CompiledReferenceNode>}
  */
-export function loadTopicDoc(entry: import("../../foundation/discovery/docs-discovery.mjs").DocsTopicEntry, { lang }?: {
-    lang?: string | null;
-}): Promise<import("./docs.type.mjs").DocsDetailResponse["data"]>;
+export function lowerTopic(catalog: DocsCatalog, entry: import("../../foundation/discovery/docs-discovery.mjs").DocsTopicEntry, lang?: string | null): Promise<import("../../foundation/doc-compiler/compile.mjs").CompiledReferenceNode>;
 /**
- * The overlay languages a topic ships for its own file or any extension.
+ * How a token reference finds its target: the topic it names in `catalog`,
+ * lowered for the same language.
+ * @param {DocsCatalog} catalog
+ * @param {string | null} lang
+ * @returns {(topic: string) => Promise<import('../../foundation/doc-compiler/compile.mjs').CompiledReferenceNode | null>}
+ */
+export function referenceTargets(catalog: DocsCatalog, lang: string | null): (topic: string) => Promise<import("../../foundation/doc-compiler/compile.mjs").CompiledReferenceNode | null>;
+/**
+ * One topic, compiled for `lang`: lowered, then every token reference linked.
+ * @param {DocsCatalog} catalog
  * @param {import('../../foundation/discovery/docs-discovery.mjs').DocsTopicEntry} entry
- * @returns {string[]}
+ * @param {string | null} [lang]
+ * @returns {Promise<import('../../foundation/doc-compiler/compile.mjs').CompiledReferenceNode>}
  */
-export function overlayLanguages(entry: import("../../foundation/discovery/docs-discovery.mjs").DocsTopicEntry): string[];
+export function compileTopic(catalog: DocsCatalog, entry: import("../../foundation/discovery/docs-discovery.mjs").DocsTopicEntry, lang?: string | null): Promise<import("../../foundation/doc-compiler/compile.mjs").CompiledReferenceNode>;
 /**
  * Resolve `topic` against the project's catalog (throwing `ERR_UNKNOWN_TOPIC`
- * when unmatched), and load it with any --dense/--zh overlay and any
- * integration extension applied. Shared by the detail and section leaves so
- * topic normalization and unknown-topic handling live in exactly one place.
+ * when unmatched) and lower it with any --dense/--zh overlay and any
+ * integration extension applied. Shared by the leaves so topic normalization
+ * and unknown-topic handling live in exactly one place.
  *
  * @param {string} topic
  * @param {object} [options]
@@ -59,7 +62,7 @@ export function overlayLanguages(entry: import("../../foundation/discovery/docs-
  * @param {string} [options.cwd]
  * @returns {Promise<{
  *   catalog: DocsCatalog,
- *   docsData: import('./docs.type.mjs').DocsDetailResponse['data'],
+ *   node: import('../../foundation/doc-compiler/compile.mjs').CompiledReferenceNode,
  *   lang: string | null,
  * }>}
  */
@@ -70,7 +73,7 @@ export function resolveTopicDocs(topic: string, options?: {
     cwd?: string | undefined;
 }): Promise<{
     catalog: DocsCatalog;
-    docsData: import("./docs.type.mjs").DocsDetailResponse["data"];
+    node: import("../../foundation/doc-compiler/compile.mjs").CompiledReferenceNode;
     lang: string | null;
 }>;
 /** The localized overlays a docs read can apply. */

package/api/docs/_adapter.mjs

@@ -7,29 +7,24 @@
  *   packages/cli/assets/docs/{topic}.doc.mjs plus every topic the configured
  *   integrations contribute — and, when a --dense/--zh overlay is requested,
  *   the sibling {topic}.doc.dense.mjs / {topic}.doc.zh.mjs.
- * @output Catalog access, overlay- and extension-merged reference-doc data,
- *   and a combined resolve step ({catalog, docsData}) that the detail and
- *   section leaves share.
- * @position Sits beside docs.mjs (api/docs/). Owns everything ≥2 leaves need so
- *   no leaf re-implements resolution, overlay merging, or unknown-topic
- *   handling. Discovery itself lives in foundation/discovery/docs-discovery,
- *   which api/search and the agent-docs block read through the same catalog.
+ * @output Catalog access, the compiler input for a topic, and the compiled
+ *   node for it: lowered (overlaid, extensions merged, keys stamped) or linked
+ *   (token references resolved too), memoized per catalog.
+ * @position Sits beside docs.mjs (api/docs/). Loads authored files and hands
+ *   them to foundation/doc-compiler, so no leaf, doctor check or search loads,
+ *   merges, or resolves docs on its own. Discovery itself lives in
+ *   foundation/discovery/docs-discovery, which the catalog comes from.
  */
 
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import {pathToFileURL} from 'node:url';
 import {Project} from '../../foundation/config/project.mjs';
+import {DocsCatalog} from '../../foundation/discovery/docs-discovery.mjs';
 import {
-  DocsCatalog,
-  mergeTopic,
-  problemsInTopic,
-  withSourceTitle,
-} from '../../foundation/discovery/docs-discovery.mjs';
-import {
-  sectionKeyProblems,
-  withSectionKeys,
-} from '../../foundation/discovery/docs-section-key.mjs';
+  linkReferenceTopic,
+  lowerReferenceTopic,
+} from '../../foundation/doc-compiler/compile.mjs';
 import {AstryxError} from '../error.mjs';
 import {ERROR_CODES} from '../../foundation/response/error-codes.mjs';
 import {parseDoc} from '../../authoring/doctypes/parse.mjs';
@@ -56,108 +51,6 @@ export async function loadDocsCatalog(cwd = process.cwd()) {
   }
 }
 
-/**
- * @param {string} docPath
- * @param {{lang?: string|null}} [opts]
- * @returns {Promise<import('./docs.type.mjs').DocsDetailResponse['data']>}
- */
-export async function loadReferenceDocs(docPath, {lang} = {}) {
-  const mod = await import(pathToFileURL(docPath).href);
-  const parsed = parseDoc(mod.docs ?? mod.default, path.basename(docPath));
-  if (!('sections' in parsed)) {
-    throw new Error(`${path.basename(docPath)} is not a reference document.`);
-  }
-  const problems = problemsInTopic(parsed);
-  if (problems.length > 0) {
-    throw new Error(
-      `${path.basename(docPath)} is invalid: ${problems.join('; ')}`,
-    );
-  }
-  const docs = parsed;
-  if (!lang || lang === 'en') return docs;
-
-  const translationPath = overlayPath(docPath, lang);
-  if (!fs.existsSync(translationPath)) return docs;
-
-  const translationMod = await import(pathToFileURL(translationPath).href);
-  const translation = translationMod.docsZh || translationMod.docsDense;
-  if (!translation) return docs;
-
-  // Overlays are keyed to a base section by title (`section`), not by array
-  // position. Position-keying silently grafted each overlay title onto whatever
-  // base section happened to share its index, so an overlay that omitted or
-  // reordered a section corrupted every section after it — `docs tokens --dense`
-  // printed the colour table under a "Spacing" heading (#2182). An overlay may
-  // now cover any subset of sections, in any order; sections it does not name
-  // keep their base content.
-  /** @type {Map<string, any>} */
-  const bySection = new Map();
-  for (const ts of translation.sections ?? []) {
-    if (ts?.section != null) bySection.set(ts.section, ts);
-  }
-
-  return {
-    ...docs,
-    description: translation.description || docs.description,
-    sections: docs.sections.map(
-      (
-        /** @type {import('@astryxdesign/cli/authoring').ReferenceSection} */ section,
-      ) => {
-        const ts = bySection.get(section.title);
-        if (!ts) return section;
-        const localized = {
-          ...section,
-          title: ts.title || section.title,
-          content: section.content.map(
-            (
-              /** @type {import('@astryxdesign/cli/authoring').ReferenceContentBlock} */ block,
-              /** @type {number} */ bi,
-            ) => {
-              const tb = ts.content?.[bi];
-              if (!tb) return block;
-              if (tb.type === 'prose' && block.type === 'prose')
-                return {...block, text: tb.text};
-              if (tb.type === 'list' && block.type === 'list')
-                return {...block, items: tb.items};
-              return block;
-            },
-          ),
-        };
-        return withSourceTitle(localized, section.title);
-      },
-    ),
-  };
-}
-
-/**
- * Load one catalog entry: its own doc, plus any extension an integration
- * merged onto it, in configuration order.
- *
- * A localization overlay applies to each file before the extensions are
- * merged, so an extension written in the base language stays readable under
- * `--dense`/`--zh` (it replaces its own sections and leaves the rest
- * translated) rather than being dropped.
- *
- * @param {import('../../foundation/discovery/docs-discovery.mjs').DocsTopicEntry} entry
- * @param {{lang?: string|null}} [opts]
- * @returns {Promise<import('./docs.type.mjs').DocsDetailResponse['data']>}
- */
-export async function loadTopicDoc(entry, {lang} = {}) {
-  let doc = await loadReferenceDocs(entry.path, {lang});
-  for (const extension of entry.extensions) {
-    doc = mergeTopic(doc, await loadReferenceDocs(extension.path, {lang}));
-    // Merging matches on keys, so this holds unless merge itself regresses.
-    const problems = sectionKeyProblems(doc.sections);
-    if (problems.length > 0) {
-      throw new Error(
-        `${path.basename(extension.path)}, extending ${entry.name}, leaves two sections with one key: ${problems.join('; ')}`,
-      );
-    }
-  }
-  // Derived keys are stamped only now, so they never take part in merging.
-  return withSectionKeys(doc);
-}
-
 /** The localized overlays a docs read can apply. */
 export const OVERLAY_LANGUAGES = ['zh', 'dense'];
 
@@ -186,11 +79,148 @@ export function overlayLanguages(entry) {
   );
 }
 
+/**
+ * The overlay a read applies: none for the authored language.
+ * @param {string | null | undefined} lang
+ * @returns {string | null}
+ */
+function overlayLanguage(lang) {
+  return lang && lang !== 'en' ? lang : null;
+}
+
+/**
+ * Load one authored file and the overlay for `lang`. A failure is recorded on
+ * the result, not thrown, so the compiler reports it in reading order.
+ * @param {string} docPath
+ * @param {string | null} lang
+ * @returns {Promise<import('../../foundation/doc-compiler/compile.mjs').AuthoredFile>}
+ */
+async function loadAuthoredFile(docPath, lang) {
+  const file = path.basename(docPath);
+  let doc;
+  try {
+    const mod = await import(pathToFileURL(docPath).href);
+    doc = parseDoc(mod.docs ?? mod.default, file);
+  } catch (error) {
+    return {file, error};
+  }
+  if (!lang) return {file, doc};
+  const translationPath = overlayPath(docPath, lang);
+  if (!fs.existsSync(translationPath)) return {file, doc};
+  try {
+    const translationMod = await import(pathToFileURL(translationPath).href);
+    return {
+      file,
+      doc,
+      overlay: translationMod.docsZh || translationMod.docsDense || null,
+    };
+  } catch (overlayError) {
+    return {file, doc, overlayError};
+  }
+}
+
+/**
+ * Everything the compiler needs for one topic, read from disk.
+ * @param {import('../../foundation/discovery/docs-discovery.mjs').DocsTopicEntry} entry
+ * @param {string | null} lang
+ * @returns {Promise<import('../../foundation/doc-compiler/compile.mjs').ReferenceTopicInput>}
+ */
+async function loadCompilerInput(entry, lang) {
+  const extensions = [];
+  for (const extension of entry.extensions) {
+    extensions.push({
+      ...(await loadAuthoredFile(extension.path, lang)),
+      provider: extension.package,
+    });
+  }
+  return {
+    id: entry.name,
+    provider: entry.package,
+    replaces: entry.replaces ?? null,
+    lang,
+    base: await loadAuthoredFile(entry.path, lang),
+    extensions,
+  };
+}
+
+/** @type {WeakMap<DocsCatalog, Map<string, Promise<import('../../foundation/doc-compiler/compile.mjs').CompiledReferenceNode>>>} */
+const loweredByCatalog = new WeakMap();
+
+/**
+ * One topic, lowered for `lang`: overlaid, extensions merged, keys stamped.
+ * Memoized per catalog, so a read that references a topic twice loads it once.
+ * Every read of the catalog shares the memoized node, so it is frozen; the
+ * lenses hand readers copies.
+ * @param {DocsCatalog} catalog
+ * @param {import('../../foundation/discovery/docs-discovery.mjs').DocsTopicEntry} entry
+ * @param {string | null} [lang]
+ * @returns {Promise<import('../../foundation/doc-compiler/compile.mjs').CompiledReferenceNode>}
+ */
+export function lowerTopic(catalog, entry, lang = null) {
+  const overlay = overlayLanguage(lang);
+  let cache = loweredByCatalog.get(catalog);
+  if (!cache) {
+    cache = new Map();
+    loweredByCatalog.set(catalog, cache);
+  }
+  const key = `${entry.name.toLowerCase()}\u0000${overlay ?? ''}`;
+  let lowered = cache.get(key);
+  if (!lowered) {
+    lowered = loadCompilerInput(entry, overlay).then(input =>
+      deepFreeze(lowerReferenceTopic(input)),
+    );
+    cache.set(key, lowered);
+  }
+  return lowered;
+}
+
+/**
+ * Freeze a value and everything in it.
+ * @template T
+ * @param {T} value
+ * @returns {T}
+ */
+function deepFreeze(value) {
+  if (value !== null && typeof value === 'object' && !Object.isFrozen(value)) {
+    Object.freeze(value);
+    for (const child of Object.values(value)) deepFreeze(child);
+  }
+  return value;
+}
+
+/**
+ * How a token reference finds its target: the topic it names in `catalog`,
+ * lowered for the same language.
+ * @param {DocsCatalog} catalog
+ * @param {string | null} lang
+ * @returns {(topic: string) => Promise<import('../../foundation/doc-compiler/compile.mjs').CompiledReferenceNode | null>}
+ */
+export function referenceTargets(catalog, lang) {
+  return async topic => {
+    const target = catalog.resolve(topic);
+    return target ? lowerTopic(catalog, target, lang) : null;
+  };
+}
+
+/**
+ * One topic, compiled for `lang`: lowered, then every token reference linked.
+ * @param {DocsCatalog} catalog
+ * @param {import('../../foundation/discovery/docs-discovery.mjs').DocsTopicEntry} entry
+ * @param {string | null} [lang]
+ * @returns {Promise<import('../../foundation/doc-compiler/compile.mjs').CompiledReferenceNode>}
+ */
+export async function compileTopic(catalog, entry, lang = null) {
+  return linkReferenceTopic(
+    await lowerTopic(catalog, entry, lang),
+    referenceTargets(catalog, lang),
+  );
+}
+
 /**
  * Resolve `topic` against the project's catalog (throwing `ERR_UNKNOWN_TOPIC`
- * when unmatched), and load it with any --dense/--zh overlay and any
- * integration extension applied. Shared by the detail and section leaves so
- * topic normalization and unknown-topic handling live in exactly one place.
+ * when unmatched) and lower it with any --dense/--zh overlay and any
+ * integration extension applied. Shared by the leaves so topic normalization
+ * and unknown-topic handling live in exactly one place.
  *
  * @param {string} topic
  * @param {object} [options]
@@ -200,7 +230,7 @@ export function overlayLanguages(entry) {
  * @param {string} [options.cwd]
  * @returns {Promise<{
  *   catalog: DocsCatalog,
- *   docsData: import('./docs.type.mjs').DocsDetailResponse['data'],
+ *   node: import('../../foundation/doc-compiler/compile.mjs').CompiledReferenceNode,
  *   lang: string | null,
  * }>}
  */
@@ -221,6 +251,6 @@ export async function resolveTopicDocs(topic, options = {}) {
     );
   }
 
-  const docsData = await loadTopicDoc(entry, {lang: effectiveLang});
-  return {catalog, docsData, lang: effectiveLang};
+  const node = await lowerTopic(catalog, entry, effectiveLang);
+  return {catalog, node, lang: effectiveLang};
 }

package/api/docs/compiled-topics.test.mjs

@@ -0,0 +1,78 @@
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+
+/**
+ * @file Every shipped topic compiles to a plain-JSON node that answers every
+ * docs read exactly as the live one does, and no read can change another read
+ * of the same catalog.
+ */
+
+import {describe, expect, it} from 'vitest';
+import {parseCompiledReferenceNode} from '../../foundation/doc-compiler/ir.mjs';
+import {detailView, indexView} from '../../foundation/doc-compiler/lenses.mjs';
+import {
+  compileTopic,
+  loadDocsCatalog,
+  lowerTopic,
+  overlayLanguages,
+} from './_adapter.mjs';
+
+const SLOW = 60_000;
+
+describe('every shipped topic compiles to plain JSON', () => {
+  it(
+    'survives a JSON round trip with identical responses in every language',
+    async () => {
+      const catalog = await loadDocsCatalog();
+      let compiled = 0;
+      for (const entry of catalog.entries()) {
+        for (const lang of [null, ...overlayLanguages(entry)]) {
+          const lowered = await lowerTopic(catalog, entry, lang);
+          expect(parseCompiledReferenceNode(lowered)).toBe(lowered);
+          const node = await compileTopic(catalog, entry, lang);
+          expect(parseCompiledReferenceNode(node)).toBe(node);
+          const copy = parseCompiledReferenceNode(
+            JSON.parse(JSON.stringify(node)),
+          );
+          expect(JSON.stringify(detailView(copy))).toBe(
+            JSON.stringify(detailView(node)),
+          );
+          expect(JSON.stringify(indexView(copy))).toBe(
+            JSON.stringify(indexView(node)),
+          );
+          compiled += 1;
+        }
+      }
+      expect(compiled).toBeGreaterThan(catalog.entries().length);
+    },
+    SLOW,
+  );
+});
+
+describe('reads that share a catalog', () => {
+  it(
+    'never let one read change another',
+    async () => {
+      const catalog = await loadDocsCatalog();
+      const tokens = catalog.resolve('tokens');
+      const first = detailView(await compileTopic(catalog, tokens));
+      for (const section of first.sections) {
+        section.title = 'EDITED';
+        for (const block of section.content) {
+          if (typeof block.text === 'string') block.text = 'EDITED';
+          if (Array.isArray(block.rows)) block.rows.push(['EDITED']);
+        }
+      }
+      const again = detailView(await compileTopic(catalog, tokens));
+      const index = indexView(await lowerTopic(catalog, tokens));
+      const spacing = detailView(
+        await compileTopic(catalog, catalog.resolve('spacing')),
+      );
+      for (const read of [again, index, spacing]) {
+        expect(JSON.stringify(read)).not.toContain('EDITED');
+      }
+      const lowered = await lowerTopic(catalog, tokens);
+      expect(Object.isFrozen(lowered.doc.sections[0].content)).toBe(true);
+    },
+    SLOW,
+  );
+});

package/api/docs/detail/detail.d.mts

@@ -1,21 +1,6 @@
 // @generated by scripts/sync-api-types.mjs from the JSDoc in api/**/*.mjs.
 // DO NOT EDIT — run `pnpm sync:api-types` to regenerate.
 
-/**
- * Resolve token-ref blocks by inlining the referenced section's table.
- * This allows section docs to reference token tables without duplicating data.
- *
- * The reference is resolved through the catalog, so a topic may point at one
- * an integration contributed (or replaced) rather than only at a built-in. It
- * names the section by key or authored title, so it resolves in every language.
- * @param {import('../docs.type.mjs').DocsDetailResponse['data']} docsData
- * @param {import('../../../foundation/discovery/docs-discovery.mjs').DocsCatalog} catalog
- * @param {{lang?: string | null}} [options]
- * @returns {Promise<import('../docs.type.mjs').DocsDetailResponse['data']>}
- */
-export function resolveTokenRefs(docsData: import("../docs.type.mjs").DocsDetailResponse["data"], catalog: import("../../../foundation/discovery/docs-discovery.mjs").DocsCatalog, { lang }?: {
-    lang?: string | null;
-}): Promise<import("../docs.type.mjs").DocsDetailResponse["data"]>;
 /**
  * @param {string} topic
  * @param {object} [options]

package/api/docs/detail/detail.mjs

@@ -3,84 +3,17 @@
 /**
  * @file docs.detail leaf — load one topic's full reference doc.
  *
- * @input A topic name plus optional {lang, zh, dense}. Resolves and loads the
- *   topic via the shared adapter, then inlines any token-ref blocks.
+ * @input A topic name plus optional {lang, zh, dense, cwd}. Resolves the topic
+ *   via the shared adapter and compiles it with its token references linked.
  * @output { type: 'docs.detail', data: ReferenceDoc } — the full doc with
- *   token-refs resolved, matching `xds --json docs <topic>`.
- * @position Leaf under api/docs. Owns resolveTokenRefs (used only here); shares
- *   discovery/loading/topic-resolution with the section leaf via _adapter.mjs.
+ *   token-refs inlined, matching `astryx --json docs <topic>`.
+ * @position Leaf under api/docs. Reads the compiled node through the detail
+ *   lens; resolution, overlays and extensions happen in the compiler.
  */
 
-import {loadTopicDoc, resolveTopicDocs} from '../_adapter.mjs';
-import {
-  sectionKey,
-  sourceTitle,
-  withSourceTitle,
-} from '../../../foundation/discovery/docs-section-key.mjs';
-
-/**
- * Resolve token-ref blocks by inlining the referenced section's table.
- * This allows section docs to reference token tables without duplicating data.
- *
- * The reference is resolved through the catalog, so a topic may point at one
- * an integration contributed (or replaced) rather than only at a built-in. It
- * names the section by key or authored title, so it resolves in every language.
- * @param {import('../docs.type.mjs').DocsDetailResponse['data']} docsData
- * @param {import('../../../foundation/discovery/docs-discovery.mjs').DocsCatalog} catalog
- * @param {{lang?: string | null}} [options]
- * @returns {Promise<import('../docs.type.mjs').DocsDetailResponse['data']>}
- */
-export async function resolveTokenRefs(docsData, catalog, {lang = null} = {}) {
-  const resolved = {...docsData, sections: [...docsData.sections]};
-  for (let si = 0; si < resolved.sections.length; si++) {
-    const section = resolved.sections[si];
-    /** @type {import('@astryxdesign/cli/authoring').ReferenceContentBlock[]} */
-    const newContent = [];
-    for (const block of section.content) {
-      if (block.type === 'token-ref') {
-        const refEntry = catalog.resolve(block.topic);
-        if (!refEntry) {
-          newContent.push({type: 'prose', text: `[token-ref: unknown topic "${block.topic}"]`});
-          continue;
-        }
-        const refDocs = await loadTopicDoc(refEntry, {lang});
-        const wanted = block.section.toLowerCase();
-        const refSection = refDocs.sections.find(
-          (/** @type {import('@astryxdesign/cli/authoring').ReferenceSection} */ s) =>
-            sectionKey(s) === block.section ||
-            sourceTitle(s).toLowerCase() === wanted,
-        );
-        if (!refSection) {
-          newContent.push({type: 'prose', text: `[token-ref: section "${block.section}" not found in "${block.topic}"]`});
-          continue;
-        }
-        // Inline the referenced section's content blocks (tables, prose, etc.)
-        // and carry over the previewType
-        for (const refBlock of refSection.content) {
-          newContent.push(refBlock);
-        }
-        // If the referenced section has a previewType, attach it to our section
-        if (refSection.previewType && !section.previewType) {
-          resolved.sections[si] = withSourceTitle(
-            {...section, previewType: refSection.previewType, content: newContent},
-            sourceTitle(section),
-          );
-        }
-      } else {
-        newContent.push(block);
-      }
-    }
-    if (resolved.sections[si] === section) {
-      resolved.sections[si] = withSourceTitle(
-        {...section, content: newContent},
-        sourceTitle(section),
-      );
-    } else {
-      resolved.sections[si].content = newContent;
-    }
-  }
-  return resolved;
-}
+import {linkReferenceTopic} from '../../../foundation/doc-compiler/compile.mjs';
+import {detailView} from '../../../foundation/doc-compiler/lenses.mjs';
+import {referenceTargets, resolveTopicDocs} from '../_adapter.mjs';
 
 /**
  * @param {string} topic
@@ -92,7 +25,10 @@ export async function resolveTokenRefs(docsData, catalog, {lang = null} = {}) {
  * @returns {Promise<import('../docs.type.mjs').DocsDetailResponse>}
  */
 export async function detail(topic, options = {}) {
-  const {catalog, docsData, lang} = await resolveTopicDocs(topic, options);
-  const resolved = await resolveTokenRefs(docsData, catalog, {lang});
-  return {type: 'docs.detail', data: resolved};
+  const {catalog, node, lang} = await resolveTopicDocs(topic, options);
+  const linked = await linkReferenceTopic(
+    node,
+    referenceTargets(catalog, lang),
+  );
+  return {type: 'docs.detail', data: detailView(linked)};
 }