@singapore-editor/diff 0.2.0

package/dist/diffSyntax.js

@@ -0,0 +1,491 @@
+import { languageIdForPath } from "./lines.js";
+import { createDocumentTextSnapshot, createPieceTableSnapshot } from "@singapore-editor/core/document";
+import { createEmptySyntaxResult, createSyntaxLanguageConfiguration, createSyntaxSnapshotTag, toEditorTokenStore } from "@singapore-editor/core/syntax";
+import { EditorSecondaryViewScheduler } from "@singapore-editor/core/secondary-views";
+//#region src/diffSyntax.ts
+var nextSyntaxControllerId = 0;
+/**
+* One source side's parsed token stream and the session that recolours it on a theme change.
+* Exactly one holder owns it at a time — a host's store, or the controller that adopted it — and
+* that holder disposes it.
+*/
+var PreparedDiffSyntaxSource = class {
+	side;
+	lineStarts;
+	listeners = /* @__PURE__ */ new Set();
+	disposables = [];
+	current = toEditorTokenStore([]);
+	disposed = false;
+	constructor(side, lineStarts) {
+		this.side = side;
+		this.lineStarts = lineStarts;
+	}
+	get tokens() {
+		return this.current;
+	}
+	/** Fires when a theme change recolours the stream. */
+	onDidChangeTokens(listener) {
+		this.listeners.add(listener);
+		return () => this.listeners.delete(listener);
+	}
+	dispose() {
+		if (this.disposed) return;
+		this.disposed = true;
+		this.listeners.clear();
+		disposeMutableSessions(this.disposables);
+	}
+	/** @internal */
+	own(disposable) {
+		this.disposables.push(disposable);
+	}
+	/** @internal */
+	setTokens(tokens) {
+		this.current = toEditorTokenStore(tokens);
+	}
+	/** @internal */
+	async recolor(session) {
+		try {
+			const result = await session.refresh();
+			if (this.disposed) return;
+			this.setTokens(result.tokens);
+			for (const listener of this.listeners) listener();
+		} catch {}
+	}
+};
+/**
+* Parses a diff's sources ahead of the view that will show them, so `setFile(file, rows, prepared)`
+* paints coloured on its first frame. The caller owns the result; an aborted preparation resolves
+* empty.
+*/
+async function prepareDiffSyntax(file, options = {}) {
+	const created = [];
+	const isCurrent = () => options.signal?.aborted !== true;
+	try {
+		const sources = await loadSyntaxSources(file, options.side ?? "stacked", options.backend, isCurrent, created);
+		if (sources) return sources;
+	} catch (error) {
+		disposeMutableSessions(created);
+		throw error;
+	}
+	disposeMutableSessions(created);
+	return [];
+}
+/**
+* The syntax half of the old `DiffView`, with one behavioural change.
+*
+* `DiffView` re-ran the whole pipeline — new sessions, new parse — on every row change, including
+* every expansion toggle (`updatePaneRows` → `refreshSyntaxHighlighting`, DiffView.ts:564). The
+* parse result does not depend on which regions are expanded: the sources are the two *full files*,
+* and expansion only changes which of their lines the projection shows. So the per-side token
+* streams are cached against the file and re-projected synchronously when rows change, which is
+* what lets a toggle repaint without an uncoloured frame (§C10).
+*/
+var DiffSyntaxController = class {
+	options;
+	scheduler = new EditorSecondaryViewScheduler();
+	key = `diff.syntax.${nextSyntaxControllerId++}`;
+	sources = [];
+	sourceSubscriptions = [];
+	indexed = [];
+	sourcesFile = null;
+	file = null;
+	rows = [];
+	tokens = [];
+	disposed = false;
+	ready = true;
+	constructor(options) {
+		this.options = options;
+	}
+	/** A disposed controller is terminal — its scheduler never runs another task. */
+	isDisposed() {
+		return this.disposed;
+	}
+	isReady() {
+		return this.ready;
+	}
+	getTokens() {
+		return this.tokens;
+	}
+	/**
+	* New file: drop the cached streams, then adopt `prepared` when it covers this side, or reparse.
+	* A preparation still running is awaited instead of parsing the same file twice. Takes ownership
+	* of `prepared` either way.
+	*/
+	setFile(file, rows, prepared = []) {
+		this.file = file;
+		this.ready = !file || this.options.enabled === false;
+		this.rows = rows;
+		this.tokens = [];
+		this.disposeSources();
+		this.scheduler.cancel(this.key);
+		if (!file || this.ready) {
+			Promise.resolve(prepared).then(disposePrepared, () => void 0);
+			return;
+		}
+		if (isPromiseLike(prepared)) {
+			const settle = (sources) => {
+				if (this.settlePrepared(file, sources)) this.options.onDidChangeTokens();
+			};
+			prepared.then(settle, () => settle([]));
+			return;
+		}
+		this.settlePrepared(file, prepared);
+	}
+	/** Whether `prepared` was adopted; otherwise it is disposed, and a current file reparses. */
+	settlePrepared(file, prepared) {
+		if (this.disposed || this.file !== file || this.ready) {
+			disposePrepared(prepared);
+			return false;
+		}
+		if (!coversSide(prepared, this.options.side)) {
+			disposePrepared(prepared);
+			this.load(file);
+			return false;
+		}
+		this.adoptSources(file, prepared);
+		return true;
+	}
+	/** Same file, different rows — an expansion toggle. Re-project what is already parsed. */
+	setRows(rows) {
+		this.rows = rows;
+		this.reproject();
+	}
+	/**
+	* Hands the parsed streams of the current file to the caller, which then owns them; empty while
+	* a parse is still running. The controller keeps projecting their current tokens, and stops
+	* following their recolouring.
+	*/
+	release() {
+		if (!this.ready || this.sourcesFile !== this.file) return [];
+		const sources = this.sources;
+		this.unsubscribeSources();
+		this.sources = [];
+		return sources;
+	}
+	dispose() {
+		this.disposed = true;
+		this.scheduler.cancel(this.key);
+		this.scheduler.dispose();
+		this.disposeSources();
+		this.tokens = [];
+	}
+	reproject() {
+		if (this.indexed.length === 0 || this.sourcesFile !== this.file) {
+			this.tokens = [];
+			return;
+		}
+		this.tokens = projectIndexedTokens(this.rows, this.options.side, this.indexed);
+	}
+	load(file) {
+		if (this.options.enabled === false) return;
+		const created = [];
+		this.scheduler.schedule({
+			key: this.key,
+			taskClass: "background-derived",
+			priority: "low",
+			tags: {
+				configuration: "syntax",
+				viewport: this.options.side
+			},
+			run: (context) => loadSyntaxSources(file, this.options.side, this.options.backend, () => context.isCurrent(), created),
+			apply: (sources) => this.applySources(file, sources, created),
+			fail: () => {
+				disposeMutableSessions(created);
+				if (this.file !== file) return;
+				this.ready = true;
+				this.options.onDidChangeTokens();
+			},
+			cancel: () => disposeMutableSessions(created)
+		});
+	}
+	applySources(file, sources, created) {
+		if (this.file !== file) {
+			disposeMutableSessions(created);
+			return;
+		}
+		created.length = 0;
+		this.adoptSources(file, sources ?? []);
+		this.options.onDidChangeTokens();
+	}
+	adoptSources(file, sources) {
+		this.disposeSources();
+		this.sources = sources;
+		this.sourceSubscriptions = sources.map((source) => source.onDidChangeTokens(() => this.recolor(file)));
+		this.indexed = indexPreparedSources(sources);
+		this.ready = true;
+		this.sourcesFile = file;
+		this.reproject();
+	}
+	recolor(file) {
+		if (this.disposed || this.file !== file) return;
+		this.indexed = indexPreparedSources(this.sources);
+		this.reproject();
+		this.options.onDidChangeTokens();
+	}
+	unsubscribeSources() {
+		for (const unsubscribe of this.sourceSubscriptions) unsubscribe();
+		this.sourceSubscriptions = [];
+	}
+	disposeSources() {
+		this.unsubscribeSources();
+		disposeMutableSessions([...this.sources]);
+		this.sources = [];
+		this.indexed = [];
+		this.sourcesFile = null;
+	}
+};
+async function loadSyntaxSources(file, side, backend, isCurrent, created) {
+	const service = diffSyntaxService(diffSyntaxBackend(backend));
+	if (!service) return null;
+	const stale = () => {
+		disposeMutableSessions(created);
+		return null;
+	};
+	const sources = [];
+	for (const document of syntaxDocumentsForFile(file, side)) {
+		if (!isCurrent()) return stale();
+		const session = await service.createSession(document);
+		if (!session) continue;
+		const source = new PreparedDiffSyntaxSource(document.side, document.lineStarts);
+		created.push(source);
+		source.own(session);
+		if (!isCurrent()) return stale();
+		const unsubscribe = session.onDidChangeTheme?.(() => void source.recolor(session));
+		if (unsubscribe) source.own({ dispose: unsubscribe });
+		const result = await session.refresh();
+		if (!isCurrent()) return stale();
+		source.setTokens(result.tokens);
+		sources.push(source);
+	}
+	return sources;
+}
+function disposePrepared(sources) {
+	for (const source of sources) source.dispose();
+}
+function isPromiseLike(value) {
+	return "then" in value;
+}
+function coversSide(sources, side) {
+	const sides = new Set(sources.map((source) => source.side));
+	if (side === "stacked") return sides.size === 2 && sources.length === 2;
+	return sides.has(side) && sources.length === 1;
+}
+function indexPreparedSources(sources) {
+	return sources.map((source) => ({
+		lineStarts: source.lineStarts,
+		side: source.side,
+		tokens: source.tokens
+	}));
+}
+function diffSyntaxBackend(backend) {
+	return backend ?? { kind: "tree-sitter" };
+}
+function projectDiffSyntaxTokens({ rows, side, sources }) {
+	return projectIndexedTokens(rows, side, indexTokenSources(sources));
+}
+function projectIndexedTokens(rows, side, sources) {
+	const projectedTokens = [];
+	let rowOffset = 0;
+	for (const row of rows) {
+		const source = tokenSourceForRow(sources, row, side);
+		if (source) appendRowSyntaxTokens(projectedTokens, {
+			lineStarts: source.lineStarts,
+			row,
+			rowOffset,
+			side: source.side,
+			tokens: source.tokens
+		});
+		rowOffset += row.text.length + 1;
+	}
+	return projectedTokens;
+}
+function diffSyntaxService(backend) {
+	if (backend.kind === "tree-sitter") return treeSitterDiffSyntaxService(backend.provider ?? null);
+	return highlighterDiffSyntaxService(backend.provider ?? null);
+}
+function highlighterDiffSyntaxService(provider) {
+	if (!provider) return null;
+	return { createSession: async (document) => highlighterDiffSyntaxSession(provider, document) };
+}
+function highlighterDiffSyntaxSession(provider, document) {
+	const session = provider.createSession(highlighterSessionOptions(document));
+	if (!session) return null;
+	return tokenHighlighterDiffSyntaxSession(document, session);
+}
+function treeSitterDiffSyntaxService(provider) {
+	if (!provider) return null;
+	return { createSession: async (document) => treeSitterDiffSyntaxSession(provider, document) };
+}
+function treeSitterDiffSyntaxSession(provider, document) {
+	const session = provider.createSession(syntaxSessionOptions(document));
+	if (!session) return null;
+	return {
+		dispose: () => session.dispose(),
+		refresh: () => session.refresh(document.textSnapshot)
+	};
+}
+function tokenHighlighterDiffSyntaxSession(document, session) {
+	return {
+		onDidChangeTheme: session.onDidChangeTheme,
+		dispose: () => session.dispose(),
+		refresh: async () => {
+			const result = await session.refresh(document.textSnapshot);
+			return syntaxResultFromTokens(document.request, result.tokens);
+		}
+	};
+}
+function syntaxSessionOptions(document) {
+	return {
+		documentId: document.documentId,
+		includeCaptures: document.request.language.includeCaptures,
+		includeHighlights: document.request.language.includeHighlights,
+		languageId: document.languageId,
+		snapshot: document.request.snapshot,
+		syntaxMode: document.request.language.mode === "range" ? "range" : "full",
+		textSnapshot: document.textSnapshot
+	};
+}
+function highlighterSessionOptions(document) {
+	return {
+		documentId: document.documentId,
+		languageId: document.languageId,
+		snapshot: document.request.snapshot,
+		textSnapshot: document.textSnapshot
+	};
+}
+function syntaxResultFromTokens(request, tokens) {
+	return {
+		...createEmptySyntaxResult({
+			language: request.language,
+			requestedRanges: request.requestedRanges,
+			snapshot: request.snapshotTag
+		}),
+		tokens
+	};
+}
+/**
+* The two full files, parsed whole.
+*
+* This is the language the diff is highlighted in, and §C11 is the reason it lives here rather than
+* on the editor: the editor's own document is the *interleaved* buffer, and giving that a language
+* feeds a garbage parse into folds, brackets and injections.
+*/
+function syntaxDocumentsForFile(file, side) {
+	return syntaxSourcesForSide(file, side).map((source) => syntaxDocument(file, source));
+}
+function syntaxSourcesForSide(file, side) {
+	if (side === "stacked") return [syntaxSource(file.oldLines, "old"), syntaxSource(file.newLines, "new")];
+	return [syntaxSource(side === "old" ? file.oldLines : file.newLines, side)];
+}
+function syntaxSource(lines, side) {
+	const text = lines.join("\n");
+	return {
+		lineStarts: lineStartsForLines(lines),
+		side,
+		text
+	};
+}
+function syntaxDocument(file, source) {
+	const snapshot = createPieceTableSnapshot(source.text);
+	const textSnapshot = createDocumentTextSnapshot(snapshot, source.text);
+	const documentId = `${file.path}#diff-${source.side}`;
+	const languageId = diffSyntaxLanguageId(file);
+	const request = {
+		editSummary: null,
+		language: createSyntaxLanguageConfiguration({
+			includeCaptures: true,
+			includeHighlights: true,
+			languageId,
+			mode: "full"
+		}),
+		requestedRanges: [{
+			startIndex: 0,
+			endIndex: snapshot.length
+		}],
+		snapshot,
+		snapshotTag: createSyntaxSnapshotTag({
+			documentId,
+			length: snapshot.length,
+			version: 0
+		}),
+		textSnapshot
+	};
+	return {
+		...source,
+		documentId,
+		languageId,
+		request,
+		textSnapshot
+	};
+}
+function diffSyntaxLanguageId(file) {
+	return file.languageId ?? languageIdForPath(file.path);
+}
+/**
+* A row reads its line's tokens by bisection, and rows do not visit source lines in order once
+* expanded regions interleave. The store is sorted whichever producer made the tokens.
+*/
+function indexTokenSources(sources) {
+	return sources.map((source) => ({
+		lineStarts: source.lineStarts,
+		side: source.side,
+		tokens: toEditorTokenStore(source.tokens)
+	}));
+}
+function tokenSourceForRow(sources, row, side) {
+	const sourceSide = sourceSideForRow(row, side);
+	return sources.find((source) => source.side === sourceSide) ?? null;
+}
+function appendRowSyntaxTokens(projectedTokens, { lineStarts, row, rowOffset, side, tokens }) {
+	const lineNumber = sourceLineNumberForRow(row, side);
+	if (lineNumber === void 0) return;
+	const lineStart = lineStarts[lineNumber - 1];
+	const nextLineStart = lineStarts[lineNumber];
+	if (lineStart === void 0) return;
+	const lineEnd = Math.min(nextLineStart === void 0 ? Number.POSITIVE_INFINITY : nextLineStart - 1, lineStart + row.text.length);
+	const last = tokens.firstStartingAtOrAfter(lineEnd);
+	tokens.forEachInRange(tokens.firstEndingAfter(lineStart, last), last, (start, end, styleId) => {
+		appendProjectedToken(projectedTokens, {
+			start,
+			end,
+			style: tokens.styles[styleId]
+		}, lineStart, lineEnd, rowOffset);
+	});
+}
+function appendProjectedToken(projectedTokens, token, lineStart, lineEnd, rowOffset) {
+	if (token.end <= lineStart) return;
+	if (token.start >= lineEnd) return;
+	const start = Math.max(token.start, lineStart);
+	const end = Math.min(token.end, lineEnd);
+	if (end <= start) return;
+	projectedTokens.push({
+		end: rowOffset + end - lineStart,
+		start: rowOffset + start - lineStart,
+		style: token.style
+	});
+}
+function sourceLineNumberForRow(row, side) {
+	if (side === "old") return row.oldLineNumber;
+	return row.newLineNumber;
+}
+function sourceSideForRow(row, side) {
+	if (side === "old" || side === "new") return side;
+	if (row.type === "deletion") return "old";
+	return "new";
+}
+function lineStartsForLines(lines) {
+	const starts = [];
+	let offset = 0;
+	for (const line of lines) {
+		starts.push(offset);
+		offset += line.length + 1;
+	}
+	return starts;
+}
+function disposeMutableSessions(sessions) {
+	while (sessions.length > 0) sessions.pop()?.dispose();
+}
+//#endregion
+export { DiffSyntaxController, PreparedDiffSyntaxSource, diffSyntaxBackend, prepareDiffSyntax, projectDiffSyntaxTokens };
+
+//# sourceMappingURL=diffSyntax.js.map

