@pierre/diffs 1.5.2 → 1.6.0-beta.1

package/dist/highlighter/highlights-editor.d.ts

@@ -0,0 +1,24 @@
+import { DiffsEditorTokenizer } from "./DiffsEditorTokenizer.js";
+import { DiffsEditorTokenizerOptions } from "./tokenizer-types.js";
+import { CodeToTokensOptions as CodeToTokensOptions$1 } from "./types.js";
+import { HighlightedToken, RenderRange } from "../types.js";
+import { TextDocumentChange } from "../editor/textDocument.js";
+import { CodeToTokensOptions } from "@pierre/highlights";
+//#region src/highlighter/highlights-editor.d.ts
+declare class HighlightsEditorTokenizer implements DiffsEditorTokenizer {
+  #private;
+  private readonly options;
+  private readonly resolveOptions;
+  constructor(options: DiffsEditorTokenizerOptions, resolveOptions: (options: CodeToTokensOptions$1) => CodeToTokensOptions);
+  tokenize(change: TextDocumentChange, renderRange?: RenderRange, hostRealignsRows?: boolean): Map<number, HighlightedToken[]>;
+  setTheme(themeName: string): void;
+  getStringCommentRegexpRangesInLine(lineIndex: number): [number, number][] | null;
+  prebuildStateStack(): void;
+  stopBackgroundTokenize(): void;
+  pauseBackgroundTokenize(): void;
+  resumeBackgroundTokenize(): void;
+  dispose(): void;
+}
+//#endregion
+export { HighlightsEditorTokenizer };
+//# sourceMappingURL=highlights-editor.d.ts.map

package/dist/highlighter/highlights-editor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"highlights-editor.d.ts","names":[],"sources":["../../src/highlighter/highlights-editor.ts"],"mappings":";;;;;;;cAaa,qCAAqC;;mBAa7B;mBACA;EAFnB,YACmB,SAAS,6BACT,iBACf,SAAS,0BACN;EAqDP,SACE,QAAQ,oBACR,cAAc,aACd,6BACC,YAAY;EAiGf,SAAS;EAUT,mCACE;EAoCF;EACA;EAGA;EAIA;EAIA"}

package/dist/highlighter/highlights-editor.js

@@ -0,0 +1,166 @@
+import { formatCSSVariablePrefix } from "../utils/formatCSSVariablePrefix.js";
+import { LiveTokenizer } from "@pierre/highlights";
+//#region src/highlighter/highlights-editor.ts
+var HighlightsEditorTokenizer = class {
+	options;
+	resolveOptions;
+	#tokenizer;
+	#version;
+	#disposed = false;
+	#returnedRange;
+	#paused = false;
+	#capturedLines;
+	#pendingDelivery;
+	constructor(options, resolveOptions) {
+		this.options = options;
+		this.resolveOptions = resolveOptions;
+		this.#version = options.textDocument.version;
+		this.#tokenizer = this.#createTokenizer();
+	}
+	#createTokenizer() {
+		return new LiveTokenizer({
+			...this.resolveOptions({
+				lang: this.options.textDocument.languageId,
+				theme: this.options.theme,
+				cssVariablePrefix: formatCSSVariablePrefix("token"),
+				tokenizeMaxLineLength: this.options.tokenizeMaxLineLength ?? 1e3
+			}),
+			code: this.options.textDocument.getText(),
+			renderRange: [0, 0],
+			onDeferTokenize: (lines) => this.#deliver(lines)
+		});
+	}
+	#deliver(lines) {
+		const captured = this.#capturedLines;
+		if (captured != null) {
+			for (const [line, tokens] of lines) captured.set(line, tokens);
+			return;
+		}
+		const range = this.#returnedRange;
+		if (range != null) {
+			for (const line of lines.keys()) if (line >= range[0] && line < range[1]) lines.delete(line);
+			if (lines.size === 0) return;
+		}
+		this.options.onDeferTokenize(lines);
+	}
+	#queueDelivery(lines) {
+		const pending = this.#pendingDelivery;
+		if (pending != null) {
+			for (const [line, tokens] of lines) pending.set(line, tokens);
+			return;
+		}
+		this.#pendingDelivery = lines;
+		queueMicrotask(() => {
+			const batch = this.#pendingDelivery;
+			this.#pendingDelivery = void 0;
+			if (batch != null && batch.size > 0 && !this.#disposed) this.options.onDeferTokenize(batch);
+		});
+	}
+	tokenize(change, renderRange, hostRealignsRows = false) {
+		const document = this.options.textDocument;
+		const start = Math.min(renderRange?.startingLine ?? 0, document.lineCount);
+		const end = Math.min(start + (renderRange?.totalLines ?? Infinity), document.lineCount);
+		const returnedStart = Math.max(start, change.startLine);
+		this.#paused = false;
+		let lines;
+		if (this.#version !== document.version) {
+			this.#pendingDelivery = void 0;
+			lines = this.#syncDocument(change, [start, end]).lines;
+			this.#version = document.version;
+		} else if (this.#tokenizer.lineCount !== document.lineCount) {
+			this.#pendingDelivery = void 0;
+			lines = this.#tokenizer.reset(document.getText(), { renderRange: [start, end] }).lines;
+		} else {
+			lines = /* @__PURE__ */ new Map();
+			this.#readLines(lines, returnedStart, end);
+			if (this.#pendingDelivery != null) for (const line of lines.keys()) this.#pendingDelivery.delete(line);
+			return lines;
+		}
+		if (change.lineDelta === 0 ? change.changedLineChanges?.some(([, , lineDelta]) => lineDelta !== 0) ?? false : !hostRealignsRows) this.#readLines(lines, returnedStart, end);
+		return lines;
+	}
+	#syncDocument(change, renderRange) {
+		const document = this.options.textDocument;
+		const options = { renderRange };
+		if (Math.abs(document.version - this.#version) === 1 && change.changes.length > 0 && this.#tokenizer.lineCount === change.previousLineCount) try {
+			const update = this.#tokenizer.applyEdits(change.changes.map(({ range, text }) => ({
+				range,
+				newText: text
+			})), options);
+			if (this.#tokenizer.lineCount === document.lineCount) return update;
+		} catch (error) {
+			if (!(error instanceof RangeError)) throw error;
+		}
+		return this.#tokenizer.reset(document.getText(), options);
+	}
+	#readLines(lines, from, to) {
+		this.#returnedRange = [from, to];
+		try {
+			this.#tokenizer.flush(to);
+		} finally {
+			this.#returnedRange = void 0;
+		}
+		for (let line = from; line < to; line++) {
+			if (lines.has(line)) continue;
+			const { tokens } = this.#tokenizer.getLineTokens(line);
+			lines.set(line, tokens.length === 0 ? [[
+				0,
+				"",
+				""
+			]] : tokens.map((token) => [
+				token.offset,
+				token.color ?? "",
+				token.content
+			]));
+		}
+	}
+	setTheme(themeName) {
+		if (themeName === this.options.theme) return;
+		this.options.theme = themeName;
+		this.#tokenizer.dispose();
+		this.#pendingDelivery = void 0;
+		this.#paused = false;
+		this.#version = this.options.textDocument.version;
+		this.#tokenizer = this.#createTokenizer();
+	}
+	getStringCommentRegexpRangesInLine(lineIndex) {
+		const document = this.options.textDocument;
+		if (this.options.matchBrackets === false || lineIndex < 0 || lineIndex >= document.lineCount) return null;
+		const captured = /* @__PURE__ */ new Map();
+		this.#capturedLines = captured;
+		try {
+			if (this.#version !== document.version || this.#tokenizer.lineCount !== document.lineCount) {
+				this.#pendingDelivery = void 0;
+				this.#tokenizer.reset(document.getText(), { renderRange: [lineIndex, lineIndex + 1] });
+				this.#version = document.version;
+			}
+			this.#tokenizer.flush(lineIndex + 1);
+		} finally {
+			this.#capturedLines = void 0;
+			if (this.#paused) this.#tokenizer.pause();
+		}
+		if (captured.size > 0) this.#queueDelivery(captured);
+		return this.#tokenizer.getLineTokens(lineIndex).bracketIgnoredRanges;
+	}
+	prebuildStateStack() {}
+	stopBackgroundTokenize() {
+		this.pauseBackgroundTokenize();
+	}
+	pauseBackgroundTokenize() {
+		this.#paused = true;
+		this.#tokenizer.pause();
+	}
+	resumeBackgroundTokenize() {
+		this.#paused = false;
+		this.#tokenizer.resume();
+	}
+	dispose() {
+		this.#disposed = true;
+		this.#pendingDelivery = void 0;
+		this.#tokenizer.dispose();
+	}
+};
+//#endregion
+export { HighlightsEditorTokenizer };
+
+//# sourceMappingURL=highlights-editor.js.map

