rspress-plugin-api-extractor 0.4.0 → 0.6.0

package/layers/ConfigServiceLive.js

@@ -180,7 +180,7 @@ function ConfigServiceLive(options, shikiCrossLinker, buildId = "", resolvedThre
 				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.incrementBy(BuildMetrics.externalPackagesTotal, externalPackages.length));
+				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;
@@ -234,7 +234,7 @@ function ConfigServiceLive(options, shikiCrossLinker, buildId = "", resolvedThre
 							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.increment(BuildMetrics.apiVersionsLoaded));
+								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);
@@ -242,7 +242,7 @@ function ConfigServiceLive(options, shikiCrossLinker, buildId = "", resolvedThre
 								validateExternalPackages(versionExternalPackages || api.externalPackages, packageJson);
 								const autoDetectOptions = versionAutoDetectDependencies || api.autoDetectDependencies;
 								const externalPackages = versionExternalPackages || api.externalPackages || extractAutoDetectedPackages(packageJson, autoDetectOptions);
-								if (externalPackages && externalPackages.length > 0) Effect.runSync(Metric.incrementBy(BuildMetrics.externalPackagesTotal, externalPackages.length));
+								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 = versionOgImage ?? api.ogImage ?? options.ogImage;
@@ -433,7 +433,7 @@ function ConfigServiceLive(options, shikiCrossLinker, buildId = "", resolvedThre
 			}));
 			const documentedPackageNames = new Set(apiConfigs.map((config) => config.packageName));
 			const externalPackagesToLoad = allExternalPackages.filter((pkg) => !documentedPackageNames.has(pkg.name));
