@pierre/diffs 1.1.11 → 1.1.13

package/dist/worker/worker.js

@@ -62,220 +62,10 @@ function attachResolvedThemes(themes, highlighter$1) {
 	}
 }
 
-//#endregion
-//#region src/utils/cleanLastNewline.ts
-function cleanLastNewline(contents) {
-	return contents.replace(/\n$|\r\n$/, "");
-}
-
-//#endregion
-//#region src/utils/hast_utils.ts
-function createTextNodeElement(value) {
-	return {
-		type: "text",
-		value
-	};
-}
-function createHastElement({ tagName, children = [], properties = {} }) {
-	return {
-		type: "element",
-		tagName,
-		properties,
-		children
-	};
-}
-function findCodeElement(nodes) {
-	let firstChild = nodes.children[0];
-	while (firstChild != null) {
-		if (firstChild.type === "element" && firstChild.tagName === "code") return firstChild;
-		if ("children" in firstChild) firstChild = firstChild.children[0];
-		else firstChild = null;
-	}
-}
-
-//#endregion
-//#region src/utils/processLine.ts
-function processLine(node, line, state) {
-	const lineInfo = typeof state.lineInfo === "function" ? state.lineInfo(line) : state.lineInfo[line - 1];
-	if (lineInfo == null) {
-		const errorMessage = `processLine: line ${line}, contains no state.lineInfo`;
-		console.error(errorMessage, {
-			node,
-			line,
-			state
-		});
-		throw new Error(errorMessage);
-	}
-	node.tagName = "div";
-	node.properties["data-line"] = lineInfo.lineNumber;
-	node.properties["data-alt-line"] = lineInfo.altLineNumber;
-	node.properties["data-line-type"] = lineInfo.type;
-	node.properties["data-line-index"] = lineInfo.lineIndex;
-	if (node.children.length === 0) node.children.push(createTextNodeElement("\n"));
-	return node;
-}
-
-//#endregion
-//#region src/utils/wrapTokenFragments.ts
-const NO_TOKEN = Symbol("no-token");
-const MULTIPLE_TOKENS = Symbol("multiple-tokens");
-function wrapTokenFragments(container) {
-	const ownTokenChar = getTokenChar(container);
-	if (ownTokenChar != null) return ownTokenChar;
-	let containerTokenState = NO_TOKEN;
-	const wrappedChildren = [];
-	let currentTokenChildren = [];
-	let currentTokenChar;
-	const flushTokenChildren = () => {
-		if (currentTokenChildren.length === 0 || currentTokenChar == null) {
-			currentTokenChildren = [];
-			currentTokenChar = void 0;
-			return;
-		}
-		if (currentTokenChildren.length === 1) {
-			const child = currentTokenChildren[0];
-			if (child?.type === "element") {
-				setTokenChar(child, currentTokenChar);
-				for (const grandChild of child.children) stripTokenChar(grandChild);
-			} else stripTokenChar(child);
-			wrappedChildren.push(child);
-			currentTokenChildren = [];
-			currentTokenChar = void 0;
-			return;
-		}
-		for (const child of currentTokenChildren) stripTokenChar(child);
-		wrappedChildren.push(createHastElement({
-			tagName: "span",
-			properties: { "data-char": currentTokenChar },
-			children: currentTokenChildren
-		}));
-		currentTokenChildren = [];
-		currentTokenChar = void 0;
-	};
-	const mergeContainerTokenState = (childTokenState) => {
-		if (childTokenState === NO_TOKEN) return;
-		if (childTokenState === MULTIPLE_TOKENS) {
-			containerTokenState = MULTIPLE_TOKENS;
-			return;
-		}
-		if (containerTokenState === NO_TOKEN) {
-			containerTokenState = childTokenState;
-			return;
-		}
-		if (containerTokenState !== childTokenState) containerTokenState = MULTIPLE_TOKENS;
-	};
-	for (const child of container.children) {
-		const childTokenState = child.type === "element" ? wrapTokenFragments(child) : NO_TOKEN;
-		mergeContainerTokenState(childTokenState);
-		if (typeof childTokenState !== "number") {
-			flushTokenChildren();
-			wrappedChildren.push(child);
-			continue;
-		}
-		if (currentTokenChar != null && currentTokenChar !== childTokenState) flushTokenChildren();
-		currentTokenChar ??= childTokenState;
-		currentTokenChildren.push(child);
-	}
-	flushTokenChildren();
-	container.children = wrappedChildren;
-	return containerTokenState;
-}
-function getTokenChar(node) {
-	const value = node.properties["data-char"];
-	if (typeof value === "number") return value;
-}
-function stripTokenChar(node) {
-	if (node.type !== "element") return;
-	node.properties["data-char"] = void 0;
-	for (const child of node.children) stripTokenChar(child);
-}
-function setTokenChar(node, char) {
-	node.properties["data-char"] = char;
-}
-
-//#endregion
-//#region src/utils/createTransformerWithState.ts
-function createTransformerWithState(useTokenTransformer = false, useCSSClasses = false) {
-	const state = { lineInfo: [] };
-	const transformers = [{
-		line(node) {
-			delete node.properties.class;
-			return node;
-		},
-		pre(pre) {
-			const code = findCodeElement(pre);
-			const children = [];
-			if (code != null) {
-				let index = 1;
-				for (const node of code.children) {
-					if (node.type !== "element") continue;
-					if (useTokenTransformer) wrapTokenFragments(node);
-					children.push(processLine(node, index, state));
-					index++;
-				}
-				code.children = children;
-			}
-			return pre;
-		},
-		...useTokenTransformer ? {
-			tokens(lines) {
-				for (const line of lines) {
-					let col = 0;
-					for (const token of line) {
-						const tokenWithOriginalRange = token;
-						tokenWithOriginalRange.__lineChar ??= col;
-						col += token.content.length;
-					}
-				}
-			},
-			preprocess(_code, options) {
-				options.mergeWhitespaces = "never";
-			},
-			span(hast, _line, _char, _lineElement, token) {
-				if (token?.offset != null && token.content != null) {
-					const tokenChar = token.__lineChar;
-					if (tokenChar != null) hast.properties["data-char"] = tokenChar;
-					return hast;
-				}
-				return hast;
-			}
-		} : null
-	}];
-	if (useCSSClasses) transformers.push(tokenStyleNormalizer, toClass);
-	return {
-		state,
-		transformers,
-		toClass
-	};
-}
-const toClass = transformerStyleToClass({ classPrefix: "hl-" });
-const tokenStyleNormalizer = {
-	name: "token-style-normalizer",
-	tokens(lines) {
-		for (const line of lines) for (const token of line) {
-			if (token.htmlStyle != null) continue;
-			const style = {};
-			if (token.color != null) style.color = token.color;
-			if (token.bgColor != null) style["background-color"] = token.bgColor;
-			if (token.fontStyle != null && token.fontStyle !== 0) {
-				if ((token.fontStyle & 1) !== 0) style["font-style"] = "italic";
-				if ((token.fontStyle & 2) !== 0) style["font-weight"] = "bold";
-				if ((token.fontStyle & 4) !== 0) style["text-decoration"] = "underline";
-			}
-			if (Object.keys(style).length > 0) token.htmlStyle = style;
-		}
-	}
-};
-
-//#endregion
-//#region src/utils/formatCSSVariablePrefix.ts
-function formatCSSVariablePrefix(type) {
-	return `--${type === "token" ? "diffs-token" : "diffs"}-`;
-}
-
 //#endregion
 //#region src/utils/getFiletypeFromFileName.ts
 const CUSTOM_EXTENSION_TO_FILE_FORMAT = /* @__PURE__ */ new Map();
