@pierre/diffs 1.3.0-beta.1 → 1.3.0-beta.11

package/dist/utils/wrapTokenFragments.js.map

@@ -1 +1 @@
-{"version":3,"file":"wrapTokenFragments.js","names":["NO_TOKEN: unique symbol","MULTIPLE_TOKENS: unique symbol","containerTokenState: TokenFragmentState","wrappedChildren: ElementContent[]","currentTokenChildren: ElementContent[]","currentTokenChar: number | undefined","childTokenState: TokenFragmentState"],"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,MAAMA,WAA0B,OAAO,WAAW;AAClD,MAAMC,kBAAiC,OAAO,kBAAkB;AAMhE,SAAgB,mBAAmB,WAA4C;CAC7E,MAAM,eAAe,aAAa,UAAU;AAC5C,KAAI,gBAAgB,KAClB,QAAO;CAGT,IAAIC,sBAA0C;CAC9C,MAAMC,kBAAoC,EAAE;CAC5C,IAAIC,uBAAyC,EAAE;CAC/C,IAAIC;CAEJ,MAAM,2BAA2B;AAC/B,MAAI,qBAAqB,WAAW,KAAK,oBAAoB,MAAM;AACjE,0BAAuB,EAAE;AACzB,sBAAmB;AACnB;;AAGF,MAAI,qBAAqB,WAAW,GAAG;GACrC,MAAM,QAAQ,qBAAqB;AACnC,OAAI,OAAO,SAAS,WAAW;AAC7B,iBAAa,OAAO,iBAAiB;AACrC,SAAK,MAAM,cAAc,MAAM,SAC7B,gBAAe,WAAW;SAG5B,gBAAe,MAAM;AAEvB,mBAAgB,KAAK,MAAM;AAC3B,0BAAuB,EAAE;AACzB,sBAAmB;AACnB;;AAGF,OAAK,MAAM,SAAS,qBAClB,gBAAe,MAAM;AAGvB,kBAAgB,KACd,kBAAkB;GAChB,SAAS;GACT,YAAY,EAAE,aAAa,kBAAkB;GAC7C,UAAU;GACX,CAAC,CACH;AAED,yBAAuB,EAAE;AACzB,qBAAmB;;CAGrB,MAAM,4BAA4B,oBAAwC;AACxE,MAAI,oBAAoB,SACtB;AAEF,MAAI,oBAAoB,iBAAiB;AACvC,yBAAsB;AACtB;;AAEF,MAAI,wBAAwB,UAAU;AACpC,yBAAsB;AACtB;;AAEF,MAAI,wBAAwB,gBAC1B,uBAAsB;;AAI1B,MAAK,MAAM,SAAS,UAAU,UAAU;EACtC,MAAMC,kBACJ,MAAM,SAAS,YAAY,mBAAmB,MAAM,GAAG;AACzD,2BAAyB,gBAAgB;AAEzC,MAAI,OAAO,oBAAoB,UAAU;AACvC,uBAAoB;AACpB,mBAAgB,KAAK,MAAM;AAC3B;;AAGF,MAAI,oBAAoB,QAAQ,qBAAqB,gBACnD,qBAAoB;AAGtB,uBAAqB;AACrB,uBAAqB,KAAK,MAAM;;AAGlC,qBAAoB;AACpB,WAAU,WAAW;AACrB,QAAO;;AAGT,SAAS,aAAa,MAAuC;CAC3D,MAAM,QAAQ,KAAK,WAAW;AAC9B,KAAI,OAAO,UAAU,SACnB,QAAO;;AAKX,SAAS,eAAe,MAA4B;AAClD,KAAI,KAAK,SAAS,UAAW;AAC7B,MAAK,WAAW,eAAe;AAC/B,MAAK,MAAM,SAAS,KAAK,SACvB,gBAAe,MAAM;;AAIzB,SAAS,aAAa,MAAmB,MAAoB;AAC3D,MAAK,WAAW,eAAe"}
+{"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"}

package/dist/worker/WorkerPoolManager.d.ts

