@coldsmirk/inkstone-monaco 0.9.0 → 0.10.0

package/README.md

@@ -19,7 +19,7 @@ Part of [inkstone](https://github.com/coldsmirk/inkstone). For a drop-in React c
 pnpm add @coldsmirk/inkstone-monaco monaco-editor
 ```
 
-`monaco-editor` is a **peer dependency** — your app owns the version. Node.js >= 22 for build / SSR hosts; workers are bundled by your bundler from `new Worker(new URL(...))`, which any Vite / Rollup / webpack 5 setup handles natively.
+`monaco-editor` is a **peer dependency** — your app owns the version. Node.js >= 24 for build / SSR hosts. Workers are bundled from dependency-relative `new Worker(new URL(...))` references; Vite and webpack 5 handle this form natively. Plain Rollup does not emit these workers by itself, so configure worker/asset handling that bundles the referenced modules or implement `getWorker` for every label your app can request.
 
 ## Quick start
 

package/dist/index.js

@@ -1,5 +1,40 @@
 //#region src/host.ts
-let hostPromise = null;
+const HOST_PROMISE_KEY = Symbol.for("coldsmirk.inkstone.monaco.hostPromise");
+const NLS_REGISTRY_KEY = Symbol.for("coldsmirk.inkstone.monaco.nlsRegistry");
+async function applyZhCnCatalog() {
+	const host = globalThis;
+	let registry = host[NLS_REGISTRY_KEY];
+	if (!registry) {
+		registry = { catalogs: /* @__PURE__ */ new WeakMap() };
+		host[NLS_REGISTRY_KEY] = registry;
+	}
+	const hadPreviousLanguage = Object.hasOwn(host, "_VSCODE_NLS_LANGUAGE");
+	const hadPreviousMessages = Object.hasOwn(host, "_VSCODE_NLS_MESSAGES");
+	const previousLanguage = host._VSCODE_NLS_LANGUAGE;
+	const previousMessages = host._VSCODE_NLS_MESSAGES;
+	const previousOwner = registry.owner;
+	const owner = {};
+	const catalogModule = await import("monaco-editor/esm/nls.messages.zh-cn.js");
+	let catalog = registry.catalogs.get(catalogModule);
+	if (!catalog) {
+		catalog = {
+			language: host._VSCODE_NLS_LANGUAGE,
+			messages: host._VSCODE_NLS_MESSAGES
+		};
+		registry.catalogs.set(catalogModule, catalog);
+	}
+	host._VSCODE_NLS_MESSAGES = catalog.messages;
+	host._VSCODE_NLS_LANGUAGE = catalog.language;
+	registry.owner = owner;
+	return () => {
+		if (host[NLS_REGISTRY_KEY] !== registry || registry.owner !== owner || host._VSCODE_NLS_MESSAGES !== catalog.messages || host._VSCODE_NLS_LANGUAGE !== catalog.language) return;
+		if (hadPreviousMessages) host._VSCODE_NLS_MESSAGES = previousMessages;
+		else Reflect.deleteProperty(host, "_VSCODE_NLS_MESSAGES");
+		if (hadPreviousLanguage) host._VSCODE_NLS_LANGUAGE = previousLanguage;
+		else Reflect.deleteProperty(host, "_VSCODE_NLS_LANGUAGE");
+		registry.owner = previousOwner;
+	};
+}
 function editorWorker() {
 	return new Worker(new URL("workers/editor.worker.js", import.meta.url), { type: "module" });
 }
@@ -28,19 +63,38 @@ function installHoverGeometryFix() {
 	style.textContent = ".context-view:has(> .workbench-hover-container) { width: max-content !important; }";
 	document.head.append(style);
 }
+const SUGGEST_GEOMETRY_STYLE_SELECTOR = "style[data-inkstone=\"monaco-suggest-geometry\"]";
+function installSuggestGeometryFix() {
+	if (document.querySelector(SUGGEST_GEOMETRY_STYLE_SELECTOR)) return;
+	const style = document.createElement("style");
+	style.dataset.inkstone = "monaco-suggest-geometry";
+	style.textContent = ".monaco-editor .suggest-widget .monaco-list .monaco-list-row > .contents > .main > .right > span.readMore.codicon.codicon-suggest-more-info::before { position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); }";
+	document.head.append(style);
+}
 function ensureMonacoHost(options = {}) {
-	hostPromise ??= (async () => {
+	const registry = globalThis;
+	const existing = registry[HOST_PROMISE_KEY];
+	if (existing) return existing;
+	const attempt = (async () => {
 		const { locale = "en", getWorker } = options;
-		if (locale === "zh-cn") await import("monaco-editor/esm/nls.messages.zh-cn.js");
-		const monaco = await import("monaco-editor");
-		globalThis.MonacoEnvironment = { getWorker: (workerId, label) => getWorker?.(workerId, label) ?? builtinGetWorker(label) };
-		installHoverGeometryFix();
-		return monaco;
-	})().catch((error) => {
-		hostPromise = null;
-		throw error;
+		let restoreNls;
+		try {
+			if (locale === "zh-cn") restoreNls = await applyZhCnCatalog();
+			installHoverGeometryFix();
+			installSuggestGeometryFix();
+			const monaco = await import("monaco-editor");
+			globalThis.MonacoEnvironment = { getWorker: (workerId, label) => getWorker?.(workerId, label) ?? builtinGetWorker(label) };
+			return monaco;
+		} catch (error) {
+			restoreNls?.();
+			throw error;
+		}
+	})();
+	registry[HOST_PROMISE_KEY] = attempt;
+	attempt.catch(() => {
+		if (registry[HOST_PROMISE_KEY] === attempt) registry[HOST_PROMISE_KEY] = void 0;
 	});
-	return hostPromise;
+	return attempt;
 }
 //#endregion
 //#region src/keybindings.ts
@@ -244,10 +298,11 @@ var StreamingEditorController = class {
 	append(text) {
 		if (!this.writing) return;
 		this.buffer += text;
-		const model = this.editor?.getModel();
-		if (!this.editor || !model) return;
+		const instance = this.editor;
+		const model = instance?.getModel();
+		if (!instance || !model) return;
 		if (model !== this.synced) {
-			this.replay(this.editor, model);
+			this.replay(instance, model);
 			return;
 		}
 		this.claim(model);
@@ -262,9 +317,10 @@ var StreamingEditorController = class {
 			},
 			text
 		}]);
-		if (!model.isDisposed()) this.editor.revealLine(model.getLineCount());
+		if (this.editor === instance && !model.isDisposed() && instance.getModel() === model) instance.revealLine(model.getLineCount());
 	}
 	end() {
+		if (!this.writing) return this.buffer;
 		try {
 			const instance = this.editor;
 			const current = instance?.getModel();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coldsmirk/inkstone-monaco",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "Framework-agnostic Monaco assembly: lazy offline host (all language workers bundled, no CDN), opt-in Simplified-Chinese UI via monaco's official NLS catalog, and a streaming editor controller for AI-typed content.",
   "keywords": [
     "monaco",