package/dist/diffSyntax.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"diffSyntax.js","names":[],"sources":["../src/diffSyntax.ts"],"sourcesContent":["import {\n  createDocumentTextSnapshot,\n  type DocumentTextSnapshot,\n  createPieceTableSnapshot,\n} from '@singapore-editor/core/document'\nimport type {\n  EditorHighlighterProvider,\n  EditorHighlighterSession,\n} from '@singapore-editor/core/extensions'\nimport {\n  createEmptySyntaxResult,\n  createSyntaxLanguageConfiguration,\n  createSyntaxSnapshotTag,\n  type EditorSyntaxProvider,\n  type EditorSyntaxResult,\n  type EditorSyntaxServiceRequest,\n  type EditorSyntaxSessionOptions,\n  type EditorToken,\n  type EditorTokenInput,\n  type EditorTokenStore,\n  toEditorTokenStore,\n} from '@singapore-editor/core/syntax'\nimport { EditorSecondaryViewScheduler } from '@singapore-editor/core/secondary-views'\nimport { languageIdForPath } from './lines'\nimport type { DiffFile, DiffRenderRow, DiffSyntaxBackend } from './types'\n\ntype DiffSyntaxSide = 'old' | 'new' | 'stacked'\ntype DiffSyntaxSourceSide = 'old' | 'new'\n\nlet nextSyntaxControllerId = 0\n\nexport type DiffSyntaxTokenSource = {\n  readonly lineStarts: readonly number[]\n  readonly side: DiffSyntaxSourceSide\n  readonly tokens: EditorTokenInput\n}\n\nexport type ProjectDiffSyntaxTokensOptions = {\n  readonly rows: readonly DiffRenderRow[]\n  readonly side: DiffSyntaxSide\n  readonly sources: readonly DiffSyntaxTokenSource[]\n}\n\nexport type DiffSyntaxControllerOptions = {\n  readonly side: DiffSyntaxSide\n  readonly backend?: DiffSyntaxBackend\n  readonly enabled?: boolean\n  /** Fires when a *newly parsed* token stream lands; row-driven re-projection is synchronous. */\n  readonly onDidChangeTokens: () => void\n}\n\n/** Streams from `prepareDiffSyntax`, or a preparation of them still running. */\nexport type PreparedDiffSyntaxInput =\n  | readonly PreparedDiffSyntaxSource[]\n  | Promise<readonly PreparedDiffSyntaxSource[]>\n\nexport type PrepareDiffSyntaxOptions = {\n  readonly backend?: DiffSyntaxBackend\n  /** Which pane the sources are for. `stacked` prepares both source sides. */\n  readonly side?: DiffSyntaxSide\n  readonly signal?: AbortSignal\n}\n\n/**\n * One source side's parsed token stream and the session that recolours it on a theme change.\n * Exactly one holder owns it at a time — a host's store, or the controller that adopted it — and\n * that holder disposes it.\n */\nexport class PreparedDiffSyntaxSource {\n  private readonly listeners = new Set<() => void>()\n  private readonly disposables: { dispose(): void }[] = []\n  private current: EditorTokenStore = toEditorTokenStore([])\n  private disposed = false\n\n  constructor(\n    readonly side: DiffSyntaxSourceSide,\n    readonly lineStarts: readonly number[],\n  ) {}\n\n  get tokens(): EditorTokenStore {\n    return this.current\n  }\n\n  /** Fires when a theme change recolours the stream. */\n  onDidChangeTokens(listener: () => void): () => void {\n    this.listeners.add(listener)\n    return () => this.listeners.delete(listener)\n  }\n\n  dispose(): void {\n    if (this.disposed) return\n\n    this.disposed = true\n    this.listeners.clear()\n    disposeMutableSessions(this.disposables)\n  }\n\n  /** @internal */\n  own(disposable: { dispose(): void }): void {\n    this.disposables.push(disposable)\n  }\n\n  /** @internal */\n  setTokens(tokens: EditorTokenInput): void {\n    this.current = toEditorTokenStore(tokens)\n  }\n\n  /** @internal */\n  async recolor(session: DiffSyntaxServiceSession): Promise<void> {\n    try {\n      const result = await session.refresh()\n      if (this.disposed) return\n\n      this.setTokens(result.tokens)\n      for (const listener of this.listeners) listener()\n    } catch {\n      // Keep the last colors if the worker fails; a subsequent change can retry.\n    }\n  }\n}\n\n/**\n * Parses a diff's sources ahead of the view that will show them, so `setFile(file, rows, prepared)`\n * paints coloured on its first frame. The caller owns the result; an aborted preparation resolves\n * empty.\n */\nexport async function prepareDiffSyntax(\n  file: DiffFile,\n  options: PrepareDiffSyntaxOptions = {},\n): Promise<readonly PreparedDiffSyntaxSource[]> {\n  const created: PreparedDiffSyntaxSource[] = []\n  const isCurrent = () => options.signal?.aborted !== true\n  try {\n    const sources = await loadSyntaxSources(\n      file,\n      options.side ?? 'stacked',\n      options.backend,\n      isCurrent,\n      created,\n    )\n    if (sources) return sources\n  } catch (error) {\n    disposeMutableSessions(created)\n    throw error\n  }\n\n  disposeMutableSessions(created)\n  return []\n}\n\n/**\n * The syntax half of the old `DiffView`, with one behavioural change.\n *\n * `DiffView` re-ran the whole pipeline — new sessions, new parse — on every row change, including\n * every expansion toggle (`updatePaneRows` → `refreshSyntaxHighlighting`, DiffView.ts:564). The\n * parse result does not depend on which regions are expanded: the sources are the two *full files*,\n * and expansion only changes which of their lines the projection shows. So the per-side token\n * streams are cached against the file and re-projected synchronously when rows change, which is\n * what lets a toggle repaint without an uncoloured frame (§C10).\n */\nexport class DiffSyntaxController {\n  private readonly scheduler = new EditorSecondaryViewScheduler()\n  private readonly key = `diff.syntax.${nextSyntaxControllerId++}`\n  private sources: readonly PreparedDiffSyntaxSource[] = []\n  private sourceSubscriptions: (() => void)[] = []\n  private indexed: readonly IndexedTokenSource[] = []\n  private sourcesFile: DiffFile | null = null\n  private file: DiffFile | null = null\n  private rows: readonly DiffRenderRow[] = []\n  private tokens: readonly EditorToken[] = []\n  private disposed = false\n  private ready = true\n\n  constructor(private readonly options: DiffSyntaxControllerOptions) {}\n\n  /** A disposed controller is terminal — its scheduler never runs another task. */\n  isDisposed(): boolean {\n    return this.disposed\n  }\n\n  isReady(): boolean {\n    return this.ready\n  }\n\n  getTokens(): readonly EditorToken[] {\n    return this.tokens\n  }\n\n  /**\n   * New file: drop the cached streams, then adopt `prepared` when it covers this side, or reparse.\n   * A preparation still running is awaited instead of parsing the same file twice. Takes ownership\n   * of `prepared` either way.\n   */\n  setFile(\n    file: DiffFile | null,\n    rows: readonly DiffRenderRow[],\n    prepared: PreparedDiffSyntaxInput = [],\n  ): void {\n    this.file = file\n    this.ready = !file || this.options.enabled === false\n    this.rows = rows\n    this.tokens = []\n    this.disposeSources()\n    this.scheduler.cancel(this.key)\n    if (!file || this.ready) {\n      void Promise.resolve(prepared).then(disposePrepared, () => undefined)\n      return\n    }\n    if (isPromiseLike(prepared)) {\n      const settle = (sources: readonly PreparedDiffSyntaxSource[]) => {\n        if (this.settlePrepared(file, sources)) this.options.onDidChangeTokens()\n      }\n      void prepared.then(settle, () => settle([]))\n      return\n    }\n    this.settlePrepared(file, prepared)\n  }\n\n  /** Whether `prepared` was adopted; otherwise it is disposed, and a current file reparses. */\n  private settlePrepared(file: DiffFile, prepared: readonly PreparedDiffSyntaxSource[]): boolean {\n    if (this.disposed || this.file !== file || this.ready) {\n      disposePrepared(prepared)\n      return false\n    }\n    if (!coversSide(prepared, this.options.side)) {\n      disposePrepared(prepared)\n      this.load(file)\n      return false\n    }\n\n    this.adoptSources(file, prepared)\n    return true\n  }\n\n  /** Same file, different rows — an expansion toggle. Re-project what is already parsed. */\n  setRows(rows: readonly DiffRenderRow[]): void {\n    this.rows = rows\n    this.reproject()\n  }\n\n  /**\n   * Hands the parsed streams of the current file to the caller, which then owns them; empty while\n   * a parse is still running. The controller keeps projecting their current tokens, and stops\n   * following their recolouring.\n   */\n  release(): readonly PreparedDiffSyntaxSource[] {\n    if (!this.ready || this.sourcesFile !== this.file) return []\n\n    const sources = this.sources\n    this.unsubscribeSources()\n    this.sources = []\n    return sources\n  }\n\n  dispose(): void {\n    this.disposed = true\n    this.scheduler.cancel(this.key)\n    this.scheduler.dispose()\n    this.disposeSources()\n    this.tokens = []\n  }\n\n  private reproject(): void {\n    if (this.indexed.length === 0 || this.sourcesFile !== this.file) {\n      this.tokens = []\n      return\n    }\n\n    this.tokens = projectIndexedTokens(this.rows, this.options.side, this.indexed)\n  }\n\n  private load(file: DiffFile): void {\n    if (this.options.enabled === false) return\n\n    const created: PreparedDiffSyntaxSource[] = []\n    this.scheduler.schedule({\n      key: this.key,\n      taskClass: 'background-derived',\n      priority: 'low',\n      tags: { configuration: 'syntax', viewport: this.options.side },\n      run: (context) =>\n        loadSyntaxSources(\n          file,\n          this.options.side,\n          this.options.backend,\n          () => context.isCurrent(),\n          created,\n        ),\n      apply: (sources) => this.applySources(file, sources, created),\n      fail: () => {\n        disposeMutableSessions(created)\n        if (this.file !== file) return\n        this.ready = true\n        this.options.onDidChangeTokens()\n      },\n      cancel: () => disposeMutableSessions(created),\n    })\n  }\n\n  private applySources(\n    file: DiffFile,\n    sources: readonly PreparedDiffSyntaxSource[] | null,\n    created: PreparedDiffSyntaxSource[],\n  ): void {\n    if (this.file !== file) {\n      disposeMutableSessions(created)\n      return\n    }\n\n    // Adopted: the task's cancel path must no longer reach them.\n    created.length = 0\n    this.adoptSources(file, sources ?? [])\n    this.options.onDidChangeTokens()\n  }\n\n  private adoptSources(file: DiffFile, sources: readonly PreparedDiffSyntaxSource[]): void {\n    this.disposeSources()\n    this.sources = sources\n    this.sourceSubscriptions = sources.map((source) =>\n      source.onDidChangeTokens(() => this.recolor(file)),\n    )\n    // Indexed here, once per parse. The index depends only on the token streams, and expansion\n    // does not change those — so rebuilding it inside every re-projection would be repeated work\n    // plus a fresh Map and N arrays of garbage on each toggle.\n    this.indexed = indexPreparedSources(sources)\n    this.ready = true\n    this.sourcesFile = file\n    this.reproject()\n  }\n\n  private recolor(file: DiffFile): void {\n    if (this.disposed || this.file !== file) return\n\n    this.indexed = indexPreparedSources(this.sources)\n    this.reproject()\n    this.options.onDidChangeTokens()\n  }\n\n  private unsubscribeSources(): void {\n    for (const unsubscribe of this.sourceSubscriptions) unsubscribe()\n    this.sourceSubscriptions = []\n  }\n\n  private disposeSources(): void {\n    this.unsubscribeSources()\n    disposeMutableSessions([...this.sources])\n    this.sources = []\n    this.indexed = []\n    this.sourcesFile = null\n  }\n}\n\nasync function loadSyntaxSources(\n  file: DiffFile,\n  side: DiffSyntaxSide,\n  backend: DiffSyntaxBackend | undefined,\n  isCurrent: () => boolean,\n  created: PreparedDiffSyntaxSource[],\n): Promise<readonly PreparedDiffSyntaxSource[] | null> {\n  const service = diffSyntaxService(diffSyntaxBackend(backend))\n  if (!service) return null\n\n  // A task cancelled mid-load has already run its cancel callback, so a stale load disposes\n  // whatever it created itself: nothing else will.\n  const stale = () => {\n    disposeMutableSessions(created)\n    return null\n  }\n  const sources: PreparedDiffSyntaxSource[] = []\n  for (const document of syntaxDocumentsForFile(file, side)) {\n    if (!isCurrent()) return stale()\n\n    const session = await service.createSession(document)\n    if (!session) continue\n\n    const source = new PreparedDiffSyntaxSource(document.side, document.lineStarts)\n    created.push(source)\n    source.own(session)\n    if (!isCurrent()) return stale()\n    const unsubscribe = session.onDidChangeTheme?.(() => void source.recolor(session))\n    if (unsubscribe) source.own({ dispose: unsubscribe })\n    const result = await session.refresh()\n    if (!isCurrent()) return stale()\n\n    source.setTokens(result.tokens)\n    sources.push(source)\n  }\n\n  return sources\n}\n\nfunction disposePrepared(sources: readonly PreparedDiffSyntaxSource[]): void {\n  for (const source of sources) source.dispose()\n}\n\nfunction isPromiseLike(\n  value: PreparedDiffSyntaxInput,\n): value is Promise<readonly PreparedDiffSyntaxSource[]> {\n  return 'then' in value\n}\n\nfunction coversSide(sources: readonly PreparedDiffSyntaxSource[], side: DiffSyntaxSide): boolean {\n  const sides = new Set(sources.map((source) => source.side))\n  if (side === 'stacked') return sides.size === 2 && sources.length === 2\n  return sides.has(side) && sources.length === 1\n}\n\nfunction indexPreparedSources(\n  sources: readonly PreparedDiffSyntaxSource[],\n): readonly IndexedTokenSource[] {\n  return sources.map((source) => ({\n    lineStarts: source.lineStarts,\n    side: source.side,\n    tokens: source.tokens,\n  }))\n}\n\nexport function diffSyntaxBackend(backend: DiffSyntaxBackend | undefined): DiffSyntaxBackend {\n  return backend ?? { kind: 'tree-sitter' }\n}\n\nexport function projectDiffSyntaxTokens({\n  rows,\n  side,\n  sources,\n}: ProjectDiffSyntaxTokensOptions): readonly EditorToken[] {\n  return projectIndexedTokens(rows, side, indexTokenSources(sources))\n}\n\nfunction projectIndexedTokens(\n  rows: readonly DiffRenderRow[],\n  side: DiffSyntaxSide,\n  sources: readonly IndexedTokenSource[],\n): readonly EditorToken[] {\n  const projectedTokens: EditorToken[] = []\n  let rowOffset = 0\n\n  for (const row of rows) {\n    const source = tokenSourceForRow(sources, row, side)\n    if (source) {\n      appendRowSyntaxTokens(projectedTokens, {\n        lineStarts: source.lineStarts,\n        row,\n        rowOffset,\n        side: source.side,\n        tokens: source.tokens,\n      })\n    }\n    rowOffset += row.text.length + 1\n  }\n\n  return projectedTokens\n}\n\ntype DiffSyntaxSource = {\n  readonly lineStarts: readonly number[]\n  readonly side: DiffSyntaxSourceSide\n  readonly text: string\n}\n\ntype DiffSyntaxDocument = DiffSyntaxSource & {\n  readonly documentId: string\n  readonly languageId: string | null\n  readonly request: EditorSyntaxServiceRequest\n  readonly textSnapshot: DocumentTextSnapshot\n}\n\ntype DiffSyntaxService = {\n  createSession(document: DiffSyntaxDocument): Promise<DiffSyntaxServiceSession | null>\n}\n\ntype DiffSyntaxServiceSession = {\n  onDidChangeTheme?: EditorHighlighterSession['onDidChangeTheme']\n  refresh(): Promise<EditorSyntaxResult>\n  dispose(): void\n}\n\nfunction diffSyntaxService(backend: DiffSyntaxBackend): DiffSyntaxService | null {\n  if (backend.kind === 'tree-sitter') return treeSitterDiffSyntaxService(backend.provider ?? null)\n  return highlighterDiffSyntaxService(backend.provider ?? null)\n}\n\nfunction highlighterDiffSyntaxService(\n  provider: EditorHighlighterProvider | null,\n): DiffSyntaxService | null {\n  if (!provider) return null\n\n  return {\n    createSession: async (document) => highlighterDiffSyntaxSession(provider, document),\n  }\n}\n\nfunction highlighterDiffSyntaxSession(\n  provider: EditorHighlighterProvider,\n  document: DiffSyntaxDocument,\n): DiffSyntaxServiceSession | null {\n  const session = provider.createSession(highlighterSessionOptions(document))\n  if (!session) return null\n\n  return tokenHighlighterDiffSyntaxSession(document, session)\n}\n\nfunction treeSitterDiffSyntaxService(\n  provider: EditorSyntaxProvider | null,\n): DiffSyntaxService | null {\n  if (!provider) return null\n\n  return {\n    createSession: async (document) => treeSitterDiffSyntaxSession(provider, document),\n  }\n}\n\nfunction treeSitterDiffSyntaxSession(\n  provider: EditorSyntaxProvider,\n  document: DiffSyntaxDocument,\n): DiffSyntaxServiceSession | null {\n  const session = provider.createSession(syntaxSessionOptions(document))\n  if (!session) return null\n\n  return {\n    dispose: () => session.dispose(),\n    refresh: () => session.refresh(document.textSnapshot),\n  }\n}\n\nfunction tokenHighlighterDiffSyntaxSession(\n  document: DiffSyntaxDocument,\n  session: EditorHighlighterSession,\n): DiffSyntaxServiceSession {\n  return {\n    onDidChangeTheme: session.onDidChangeTheme,\n    dispose: () => session.dispose(),\n    refresh: async () => {\n      const result = await session.refresh(document.textSnapshot)\n      return syntaxResultFromTokens(document.request, result.tokens)\n    },\n  }\n}\n\nfunction syntaxSessionOptions(document: DiffSyntaxDocument): EditorSyntaxSessionOptions {\n  return {\n    documentId: document.documentId,\n    includeCaptures: document.request.language.includeCaptures,\n    includeHighlights: document.request.language.includeHighlights,\n    languageId: document.languageId,\n    snapshot: document.request.snapshot,\n    syntaxMode: document.request.language.mode === 'range' ? 'range' : 'full',\n    textSnapshot: document.textSnapshot,\n  }\n}\n\nfunction highlighterSessionOptions(\n  document: DiffSyntaxDocument,\n): Omit<EditorSyntaxSessionOptions, 'includeCaptures' | 'includeHighlights' | 'syntaxMode'> {\n  return {\n    documentId: document.documentId,\n    languageId: document.languageId,\n    snapshot: document.request.snapshot,\n    textSnapshot: document.textSnapshot,\n  }\n}\n\nfunction syntaxResultFromTokens(\n  request: EditorSyntaxServiceRequest,\n  tokens: EditorTokenInput,\n): EditorSyntaxResult {\n  return {\n    ...createEmptySyntaxResult({\n      language: request.language,\n      requestedRanges: request.requestedRanges,\n      snapshot: request.snapshotTag,\n    }),\n    tokens,\n  }\n}\n\n/**\n * The two full files, parsed whole.\n *\n * This is the language the diff is highlighted in, and §C11 is the reason it lives here rather than\n * on the editor: the editor's own document is the *interleaved* buffer, and giving that a language\n * feeds a garbage parse into folds, brackets and injections.\n */\nfunction syntaxDocumentsForFile(\n  file: DiffFile,\n  side: DiffSyntaxSide,\n): readonly DiffSyntaxDocument[] {\n  return syntaxSourcesForSide(file, side).map((source) => syntaxDocument(file, source))\n}\n\nfunction syntaxSourcesForSide(file: DiffFile, side: DiffSyntaxSide): readonly DiffSyntaxSource[] {\n  if (side === 'stacked') {\n    return [syntaxSource(file.oldLines, 'old'), syntaxSource(file.newLines, 'new')]\n  }\n\n  return [syntaxSource(side === 'old' ? file.oldLines : file.newLines, side)]\n}\n\nfunction syntaxSource(lines: readonly string[], side: DiffSyntaxSourceSide): DiffSyntaxSource {\n  const text = lines.join('\\n')\n  return {\n    lineStarts: lineStartsForLines(lines),\n    side,\n    text,\n  }\n}\n\nfunction syntaxDocument(file: DiffFile, source: DiffSyntaxSource): DiffSyntaxDocument {\n  const snapshot = createPieceTableSnapshot(source.text)\n  const textSnapshot = createDocumentTextSnapshot(snapshot, source.text)\n  const documentId = `${file.path}#diff-${source.side}`\n  const languageId = diffSyntaxLanguageId(file)\n  const request: EditorSyntaxServiceRequest = {\n    editSummary: null,\n    language: createSyntaxLanguageConfiguration({\n      includeCaptures: true,\n      includeHighlights: true,\n      languageId,\n      mode: 'full',\n    }),\n    requestedRanges: [{ startIndex: 0, endIndex: snapshot.length }],\n    snapshot,\n    snapshotTag: createSyntaxSnapshotTag({\n      documentId,\n      length: snapshot.length,\n      version: 0,\n    }),\n    textSnapshot,\n  }\n  return { ...source, documentId, languageId, request, textSnapshot }\n}\n\nfunction diffSyntaxLanguageId(file: DiffFile): string | null {\n  return file.languageId ?? languageIdForPath(file.path)\n}\n\ntype IndexedTokenSource = {\n  readonly lineStarts: readonly number[]\n  readonly side: DiffSyntaxSourceSide\n  readonly tokens: EditorTokenStore\n}\n\n/**\n * A row reads its line's tokens by bisection, and rows do not visit source lines in order once\n * expanded regions interleave. The store is sorted whichever producer made the tokens.\n */\nfunction indexTokenSources(\n  sources: readonly DiffSyntaxTokenSource[],\n): readonly IndexedTokenSource[] {\n  return sources.map((source) => ({\n    lineStarts: source.lineStarts,\n    side: source.side,\n    tokens: toEditorTokenStore(source.tokens),\n  }))\n}\n\nfunction tokenSourceForRow(\n  sources: readonly IndexedTokenSource[],\n  row: DiffRenderRow,\n  side: DiffSyntaxSide,\n): IndexedTokenSource | null {\n  const sourceSide = sourceSideForRow(row, side)\n  return sources.find((source) => source.side === sourceSide) ?? null\n}\n\nfunction appendRowSyntaxTokens(\n  projectedTokens: EditorToken[],\n  {\n    lineStarts,\n    row,\n    rowOffset,\n    side,\n    tokens,\n  }: {\n    readonly lineStarts: readonly number[]\n    readonly row: DiffRenderRow\n    readonly rowOffset: number\n    readonly side: DiffSyntaxSourceSide\n    readonly tokens: EditorTokenStore\n  },\n): void {\n  const lineNumber = sourceLineNumberForRow(row, side)\n  if (lineNumber === undefined) return\n\n  const lineStart = lineStarts[lineNumber - 1]\n  const nextLineStart = lineStarts[lineNumber]\n  if (lineStart === undefined) return\n\n  const lineEnd = Math.min(\n    nextLineStart === undefined ? Number.POSITIVE_INFINITY : nextLineStart - 1,\n    lineStart + row.text.length,\n  )\n\n  const last = tokens.firstStartingAtOrAfter(lineEnd)\n  tokens.forEachInRange(tokens.firstEndingAfter(lineStart, last), last, (start, end, styleId) => {\n    const token = { start, end, style: tokens.styles[styleId]! }\n    appendProjectedToken(projectedTokens, token, lineStart, lineEnd, rowOffset)\n  })\n}\n\nfunction appendProjectedToken(\n  projectedTokens: EditorToken[],\n  token: EditorToken,\n  lineStart: number,\n  lineEnd: number,\n  rowOffset: number,\n): void {\n  if (token.end <= lineStart) return\n  if (token.start >= lineEnd) return\n\n  const start = Math.max(token.start, lineStart)\n  const end = Math.min(token.end, lineEnd)\n  if (end <= start) return\n\n  projectedTokens.push({\n    end: rowOffset + end - lineStart,\n    start: rowOffset + start - lineStart,\n    style: token.style,\n  })\n}\n\nfunction sourceLineNumberForRow(\n  row: DiffRenderRow,\n  side: DiffSyntaxSourceSide,\n): number | undefined {\n  if (side === 'old') return row.oldLineNumber\n  return row.newLineNumber\n}\n\nfunction sourceSideForRow(row: DiffRenderRow, side: DiffSyntaxSide): DiffSyntaxSourceSide {\n  if (side === 'old' || side === 'new') return side\n  if (row.type === 'deletion') return 'old'\n\n  return 'new'\n}\n\nfunction lineStartsForLines(lines: readonly string[]): readonly number[] {\n  const starts: number[] = []\n  let offset = 0\n  for (const line of lines) {\n    starts.push(offset)\n    offset += line.length + 1\n  }\n  return starts\n}\n\nfunction disposeMutableSessions(sessions: { dispose(): void }[]): void {\n  while (sessions.length > 0) sessions.pop()?.dispose()\n}\n"],"mappings":"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"}

