@pierre/diffs 1.5.2 → 1.6.0-beta.1

package/dist/utils/wrapTokenFragments.js.map

@@ -1 +1 @@
-{"version":3,"file":"wrapTokenFragments.js","names":[],"sources":["../../src/utils/wrapTokenFragments.ts"],"sourcesContent":["import type { ElementContent, Element as HASTElement } from 'hast';\n\nimport { createHastElement } from './hast_utils';\n\nconst NO_TOKEN: unique symbol = Symbol('no-token');\nconst MULTIPLE_TOKENS: unique symbol = Symbol('multiple-tokens');\n\ntype TokenFragmentState = number | typeof NO_TOKEN | typeof MULTIPLE_TOKENS;\n\n// Walk a rendered line and add a single outer token wrapper around all\n// fragments that still belong to the same original Shiki token.\nexport function wrapTokenFragments(container: HASTElement): TokenFragmentState {\n  const ownTokenChar = getTokenChar(container);\n  if (ownTokenChar != null) {\n    return ownTokenChar;\n  }\n\n  let containerTokenState: TokenFragmentState = NO_TOKEN;\n  const wrappedChildren: ElementContent[] = [];\n  let currentTokenChildren: ElementContent[] = [];\n  let currentTokenChar: number | undefined;\n\n  const flushTokenChildren = () => {\n    if (currentTokenChildren.length === 0 || currentTokenChar == null) {\n      currentTokenChildren = [];\n      currentTokenChar = undefined;\n      return;\n    }\n\n    if (currentTokenChildren.length === 1) {\n      const child = currentTokenChildren[0];\n      if (child?.type === 'element') {\n        setTokenChar(child, currentTokenChar);\n        for (const grandChild of child.children) {\n          stripTokenChar(grandChild);\n        }\n      } else {\n        stripTokenChar(child);\n      }\n      wrappedChildren.push(child);\n      currentTokenChildren = [];\n      currentTokenChar = undefined;\n      return;\n    }\n\n    for (const child of currentTokenChildren) {\n      stripTokenChar(child);\n    }\n\n    wrappedChildren.push(\n      createHastElement({\n        tagName: 'span',\n        properties: { 'data-char': currentTokenChar },\n        children: currentTokenChildren,\n      })\n    );\n\n    currentTokenChildren = [];\n    currentTokenChar = undefined;\n  };\n\n  const mergeContainerTokenState = (childTokenState: TokenFragmentState) => {\n    if (childTokenState === NO_TOKEN) {\n      return;\n    }\n    if (childTokenState === MULTIPLE_TOKENS) {\n      containerTokenState = MULTIPLE_TOKENS;\n      return;\n    }\n    if (containerTokenState === NO_TOKEN) {\n      containerTokenState = childTokenState;\n      return;\n    }\n    if (containerTokenState !== childTokenState) {\n      containerTokenState = MULTIPLE_TOKENS;\n    }\n  };\n\n  for (const child of container.children) {\n    const childTokenState: TokenFragmentState =\n      child.type === 'element' ? wrapTokenFragments(child) : NO_TOKEN;\n    mergeContainerTokenState(childTokenState);\n\n    if (typeof childTokenState !== 'number') {\n      flushTokenChildren();\n      wrappedChildren.push(child);\n      continue;\n    }\n\n    if (currentTokenChar != null && currentTokenChar !== childTokenState) {\n      flushTokenChildren();\n    }\n\n    currentTokenChar ??= childTokenState;\n    currentTokenChildren.push(child);\n  }\n\n  flushTokenChildren();\n  container.children = wrappedChildren;\n  return containerTokenState;\n}\n\nfunction getTokenChar(node: HASTElement): number | undefined {\n  const value = node.properties['data-char'];\n  if (typeof value === 'number') {\n    return value;\n  }\n  return undefined;\n}\n\nfunction stripTokenChar(node: ElementContent): void {\n  if (node.type !== 'element') return;\n  node.properties['data-char'] = undefined;\n  for (const child of node.children) {\n    stripTokenChar(child);\n  }\n}\n\nfunction setTokenChar(node: HASTElement, char: number): void {\n  node.properties['data-char'] = char;\n}\n"],"mappings":";;AAIA,MAAM,WAA0B,OAAO,UAAU;AACjD,MAAM,kBAAiC,OAAO,iBAAiB;AAM/D,SAAgB,mBAAmB,WAA4C;CAC7E,MAAM,eAAe,aAAa,SAAS;CAC3C,IAAI,gBAAgB,MAClB,OAAO;CAGT,IAAI,sBAA0C;CAC9C,MAAM,kBAAoC,CAAC;CAC3C,IAAI,uBAAyC,CAAC;CAC9C,IAAI;CAEJ,MAAM,2BAA2B;EAC/B,IAAI,qBAAqB,WAAW,KAAK,oBAAoB,MAAM;GACjE,uBAAuB,CAAC;GACxB,mBAAmB,KAAA;GACnB;EACF;EAEA,IAAI,qBAAqB,WAAW,GAAG;GACrC,MAAM,QAAQ,qBAAqB;GACnC,IAAI,OAAO,SAAS,WAAW;IAC7B,aAAa,OAAO,gBAAgB;IACpC,KAAK,MAAM,cAAc,MAAM,UAC7B,eAAe,UAAU;GAE7B,OACE,eAAe,KAAK;GAEtB,gBAAgB,KAAK,KAAK;GAC1B,uBAAuB,CAAC;GACxB,mBAAmB,KAAA;GACnB;EACF;EAEA,KAAK,MAAM,SAAS,sBAClB,eAAe,KAAK;EAGtB,gBAAgB,KACd,kBAAkB;GAChB,SAAS;GACT,YAAY,EAAE,aAAa,iBAAiB;GAC5C,UAAU;EACZ,CAAC,CACH;EAEA,uBAAuB,CAAC;EACxB,mBAAmB,KAAA;CACrB;CAEA,MAAM,4BAA4B,oBAAwC;EACxE,IAAI,oBAAoB,UACtB;EAEF,IAAI,oBAAoB,iBAAiB;GACvC,sBAAsB;GACtB;EACF;EACA,IAAI,wBAAwB,UAAU;GACpC,sBAAsB;GACtB;EACF;EACA,IAAI,wBAAwB,iBAC1B,sBAAsB;CAE1B;CAEA,KAAK,MAAM,SAAS,UAAU,UAAU;EACtC,MAAM,kBACJ,MAAM,SAAS,YAAY,mBAAmB,KAAK,IAAI;EACzD,yBAAyB,eAAe;EAExC,IAAI,OAAO,oBAAoB,UAAU;GACvC,mBAAmB;GACnB,gBAAgB,KAAK,KAAK;GAC1B;EACF;EAEA,IAAI,oBAAoB,QAAQ,qBAAqB,iBACnD,mBAAmB;EAGrB,qBAAqB;EACrB,qBAAqB,KAAK,KAAK;CACjC;CAEA,mBAAmB;CACnB,UAAU,WAAW;CACrB,OAAO;AACT;AAEA,SAAS,aAAa,MAAuC;CAC3D,MAAM,QAAQ,KAAK,WAAW;CAC9B,IAAI,OAAO,UAAU,UACnB,OAAO;AAGX;AAEA,SAAS,eAAe,MAA4B;CAClD,IAAI,KAAK,SAAS,WAAW;CAC7B,KAAK,WAAW,eAAe,KAAA;CAC/B,KAAK,MAAM,SAAS,KAAK,UACvB,eAAe,KAAK;AAExB;AAEA,SAAS,aAAa,MAAmB,MAAoB;CAC3D,KAAK,WAAW,eAAe;AACjC"}
+{"version":3,"file":"wrapTokenFragments.js","names":[],"sources":["../../src/utils/wrapTokenFragments.ts"],"sourcesContent":["import type { ElementContent, Element as HASTElement } from 'hast';\n\nimport { createHastElement } from './hast_utils';\n\nconst NO_TOKEN: unique symbol = Symbol('no-token');\nconst MULTIPLE_TOKENS: unique symbol = Symbol('multiple-tokens');\n\ntype TokenFragmentState = number | typeof NO_TOKEN | typeof MULTIPLE_TOKENS;\n\n// Walk a rendered line and add a single outer token wrapper around all\n// fragments that still belong to the same original syntax token.\nexport function wrapTokenFragments(container: HASTElement): TokenFragmentState {\n  const ownTokenChar = getTokenChar(container);\n  if (ownTokenChar != null) {\n    return ownTokenChar;\n  }\n\n  let containerTokenState: TokenFragmentState = NO_TOKEN;\n  const wrappedChildren: ElementContent[] = [];\n  let currentTokenChildren: ElementContent[] = [];\n  let currentTokenChar: number | undefined;\n\n  const flushTokenChildren = () => {\n    if (currentTokenChildren.length === 0 || currentTokenChar == null) {\n      currentTokenChildren = [];\n      currentTokenChar = undefined;\n      return;\n    }\n\n    if (currentTokenChildren.length === 1) {\n      const child = currentTokenChildren[0];\n      if (child?.type === 'element') {\n        setTokenChar(child, currentTokenChar);\n        for (const grandChild of child.children) {\n          stripTokenChar(grandChild);\n        }\n      } else {\n        stripTokenChar(child);\n      }\n      wrappedChildren.push(child);\n      currentTokenChildren = [];\n      currentTokenChar = undefined;\n      return;\n    }\n\n    for (const child of currentTokenChildren) {\n      stripTokenChar(child);\n    }\n\n    wrappedChildren.push(\n      createHastElement({\n        tagName: 'span',\n        properties: { 'data-char': currentTokenChar },\n        children: currentTokenChildren,\n      })\n    );\n\n    currentTokenChildren = [];\n    currentTokenChar = undefined;\n  };\n\n  const mergeContainerTokenState = (childTokenState: TokenFragmentState) => {\n    if (childTokenState === NO_TOKEN) {\n      return;\n    }\n    if (childTokenState === MULTIPLE_TOKENS) {\n      containerTokenState = MULTIPLE_TOKENS;\n      return;\n    }\n    if (containerTokenState === NO_TOKEN) {\n      containerTokenState = childTokenState;\n      return;\n    }\n    if (containerTokenState !== childTokenState) {\n      containerTokenState = MULTIPLE_TOKENS;\n    }\n  };\n\n  for (const child of container.children) {\n    const childTokenState: TokenFragmentState =\n      child.type === 'element' ? wrapTokenFragments(child) : NO_TOKEN;\n    mergeContainerTokenState(childTokenState);\n\n    if (typeof childTokenState !== 'number') {\n      flushTokenChildren();\n      wrappedChildren.push(child);\n      continue;\n    }\n\n    if (currentTokenChar != null && currentTokenChar !== childTokenState) {\n      flushTokenChildren();\n    }\n\n    currentTokenChar ??= childTokenState;\n    currentTokenChildren.push(child);\n  }\n\n  flushTokenChildren();\n  container.children = wrappedChildren;\n  return containerTokenState;\n}\n\nfunction getTokenChar(node: HASTElement): number | undefined {\n  const value = node.properties['data-char'];\n  if (typeof value === 'number') {\n    return value;\n  }\n  return undefined;\n}\n\nfunction stripTokenChar(node: ElementContent): void {\n  if (node.type !== 'element') return;\n  node.properties['data-char'] = undefined;\n  for (const child of node.children) {\n    stripTokenChar(child);\n  }\n}\n\nfunction setTokenChar(node: HASTElement, char: number): void {\n  node.properties['data-char'] = char;\n}\n"],"mappings":";;AAIA,MAAM,WAA0B,OAAO,UAAU;AACjD,MAAM,kBAAiC,OAAO,iBAAiB;AAM/D,SAAgB,mBAAmB,WAA4C;CAC7E,MAAM,eAAe,aAAa,SAAS;CAC3C,IAAI,gBAAgB,MAClB,OAAO;CAGT,IAAI,sBAA0C;CAC9C,MAAM,kBAAoC,CAAC;CAC3C,IAAI,uBAAyC,CAAC;CAC9C,IAAI;CAEJ,MAAM,2BAA2B;EAC/B,IAAI,qBAAqB,WAAW,KAAK,oBAAoB,MAAM;GACjE,uBAAuB,CAAC;GACxB,mBAAmB,KAAA;GACnB;EACF;EAEA,IAAI,qBAAqB,WAAW,GAAG;GACrC,MAAM,QAAQ,qBAAqB;GACnC,IAAI,OAAO,SAAS,WAAW;IAC7B,aAAa,OAAO,gBAAgB;IACpC,KAAK,MAAM,cAAc,MAAM,UAC7B,eAAe,UAAU;GAE7B,OACE,eAAe,KAAK;GAEtB,gBAAgB,KAAK,KAAK;GAC1B,uBAAuB,CAAC;GACxB,mBAAmB,KAAA;GACnB;EACF;EAEA,KAAK,MAAM,SAAS,sBAClB,eAAe,KAAK;EAGtB,gBAAgB,KACd,kBAAkB;GAChB,SAAS;GACT,YAAY,EAAE,aAAa,iBAAiB;GAC5C,UAAU;EACZ,CAAC,CACH;EAEA,uBAAuB,CAAC;EACxB,mBAAmB,KAAA;CACrB;CAEA,MAAM,4BAA4B,oBAAwC;EACxE,IAAI,oBAAoB,UACtB;EAEF,IAAI,oBAAoB,iBAAiB;GACvC,sBAAsB;GACtB;EACF;EACA,IAAI,wBAAwB,UAAU;GACpC,sBAAsB;GACtB;EACF;EACA,IAAI,wBAAwB,iBAC1B,sBAAsB;CAE1B;CAEA,KAAK,MAAM,SAAS,UAAU,UAAU;EACtC,MAAM,kBACJ,MAAM,SAAS,YAAY,mBAAmB,KAAK,IAAI;EACzD,yBAAyB,eAAe;EAExC,IAAI,OAAO,oBAAoB,UAAU;GACvC,mBAAmB;GACnB,gBAAgB,KAAK,KAAK;GAC1B;EACF;EAEA,IAAI,oBAAoB,QAAQ,qBAAqB,iBACnD,mBAAmB;EAGrB,qBAAqB;EACrB,qBAAqB,KAAK,KAAK;CACjC;CAEA,mBAAmB;CACnB,UAAU,WAAW;CACrB,OAAO;AACT;AAEA,SAAS,aAAa,MAAuC;CAC3D,MAAM,QAAQ,KAAK,WAAW;CAC9B,IAAI,OAAO,UAAU,UACnB,OAAO;AAGX;AAEA,SAAS,eAAe,MAA4B;CAClD,IAAI,KAAK,SAAS,WAAW;CAC7B,KAAK,WAAW,eAAe,KAAA;CAC/B,KAAK,MAAM,SAAS,KAAK,UACvB,eAAe,KAAK;AAExB;AAEA,SAAS,aAAa,MAAmB,MAAoB;CAC3D,KAAK,WAAW,eAAe;AACjC"}

