@tsdoctor/vfs 0.1.0 → 0.2.1

package/TwoslashCache.js

@@ -0,0 +1,188 @@
+import { createHash } from "node:crypto";
+import { gunzipSync, gzipSync } from "node:zlib";
+
+//#region src/TwoslashCache.ts
+/**
+* Persisted Twoslash result cache.
+*
+* Type-checking code blocks is by far the dominant cost of the render phase —
+* measured at ~97% of it, concentrated in the minority of blocks that carry an
+* `@example` (see `render-phase-instrumentation.md`). `@shikijs/twoslash`
+* exposes a first-class `typesCache` seam for exactly this, so the work here is
+* a keying scheme and a store rather than a new interception point.
+*
+* ## Soundness
+*
+* A Twoslash result depends on the code, the compiler options, the declarations
+* it is checked against, and the compiler doing the checking. The keys cover
+* all four: the per-entry key carries the code, its language and the compiler
+* options; {@link twoslashEnvHash} carries the declarations and the TypeScript
+* version.
+*
+* The TypeScript version is load-bearing and easy to overlook — `lib.d.ts`
+* ships with the compiler and inference changes between releases, so an upgrade
+* against unchanged declarations yields different hovers. Omitting it would let
+* a warm cache serve results from the previous compiler and stay wrong until
+* the API's own declarations happened to change.
+*
+* NOT covered, and covered instead by {@link TWOSLASH_CACHE_FORMAT}: the
+* `@shikijs/twoslash` / `twoslash` renderer version, which determines the shape
+* of the stored `nodes`. Bump the format constant when upgrading those, since
+* nothing derives it automatically.
+*
+* ## Invalidation granularity
+*
+* The consequence of that soundness is coarse invalidation: any VFS change
+* discards the whole generation, because a declaration change anywhere can
+* legitimately change any block's inferred types. So this cache makes repeat
+* builds over an UNCHANGED API nearly free — CI re-runs, prose-only edits,
+* theme and config changes, rebuilding a site without touching the library —
+* and does nothing for the build right after an API item changes.
+*
+* Sharpening that would need per-scope type environments, so one package's
+* change stops invalidating every other package's blocks. That is fix (b) in
+* `render-phase-instrumentation.md`, tracked as a correctness fix; it would
+* make this cache substantially more effective on a multi-API site as a side
+* effect.
+*
+* ## Synchronous by necessity
+*
+* `TwoslashTypesCache.read`/`write` are synchronous — they are called from
+* inside Shiki's `preprocess` hook. Persistence is therefore load-once at
+* startup and save-once at the end, against an in-memory map; there is no
+* per-entry I/O. See `TwoslashCacheService`.
+*/
+/**
+* Bumped when the stored shape changes, so an older blob is treated as absent
+* rather than deserialized into the wrong shape.
+*
+* Also the manual lever for renderer changes: bump this when upgrading
+* `@shikijs/twoslash` or `twoslash`, whose versions determine the shape of the
+* stored `nodes` and are not derived into any key.
+*
+* @public
+*/
+const TWOSLASH_CACHE_FORMAT = 1;
+function sha256(input) {
+	return createHash("sha256").update(input).digest("hex");
+}
+/**
+* Fingerprint the type environment a generation is checked against.
+*
+* Covers the declarations (`vfs`) and the compiler that interprets them
+* (`toolchain`). The VFS is hashed over sorted `path\0content` pairs so the
+* digest is stable against map iteration order.
+*
+* `toolchain` must carry the TypeScript version. The declarations alone do not
+* determine the answer: `lib.d.ts` ships with the compiler and inference
+* behaviour changes between releases, so upgrading TypeScript against unchanged
+* declarations produces different hovers. Without the version in the key the
+* warm cache would serve results computed by the previous compiler, and stay
+* wrong until the API's own declarations happened to change.
+*
+* Compiler OPTIONS are deliberately not folded in here — they belong on the
+* per-entry key, so one generation can hold results from the several
+* configurations a multi-API site may declare.
+*
+* @public
+*/
+function twoslashEnvHash(vfs, toolchain) {
+	const hash = createHash("sha256");
+	hash.update(`format:${1}\0toolchain:${toolchain}\0`);
+	for (const key of [...vfs.keys()].sort()) hash.update(`${key}\0${vfs.get(key) ?? ""}\0`);
+	return hash.digest("hex");
+}
+/** JSON with object keys sorted, so equivalent options hash identically. */
+function stableStringify(value) {
+	if (value === null || typeof value !== "object") return JSON.stringify(value) ?? "null";
+	if (Array.isArray(value)) return `[${value.map(stableStringify).join(",")}]`;
+	return `{${Object.entries(value).sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0).map(([k, v]) => `${JSON.stringify(k)}:${stableStringify(v)}`).join(",")}}`;
+}
+/**
+* Per-entry key: the code, its language, and the compiler configuration it is
+* checked under.
+*
+* The configuration matters because two APIs on one site may be documented
+* under different `tsconfig`s — the same source checked under different options
+* can produce different types, so it must not share a cache entry.
+*
+* @public
+*/
+function twoslashEntryKey(code, lang, compilerOptions) {
+	return sha256(`${lang ?? "ts"}\0${stableStringify(compilerOptions ?? {})}\0${code}`);
+}
+/**
+* The cache key a whole generation is stored under. One blob per environment,
+* so a changed environment reads as a miss rather than serving stale results.
+*
+* @public
+*/
+function twoslashBlobKey(envHash) {
+	return `twoslash/v${1}/${envHash}`;
+}
+/**
+* Build a synchronous Twoslash cache over an in-memory map, optionally seeded
+* with entries loaded from a previous build.
+*
+* @public
+*/
+function makeTwoslashCache(initial) {
+	const map = new Map(initial);
+	let hits = 0;
+	let misses = 0;
+	let dirty = false;
+	return {
+		read: (code, lang, options) => {
+			const found = map.get(twoslashEntryKey(code, lang, options?.compilerOptions));
+			if (found === void 0) {
+				misses += 1;
+				return null;
+			}
+			hits += 1;
+			return found;
+		},
+		write: (code, data, lang, options) => {
+			const value = {
+				nodes: data.nodes,
+				code: data.code,
+				...data.meta?.extension != null ? { meta: { extension: data.meta.extension } } : {}
+			};
+			map.set(twoslashEntryKey(code, lang, options?.compilerOptions), value);
+			dirty = true;
+		},
+		stats: () => ({
+			hits,
+			misses,
+			entries: map.size,
+			dirty
+		}),
+		entries: () => map
+	};
+}
+/** Serialize a generation for storage. Gzipped JSON — hover text compresses well. *
+* @public
+*/
+function encodeTwoslashCache(entries) {
+	return gzipSync(Buffer.from(JSON.stringify(Object.fromEntries(entries)), "utf-8"));
+}
+/**
+* Deserialize a stored generation.
+*
+* Returns an empty map for anything unreadable — a truncated blob, a format
+* change, a corrupted file. A cache that cannot be read is a cache miss, never
+* a build failure.
+*
+* @public
+*/
+function decodeTwoslashCache(blob) {
+	try {
+		const parsed = JSON.parse(gunzipSync(blob).toString("utf-8"));
+		if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) return /* @__PURE__ */ new Map();
+		return new Map(Object.entries(parsed));
+	} catch {
+		return /* @__PURE__ */ new Map();
+	}
+}
+
+//#endregion
+export { TWOSLASH_CACHE_FORMAT, decodeTwoslashCache, encodeTwoslashCache, makeTwoslashCache, twoslashBlobKey, twoslashEntryKey, twoslashEnvHash };

