@pierre/diffs 1.5.0 → 1.5.2

package/dist/worker/errors.js

@@ -0,0 +1,52 @@
+//#region src/worker/errors.ts
+/** The pool was terminated while the operation was pending. */
+var WorkerPoolTerminatedError = class extends Error {
+	constructor() {
+		super("WorkerPoolManager: operation canceled because the pool terminated");
+		this.name = "WorkerPoolTerminatedError";
+	}
+};
+/** The task was replaced or removed before it completed. */
+var WorkerPoolTaskCanceledError = class extends Error {
+	constructor() {
+		super("WorkerPoolManager: operation canceled before the task completed");
+		this.name = "WorkerPoolTaskCanceledError";
+	}
+};
+/**
+* A worker failed during initialization. The pool rejects initialization and
+* pending highlight requests with this error. Components then highlight on
+* the main thread.
+*/
+var WorkerPoolWorkerError = class extends Error {
+	constructor(message, options) {
+		super(message, options);
+		this.name = "WorkerPoolWorkerError";
+	}
+};
+const reportedWorkerErrors = /* @__PURE__ */ new WeakSet();
+/**
+* Mark a worker error as reported so the pool and its consumers do not log it
+* again. Used internally by the pool; not exported from the package entry.
+*/
+function markWorkerErrorReported(error) {
+	reportedWorkerErrors.add(error);
+}
+/**
+* Returns true when an operation was canceled because the pool was terminated
+* or the task was replaced or removed before completion.
+*/
+function isWorkerPoolCancellation(error) {
+	return error instanceof WorkerPoolTerminatedError || error instanceof WorkerPoolTaskCanceledError;
+}
+/**
+* Returns true for cancellations and worker errors passed to onWorkerError.
+* Callers use this to skip cancellation logs and duplicate error reports.
+*/
+function isHandledWorkerPoolError(error) {
+	return isWorkerPoolCancellation(error) || error instanceof WorkerPoolWorkerError && reportedWorkerErrors.has(error);
+}
+//#endregion
+export { WorkerPoolTaskCanceledError, WorkerPoolTerminatedError, WorkerPoolWorkerError, isHandledWorkerPoolError, isWorkerPoolCancellation, markWorkerErrorReported };
+
+//# sourceMappingURL=errors.js.map

package/dist/worker/errors.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"errors.js","names":[],"sources":["../../src/worker/errors.ts"],"sourcesContent":["// Error types shared by the worker pool and its consumers. Keep this module\n// free of imports so components can handle pool errors without loading the\n// pool implementation and its dependencies.\n\n/** The pool was terminated while the operation was pending. */\nexport class WorkerPoolTerminatedError extends Error {\n  constructor() {\n    super('WorkerPoolManager: operation canceled because the pool terminated');\n    this.name = 'WorkerPoolTerminatedError';\n  }\n}\n\n/** The task was replaced or removed before it completed. */\nexport class WorkerPoolTaskCanceledError extends Error {\n  constructor() {\n    super('WorkerPoolManager: operation canceled before the task completed');\n    this.name = 'WorkerPoolTaskCanceledError';\n  }\n}\n\n/**\n * A worker failed during initialization. The pool rejects initialization and\n * pending highlight requests with this error. Components then highlight on\n * the main thread.\n */\nexport class WorkerPoolWorkerError extends Error {\n  constructor(message: string, options?: ErrorOptions) {\n    super(message, options);\n    this.name = 'WorkerPoolWorkerError';\n  }\n}\n\n// Track errors passed to onWorkerError without adding fields to the errors.\nconst reportedWorkerErrors = new WeakSet<WorkerPoolWorkerError>();\n\n/**\n * Mark a worker error as reported so the pool and its consumers do not log it\n * again. Used internally by the pool; not exported from the package entry.\n */\nexport function markWorkerErrorReported(error: WorkerPoolWorkerError): void {\n  reportedWorkerErrors.add(error);\n}\n\n/**\n * Returns true when an operation was canceled because the pool was terminated\n * or the task was replaced or removed before completion.\n */\nexport function isWorkerPoolCancellation(\n  error: unknown\n): error is WorkerPoolTerminatedError | WorkerPoolTaskCanceledError {\n  return (\n    error instanceof WorkerPoolTerminatedError ||\n    error instanceof WorkerPoolTaskCanceledError\n  );\n}\n\n/**\n * Returns true for cancellations and worker errors passed to onWorkerError.\n * Callers use this to skip cancellation logs and duplicate error reports.\n */\nexport function isHandledWorkerPoolError(error: unknown): boolean {\n  return (\n    isWorkerPoolCancellation(error) ||\n    (error instanceof WorkerPoolWorkerError && reportedWorkerErrors.has(error))\n  );\n}\n"],"mappings":";;AAKA,IAAa,4BAAb,cAA+C,MAAM;CACnD,cAAc;EACZ,MAAM,mEAAmE;EACzE,KAAK,OAAO;CACd;AACF;;AAGA,IAAa,8BAAb,cAAiD,MAAM;CACrD,cAAc;EACZ,MAAM,iEAAiE;EACvE,KAAK,OAAO;CACd;AACF;;;;;;AAOA,IAAa,wBAAb,cAA2C,MAAM;CAC/C,YAAY,SAAiB,SAAwB;EACnD,MAAM,SAAS,OAAO;EACtB,KAAK,OAAO;CACd;AACF;AAGA,MAAM,uCAAuB,IAAI,QAA+B;;;;;AAMhE,SAAgB,wBAAwB,OAAoC;CAC1E,qBAAqB,IAAI,KAAK;AAChC;;;;;AAMA,SAAgB,yBACd,OACkE;CAClE,OACE,iBAAiB,6BACjB,iBAAiB;AAErB;;;;;AAMA,SAAgB,yBAAyB,OAAyB;CAChE,OACE,yBAAyB,KAAK,KAC7B,iBAAiB,yBAAyB,qBAAqB,IAAI,KAAK;AAE7E"}

