stream-monaco 0.0.8 → 0.0.10

package/dist/index.cjs

@@ -1998,6 +1998,12 @@ let languagesRegistered = false;
 let currentThemes = [];
 let currentLanguages = [];
 let themeRegisterPromise = null;
+let registrationQueue = Promise.resolve();
+function enqueueRegistration(task) {
+	const next = registrationQueue.then(task, task);
+	registrationQueue = next.then(() => void 0, () => void 0);
+	return next;
+}
 function setThemeRegisterPromise(p) {
 	return themeRegisterPromise = p;
 }
@@ -2074,27 +2080,29 @@ async function getOrCreateHighlighter(themes, languages$1) {
 * standalone renderer to use the new theme without recreating everything.
 */
 async function registerMonacoThemes(themes, languages$1) {
-	registerMonacoLanguages(languages$1);
-	if (themesRegistered && arraysEqual(themes, currentThemes) && arraysEqual(languages$1, currentLanguages)) {
-		const existing = highlighterCache.get(serializeThemes(themes));
-		return existing ? existing.promise : Promise.resolve(null);
-	}
-	const p = (async () => {
-		const highlighter = await getOrCreateHighlighter(themes, languages$1);
-		(0, __shikijs_monaco.shikiToMonaco)(highlighter, monaco_shim_exports);
-		themesRegistered = true;
-		currentThemes = themes;
-		currentLanguages = languages$1;
-		return highlighter;
-	})();
-	setThemeRegisterPromise(p);
-	try {
-		const res = await p;
-		return res;
-	} catch (e) {
-		setThemeRegisterPromise(null);
-		throw e;
-	}
+	return enqueueRegistration(async () => {
+		registerMonacoLanguages(languages$1);
+		if (themesRegistered && arraysEqual(themes, currentThemes) && arraysEqual(languages$1, currentLanguages)) {
+			const existing = highlighterCache.get(serializeThemes(themes));
+			return existing ? existing.promise : Promise.resolve(null);
+		}
+		const p = (async () => {
+			const highlighter = await getOrCreateHighlighter(themes, languages$1);
+			(0, __shikijs_monaco.shikiToMonaco)(highlighter, monaco_shim_exports);
+			themesRegistered = true;
+			currentThemes = themes.slice();
+			currentLanguages = languages$1.slice();
+			return highlighter;
+		})();
+		setThemeRegisterPromise(p);
+		try {
+			const res = await p;
+			return res;
+		} catch (e) {
+			setThemeRegisterPromise(null);
+			throw e;
+		}
+	});
 }
 function registerMonacoLanguages(languages$1) {
 	if (languagesRegistered && arraysEqual(languages$1, currentLanguages)) return;
@@ -2287,6 +2295,12 @@ function useMonaco(monacoOptions = {}) {
 			console.warn("onThemeChange callback threw an error:", err);
 		}
 	}
+	async function ensureThemeRegistered(themeName) {
+		const availableNames = themes.map((t) => typeof t === "string" ? t : t.name);
+		const list = availableNames.includes(themeName) ? themes : themes.concat(themeName);
+		const p = setThemeRegisterPromise(registerMonacoThemes(list, languages$1));
+		if (p) await p;
+	}
 	function hasVerticalScrollbar() {
 		if (!editorView) return false;
 		if (_hasScrollBar) return true;
@@ -2327,11 +2341,16 @@ function useMonaco(monacoOptions = {}) {
 			const ds = monacoOptions.onBeforeCreate(monaco_shim_exports);
 			if (ds) disposals.push(...ds);
 		}
-		await setThemeRegisterPromise(registerMonacoThemes(themes, languages$1));
 		const initialThemeName = monacoOptions.theme ?? currentTheme.value;
-		lastAppliedTheme = initialThemeName;
+		await ensureThemeRegistered(initialThemeName);
 		editorMgr = new EditorManager(monacoOptions, maxHeightValue, maxHeightCSS, autoScrollOnUpdate, autoScrollInitial, autoScrollThresholdPx, autoScrollThresholdLines, monacoOptions.revealDebounceMs);
 		editorView = await editorMgr.createEditor(container, code, language, initialThemeName);
+		lastAppliedTheme = initialThemeName;
+		if (pendingUpdate && editorMgr) {
+			const { code: queuedCode, lang: queuedLang } = pendingUpdate;
+			pendingUpdate = null;
+			editorMgr.updateCode(queuedCode, queuedLang);
+		}
 		if (typeof monacoOptions.onThemeChange === "function") monacoOptions.onThemeChange(initialThemeName);
 		if (editorView) lastKnownCode = editorView.getValue();
 		return editorView;
@@ -2354,8 +2373,8 @@ function useMonaco(monacoOptions = {}) {
 			const ds = monacoOptions.onBeforeCreate(monaco_shim_exports);
 			if (ds) disposals.push(...ds);
 		}
-		await setThemeRegisterPromise(registerMonacoThemes(themes, languages$1));
 		const initialThemeName = monacoOptions.theme ?? currentTheme.value;
+		await ensureThemeRegistered(initialThemeName);
 		try {
 			monaco_shim_exports.editor.setTheme(initialThemeName);
 			lastAppliedTheme = initialThemeName;

package/dist/index.js

@@ -1970,6 +1970,12 @@ let languagesRegistered = false;
 let currentThemes = [];
 let currentLanguages = [];
 let themeRegisterPromise = null;
+let registrationQueue = Promise.resolve();
+function enqueueRegistration(task) {
+	const next = registrationQueue.then(task, task);
+	registrationQueue = next.then(() => void 0, () => void 0);
+	return next;
+}
 function setThemeRegisterPromise(p) {
 	return themeRegisterPromise = p;
 }
@@ -2046,27 +2052,29 @@ async function getOrCreateHighlighter(themes, languages$1) {
 * standalone renderer to use the new theme without recreating everything.
 */
 async function registerMonacoThemes(themes, languages$1) {
-	registerMonacoLanguages(languages$1);
-	if (themesRegistered && arraysEqual(themes, currentThemes) && arraysEqual(languages$1, currentLanguages)) {
-		const existing = highlighterCache.get(serializeThemes(themes));
-		return existing ? existing.promise : Promise.resolve(null);
-	}
-	const p = (async () => {
-		const highlighter = await getOrCreateHighlighter(themes, languages$1);
-		shikiToMonaco(highlighter, monaco_shim_exports);
-		themesRegistered = true;
-		currentThemes = themes;
-		currentLanguages = languages$1;
-		return highlighter;
-	})();
-	setThemeRegisterPromise(p);
-	try {
-		const res = await p;
-		return res;
-	} catch (e) {
-		setThemeRegisterPromise(null);
-		throw e;
-	}
+	return enqueueRegistration(async () => {
+		registerMonacoLanguages(languages$1);
+		if (themesRegistered && arraysEqual(themes, currentThemes) && arraysEqual(languages$1, currentLanguages)) {
+			const existing = highlighterCache.get(serializeThemes(themes));
+			return existing ? existing.promise : Promise.resolve(null);
+		}
+		const p = (async () => {
+			const highlighter = await getOrCreateHighlighter(themes, languages$1);
+			shikiToMonaco(highlighter, monaco_shim_exports);
+			themesRegistered = true;
+			currentThemes = themes.slice();
+			currentLanguages = languages$1.slice();
+			return highlighter;
+		})();
+		setThemeRegisterPromise(p);
+		try {
+			const res = await p;
+			return res;
+		} catch (e) {
+			setThemeRegisterPromise(null);
+			throw e;
+		}
+	});
 }
 function registerMonacoLanguages(languages$1) {
 	if (languagesRegistered && arraysEqual(languages$1, currentLanguages)) return;
@@ -2259,6 +2267,12 @@ function useMonaco(monacoOptions = {}) {
 			console.warn("onThemeChange callback threw an error:", err);
 		}
 	}
+	async function ensureThemeRegistered(themeName) {
+		const availableNames = themes.map((t) => typeof t === "string" ? t : t.name);
+		const list = availableNames.includes(themeName) ? themes : themes.concat(themeName);
+		const p = setThemeRegisterPromise(registerMonacoThemes(list, languages$1));
+		if (p) await p;
+	}
 	function hasVerticalScrollbar() {
 		if (!editorView) return false;
 		if (_hasScrollBar) return true;
@@ -2299,11 +2313,16 @@ function useMonaco(monacoOptions = {}) {
 			const ds = monacoOptions.onBeforeCreate(monaco_shim_exports);
 			if (ds) disposals.push(...ds);
 		}
-		await setThemeRegisterPromise(registerMonacoThemes(themes, languages$1));
 		const initialThemeName = monacoOptions.theme ?? currentTheme.value;
-		lastAppliedTheme = initialThemeName;
+		await ensureThemeRegistered(initialThemeName);
 		editorMgr = new EditorManager(monacoOptions, maxHeightValue, maxHeightCSS, autoScrollOnUpdate, autoScrollInitial, autoScrollThresholdPx, autoScrollThresholdLines, monacoOptions.revealDebounceMs);
 		editorView = await editorMgr.createEditor(container, code, language, initialThemeName);
+		lastAppliedTheme = initialThemeName;
+		if (pendingUpdate && editorMgr) {
+			const { code: queuedCode, lang: queuedLang } = pendingUpdate;
+			pendingUpdate = null;
+			editorMgr.updateCode(queuedCode, queuedLang);
+		}
 		if (typeof monacoOptions.onThemeChange === "function") monacoOptions.onThemeChange(initialThemeName);
 		if (editorView) lastKnownCode = editorView.getValue();
 		return editorView;
@@ -2326,8 +2345,8 @@ function useMonaco(monacoOptions = {}) {
 			const ds = monacoOptions.onBeforeCreate(monaco_shim_exports);
 			if (ds) disposals.push(...ds);
 		}
-		await setThemeRegisterPromise(registerMonacoThemes(themes, languages$1));
 		const initialThemeName = monacoOptions.theme ?? currentTheme.value;
+		await ensureThemeRegistered(initialThemeName);
 		try {
 			monaco_shim_exports.editor.setTheme(initialThemeName);
 			lastAppliedTheme = initialThemeName;

package/package.json

@@ -1,8 +1,7 @@
 {
   "name": "stream-monaco",
   "type": "module",
-  "version": "0.0.8",
-  "packageManager": "pnpm@10.24.0",
+  "version": "0.0.10",
   "description": "A framework-agnostic library for integrating Monaco Editor with Shiki highlighting, optimized for streaming updates.",
   "author": "Simon He",
   "license": "MIT",
@@ -54,20 +53,6 @@
   "files": [
     "dist"
   ],
-  "scripts": {
-    "build": "tsdown",
-    "dev": "npm run build -- --watch src",
-    "format": "prettier --write --cache .",
-    "lint": "eslint . --cache",
-    "lint:fix": "pnpm run lint --fix",
-    "prepublishOnly": "nr build",
-    "release": "bumpp && npm publish",
-    "start": "esno src/index.ts",
-    "bench": "node scripts/stream-benchmark.mjs",
-    "bench:playwright": "node scripts/playwright-bench.mjs",
-    "test": "vitest",
-    "typecheck": "tsc --noEmit"
-  },
   "peerDependencies": {
     "monaco-editor": "^0.52.2"
   },
@@ -96,5 +81,18 @@
       "prettier --write --cache --ignore-unknown"
     ],
     "*.{vue,js,ts,jsx,tsx,md,json}": "eslint --fix"
+  },
+  "scripts": {
+    "build": "tsdown",
+    "dev": "npm run build -- --watch src",
+    "format": "prettier --write --cache .",
+    "lint": "eslint . --cache",
+    "lint:fix": "pnpm run lint --fix",
+    "release": "bumpp && npm publish",
+    "start": "esno src/index.ts",
+    "bench": "node scripts/stream-benchmark.mjs",
+    "bench:playwright": "node scripts/playwright-bench.mjs",
+    "test": "vitest",
+    "typecheck": "tsc --noEmit"
   }
-}
+}