rspress-plugin-api-extractor 0.8.8 → 0.9.0

package/layers/ConfigServiceLive.js

@@ -1,4 +1,3 @@
-import { hashContent } from "../content-hash.js";
 import { PluginEvent } from "../observability/events.js";
 import { emit, wantsLevel } from "../observability/EventBus.js";
 import { BuildMetrics } from "./build-metrics.js";
@@ -14,13 +13,14 @@ import { CategoryResolver } from "../category-resolver.js";
 import { ConfigValidationError } from "../errors.js";
 import { HideCutLinesTransformer, MemberFormatTransformer } from "../hide-cut-transformer.js";
 import { DEFAULT_SHIKI_THEMES } from "../markdown/shiki-utils.js";
-import { ApiModelLoader } from "../model-loader.js";
+import { loadApiModel, loadPackageJson, loadVersionModel } from "../model-loader.js";
 import { DEFAULT_CATEGORIES } from "../schemas/config.js";
 import "../schemas/index.js";
 import { ConfigService } from "../services/ConfigService.js";
 import { PathDerivationService } from "../services/PathDerivationService.js";
 import { TypeRegistryService } from "../services/TypeRegistryService.js";
 import path from "node:path";
+import { hashContent } from "@tsdoctor/snapshot";
 import { Effect, Layer, Metric } from "effect";
 import os from "node:os";
 import { createHighlighter } from "shiki";
