stream-monaco 0.0.2 → 0.0.3

package/dist/index.d.ts

@@ -209,6 +209,7 @@ declare function registerMonacoThemes(themes: (ThemeInput | string | SpecialThem
  *   getEditorView: () => monaco.editor.IStandaloneCodeEditor | null,
  *   getDiffEditorView: () => monaco.editor.IStandaloneDiffEditor | null,
  *   getDiffModels: () => { original: monaco.editor.ITextModel | null, modified: monaco.editor.ITextModel | null },
+ *   getCode: () => string | { original: string, modified: string } | null,
  * }} 返回对象包含以下方法和属性：
  *
  * @property {Function} createEditor - 创建并挂载 Monaco 编辑器到指定容器
@@ -228,6 +229,7 @@ declare function registerMonacoThemes(themes: (ThemeInput | string | SpecialThem
  * @property {Function} getEditorView - 获取当前编辑器实例
  * @property {Function} getDiffEditorView - 获取当前 Diff 编辑器实例
  * @property {Function} getDiffModels - 获取 Diff 的 original/modified 两个模型
+ * @property {Function} getCode - 获取当前编辑器或 Diff 编辑器中的代码内容
  *
  * @throws {Error} 当主题数组不是数组或长度小于2时抛出错误
  *
@@ -276,6 +278,10 @@ declare function useMonaco(monacoOptions?: MonacoOptions): {
   getMonacoInstance(): typeof monaco_shim_d_exports;
   setUpdateThrottleMs: (ms: number) => void;
   getUpdateThrottleMs: () => number;
+  getCode(): string | {
+    original: string;
+    modified: string;
+  } | null;
 };
 //#endregion
 export { MonacoDiffEditorInstance, MonacoEditorInstance, MonacoLanguage, MonacoOptions, MonacoTheme, RevealStrategy, ShikiHighlighter, clearHighlighterCache, defaultRevealDebounceMs, detectLanguage, getOrCreateHighlighter, isDark, preloadMonacoWorkers, registerMonacoThemes, useMonaco };

package/dist/index.js

@@ -1,5 +1,6 @@
 import { __export, __reExport } from "./chunk-CHLpw0oG.js";
 import * as _monaco from "monaco-editor";
+import nodeProcess from "node:process";
 import { computed, effect, signal } from "alien-signals";
 import { shikiToMonaco } from "@shikijs/monaco";
 import { createHighlighter } from "shiki";
@@ -199,34 +200,107 @@ import * as import_monaco_editor from "monaco-editor";
 __reExport(monaco_shim_exports, import_monaco_editor);
 const monaco = _monaco;
 
+//#endregion
+//#region src/utils/logger.ts
+let seq = 0;
+const ENABLED = (() => {
+	try {
+		if (typeof window !== "undefined" && window.__STREAM_MONACO_DEBUG__ !== void 0) return Boolean(window.__STREAM_MONACO_DEBUG__);
+		try {
+			const proc = nodeProcess;
+			if (proc && proc.env && proc.env.NODE_ENV !== "production") return true;
+		} catch {}
+	} catch {}
+	return false;
+})();
+function log(tag, ...args) {
+	if (!ENABLED) return;
+	try {
+		seq += 1;
+		const id = `#${seq}`;
+		const ts = typeof performance !== "undefined" && performance.now ? performance.now().toFixed(1) : Date.now();
+		console.warn(`${id} [${tag}] @${ts}ms`, ...args);
+	} catch (err) {
+		try {
+			console.warn("[logger] fallback", tag, ...args, err);
+		} catch {}
+	}
+}
+function error(tag, ...args) {
+	if (!ENABLED) return;
+	try {
+		console.error(`[${tag}]`, ...args);
+	} catch (err) {
+		try {
+			console.error("[logger] fallback error", tag, ...args, err);
+		} catch {}
+	}
+}
+
 //#endregion
 //#region src/utils/height.ts
 function createHeightManager(container, computeNext) {
 	let raf = null;
+	let debounceTimer = null;
 	let lastApplied = -1;
 	let suppressed = false;
+	const HYSTERESIS_PX = 12;
+	const DEBOUNCE_MS = 0;
 	function apply() {
 		const next = computeNext();
+		if (next == null) return;
+		log("heightManager", "computeNext ->", {
+			next,
+			lastApplied
+		});
+		if (!Number.isFinite(next) || next <= 0) {
+			log("heightManager", "invalid next height, ignoring", next);
+			return;
+		}
+		if (lastApplied !== -1 && Math.abs(next - lastApplied) <= HYSTERESIS_PX) return;
 		if (next === lastApplied) return;
 		suppressed = true;
 		container.style.height = `${next}px`;
 		lastApplied = next;
+		log("heightManager", "applied height ->", next);
 		queueMicrotask(() => {
 			suppressed = false;
 		});
 	}
+	function scheduleApply() {
+		if (debounceTimer != null) {
+			clearTimeout(debounceTimer);
+			debounceTimer = null;
+		}
+		if (DEBOUNCE_MS === 0) {
+			if (raf != null) return;
+			raf = requestAnimationFrame(() => {
+				raf = null;
+				apply();
+			});
+			return;
+		}
+		debounceTimer = setTimeout(() => {
+			debounceTimer = null;
+			if (raf != null) return;
+			raf = requestAnimationFrame(() => {
+				raf = null;
+				apply();
+			});
+		}, DEBOUNCE_MS);
+	}
 	function update() {
-		if (raf != null) return;
-		raf = requestAnimationFrame(() => {
-			raf = null;
-			apply();
-		});
+		scheduleApply();
 	}
 	function dispose() {
 		if (raf != null) {
 			cancelAnimationFrame(raf);
 			raf = null;
 		}
+		if (debounceTimer != null) {
+			clearTimeout(debounceTimer);
+			debounceTimer = null;
+		}
 	}
 	function isSuppressed() {
 		return suppressed;
@@ -280,20 +354,58 @@ function createRafScheduler(timeSource) {
 //#region src/utils/scroll.ts
 function createScrollWatcherForEditor(ed, opts) {
 	var _ed$getScrollTop, _ed$onDidScrollChange;
+	const DEBUG = (() => {
+		try {
+			if (typeof window !== "undefined" && window.__STREAM_MONACO_DEBUG__ !== void 0) return Boolean(window.__STREAM_MONACO_DEBUG__);
+			try {
+				const proc = nodeProcess;
+				if (proc && proc.env && proc.env.NODE_ENV === "production") return false;
+			} catch {}
+		} catch {}
+		return true;
+	})();
 	const initial = ((_ed$getScrollTop = ed.getScrollTop) === null || _ed$getScrollTop === void 0 ? void 0 : _ed$getScrollTop.call(ed)) ?? 0;
 	opts.setLast(initial);
-	const disp = ((_ed$onDidScrollChange = ed.onDidScrollChange) === null || _ed$onDidScrollChange === void 0 ? void 0 : _ed$onDidScrollChange.call(ed, (e) => {
+	if (DEBUG) log("scrollWatcher", "initial scrollTop=", initial);
+	let suppressedExternally = false;
+	const THRESHOLD_PX = 6;
+	const listener = (e) => {
 		var _ed$getScrollTop2;
+		if (suppressedExternally) {
+			if (DEBUG) log("scrollWatcher", "suppressedExternally, ignoring event");
+			return;
+		}
 		const currentTop = e && typeof e.scrollTop === "number" ? e.scrollTop : ((_ed$getScrollTop2 = ed.getScrollTop) === null || _ed$getScrollTop2 === void 0 ? void 0 : _ed$getScrollTop2.call(ed)) ?? 0;
 		const delta = currentTop - opts.getLast();
 		opts.setLast(currentTop);
+		if (Math.abs(delta) < THRESHOLD_PX) {
+			if (DEBUG) log("scrollWatcher", "small delta ignored", delta);
+			return;
+		}
+		if (DEBUG) log("scrollWatcher", "delta=", delta, "currentTop=", currentTop);
 		if (delta < 0) {
+			if (DEBUG) log("scrollWatcher", "pause detected delta=", delta);
 			opts.onPause();
 			return;
 		}
+		if (DEBUG) log("scrollWatcher", "maybe resume delta=", delta);
 		opts.onMaybeResume();
-	})) ?? null;
-	return disp;
+	};
+	const disp = ((_ed$onDidScrollChange = ed.onDidScrollChange) === null || _ed$onDidScrollChange === void 0 ? void 0 : _ed$onDidScrollChange.call(ed, listener)) ?? null;
+	const api = {
+		dispose() {
+			try {
+				if (disp && typeof disp.dispose === "function") disp.dispose();
+				else if (typeof disp === "function") disp();
+			} catch {}
+			if (DEBUG) log("scrollWatcher", "dispose");
+		},
+		setSuppressed(v) {
+			suppressedExternally = !!v;
+			if (DEBUG) log("scrollWatcher", "setSuppressed =>", suppressedExternally);
+		}
+	};
+	return api;
 }
 
 //#endregion
@@ -847,12 +959,14 @@ var EditorManager = class {
 	_hasScrollBar = false;
 	shouldAutoScroll = true;
 	scrollWatcher = null;
+	scrollWatcherSuppressionTimer = null;
 	lastScrollTop = 0;
 	cachedScrollHeight = null;
 	cachedLineHeight = null;
 	cachedComputedHeight = null;
 	cachedLineCount = null;
 	lastKnownCodeDirty = false;
+	debug = false;
 	measureViewport() {
 		var _this$editorView$getL, _this$editorView, _this$editorView$getS, _this$editorView2, _this$editorView$getS2, _this$editorView3;
 		if (!this.editorView) return null;
@@ -880,8 +994,10 @@ var EditorManager = class {
 	revealDebounceId = null;
 	revealDebounceMs = defaultRevealDebounceMs;
 	revealIdleTimerId = null;
+	revealTicket = 0;
 	revealStrategyOption;
 	revealBatchOnIdleMsOption;
+	scrollWatcherSuppressionMs = 500;
 	constructor(options, maxHeightValue, maxHeightCSS, autoScrollOnUpdate, autoScrollInitial, autoScrollThresholdPx, autoScrollThresholdLines, revealDebounceMsOption) {
 		this.options = options;
 		this.maxHeightValue = maxHeightValue;
@@ -892,6 +1008,21 @@ var EditorManager = class {
 		this.autoScrollThresholdLines = autoScrollThresholdLines;
 		this.revealDebounceMsOption = revealDebounceMsOption;
 	}
+	initDebugFlag() {
+		if (typeof window !== "undefined" && window.__STREAM_MONACO_DEBUG__ !== void 0) {
+			this.debug = Boolean(window.__STREAM_MONACO_DEBUG__);
+			return;
+		}
+		if (this.options && this.options.debug !== void 0) {
+			this.debug = Boolean(this.options.debug);
+			return;
+		}
+		this.debug = false;
+	}
+	dlog(...args) {
+		if (!this.debug) return;
+		log("EditorManager", ...args);
+	}
 	hasVerticalScrollbar() {
 		if (!this.editorView) return false;
 		if (this._hasScrollBar) return true;
@@ -913,19 +1044,40 @@ var EditorManager = class {
 		const lineCount = this.cachedLineCount ?? ((_editorView$getModel = editorView.getModel()) === null || _editorView$getModel === void 0 ? void 0 : _editorView$getModel.getLineCount()) ?? 1;
 		const lineHeight = editorView.getOption(monaco_shim_exports.editor.EditorOption.lineHeight);
 		const height = Math.min(lineCount * lineHeight + padding, this.maxHeightValue);
+		try {
+			log("EditorManager.computedHeight", {
+				lineCount,
+				lineHeight,
+				computed: height,
+				maxHeightValue: this.maxHeightValue
+			});
+		} catch {}
 		return height;
 	}
 	maybeScrollToBottom(targetLine) {
 		this.rafScheduler.schedule("maybe-scroll", () => {
-			if (!(this.autoScrollOnUpdate && this.shouldAutoScroll && this.hasVerticalScrollbar())) return;
+			const hasVS = this.hasVerticalScrollbar();
+			this.dlog("maybeScrollToBottom called", {
+				autoScrollOnUpdate: this.autoScrollOnUpdate,
+				shouldAutoScroll: this.shouldAutoScroll,
+				hasVerticalScrollbar: hasVS,
+				targetLine
+			});
+			if (!(this.autoScrollOnUpdate && this.shouldAutoScroll && this.hasVerticalScrollbar())) {
+				this.dlog("maybeScrollToBottom skipped (auto-scroll conditions not met)");
+				return;
+			}
 			const model = this.editorView.getModel();
 			const line = targetLine ?? (model === null || model === void 0 ? void 0 : model.getLineCount()) ?? 1;
 			const batchMs = this.revealBatchOnIdleMsOption ?? this.options.revealBatchOnIdleMs ?? defaultRevealBatchOnIdleMs;
 			if (typeof batchMs === "number" && batchMs > 0) {
 				if (this.revealIdleTimerId != null) clearTimeout(this.revealIdleTimerId);
+				const ticket = ++this.revealTicket;
+				this.dlog("scheduled idle reveal ticket=", ticket, "line=", line, "batchMs=", batchMs);
 				this.revealIdleTimerId = setTimeout(() => {
 					this.revealIdleTimerId = null;
-					this.performReveal(line);
+					this.dlog("idle reveal timer firing, ticket=", ticket, "line=", line);
+					this.performReveal(line, ticket);
 				}, batchMs);
 				return;
 			}
@@ -936,14 +1088,23 @@ var EditorManager = class {
 			const ms = typeof this.revealDebounceMs === "number" && this.revealDebounceMs > 0 ? this.revealDebounceMs : typeof this.revealDebounceMsOption === "number" && this.revealDebounceMsOption > 0 ? this.revealDebounceMsOption : this.revealDebounceMs;
 			this.revealDebounceId = setTimeout(() => {
 				this.revealDebounceId = null;
-				this.performReveal(line);
+				const ticket = ++this.revealTicket;
+				this.dlog("scheduled debounce reveal ticket=", ticket, "line=", line, "ms=", ms);
+				this.performReveal(line, ticket);
 			}, ms);
 		});
 	}
-	performReveal(line) {
+	performReveal(line, ticket) {
 		this.rafScheduler.schedule("reveal", () => {
 			var _editor;
+			if (ticket !== this.revealTicket) {
+				this.dlog("performReveal skipped, stale ticket", ticket, "current", this.revealTicket);
+				return;
+			}
+			this.dlog("performReveal executing, ticket=", ticket, "line=", line);
+			this.lastPerformedRevealTicket = ticket;
 			const strategy = this.revealStrategyOption ?? this.options.revealStrategy ?? "centerIfOutside";
+			this.dlog("performReveal strategy=", strategy);
 			const ScrollType = monaco_shim_exports.ScrollType || ((_editor = monaco_shim_exports.editor) === null || _editor === void 0 ? void 0 : _editor.ScrollType);
 			const smooth = ScrollType && typeof ScrollType.Smooth !== "undefined" ? ScrollType.Smooth : void 0;
 			try {
@@ -960,11 +1121,60 @@ var EditorManager = class {
 			}
 		});
 	}
+	performImmediateReveal(line, ticket) {
+		this.dlog("performImmediateReveal line=", line, "ticket=", ticket);
+		try {
+			var _editor2;
+			if (!this.editorView) return;
+			if (ticket !== this.revealTicket) {
+				this.dlog("performImmediateReveal skipped, stale ticket", ticket, "current", this.revealTicket);
+				return;
+			}
+			this.lastPerformedRevealTicket = ticket;
+			const ScrollType = monaco_shim_exports.ScrollType || ((_editor2 = monaco_shim_exports.editor) === null || _editor2 === void 0 ? void 0 : _editor2.ScrollType);
+			const immediate = ScrollType && typeof ScrollType.Immediate !== "undefined" ? ScrollType.Immediate : void 0;
+			if (typeof immediate !== "undefined") this.editorView.revealLine(line, immediate);
+			else this.editorView.revealLine(line);
+		} catch {}
+		try {
+			this.measureViewport();
+		} catch {}
+	}
+	forceReveal(line) {
+		try {
+			var _editor3;
+			if (!this.editorView) return;
+			const ScrollType = monaco_shim_exports.ScrollType || ((_editor3 = monaco_shim_exports.editor) === null || _editor3 === void 0 ? void 0 : _editor3.ScrollType);
+			const immediate = ScrollType && typeof ScrollType.Immediate !== "undefined" ? ScrollType.Immediate : void 0;
+			if (typeof immediate !== "undefined") this.editorView.revealLine(line, immediate);
+			else this.editorView.revealLine(line);
+		} catch {}
+		try {
+			this.measureViewport();
+		} catch {}
+		try {
+			var _this$editorView4, _this$editorView4$get;
+			this.shouldAutoScroll = true;
+			this.lastScrollTop = ((_this$editorView4 = this.editorView) === null || _this$editorView4 === void 0 || (_this$editorView4$get = _this$editorView4.getScrollTop) === null || _this$editorView4$get === void 0 ? void 0 : _this$editorView4$get.call(_this$editorView4)) ?? this.lastScrollTop;
+		} catch {}
+	}
+	isOverflowAuto() {
+		try {
+			return !!this.lastContainer && this.lastContainer.style.overflow === "auto";
+		} catch {
+			return false;
+		}
+	}
+	shouldPerformImmediateReveal() {
+		return this.autoScrollOnUpdate && this.shouldAutoScroll && this.hasVerticalScrollbar() && this.isOverflowAuto();
+	}
 	async createEditor(container, code, language, currentTheme) {
-		var _this$editorView$getS3, _this$editorView4, _this$editorView$getO, _this$editorView5, _this$editorView$getM, _this$editorView$onDi, _this$editorView6;
+		var _this$editorView$getS3, _this$editorView5, _this$editorView$getO, _this$editorView6, _this$editorView$getM, _this$editorView$onDi, _this$editorView7;
 		this.cleanup();
 		this.lastContainer = container;
-		container.style.overflow = "auto";
+		this.initDebugFlag();
+		this.dlog("createEditor container, maxHeight", this.maxHeightValue);
+		container.style.overflow = "hidden";
 		container.style.maxHeight = this.maxHeightCSS;
 		this.editorView = monaco_shim_exports.editor.create(container, {
 			value: code,
@@ -995,22 +1205,51 @@ var EditorManager = class {
 		}
 		if (this.revealIdleTimerId != null) clearTimeout(this.revealIdleTimerId);
 		this.revealIdleTimerId = null;
-		this.editorHeightManager = createHeightManager(container, () => this.computedHeight(this.editorView));
+		const MIN_VISIBLE_HEIGHT = Math.min(120, this.maxHeightValue);
+		container.style.minHeight = `${MIN_VISIBLE_HEIGHT}px`;
+		this.editorHeightManager = createHeightManager(container, () => {
+			const computed$2 = this.computedHeight(this.editorView);
+			const clamped = Math.min(computed$2, this.maxHeightValue);
+			return Math.max(clamped, MIN_VISIBLE_HEIGHT);
+		});
 		this.editorHeightManager.update();
-		this.cachedScrollHeight = ((_this$editorView$getS3 = (_this$editorView4 = this.editorView).getScrollHeight) === null || _this$editorView$getS3 === void 0 ? void 0 : _this$editorView$getS3.call(_this$editorView4)) ?? null;
-		this.cachedLineHeight = ((_this$editorView$getO = (_this$editorView5 = this.editorView).getOption) === null || _this$editorView$getO === void 0 ? void 0 : _this$editorView$getO.call(_this$editorView5, monaco_shim_exports.editor.EditorOption.lineHeight)) ?? null;
+		const initialComputed = this.computedHeight(this.editorView);
+		if (initialComputed >= this.maxHeightValue - 1) {
+			container.style.height = `${this.maxHeightValue}px`;
+			container.style.overflow = "auto";
+			this.dlog("applied immediate maxHeight on createEditor", this.maxHeightValue);
+		}
+		this.cachedScrollHeight = ((_this$editorView$getS3 = (_this$editorView5 = this.editorView).getScrollHeight) === null || _this$editorView$getS3 === void 0 ? void 0 : _this$editorView$getS3.call(_this$editorView5)) ?? null;
+		this.cachedLineHeight = ((_this$editorView$getO = (_this$editorView6 = this.editorView).getOption) === null || _this$editorView$getO === void 0 ? void 0 : _this$editorView$getO.call(_this$editorView6, monaco_shim_exports.editor.EditorOption.lineHeight)) ?? null;
 		this.cachedComputedHeight = this.computedHeight(this.editorView);
 		this.cachedLineCount = ((_this$editorView$getM = this.editorView.getModel()) === null || _this$editorView$getM === void 0 ? void 0 : _this$editorView$getM.getLineCount()) ?? null;
-		(_this$editorView$onDi = (_this$editorView6 = this.editorView).onDidContentSizeChange) === null || _this$editorView$onDi === void 0 || _this$editorView$onDi.call(_this$editorView6, () => {
+		(_this$editorView$onDi = (_this$editorView7 = this.editorView).onDidContentSizeChange) === null || _this$editorView$onDi === void 0 || _this$editorView$onDi.call(_this$editorView7, () => {
 			this._hasScrollBar = false;
 			this.rafScheduler.schedule("content-size-change", () => {
 				try {
-					var _this$editorView7, _this$editorHeightMan, _this$editorHeightMan2;
-					this.measureViewport();
-					this.cachedLineCount = ((_this$editorView7 = this.editorView) === null || _this$editorView7 === void 0 || (_this$editorView7 = _this$editorView7.getModel()) === null || _this$editorView7 === void 0 ? void 0 : _this$editorView7.getLineCount()) ?? this.cachedLineCount;
-					if ((_this$editorHeightMan = this.editorHeightManager) === null || _this$editorHeightMan === void 0 ? void 0 : _this$editorHeightMan.isSuppressed()) return;
+					var _this$editorView8, _this$editorHeightMan, _this$editorHeightMan2;
+					this.dlog("content-size-change frame");
+					const m = this.measureViewport();
+					this.dlog("content-size-change measure", m);
+					this.cachedLineCount = ((_this$editorView8 = this.editorView) === null || _this$editorView8 === void 0 || (_this$editorView8 = _this$editorView8.getModel()) === null || _this$editorView8 === void 0 ? void 0 : _this$editorView8.getLineCount()) ?? this.cachedLineCount;
+					if ((_this$editorHeightMan = this.editorHeightManager) === null || _this$editorHeightMan === void 0 ? void 0 : _this$editorHeightMan.isSuppressed()) {
+						this.dlog("content-size-change skipped height update (suppressed)");
+						return;
+					}
+					this.dlog("content-size-change calling heightManager.update");
 					(_this$editorHeightMan2 = this.editorHeightManager) === null || _this$editorHeightMan2 === void 0 || _this$editorHeightMan2.update();
-				} catch {}
+					const computed$2 = this.computedHeight(this.editorView);
+					if (this.lastContainer) {
+						const prevOverflow = this.lastContainer.style.overflow;
+						const newOverflow = computed$2 >= this.maxHeightValue - 1 ? "auto" : "hidden";
+						if (prevOverflow !== newOverflow) {
+							this.lastContainer.style.overflow = newOverflow;
+							if (newOverflow === "auto" && this.shouldAutoScroll) this.maybeScrollToBottom();
+						}
+					}
+				} catch (err) {
+					error("EditorManager", "content-size-change error", err);
+				}
 			});
 		});
 		this.editorView.onDidChangeModelContent(() => {
@@ -1051,6 +1290,65 @@ var EditorManager = class {
 			this.lastKnownCodeDirty = false;
 		}
 	}
+	suppressScrollWatcher(ms) {
+		try {
+			if (!this.scrollWatcher || typeof this.scrollWatcher.setSuppressed !== "function") return;
+			this.dlog("suppressScrollWatcher", ms);
+			if (this.scrollWatcherSuppressionTimer != null) {
+				clearTimeout(this.scrollWatcherSuppressionTimer);
+				this.scrollWatcherSuppressionTimer = null;
+			}
+			this.scrollWatcher.setSuppressed(true);
+			this.scrollWatcherSuppressionTimer = setTimeout(() => {
+				try {
+					if (this.scrollWatcher && typeof this.scrollWatcher.setSuppressed === "function") {
+						this.scrollWatcher.setSuppressed(false);
+						this.dlog("suppressScrollWatcher cleared");
+					}
+				} catch {}
+				this.scrollWatcherSuppressionTimer = null;
+			}, ms);
+		} catch {}
+	}
+	scheduleImmediateRevealAfterLayout(line) {
+		const ticket = ++this.revealTicket;
+		this.dlog("scheduleImmediateRevealAfterLayout ticket=", ticket, "line=", line);
+		this.rafScheduler.schedule("immediate-reveal", async () => {
+			try {
+				const target = this.editorView && this.editorHeightManager ? Math.min(this.computedHeight(this.editorView), this.maxHeightValue) : -1;
+				if (target !== -1 && this.editorHeightManager) await this.waitForHeightApplied(target, 500);
+				else await new Promise((r) => requestAnimationFrame(() => requestAnimationFrame(() => r())));
+				this.dlog("running delayed immediate reveal", "ticket=", ticket, "line=", line);
+				this.performImmediateReveal(line, ticket);
+			} catch (err) {
+				error("EditorManager", "scheduleImmediateRevealAfterLayout error", err);
+			}
+		});
+	}
+	waitForHeightApplied(target, timeoutMs = 500) {
+		return new Promise((resolve) => {
+			const start = typeof performance !== "undefined" && performance.now ? performance.now() : Date.now();
+			const check = () => {
+				try {
+					var _this$editorHeightMan3, _this$editorHeightMan4;
+					const last = ((_this$editorHeightMan3 = this.editorHeightManager) === null || _this$editorHeightMan3 === void 0 || (_this$editorHeightMan4 = _this$editorHeightMan3.getLastApplied) === null || _this$editorHeightMan4 === void 0 ? void 0 : _this$editorHeightMan4.call(_this$editorHeightMan3)) ?? -1;
+					if (last !== -1 && Math.abs(last - target) <= 12) {
+						this.dlog("waitForHeightApplied satisfied", last, "target=", target);
+						resolve();
+						return;
+					}
+					const now = typeof performance !== "undefined" && performance.now ? performance.now() : Date.now();
+					if (now - start > timeoutMs) {
+						log("EditorManager", "waitForHeightApplied timeout", last, "target=", target);
+						resolve();
+						return;
+					}
+				} catch {}
+				requestAnimationFrame(check);
+			};
+			check();
+		});
+	}
 	updateCode(newCode, codeLanguage) {
 		this.pendingUpdate = {
 			code: newCode,
@@ -1073,7 +1371,18 @@ var EditorManager = class {
 			this.lastKnownCode = newCode;
 			const newLineCount$1 = model.getLineCount();
 			this.cachedLineCount = newLineCount$1;
-			if (newLineCount$1 !== prevLineCount$1) this.maybeScrollToBottom(newLineCount$1);
+			if (newLineCount$1 !== prevLineCount$1) {
+				const shouldImmediate = this.shouldPerformImmediateReveal();
+				if (shouldImmediate) this.suppressScrollWatcher(this.scrollWatcherSuppressionMs);
+				try {
+					const computed$2 = this.computedHeight(this.editorView);
+					if (computed$2 >= this.maxHeightValue - 1 && this.lastContainer) this.lastContainer.style.height = `${this.maxHeightValue}px`;
+				} catch {}
+				if (shouldImmediate) try {
+					this.forceReveal(newLineCount$1);
+				} catch {}
+				else this.maybeScrollToBottom(newLineCount$1);
+			}
 			return;
 		}
 		const prevCode = this.appendBuffer.length > 0 ? this.editorView.getValue() : this.lastKnownCode ?? this.editorView.getValue();
@@ -1089,7 +1398,12 @@ var EditorManager = class {
 		this.lastKnownCode = newCode;
 		const newLineCount = model.getLineCount();
 		this.cachedLineCount = newLineCount;
-		if (newLineCount !== prevLineCount) this.maybeScrollToBottom(newLineCount);
+		if (newLineCount !== prevLineCount) {
+			const shouldImmediate = this.shouldPerformImmediateReveal();
+			if (shouldImmediate) this.suppressScrollWatcher(this.scrollWatcherSuppressionMs);
+			if (shouldImmediate) this.scheduleImmediateRevealAfterLayout(newLineCount);
+			else this.maybeScrollToBottom(newLineCount);
+		}
 	}
 	appendCode(appendText, codeLanguage) {
 		if (!this.editorView) return;
@@ -1167,7 +1481,16 @@ var EditorManager = class {
 		const newLineCount = model.getLineCount();
 		if (lastLine !== newLineCount) {
 			this.cachedLineCount = newLineCount;
-			this.maybeScrollToBottom(newLineCount);
+			const shouldImmediate = this.shouldPerformImmediateReveal();
+			if (shouldImmediate) this.suppressScrollWatcher(this.scrollWatcherSuppressionMs);
+			try {
+				const computed$2 = this.computedHeight(this.editorView);
+				if (computed$2 >= this.maxHeightValue - 1 && this.lastContainer) this.lastContainer.style.height = `${this.maxHeightValue}px`;
+			} catch {}
+			if (shouldImmediate) try {
+				this.forceReveal(newLineCount);
+			} catch {}
+			else this.maybeScrollToBottom(newLineCount);
 		}
 	}
 	setLanguage(language, languages$1) {
@@ -1185,16 +1508,33 @@ var EditorManager = class {
 		this.rafScheduler.cancel("update");
 		this.rafScheduler.cancel("sync-last-known");
 		this.rafScheduler.cancel("content-size-change");
+		this.rafScheduler.cancel("maybe-scroll");
+		this.rafScheduler.cancel("reveal");
+		this.rafScheduler.cancel("immediate-reveal");
+		this.rafScheduler.cancel("maybe-resume");
 		this.pendingUpdate = null;
 		this.rafScheduler.cancel("append");
 		this.appendBufferScheduled = false;
 		this.appendBuffer.length = 0;
+		if (this.revealDebounceId != null) {
+			clearTimeout(this.revealDebounceId);
+			this.revealDebounceId = null;
+		}
+		if (this.revealIdleTimerId != null) {
+			clearTimeout(this.revealIdleTimerId);
+			this.revealIdleTimerId = null;
+		}
+		if (this.scrollWatcherSuppressionTimer != null) {
+			clearTimeout(this.scrollWatcherSuppressionTimer);
+			this.scrollWatcherSuppressionTimer = null;
+		}
 		if (this.editorView) {
 			this.editorView.dispose();
 			this.editorView = null;
 		}
 		this.lastKnownCode = null;
 		if (this.lastContainer) {
+			this.lastContainer.style.minHeight = "";
 			this.lastContainer.innerHTML = "";
 			this.lastContainer = null;
 		}
@@ -1212,13 +1552,27 @@ var EditorManager = class {
 		this.pendingUpdate = null;
 		this.rafScheduler.cancel("sync-last-known");
 		if (this.scrollWatcher) {
-			this.scrollWatcher.dispose();
+			try {
+				this.scrollWatcher.dispose();
+			} catch {}
 			this.scrollWatcher = null;
 		}
 		if (this.revealDebounceId != null) {
 			clearTimeout(this.revealDebounceId);
 			this.revealDebounceId = null;
 		}
+		if (this.revealIdleTimerId != null) {
+			clearTimeout(this.revealIdleTimerId);
+			this.revealIdleTimerId = null;
+		}
+		if (this.scrollWatcherSuppressionTimer != null) {
+			clearTimeout(this.scrollWatcherSuppressionTimer);
+			this.scrollWatcherSuppressionTimer = null;
+		}
+		this.rafScheduler.cancel("maybe-scroll");
+		this.rafScheduler.cancel("reveal");
+		this.rafScheduler.cancel("immediate-reveal");
+		this.rafScheduler.cancel("maybe-resume");
 		this._hasScrollBar = false;
 		this.shouldAutoScroll = !!this.autoScrollInitial;
 		this.lastScrollTop = 0;
@@ -1525,6 +1879,7 @@ let RevealStrategy = /* @__PURE__ */ function(RevealStrategy$1) {
 *   getEditorView: () => monaco.editor.IStandaloneCodeEditor | null,
 *   getDiffEditorView: () => monaco.editor.IStandaloneDiffEditor | null,
 *   getDiffModels: () => { original: monaco.editor.ITextModel | null, modified: monaco.editor.ITextModel | null },
+*   getCode: () => string | { original: string, modified: string } | null,
 * }} 返回对象包含以下方法和属性：
 *
 * @property {Function} createEditor - 创建并挂载 Monaco 编辑器到指定容器
@@ -1544,6 +1899,7 @@ let RevealStrategy = /* @__PURE__ */ function(RevealStrategy$1) {
 * @property {Function} getEditorView - 获取当前编辑器实例
 * @property {Function} getDiffEditorView - 获取当前 Diff 编辑器实例
 * @property {Function} getDiffModels - 获取 Diff 的 original/modified 两个模型
+* @property {Function} getCode - 获取当前编辑器或 Diff 编辑器中的代码内容
 *
 * @throws {Error} 当主题数组不是数组或长度小于2时抛出错误
 *
@@ -2050,7 +2406,26 @@ function useMonaco(monacoOptions = {}) {
 			return monaco_shim_exports;
 		},
 		setUpdateThrottleMs,
-		getUpdateThrottleMs
+		getUpdateThrottleMs,
+		getCode() {
+			if (editorView) try {
+				var _editorView$getModel;
+				return ((_editorView$getModel = editorView.getModel()) === null || _editorView$getModel === void 0 ? void 0 : _editorView$getModel.getValue()) ?? null;
+			} catch {
+				return null;
+			}
+			if (diffEditorView || originalModel && modifiedModel) try {
+				const original = (originalModel === null || originalModel === void 0 ? void 0 : originalModel.getValue()) ?? "";
+				const modified = (modifiedModel === null || modifiedModel === void 0 ? void 0 : modifiedModel.getValue()) ?? "";
+				return {
+					original,
+					modified
+				};
+			} catch {
+				return null;
+			}
+			return null;
+		}
 	};
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "stream-monaco",
   "type": "module",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "packageManager": "pnpm@10.18.3",
   "description": "A framework-agnostic library for integrating Monaco Editor with Shiki highlighting, optimized for streaming updates.",
   "author": "Simon He",