@ox-content/vite-plugin 3.0.0-alpha.2 → 3.0.0-alpha.4

package/dist/index.d.cts

@@ -2173,9 +2173,9 @@ interface OxContentOptions {
    * Enable syntax highlighting for code blocks.
    *
    * When true, fenced and language-tagged inline code is highlighted with the
-   * native tree-sitter engine. Token colors are `--octc-shiki-*` custom
-   * properties (the `shiki` prefix is historical) so theme-color packages keep
-   * working. Languages with no native grammar stay unhighlighted.
+   * native tree-sitter engine. Token colors are `--octc-syntax-*` custom
+   * properties so theme-color packages resolve highlighting. Languages with no
+   * native grammar stay unhighlighted.
    *
    * @default false
    */

package/dist/index.d.mts

@@ -2173,9 +2173,9 @@ interface OxContentOptions {
    * Enable syntax highlighting for code blocks.
    *
    * When true, fenced and language-tagged inline code is highlighted with the
-   * native tree-sitter engine. Token colors are `--octc-shiki-*` custom
-   * properties (the `shiki` prefix is historical) so theme-color packages keep
-   * working. Languages with no native grammar stay unhighlighted.
+   * native tree-sitter engine. Token colors are `--octc-syntax-*` custom
+   * properties so theme-color packages resolve highlighting. Languages with no
+   * native grammar stay unhighlighted.
    *
    * @default false
    */

package/dist/index.mjs

@@ -132,8 +132,8 @@ function normalizeClassName(className) {
 * Highlights with the native tree-sitter engine, or `null` when it has no
 * grammar for `lang`.
 *
-* It emits `--octc-shiki-*` markup (the `shiki` prefix is historical) so
-* theme-color packages keep working.
+* It emits `--octc-syntax-*` markup so theme-color packages resolve token
+* colors.
 */
 function highlightNatively(code, lang) {
 	try {
@@ -160,8 +160,8 @@ async function highlightDocumentNatively(html) {
 /**
 * Syntax highlighting with the native tree-sitter engine.
 *
-* Markup keeps the historical `<pre class="shiki css-variables">` wrapper and
-* `--octc-shiki-*` custom properties so theme-color packages keep working.
+* Markup uses `<pre class="ox-highlight css-variables">` and `--octc-syntax-*`
+* custom properties so theme-color packages resolve token colors.
 */
 const rehypeParse$3 = interopDefault(rehypeParsePlugin);
 const rehypeStringify$3 = interopDefault(rehypeStringifyPlugin);
@@ -205,7 +205,7 @@ function rehypeNativeHighlight() {
 						highlightedCode.properties.className = [.../* @__PURE__ */ new Set([
 							...originalCodeClasses,
 							...highlightedClasses,
-							"shiki-inline"
+							"ox-highlight-inline"
 						])];
 						highlightedCode.properties["data-language"] = lang;
 						return highlightedCode;
@@ -220,7 +220,7 @@ function rehypeNativeHighlight() {
 				const child = node.children[i];
 				if (child.type === "element" && child.tagName === "pre") {
 					const codeElement = child.children.find((c) => c.type === "element" && c.tagName === "code");
-					const alreadyHighlighted = normalizeClassName(child.properties?.className).includes("shiki");
+					const alreadyHighlighted = normalizeClassName(child.properties?.className).includes("ox-highlight");
 					if (codeElement && !alreadyHighlighted) {
 						const highlightedPre = highlightBlockCode(codeElement);
 						if (highlightedPre) node.children[i] = highlightedPre;
@@ -1754,7 +1754,7 @@ async function transformOgp(html, ogpDataMap, options) {
 const SELF_CLOSING_EMBED_TAG = /<(GitHub|OgCard|Tweet|XPost|Bluesky|Spotify|StackBlitz|WebContainer|YouTube)((?:[^>"']|"[^"]*"|'[^']*')*?)\s*\/>/gi;
 /**
 * Custom embed tags are not HTML void elements, so a self-closing authoring
-* form like `<GitHub ... />` reaches the HTML re-parsers (Shiki highlighting,
+* form like `<GitHub ... />` reaches the HTML re-parsers (syntax highlighting,
 * embed transforms) as an unclosed element that swallows the rest of the
 * document. Normalize to an explicit open/close pair before any rehype pass
 * runs.
@@ -2202,7 +2202,8 @@ async function applyTypedHover(source, html, options) {
 	if (fences.length === 0) return html;
 	try {
 		return attachTypedHoverPayloads(html, await generateTypedHoverAttachments(fences, options.tsgoCommand));
-	} catch {
+	} catch (error) {
+		console.warn("[ox-content] typedHover failed; leaving the fence unannotated.", error);
 		return html;
 	}
 }
@@ -2294,10 +2295,16 @@ function normalizeFenceText(value) {
 	return decodeHtmlEntities(value).replace(/\r\n/g, "\n").trim();
 }
 function decodeHtmlEntities(value) {
-	return value.replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&amp;/g, "&").replace(/&quot;/g, "\"").replace(/&#39;/g, "'");
+	return value.replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, "\"").replace(/&#39;/g, "'").replace(/&#x([0-9a-fA-F]+);/g, (_, hex) => {
+		const code = Number.parseInt(hex, 16);
+		return Number.isFinite(code) ? String.fromCodePoint(code) : "";
+	}).replace(/&#(\d+);/g, (_, dec) => {
+		const code = Number.parseInt(dec, 10);
+		return Number.isFinite(code) ? String.fromCodePoint(code) : "";
+	}).replace(/&amp;/g, "&");
 }
 const TYPED_HOVER_STYLE = `<style data-ox-typed-hover-style>.ox-typed-hover-token{cursor:help;text-decoration:underline dotted}.ox-typed-hover-overlay{position:fixed;z-index:50;max-width:36rem;padding:.35rem .55rem;border:1px solid #444;border-radius:4px;background:#1e1e1e;color:#d4d4d4;font:12px/1.4 ui-monospace,SFMono-Regular,Menlo,monospace;white-space:pre-wrap;pointer-events:none}</style>`;
-const TYPED_HOVER_CLIENT = `<script data-ox-typed-hover-runtime>(function(){if(window.__oxTypedHover)return;window.__oxTypedHover=1;var tip=document.createElement("div");tip.className="ox-typed-hover-overlay";tip.setAttribute("role","tooltip");tip.hidden=true;document.body.appendChild(tip);function payload(token){var pre=token.closest(".ox-typed-hover");var data=pre&&pre.nextElementSibling;if(!data||!data.classList.contains("ox-typed-hover-data"))return null;try{return JSON.parse(data.textContent||"")}catch(e){return null}}function show(token){var data=payload(token);var item=data&&data.hovers[Number(token.getAttribute("data-ox-typed-hover"))];if(!item)return;tip.textContent=item.type;tip.hidden=false;var box=token.getBoundingClientRect();tip.style.left=Math.max(8,box.left)+"px";tip.style.top=Math.max(8,box.top-tip.offsetHeight-8)+"px"}function hide(){tip.hidden=true}document.addEventListener("mouseover",function(e){var t=e.target.closest(".ox-typed-hover-token");if(t)show(t)});document.addEventListener("mouseout",function(e){var t=e.target.closest(".ox-typed-hover-token");if(t&&!t.contains(e.relatedTarget))hide()});document.addEventListener("focusin",function(e){var t=e.target.closest(".ox-typed-hover-token");if(t)show(t)});document.addEventListener("focusout",function(e){if(!e.relatedTarget||!e.relatedTarget.closest(".ox-typed-hover-token"))hide()});document.addEventListener("keydown",function(e){if(e.key==="Escape")hide()})})();<\/script>`;
+const TYPED_HOVER_CLIENT = `<script data-ox-typed-hover-runtime>(function(){if(window.__oxTypedHover)return;window.__oxTypedHover=1;var tip=document.createElement("div");tip.className="ox-typed-hover-overlay";tip.setAttribute("role","tooltip");tip.hidden=true;document.body.appendChild(tip);function payload(token){var pre=token.closest(".ox-typed-hover");if(!pre)return null;var host=pre.closest(".ox-code")||pre;var data=host.nextElementSibling;if(!data||!data.classList.contains("ox-typed-hover-data"))return null;try{return JSON.parse(data.textContent||"")}catch(e){return null}}function show(token){var data=payload(token);var item=data&&data.hovers[Number(token.getAttribute("data-ox-typed-hover"))];if(!item)return;tip.textContent=item.type;tip.hidden=false;var box=token.getBoundingClientRect();tip.style.left=Math.max(8,box.left)+"px";tip.style.top=Math.max(8,box.top-tip.offsetHeight-8)+"px"}function hide(){tip.hidden=true}document.addEventListener("mouseover",function(e){var t=e.target.closest(".ox-typed-hover-token");if(t)show(t)});document.addEventListener("mouseout",function(e){var t=e.target.closest(".ox-typed-hover-token");if(t&&!t.contains(e.relatedTarget))hide()});document.addEventListener("focusin",function(e){var t=e.target.closest(".ox-typed-hover-token");if(t)show(t)});document.addEventListener("focusout",function(e){if(!e.relatedTarget||!e.relatedTarget.closest(".ox-typed-hover-token"))hide()});document.addEventListener("keydown",function(e){if(e.key==="Escape")hide()})})();<\/script>`;
 //#endregion
 //#region src/file-tree-options.ts
 const disabled = {