@@ -172,42 +172,56 @@ function ConfigServiceLive(options, shikiCrossLinker, buildId = "", resolvedThre
 			let firstApiTsconfig;
 			let firstApiCompilerOptions;
 			/**
+			* Emit a typed ModelLoadFailed event for a failed model load, then
+			* convert the typed failure to a defect — a missing or unparsable
+			* model remains fatal to the build, exactly as before, but the
+			* event now rides the error channel instead of a sync-island seam.
+			*/
+			const withModelLoadEvents = (self) => self.pipe(Effect.tapError((error) => emit(PluginEvent.ModelLoadFailed({
+				ctx: { buildId },
+				level: "error",
+				modelPath: "modelPath" in error ? error.modelPath : "<loader function>",
+				reason: error.message
+			}))), Effect.orDie);
+			/**
 			* Helper to process a single API model (shared by single and multi modes).
 			*/
-			const processSimpleApi = (api, model, outputDir, fullRoute, wantTrace) => Effect.promise(async () => {
-				const { apiPackage, source: loaderSource } = await ApiModelLoader.loadApiModel(model);
-				const resolvedCategories = categoryResolver.resolveCategoryConfig(pluginDefaults, api.categories);
-				const resolvedSource = categoryResolver.resolveSourceConfig(api.source, loaderSource);
-				const resolvedLlms = mergeLlmsPluginConfig(options.llmsPlugin, api.llmsPlugin);
-				const packageJson = api.packageJson ? await ApiModelLoader.loadPackageJson(api.packageJson) : void 0;
-				validateExternalPackages(api.externalPackages, packageJson);
-				const externalPackages = api.externalPackages || extractAutoDetectedPackages(packageJson, api.autoDetectDependencies);
-				if (externalPackages && externalPackages.length > 0) Effect.runSync(Metric.update(BuildMetrics.externalPackagesTotal, externalPackages.length));
-				const vfs = ApiExtractedPackage.fromPackage(apiPackage, api.packageName).generateVfs();
-				const vfsPayloads = prependImportsToVfs(vfs, apiPackage, api.packageName, wantTrace);
-				const resolvedOgImage = api.ogImage ?? options.ogImage;
-				const resolvedTheme = normalizeThemeConfig(api.theme);
-				return {
-					vfs,
-					vfsPayloads,
-					externalPackages: externalPackages || [],
-					config: {
-						apiPackage,
-						packageName: api.packageName,
-						...api.name != null ? { apiName: api.name } : {},
-						outputDir,
-						baseRoute: fullRoute,
-						categories: resolvedCategories,
-						...resolvedSource != null ? { source: resolvedSource } : {},
-						...packageJson != null ? { packageJson } : {},
-						...resolvedLlms != null ? { llmsPlugin: resolvedLlms } : {},
-						...options.siteUrl != null ? { siteUrl: options.siteUrl } : {},
-						...resolvedOgImage != null ? { ogImage: resolvedOgImage } : {},
-						docsDir: path.dirname(outputDir),
-						...docsRoot != null ? { docsRoot } : {},
-						...resolvedTheme != null ? { theme: resolvedTheme } : {}
-					}
-				};
+			const processSimpleApi = (api, model, outputDir, fullRoute, wantTrace) => Effect.gen(function* () {
+				const { apiPackage, source: loaderSource } = yield* withModelLoadEvents(loadApiModel(model));
+				return yield* Effect.promise(async () => {
+					const resolvedCategories = categoryResolver.resolveCategoryConfig(pluginDefaults, api.categories);
+					const resolvedSource = categoryResolver.resolveSourceConfig(api.source, loaderSource);
+					const resolvedLlms = mergeLlmsPluginConfig(options.llmsPlugin, api.llmsPlugin);
+					const packageJson = api.packageJson ? await loadPackageJson(api.packageJson) : void 0;
+					validateExternalPackages(api.externalPackages, packageJson);
+					const externalPackages = api.externalPackages || extractAutoDetectedPackages(packageJson, api.autoDetectDependencies);
+					if (externalPackages && externalPackages.length > 0) Effect.runSync(Metric.update(BuildMetrics.externalPackagesTotal, externalPackages.length));
+					const vfs = ApiExtractedPackage.fromPackage(apiPackage, api.packageName).generateVfs();
+					const vfsPayloads = prependImportsToVfs(vfs, apiPackage, api.packageName, wantTrace);
+					const resolvedOgImage = api.ogImage ?? options.ogImage;
+					const resolvedTheme = normalizeThemeConfig(api.theme);
+					return {
+						vfs,
+						vfsPayloads,
+						externalPackages: externalPackages || [],
+						config: {
+							apiPackage,
+							packageName: api.packageName,
+							...api.name != null ? { apiName: api.name } : {},
+							outputDir,
+							baseRoute: fullRoute,
+							categories: resolvedCategories,
+							...resolvedSource != null ? { source: resolvedSource } : {},
+							...packageJson != null ? { packageJson } : {},
+							...resolvedLlms != null ? { llmsPlugin: resolvedLlms } : {},
+							...options.siteUrl != null ? { siteUrl: options.siteUrl } : {},
+							...resolvedOgImage != null ? { ogImage: resolvedOgImage } : {},
+							docsDir: path.dirname(outputDir),
+							...docsRoot != null ? { docsRoot } : {},
+							...resolvedTheme != null ? { theme: resolvedTheme } : {}
+						}
+					};
+				});
 			});
 			yield* withPhase("modelLoad", { buildId }, Effect.gen(function* () {
 				if (options.api) {
@@ -233,14 +247,14 @@ function ConfigServiceLive(options, shikiCrossLinker, buildId = "", resolvedThre
 								externalPackages: [],
 								config: null
 							};
+							const versionConfig = isVersionConfig(versionValue) ? versionValue : { model: versionValue };
+							const { apiPackage, packageJson: versionPackageJson, categories: versionCategories, source: versionSource, externalPackages: versionExternalPackages, autoDetectDependencies: versionAutoDetectDependencies, llmsPlugin: versionLlms, ogImage: versionOgImage } = yield* withModelLoadEvents(loadVersionModel(versionConfig));
 							return yield* Effect.promise(async () => {
-								const versionConfig = isVersionConfig(versionValue) ? versionValue : { model: versionValue };
-								const { apiPackage, packageJson: versionPackageJson, categories: versionCategories, source: versionSource, externalPackages: versionExternalPackages, autoDetectDependencies: versionAutoDetectDependencies, llmsPlugin: versionLlms, ogImage: versionOgImage } = await ApiModelLoader.loadVersionModel(versionConfig);
 								Effect.runSync(Metric.update(BuildMetrics.apiVersionsLoaded, 1));
 								const resolvedCategories = categoryResolver.resolveCategoryConfig(pluginDefaults, api.categories, versionCategories);
 								const resolvedSource = categoryResolver.resolveSourceConfig(api.source, versionSource);
 								const resolvedLlms = mergeLlmsPluginConfig(options.llmsPlugin, api.llmsPlugin, versionLlms);
-								const packageJson = versionPackageJson || (api.packageJson ? await ApiModelLoader.loadPackageJson(api.packageJson) : void 0);
+								const packageJson = versionPackageJson || (api.packageJson ? await loadPackageJson(api.packageJson) : void 0);
 								validateExternalPackages(versionExternalPackages || api.externalPackages, packageJson);
 								const autoDetectOptions = versionAutoDetectDependencies || api.autoDetectDependencies;
 								const externalPackages = versionExternalPackages || api.externalPackages || extractAutoDetectedPackages(packageJson, autoDetectOptions);

package/layers/TypeRegistryServiceLive.js

@@ -5,13 +5,13 @@ import { TypeRegistryError } from "../errors.js";
 import { TypeRegistryService } from "../services/TypeRegistryService.js";
 import { NodeFileSystem, NodeHttpClient } from "@effect/platform-node";
 import { Duration, Effect, Layer, Path } from "effect";
-import { PackageFetcher, PackageSpec, RegistryObserver, TypeCache, TypeRegistry } from "type-registry-effect";
+import { PackageFetcher, PackageSpec, RegistryObserver, TypeCache, TypeRegistry } from "@tsdoctor/registry";
 import { Cache } from "@effected/store";
 import { AppDirs, Xdg } from "@effected/xdg";
 
 //#region src/layers/TypeRegistryServiceLive.ts
 /**
-* Forward type-registry-effect's typed `RegistryEvent`s to the plugin's Effect
+* Forward @tsdoctor/registry's typed `RegistryEvent`s to the plugin's Effect
 * logger. Since v1 the library emits no logs of its own — observers are the only
 * diagnostic surface — so this restores the build output and routes it through
 * the plugin's configured log level/format (a single source, no duplication).
@@ -102,7 +102,7 @@ const RegistryObserverLayer = Layer.succeed(RegistryObserver, { emit: (event) =>
 	}
 } });
 /**
-* type-registry-effect v2 composes at the edge: the library ships no platform
+* @tsdoctor/registry composes at the edge: the library ships no platform
 * layer of its own, so the plugin wires FileSystem/Path, the XDG directories,
 * the sqlite metadata Cache and the HTTP client here.
 *
@@ -110,8 +110,13 @@ const RegistryObserverLayer = Layer.succeed(RegistryObserver, { emit: (event) =>
 * v4 layer memoization discipline.
 */
 const PlatformLive = Layer.mergeAll(NodeFileSystem.layer, Path.layer);
-/** XDG app directories under the library's shared namespace (cache is shared across consumers). */
-const AppDirsLive = AppDirs.layer({ namespace: "type-registry-effect" }).pipe(Layer.provide(Layer.mergeAll(Xdg.layer, PlatformLive)));
+/**
+* XDG app directories under the tsdoctor-wide namespace. Renamed from the
+* legacy "type-registry-effect" namespace in phase 2 per the resolved identity
+* decision (see tsdoctor-package-architecture.md) — a deliberate one-time
+* on-disk cache invalidation: existing caches go cold and refetch.
+*/
+const AppDirsLive = AppDirs.layer({ namespace: "tsdoctor" }).pipe(Layer.provide(Layer.mergeAll(Xdg.layer, PlatformLive)));
 /** Metadata plane: a sqlite-backed `@effected/store` Cache rooted in the XDG cache dir. */
 const MetadataCacheLive = Layer.unwrap(Effect.gen(function* () {
 	const appDirs = yield* AppDirs;
@@ -126,7 +131,7 @@ const MetadataCacheLive = Layer.unwrap(Effect.gen(function* () {
 */
 const RegistryLayer = TypeRegistry.layer.pipe(Layer.provideMerge(Layer.mergeAll(TypeCache.layerXdg(), PackageFetcher.layer)), Layer.provideMerge(RegistryObserverLayer), Layer.provide(Layer.mergeAll(MetadataCacheLive, AppDirsLive, PlatformLive, NodeHttpClient.layerUndici)));
 /**
-* TypeRegistryServiceLive: uses type-registry-effect Effect programs directly.
+* TypeRegistryServiceLive: uses @tsdoctor/registry Effect programs directly.
 */
 const TypeRegistryServiceLive = Layer.succeed(TypeRegistryService, {
 	resolveVersions: (packages) => Effect.gen(function* () {

package/markdown/helpers.js

@@ -1,3 +1,4 @@
+import { emitFrontmatterBlock } from "../frontmatter.js";
 import { classifyCutDirective, isTwoslashDirective } from "../twoslash-patterns.js";
 import { formatCode } from "../prettier-formatter.js";
 import { TypeReferenceExtractor } from "../type-reference-extractor.js";
@@ -88,8 +89,21 @@ function sanitizeId(displayName, prefix = "") {
 * escapeYamlString("@pkg/name。:");          // "\"@pkg/name。:\""
 * ```
 */
+/**
+* Normalize a string for use as a YAML frontmatter value: collapse newlines
+* and repeated whitespace to single spaces and trim.
+*
+* This is the cleaning half of the former hand-rolled YAML escaping. It is
+* applied to every frontmatter value BEFORE serialization so the parsed data
+* (and therefore the snapshot frontmatter hash — see `@tsdoctor/snapshot`)
+* is byte-identical to what the previous emitter produced; the quoting half
+* is now owned by the real YAML emitter in `../frontmatter.ts`.
+*/
+function cleanYamlValue(value) {
+	return value.replace(/[\r\n]+/g, " ").replace(/\s+/g, " ").trim();
+}
 function escapeYamlString(value) {
-	const cleaned = value.replace(/[\r\n]+/g, " ").replace(/\s+/g, " ").trim();
+	const cleaned = cleanYamlValue(value);
 	if (/["':#|>&*!%@`[\]{},?-]/.test(cleaned) || /[\u0080-\uFFFF]/.test(cleaned) || /^(true|false|null|~|yes|no|on|off)$/i.test(cleaned) || /^-?\d+(\.\d+)?([eE][+-]?\d+)?$/.test(cleaned)) return `"${cleaned.replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}"`;
 	return cleaned;
 }
@@ -163,84 +177,41 @@ function buildPageTitle(entityName, singularName, apiName) {
 * );
 * // Returns:
 * // ---
-* // title: MyClass | Class | API | My Package
-* // description: A utility class for...
+* // title: "MyClass | Class | API | My Package"
+* // description: "A utility class for..."
 * // ---
 * ```
 */
 function generateFrontmatter(entityName, description, singularName, apiName, ogMetadata) {
 	const title = buildPageTitle(entityName, singularName, apiName);
+	const meta = (property, content) => ["meta", {
+		property,
+		content: cleanYamlValue(content)
+	}];
 	const headEntries = [];
 	if (ogMetadata) {
-		headEntries.push(["meta", {
-			property: "og:url",
-			content: `${ogMetadata.siteUrl}${ogMetadata.pageRoute}`
-		}]);
-		headEntries.push(["meta", {
-			property: "og:type",
-			content: ogMetadata.ogType
-		}]);
-		headEntries.push(["meta", {
-			property: "og:description",
-			content: ogMetadata.description
-		}]);
+		headEntries.push(meta("og:url", `${ogMetadata.siteUrl}${ogMetadata.pageRoute}`));
+		headEntries.push(meta("og:type", ogMetadata.ogType));
+		headEntries.push(meta("og:description", ogMetadata.description));
 		if (ogMetadata.ogImage) {
-			headEntries.push(["meta", {
-				property: "og:image",
-				content: ogMetadata.ogImage.url
-			}]);
-			if (ogMetadata.ogImage.secureUrl) headEntries.push(["meta", {
-				property: "og:image:secure_url",
-				content: ogMetadata.ogImage.secureUrl
-			}]);
-			if (ogMetadata.ogImage.type) headEntries.push(["meta", {
-				property: "og:image:type",
-				content: ogMetadata.ogImage.type
-			}]);
-			if (ogMetadata.ogImage.width) headEntries.push(["meta", {
-				property: "og:image:width",
-				content: String(ogMetadata.ogImage.width)
-			}]);
-			if (ogMetadata.ogImage.height) headEntries.push(["meta", {
-				property: "og:image:height",
-				content: String(ogMetadata.ogImage.height)
-			}]);
-			if (ogMetadata.ogImage.alt) headEntries.push(["meta", {
-				property: "og:image:alt",
-				content: ogMetadata.ogImage.alt
-			}]);
+			headEntries.push(meta("og:image", ogMetadata.ogImage.url));
+			if (ogMetadata.ogImage.secureUrl) headEntries.push(meta("og:image:secure_url", ogMetadata.ogImage.secureUrl));
+			if (ogMetadata.ogImage.type) headEntries.push(meta("og:image:type", ogMetadata.ogImage.type));
+			if (ogMetadata.ogImage.width) headEntries.push(meta("og:image:width", String(ogMetadata.ogImage.width)));
+			if (ogMetadata.ogImage.height) headEntries.push(meta("og:image:height", String(ogMetadata.ogImage.height)));
+			if (ogMetadata.ogImage.alt) headEntries.push(meta("og:image:alt", ogMetadata.ogImage.alt));
 		}
-		headEntries.push(["meta", {
-			property: "article:published_time",
-			content: ogMetadata.publishedTime
-		}]);
-		headEntries.push(["meta", {
-			property: "article:modified_time",
-			content: ogMetadata.modifiedTime
-		}]);
-		headEntries.push(["meta", {
-			property: "article:section",
-			content: ogMetadata.section
-		}]);
-		for (const tag of ogMetadata.tags) headEntries.push(["meta", {
-			property: "article:tag",
-			content: tag
-		}]);
+		headEntries.push(meta("article:published_time", ogMetadata.publishedTime));
+		headEntries.push(meta("article:modified_time", ogMetadata.modifiedTime));
+		headEntries.push(meta("article:section", ogMetadata.section));
+		for (const tag of ogMetadata.tags) headEntries.push(meta("article:tag", tag));
 	}
-	let frontmatter = `---\ntitle: ${escapeYamlString(title)}\n`;
-	frontmatter += `description: ${escapeYamlString(description)}\n`;
-	if (headEntries.length > 0) {
-		frontmatter += "head:\n";
-		for (const [tag, attrs] of headEntries) {
-			frontmatter += `  - - ${tag}\n`;
-			frontmatter += "    - ";
-			const attrPairs = Object.entries(attrs).map(([key, value]) => `${key}: ${escapeYamlString(value)}`);
-			frontmatter += attrPairs.join("\n      ");
-			frontmatter += "\n";
-		}
-	}
-	frontmatter += "---\n\n";
-	return frontmatter;
+	const data = {
+		title: cleanYamlValue(title),
+		description: cleanYamlValue(description)
+	};
+	if (headEntries.length > 0) data.head = headEntries;
+	return emitFrontmatterBlock(data);
 }
 /**
 * Strip Twoslash directives from code for display purposes.

package/markdown/index.js

@@ -1,4 +1,4 @@
-import { MarkdownCrossLinker, markdownCrossLinker } from "./cross-linker.js";
+import { linkProse, setProseLinker } from "./prose-linker.js";
 import { ClassPageGenerator } from "./page-generators/class-page.js";
 import { EnumPageGenerator } from "./page-generators/enum-page.js";
 import { FunctionPageGenerator } from "./page-generators/function-page.js";
@@ -8,4 +8,4 @@ import { NamespacePageGenerator } from "./page-generators/namespace-page.js";
 import { TypeAliasPageGenerator } from "./page-generators/type-alias-page.js";
 import { VariablePageGenerator } from "./page-generators/variable-page.js";
 
-export { ClassPageGenerator, EnumPageGenerator, FunctionPageGenerator, InterfacePageGenerator, MainIndexPageGenerator, NamespacePageGenerator, TypeAliasPageGenerator, VariablePageGenerator, markdownCrossLinker };
+export { ClassPageGenerator, EnumPageGenerator, FunctionPageGenerator, InterfacePageGenerator, MainIndexPageGenerator, NamespacePageGenerator, TypeAliasPageGenerator, VariablePageGenerator, setProseLinker };

package/markdown/page-generators/class-page.js

@@ -1,8 +1,7 @@
-import { ApiParser } from "../../loader.js";
 import { TypeReferenceExtractor } from "../../type-reference-extractor.js";
 import { escapeMdxGenerics, formatExampleCode, generateAvailableFrom, generateFrontmatter, prepareExampleCode, prependHiddenImports, sanitizeId, stripTwoslashDirectives } from "../helpers.js";
-import { markdownCrossLinker } from "../cross-linker.js";
-import { TypeSignatureFormatter } from "../../formatter.js";
+import { linkProse } from "../prose-linker.js";
+import { ApiItems, Signature, Tsdoc } from "@tsdoctor/model";
 
 //#region src/markdown/page-generators/class-page.ts
 /**
@@ -32,9 +31,9 @@ import { TypeSignatureFormatter } from "../../formatter.js";
 *
 * **Relationships:**
 * - Created and invoked by {@link ApiExtractorPlugin} during page generation
-* - Uses {@link TypeSignatureFormatter} for formatting type signatures
-* - Uses {@link ApiParser} for extracting documentation from API models
-* - Uses {@link MarkdownCrossLinker} for adding type reference links
+* - Uses `Signature.format` from `@tsdoctor/model` for formatting type signatures
+* - Uses the `Tsdoc` / `ApiItems` modules from `@tsdoctor/model` for extracting documentation
+* - Uses the per-build prose linker (`linkProse`) for adding type reference links
 *
 * @example
 * ```ts
@@ -56,7 +55,6 @@ import { TypeSignatureFormatter } from "../../formatter.js";
 * @see {@link FunctionPageGenerator} for function documentation
 */
 var ClassPageGenerator = class {
-	typeFormatter = new TypeSignatureFormatter();
 	/**
 	* Generate a markdown page for a class
 	*
@@ -65,22 +63,22 @@ var ClassPageGenerator = class {
 	async generate(apiClass, baseRoute, packageName, singularName, apiScope, apiName, sourceConfig, suppressExampleErrors, llmsPlugin, availableFrom, syntheticBase) {
 		const shouldSuppressErrors = suppressExampleErrors ?? true;
 		const name = apiClass.displayName;
-		const summary = ApiParser.getSummary(apiClass) || "No description available.";
-		const releaseTag = ApiParser.getReleaseTag(apiClass);
+		const summary = Tsdoc.summary(apiClass) || "No description available.";
+		const releaseTag = Tsdoc.releaseTag(apiClass);
 		let content = generateFrontmatter(name, summary, singularName, apiName);
 		content += `import { SourceCode } from "@rspress/core/theme";\n`;
 		content += `import { ParametersTable } from "rspress-plugin-api-extractor/runtime";\n`;
 		content += `import { ApiSignature, ApiMember, ApiExample } from "rspress-plugin-api-extractor/runtime";\n\n`;
 		content += `# ${name}\n\n`;
-		const deprecation = ApiParser.getDeprecation(apiClass);
+		const deprecation = Tsdoc.deprecation(apiClass);
 		if (deprecation) {
-			const message = escapeMdxGenerics(markdownCrossLinker.addCrossLinks(deprecation.message));
+			const message = escapeMdxGenerics(linkProse(deprecation.message));
 			content += `> ⚠️ **Deprecated:** ${message}\n\n`;
 		}
 		if (releaseTag !== "Public") content += `\`${releaseTag}\`\n\n`;
 		content += `${summary}\n\n`;
 		content += generateAvailableFrom(packageName, availableFrom);
-		const sourceLink = ApiParser.getSourceLink(apiClass, sourceConfig);
+		const sourceLink = ApiItems.sourceLink(apiClass, sourceConfig);
 		if (sourceLink) {
 			content += `<div className="api-docs-toolbar">\n`;
 			content += `  <div className="api-docs-toolbar-left">\n`;
@@ -100,21 +98,21 @@ var ClassPageGenerator = class {
 		if (constructors.length > 0) {
 			content += `## Constructors\n\n`;
 			for (const ctor of constructors) {
-				const ctorSummary = ApiParser.getSummary(ctor);
+				const ctorSummary = Tsdoc.summary(ctor);
 				const ctorId = sanitizeId("constructor");
 				const ctorItem = ctor;
-				const params = ApiParser.getParams(ctor);
+				const params = Tsdoc.params(ctor);
 				const hasParameters = params.length > 0;
 				if (ctorItem.excerpt?.text) {
-					const memberSignature = this.typeFormatter.format(ctorItem.excerpt).trim();
+					const memberSignature = Signature.format(ctorItem.excerpt).trim();
 					const skeletonWithContext = this.generateClassMemberWithContext(apiClass, ctor, packageName);
-					const summaryMd = ctorSummary ? escapeMdxGenerics(markdownCrossLinker.addCrossLinks(ctorSummary)) : void 0;
+					const summaryMd = ctorSummary ? escapeMdxGenerics(linkProse(ctorSummary)) : void 0;
 					content += `<ApiMember code={${JSON.stringify(memberSignature)}} source={${JSON.stringify(skeletonWithContext)}} apiScope={${JSON.stringify(apiScope)}} memberName="constructor"${summaryMd ? ` summary={${JSON.stringify(summaryMd)}}` : ""} id={${JSON.stringify(ctorId)}} hasParameters={${hasParameters}} />\n\n`;
 				}
 				if (hasParameters) content += `<ParametersTable parameters={${JSON.stringify(params.map((p) => ({
 					name: p.name,
 					type: p.type,
-					description: markdownCrossLinker.addCrossLinks(p.description)
+					description: linkProse(p.description)
 				})))}} />\n\n`;
 			}
 		}
@@ -138,15 +136,15 @@ var ClassPageGenerator = class {
 			if (propList.length === 0) return;
 			content += `## ${title}\n\n`;
 			for (const prop of propList) {
-				const propSummary = ApiParser.getSummary(prop);
+				const propSummary = Tsdoc.summary(prop);
 				const baseName = sanitizeId(prop.displayName);
 				const prefix = prefixMap.get(baseName) || "";
 				const propId = sanitizeId(prop.displayName, prefix);
 				const propItem = prop;
 				if (propItem.excerpt?.text) {
-					const memberSignature = this.typeFormatter.format(propItem.excerpt).trim();
+					const memberSignature = Signature.format(propItem.excerpt).trim();
 					const skeletonWithContext = this.generateClassMemberWithContext(apiClass, prop, packageName);
-					const summaryMd = propSummary ? escapeMdxGenerics(markdownCrossLinker.addCrossLinks(propSummary)) : void 0;
+					const summaryMd = propSummary ? escapeMdxGenerics(linkProse(propSummary)) : void 0;
 					content += `<ApiMember code={${JSON.stringify(memberSignature)}} source={${JSON.stringify(skeletonWithContext)}} apiScope={${JSON.stringify(apiScope)}} memberName={${JSON.stringify(prop.displayName)}}${summaryMd ? ` summary={${JSON.stringify(summaryMd)}}` : ""} id={${JSON.stringify(propId)}} />\n\n`;
 				}
 			}
@@ -155,27 +153,27 @@ var ClassPageGenerator = class {
 			if (methodList.length === 0) return;
 			content += `## ${title}\n\n`;
 			for (const method of methodList) {
-				const methodSummary = ApiParser.getSummary(method);
+				const methodSummary = Tsdoc.summary(method);
 				const baseName = sanitizeId(method.displayName);
 				const prefix = prefixMap.get(baseName) || "";
 				const methodId = sanitizeId(method.displayName, prefix);
 				const methodItem = method;
-				const params = ApiParser.getParams(method);
+				const params = Tsdoc.params(method);
 				const hasParameters = params.length > 0;
 				if (methodItem.excerpt?.text) {
-					const memberSignature = this.typeFormatter.format(methodItem.excerpt).trim();
+					const memberSignature = Signature.format(methodItem.excerpt).trim();
 					const skeletonWithContext = this.generateClassMemberWithContext(apiClass, method, packageName);
-					const summaryMd = methodSummary ? escapeMdxGenerics(markdownCrossLinker.addCrossLinks(methodSummary)) : void 0;
+					const summaryMd = methodSummary ? escapeMdxGenerics(linkProse(methodSummary)) : void 0;
 					content += `<ApiMember code={${JSON.stringify(memberSignature)}} source={${JSON.stringify(skeletonWithContext)}} apiScope={${JSON.stringify(apiScope)}} memberName={${JSON.stringify(method.displayName)}}${summaryMd ? ` summary={${JSON.stringify(summaryMd)}}` : ""} id={${JSON.stringify(methodId)}} hasParameters={${hasParameters}} />\n\n`;
 				}
 				if (hasParameters) content += `<ParametersTable parameters={${JSON.stringify(params.map((p) => ({
 					name: p.name,
 					type: p.type,
-					description: markdownCrossLinker.addCrossLinks(p.description)
+					description: linkProse(p.description)
 				})))}} />\n\n`;
-				const returns = ApiParser.getReturns(method);
+				const returns = Tsdoc.returns(method);
 				if (returns) {
-					const description = escapeMdxGenerics(markdownCrossLinker.addCrossLinks(returns.description));
+					const description = escapeMdxGenerics(linkProse(returns.description));
 					content += `**Returns:** ${description}\n\n`;
 				}
 			}
@@ -185,7 +183,7 @@ var ClassPageGenerator = class {
 		await renderProperties("Properties", instanceProperties);
 		await renderMethods("Getters & Setters", grouped.getters);
 		await renderMethods("Methods", grouped.instanceMethods);
-		const examples = ApiParser.getExamples(apiClass);
+		const examples = Tsdoc.examples(apiClass);
 		if (examples.length > 0) {
 			content += `## Examples\n\n`;
 			for (const example of examples) {
@@ -200,11 +198,11 @@ var ClassPageGenerator = class {
 				} else content += `\`\`\`${prepared.language}\n${formattedCode}\n\`\`\`\n\n`;
 			}
 		}
-		const seeReferences = ApiParser.getSeeReferences(apiClass);
+		const seeReferences = Tsdoc.seeReferences(apiClass);
 		if (seeReferences.length > 0) {
 			content += `## See Also\n\n`;
 			for (const reference of seeReferences) {
-				const refText = escapeMdxGenerics(markdownCrossLinker.addCrossLinks(reference.text));
+				const refText = escapeMdxGenerics(linkProse(reference.text));
 				content += `- ${refText}\n`;
 			}
 			content += `\n`;
@@ -220,15 +218,15 @@ var ClassPageGenerator = class {
 	* `Foo_base` variable TypeScript emits for `Schema.Class`-style patterns).
 	*
 	* The `## Base Class` heading slugs to `BASE_CLASS_ANCHOR` from
-	* `synthetic-bases.ts`, which is where the cross-link route for the base
-	* name points.
+	* `@tsdoctor/model`'s `SyntheticBases`, which is where the cross-link
+	* route for the base name points.
 	*/
 	generateBaseClassSection(apiClass, syntheticBase, packageName, apiScope) {
 		const baseDecl = syntheticBase;
 		if (!baseDecl?.excerpt?.text) return "";
 		let section = `## Base Class\n\n`;
 		section += `\`${apiClass.displayName}\` extends \`${baseDecl.displayName}\`, a compiler-generated declaration that is not exported from \`${packageName}\`.\n\n`;
-		const signature = this.typeFormatter.format(baseDecl.excerpt).trim();
+		const signature = Signature.format(baseDecl.excerpt).trim();
 		let source = signature;
 		const apiPackage = apiClass.getAssociatedPackage?.();
 		if (apiPackage) {
@@ -286,13 +284,13 @@ var ClassPageGenerator = class {
 	*/
 	generateClassMemberWithContext(apiClass, targetMember, packageName) {
 		const className = apiClass.displayName;
-		const inheritance = ApiParser.getInheritance(apiClass);
+		const inheritance = ApiItems.inheritance(apiClass);
 		let declaration = `class ${className}`;
 		if (inheritance.extends && inheritance.extends.length > 0) declaration += ` extends ${inheritance.extends.join(", ")}`;
 		if (inheritance.implements && inheritance.implements.length > 0) declaration += ` implements ${inheritance.implements.join(", ")}`;
 		declaration += " {";
 		const memberItem = targetMember;
-		const memberSignature = memberItem.excerpt?.text ? this.typeFormatter.format(memberItem.excerpt).trim() : "";
+		const memberSignature = memberItem.excerpt?.text ? Signature.format(memberItem.excerpt).trim() : "";
 		const skeleton = `${declaration}\n${memberSignature}\n}`;
 		const apiPackage = apiClass.getAssociatedPackage?.();
 		if (apiPackage) {
@@ -320,7 +318,7 @@ var ClassPageGenerator = class {
 	generateClassSkeleton(apiClass) {
 		const lines = [];
 		const className = apiClass.displayName;
-		const inheritance = ApiParser.getInheritance(apiClass);
+		const inheritance = ApiItems.inheritance(apiClass);
 		let declaration = `class ${className}`;
 		if (inheritance.extends && inheritance.extends.length > 0) declaration += ` extends ${inheritance.extends.join(", ")}`;
 		if (inheritance.implements && inheritance.implements.length > 0) declaration += ` implements ${inheritance.implements.join(", ")}`;
@@ -330,7 +328,7 @@ var ClassPageGenerator = class {
 		if (constructors.length > 0) for (const ctor of constructors) {
 			const ctorItem = ctor;
 			if (ctorItem.excerpt?.text) {
-				const signature = this.typeFormatter.format(ctorItem.excerpt).trim();
+				const signature = Signature.format(ctorItem.excerpt).trim();
 				lines.push(`    ${signature}`);
 			}
 		}
@@ -343,14 +341,14 @@ var ClassPageGenerator = class {
 		if (staticProperties.length > 0) for (const prop of staticProperties) {
 			const propItem = prop;
 			if (propItem.excerpt?.text) {
-				const signature = this.typeFormatter.format(propItem.excerpt).trim();
+				const signature = Signature.format(propItem.excerpt).trim();
 				lines.push(`    ${signature}`);
 			}
 		}
 		if (grouped.staticMethods.length > 0) for (const method of grouped.staticMethods) {
 			const methodItem = method;
 			if (methodItem.excerpt?.text) {
-				const signature = this.typeFormatter.format(methodItem.excerpt).trim();
+				const signature = Signature.format(methodItem.excerpt).trim();
 				lines.push(`    ${signature}`);
 			}
 		}
@@ -362,21 +360,21 @@ var ClassPageGenerator = class {
 		if (instanceProperties.length > 0) for (const prop of instanceProperties) {
 			const propItem = prop;
 			if (propItem.excerpt?.text) {
-				const signature = this.typeFormatter.format(propItem.excerpt).trim();
+				const signature = Signature.format(propItem.excerpt).trim();
 				lines.push(`    ${signature}`);
 			}
 		}
 		if (grouped.getters.length > 0) for (const method of grouped.getters) {
 			const methodItem = method;
 			if (methodItem.excerpt?.text) {
-				const signature = this.typeFormatter.format(methodItem.excerpt).trim();
+				const signature = Signature.format(methodItem.excerpt).trim();
 				lines.push(`    ${signature}`);
 			}
 		}
 		if (grouped.instanceMethods.length > 0) for (const method of grouped.instanceMethods) {
 			const methodItem = method;
 			if (methodItem.excerpt?.text) {
-				const signature = this.typeFormatter.format(methodItem.excerpt).trim();
+				const signature = Signature.format(methodItem.excerpt).trim();
 				lines.push(`    ${signature}`);
 			}
 		}