+let customExtensionsVersion = 0;
 const EXTENSION_TO_FILE_FORMAT = {
 	"1c": "1c",
 	abap: "abap",
@@ -617,6 +407,227 @@ function getFiletypeFromFileName(fileName) {
 	if (CUSTOM_EXTENSION_TO_FILE_FORMAT.has(simpleMatch)) return CUSTOM_EXTENSION_TO_FILE_FORMAT.get(simpleMatch) ?? "text";
 	return EXTENSION_TO_FILE_FORMAT[simpleMatch] ?? "text";
 }
+function replaceCustomExtensions(version, map) {
+	if (version <= customExtensionsVersion) return false;
+	CUSTOM_EXTENSION_TO_FILE_FORMAT.clear();
+	for (const key in map) {
+		const lang = map[key];
+		if (lang != null) CUSTOM_EXTENSION_TO_FILE_FORMAT.set(key, lang);
+	}
+	customExtensionsVersion = version;
+	return true;
+}
+
+//#endregion
+//#region src/utils/cleanLastNewline.ts
+function cleanLastNewline(contents) {
+	return contents.replace(/\n$|\r\n$/, "");
+}
+
+//#endregion
+//#region src/utils/hast_utils.ts
+function createTextNodeElement(value) {
+	return {
+		type: "text",
+		value
+	};
+}
+function createHastElement({ tagName, children = [], properties = {} }) {
+	return {
+		type: "element",
+		tagName,
+		properties,
+		children
+	};
+}
+function findCodeElement(nodes) {
+	let firstChild = nodes.children[0];
+	while (firstChild != null) {
+		if (firstChild.type === "element" && firstChild.tagName === "code") return firstChild;
+		if ("children" in firstChild) firstChild = firstChild.children[0];
+		else firstChild = null;
+	}
+}
+
+//#endregion
+//#region src/utils/processLine.ts
+function processLine(node, line, state) {
+	const lineInfo = typeof state.lineInfo === "function" ? state.lineInfo(line) : state.lineInfo[line - 1];
+	if (lineInfo == null) {
+		const errorMessage = `processLine: line ${line}, contains no state.lineInfo`;
+		console.error(errorMessage, {
+			node,
+			line,
+			state
+		});
+		throw new Error(errorMessage);
+	}
+	node.tagName = "div";
+	node.properties["data-line"] = lineInfo.lineNumber;
+	node.properties["data-alt-line"] = lineInfo.altLineNumber;
+	node.properties["data-line-type"] = lineInfo.type;
+	node.properties["data-line-index"] = lineInfo.lineIndex;
+	if (node.children.length === 0) node.children.push(createTextNodeElement("\n"));
+	return node;
+}
+
+//#endregion
+//#region src/utils/wrapTokenFragments.ts
+const NO_TOKEN = Symbol("no-token");
+const MULTIPLE_TOKENS = Symbol("multiple-tokens");
+function wrapTokenFragments(container) {
+	const ownTokenChar = getTokenChar(container);
+	if (ownTokenChar != null) return ownTokenChar;
+	let containerTokenState = NO_TOKEN;
+	const wrappedChildren = [];
+	let currentTokenChildren = [];
+	let currentTokenChar;
+	const flushTokenChildren = () => {
+		if (currentTokenChildren.length === 0 || currentTokenChar == null) {
+			currentTokenChildren = [];
+			currentTokenChar = void 0;
+			return;
+		}
+		if (currentTokenChildren.length === 1) {
+			const child = currentTokenChildren[0];
+			if (child?.type === "element") {
+				setTokenChar(child, currentTokenChar);
+				for (const grandChild of child.children) stripTokenChar(grandChild);
+			} else stripTokenChar(child);
+			wrappedChildren.push(child);
+			currentTokenChildren = [];
+			currentTokenChar = void 0;
+			return;
+		}
+		for (const child of currentTokenChildren) stripTokenChar(child);
+		wrappedChildren.push(createHastElement({
+			tagName: "span",
+			properties: { "data-char": currentTokenChar },
+			children: currentTokenChildren
+		}));
+		currentTokenChildren = [];
+		currentTokenChar = void 0;
+	};
+	const mergeContainerTokenState = (childTokenState) => {
+		if (childTokenState === NO_TOKEN) return;
+		if (childTokenState === MULTIPLE_TOKENS) {
+			containerTokenState = MULTIPLE_TOKENS;
+			return;
+		}
+		if (containerTokenState === NO_TOKEN) {
+			containerTokenState = childTokenState;
+			return;
+		}
+		if (containerTokenState !== childTokenState) containerTokenState = MULTIPLE_TOKENS;
+	};
+	for (const child of container.children) {
+		const childTokenState = child.type === "element" ? wrapTokenFragments(child) : NO_TOKEN;
+		mergeContainerTokenState(childTokenState);
+		if (typeof childTokenState !== "number") {
+			flushTokenChildren();
+			wrappedChildren.push(child);
+			continue;
+		}
+		if (currentTokenChar != null && currentTokenChar !== childTokenState) flushTokenChildren();
+		currentTokenChar ??= childTokenState;
+		currentTokenChildren.push(child);
+	}
+	flushTokenChildren();
+	container.children = wrappedChildren;
+	return containerTokenState;
+}
+function getTokenChar(node) {
+	const value = node.properties["data-char"];
+	if (typeof value === "number") return value;
+}
+function stripTokenChar(node) {
+	if (node.type !== "element") return;
+	node.properties["data-char"] = void 0;
+	for (const child of node.children) stripTokenChar(child);
+}
+function setTokenChar(node, char) {
+	node.properties["data-char"] = char;
+}
+
+//#endregion
+//#region src/utils/createTransformerWithState.ts
+function createTransformerWithState(useTokenTransformer = false, useCSSClasses = false) {
+	const state = { lineInfo: [] };
+	const transformers = [{
+		line(node) {
+			delete node.properties.class;
+			return node;
+		},
+		pre(pre) {
+			const code = findCodeElement(pre);
+			const children = [];
+			if (code != null) {
+				let index = 1;
+				for (const node of code.children) {
+					if (node.type !== "element") continue;
+					if (useTokenTransformer) wrapTokenFragments(node);
+					children.push(processLine(node, index, state));
+					index++;
+				}
+				code.children = children;
+			}
+			return pre;
+		},
+		...useTokenTransformer ? {
+			tokens(lines) {
+				for (const line of lines) {
+					let col = 0;
+					for (const token of line) {
+						const tokenWithOriginalRange = token;
+						tokenWithOriginalRange.__lineChar ??= col;
+						col += token.content.length;
+					}
+				}
+			},
+			preprocess(_code, options) {
+				options.mergeWhitespaces = "never";
+			},
+			span(hast, _line, _char, _lineElement, token) {
+				if (token?.offset != null && token.content != null) {
+					const tokenChar = token.__lineChar;
+					if (tokenChar != null) hast.properties["data-char"] = tokenChar;
+					return hast;
+				}
+				return hast;
+			}
+		} : null
+	}];
+	if (useCSSClasses) transformers.push(tokenStyleNormalizer, toClass);
+	return {
+		state,
+		transformers,
+		toClass
+	};
+}
+const toClass = transformerStyleToClass({ classPrefix: "hl-" });
+const tokenStyleNormalizer = {
+	name: "token-style-normalizer",
+	tokens(lines) {
+		for (const line of lines) for (const token of line) {
+			if (token.htmlStyle != null) continue;
+			const style = {};
+			if (token.color != null) style.color = token.color;
+			if (token.bgColor != null) style["background-color"] = token.bgColor;
+			if (token.fontStyle != null && token.fontStyle !== 0) {
+				if ((token.fontStyle & 1) !== 0) style["font-style"] = "italic";
+				if ((token.fontStyle & 2) !== 0) style["font-weight"] = "bold";
+				if ((token.fontStyle & 4) !== 0) style["text-decoration"] = "underline";
+			}
+			if (Object.keys(style).length > 0) token.htmlStyle = style;
+		}
+	}
+};
+
+//#endregion
+//#region src/utils/formatCSSVariablePrefix.ts
+function formatCSSVariablePrefix(type) {
+	return `--${type === "token" ? "diffs-token" : "diffs"}-`;
+}
 
 //#endregion
 //#region src/utils/getHighlighterThemeStyles.ts
@@ -1501,9 +1512,13 @@ async function handleMessage(request) {
 		sendError(request.id, error);
 	}
 }