package/dist/editorDiffPlugin.d.ts

@@ -0,0 +1,74 @@
+import type { EditorDisposable, EditorPlugin } from '@singapore-editor/core/extensions';
+import type { EditorToken } from '@singapore-editor/core/syntax';
+import { type PreparedDiffSyntaxInput, type PreparedDiffSyntaxSource } from './diffSyntax';
+import { type DiffGutterSide } from './gutters';
+import { type DiffRegionStore } from './regions';
+import type { DiffFile, DiffRenderRow, DiffSyntaxBackend, DiffTextFile } from './types';
+export type DiffPluginMode = 'document' | 'overlay';
+export type DiffPluginOptions = {
+    /**
+     * §C1. `document` is the parity path; `overlay` is explicitly non-parity — see §C2.
+     *
+     * Required, with no default. The factory this replaced took no arguments and was always overlay,
+     * so the natural migration — rename the call, keep the empty argument list — would otherwise
+     * produce a plugin that mounts, registers everything, renders nothing and reports no error,
+     * because `setBaseFile` and `setEnabled` both early-return outside overlay mode.
+     */
+    readonly mode: DiffPluginMode;
+    readonly side?: DiffGutterSide;
+    /**
+     * Expansion state, shared when a host drives two sides of one diff. Omit it and the plugin keeps
+     * a private store; pass one store to both split plugins and a toggle on either side moves both.
+     * See regions.ts — this is what holds §C7 together.
+     */
+    readonly regions?: DiffRegionStore;
+    readonly syntaxBackend?: DiffSyntaxBackend;
+    readonly syntaxHighlight?: boolean;
+};
+export type DiffPlugin = EditorPlugin & {
+    /**
+     * `document` mode: the file to project. The host owns the editor's text — §C3. `prepared`
+     * streams from `prepareDiffSyntax` for this file paint with the first rows, and a preparation
+     * still running is awaited in place of a second parse; the plugin owns them.
+     */
+    setFile(file: DiffFile | null, prepared?: PreparedDiffSyntaxInput): void;
+    /** The current file's parsed streams, handed to the caller; empty while a parse is running. */
+    releasePreparedSyntax(): readonly PreparedDiffSyntaxSource[];
+    getRows(): readonly DiffRenderRow[];
+    /** Both sides in row order. Cached until the file or expansion state changes. */
+    getStackedRows(): readonly DiffRenderRow[];
+    /**
+     * Projected syntax tokens for the current rows. The host passes them with the rows' text,
+     * `setText(text, { tokens })`, or an expansion toggle repaints uncoloured (§C10).
+     */
+    isSyntaxReady(): boolean;
+    getTokens(): readonly EditorToken[];
+    onDidChangeRows(listener: () => void): EditorDisposable;
+    onDidChangeTokens(listener: () => void): EditorDisposable;
+    /** §C5. Hosts must not mirror this. */
+    getExpandedRegions(): ReadonlySet<string>;
+    toggleRegion(key: string): void;
+    /** `overlay` mode: the buffer the live editor text is diffed against. */
+    setBaseFile(file: DiffTextFile | null): void;
+    setEnabled(enabled: boolean): void;
+};
+/** The diff row under a pointer: which pane, that pane's rows, and the index into them. */
+export type DiffRowHit = {
+    readonly side: DiffGutterSide;
+    readonly rowIndex: number;
+    readonly rows: readonly DiffRenderRow[];
+};
+/** `null` outside a `document`-mode diff pane, or over something that is not a diff row. */
+export declare function diffRowAtEvent(event: MouseEvent): DiffRowHit | null;
+/**
+ * The one diff plugin (§C1), carrying two internal row-delivery modes.
+ *
+ * `document` — the editor holds a synthetic buffer of the projected rows and the plugin publishes
+ * them for the host to push in. Everything works because the rows are real document lines.
+ *
+ * `overlay` — the editor holds the host's live, editable buffer and deletions arrive as injected
+ * rows. Non-parity by construction; see §C2 and test/overlayModeLimits.test.ts before reaching for
+ * it.
+ */
+export declare function createDiffPlugin(options: DiffPluginOptions): DiffPlugin;
+//# sourceMappingURL=editorDiffPlugin.d.ts.map