-			const typeLoadResult = yield* Effect.either(Effect.gen(function* () {
+			const typeLoadResult = yield* Effect.result(Effect.gen(function* () {
 				if (externalPackagesToLoad.length > 0) {
 					const resolvedPackages = yield* typeRegistry.resolveVersions(externalPackagesToLoad);
 					const droppedCount = externalPackagesToLoad.length - resolvedPackages.length;
@@ -454,12 +454,12 @@ function ConfigServiceLive(options, shikiCrossLinker, buildId = "", resolvedThre
 					}
 				}
 			}));
-			if (typeLoadResult._tag === "Left") yield* emit(PluginEvent.ConfigCascadeWarning({
+			if (typeLoadResult._tag === "Failure") yield* emit(PluginEvent.ConfigCascadeWarning({
 				ctx: { buildId: "" },
 				level: "warn",
 				field: "externalTypes",
 				chosen: "empty VFS",
-				ignored: [typeLoadResult.left.message ?? String(typeLoadResult.left)]
+				ignored: [typeLoadResult.failure.message ?? String(typeLoadResult.failure)]
 			}));
 			const twoslashStartMs = performance.now();
 			TwoslashManager.getInstance().initialize(combinedVfs, void 0, void 0, void 0, resolvedCompilerOptions);

package/layers/ObservabilityLive.js

@@ -3,7 +3,7 @@ import { makeConsoleSink } from "../observability/sinks/console-sink.js";
 import { BuildMetrics } from "./build-metrics.js";
 import { makeMetricsSink } from "../observability/sinks/metrics-sink.js";
 import { makeTraceSink } from "../observability/sinks/trace-sink.js";
-import { Effect, Layer, LogLevel, Logger, Metric } from "effect";
+import { Effect, Layer, Logger, Metric, References } from "effect";
 
 //#region src/layers/ObservabilityLive.ts
 function formatTime(date) {
@@ -13,20 +13,19 @@ function formatTime(date) {
 * A slim Effect Logger layer that gates the residual `Effect.log*` calls in
 * `build-program.ts` and `logBuildSummary` at the configured level.
 *
-* Level mapping: none→None, error→Error, warn→Warning, info→Info,
+* Level mapping: none→None, error→Error, warn→Warn, info→Info,
 * debug/trace→Debug.  Format: `[HH:MM:SS] <prefix><message>` with
-* `⚠️  ` / `🔴 ` prefixes for Warning / Error to match the EventBus
+* `⚠️  ` / `🔴 ` prefixes for Warn / Error to match the EventBus
 * console-sink style.
 */
 function makeSummaryLoggerLayer(logLevel) {
-	const effectLevel = logLevel === "none" ? LogLevel.None : logLevel === "error" ? LogLevel.Error : logLevel === "warn" ? LogLevel.Warning : logLevel === "info" ? LogLevel.Info : LogLevel.Debug;
+	const effectLevel = logLevel === "none" ? "None" : logLevel === "error" ? "Error" : logLevel === "warn" ? "Warn" : logLevel === "info" ? "Info" : "Debug";
 	const pluginLogger = Logger.make(({ logLevel: lvl, message, date }) => {
 		const time = formatTime(date);
-		const msg = typeof message === "string" ? message : String(message);
-		const prefix = lvl._tag === "Warning" ? "⚠️  " : lvl._tag === "Error" ? "🔴 " : "";
-		console.log(`[${time}] ${prefix}${msg}`);
+		const msg = Array.isArray(message) ? message.map(String).join(" ") : String(message);
+		console.log(`[${time}] ${lvl === "Warn" ? "⚠️  " : lvl === "Error" ? "🔴 " : ""}${msg}`);
 	});
-	return Layer.mergeAll(Logger.replace(Logger.defaultLogger, pluginLogger), Logger.minimumLogLevel(effectLevel));
+	return Layer.mergeAll(Logger.layer([pluginLogger]), Layer.succeed(References.MinimumLogLevel, effectLevel));
 }
 /**
 * Compose the console + metrics (+ optional trace) sinks into an EventBus layer.

package/layers/SnapshotServiceLive.js

@@ -2,11 +2,9 @@ import { hashContent } from "../content-hash.js";
 import { SnapshotService } from "../services/SnapshotService.js";
 import { SnapshotDbError } from "../errors.js";
 import migration from "../migrations/001_create_snapshots.js";
-import { NodeContext } from "@effect/platform-node";
 import { Effect, Layer, Option } from "effect";
-import { Migrator } from "@effect/sql";
-import * as SqlClient from "@effect/sql/SqlClient";
 import { SqliteClient, SqliteMigrator } from "@effect/sql-sqlite-node";
+import { Migrator, SqlClient } from "effect/unstable/sql";
 
 //#region src/layers/SnapshotServiceLive.ts
 function toFileSnapshot(row) {
@@ -29,8 +27,8 @@ function toSnapshotDbError(error) {
 }
 const SnapshotServiceLive = (dbPath) => {
 	const SqlLive = SqliteClient.layer({ filename: dbPath });
-	const MigratorLive = SqliteMigrator.layer({ loader: Migrator.fromRecord({ "001_create_snapshots": migration }) }).pipe(Layer.provide(Layer.merge(SqlLive, NodeContext.layer)));
-	const ServiceImpl = Layer.scoped(SnapshotService, Effect.gen(function* () {
+	const MigratorLive = SqliteMigrator.layer({ loader: Migrator.fromRecord({ "001_create_snapshots": migration }) }).pipe(Layer.provide(SqlLive));
+	const ServiceImpl = Layer.effect(SnapshotService, Effect.gen(function* () {
 		const sql = yield* SqlClient.SqlClient;
 		yield* Effect.addFinalizer(() => sql`PRAGMA wal_checkpoint(TRUNCATE)`.pipe(Effect.ignore));
 		return {

package/layers/TypeRegistryServiceLive.js

@@ -3,9 +3,11 @@ import { emit } from "../observability/EventBus.js";
 import { resolveExternalPackageVersions } from "../config-utils.js";
 import { TypeRegistryError } from "../errors.js";
 import { TypeRegistryService } from "../services/TypeRegistryService.js";
-import { Effect, Layer } from "effect";
-import { PackageSpec, RegistryEvent, TypeRegistry, TypeRegistryObserver } from "type-registry-effect";
-import { NodeLayer } from "type-registry-effect/node";
+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 { Cache } from "@effected/store";
+import { AppDirs, Xdg } from "@effected/xdg";
 
 //#region src/layers/TypeRegistryServiceLive.ts
 /**
@@ -17,130 +19,131 @@ import { NodeLayer } from "type-registry-effect/node";
 * The summary (`BatchComplete`) and failures are surfaced at info/warning;
 * per-package detail stays at debug so a normal build is quiet.
 */
-const RegistryObserverLayer = Layer.succeed(TypeRegistryObserver, { emit: (event) => RegistryEvent.$match(event, {
-	VersionResolved: ({ package: pkg, requested, resolved }) => emit(PluginEvent.TypeRegistryEvent({
-		ctx: {
-			buildId: "",
-			packageName: pkg
-		},
-		level: "debug",
-		kind: "VersionResolved",
-		detail: `${requested} -> ${resolved}`
-	})),
-	VersionResolveFailed: ({ package: pkg, requested, reason }) => emit(PluginEvent.TypeRegistryEvent({
-		ctx: {
-			buildId: "",
-			packageName: pkg
-		},
-		level: "debug",
-		kind: "VersionResolveFailed",
-		detail: `${requested}: ${reason}`
-	})),
-	CacheHit: ({ package: pkg, version }) => emit(PluginEvent.TypeRegistryEvent({
-		ctx: {
-			buildId: "",
-			packageName: pkg,
-			version
-		},
-		level: "debug",
-		kind: "CacheHit",
-		detail: ""
-	})),
-	CacheStale: ({ package: pkg, version }) => emit(PluginEvent.TypeRegistryEvent({
-		ctx: {
-			buildId: "",
-			packageName: pkg,
-			version
-		},
-		level: "debug",
-		kind: "CacheStale",
-		detail: ""
-	})),
-	CacheMiss: ({ package: pkg, version }) => emit(PluginEvent.TypeRegistryEvent({
-		ctx: {
-			buildId: "",
-			packageName: pkg,
-			version
-		},
-		level: "debug",
-		kind: "CacheMiss",
-		detail: ""
-	})),
-	FetchStart: ({ package: pkg, version }) => emit(PluginEvent.TypeRegistryEvent({
-		ctx: {
-			buildId: "",
-			packageName: pkg,
-			version
-		},
-		level: "debug",
-		kind: "FetchStart",
-		detail: ""
-	})),
-	FetchFailed: ({ url, status, bodySnippet }) => emit(PluginEvent.TypeRegistryEvent({
-		ctx: { buildId: "" },
-		level: "debug",
-		kind: "FetchFailed",
-		detail: `HTTP ${status}: ${url}${bodySnippet ? ` — ${bodySnippet}` : ""}`
-	})),
-	PackageLoaded: ({ package: pkg, version, files, source }) => emit(PluginEvent.TypeRegistryEvent({
-		ctx: {
-			buildId: "",
-			packageName: pkg,
-			version
-		},
-		level: "debug",
-		kind: "PackageLoaded",
-		detail: `${files} files, ${source}`
-	})),
-	PackageLoadFailed: ({ package: pkg, version, kind, message }) => emit(PluginEvent.TypeRegistryEvent({
-		ctx: {
-			buildId: "",
-			packageName: pkg,
-			version
-		},
-		level: "warn",
-		kind: "PackageLoadFailed",
-		detail: `[${kind}] ${message}`
-	})),
-	BatchStart: ({ total }) => emit(PluginEvent.TypeRegistryEvent({
-		ctx: { buildId: "" },
-		level: "debug",
-		kind: "BatchStart",
-		detail: `${total} package(s)`
-	})),
-	BatchComplete: ({ loaded, total, totalFiles, durationMs }) => emit(PluginEvent.TypeRegistryEvent({
-		ctx: { buildId: "" },
-		level: "info",
-		kind: "BatchComplete",
-		detail: `${loaded}/${total} packages, ${totalFiles} files, ${durationMs}ms`
-	}))
-}) });
+const RegistryObserverLayer = Layer.succeed(RegistryObserver, { emit: (event) => {
+	switch (event._tag) {
+		case "VersionResolved": return emit(PluginEvent.TypeRegistryEvent({
+			ctx: {
+				buildId: "",
+				packageName: event.package
+			},
+			level: "debug",
+			kind: "VersionResolved",
+			detail: `${event.requested} -> ${event.resolved}`
+		}));
+		case "VersionResolveFailed": return emit(PluginEvent.TypeRegistryEvent({
+			ctx: {
+				buildId: "",
+				packageName: event.package
+			},
+			level: "debug",
+			kind: "VersionResolveFailed",
+			detail: `${event.requested}: ${event.kind}`
+		}));
+		case "CacheHit":
+		case "CacheMiss":
+		case "FetchStart": return emit(PluginEvent.TypeRegistryEvent({
+			ctx: {
+				buildId: "",
+				packageName: event.package,
+				version: event.version
+			},
+			level: "debug",
+			kind: event._tag,
+			detail: ""
+		}));
+		case "CacheStale": return emit(PluginEvent.TypeRegistryEvent({
+			ctx: {
+				buildId: "",
+				packageName: event.package,
+				version: event.version
+			},
+			level: "debug",
+			kind: "CacheStale",
+			detail: ""
+		}));
+		case "FetchFailed": return emit(PluginEvent.TypeRegistryEvent({
+			ctx: { buildId: "" },
+			level: "debug",
+			kind: "FetchFailed",
+			detail: `HTTP ${event.status}: ${event.url}${event.bodySnippet ? ` — ${event.bodySnippet}` : ""}`
+		}));
+		case "PackageLoaded": return emit(PluginEvent.TypeRegistryEvent({
+			ctx: {
+				buildId: "",
+				packageName: event.package,
+				version: event.version
+			},
+			level: "debug",
+			kind: "PackageLoaded",
+			detail: `${event.files} files, ${event.source}`
+		}));
+		case "PackageLoadFailed": return emit(PluginEvent.TypeRegistryEvent({
+			ctx: {
+				buildId: "",
+				packageName: event.package,
+				version: event.version
+			},
+			level: "warn",
+			kind: "PackageLoadFailed",
+			detail: `[${event.kind}] ${event.error instanceof Error ? event.error.message : String(event.error)}`
+		}));
+		case "BatchStart": return emit(PluginEvent.TypeRegistryEvent({
+			ctx: { buildId: "" },
+			level: "debug",
+			kind: "BatchStart",
+			detail: `${event.total} package(s)`
+		}));
+		case "BatchComplete": return emit(PluginEvent.TypeRegistryEvent({
+			ctx: { buildId: "" },
+			level: "info",
+			kind: "BatchComplete",
+			detail: `${event.loaded}/${event.total} packages, ${event.totalFiles} files, ${Math.round(Duration.toMillis(event.duration))}ms`
+		}));
+	}
+} });
 /**
-* type-registry-effect runtime: the Node platform layer plus the observer that
-* forwards registry events to the plugin logger.
+* type-registry-effect v2 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.
 *
-* `NodeLayer` provides CacheService, PackageFetcher, and TypeResolver with
-* Node.js platform implementations (FileSystem, HttpClient). Built-in metrics
-* (packagesLoaded, packagesFailed, cacheHits, etc.) are tracked by the library.
+* All layers are bound to module-level consts (never rebuilt per call) per the
+* 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)));
+/** 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;
+	const path = yield* Path.Path;
+	const cacheDir = yield* appDirs.ensureCache;
+	return Cache.layerSqlite({ filename: path.join(cacheDir, "metadata.sqlite") });
+})).pipe(Layer.provide(Layer.mergeAll(AppDirsLive, PlatformLive)));
+/**
+* The full registry runtime: TypeRegistry over an XDG-rooted TypeCache and the
+* jsDelivr PackageFetcher, with the observer that forwards registry events to
+* the plugin's EventBus (found ambiently via serviceOption at emit time).
 */
-const RegistryLayer = Layer.merge(NodeLayer, RegistryObserverLayer);
+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.
 */
 const TypeRegistryServiceLive = Layer.succeed(TypeRegistryService, {
-	resolveVersions: (packages) => resolveExternalPackageVersions(packages, (pkg) => TypeRegistry.resolveVersion(pkg.name, pkg.version)).pipe(Effect.provide(RegistryLayer)),
-	loadPackages: (packages) => Effect.gen(function* () {
-		if (packages.length === 0) return { vfs: /* @__PURE__ */ new Map() };
+	resolveVersions: (packages) => Effect.gen(function* () {
+		const registry = yield* TypeRegistry;
+		return yield* resolveExternalPackageVersions(packages, (pkg) => registry.resolveVersion(pkg.name, pkg.version));
+	}).pipe(Effect.provide(RegistryLayer), Effect.catch(() => Effect.succeed([...packages]))),
+	loadPackages: (packages) => packages.length === 0 ? Effect.succeed({ vfs: /* @__PURE__ */ new Map() }) : Effect.gen(function* () {
 		const specs = packages.map((pkg) => new PackageSpec({
 			name: pkg.name,
 			version: pkg.version
 		}));
-		return { vfs: yield* TypeRegistry.getVFS(specs, { autoFetch: true }).pipe(Effect.catchAll((error) => Effect.fail(new TypeRegistryError({
-			packageName: packages.map((p) => p.name).join(", "),
-			version: packages.map((p) => p.version).join(", "),
-			reason: error.message ?? String(error)
-		})))) };
-	}).pipe(Effect.provide(RegistryLayer))
+		return { vfs: yield* (yield* TypeRegistry).getVfs(specs, { autoFetch: true }) };
+	}).pipe(Effect.provide(RegistryLayer), Effect.catch((error) => Effect.fail(new TypeRegistryError({
+		packageName: packages.map((p) => p.name).join(", "),
+		version: packages.map((p) => p.version).join(", "),
+		reason: error instanceof Error ? error.message ?? String(error) : String(error)
+	}))))
 });
 
 //#endregion

package/layers/build-metrics.js

@@ -1,4 +1,4 @@
-import { Metric, MetricBoundaries } from "effect";
+import { Metric } from "effect";
 
 //#region src/layers/build-metrics.ts
 /**
@@ -17,7 +17,7 @@ const BuildMetrics = {
 	filesNew: Metric.counter("files.new"),
 	filesModified: Metric.counter("files.modified"),
 	filesUnchanged: Metric.counter("files.unchanged"),
-	codeblockDuration: Metric.histogram("codeblock.duration", MetricBoundaries.fromIterable([
+	codeblockDuration: Metric.histogram("codeblock.duration", { boundaries: [
 		10,
 		25,
 		50,
@@ -25,15 +25,15 @@ const BuildMetrics = {
 		200,
 		500,
 		1e3
-	])),
-	codeblockShikiDuration: Metric.histogram("codeblock.shiki.duration", MetricBoundaries.fromIterable([
+	] }),
+	codeblockShikiDuration: Metric.histogram("codeblock.shiki.duration", { boundaries: [
 		5,
 		10,
 		25,
 		50,
 		100,
 		250
-	])),
+	] }),
 	codeblockTotal: Metric.counter("codeblock.total"),
 	codeblockSlow: Metric.counter("codeblock.slow"),
 	twoslashErrors: Metric.counter("twoslash.errors"),
@@ -41,7 +41,7 @@ const BuildMetrics = {
 	pagesGenerated: Metric.counter("pages.generated"),
 	apiVersionsLoaded: Metric.counter("api.versions.loaded"),
 	externalPackagesTotal: Metric.counter("external.packages.total"),
-	phaseDuration: Metric.histogram("phase.duration", MetricBoundaries.fromIterable([
+	phaseDuration: Metric.histogram("phase.duration", { boundaries: [
 		50,
 		100,
 		250,
@@ -50,7 +50,7 @@ const BuildMetrics = {
 		2500,
 		5e3,
 		1e4
-	])),
+	] }),
 	vfsFiles: Metric.counter("vfs.files"),
 	importsPrepended: Metric.counter("imports.prepended"),
 	twoslashDiagnostics: Metric.counter("twoslash.diagnostics"),

package/llms-program.js

@@ -2,15 +2,14 @@ import { PluginEvent } from "./observability/events.js";
 import { emit } from "./observability/EventBus.js";
 import { filterLlmsFullTxt, filterLlmsTxt, generatePackageLlmsFullTxt, generatePackageLlmsTxt, generateStructuredLlmsTxt, parseLlmsTxtLine } from "./llms-processing.js";
 import path from "node:path";
-import { Effect } from "effect";
-import { FileSystem } from "@effect/platform";
+import { Effect, FileSystem } from "effect";
 
 //#region src/llms-program.ts
 /**
 * Effect program for post-processing LLMs text files in afterBuild.
 *
 * Wires the pure processing functions from llms-processing.ts into the
-* plugin lifecycle, handling file I/O via \@effect/platform FileSystem.
+* plugin lifecycle, handling file I/O via the core `effect` FileSystem service.
 *
 * Responsibilities:
 * 1. Collect all API routes from build results
@@ -170,7 +169,7 @@ function collectApiPageContent(globalLlmsFullContent, result) {
 * 3. For each prefix, post-processes global llms.txt and llms-full.txt
 * 4. When scopes is enabled, generates per-package LLMs files
 *
-* Requires FileSystem from \@effect/platform.
+* Requires the core `effect` FileSystem service.
 */
 function processLlmsFiles(input) {
 	return Effect.gen(function* () {

package/migrations/001_create_snapshots.js

@@ -1,5 +1,5 @@
 import { Effect } from "effect";
-import * as SqlClient from "@effect/sql/SqlClient";
+import { SqlClient } from "effect/unstable/sql";
 
 //#region src/migrations/001_create_snapshots.ts
 const migration = Effect.gen(function* () {

package/observability/EventBus.js

@@ -2,7 +2,7 @@ import { LEVEL_RANK, levelOf } from "./events.js";
 import { Context, Effect, Layer, Option } from "effect";
 
 //#region src/observability/EventBus.ts
-var EventBus = class extends Context.Tag("rspress-plugin-api-extractor/EventBus")() {};
+var EventBus = class extends Context.Service()("rspress-plugin-api-extractor/EventBus") {};
 function makeShape(sinks) {
 	const maxAdmitted = sinks.filter((s) => s.capturesPayload === true).reduce((max, s) => Math.max(max, LEVEL_RANK[s.minLevel]), -1);
 	return {

package/observability/sinks/metrics-sink.js

@@ -25,38 +25,38 @@ function makeMetricsSink() {
 		handle(event) {
 			switch (event._tag) {
 				case "FileDecision":
-					Effect.runSync(Metric.increment(BuildMetrics.filesTotal));
-					if (event.status === "new") Effect.runSync(Metric.increment(BuildMetrics.filesNew));
-					else if (event.status === "modified") Effect.runSync(Metric.increment(BuildMetrics.filesModified));
-					else Effect.runSync(Metric.increment(BuildMetrics.filesUnchanged));
+					Effect.runSync(Metric.update(BuildMetrics.filesTotal, 1));
+					if (event.status === "new") Effect.runSync(Metric.update(BuildMetrics.filesNew, 1));
+					else if (event.status === "modified") Effect.runSync(Metric.update(BuildMetrics.filesModified, 1));
+					else Effect.runSync(Metric.update(BuildMetrics.filesUnchanged, 1));
 					break;
 				case "PageGenerated":
-					Effect.runSync(Metric.increment(BuildMetrics.pagesGenerated));
+					Effect.runSync(Metric.update(BuildMetrics.pagesGenerated, 1));
 					break;
 				case "TwoslashDiagnostic":
-					Effect.runSync(Metric.increment(BuildMetrics.twoslashDiagnostics));
-					Effect.runSync(Metric.increment(BuildMetrics.twoslashErrors));
+					Effect.runSync(Metric.update(BuildMetrics.twoslashDiagnostics, 1));
+					Effect.runSync(Metric.update(BuildMetrics.twoslashErrors, 1));
 					break;
 				case "PrettierError":
-					Effect.runSync(Metric.increment(BuildMetrics.prettierErrors));
+					Effect.runSync(Metric.update(BuildMetrics.prettierErrors, 1));
 					break;
 				case "CodeBlockProcessed":
-					Effect.runSync(Metric.increment(BuildMetrics.codeblockTotal));
+					Effect.runSync(Metric.update(BuildMetrics.codeblockTotal, 1));
 					Effect.runSync(Metric.update(BuildMetrics.codeblockDuration, event.totalMs));
 					if (event.shikiMs > 0) Effect.runSync(Metric.update(BuildMetrics.codeblockShikiDuration, event.shikiMs));
-					if (event.slow) Effect.runSync(Metric.increment(BuildMetrics.codeblockSlow));
+					if (event.slow) Effect.runSync(Metric.update(BuildMetrics.codeblockSlow, 1));
 					break;
 				case "VfsGenerated":
-					Effect.runSync(Metric.increment(BuildMetrics.vfsFiles));
+					Effect.runSync(Metric.update(BuildMetrics.vfsFiles, 1));
 					break;
 				case "ImportsPrepended":
-					Effect.runSync(Metric.increment(BuildMetrics.importsPrepended));
+					Effect.runSync(Metric.update(BuildMetrics.importsPrepended, 1));
 					break;
 				case "PhaseCompleted":
 					Effect.runSync(Metric.update(BuildMetrics.phaseDuration, event.durationMs));
 					break;
 				case "DefaultApplied":
-					Effect.runSync(Metric.increment(BuildMetrics.configDefaultsApplied));
+					Effect.runSync(Metric.update(BuildMetrics.configDefaultsApplied, 1));
 					break;
 				default: break;
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "rspress-plugin-api-extractor",
-	"version": "0.4.0",
+	"version": "0.6.0",
 	"private": false,
 	"description": "RSPress plugin for generating API documentation from TypeScript API Extractor models",
 	"keywords": [
@@ -14,7 +14,7 @@
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/spencerbeggs/rspress-plugin-api-extractor.git",
-		"directory": "plugin"
+		"directory": "package"
 	},
 	"license": "MIT",
 	"author": "Spencer Beggs",
@@ -22,40 +22,41 @@
 	"exports": {
 		".": {
 			"types": "./index.d.ts",
-			"import": "./index.js"
+			"import": "./index.js",
+			"default": "./index.js"
 		},
 		"./runtime": {
 			"types": "./runtime/index.d.ts",
-			"import": "./runtime/index.js"
+			"import": "./runtime/index.js",
+			"default": "./runtime/index.js"
 		},
 		"./tsconfig/rspress.json": "./tsconfig/rspress.json",
 		"./package.json": "./package.json"
 	},
 	"dependencies": {
-		"@effect/cluster": "^0.59.0",
-		"@effect/experimental": "^0.60.0",
-		"@effect/platform": "^0.96.2",
-		"@effect/platform-node": "^0.107.0",
-		"@effect/rpc": "^0.75.1",
-		"@effect/sql": "^0.51.1",
-		"@effect/sql-sqlite-node": "^0.52.0",
-		"@effect/workflow": "^0.18.2",
+		"@effect/platform-node": "4.0.0-beta.98",
+		"@effect/sql-sqlite-node": "4.0.0-beta.98",
+		"@effected/semver": "^0.1.0",
+		"@effected/store": "^0.1.0",
+		"@effected/tsconfig-json": "^0.2.3",
+		"@effected/xdg": "^0.1.3",
 		"@microsoft/api-extractor-model": "^7.33.8",
 		"@shikijs/twoslash": "^4.3.1",
+		"@typescript/vfs": "^1.6.4",
 		"api-extractor-llms": "^0.2.0",
 		"clsx": "^2.1.1",
-		"effect": "^3.21.4",
+		"effect": "4.0.0-beta.98",
 		"gray-matter": "^4.0.3",
 		"hast-util-to-jsx-runtime": "^2.3.6",
 		"image-size": "^2.0.2",
+		"ioredis": "^5.7.0",
 		"mdast-util-from-markdown": "^2.0.3",
 		"mdast-util-to-hast": "^13.2.1",
 		"open": "^11.0.0",
 		"prettier": "^3.9.5",
 		"react-markdown": "^10.1.0",
-		"semver-effect": "^0.3.1",
 		"shiki": "^4.3.1",
-		"type-registry-effect": "^1.1.0",
+		"type-registry-effect": "^2.0.0",
 		"typescript": "^6.0.3",
 		"unist-util-visit": "^5.1.0"
 	},