package/dist/highlighter/highlights-editor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"highlights-editor.js","names":[],"sources":["../../src/highlighter/highlights-editor.ts"],"sourcesContent":["import {\n  type CodeToTokensOptions as HighlightsOptions,\n  LiveTokenizer,\n  type LiveTokenizerUpdate,\n} from '@pierre/highlights';\n\nimport type { TextDocumentChange } from '../editor/textDocument';\nimport type { HighlightedToken, RenderRange } from '../types';\nimport { formatCSSVariablePrefix } from '../utils/formatCSSVariablePrefix';\nimport type { DiffsEditorTokenizer } from './DiffsEditorTokenizer';\nimport type { DiffsEditorTokenizerOptions } from './tokenizer-types';\nimport type { CodeToTokensOptions } from './types';\n\nexport class HighlightsEditorTokenizer implements DiffsEditorTokenizer {\n  #tokenizer: LiveTokenizer;\n  #version: number;\n  #disposed = false;\n  // Delivering these lines through onDeferTokenize would patch them twice.\n  #returnedRange: readonly [start: number, end: number] | undefined;\n  // Flush, edit and reset resume the lexer; reads must restore this pause.\n  #paused = false;\n  // Defer callbacks during bracket matching to avoid re-entering the renderer.\n  #capturedLines: Map<number, HighlightedToken[]> | undefined;\n  #pendingDelivery: Map<number, HighlightedToken[]> | undefined;\n\n  constructor(\n    private readonly options: DiffsEditorTokenizerOptions,\n    private readonly resolveOptions: (\n      options: CodeToTokensOptions\n    ) => HighlightsOptions\n  ) {\n    this.#version = options.textDocument.version;\n    this.#tokenizer = this.#createTokenizer();\n  }\n\n  #createTokenizer(): LiveTokenizer {\n    return new LiveTokenizer({\n      ...this.resolveOptions({\n        lang: this.options.textDocument.languageId,\n        theme: this.options.theme,\n        cssVariablePrefix: formatCSSVariablePrefix('token'),\n        tokenizeMaxLineLength: this.options.tokenizeMaxLineLength ?? 1000,\n      }),\n      code: this.options.textDocument.getText(),\n      renderRange: [0, 0],\n      onDeferTokenize: (lines) => this.#deliver(lines),\n    });\n  }\n\n  #deliver(lines: Map<number, HighlightedToken[]>): void {\n    const captured = this.#capturedLines;\n    if (captured != null) {\n      for (const [line, tokens] of lines) captured.set(line, tokens);\n      return;\n    }\n    const range = this.#returnedRange;\n    if (range != null) {\n      for (const line of lines.keys()) {\n        if (line >= range[0] && line < range[1]) lines.delete(line);\n      }\n      if (lines.size === 0) return;\n    }\n    this.options.onDeferTokenize(lines);\n  }\n\n  // Wait until bracket matching returns before patching rows. Edits, resets\n  // and theme changes discard the batch because its tokens may be stale.\n  #queueDelivery(lines: Map<number, HighlightedToken[]>): void {\n    const pending = this.#pendingDelivery;\n    if (pending != null) {\n      for (const [line, tokens] of lines) pending.set(line, tokens);\n      return;\n    }\n    this.#pendingDelivery = lines;\n    queueMicrotask(() => {\n      const batch = this.#pendingDelivery;\n      this.#pendingDelivery = undefined;\n      if (batch != null && batch.size > 0 && !this.#disposed)\n        this.options.onDeferTokenize(batch);\n    });\n  }\n\n  tokenize(\n    change: TextDocumentChange,\n    renderRange?: RenderRange,\n    hostRealignsRows = false\n  ): Map<number, HighlightedToken[]> {\n    const document = this.options.textDocument;\n    const start = Math.min(renderRange?.startingLine ?? 0, document.lineCount);\n    const end = Math.min(\n      start + (renderRange?.totalLines ?? Infinity),\n      document.lineCount\n    );\n    const returnedStart = Math.max(start, change.startLine);\n    // Edits, resets and flushes all resume the native background work.\n    this.#paused = false;\n    let lines: Map<number, HighlightedToken[]>;\n    if (this.#version !== document.version) {\n      this.#pendingDelivery = undefined;\n      lines = this.#syncDocument(change, [start, end]).lines;\n      this.#version = document.version;\n    } else if (this.#tokenizer.lineCount !== document.lineCount) {\n      this.#pendingDelivery = undefined;\n      lines = this.#tokenizer.reset(document.getText(), {\n        renderRange: [start, end],\n      }).lines;\n    } else {\n      lines = new Map();\n      this.#readLines(lines, returnedStart, end);\n      if (this.#pendingDelivery != null) {\n        for (const line of lines.keys()) this.#pendingDelivery.delete(line);\n      }\n      return lines;\n    }\n    // Balanced insert/delete batches shift rows without triggering host realignment.\n    // Other structural edits need the suffix only when the host does not move rows.\n    if (\n      change.lineDelta === 0\n        ? (change.changedLineChanges?.some(\n            ([, , lineDelta]) => lineDelta !== 0\n          ) ?? false)\n        : !hostRealignsRows\n    ) {\n      this.#readLines(lines, returnedStart, end);\n    }\n    return lines;\n  }\n\n  // Reload the lexer document if edits were skipped or combined; applying\n  // them to stale text can produce incorrect tokens or out-of-range reads.\n  #syncDocument(\n    change: TextDocumentChange,\n    renderRange: readonly [start: number, end: number]\n  ): LiveTokenizerUpdate {\n    const document = this.options.textDocument;\n    const options = { renderRange };\n    if (\n      Math.abs(document.version - this.#version) === 1 &&\n      change.changes.length > 0 &&\n      this.#tokenizer.lineCount === change.previousLineCount\n    ) {\n      try {\n        const update = this.#tokenizer.applyEdits(\n          change.changes.map(({ range, text }) => ({ range, newText: text })),\n          options\n        );\n        if (this.#tokenizer.lineCount === document.lineCount) return update;\n      } catch (error) {\n        // Out-of-range edits require a reload; other errors must propagate.\n        if (!(error instanceof RangeError)) throw error;\n      }\n    }\n    return this.#tokenizer.reset(document.getText(), options);\n  }\n\n  // Flushing may complete lines outside [from, to); deliver those by callback.\n  #readLines(\n    lines: Map<number, HighlightedToken[]>,\n    from: number,\n    to: number\n  ): void {\n    this.#returnedRange = [from, to];\n    try {\n      this.#tokenizer.flush(to);\n    } finally {\n      this.#returnedRange = undefined;\n    }\n    for (let line = from; line < to; line++) {\n      if (lines.has(line)) continue;\n      const { tokens } = this.#tokenizer.getLineTokens(line);\n      lines.set(\n        line,\n        tokens.length === 0\n          ? [[0, '', '']]\n          : tokens.map((token) => [\n              token.offset,\n              token.color ?? '',\n              token.content,\n            ])\n      );\n    }\n  }\n\n  setTheme(themeName: string): void {\n    if (themeName === this.options.theme) return;\n    this.options.theme = themeName;\n    this.#tokenizer.dispose();\n    this.#pendingDelivery = undefined;\n    this.#paused = false;\n    this.#version = this.options.textDocument.version;\n    this.#tokenizer = this.#createTokenizer();\n  }\n\n  getStringCommentRegexpRangesInLine(\n    lineIndex: number\n  ): [number, number][] | null {\n    const document = this.options.textDocument;\n    if (\n      this.options.matchBrackets === false ||\n      lineIndex < 0 ||\n      lineIndex >= document.lineCount\n    )\n      return null;\n    // Reset and flush resume background work and invoke callbacks immediately.\n    // Defer those callbacks and restore any pause before returning.\n    const captured = new Map<number, HighlightedToken[]>();\n    this.#capturedLines = captured;\n    try {\n      // Bracket matching can precede rendering. Record the reloaded version\n      // so the next render does not apply the same edits again.\n      if (\n        this.#version !== document.version ||\n        this.#tokenizer.lineCount !== document.lineCount\n      ) {\n        this.#pendingDelivery = undefined;\n        this.#tokenizer.reset(document.getText(), {\n          renderRange: [lineIndex, lineIndex + 1],\n        });\n        this.#version = document.version;\n      }\n      this.#tokenizer.flush(lineIndex + 1);\n    } finally {\n      this.#capturedLines = undefined;\n      if (this.#paused) this.#tokenizer.pause();\n    }\n    if (captured.size > 0) this.#queueDelivery(captured);\n    return this.#tokenizer.getLineTokens(lineIndex).bracketIgnoredRanges;\n  }\n\n  // Rendering calls this while background tokenization may be paused; do not resume it.\n  prebuildStateStack(): void {}\n  stopBackgroundTokenize(): void {\n    this.pauseBackgroundTokenize();\n  }\n  pauseBackgroundTokenize(): void {\n    this.#paused = true;\n    this.#tokenizer.pause();\n  }\n  resumeBackgroundTokenize(): void {\n    this.#paused = false;\n    this.#tokenizer.resume();\n  }\n  dispose(): void {\n    this.#disposed = true;\n    this.#pendingDelivery = undefined;\n    this.#tokenizer.dispose();\n  }\n}\n"],"mappings":";;;AAaA,IAAa,4BAAb,MAAuE;CAalD;CACA;CAbnB;CACA;CACA,YAAY;CAEZ;CAEA,UAAU;CAEV;CACA;CAEA,YACE,SACA,gBAGA;EAJiB,KAAA,UAAA;EACA,KAAA,iBAAA;EAIjB,KAAK,WAAW,QAAQ,aAAa;EACrC,KAAK,aAAa,KAAK,iBAAiB;CAC1C;CAEA,mBAAkC;EAChC,OAAO,IAAI,cAAc;GACvB,GAAG,KAAK,eAAe;IACrB,MAAM,KAAK,QAAQ,aAAa;IAChC,OAAO,KAAK,QAAQ;IACpB,mBAAmB,wBAAwB,OAAO;IAClD,uBAAuB,KAAK,QAAQ,yBAAyB;GAC/D,CAAC;GACD,MAAM,KAAK,QAAQ,aAAa,QAAQ;GACxC,aAAa,CAAC,GAAG,CAAC;GAClB,kBAAkB,UAAU,KAAK,SAAS,KAAK;EACjD,CAAC;CACH;CAEA,SAAS,OAA8C;EACrD,MAAM,WAAW,KAAK;EACtB,IAAI,YAAY,MAAM;GACpB,KAAK,MAAM,CAAC,MAAM,WAAW,OAAO,SAAS,IAAI,MAAM,MAAM;GAC7D;EACF;EACA,MAAM,QAAQ,KAAK;EACnB,IAAI,SAAS,MAAM;GACjB,KAAK,MAAM,QAAQ,MAAM,KAAK,GAC5B,IAAI,QAAQ,MAAM,MAAM,OAAO,MAAM,IAAI,MAAM,OAAO,IAAI;GAE5D,IAAI,MAAM,SAAS,GAAG;EACxB;EACA,KAAK,QAAQ,gBAAgB,KAAK;CACpC;CAIA,eAAe,OAA8C;EAC3D,MAAM,UAAU,KAAK;EACrB,IAAI,WAAW,MAAM;GACnB,KAAK,MAAM,CAAC,MAAM,WAAW,OAAO,QAAQ,IAAI,MAAM,MAAM;GAC5D;EACF;EACA,KAAK,mBAAmB;EACxB,qBAAqB;GACnB,MAAM,QAAQ,KAAK;GACnB,KAAK,mBAAmB,KAAA;GACxB,IAAI,SAAS,QAAQ,MAAM,OAAO,KAAK,CAAC,KAAK,WAC3C,KAAK,QAAQ,gBAAgB,KAAK;EACtC,CAAC;CACH;CAEA,SACE,QACA,aACA,mBAAmB,OACc;EACjC,MAAM,WAAW,KAAK,QAAQ;EAC9B,MAAM,QAAQ,KAAK,IAAI,aAAa,gBAAgB,GAAG,SAAS,SAAS;EACzE,MAAM,MAAM,KAAK,IACf,SAAS,aAAa,cAAc,WACpC,SAAS,SACX;EACA,MAAM,gBAAgB,KAAK,IAAI,OAAO,OAAO,SAAS;EAEtD,KAAK,UAAU;EACf,IAAI;EACJ,IAAI,KAAK,aAAa,SAAS,SAAS;GACtC,KAAK,mBAAmB,KAAA;GACxB,QAAQ,KAAK,cAAc,QAAQ,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;GACjD,KAAK,WAAW,SAAS;EAC3B,OAAO,IAAI,KAAK,WAAW,cAAc,SAAS,WAAW;GAC3D,KAAK,mBAAmB,KAAA;GACxB,QAAQ,KAAK,WAAW,MAAM,SAAS,QAAQ,GAAG,EAChD,aAAa,CAAC,OAAO,GAAG,EAC1B,CAAC,CAAC,CAAC;EACL,OAAO;GACL,wBAAQ,IAAI,IAAI;GAChB,KAAK,WAAW,OAAO,eAAe,GAAG;GACzC,IAAI,KAAK,oBAAoB,MAC3B,KAAK,MAAM,QAAQ,MAAM,KAAK,GAAG,KAAK,iBAAiB,OAAO,IAAI;GAEpE,OAAO;EACT;EAGA,IACE,OAAO,cAAc,IAChB,OAAO,oBAAoB,MACzB,KAAK,eAAe,cAAc,CACrC,KAAK,QACL,CAAC,kBAEL,KAAK,WAAW,OAAO,eAAe,GAAG;EAE3C,OAAO;CACT;CAIA,cACE,QACA,aACqB;EACrB,MAAM,WAAW,KAAK,QAAQ;EAC9B,MAAM,UAAU,EAAE,YAAY;EAC9B,IACE,KAAK,IAAI,SAAS,UAAU,KAAK,QAAQ,MAAM,KAC/C,OAAO,QAAQ,SAAS,KACxB,KAAK,WAAW,cAAc,OAAO,mBAErC,IAAI;GACF,MAAM,SAAS,KAAK,WAAW,WAC7B,OAAO,QAAQ,KAAK,EAAE,OAAO,YAAY;IAAE;IAAO,SAAS;GAAK,EAAE,GAClE,OACF;GACA,IAAI,KAAK,WAAW,cAAc,SAAS,WAAW,OAAO;EAC/D,SAAS,OAAO;GAEd,IAAI,EAAE,iBAAiB,aAAa,MAAM;EAC5C;EAEF,OAAO,KAAK,WAAW,MAAM,SAAS,QAAQ,GAAG,OAAO;CAC1D;CAGA,WACE,OACA,MACA,IACM;EACN,KAAK,iBAAiB,CAAC,MAAM,EAAE;EAC/B,IAAI;GACF,KAAK,WAAW,MAAM,EAAE;EAC1B,UAAU;GACR,KAAK,iBAAiB,KAAA;EACxB;EACA,KAAK,IAAI,OAAO,MAAM,OAAO,IAAI,QAAQ;GACvC,IAAI,MAAM,IAAI,IAAI,GAAG;GACrB,MAAM,EAAE,WAAW,KAAK,WAAW,cAAc,IAAI;GACrD,MAAM,IACJ,MACA,OAAO,WAAW,IACd,CAAC;IAAC;IAAG;IAAI;GAAE,CAAC,IACZ,OAAO,KAAK,UAAU;IACpB,MAAM;IACN,MAAM,SAAS;IACf,MAAM;GACR,CAAC,CACP;EACF;CACF;CAEA,SAAS,WAAyB;EAChC,IAAI,cAAc,KAAK,QAAQ,OAAO;EACtC,KAAK,QAAQ,QAAQ;EACrB,KAAK,WAAW,QAAQ;EACxB,KAAK,mBAAmB,KAAA;EACxB,KAAK,UAAU;EACf,KAAK,WAAW,KAAK,QAAQ,aAAa;EAC1C,KAAK,aAAa,KAAK,iBAAiB;CAC1C;CAEA,mCACE,WAC2B;EAC3B,MAAM,WAAW,KAAK,QAAQ;EAC9B,IACE,KAAK,QAAQ,kBAAkB,SAC/B,YAAY,KACZ,aAAa,SAAS,WAEtB,OAAO;EAGT,MAAM,2BAAW,IAAI,IAAgC;EACrD,KAAK,iBAAiB;EACtB,IAAI;GAGF,IACE,KAAK,aAAa,SAAS,WAC3B,KAAK,WAAW,cAAc,SAAS,WACvC;IACA,KAAK,mBAAmB,KAAA;IACxB,KAAK,WAAW,MAAM,SAAS,QAAQ,GAAG,EACxC,aAAa,CAAC,WAAW,YAAY,CAAC,EACxC,CAAC;IACD,KAAK,WAAW,SAAS;GAC3B;GACA,KAAK,WAAW,MAAM,YAAY,CAAC;EACrC,UAAU;GACR,KAAK,iBAAiB,KAAA;GACtB,IAAI,KAAK,SAAS,KAAK,WAAW,MAAM;EAC1C;EACA,IAAI,SAAS,OAAO,GAAG,KAAK,eAAe,QAAQ;EACnD,OAAO,KAAK,WAAW,cAAc,SAAS,CAAC,CAAC;CAClD;CAGA,qBAA2B,CAAC;CAC5B,yBAA+B;EAC7B,KAAK,wBAAwB;CAC/B;CACA,0BAAgC;EAC9B,KAAK,UAAU;EACf,KAAK,WAAW,MAAM;CACxB;CACA,2BAAiC;EAC/B,KAAK,UAAU;EACf,KAAK,WAAW,OAAO;CACzB;CACA,UAAgB;EACd,KAAK,YAAY;EACjB,KAAK,mBAAmB,KAAA;EACxB,KAAK,WAAW,QAAQ;CAC1B;AACF"}