package/dist/editorDiffPlugin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"editorDiffPlugin.d.ts","sourceRoot":"","sources":["../src/editorDiffPlugin.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAIV,gBAAgB,EAGhB,YAAY,EAOb,MAAM,mCAAmC,CAAA;AAE1C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAGhE,OAAO,EAEL,KAAK,uBAAuB,EAC5B,KAAK,wBAAwB,EAC9B,MAAM,cAAc,CAAA;AACrB,OAAO,EAIL,KAAK,cAAc,EACpB,MAAM,WAAW,CAAA;AAIlB,OAAO,EAAyB,KAAK,eAAe,EAAE,MAAM,WAAW,CAAA;AACvE,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAEvF,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,SAAS,CAAA;AAEnD,MAAM,MAAM,iBAAiB,GAAG;IAC9B;;;;;;;OAOG;IACH,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAA;IAC7B,QAAQ,CAAC,IAAI,CAAC,EAAE,cAAc,CAAA;IAC9B;;;;OAIG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,eAAe,CAAA;IAClC,QAAQ,CAAC,aAAa,CAAC,EAAE,iBAAiB,CAAA;IAC1C,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,CAAA;CACnC,CAAA;AAED,MAAM,MAAM,UAAU,GAAG,YAAY,GAAG;IACtC;;;;OAIG;IACH,OAAO,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI,EAAE,QAAQ,CAAC,EAAE,uBAAuB,GAAG,IAAI,CAAA;IACxE,+FAA+F;IAC/F,qBAAqB,IAAI,SAAS,wBAAwB,EAAE,CAAA;IAC5D,OAAO,IAAI,SAAS,aAAa,EAAE,CAAA;IACnC,iFAAiF;IACjF,cAAc,IAAI,SAAS,aAAa,EAAE,CAAA;IAC1C;;;OAGG;IACH,aAAa,IAAI,OAAO,CAAA;IACxB,SAAS,IAAI,SAAS,WAAW,EAAE,CAAA;IACnC,eAAe,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,gBAAgB,CAAA;IACvD,iBAAiB,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,gBAAgB,CAAA;IACzD,uCAAuC;IACvC,kBAAkB,IAAI,WAAW,CAAC,MAAM,CAAC,CAAA;IACzC,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;IAE/B,yEAAyE;IACzE,WAAW,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI,GAAG,IAAI,CAAA;IAC5C,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAA;CACnC,CAAA;AAED,2FAA2F;AAC3F,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAA;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,IAAI,EAAE,SAAS,aAAa,EAAE,CAAA;CACxC,CAAA;AAMD,4FAA4F;AAC5F,wBAAgB,cAAc,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU,GAAG,IAAI,CAQnE;AAaD;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,iBAAiB,GAAG,UAAU,CAsBvE"}