@pierre/diffs 1.1.0-beta.10 → 1.1.0-beta.12

package/dist/worker/worker.js

@@ -1,5 +1,6 @@
-import { createJavaScriptRegexEngine } from "@shikijs/engine-javascript";
-import { createHighlighterCoreSync } from "shiki/core";
+import { createHighlighterCore } from "shiki/core";
+import { createJavaScriptRegexEngine } from "shiki/engine/javascript";
+import { createOnigurumaEngine } from "shiki/engine/oniguruma";
 import { diffChars, diffWordsWithSpace } from "diff";
 import { transformerStyleToClass } from "@shikijs/transformers";
 
@@ -1366,20 +1367,22 @@ self.addEventListener("error", (event) => {
 	console.error("[Shiki Worker] Unhandled error:", event.error);
 });
 self.addEventListener("message", (event) => {
-	const request = event.data;
+	handleMessage(event.data);
+});
+async function handleMessage(request) {
 	try {
 		switch (request.type) {
 			case "initialize":
-				handleInitialize(request);
+				await handleInitialize(request);
 				break;
 			case "set-render-options":
-				handleSetRenderOptions(request);
+				await handleSetRenderOptions(request);
 				break;
 			case "file":
-				handleRenderFile(request);
+				await handleRenderFile(request);
 				break;
 			case "diff":
-				handleRenderDiff(request);
+				await handleRenderDiff(request);
 				break;
 			default: throw new Error(`Unknown request type: ${request.type}`);
 		}
@@ -1387,9 +1390,10 @@ self.addEventListener("message", (event) => {
 		console.error("Worker error:", error);
 		sendError(request.id, error);
 	}
-});
-function handleInitialize({ id, renderOptions: options, resolvedThemes, resolvedLanguages }) {
-	const highlighter$1 = getHighlighter();
+}
+async function handleInitialize({ id, renderOptions: options, preferredHighlighter, resolvedThemes, resolvedLanguages }) {
+	let highlighter$1 = getHighlighter(preferredHighlighter);
+	if ("then" in highlighter$1) highlighter$1 = await highlighter$1;
 	attachResolvedThemes(resolvedThemes, highlighter$1);
 	if (resolvedLanguages != null) attachResolvedLanguages(resolvedLanguages, highlighter$1);
 	renderOptions = options;
@@ -1400,8 +1404,10 @@ function handleInitialize({ id, renderOptions: options, resolvedThemes, resolved
 		sentAt: Date.now()
 	});
 }
-function handleSetRenderOptions({ id, renderOptions: options, resolvedThemes }) {
-	attachResolvedThemes(resolvedThemes, getHighlighter());
+async function handleSetRenderOptions({ id, renderOptions: options, resolvedThemes }) {
+	let highlighter$1 = getHighlighter();
+	if ("then" in highlighter$1) highlighter$1 = await highlighter$1;
+	attachResolvedThemes(resolvedThemes, highlighter$1);
 	renderOptions = options;
 	postMessage({
 		type: "success",
@@ -1410,8 +1416,9 @@ function handleSetRenderOptions({ id, renderOptions: options, resolvedThemes })
 		sentAt: Date.now()
 	});
 }
-function handleRenderFile({ id, file, resolvedLanguages }) {
-	const highlighter$1 = getHighlighter();
+async function handleRenderFile({ id, file, resolvedLanguages }) {
+	let highlighter$1 = getHighlighter();
+	if ("then" in highlighter$1) highlighter$1 = await highlighter$1;
 	if (resolvedLanguages != null) attachResolvedLanguages(resolvedLanguages, highlighter$1);
 	const fileOptions = {
 		theme: renderOptions.theme,
@@ -1419,16 +1426,17 @@ function handleRenderFile({ id, file, resolvedLanguages }) {
 	};
 	sendFileSuccess(id, renderFileWithHighlighter(file, highlighter$1, fileOptions), fileOptions);
 }
-function handleRenderDiff({ id, diff, resolvedLanguages }) {
-	const highlighter$1 = getHighlighter();
+async function handleRenderDiff({ id, diff, resolvedLanguages }) {
+	let highlighter$1 = getHighlighter();
+	if ("then" in highlighter$1) highlighter$1 = await highlighter$1;
 	if (resolvedLanguages != null) attachResolvedLanguages(resolvedLanguages, highlighter$1);
 	sendDiffSuccess(id, renderDiffWithHighlighter(diff, highlighter$1, renderOptions), renderOptions);
 }
-function getHighlighter() {
-	highlighter ??= createHighlighterCoreSync({
+function getHighlighter(preferredHighlighter = "shiki-js") {
+	highlighter ??= createHighlighterCore({
 		themes: [],
 		langs: [],
-		engine: createJavaScriptRegexEngine()
+		engine: preferredHighlighter === "shiki-wasm" ? createOnigurumaEngine(import("shiki/wasm")) : createJavaScriptRegexEngine()
 	});
 	return highlighter;
 }