package/dist/highlighter/highlights-stream.d.ts

@@ -0,0 +1,20 @@
+import { ThemedToken } from "./types.js";
+import { BaseStreamTokenizer } from "./stream-tokenizer.js";
+import { CodeToTokensOptions } from "@pierre/highlights";
+//#region src/highlighter/highlights-stream.d.ts
+/** Keeps the unfinished line editable so new chunks can recall provisional tokens. */
+declare class HighlightsStreamTokenizer extends BaseStreamTokenizer {
+  #private;
+  private readonly options;
+  constructor(options: CodeToTokensOptions);
+  protected tokenizeChunk(chunk: string, stable: ThemedToken[]): {
+    unstable: ThemedToken[];
+    tailLength: number;
+  };
+  clone(): HighlightsStreamTokenizer;
+  protected resetSource(): void;
+  protected releaseSource(): void;
+}
+//#endregion
+export { HighlightsStreamTokenizer };
+//# sourceMappingURL=highlights-stream.d.ts.map

package/dist/highlighter/highlights-stream.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"highlights-stream.d.ts","names":[],"sources":["../../src/highlighter/highlights-stream.ts"],"mappings":";;;;;cAWa,kCAAkC;;mBAIhB;EAA7B,YAA6B,SAAS;YAK5B,cACR,eACA,QAAQ;IACL,UAAU;IAAe;;EA0D9B,SAAS;YAQC;YAKA"}