-async function handleInitialize({ id, renderOptions: options, preferredHighlighter, resolvedThemes, resolvedLanguages }) {
+async function handleInitialize({ id, renderOptions: options, preferredHighlighter, resolvedThemes, resolvedLanguages, customExtensionsVersion: customExtensionsVersion$1, customExtensionMap }) {
 	let highlighter$1 = getHighlighter(preferredHighlighter);
 	if ("then" in highlighter$1) highlighter$1 = await highlighter$1;
+	syncCustomExtensionsFromRequest({
+		customExtensionsVersion: customExtensionsVersion$1,
+		customExtensionMap
+	});
 	attachResolvedThemes(resolvedThemes, highlighter$1);
 	if (resolvedLanguages != null) attachResolvedLanguages(resolvedLanguages, highlighter$1);
 	renderOptions = options;
@@ -1526,9 +1541,13 @@ async function handleSetRenderOptions({ id, renderOptions: options, resolvedThem
 		sentAt: Date.now()
 	});
 }
-async function handleRenderFile({ id, file, resolvedLanguages }) {
+async function handleRenderFile({ id, file, resolvedLanguages, customExtensionsVersion: customExtensionsVersion$1, customExtensionMap }) {
 	let highlighter$1 = getHighlighter();
 	if ("then" in highlighter$1) highlighter$1 = await highlighter$1;
+	syncCustomExtensionsFromRequest({
+		customExtensionsVersion: customExtensionsVersion$1,
+		customExtensionMap
+	});
 	if (resolvedLanguages != null) attachResolvedLanguages(resolvedLanguages, highlighter$1);
 	const fileOptions = {
 		theme: renderOptions.theme,
@@ -1537,9 +1556,13 @@ async function handleRenderFile({ id, file, resolvedLanguages }) {
 	};
 	sendFileSuccess(id, renderFileWithHighlighter(file, highlighter$1, fileOptions), fileOptions);
 }
-async function handleRenderDiff({ id, diff, resolvedLanguages }) {
+async function handleRenderDiff({ id, diff, resolvedLanguages, customExtensionsVersion: customExtensionsVersion$1, customExtensionMap }) {
 	let highlighter$1 = getHighlighter();
 	if ("then" in highlighter$1) highlighter$1 = await highlighter$1;
+	syncCustomExtensionsFromRequest({
+		customExtensionsVersion: customExtensionsVersion$1,
+		customExtensionMap
+	});
 	if (resolvedLanguages != null) attachResolvedLanguages(resolvedLanguages, highlighter$1);
 	sendDiffSuccess(id, renderDiffWithHighlighter(diff, highlighter$1, renderOptions), renderOptions);
 }
@@ -1551,6 +1574,11 @@ function getHighlighter(preferredHighlighter = "shiki-js") {
 	});
 	return highlighter;
 }
+function syncCustomExtensionsFromRequest({ customExtensionsVersion: customExtensionsVersion$1, customExtensionMap }) {
+	if (customExtensionsVersion$1 == null && customExtensionMap == null) return;
+	if (customExtensionsVersion$1 == null || customExtensionMap == null) throw new Error("Worker request must include both customExtensionsVersion and customExtensionMap");
+	replaceCustomExtensions(customExtensionsVersion$1, customExtensionMap);
+}
 function sendFileSuccess(id, result, options) {
 	postMessage({
 		type: "success",