package/dist/worker/WorkerPoolManager.d.ts

@@ -1,5 +1,5 @@
-import { FileContents, FileDiffMetadata, HighlighterTypes, HunkExpansionRegion, RenderDiffOptions, RenderDiffResult, RenderFileOptions, RenderFileResult, SupportedLanguages, ThemedDiffResult, ThemedFileResult } from "../types.js";
 import { DiffRendererInstance, FileRendererInstance, WorkerInitializationRenderOptions, WorkerPoolOptions, WorkerRenderingOptions, WorkerStats } from "./types.js";
+import { FileContents, FileDiffMetadata, HighlighterTypes, HunkExpansionRegion, RenderDiffOptions, RenderDiffResult, RenderFileOptions, RenderFileResult, SupportedLanguages, ThemedDiffResult, ThemedFileResult } from "../types.js";
 import { LRUMap } from "lru_map";
 //#region src/worker/WorkerPoolManager.d.ts
 interface GetCachesResult {
@@ -12,7 +12,6 @@ interface ThemeSubscriber {
 type RenderTaskInstance = FileRendererInstance | DiffRendererInstance;
 declare class WorkerPoolManager {
   private options;
-  private highlighter;
   private readonly preferredHighlighter;
   private renderOptions;
   private renderOptionsRequestVersion;
@@ -52,6 +51,7 @@ declare class WorkerPoolManager {
   cleanUpTasks(instance: RenderTaskInstance): void;
   isInitialized(): boolean;
   initialize(languages?: SupportedLanguages[]): Promise<void>;
+  private loadSharedHighlighter;
   private initializeWorkers;
   /**
    * Pass worker errors to onWorkerError, or log them if no callback is set.

package/dist/worker/WorkerPoolManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WorkerPoolManager.d.ts","names":[],"sources":["../../src/worker/WorkerPoolManager.ts"],"mappings":";;;;UA0EU;EACR,WAAW,eAAe;EAC1B,WAAW,eAAe;;UAYlB;EACR;;KAKG,qBAAqB,uBAAuB;cAEpC;UAkCD;UAjCF;mBACS;UACT;UACA;UACA;UACA;UACA;UAEA;UACA;UAIA;UAGA;UACA;UAKA;UACA;UACA;UACA;UACA;UACA;UACA;UAEA;EAER,YACU,SAAS,qBAEf,OACA,OACA,qBACA,cACA,mBACA,uBACA,wBACC;EAeE;EAIA,mBAAmB,MAAM,eAAe;EAMxC,mBACL,MAAM,mBACL;EAMI,iBAAiB;EAKjB,mBAAmB;EAQnB,mBAAmB;EAQpB,mBACJ,OACA,qBACA,cACA,mBACA,yBACC,QAAQ,0BAA0B;EA4E9B,2BAA2B;EAI3B,wBAAwB;EAMxB,wBAAwB;UAIjB;EA6CP,wBAAwB,UAAU;EASlC,0BAA0B,UAAU;EAKpC,uBACL,WAAW,OAAO;UASZ;UAKA;EAWD,aAAa,UAAU;EAkBvB;EAIM,WAAW,YAAW,uBAA4B;UAqFjD;;;;;;;;;UA8FN;UA8BA;EA2BD,iBACL,UAAU,sBACV,MAAM;EAqBD,wBAAwB,MAAM,eAAe;UAe5C;EAgCD,gBACL,MAAM,cACN,sBACA,oBACA,mBACC;EAaI,iBACL,UAAU,sBACV,MAAM;EAqBD,wBAAwB,MAAM,mBAAmB;UAehD;EAgCD,gBACL,MAAM,kBACN,sBACA,oBACA,gBAAgB,YAAY,6BAC5B,qCACC;EAYI;UAqBC;UAIA;UAUA;UAWA;EAOD,YAAY;UAwBX;UA+DA;UA0CA;UAcM;UAyDN;UAuGA;UACA;UAMA;UAYA;UAqBA;UAmCA;UAeA;UAUA;UA8BA;UAOA;UAOA;UAWA;UASA;UAgBA;UAeA;UAWA;UAUA;UAOA;UAMA;UAOA;UAOA;UAkBA;UAQA;UASA;UAMA;UAQA;UAYA;UAYA;UAQA;UAiBA;UAiBA;UAKA;UAIC;UAWD"}
+{"version":3,"file":"WorkerPoolManager.d.ts","names":[],"sources":["../../src/worker/WorkerPoolManager.ts"],"mappings":";;;;UAkFU;EACR,WAAW,eAAe;EAC1B,WAAW,eAAe;;UAYlB;EACR;;KAKG,qBAAqB,uBAAuB;cAEpC;UAiCD;mBAhCO;UACT;UACA;UACA;UACA;UACA;UAEA;UACA;UAIA;UAGA;UACA;UAKA;UACA;UACA;UACA;UACA;UACA;UACA;UAEA;EAER,YACU,SAAS,qBAEf,OACA,OACA,qBACA,cACA,mBACA,uBACA,wBACC;EAeE;EAIA,mBAAmB,MAAM,eAAe;EAMxC,mBACL,MAAM,mBACL;EAMI,iBAAiB;EAKjB,mBAAmB;EAQnB,mBAAmB;EAQpB,mBACJ,OACA,qBACA,cACA,mBACA,yBACC,QAAQ,0BAA0B;EAwE9B,2BAA2B;EAI3B,wBAAwB;EAMxB,wBAAwB;UAIjB;EA6CP,wBAAwB,UAAU;EASlC,0BAA0B,UAAU;EAKpC,uBACL,WAAW,OAAO;UASZ;UAKA;EAWD,aAAa,UAAU;EAkBvB;EAIM,WAAW,YAAW,uBAA4B;UAyFjD;UAiBA;;;;;;;;;UAgGN;UA8BA;EA2BD,iBACL,UAAU,sBACV,MAAM;EAqBD,wBAAwB,MAAM,eAAe;UAe5C;EAgCD,gBACL,MAAM,cACN,sBACA,oBACA,mBACC;EAgBI,iBACL,UAAU,sBACV,MAAM;EAqBD,wBAAwB,MAAM,mBAAmB;UAehD;EAgCD,gBACL,MAAM,kBACN,sBACA,oBACA,gBAAgB,YAAY,6BAC5B,qCACC;EAiBI;UAoBC;UAIA;UAUA;UAWA;EAOD,YAAY;UAwBX;UA+DA;UA0CA;UAcM;UA0DN;UAsHA;UACA;UAMA;UAYA;UAqBA;UAmCA;UAeA;UAUA;UA8BA;UAOA;UAOA;UAWA;UASA;UAgBA;UAeA;UAWA;UAUA;UAOA;UAMA;UAOA;UAOA;UAkBA;UAQA;UASA;UAMA;UAQA;UAYA;UAYA;UAQA;UAiBA;UAiBA;UAKA;UAIC;UAWD"}

package/dist/worker/WorkerPoolManager.js

@@ -1,10 +1,9 @@
 import { DEFAULT_THEMES } from "../constants.js";
-import { areLanguagesAttached } from "../highlighter/languages/areLanguagesAttached.js";
+import { HighlighterDisposedError, resolveHighlighterType } from "../highlighter/highlighterType.js";
 import { getThemes } from "../utils/getThemes.js";
-import { attachResolvedThemes } from "../highlighter/themes/attachResolvedThemes.js";
-import { getSharedHighlighter } from "../highlighter/shared_highlighter.js";
+import { getHighlighterIfLoaded, getSharedHighlighter } from "../highlighter/shared_highlighter.js";
 import { areThemesEqual } from "../utils/areThemesEqual.js";
-import { hasResolvedThemes } from "../highlighter/themes/hasResolvedThemes.js";
+import { areLanguagesAttached } from "../highlighter/languages/areLanguagesAttached.js";
 import { areFileRenderOptionsEqual } from "../utils/areFileRenderOptionsEqual.js";
 import { getCustomExtensionsMap, getCustomExtensionsVersion, getFiletypeFromFileName } from "../utils/getFiletypeFromFileName.js";
 import { isFilePlainText } from "../utils/isFilePlainText.js";
@@ -19,14 +18,15 @@ import { getResolvedLanguages } from "../highlighter/languages/getResolvedLangua
 import { hasResolvedLanguages } from "../highlighter/languages/hasResolvedLanguages.js";
 import { resolveLanguages } from "../highlighter/languages/resolveLanguages.js";
 import { getResolvedThemes } from "../highlighter/themes/getResolvedThemes.js";
+import { hasResolvedThemes } from "../highlighter/themes/hasResolvedThemes.js";
 import { resolveThemes } from "../highlighter/themes/resolveThemes.js";
+import { decodeHastLines } from "./hastLinesTransport.js";
 import LRUMapPkg from "lru_map";
 //#region src/worker/WorkerPoolManager.ts
 const IGNORE_RESPONSE = Symbol("IGNORE_RESPONSE");
 const DEFAULT_WORKER_INITIALIZATION_TIMEOUT = 1e4;
 var WorkerPoolManager = class {
 	options;
-	highlighter;
 	preferredHighlighter;
 	renderOptions;
 	renderOptionsRequestVersion = 0;
@@ -46,9 +46,9 @@ var WorkerPoolManager = class {
 	diffCache;
 	_queuedBroadcast;
 	lifecycleGeneration = 0;
-	constructor(options, { langs, theme = DEFAULT_THEMES, useTokenTransformer = false, lineDiffType = "word-alt", maxLineDiffLength = 1e3, tokenizeMaxLineLength = 1e3, preferredHighlighter = "shiki-js" }) {
+	constructor(options, { langs, theme = DEFAULT_THEMES, useTokenTransformer = false, lineDiffType = "word-alt", maxLineDiffLength = 1e3, tokenizeMaxLineLength = 1e3, preferredHighlighter }) {
 		this.options = options;
-		this.preferredHighlighter = preferredHighlighter;
+		this.preferredHighlighter = resolveHighlighterType(preferredHighlighter);
 		this.renderOptions = {
 			theme,
 			useTokenTransformer,
@@ -106,20 +106,11 @@ var WorkerPoolManager = class {
 			if (!isCurrentRequest() || areDiffRenderOptionsEqual(newRenderOptions, this.renderOptions)) return;
 			const themeNames = getThemes(theme);
 			let resolvedThemes = [];
-			if (!areThemesEqual(newRenderOptions.theme, this.renderOptions.theme)) {
-				if (hasResolvedThemes(themeNames)) resolvedThemes = getResolvedThemes(themeNames);
-				else resolvedThemes = await resolveThemes(themeNames);
-			}
+			if (!areThemesEqual(newRenderOptions.theme, this.renderOptions.theme)) resolvedThemes = hasResolvedThemes(themeNames, this.preferredHighlighter) ? getResolvedThemes(themeNames, this.preferredHighlighter) : await resolveThemes(themeNames, this.preferredHighlighter);
 			if (!isCurrentRequest()) return;
-			if (this.highlighter != null) attachResolvedThemes(resolvedThemes, this.highlighter);
-			else {
-				const highlighter = await getSharedHighlighter({
-					themes: themeNames,
-					langs: ["text"],
-					preferredHighlighter: this.preferredHighlighter
-				});
+			if (getHighlighterIfLoaded({ theme }) == null) {
+				await this.loadSharedHighlighter(themeNames, ["text"]);
 				if (!isCurrentRequest()) return;
-				this.highlighter = highlighter;
 			}
 			const workerSetup = this.setRenderOptionsOnWorkers(newRenderOptions, resolvedThemes);
 			this.renderOptions = newRenderOptions;
@@ -227,38 +218,32 @@ var WorkerPoolManager = class {
 		return this.initialized === true;
 	}
 	async initialize(languages = []) {
-		if (this.initialized === true) return;
-		else if (this.initialized === false) {
+		if (this.initialized === true) {
+			if (getHighlighterIfLoaded({ theme: this.renderOptions.theme }) == null) await this.loadSharedHighlighter(getThemes(this.renderOptions.theme), ["text", ...languages]);
+			return;
+		} else if (this.initialized === false) {
 			const { lifecycleGeneration } = this;
 			const initialization = new Promise((resolve, reject) => {
 				(async () => {
 					try {
 						const themes = getThemes(this.renderOptions.theme);
-						let resolvedThemes = [];
-						if (hasResolvedThemes(themes)) resolvedThemes = getResolvedThemes(themes);
-						else resolvedThemes = await resolveThemes(themes);
+						const resolvedThemes = hasResolvedThemes(themes, this.preferredHighlighter) ? getResolvedThemes(themes, this.preferredHighlighter) : await resolveThemes(themes, this.preferredHighlighter);
 						if (!this.isCurrentLifecycle(lifecycleGeneration)) {
 							resolve();
 							return;
 						}
 						let resolvedLanguages = [];
-						if (hasResolvedLanguages(languages)) resolvedLanguages = getResolvedLanguages(languages);
-						else resolvedLanguages = await resolveLanguages(languages);
+						if (this.preferredHighlighter !== "highlights") resolvedLanguages = hasResolvedLanguages(languages) ? getResolvedLanguages(languages) : await resolveLanguages(languages);
 						if (!this.isCurrentLifecycle(lifecycleGeneration)) {
 							resolve();
 							return;
 						}
-						const [highlighter] = await Promise.all([getSharedHighlighter({
-							themes,
-							langs: ["text", ...languages],
-							preferredHighlighter: this.preferredHighlighter
-						}), this.initializeWorkers(resolvedThemes, resolvedLanguages)]);
+						await Promise.all([this.loadSharedHighlighter(themes, ["text", ...languages]), this.initializeWorkers(resolvedThemes, resolvedLanguages)]);
 						if (!this.isCurrentLifecycle(lifecycleGeneration)) {
 							this.terminateWorkers();
 							resolve();
 							return;
 						}
-						this.highlighter = highlighter;
 						this.initialized = true;
 						this.diffCache.clear();
 						this.fileCache.clear();
@@ -286,6 +271,17 @@ var WorkerPoolManager = class {
 			return initialization;
 		} else return this.initialized;
 	}
+	async loadSharedHighlighter(themes, langs) {
+		try {
+			await getSharedHighlighter({
+				themes,
+				langs,
+				preferredHighlighter: this.preferredHighlighter
+			});
+		} catch (error) {
+			if (!(error instanceof HighlighterDisposedError)) throw error;
+		}
+	}
 	async initializeWorkers(resolvedThemes, resolvedLanguages) {
 		this.workersFailed = false;
 		const initPromises = [];
@@ -314,6 +310,7 @@ var WorkerPoolManager = class {
 					id,
 					request: {
 						type: "initialize",
+						resultFormat: "hast-ops-v1",
 						id,
 						renderOptions: this.renderOptions,
 						preferredHighlighter: this.preferredHighlighter,
@@ -423,11 +420,12 @@ var WorkerPoolManager = class {
 		}
 	}
 	getPlainFileAST(file, startingLine, totalLines, lines) {
-		if (this.highlighter == null) {
+		const highlighter = getHighlighterIfLoaded({ theme: this.renderOptions.theme });
+		if (highlighter == null) {
 			this.queueInitialization();
 			return;
 		}
-		return renderFileWithHighlighter(file, this.highlighter, this.renderOptions, {
+		return renderFileWithHighlighter(file, highlighter, this.renderOptions, {
 			forcePlainText: true,
 			startingLine,
 			totalLines,
@@ -468,13 +466,18 @@ var WorkerPoolManager = class {
 		}
 	}
 	getPlainDiffAST(diff, startingLine, totalLines, expandedHunks, collapsedContextThreshold) {
-		return this.highlighter != null ? renderDiffWithHighlighter(diff, this.highlighter, this.renderOptions, {
+		const highlighter = getHighlighterIfLoaded({ theme: this.renderOptions.theme });
+		if (highlighter == null) {
+			this.queueInitialization();
+			return;
+		}
+		return renderDiffWithHighlighter(diff, highlighter, this.renderOptions, {
 			forcePlainText: true,
 			startingLine,
 			totalLines,
 			expandedHunks,
 			collapsedContextThreshold
-		}) : void 0;
+		});
 	}
 	terminate() {
 		this.lifecycleGeneration++;
@@ -489,7 +492,6 @@ var WorkerPoolManager = class {
 		this.queuedTaskByInstance.clear();
 		this.taskByHighlightKey.clear();
 		this.activeTaskById.clear();
-		this.highlighter = void 0;
 		this.initialized = false;
 		this.workersFailed = false;
 		this.queueBroadcastStateChanges();
@@ -625,15 +627,12 @@ var WorkerPoolManager = class {
 	}
 	async resolveLanguagesAndExecuteTask(availableWorker, task, langs) {
 		try {
-			const mainThreadLangs = langs.filter((lang) => !areLanguagesAttached(lang));
-			if (mainThreadLangs.length > 0) getSharedHighlighter({
-				themes: getThemes(this.renderOptions.theme),
-				langs: ["text", ...mainThreadLangs],
-				preferredHighlighter: this.preferredHighlighter
-			}).catch((error) => {
+			const highlighter = getHighlighterIfLoaded();
+			const mainThreadLangs = langs.filter((lang) => highlighter == null || !areLanguagesAttached(lang, highlighter));
+			if (mainThreadLangs.length > 0) this.loadSharedHighlighter(getThemes(this.renderOptions.theme), ["text", ...mainThreadLangs]).catch((error) => {
 				console.error(error);
 			});
-			const workerMissingLangs = langs.filter((lang) => !availableWorker.langs.has(lang));
+			const workerMissingLangs = this.preferredHighlighter === "highlights" ? [] : langs.filter((lang) => !availableWorker.langs.has(lang));
 			if (workerMissingLangs.length > 0) {
 				if (hasResolvedLanguages(workerMissingLangs)) task.request.resolvedLanguages = getResolvedLanguages(workerMissingLangs);
 				else task.request.resolvedLanguages = await resolveLanguages(workerMissingLangs);
@@ -681,9 +680,13 @@ var WorkerPoolManager = class {
 						break;
 					case "file": {
 						if (task.type !== "file") throw new Error("handleWorkerMessage: task/response dont match");
-						const { result, options } = response;
+						const { options } = response;
 						if (!this.isCurrentRenderTask(task) || !areFileRenderOptionsEqual(options, this.getFileRenderOptions())) throw IGNORE_RESPONSE;
 						const { request } = task;
+						const result = {
+							...response.result,
+							code: decodeHastLines(response.result.code)
+						};
 						this.syncCustomExtensionVersion(managedWorker, request);
 						if (task.cacheKeyAtDispatch != null) this.fileCache.set(task.cacheKeyAtDispatch, {
 							result,
@@ -695,9 +698,16 @@ var WorkerPoolManager = class {
 					}
 					case "diff": {
 						if (task.type !== "diff") throw new Error("handleWorkerMessage: task/response dont match");
-						const { result, options } = response;
+						const { options } = response;
 						if (!this.isCurrentRenderTask(task) || !areDiffRenderOptionsEqual(options, this.getDiffRenderOptions())) throw IGNORE_RESPONSE;
 						const { request } = task;
+						const result = {
+							...response.result,
+							code: {
+								deletionLines: decodeHastLines(response.result.code.deletionLines),
+								additionLines: decodeHastLines(response.result.code.additionLines)
+							}
+						};
 						this.syncCustomExtensionVersion(managedWorker, request);
 						if (task.cacheKeyAtDispatch != null) this.diffCache.set(task.cacheKeyAtDispatch, {
 							result,