package/dist/highlighter/highlights-stream.js

@@ -0,0 +1,93 @@
+import { appendItems } from "../utils/appendItems.js";
+import { BaseStreamTokenizer } from "./stream-tokenizer.js";
+import { LiveTokenizer } from "@pierre/highlights";
+//#region src/highlighter/highlights-stream.ts
+const TRIM_LINE_COUNT = 1024;
+const DOCUMENT_START = {
+	line: 0,
+	character: 0
+};
+/** Keeps the unfinished line editable so new chunks can recall provisional tokens. */
+var HighlightsStreamTokenizer = class HighlightsStreamTokenizer extends BaseStreamTokenizer {
+	options;
+	#tokenizer;
+	#trimLineCount = TRIM_LINE_COUNT;
+	constructor(options) {
+		super();
+		this.options = options;
+		this.#tokenizer = new LiveTokenizer(options);
+	}
+	tokenizeChunk(chunk, stable) {
+		const lineBreaks = [...chunk.matchAll(/\r\n|\r|\n/g)];
+		const startLine = this.#tokenizer.lineCount - 1;
+		const position = {
+			line: startLine,
+			character: this.#tokenizer.getLineLength(startLine)
+		};
+		this.#tokenizer.applyEdits([{
+			range: {
+				start: position,
+				end: position
+			},
+			newText: chunk
+		}]);
+		const lastLine = this.#tokenizer.lineCount - 1;
+		let unstable = [];
+		for (let line = startLine; line <= lastLine; line++) {
+			const { tokens } = this.#tokenizer.getLineTokens(line);
+			for (const token of tokens) token.offset += this.stableOffset;
+			if (line < lastLine) {
+				appendItems(stable, tokens);
+				this.pushLineBreak(stable, this.#tokenizer.getLineLength(line), lineBreaks[line - startLine][0]);
+			} else unstable = tokens;
+		}
+		const tailLength = this.#tokenizer.getLineLength(lastLine);
+		if (lastLine > this.#trimLineCount) {
+			const text = this.#tokenizer.getText();
+			const { lineChanges } = this.#tokenizer.applyEdits([{
+				range: {
+					start: DOCUMENT_START,
+					end: {
+						line: lastLine - 1,
+						character: 0
+					}
+				},
+				newText: ""
+			}]);
+			if (lineChanges.every((change) => change.newEndLine <= 1)) this.#trimLineCount = TRIM_LINE_COUNT;
+			else {
+				const keptLength = this.#tokenizer.getText().length;
+				this.#tokenizer.applyEdits([{
+					range: {
+						start: DOCUMENT_START,
+						end: DOCUMENT_START
+					},
+					newText: text.slice(0, text.length - keptLength)
+				}]);
+				this.#trimLineCount = lastLine * 2;
+			}
+		}
+		return {
+			unstable,
+			tailLength
+		};
+	}
+	clone() {
+		this.assertActive();
+		const clone = new HighlightsStreamTokenizer(this.options);
+		clone.#tokenizer.reset(this.#tokenizer.getText());
+		this.copyStateTo(clone);
+		return clone;
+	}
+	resetSource() {
+		this.#tokenizer.reset("");
+		this.#trimLineCount = TRIM_LINE_COUNT;
+	}
+	releaseSource() {
+		this.#tokenizer.dispose();
+	}
+};
+//#endregion
+export { HighlightsStreamTokenizer };
+
+//# sourceMappingURL=highlights-stream.js.map