package/index.d.ts

@@ -1,6 +1,7 @@
 import { CompilerOptions, ProgrammaticCompilerOptions } from "@effected/tsconfig-json";
 import { Effect, FileSystem, PlatformError, Result, Schema } from "effect";
 import { VirtualTypeScriptEnvironment } from "@typescript/vfs";
+import { TwoslashTypesCache } from "@shikijs/twoslash";
 import { PathLike } from "node:fs";
 //#region src/TypeResolutionOptions.d.ts
 /**
@@ -252,6 +253,163 @@ declare class TsEnvironment {
   static make(options: TsEnvironmentOptions): Effect.Effect<VirtualTypeScriptEnvironment, TsEnvironmentError>;
 }
 //#endregion
+//#region src/TwoslashCache.d.ts
+/**
+ * Persisted Twoslash result cache.
+ *
+ * Type-checking code blocks is by far the dominant cost of the render phase —
+ * measured at ~97% of it, concentrated in the minority of blocks that carry an
+ * `@example` (see `render-phase-instrumentation.md`). `@shikijs/twoslash`
+ * exposes a first-class `typesCache` seam for exactly this, so the work here is
+ * a keying scheme and a store rather than a new interception point.
+ *
+ * ## Soundness
+ *
+ * A Twoslash result depends on the code, the compiler options, the declarations
+ * it is checked against, and the compiler doing the checking. The keys cover
+ * all four: the per-entry key carries the code, its language and the compiler
+ * options; {@link twoslashEnvHash} carries the declarations and the TypeScript
+ * version.
+ *
+ * The TypeScript version is load-bearing and easy to overlook — `lib.d.ts`
+ * ships with the compiler and inference changes between releases, so an upgrade
+ * against unchanged declarations yields different hovers. Omitting it would let
+ * a warm cache serve results from the previous compiler and stay wrong until
+ * the API's own declarations happened to change.
+ *
+ * NOT covered, and covered instead by {@link TWOSLASH_CACHE_FORMAT}: the
+ * `@shikijs/twoslash` / `twoslash` renderer version, which determines the shape
+ * of the stored `nodes`. Bump the format constant when upgrading those, since
+ * nothing derives it automatically.
+ *
+ * ## Invalidation granularity
+ *
+ * The consequence of that soundness is coarse invalidation: any VFS change
+ * discards the whole generation, because a declaration change anywhere can
+ * legitimately change any block's inferred types. So this cache makes repeat
+ * builds over an UNCHANGED API nearly free — CI re-runs, prose-only edits,
+ * theme and config changes, rebuilding a site without touching the library —
+ * and does nothing for the build right after an API item changes.
+ *
+ * Sharpening that would need per-scope type environments, so one package's
+ * change stops invalidating every other package's blocks. That is fix (b) in
+ * `render-phase-instrumentation.md`, tracked as a correctness fix; it would
+ * make this cache substantially more effective on a multi-API site as a side
+ * effect.
+ *
+ * ## Synchronous by necessity
+ *
+ * `TwoslashTypesCache.read`/`write` are synchronous — they are called from
+ * inside Shiki's `preprocess` hook. Persistence is therefore load-once at
+ * startup and save-once at the end, against an in-memory map; there is no
+ * per-entry I/O. See `TwoslashCacheService`.
+ */
+/**
+ * Bumped when the stored shape changes, so an older blob is treated as absent
+ * rather than deserialized into the wrong shape.
+ *
+ * Also the manual lever for renderer changes: bump this when upgrading
+ * `@shikijs/twoslash` or `twoslash`, whose versions determine the shape of the
+ * stored `nodes` and are not derived into any key.
+ *
+ * @public
+ */
+declare const TWOSLASH_CACHE_FORMAT = 1;
+/**
+ * The subset of a Twoslash run that Shiki consumes, and all this cache stores.
+ *
+ * @public
+ */
+interface TwoslashCacheValue {
+  readonly nodes: unknown;
+  readonly code: string;
+  readonly meta?: {
+    readonly extension?: string;
+  };
+}
+/**
+ * Hit/miss statistics for one generation.
+ *
+ * @public
+ */
+interface TwoslashCacheStats {
+  readonly hits: number;
+  readonly misses: number;
+  /** Entries currently held, including those loaded from a previous build. */
+  readonly entries: number;
+  /** True when at least one entry was written this build. */
+  readonly dirty: boolean;
+}
+/**
+ * The synchronous in-memory cache Shiki reads and writes, plus its statistics.
+ *
+ * @public
+ */
+interface TwoslashResultCache extends TwoslashTypesCache {
+  readonly stats: () => TwoslashCacheStats;
+  readonly entries: () => ReadonlyMap<string, TwoslashCacheValue>;
+}
+/**
+ * Fingerprint the type environment a generation is checked against.
+ *
+ * Covers the declarations (`vfs`) and the compiler that interprets them
+ * (`toolchain`). The VFS is hashed over sorted `path\0content` pairs so the
+ * digest is stable against map iteration order.
+ *
+ * `toolchain` must carry the TypeScript version. The declarations alone do not
+ * determine the answer: `lib.d.ts` ships with the compiler and inference
+ * behaviour changes between releases, so upgrading TypeScript against unchanged
+ * declarations produces different hovers. Without the version in the key the
+ * warm cache would serve results computed by the previous compiler, and stay
+ * wrong until the API's own declarations happened to change.
+ *
+ * Compiler OPTIONS are deliberately not folded in here — they belong on the
+ * per-entry key, so one generation can hold results from the several
+ * configurations a multi-API site may declare.
+ *
+ * @public
+ */
+declare function twoslashEnvHash(vfs: ReadonlyMap<string, string>, toolchain: string): string;
+/**
+ * Per-entry key: the code, its language, and the compiler configuration it is
+ * checked under.
+ *
+ * The configuration matters because two APIs on one site may be documented
+ * under different `tsconfig`s — the same source checked under different options
+ * can produce different types, so it must not share a cache entry.
+ *
+ * @public
+ */
+declare function twoslashEntryKey(code: string, lang: string | undefined, compilerOptions?: unknown): string;
+/**
+ * The cache key a whole generation is stored under. One blob per environment,
+ * so a changed environment reads as a miss rather than serving stale results.
+ *
+ * @public
+ */
+declare function twoslashBlobKey(envHash: string): string;
+/**
+ * Build a synchronous Twoslash cache over an in-memory map, optionally seeded
+ * with entries loaded from a previous build.
+ *
+ * @public
+ */
+declare function makeTwoslashCache(initial?: ReadonlyMap<string, TwoslashCacheValue>): TwoslashResultCache;
+/** Serialize a generation for storage. Gzipped JSON — hover text compresses well. *
+ * @public
+ */
+declare function encodeTwoslashCache(entries: ReadonlyMap<string, TwoslashCacheValue>): Uint8Array;
+/**
+ * Deserialize a stored generation.
+ *
+ * Returns an empty map for anything unreadable — a truncated blob, a format
+ * change, a corrupted file. A cache that cannot be read is a cache miss, never
+ * a build failure.
+ *
+ * @public
+ */
+declare function decodeTwoslashCache(blob: Uint8Array): Map<string, TwoslashCacheValue>;
+//#endregion
 //#region src/TypeScriptConfig.d.ts
 /**
  * How a caller points at TypeScript configuration: a `tsconfig.json`, inline
@@ -501,5 +659,5 @@ declare class VirtualPackage extends VirtualPackage_base {
   private toPackageJson;
 }
 //#endregion
-export { type CompilerOptionsInput, DEFAULT_COMPILER_OPTIONS, TsConfigParseError, TsEnvironment, TsEnvironmentError, type TsEnvironmentOptions, TypeResolutionCompilerOptions, type TypeScriptConfig, type Vfs, VirtualPackage, decodeCompilerOptions, isTypeDefinition, mergeCompilerOptions, mergeVfs, parseTsConfig, prefixVfs, resolveTypeScriptConfig, resolveTypeScriptConfigSingle, resolveTypeScriptConfigSingleAsync, toProgrammaticCompilerOptions };
+export { type CompilerOptionsInput, DEFAULT_COMPILER_OPTIONS, TWOSLASH_CACHE_FORMAT, TsConfigParseError, TsEnvironment, TsEnvironmentError, type TsEnvironmentOptions, type TwoslashCacheStats, type TwoslashCacheValue, type TwoslashResultCache, TypeResolutionCompilerOptions, type TypeScriptConfig, type Vfs, VirtualPackage, decodeCompilerOptions, decodeTwoslashCache, encodeTwoslashCache, isTypeDefinition, makeTwoslashCache, mergeCompilerOptions, mergeVfs, parseTsConfig, prefixVfs, resolveTypeScriptConfig, resolveTypeScriptConfigSingle, resolveTypeScriptConfigSingleAsync, toProgrammaticCompilerOptions, twoslashBlobKey, twoslashEntryKey, twoslashEnvHash };
 //# sourceMappingURL=index.d.ts.map

package/index.js

@@ -2,7 +2,8 @@ import { TypeResolutionCompilerOptions, decodeCompilerOptions, toProgrammaticCom
 import { TsConfigParseError, parseTsConfig } from "./TsconfigParser.js";
 import { isTypeDefinition, mergeVfs, prefixVfs } from "./Vfs.js";
 import { TsEnvironment, TsEnvironmentError } from "./TsEnvironment.js";
+import { TWOSLASH_CACHE_FORMAT, decodeTwoslashCache, encodeTwoslashCache, makeTwoslashCache, twoslashBlobKey, twoslashEntryKey, twoslashEnvHash } from "./TwoslashCache.js";
 import { DEFAULT_COMPILER_OPTIONS, mergeCompilerOptions, resolveTypeScriptConfig, resolveTypeScriptConfigSingle, resolveTypeScriptConfigSingleAsync } from "./TypeScriptConfig.js";
 import { VirtualPackage } from "./VirtualPackage.js";
 
-export { DEFAULT_COMPILER_OPTIONS, TsConfigParseError, TsEnvironment, TsEnvironmentError, TypeResolutionCompilerOptions, VirtualPackage, decodeCompilerOptions, isTypeDefinition, mergeCompilerOptions, mergeVfs, parseTsConfig, prefixVfs, resolveTypeScriptConfig, resolveTypeScriptConfigSingle, resolveTypeScriptConfigSingleAsync, toProgrammaticCompilerOptions };
+export { DEFAULT_COMPILER_OPTIONS, TWOSLASH_CACHE_FORMAT, TsConfigParseError, TsEnvironment, TsEnvironmentError, TypeResolutionCompilerOptions, VirtualPackage, decodeCompilerOptions, decodeTwoslashCache, encodeTwoslashCache, isTypeDefinition, makeTwoslashCache, mergeCompilerOptions, mergeVfs, parseTsConfig, prefixVfs, resolveTypeScriptConfig, resolveTypeScriptConfigSingle, resolveTypeScriptConfigSingleAsync, toProgrammaticCompilerOptions, twoslashBlobKey, twoslashEntryKey, twoslashEnvHash };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tsdoctor/vfs",
-	"version": "0.1.0",
+	"version": "0.2.1",
 	"private": false,
 	"description": "Virtual TypeScript projects for documentation tooling: the Vfs currency type, declaration-backed virtual packages, @typescript/vfs environments, and the compiler-option resolution that configures them.",
 	"keywords": [
@@ -38,11 +38,15 @@
 	},
 	"peerDependencies": {
 		"@effected/tsconfig-json": "^0.7.0",
+		"@shikijs/twoslash": "^4.4.3",
 		"@typescript/vfs": "^1.6.4",
 		"effect": "4.0.0-rc.109",
 		"typescript": "^6.0.3"
 	},
 	"peerDependenciesMeta": {
+		"@shikijs/twoslash": {
+			"optional": true
+		},
 		"@typescript/vfs": {
 			"optional": true
 		},