package/dist/worker/index.d.ts

@@ -1,4 +1,5 @@
+import { WorkerPoolTaskCanceledError, WorkerPoolTerminatedError, WorkerPoolWorkerError, isHandledWorkerPoolError, isWorkerPoolCancellation } from "./errors.js";
 import { AllWorkerTasks, DiffRendererInstance, FileRendererInstance, InitializeSuccessResponse, InitializeWorkerRequest, InitializeWorkerTask, RegisterThemeSuccessResponse, RenderDiffRequest, RenderDiffSuccessResponse, RenderDiffTask, RenderErrorResponse, RenderFileRequest, RenderFileSuccessResponse, RenderFileTask, RenderSuccessResponse, RenderTaskCallbacks, ResolvedLanguage, SetRenderOptionsWorkerRequest, SetRenderOptionsWorkerTask, SubmitRequest, WorkerInitializationRenderOptions, WorkerPoolOptions, WorkerRenderingOptions, WorkerRequest, WorkerRequestId, WorkerResponse, WorkerStats } from "./types.js";
 import { WorkerPoolManager } from "./WorkerPoolManager.js";
 import { SetupWorkerPoolProps, getOrCreateWorkerPoolSingleton, terminateWorkerPoolSingleton } from "./getOrCreateWorkerPoolSingleton.js";
-export { AllWorkerTasks, DiffRendererInstance, FileRendererInstance, InitializeSuccessResponse, InitializeWorkerRequest, InitializeWorkerTask, RegisterThemeSuccessResponse, RenderDiffRequest, RenderDiffSuccessResponse, RenderDiffTask, RenderErrorResponse, RenderFileRequest, RenderFileSuccessResponse, RenderFileTask, RenderSuccessResponse, RenderTaskCallbacks, ResolvedLanguage, SetRenderOptionsWorkerRequest, SetRenderOptionsWorkerTask, SetupWorkerPoolProps, SubmitRequest, WorkerInitializationRenderOptions, WorkerPoolManager, WorkerPoolOptions, WorkerRenderingOptions, WorkerRequest, WorkerRequestId, WorkerResponse, WorkerStats, getOrCreateWorkerPoolSingleton, terminateWorkerPoolSingleton };
+export { AllWorkerTasks, DiffRendererInstance, FileRendererInstance, InitializeSuccessResponse, InitializeWorkerRequest, InitializeWorkerTask, RegisterThemeSuccessResponse, RenderDiffRequest, RenderDiffSuccessResponse, RenderDiffTask, RenderErrorResponse, RenderFileRequest, RenderFileSuccessResponse, RenderFileTask, RenderSuccessResponse, RenderTaskCallbacks, ResolvedLanguage, SetRenderOptionsWorkerRequest, SetRenderOptionsWorkerTask, SetupWorkerPoolProps, SubmitRequest, WorkerInitializationRenderOptions, WorkerPoolManager, WorkerPoolOptions, WorkerPoolTaskCanceledError, WorkerPoolTerminatedError, WorkerPoolWorkerError, WorkerRenderingOptions, WorkerRequest, WorkerRequestId, WorkerResponse, WorkerStats, getOrCreateWorkerPoolSingleton, isHandledWorkerPoolError, isWorkerPoolCancellation, terminateWorkerPoolSingleton };