@@ -69,10 +69,12 @@ declare class WorkerPoolManager {
   private initializeWorkers;
   private drainQueue;
   highlightFileAST(instance: FileRendererInstance, file: FileContents): void;
-  primeFileHighlightCache(file: FileContents): void;
+  primeFileHighlightCache(file: FileContents): Promise<void>;
+  private getOrCreateFileHighlightCacheTask;
   getPlainFileAST(file: FileContents, startingLine: number, totalLines: number, lines?: string[]): ThemedFileResult | undefined;
   highlightDiffAST(instance: DiffRendererInstance, diff: FileDiffMetadata): void;
-  primeDiffHighlightCache(diff: FileDiffMetadata): void;
+  primeDiffHighlightCache(diff: FileDiffMetadata): Promise<void>;
+  private getOrCreateDiffHighlightCacheTask;
   getPlainDiffAST(diff: FileDiffMetadata, startingLine: number, totalLines: number, expandedHunks?: Map<number, HunkExpansionRegion> | true, collapsedContextThreshold?: number): ThemedDiffResult | undefined;
   terminate(): void;
   private isCurrentLifecycle;
@@ -102,6 +104,9 @@ declare class WorkerPoolManager {
   private detachInstanceFromRenderTask;
   private removeQueuedTask;
   private removeActiveTask;
+  private createRenderTaskCallbacks;
+  private resolveRenderTaskCallbacks;
+  private rejectRenderTaskCallbacks;
   private invalidateRenderTasks;
   private clearQueuedInstanceRequests;
   private clearHighlightKey;

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

@@ -1 +1 @@
-{"version":3,"file":"WorkerPoolManager.d.ts","names":["LRUMapPkg","FileContents","FileDiffMetadata","HunkExpansionRegion","RenderDiffOptions","RenderDiffResult","RenderFileOptions","RenderFileResult","SupportedLanguages","ThemedDiffResult","ThemedFileResult","DiffRendererInstance","FileRendererInstance","WorkerInitializationRenderOptions","WorkerPoolOptions","WorkerRenderingOptions","WorkerStats","GetCachesResult","LRUMap","ThemeSubscriber","RenderTaskInstance","WorkerPoolManager","langs","theme","useTokenTransformer","lineDiffType","maxLineDiffLength","tokenizeMaxLineLength","preferredHighlighter","Partial","Promise","Map"],"sources":["../../src/worker/WorkerPoolManager.d.ts"],"sourcesContent":["import LRUMapPkg from 'lru_map';\nimport type { FileContents, FileDiffMetadata, HunkExpansionRegion, RenderDiffOptions, RenderDiffResult, RenderFileOptions, RenderFileResult, SupportedLanguages, ThemedDiffResult, ThemedFileResult } from '../types';\nimport type { DiffRendererInstance, FileRendererInstance, WorkerInitializationRenderOptions, WorkerPoolOptions, WorkerRenderingOptions, WorkerStats } from './types';\ninterface GetCachesResult {\n    fileCache: LRUMapPkg.LRUMap<string, RenderFileResult>;\n    diffCache: LRUMapPkg.LRUMap<string, RenderDiffResult>;\n}\ninterface ThemeSubscriber {\n    onThemeChange(): void;\n}\ntype RenderTaskInstance = FileRendererInstance | DiffRendererInstance;\nexport declare class WorkerPoolManager {\n    private options;\n    private highlighter;\n    private readonly preferredHighlighter;\n    private renderOptions;\n    private renderOptionsRequestVersion;\n    private renderOptionsVersion;\n    private initialized;\n    private workers;\n    private queuedTasks;\n    private queuedTaskByInstance;\n    private taskByHighlightKey;\n    private activeTaskById;\n    private activeRequestByInstance;\n    private nextRequestId;\n    private themeSubscribers;\n    private workersFailed;\n    private statSubscribers;\n    private fileCache;\n    private diffCache;\n    private _queuedBroadcast;\n    private lifecycleGeneration;\n    constructor(options: WorkerPoolOptions, { langs, theme, useTokenTransformer, lineDiffType, maxLineDiffLength, tokenizeMaxLineLength, preferredHighlighter }: WorkerInitializationRenderOptions);\n    isWorkingPool(): boolean;\n    getFileResultCache(file: FileContents): RenderFileResult | undefined;\n    getDiffResultCache(diff: FileDiffMetadata): RenderDiffResult | undefined;\n    inspectCaches(): GetCachesResult;\n    evictFileFromCache(cacheKey: string): boolean;\n    evictDiffFromCache(cacheKey: string): boolean;\n    setRenderOptions({ theme, useTokenTransformer, lineDiffType, maxLineDiffLength, tokenizeMaxLineLength }: Partial<WorkerRenderingOptions>): Promise<void>;\n    getFileRenderOptions(): RenderFileOptions;\n    getDiffRenderOptions(): RenderDiffOptions;\n    private setRenderOptionsOnWorkers;\n    subscribeToThemeChanges(instance: ThemeSubscriber): () => void;\n    unsubscribeToThemeChanges(instance: ThemeSubscriber): void;\n    subscribeToStatChanges(callback: (stats: WorkerStats) => unknown): () => void;\n    private queueBroadcastStateChanges;\n    private _broadcastStateChanges;\n    cleanUpTasks(instance: RenderTaskInstance): void;\n    isInitialized(): boolean;\n    initialize(languages?: SupportedLanguages[]): Promise<void>;\n    private initializeWorkers;\n    private drainQueue;\n    highlightFileAST(instance: FileRendererInstance, file: FileContents): void;\n    primeFileHighlightCache(file: FileContents): void;\n    getPlainFileAST(file: FileContents, startingLine: number, totalLines: number, lines?: string[]): ThemedFileResult | undefined;\n    highlightDiffAST(instance: DiffRendererInstance, diff: FileDiffMetadata): void;\n    primeDiffHighlightCache(diff: FileDiffMetadata): void;\n    getPlainDiffAST(diff: FileDiffMetadata, startingLine: number, totalLines: number, expandedHunks?: Map<number, HunkExpansionRegion> | true, collapsedContextThreshold?: number): ThemedDiffResult | undefined;\n    terminate(): void;\n    private isCurrentLifecycle;\n    private queueInitialization;\n    private cancelActiveWorkerTasks;\n    private terminateWorkers;\n    getStats(): WorkerStats;\n    private submitTask;\n    private submitCacheTask;\n    private enqueueRenderTask;\n    private resolveLanguagesAndExecuteTask;\n    private handleWorkerMessage;\n    private _queuedDrain;\n    private queueDrain;\n    private assignWorkerToTask;\n    private cleanWorkerAndTask;\n    private executeTask;\n    private maybeAttachCustomExtensions;\n    private syncCustomExtensionVersion;\n    private getAvailableWorker;\n    private getFileHighlightKey;\n    private getDiffHighlightKey;\n    private getHighlightKeyForRequest;\n    private hasActiveRequest;\n    private addInstanceToTask;\n    private detachInstanceFromQueuedTasks;\n    private detachInstanceFromRenderTask;\n    private removeQueuedTask;\n    private removeActiveTask;\n    private invalidateRenderTasks;\n    private clearQueuedInstanceRequests;\n    private clearHighlightKey;\n    private trackInstanceRequests;\n    private clearInstanceRequests;\n    private notifyFileInstances;\n    private notifyDiffInstances;\n    private notifyHighlightError;\n    private hasMatchingFileInstanceTask;\n    private hasMatchingDiffInstanceTask;\n    private getTaskByHighlightKey;\n    private isCurrentRenderTask;\n    private iterateRenderTasks;\n    private generateRequestId;\n}\nexport {};\n//# sourceMappingURL=WorkerPoolManager.d.ts.map"],"mappings":"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"}
+{"version":3,"file":"WorkerPoolManager.d.ts","names":[],"sources":["../../src/worker/WorkerPoolManager.ts"],"mappings":"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"}

package/dist/worker/WorkerPoolManager.js

@@ -19,7 +19,6 @@ import { resolveLanguages } from "../highlighter/languages/resolveLanguages.js";
 import { getResolvedThemes } from "../highlighter/themes/getResolvedThemes.js";
 import { resolveThemes } from "../highlighter/themes/resolveThemes.js";
 import LRUMapPkg from "lru_map";
-
 //#region src/worker/WorkerPoolManager.ts
 const IGNORE_RESPONSE = Symbol("IGNORE_RESPONSE");
 var WorkerPoolTerminatedError = class extends Error {
@@ -27,7 +26,13 @@ var WorkerPoolTerminatedError = class extends Error {
 		super("WorkerPoolManager: operation canceled because the pool terminated");
 	}
 };
+var WorkerPoolTaskCanceledError = class extends Error {
+	constructor() {
+		super("WorkerPoolManager: operation canceled before the task completed");
+	}
+};
 var WorkerPoolManager = class {
+	options;
 	highlighter;
 	preferredHighlighter;
 	renderOptions;
@@ -92,7 +97,7 @@ var WorkerPoolManager = class {
 			this.queueBroadcastStateChanges();
 		}
 	}
-	async setRenderOptions({ theme = DEFAULT_THEMES, useTokenTransformer = false, lineDiffType = "word-alt", maxLineDiffLength = 1e3, tokenizeMaxLineLength = 1e3 }) {
+	async setRenderOptions({ theme = this.renderOptions.theme ?? DEFAULT_THEMES, useTokenTransformer = this.renderOptions.useTokenTransformer ?? false, lineDiffType = this.renderOptions.lineDiffType ?? "word-alt", maxLineDiffLength = this.renderOptions.maxLineDiffLength ?? 1e3, tokenizeMaxLineLength = this.renderOptions.tokenizeMaxLineLength ?? 1e3 }) {
 		const { lifecycleGeneration } = this;
 		const renderOptionsRequestVersion = ++this.renderOptionsRequestVersion;
 		const isCurrentRequest = () => this.isCurrentLifecycle(lifecycleGeneration) && this.renderOptionsRequestVersion === renderOptionsRequestVersion;
@@ -269,6 +274,7 @@ var WorkerPoolManager = class {
 						}
 						this.initialized = false;
 						this.workersFailed = true;
+						for (const task of this.queuedTasks) this.rejectRenderTaskCallbacks(task, normalizeWorkerError(e));
 						this.queueBroadcastStateChanges();
 						reject(e);
 					}
@@ -290,7 +296,7 @@ var WorkerPoolManager = class {
 				requestId: void 0,
 				pendingSetupRequestId: void 0,
 				initialized: false,
-				langs: new Set(["text", ...resolvedLanguages.map(({ name }) => name)]),
+				langs: /* @__PURE__ */ new Set(["text", ...resolvedLanguages.map(({ name }) => name)]),
 				customExtensionsVersion: 0
 			};
 			worker.addEventListener("message", (event) => {
@@ -353,6 +359,11 @@ var WorkerPoolManager = class {
 		});
 	}
 	primeFileHighlightCache(file) {
+		if (!this.isWorkingPool()) return Promise.reject(/* @__PURE__ */ new Error("WorkerPoolManager.primeFileHighlightCache: worker pool is not working"));
+		const task = this.getOrCreateFileHighlightCacheTask(file);
+		return task != null ? this.createRenderTaskCallbacks(task) : Promise.resolve();
+	}
+	getOrCreateFileHighlightCacheTask(file) {
 		if (file.cacheKey == null) {
 			console.warn(`WorkerPoolManager.primeFileHighlightCache: priming highlight cache requires file.cacheKey; skipping "${file.name}".`);
 			return;
@@ -361,11 +372,16 @@ var WorkerPoolManager = class {
 		const highlightKey = this.getFileHighlightKey(file);
 		if (highlightKey == null || isFilePlainText(file) || cachedResult != null && areFileRenderOptionsEqual(cachedResult.options, this.getFileRenderOptions())) return;
 		const existingTask = this.getTaskByHighlightKey(highlightKey);
-		if (existingTask != null) existingTask.primeCache = true;
-		else this.submitCacheTask({
-			type: "file",
-			file
-		}, highlightKey);
+		if (existingTask != null) {
+			existingTask.primeCache = true;
+			return existingTask.type === "file" ? existingTask : void 0;
+		} else {
+			const task = this.submitCacheTask({
+				type: "file",
+				file
+			}, highlightKey);
+			return task.type === "file" ? task : void 0;
+		}
 	}
 	getPlainFileAST(file, startingLine, totalLines, lines) {
 		if (this.highlighter == null) {
@@ -388,6 +404,11 @@ var WorkerPoolManager = class {
 		});
 	}
 	primeDiffHighlightCache(diff) {
+		if (!this.isWorkingPool()) return Promise.reject(/* @__PURE__ */ new Error("WorkerPoolManager.primeDiffHighlightCache: worker pool is not working"));
+		const task = this.getOrCreateDiffHighlightCacheTask(diff);
+		return task != null ? this.createRenderTaskCallbacks(task) : Promise.resolve();
+	}
+	getOrCreateDiffHighlightCacheTask(diff) {
 		if (diff.cacheKey == null) {
 			console.warn(`WorkerPoolManager.primeDiffHighlightCache: priming highlight cache requires diff.cacheKey; skipping "${diff.prevName ?? diff.name}" -> "${diff.name}".`);
 			return;
@@ -396,11 +417,16 @@ var WorkerPoolManager = class {
 		const highlightKey = this.getDiffHighlightKey(diff);
 		if (highlightKey == null || isDiffPlainText(diff) || cachedResult != null && areDiffRenderOptionsEqual(cachedResult.options, this.getDiffRenderOptions())) return;
 		const existingTask = this.getTaskByHighlightKey(highlightKey);
-		if (existingTask != null) existingTask.primeCache = true;
-		else this.submitCacheTask({
-			type: "diff",
-			diff
-		}, highlightKey);
+		if (existingTask != null) {
+			existingTask.primeCache = true;
+			return existingTask.type === "diff" ? existingTask : void 0;
+		} else {
+			const task = this.submitCacheTask({
+				type: "diff",
+				diff
+			}, highlightKey);
+			return task.type === "diff" ? task : void 0;
+		}
 	}
 	getPlainDiffAST(diff, startingLine, totalLines, expandedHunks, collapsedContextThreshold) {
 		return this.highlighter != null ? renderDiffWithHighlighter(diff, this.highlighter, this.renderOptions, {
@@ -415,6 +441,8 @@ var WorkerPoolManager = class {
 		this.lifecycleGeneration++;
 		this.cancelActiveWorkerTasks();
 		this.terminateWorkers();
+		const error = new WorkerPoolTerminatedError();
+		for (const task of this.queuedTasks) this.rejectRenderTaskCallbacks(task, error);
 		this.fileCache.clear();
 		this.diffCache.clear();
 		this.activeRequestByInstance.clear();
@@ -438,6 +466,7 @@ var WorkerPoolManager = class {
 	cancelActiveWorkerTasks() {
 		const error = new WorkerPoolTerminatedError();
 		for (const task of this.activeTaskById.values()) if ("reject" in task) task.reject(error);
+		else if (isRenderTask(task)) this.rejectRenderTaskCallbacks(task, error);
 	}
 	terminateWorkers() {
 		for (const managedWorker of this.workers) managedWorker.worker.terminate();
@@ -483,9 +512,10 @@ var WorkerPoolManager = class {
 						...request,
 						id
 					},
-					instances: new Set([instance]),
+					instances: /* @__PURE__ */ new Set([instance]),
 					primeCache: false,
 					highlightKey,
+					callbacks: /* @__PURE__ */ new Set(),
 					renderOptionsVersion,
 					requestStart
 				};
@@ -496,9 +526,10 @@ var WorkerPoolManager = class {
 						...request,
 						id
 					},
-					instances: new Set([instance]),
+					instances: /* @__PURE__ */ new Set([instance]),
 					primeCache: false,
 					highlightKey,
+					callbacks: /* @__PURE__ */ new Set(),
 					renderOptionsVersion,
 					requestStart
 				};
@@ -523,6 +554,7 @@ var WorkerPoolManager = class {
 					instances: /* @__PURE__ */ new Set(),
 					primeCache: true,
 					highlightKey,
+					callbacks: /* @__PURE__ */ new Set(),
 					renderOptionsVersion,
 					requestStart
 				};
@@ -536,12 +568,14 @@ var WorkerPoolManager = class {
 					instances: /* @__PURE__ */ new Set(),
 					primeCache: true,
 					highlightKey,
+					callbacks: /* @__PURE__ */ new Set(),
 					renderOptionsVersion,
 					requestStart
 				};
 			}
 		})();
 		this.enqueueRenderTask(task);
+		return task;
 	}
 	enqueueRenderTask(task, instance) {
 		this.queuedTasks.push(task);
@@ -563,7 +597,8 @@ var WorkerPoolManager = class {
 				return;
 			}
 			this.executeTask(availableWorker, task);
-		} catch {
+		} catch (error) {
+			this.rejectRenderTaskCallbacks(task, normalizeWorkerError(error));
 			this.cleanWorkerAndTask(availableWorker, task);
 			this.queueBroadcastStateChanges();
 			if (this.queuedTasks.length > 0) this.queueDrain();
@@ -577,8 +612,10 @@ var WorkerPoolManager = class {
 				const error = new Error(response.error);
 				if (response.stack) error.stack = response.stack;
 				if ("reject" in task) task.reject(error);
-				else if (isRenderTask(task)) this.notifyHighlightError(task, error);
-				else throw new Error("handleWorkerMessage: unknown task type");
+				else if (isRenderTask(task)) {
+					this.notifyHighlightError(task, error);
+					this.rejectRenderTaskCallbacks(task, error);
+				} else throw new Error("handleWorkerMessage: unknown task type");
 				throw error;
 			} else switch (response.requestType) {
 				case "initialize":
@@ -596,10 +633,11 @@ var WorkerPoolManager = class {
 					if (!this.isCurrentRenderTask(task) || !areFileRenderOptionsEqual(options, this.getFileRenderOptions())) throw IGNORE_RESPONSE;
 					const { request } = task;
 					this.syncCustomExtensionVersion(managedWorker, request);
-					if (request.file.cacheKey != null) this.fileCache.set(request.file.cacheKey, {
+					if (task.cacheKeyAtDispatch != null) this.fileCache.set(task.cacheKeyAtDispatch, {
 						result,
 						options
 					});
+					this.resolveRenderTaskCallbacks(task);
 					this.notifyFileInstances(task, result, options);
 					break;
 				}
@@ -609,10 +647,11 @@ var WorkerPoolManager = class {
 					if (!this.isCurrentRenderTask(task) || !areDiffRenderOptionsEqual(options, this.getDiffRenderOptions())) throw IGNORE_RESPONSE;
 					const { request } = task;
 					this.syncCustomExtensionVersion(managedWorker, request);
-					if (request.diff.cacheKey != null) this.diffCache.set(request.diff.cacheKey, {
+					if (task.cacheKeyAtDispatch != null) this.diffCache.set(task.cacheKeyAtDispatch, {
 						result,
 						options
 					});
+					this.resolveRenderTaskCallbacks(task);
 					this.notifyDiffInstances(task, result, options);
 					break;
 				}
@@ -643,6 +682,7 @@ var WorkerPoolManager = class {
 		if (managedWorker.pendingSetupRequestId === requestId) managedWorker.pendingSetupRequestId = void 0;
 		if (task != null) {
 			if (isRenderTask(task)) {
+				this.rejectRenderTaskCallbacks(task, new WorkerPoolTaskCanceledError());
 				this.clearInstanceRequests(task);
 				this.clearHighlightKey(task);
 			}
@@ -654,11 +694,15 @@ var WorkerPoolManager = class {
 		if (!this.activeTaskById.has(task.id)) this.assignWorkerToTask(task, managedWorker);
 		for (const lang of getLangsFromTask(task)) managedWorker.langs.add(lang);
 		try {
+			if (task.type === "file") task.cacheKeyAtDispatch = task.request.file.cacheKey;
+			else if (task.type === "diff") task.cacheKeyAtDispatch = task.request.diff.cacheKey;
 			managedWorker.worker.postMessage(task.request);
 		} catch (error) {
 			console.error("Failed to post message to worker:", error);
-			if (isRenderTask(task)) this.notifyHighlightError(task, error);
-			else if ("reject" in task) task.reject(error);
+			if (isRenderTask(task)) {
+				this.notifyHighlightError(task, error);
+				this.rejectRenderTaskCallbacks(task, normalizeWorkerError(error));
+			} else if ("reject" in task) task.reject(error);
 			this.cleanWorkerAndTask(managedWorker, task);
 			if (this.queuedTasks.length > 0) this.queueDrain();
 		}
@@ -728,14 +772,32 @@ var WorkerPoolManager = class {
 	removeQueuedTask(task) {
 		const index = this.queuedTasks.indexOf(task);
 		if (index !== -1) this.queuedTasks.splice(index, 1);
+		this.rejectRenderTaskCallbacks(task, new WorkerPoolTaskCanceledError());
 		this.clearQueuedInstanceRequests(task);
 		this.clearHighlightKey(task);
 	}
 	removeActiveTask(task) {
+		this.rejectRenderTaskCallbacks(task, new WorkerPoolTaskCanceledError());
 		this.clearInstanceRequests(task);
 		this.clearHighlightKey(task);
 		this.activeTaskById.delete(task.id);
 	}
+	createRenderTaskCallbacks(task) {
+		return new Promise((resolve, reject) => {
+			task.callbacks.add({
+				resolve,
+				reject
+			});
+		});
+	}
+	resolveRenderTaskCallbacks(task) {
+		for (const callbacks of task.callbacks) callbacks.resolve();
+		task.callbacks.clear();
+	}
+	rejectRenderTaskCallbacks(task, error) {
+		for (const callbacks of task.callbacks) callbacks.reject(error);
+		task.callbacks.clear();
+	}
 	invalidateRenderTasks() {
 		for (let index = this.queuedTasks.length - 1; index >= 0; index--) {
 			const task = this.queuedTasks[index];
@@ -811,7 +873,10 @@ function isRenderTask(task) {
 function getInstances(task) {
 	return task.instances;
 }
-
+function normalizeWorkerError(error) {
+	return error instanceof Error ? error : new Error(String(error));
+}
 //#endregion
 export { WorkerPoolManager };
+
 //# sourceMappingURL=WorkerPoolManager.js.map