package/dist/highlighter/highlights-stream.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"highlights-stream.js","names":[],"sources":["../../src/highlighter/highlights-stream.ts"],"sourcesContent":["import { type CodeToTokensOptions, LiveTokenizer } from '@pierre/highlights';\n\nimport { appendItems } from '../utils/appendItems';\nimport { BaseStreamTokenizer } from './stream-tokenizer';\nimport type { ThemedToken } from './types';\n\n// Completed lines the tokenizer keeps before it tries to drop older ones.\nconst TRIM_LINE_COUNT = 1024;\nconst DOCUMENT_START = { line: 0, character: 0 };\n\n/** Keeps the unfinished line editable so new chunks can recall provisional tokens. */\nexport class HighlightsStreamTokenizer extends BaseStreamTokenizer {\n  #tokenizer: LiveTokenizer;\n  #trimLineCount = TRIM_LINE_COUNT;\n\n  constructor(private readonly options: CodeToTokensOptions) {\n    super();\n    this.#tokenizer = new LiveTokenizer(options);\n  }\n\n  protected tokenizeChunk(\n    chunk: string,\n    stable: ThemedToken[]\n  ): { unstable: ThemedToken[]; tailLength: number } {\n    const lineBreaks = [...chunk.matchAll(/\\r\\n|\\r|\\n/g)];\n    const startLine = this.#tokenizer.lineCount - 1;\n    const position = {\n      line: startLine,\n      character: this.#tokenizer.getLineLength(startLine),\n    };\n    this.#tokenizer.applyEdits([\n      { range: { start: position, end: position }, newText: chunk },\n    ]);\n    const lastLine = this.#tokenizer.lineCount - 1;\n    let unstable: ThemedToken[] = [];\n    for (let line = startLine; line <= lastLine; line++) {\n      const { tokens } = this.#tokenizer.getLineTokens(line);\n      for (const token of tokens) token.offset += this.stableOffset;\n      if (line < lastLine) {\n        appendItems(stable, tokens);\n        this.pushLineBreak(\n          stable,\n          this.#tokenizer.getLineLength(line),\n          lineBreaks[line - startLine][0]\n        );\n      } else {\n        unstable = tokens;\n      }\n    }\n    const tailLength = this.#tokenizer.getLineLength(lastLine);\n    if (lastLine > this.#trimLineCount) {\n      // Warning: keep the last completed line. Lexed from the initial state,\n      // it must end in its old state, or the unfinished line would be lexed\n      // from the wrong state; then restore the dropped lines.\n      const text = this.#tokenizer.getText();\n      const { lineChanges } = this.#tokenizer.applyEdits([\n        {\n          range: {\n            start: DOCUMENT_START,\n            end: { line: lastLine - 1, character: 0 },\n          },\n          newText: '',\n        },\n      ]);\n      if (lineChanges.every((change) => change.newEndLine <= 1)) {\n        this.#trimLineCount = TRIM_LINE_COUNT;\n      } else {\n        const keptLength = this.#tokenizer.getText().length;\n        this.#tokenizer.applyEdits([\n          {\n            range: { start: DOCUMENT_START, end: DOCUMENT_START },\n            newText: text.slice(0, text.length - keptLength),\n          },\n        ]);\n        // Retry after the window doubles, such as inside a long comment.\n        this.#trimLineCount = lastLine * 2;\n      }\n    }\n    return { unstable, tailLength };\n  }\n\n  clone(): HighlightsStreamTokenizer {\n    this.assertActive();\n    const clone = new HighlightsStreamTokenizer(this.options);\n    clone.#tokenizer.reset(this.#tokenizer.getText());\n    this.copyStateTo(clone);\n    return clone;\n  }\n\n  protected resetSource(): void {\n    this.#tokenizer.reset('');\n    this.#trimLineCount = TRIM_LINE_COUNT;\n  }\n\n  protected releaseSource(): void {\n    this.#tokenizer.dispose();\n  }\n}\n"],"mappings":";;;;AAOA,MAAM,kBAAkB;AACxB,MAAM,iBAAiB;CAAE,MAAM;CAAG,WAAW;AAAE;;AAG/C,IAAa,4BAAb,MAAa,kCAAkC,oBAAoB;CAIpC;CAH7B;CACA,iBAAiB;CAEjB,YAAY,SAA+C;EACzD,MAAM;EADqB,KAAA,UAAA;EAE3B,KAAK,aAAa,IAAI,cAAc,OAAO;CAC7C;CAEA,cACE,OACA,QACiD;EACjD,MAAM,aAAa,CAAC,GAAG,MAAM,SAAS,aAAa,CAAC;EACpD,MAAM,YAAY,KAAK,WAAW,YAAY;EAC9C,MAAM,WAAW;GACf,MAAM;GACN,WAAW,KAAK,WAAW,cAAc,SAAS;EACpD;EACA,KAAK,WAAW,WAAW,CACzB;GAAE,OAAO;IAAE,OAAO;IAAU,KAAK;GAAS;GAAG,SAAS;EAAM,CAC9D,CAAC;EACD,MAAM,WAAW,KAAK,WAAW,YAAY;EAC7C,IAAI,WAA0B,CAAC;EAC/B,KAAK,IAAI,OAAO,WAAW,QAAQ,UAAU,QAAQ;GACnD,MAAM,EAAE,WAAW,KAAK,WAAW,cAAc,IAAI;GACrD,KAAK,MAAM,SAAS,QAAQ,MAAM,UAAU,KAAK;GACjD,IAAI,OAAO,UAAU;IACnB,YAAY,QAAQ,MAAM;IAC1B,KAAK,cACH,QACA,KAAK,WAAW,cAAc,IAAI,GAClC,WAAW,OAAO,UAAU,CAAC,EAC/B;GACF,OACE,WAAW;EAEf;EACA,MAAM,aAAa,KAAK,WAAW,cAAc,QAAQ;EACzD,IAAI,WAAW,KAAK,gBAAgB;GAIlC,MAAM,OAAO,KAAK,WAAW,QAAQ;GACrC,MAAM,EAAE,gBAAgB,KAAK,WAAW,WAAW,CACjD;IACE,OAAO;KACL,OAAO;KACP,KAAK;MAAE,MAAM,WAAW;MAAG,WAAW;KAAE;IAC1C;IACA,SAAS;GACX,CACF,CAAC;GACD,IAAI,YAAY,OAAO,WAAW,OAAO,cAAc,CAAC,GACtD,KAAK,iBAAiB;QACjB;IACL,MAAM,aAAa,KAAK,WAAW,QAAQ,CAAC,CAAC;IAC7C,KAAK,WAAW,WAAW,CACzB;KACE,OAAO;MAAE,OAAO;MAAgB,KAAK;KAAe;KACpD,SAAS,KAAK,MAAM,GAAG,KAAK,SAAS,UAAU;IACjD,CACF,CAAC;IAED,KAAK,iBAAiB,WAAW;GACnC;EACF;EACA,OAAO;GAAE;GAAU;EAAW;CAChC;CAEA,QAAmC;EACjC,KAAK,aAAa;EAClB,MAAM,QAAQ,IAAI,0BAA0B,KAAK,OAAO;EACxD,MAAM,WAAW,MAAM,KAAK,WAAW,QAAQ,CAAC;EAChD,KAAK,YAAY,KAAK;EACtB,OAAO;CACT;CAEA,cAA8B;EAC5B,KAAK,WAAW,MAAM,EAAE;EACxB,KAAK,iBAAiB;CACxB;CAEA,gBAAgC;EAC9B,KAAK,WAAW,QAAQ;CAC1B;AACF"}

package/dist/highlighter/languages/areLanguagesAttached.d.ts

@@ -1,6 +1,7 @@
+import { DiffsHighlighter } from "../DiffsHighlighter.js";
 import { SupportedLanguages } from "../../types.js";
 //#region src/highlighter/languages/areLanguagesAttached.d.ts
-declare function areLanguagesAttached(languages: SupportedLanguages | SupportedLanguages[]): boolean;
+declare function areLanguagesAttached(languages: SupportedLanguages | SupportedLanguages[], highlighter?: DiffsHighlighter): boolean;
 //#endregion
 export { areLanguagesAttached };
 //# sourceMappingURL=areLanguagesAttached.d.ts.map

package/dist/highlighter/languages/areLanguagesAttached.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"areLanguagesAttached.d.ts","names":[],"sources":["../../../src/highlighter/languages/areLanguagesAttached.ts"],"mappings":";;iBAGgB,qBACd,WAAW,qBAAqB"}
+{"version":3,"file":"areLanguagesAttached.d.ts","names":[],"sources":["../../../src/highlighter/languages/areLanguagesAttached.ts"],"mappings":";;;iBAGgB,qBACd,WAAW,qBAAqB,sBAChC,cAAc"}

package/dist/highlighter/languages/areLanguagesAttached.js

@@ -1,11 +1,9 @@
 import { AttachedLanguages } from "./constants.js";
 //#region src/highlighter/languages/areLanguagesAttached.ts
-function areLanguagesAttached(languages) {
-	for (const language of Array.isArray(languages) ? languages : [languages]) {
-		if (language === "text" || language === "ansi") continue;
-		if (!AttachedLanguages.has(language)) return false;
-	}
-	return true;
+function areLanguagesAttached(languages, highlighter) {
+	const names = Array.isArray(languages) ? languages : [languages];
+	if (highlighter != null) return highlighter.hasLoadedLanguages(names);
+	return names.every((name) => name === "text" || name === "ansi" || AttachedLanguages.has(name));
 }
 //#endregion
 export { areLanguagesAttached };

package/dist/highlighter/languages/areLanguagesAttached.js.map

@@ -1 +1 @@
-{"version":3,"file":"areLanguagesAttached.js","names":[],"sources":["../../../src/highlighter/languages/areLanguagesAttached.ts"],"sourcesContent":["import type { SupportedLanguages } from '../../types';\nimport { AttachedLanguages } from './constants';\n\nexport function areLanguagesAttached(\n  languages: SupportedLanguages | SupportedLanguages[]\n): boolean {\n  for (const language of Array.isArray(languages) ? languages : [languages]) {\n    if (language === 'text' || language === 'ansi') {\n      continue;\n    }\n    if (!AttachedLanguages.has(language)) {\n      return false;\n    }\n  }\n  return true;\n}\n"],"mappings":";;AAGA,SAAgB,qBACd,WACS;CACT,KAAK,MAAM,YAAY,MAAM,QAAQ,SAAS,IAAI,YAAY,CAAC,SAAS,GAAG;EACzE,IAAI,aAAa,UAAU,aAAa,QACtC;EAEF,IAAI,CAAC,kBAAkB,IAAI,QAAQ,GACjC,OAAO;CAEX;CACA,OAAO;AACT"}
+{"version":3,"file":"areLanguagesAttached.js","names":[],"sources":["../../../src/highlighter/languages/areLanguagesAttached.ts"],"sourcesContent":["import type { DiffsHighlighter, SupportedLanguages } from '../../types';\nimport { AttachedLanguages } from './constants';\n\nexport function areLanguagesAttached(\n  languages: SupportedLanguages | SupportedLanguages[],\n  highlighter?: DiffsHighlighter\n): boolean {\n  const names = Array.isArray(languages) ? languages : [languages];\n  if (highlighter != null) {\n    return highlighter.hasLoadedLanguages(names);\n  }\n  return names.every(\n    (name) => name === 'text' || name === 'ansi' || AttachedLanguages.has(name)\n  );\n}\n"],"mappings":";;AAGA,SAAgB,qBACd,WACA,aACS;CACT,MAAM,QAAQ,MAAM,QAAQ,SAAS,IAAI,YAAY,CAAC,SAAS;CAC/D,IAAI,eAAe,MACjB,OAAO,YAAY,mBAAmB,KAAK;CAE7C,OAAO,MAAM,OACV,SAAS,SAAS,UAAU,SAAS,UAAU,kBAAkB,IAAI,IAAI,CAC5E;AACF"}

package/dist/highlighter/languages/attachResolvedLanguages.d.ts

@@ -1,7 +1,12 @@
-import { DiffsHighlighter } from "../../types.js";
 import { ResolvedLanguage } from "../../worker/types.js";
+import { DiffsHighlighter } from "../DiffsHighlighter.js";
+import "../../types.js";
 import "../../worker/index.js";
 //#region src/highlighter/languages/attachResolvedLanguages.d.ts
+/**
+ * Record resolved grammars in the shared language cache and attach them to a
+ * highlighter. Highlights bundles its lexers and ignores the grammars.
+ */
 declare function attachResolvedLanguages(resolvedLanguages: ResolvedLanguage | ResolvedLanguage[], highlighter: DiffsHighlighter): void;
 //#endregion
 export { attachResolvedLanguages };

package/dist/highlighter/languages/attachResolvedLanguages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"attachResolvedLanguages.d.ts","names":[],"sources":["../../../src/highlighter/languages/attachResolvedLanguages.ts"],"mappings":";;;;iBAIgB,wBACd,mBAAmB,mBAAmB,oBACtC,aAAa"}
+{"version":3,"file":"attachResolvedLanguages.d.ts","names":[],"sources":["../../../src/highlighter/languages/attachResolvedLanguages.ts"],"mappings":";;;;;;;;;iBAQgB,wBACd,mBAAmB,mBAAmB,oBACtC,aAAa"}