package/dist/worker/index.js

@@ -1,3 +1,4 @@
+import { WorkerPoolTaskCanceledError, WorkerPoolTerminatedError, WorkerPoolWorkerError, isHandledWorkerPoolError, isWorkerPoolCancellation } from "./errors.js";
 import { WorkerPoolManager } from "./WorkerPoolManager.js";
 import { getOrCreateWorkerPoolSingleton, terminateWorkerPoolSingleton } from "./getOrCreateWorkerPoolSingleton.js";
-export { WorkerPoolManager, getOrCreateWorkerPoolSingleton, terminateWorkerPoolSingleton };
+export { WorkerPoolManager, WorkerPoolTaskCanceledError, WorkerPoolTerminatedError, WorkerPoolWorkerError, getOrCreateWorkerPoolSingleton, isHandledWorkerPoolError, isWorkerPoolCancellation, terminateWorkerPoolSingleton };

package/dist/worker/types.d.ts

@@ -108,6 +108,19 @@ interface WorkerPoolOptions {
    * @default 10000
    */
   workerInitializationTimeout?: number;
+  /**
+   * Called for each worker error instead of logging it with console.error.
+   * Call event.preventDefault() to prevent the browser from also reporting it
+   * as an uncaught error.
+   *
+   * Script load failures may provide a plain Event without message or error;
+   * uncaught exceptions provide an ErrorEvent. If initialization fails, the
+   * pool stops its workers and components highlight on the main thread.
+   *
+   * Several workers can report the same script load failure. Track errors in
+   * this callback if your application should report that failure only once.
+   */
+  onWorkerError?: (event: ErrorEvent | Event, worker: Worker) => void;
   totalASTLRUCacheSize?: number;
 }
 interface WorkerInitializationRenderOptions extends Partial<WorkerRenderingOptions> {

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","names":[],"sources":["../../src/worker/types.ts"],"mappings":";;KAiBY;UAEK;EACf,OAAO,kBAAkB;EACzB;EACA;EACA,cAAc;EACd;;UAGe;WACN;EACT,mBACE,MAAM,cACN,QAAQ,kBACR,SAAS;EAEX,iBAAiB;;UAGF;WACN;EACT,mBACE,MAAM,kBACN,QAAQ,kBACR,SAAS;EAEX,iBAAiB;;UAGF;EACf;EACA,IAAI;EACJ,MAAM;EACN,oBAAoB;EACpB;EACA,qBAAqB;;UAGN;EACf;EACA,IAAI;EACJ,MAAM;EACN,oBAAoB;EACpB;EACA,qBAAqB;;UAGN;EACf;EACA,IAAI;EACJ,eAAe;EACf,sBAAsB;EACtB,gBAAgB;EAChB,oBAAoB;EACpB;EACA,qBAAqB;;UAGN;EACf,MAAM,QAAQ;EACd,MAAM;;UAGS;EACf;EACA,IAAI;EACJ,eAAe;EACf,gBAAgB;;KAGN,gBACR,KAAK,2BACL,KAAK;KAEG,gBACR,oBACA,oBACA,0BACA;UAEa;EACf;EACA;EACA,IAAI;EACJ,QAAQ;EACR,SAAS;EACT;;UAGe;EACf;EACA;EACA,IAAI;EACJ,QAAQ;EACR,SAAS;EACT;;UAGe;EACf;EACA;EACA,IAAI;EACJ;;UAGe;EACf;EACA;EACA,IAAI;EACJ;;UAGe;EACf;EACA,IAAI;EACJ;EACA;;KAGU,wBACR,4BACA;KAEQ,iBACR,wBACA,sBACA,4BACA;UAEa;;;;;EAKf,qBAAqB;;;;;EAMrB;;;;;EAMA;EAEA;;UAGe,0CAA0C,QAAQ;EACjE,QAAQ;EACR,uBAAuB;;UAGR;EACf;EACA,IAAI;EACJ,SAAS;EACT,QAAQ;EACR,OAAO,OAAO;EACd;;UAGe;EACf;EACA,IAAI;EACJ,SAAS;EACT,QAAQ;EACR,OAAO,OAAO;EACd;;UAGe;EACf;EACA,OAAO,OAAO;;UAGC;EACf;EACA,IAAI;EACJ,SAAS;;EAET;EACA,WAAW,IAAI;EAGf;EACA;EACA,WAAW,IAAI;EACf;EACA;;UAGe;EACf;EACA,IAAI;EACJ,SAAS;;EAET;EACA,WAAW,IAAI;EAGf;EACA;EACA,WAAW,IAAI;EACf;EACA;;KAGU,iBACR,uBACA,6BACA,iBACA;UAEa;EACf;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA"}
+{"version":3,"file":"types.d.ts","names":[],"sources":["../../src/worker/types.ts"],"mappings":";;KAiBY;UAEK;EACf,OAAO,kBAAkB;EACzB;EACA;EACA,cAAc;EACd;;UAGe;WACN;EACT,mBACE,MAAM,cACN,QAAQ,kBACR,SAAS;EAEX,iBAAiB;;UAGF;WACN;EACT,mBACE,MAAM,kBACN,QAAQ,kBACR,SAAS;EAEX,iBAAiB;;UAGF;EACf;EACA,IAAI;EACJ,MAAM;EACN,oBAAoB;EACpB;EACA,qBAAqB;;UAGN;EACf;EACA,IAAI;EACJ,MAAM;EACN,oBAAoB;EACpB;EACA,qBAAqB;;UAGN;EACf;EACA,IAAI;EACJ,eAAe;EACf,sBAAsB;EACtB,gBAAgB;EAChB,oBAAoB;EACpB;EACA,qBAAqB;;UAGN;EACf,MAAM,QAAQ;EACd,MAAM;;UAGS;EACf;EACA,IAAI;EACJ,eAAe;EACf,gBAAgB;;KAGN,gBACR,KAAK,2BACL,KAAK;KAEG,gBACR,oBACA,oBACA,0BACA;UAEa;EACf;EACA;EACA,IAAI;EACJ,QAAQ;EACR,SAAS;EACT;;UAGe;EACf;EACA;EACA,IAAI;EACJ,QAAQ;EACR,SAAS;EACT;;UAGe;EACf;EACA;EACA,IAAI;EACJ;;UAGe;EACf;EACA;EACA,IAAI;EACJ;;UAGe;EACf;EACA,IAAI;EACJ;EACA;;KAGU,wBACR,4BACA;KAEQ,iBACR,wBACA,sBACA,4BACA;UAEa;;;;;EAKf,qBAAqB;;;;;EAMrB;;;;;EAMA;;;;;;;;;;;;;EAcA,iBAAiB,OAAO,aAAa,OAAO,QAAQ;EAEpD;;UAGe,0CAA0C,QAAQ;EACjE,QAAQ;EACR,uBAAuB;;UAGR;EACf;EACA,IAAI;EACJ,SAAS;EACT,QAAQ;EACR,OAAO,OAAO;EACd;;UAGe;EACf;EACA,IAAI;EACJ,SAAS;EACT,QAAQ;EACR,OAAO,OAAO;EACd;;UAGe;EACf;EACA,OAAO,OAAO;;UAGC;EACf;EACA,IAAI;EACJ,SAAS;;EAET;EACA,WAAW,IAAI;EAGf;EACA;EACA,WAAW,IAAI;EACf;EACA;;UAGe;EACf;EACA,IAAI;EACJ,SAAS;;EAET;EACA,WAAW,IAAI;EAGf;EACA;EACA,WAAW,IAAI;EACf;EACA;;KAGU,iBACR,uBACA,6BACA,iBACA;UAEa;EACf;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA"}

package/dist/worker/worker-portable.js

@@ -11136,6 +11136,7 @@ const EXTENSION_TO_FILE_FORMAT = {
 	mli: "ocaml",
 	mll: "ocaml",
 	mly: "ocaml",
+	odin: "odin",
 	pas: "pascal",
 	p: "pascal",
 	pl: "prolog",
@@ -11168,6 +11169,17 @@ const EXTENSION_TO_FILE_FORMAT = {
 	py: "python",
 	pyw: "python",
 	pyi: "python",
+	BUCK: "python",
+	BUILD: "python",
+	PACKAGE: "python",
+	WORKSPACE: "python",
+	Tiltfile: "python",
+	bazel: "python",
+	bxl: "python",
+	bzl: "python",
+	bzlmod: "python",
+	star: "python",
+	sky: "python",
 	qml: "qml",
 	qmldir: "qmldir",
 	qss: "qss",
@@ -11278,16 +11290,22 @@ const EXTENSION_TO_FILE_FORMAT = {
 	sty: "tex"
 };
 function getFiletypeFromFileName(fileName) {
+	const format = matchFiletypeFromName(fileName);
+	if (format != null) return format;
+	const baseName = fileName.split(/[/\\]/).pop() ?? fileName;
+	return baseName === fileName ? "text" : matchFiletypeFromName(baseName) ?? "text";
+}
+function matchFiletypeFromName(fileName) {
 	if (CUSTOM_EXTENSION_TO_FILE_FORMAT.has(fileName)) return CUSTOM_EXTENSION_TO_FILE_FORMAT.get(fileName) ?? "text";
-	if (EXTENSION_TO_FILE_FORMAT[fileName] != null) return EXTENSION_TO_FILE_FORMAT[fileName];
+	if (Object.hasOwn(EXTENSION_TO_FILE_FORMAT, fileName)) return EXTENSION_TO_FILE_FORMAT[fileName] ?? null;
 	const compoundMatch = fileName.match(/\.([^/\\]+\.[^/\\]+)$/);
 	if (compoundMatch != null) {
 		if (CUSTOM_EXTENSION_TO_FILE_FORMAT.has(compoundMatch[1])) return CUSTOM_EXTENSION_TO_FILE_FORMAT.get(compoundMatch[1]) ?? "text";
-		if (EXTENSION_TO_FILE_FORMAT[compoundMatch[1]] != null) return EXTENSION_TO_FILE_FORMAT[compoundMatch[1]] ?? "text";
+		if (Object.hasOwn(EXTENSION_TO_FILE_FORMAT, compoundMatch[1])) return EXTENSION_TO_FILE_FORMAT[compoundMatch[1]] ?? "text";
 	}
 	const simpleMatch = fileName.match(/\.([^.]+)$/)?.[1] ?? "";
 	if (CUSTOM_EXTENSION_TO_FILE_FORMAT.has(simpleMatch)) return CUSTOM_EXTENSION_TO_FILE_FORMAT.get(simpleMatch) ?? "text";
-	return EXTENSION_TO_FILE_FORMAT[simpleMatch] ?? "text";
+	return Object.hasOwn(EXTENSION_TO_FILE_FORMAT, simpleMatch) ? EXTENSION_TO_FILE_FORMAT[simpleMatch] ?? "text" : null;
 }
 function replaceCustomExtensions(version, map) {
 	if (version <= customExtensionsVersion) return false;
@@ -13017,12 +13035,51 @@ function renderDiffWithHighlighter(diff, highlighter, options, { forcePlainText,
 		baseThemeType
 	};
 }
+function pushWordLineDecorations(lineDiff, { deletionLineIndex, additionLineIndex, deletionDecorations, additionDecorations }) {
+	let deletionOffset = 0;
+	let additionOffset = 0;
+	let deletionStart = -1;
+	let deletionEnd = 0;
+	let additionStart = -1;
+	let additionEnd = 0;
+	for (const { value, added, removed } of lineDiff) if (removed) {
+		if (deletionStart === -1) deletionStart = deletionOffset;
+		deletionOffset += value.length;
+		deletionEnd = deletionOffset;
+	} else if (added) {
+		if (additionStart === -1) additionStart = additionOffset;
+		additionOffset += value.length;
+		additionEnd = additionOffset;
+	} else {
+		deletionOffset += value.length;
+		additionOffset += value.length;
+	}
+	if (deletionStart !== -1) deletionDecorations.push(createDiffSpanDecoration({
+		line: deletionLineIndex,
+		spanStart: deletionStart,
+		spanLength: deletionEnd - deletionStart
+	}));
+	if (additionStart !== -1) additionDecorations.push(createDiffSpanDecoration({
+		line: additionLineIndex,
+		spanStart: additionStart,
+		spanLength: additionEnd - additionStart
+	}));
+}
 function computeLineDiffDecorations({ deletionLine, additionLine, deletionLineIndex, additionLineIndex, deletionDecorations, additionDecorations, lineDiffType, maxLineDiffLength }) {
 	if (deletionLine == null || additionLine == null || lineDiffType === "none") return;
 	deletionLine = cleanLastNewline(deletionLine);
 	additionLine = cleanLastNewline(additionLine);
 	if (deletionLine.length > maxLineDiffLength || additionLine.length > maxLineDiffLength) return;
 	const lineDiff = lineDiffType === "char" ? diffChars(deletionLine, additionLine) : diffWordsWithSpace(deletionLine, additionLine);
+	if (lineDiffType === "word-line") {
+		pushWordLineDecorations(lineDiff, {
+			deletionLineIndex,
+			additionLineIndex,
+			deletionDecorations,
+			additionDecorations
+		});
+		return;
+	}
 	const deletionSpans = [];
 	const additionSpans = [];
 	const enableJoin = lineDiffType === "word-alt";