package/dist/highlighter/languages/attachResolvedLanguages.js

@@ -1,22 +1,17 @@
 import { AttachedLanguages, ResolvedLanguages } from "./constants.js";
 //#region src/highlighter/languages/attachResolvedLanguages.ts
+/**
+* Record resolved grammars in the shared language cache and attach them to a
+* highlighter. Highlights bundles its lexers and ignores the grammars.
+*/
 function attachResolvedLanguages(resolvedLanguages, highlighter) {
-	resolvedLanguages = Array.isArray(resolvedLanguages) ? resolvedLanguages : [resolvedLanguages];
-	for (const resolvedLang of resolvedLanguages) {
-		if (AttachedLanguages.has(resolvedLang.name)) continue;
+	for (const resolvedLang of Array.isArray(resolvedLanguages) ? resolvedLanguages : [resolvedLanguages]) {
 		let lang = ResolvedLanguages.get(resolvedLang.name);
 		if (lang == null) {
 			lang = resolvedLang;
 			ResolvedLanguages.set(resolvedLang.name, lang);
 		}
-		const grammar = lang.data.find((grammar) => grammar.name === lang.name || grammar.aliases?.includes(lang.name) === true);
-		if (grammar == null) throw new Error(`attachResolvedLanguages: No returned grammar declares "${lang.name}" as its name or an alias.`);
-		highlighter.loadLanguageSync(lang.data);
-		try {
-			highlighter.getLanguage(lang.name);
-		} catch {
-			throw new Error(`attachResolvedLanguages: "${grammar.name}" is already loaded without alias "${lang.name}". Load the alias first or give the grammar a unique name.`);
-		}
+		highlighter.attachLanguages([lang]);
 		AttachedLanguages.add(lang.name);
 	}
 }

package/dist/highlighter/languages/attachResolvedLanguages.js.map

@@ -1 +1 @@
-{"version":3,"file":"attachResolvedLanguages.js","names":[],"sources":["../../../src/highlighter/languages/attachResolvedLanguages.ts"],"sourcesContent":["import type { DiffsHighlighter } from '../../types';\nimport type { ResolvedLanguage } from '../../worker';\nimport { AttachedLanguages, ResolvedLanguages } from './constants';\n\nexport function attachResolvedLanguages(\n  resolvedLanguages: ResolvedLanguage | ResolvedLanguage[],\n  highlighter: DiffsHighlighter\n): void {\n  resolvedLanguages = Array.isArray(resolvedLanguages)\n    ? resolvedLanguages\n    : [resolvedLanguages];\n\n  for (const resolvedLang of resolvedLanguages) {\n    if (AttachedLanguages.has(resolvedLang.name)) continue;\n    let lang = ResolvedLanguages.get(resolvedLang.name);\n    if (lang == null) {\n      lang = resolvedLang;\n      ResolvedLanguages.set(resolvedLang.name, lang);\n    }\n    const grammar = lang.data.find(\n      (grammar) =>\n        grammar.name === lang.name ||\n        grammar.aliases?.includes(lang.name) === true\n    );\n    if (grammar == null) {\n      throw new Error(\n        `attachResolvedLanguages: No returned grammar declares \"${lang.name}\" as its name or an alias.`\n      );\n    }\n    highlighter.loadLanguageSync(lang.data);\n    // Shiki can skip an already-loaded grammar, including any newly added aliases.\n    try {\n      highlighter.getLanguage(lang.name);\n    } catch {\n      throw new Error(\n        `attachResolvedLanguages: \"${grammar.name}\" is already loaded without alias \"${lang.name}\". Load the alias first or give the grammar a unique name.`\n      );\n    }\n    AttachedLanguages.add(lang.name);\n  }\n}\n"],"mappings":";;AAIA,SAAgB,wBACd,mBACA,aACM;CACN,oBAAoB,MAAM,QAAQ,iBAAiB,IAC/C,oBACA,CAAC,iBAAiB;CAEtB,KAAK,MAAM,gBAAgB,mBAAmB;EAC5C,IAAI,kBAAkB,IAAI,aAAa,IAAI,GAAG;EAC9C,IAAI,OAAO,kBAAkB,IAAI,aAAa,IAAI;EAClD,IAAI,QAAQ,MAAM;GAChB,OAAO;GACP,kBAAkB,IAAI,aAAa,MAAM,IAAI;EAC/C;EACA,MAAM,UAAU,KAAK,KAAK,MACvB,YACC,QAAQ,SAAS,KAAK,QACtB,QAAQ,SAAS,SAAS,KAAK,IAAI,MAAM,IAC7C;EACA,IAAI,WAAW,MACb,MAAM,IAAI,MACR,0DAA0D,KAAK,KAAK,2BACtE;EAEF,YAAY,iBAAiB,KAAK,IAAI;EAEtC,IAAI;GACF,YAAY,YAAY,KAAK,IAAI;EACnC,QAAQ;GACN,MAAM,IAAI,MACR,6BAA6B,QAAQ,KAAK,qCAAqC,KAAK,KAAK,2DAC3F;EACF;EACA,kBAAkB,IAAI,KAAK,IAAI;CACjC;AACF"}
+{"version":3,"file":"attachResolvedLanguages.js","names":[],"sources":["../../../src/highlighter/languages/attachResolvedLanguages.ts"],"sourcesContent":["import type { DiffsHighlighter } from '../../types';\nimport type { ResolvedLanguage } from '../../worker';\nimport { AttachedLanguages, ResolvedLanguages } from './constants';\n\n/**\n * Record resolved grammars in the shared language cache and attach them to a\n * highlighter. Highlights bundles its lexers and ignores the grammars.\n */\nexport function attachResolvedLanguages(\n  resolvedLanguages: ResolvedLanguage | ResolvedLanguage[],\n  highlighter: DiffsHighlighter\n): void {\n  for (const resolvedLang of Array.isArray(resolvedLanguages)\n    ? resolvedLanguages\n    : [resolvedLanguages]) {\n    // The first resolution of a name wins so every instance and worker\n    // attaches the same grammar data for it.\n    let lang = ResolvedLanguages.get(resolvedLang.name);\n    if (lang == null) {\n      lang = resolvedLang;\n      ResolvedLanguages.set(resolvedLang.name, lang);\n    }\n    highlighter.attachLanguages([lang]);\n    AttachedLanguages.add(lang.name);\n  }\n}\n"],"mappings":";;;;;;AAQA,SAAgB,wBACd,mBACA,aACM;CACN,KAAK,MAAM,gBAAgB,MAAM,QAAQ,iBAAiB,IACtD,oBACA,CAAC,iBAAiB,GAAG;EAGvB,IAAI,OAAO,kBAAkB,IAAI,aAAa,IAAI;EAClD,IAAI,QAAQ,MAAM;GAChB,OAAO;GACP,kBAAkB,IAAI,aAAa,MAAM,IAAI;EAC/C;EACA,YAAY,gBAAgB,CAAC,IAAI,CAAC;EAClC,kBAAkB,IAAI,KAAK,IAAI;CACjC;AACF"}

package/dist/highlighter/languages/constants.d.ts

@@ -1,5 +1,5 @@
-import { SupportedLanguages } from "../../types.js";
 import { ResolvedLanguage } from "../../worker/types.js";
+import { SupportedLanguages } from "../../types.js";
 import "../../worker/index.js";
 import { DynamicImportLanguageRegistration } from "shiki";
 //#region src/highlighter/languages/constants.d.ts

package/dist/highlighter/languages/getResolvedLanguages.d.ts

@@ -1,5 +1,5 @@
-import { SupportedLanguages } from "../../types.js";
 import { ResolvedLanguage } from "../../worker/types.js";
+import { SupportedLanguages } from "../../types.js";
 import "../../worker/index.js";
 //#region src/highlighter/languages/getResolvedLanguages.d.ts
 declare function getResolvedLanguages(languages: SupportedLanguages[]): ResolvedLanguage[];

package/dist/highlighter/languages/getResolvedOrResolveLanguage.d.ts

@@ -1,5 +1,5 @@
-import { SupportedLanguages } from "../../types.js";
 import { ResolvedLanguage } from "../../worker/types.js";
+import { SupportedLanguages } from "../../types.js";
 import "../../worker/index.js";
 //#region src/highlighter/languages/getResolvedOrResolveLanguage.d.ts
 declare function getResolvedOrResolveLanguage(language: Exclude<SupportedLanguages, 'text' | 'ansi'>): ResolvedLanguage | Promise<ResolvedLanguage>;

package/dist/highlighter/languages/resolveLanguage.d.ts

@@ -1,5 +1,5 @@
-import { SupportedLanguages } from "../../types.js";
 import { ResolvedLanguage } from "../../worker/types.js";
+import { SupportedLanguages } from "../../types.js";
 import "../../worker/index.js";
 //#region src/highlighter/languages/resolveLanguage.d.ts
 declare function resolveLanguage(lang: Exclude<SupportedLanguages, 'text' | 'ansi'>): Promise<ResolvedLanguage>;

package/dist/highlighter/languages/resolveLanguage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolveLanguage.d.ts","names":[],"sources":["../../../src/highlighter/languages/resolveLanguage.ts"],"mappings":";;;;iBAWsB,gBACpB,MAAM,QAAQ,uCACb,QAAQ"}
+{"version":3,"file":"resolveLanguage.d.ts","names":[],"sources":["../../../src/highlighter/languages/resolveLanguage.ts"],"mappings":";;;;iBAasB,gBACpB,MAAM,QAAQ,uCACb,QAAQ"}

package/dist/highlighter/languages/resolveLanguage.js

@@ -1,27 +1,30 @@
 import { RegisteredCustomLanguages, ResolvedLanguages, ResolvingLanguages } from "./constants.js";
 import { isWorkerContext } from "../../utils/isWorkerContext.js";
-import { bundledLanguages } from "shiki";
 //#region src/highlighter/languages/resolveLanguage.ts
 async function resolveLanguage(lang) {
-	if (isWorkerContext()) throw new Error(`resolveLanguage("${lang}") cannot be called from a worker context. Languages must be pre-resolved on the main thread and passed to the worker via the resolvedLanguages parameter.`);
-	const resolver = ResolvingLanguages.get(lang);
-	if (resolver != null) return resolver;
-	try {
+	if (typeof __DIFFS_WORKER__ !== "undefined" ? __DIFFS_WORKER__ : isWorkerContext()) throw new Error(`resolveLanguage("${lang}") cannot be called from a worker context. Languages must be pre-resolved on the main thread and passed to the worker via the resolvedLanguages parameter.`);
+	const pending = ResolvingLanguages.get(lang);
+	if (pending != null) return pending;
+	const resolver = (async () => {
 		let loader = RegisteredCustomLanguages.get(lang);
-		if (loader == null && Object.prototype.hasOwnProperty.call(bundledLanguages, lang)) loader = bundledLanguages[lang];
+		if (loader == null) {
+			const { bundledLanguages } = await import("shiki/langs");
+			if (Object.prototype.hasOwnProperty.call(bundledLanguages, lang)) loader = bundledLanguages[lang];
+		}
 		if (loader == null) throw new Error(`resolveLanguage: "${lang}" not found in bundled or custom languages`);
-		const resolver = loader().then(({ default: data }) => {
-			const resolvedLang = {
-				name: lang,
-				data
-			};
-			if (!ResolvedLanguages.has(lang)) ResolvedLanguages.set(lang, resolvedLang);
-			return resolvedLang;
-		});
-		ResolvingLanguages.set(lang, resolver);
+		const { default: data } = await loader();
+		const resolvedLang = {
+			name: lang,
+			data
+		};
+		if (!ResolvedLanguages.has(lang)) ResolvedLanguages.set(lang, resolvedLang);
+		return resolvedLang;
+	})();
+	ResolvingLanguages.set(lang, resolver);
+	try {
 		return await resolver;
 	} finally {
-		ResolvingLanguages.delete(lang);
+		if (ResolvingLanguages.get(lang) === resolver) ResolvingLanguages.delete(lang);
 	}
 }
 //#endregion

package/dist/highlighter/languages/resolveLanguage.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveLanguage.js","names":[],"sources":["../../../src/highlighter/languages/resolveLanguage.ts"],"sourcesContent":["import { bundledLanguages } from 'shiki';\n\nimport type { BundledLanguage, SupportedLanguages } from '../../types';\nimport { isWorkerContext } from '../../utils/isWorkerContext';\nimport type { ResolvedLanguage } from '../../worker';\nimport {\n  RegisteredCustomLanguages,\n  ResolvedLanguages,\n  ResolvingLanguages,\n} from './constants';\n\nexport async function resolveLanguage(\n  lang: Exclude<SupportedLanguages, 'text' | 'ansi'>\n): Promise<ResolvedLanguage> {\n  // Prevent dynamic imports in worker contexts\n  if (isWorkerContext()) {\n    throw new Error(\n      `resolveLanguage(\"${lang}\") cannot be called from a worker context. ` +\n        'Languages must be pre-resolved on the main thread and passed to the worker via the resolvedLanguages parameter.'\n    );\n  }\n\n  const resolver = ResolvingLanguages.get(lang);\n  if (resolver != null) {\n    return resolver;\n  }\n\n  try {\n    let loader = RegisteredCustomLanguages.get(lang);\n    if (\n      loader == null &&\n      Object.prototype.hasOwnProperty.call(bundledLanguages, lang)\n    ) {\n      loader = bundledLanguages[lang as BundledLanguage];\n    }\n    if (loader == null) {\n      throw new Error(\n        `resolveLanguage: \"${lang}\" not found in bundled or custom languages`\n      );\n    }\n\n    const resolver = loader().then(({ default: data }) => {\n      const resolvedLang = { name: lang, data };\n      if (!ResolvedLanguages.has(lang)) {\n        ResolvedLanguages.set(lang, resolvedLang);\n      }\n      return resolvedLang;\n    });\n    ResolvingLanguages.set(lang, resolver);\n    return await resolver;\n  } finally {\n    ResolvingLanguages.delete(lang);\n  }\n}\n"],"mappings":";;;;AAWA,eAAsB,gBACpB,MAC2B;CAE3B,IAAI,gBAAgB,GAClB,MAAM,IAAI,MACR,oBAAoB,KAAK,2JAE3B;CAGF,MAAM,WAAW,mBAAmB,IAAI,IAAI;CAC5C,IAAI,YAAY,MACd,OAAO;CAGT,IAAI;EACF,IAAI,SAAS,0BAA0B,IAAI,IAAI;EAC/C,IACE,UAAU,QACV,OAAO,UAAU,eAAe,KAAK,kBAAkB,IAAI,GAE3D,SAAS,iBAAiB;EAE5B,IAAI,UAAU,MACZ,MAAM,IAAI,MACR,qBAAqB,KAAK,2CAC5B;EAGF,MAAM,WAAW,OAAO,CAAC,CAAC,MAAM,EAAE,SAAS,WAAW;GACpD,MAAM,eAAe;IAAE,MAAM;IAAM;GAAK;GACxC,IAAI,CAAC,kBAAkB,IAAI,IAAI,GAC7B,kBAAkB,IAAI,MAAM,YAAY;GAE1C,OAAO;EACT,CAAC;EACD,mBAAmB,IAAI,MAAM,QAAQ;EACrC,OAAO,MAAM;CACf,UAAU;EACR,mBAAmB,OAAO,IAAI;CAChC;AACF"}
+{"version":3,"file":"resolveLanguage.js","names":[],"sources":["../../../src/highlighter/languages/resolveLanguage.ts"],"sourcesContent":["import type { BundledLanguage } from 'shiki';\n\nimport type { SupportedLanguages } from '../../types';\nimport { isWorkerContext } from '../../utils/isWorkerContext';\nimport type { ResolvedLanguage } from '../../worker';\nimport {\n  RegisteredCustomLanguages,\n  ResolvedLanguages,\n  ResolvingLanguages,\n} from './constants';\n\ndeclare const __DIFFS_WORKER__: boolean | undefined;\n\nexport async function resolveLanguage(\n  lang: Exclude<SupportedLanguages, 'text' | 'ansi'>\n): Promise<ResolvedLanguage> {\n  if (\n    typeof __DIFFS_WORKER__ !== 'undefined'\n      ? __DIFFS_WORKER__\n      : isWorkerContext()\n  ) {\n    throw new Error(\n      `resolveLanguage(\"${lang}\") cannot be called from a worker context. Languages must be pre-resolved on the main thread and passed to the worker via the resolvedLanguages parameter.`\n    );\n  }\n  const pending = ResolvingLanguages.get(lang);\n  if (pending != null) return pending;\n  const resolver = (async () => {\n    let loader = RegisteredCustomLanguages.get(lang);\n    if (loader == null) {\n      const { bundledLanguages } = await import('shiki/langs');\n      if (Object.prototype.hasOwnProperty.call(bundledLanguages, lang))\n        loader = bundledLanguages[lang as BundledLanguage];\n    }\n    if (loader == null)\n      throw new Error(\n        `resolveLanguage: \"${lang}\" not found in bundled or custom languages`\n      );\n    const { default: data } = await loader();\n    const resolvedLang = { name: lang, data };\n    if (!ResolvedLanguages.has(lang)) ResolvedLanguages.set(lang, resolvedLang);\n    return resolvedLang;\n  })();\n  ResolvingLanguages.set(lang, resolver);\n  try {\n    return await resolver;\n  } finally {\n    if (ResolvingLanguages.get(lang) === resolver)\n      ResolvingLanguages.delete(lang);\n  }\n}\n"],"mappings":";;;AAaA,eAAsB,gBACpB,MAC2B;CAC3B,IACE,OAAO,qBAAqB,cACxB,mBACA,gBAAgB,GAEpB,MAAM,IAAI,MACR,oBAAoB,KAAK,2JAC3B;CAEF,MAAM,UAAU,mBAAmB,IAAI,IAAI;CAC3C,IAAI,WAAW,MAAM,OAAO;CAC5B,MAAM,YAAY,YAAY;EAC5B,IAAI,SAAS,0BAA0B,IAAI,IAAI;EAC/C,IAAI,UAAU,MAAM;GAClB,MAAM,EAAE,qBAAqB,MAAM,OAAO;GAC1C,IAAI,OAAO,UAAU,eAAe,KAAK,kBAAkB,IAAI,GAC7D,SAAS,iBAAiB;EAC9B;EACA,IAAI,UAAU,MACZ,MAAM,IAAI,MACR,qBAAqB,KAAK,2CAC5B;EACF,MAAM,EAAE,SAAS,SAAS,MAAM,OAAO;EACvC,MAAM,eAAe;GAAE,MAAM;GAAM;EAAK;EACxC,IAAI,CAAC,kBAAkB,IAAI,IAAI,GAAG,kBAAkB,IAAI,MAAM,YAAY;EAC1E,OAAO;CACT,EAAA,CAAG;CACH,mBAAmB,IAAI,MAAM,QAAQ;CACrC,IAAI;EACF,OAAO,MAAM;CACf,UAAU;EACR,IAAI,mBAAmB,IAAI,IAAI,MAAM,UACnC,mBAAmB,OAAO,IAAI;CAClC;AACF"}

package/dist/highlighter/languages/resolveLanguages.d.ts

@@ -1,5 +1,5 @@
-import { SupportedLanguages } from "../../types.js";
 import { ResolvedLanguage } from "../../worker/types.js";
+import { SupportedLanguages } from "../../types.js";
 import "../../worker/index.js";
 //#region src/highlighter/languages/resolveLanguages.d.ts
 declare function resolveLanguages(languages: SupportedLanguages[]): Promise<ResolvedLanguage[]>;

package/dist/highlighter/shared_highlighter.d.ts

@@ -1,22 +1,36 @@
-import { DiffsHighlighter, DiffsThemeNames, HighlighterTypes, SupportedLanguages, ThemesType } from "../types.js";
+import { DiffsHighlighter } from "./DiffsHighlighter.js";
+import { DiffsThemeNames, HighlighterTypes, SupportedLanguages, ThemesType } from "../types.js";
+import { HighlighterDisposedError, getHighlighterType } from "./highlighterType.js";
 //#region src/highlighter/shared_highlighter.d.ts
-type CachedOrLoadingHighlighterType = Promise<DiffsHighlighter> | DiffsHighlighter | undefined;
 interface HighlighterOptions {
   themes: DiffsThemeNames[];
   langs: SupportedLanguages[];
   preferredHighlighter?: HighlighterTypes;
 }
+/**
+ * Creates an instance the caller must dispose. Defaults to the active type
+ * or DEFAULT_HIGHLIGHTER; rejects if a different type is already active.
+ */
+declare function createHighlighter(type?: HighlighterTypes): Promise<DiffsHighlighter>;
 declare function getSharedHighlighter({ themes, langs, preferredHighlighter }: HighlighterOptions): Promise<DiffsHighlighter>;
-declare function isHighlighterLoaded(h?: CachedOrLoadingHighlighterType): h is DiffsHighlighter;
+declare function isHighlighterLoaded(): boolean;
 interface GetHighlighterIfLoadedProps {
-  theme: DiffsThemeNames | ThemesType;
-  lang: SupportedLanguages;
+  theme?: DiffsThemeNames | ThemesType;
+  lang?: SupportedLanguages;
 }
-declare function getHighlighterIfLoaded(withSettings?: GetHighlighterIfLoadedProps): DiffsHighlighter | undefined;
-declare function isHighlighterLoading(h?: CachedOrLoadingHighlighterType): h is Promise<DiffsHighlighter>;
-declare function isHighlighterNull(h?: CachedOrLoadingHighlighterType): h is undefined;
+/**
+ * Returns undefined if the theme or language is not loaded.
+ */
+declare function getHighlighterIfLoaded({ theme, lang }?: GetHighlighterIfLoadedProps): DiffsHighlighter | undefined;
+declare function isHighlighterLoading(): boolean;
+declare function isHighlighterNull(): boolean;
 declare function preloadHighlighter(options: HighlighterOptions): Promise<void>;
+/**
+ * Disposes an already loaded shared instance synchronously and clears caches.
+ * Instances from createHighlighter() must be disposed separately before
+ * switching types.
+ */
 declare function disposeHighlighter(): Promise<void>;
 //#endregion
-export { disposeHighlighter, getHighlighterIfLoaded, getSharedHighlighter, isHighlighterLoaded, isHighlighterLoading, isHighlighterNull, preloadHighlighter };
+export { HighlighterDisposedError, HighlighterOptions, createHighlighter, disposeHighlighter, getHighlighterIfLoaded, getHighlighterType, getSharedHighlighter, isHighlighterLoaded, isHighlighterLoading, isHighlighterNull, preloadHighlighter };
 //# sourceMappingURL=shared_highlighter.d.ts.map

package/dist/highlighter/shared_highlighter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shared_highlighter.d.ts","names":[],"sources":["../../src/highlighter/shared_highlighter.ts"],"mappings":";;KA2BK,iCACD,QAAQ,oBACR;UAKM;EACR,QAAQ;EACR,OAAO;EACP,uBAAuB;;iBAGH,uBACpB,QACA,OACA,wBACC,qBAAqB,QAAQ;iBAmDhB,oBACd,IAAG,iCACF,KAAK;UAIE;EACR,OAAO,kBAAkB;EACzB,MAAM;;iBAGQ,uBACd,eAAe,8BACd;iBAca,qBACd,IAAG,iCACF,KAAK,QAAQ;iBAIA,kBACd,IAAG,iCACF;iBAImB,mBACpB,SAAS,qBACR;iBAImB,sBAAsB"}
+{"version":3,"file":"shared_highlighter.d.ts","names":[],"sources":["../../src/highlighter/shared_highlighter.ts"],"mappings":";;;;UAyBiB;EACf,QAAQ;EACR,OAAO;EACP,uBAAuB;;;;;;iBAOH,kBACpB,OAAO,mBACN,QAAQ;iBAgBW,uBACpB,QACA,OACA,wBACC,qBAAqB,QAAQ;iBAwChB;UAKN;EACR,QAAQ,kBAAkB;EAC1B,OAAO;;;;;iBAMO,yBACd,OACA,SACC,8BAAmC;iBActB;iBAIA;iBAKM,mBACpB,SAAS,qBACR;;;;;;iBASmB,sBAAsB"}