@shikijs/vitepress-twoslash 4.0.2 → 4.1.0

package/dist/cache-fs.mjs

@@ -2,7 +2,6 @@ import { createHash } from "node:crypto";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { join, resolve } from "node:path";
 import process from "node:process";
-
 //#region src/cache-fs.ts
 function createFileSystemTypesCache(options = {}) {
 	const dir = resolve(process.cwd(), options.dir ?? ".vitepress/cache/twoslash");
@@ -20,6 +19,5 @@ function createFileSystemTypesCache(options = {}) {
 		}
 	};
 }
-
 //#endregion
-export { createFileSystemTypesCache };
+export { createFileSystemTypesCache };

package/dist/cache-inline/index.d.mts

@@ -1,4 +1,4 @@
-import { t as VitePressPluginTwoslashOptions } from "../types-CKSDIC5E.mjs";
+import { t as VitePressPluginTwoslashOptions } from "../types-BvNUFoZh.mjs";
 import { UserConfig } from "vitepress";
 
 //#region src/cache-inline/markdown-fence.d.ts

package/dist/cache-inline/index.mjs

@@ -6,7 +6,6 @@ import LZString from "lz-string";
 import { hash } from "ohash";
 import MagicString from "magic-string";
 import MarkdownIt from "markdown-it";
-
 //#region src/cache-inline/file-patcher.ts
 var FilePatcher = class {
 	files = /* @__PURE__ */ new Map();
@@ -42,7 +41,6 @@ var FilePatcher = class {
 		}
 	}
 };
-
 //#endregion
 //#region src/cache-inline/cache-inline.ts
 const CODE_INLINE_CACHE_KEY = "@twoslash-cache";
@@ -156,7 +154,6 @@ function simplifyTwoslashReturn(ret) {
 		meta: ret.meta ? { extension: ret.meta.extension } : void 0
 	};
 }
-
 //#endregion
 //#region src/cache-inline/env.ts
 function isEnabledEnv(key) {
@@ -173,7 +170,6 @@ function isEnabledEnv(key) {
 	}[val] || null;
 	return null;
 }
-
 //#endregion
 //#region src/cache-inline/markdown-fence.ts
 function createMarkdownFenceSourceCodec(mapper) {
@@ -185,7 +181,7 @@ function createMarkdownFenceSourceCodec(mapper) {
 	function injectToMarkdown(code, path) {
 		const injects = mapper(code, path);
 		let newCode = code;
-		const injectAts = Array.from(injects.keys()).sort((a, b) => b - a);
+		const injectAts = [...injects.keys()].sort((a, b) => b - a);
 		for (const at of injectAts) {
 			const data = stringifyFenceSourceMap(injects.get(at));
 			newCode = newCode.slice(0, at) + data + newCode.slice(at);
@@ -210,7 +206,6 @@ function createMarkdownFenceSourceCodec(mapper) {
 		extractFromFence
 	};
 }
-
 //#endregion
 //#region src/cache-inline/markdown-it-mapper.ts
 const markdownItMapper = function(code, path) {
@@ -266,7 +261,6 @@ function findNextNewLine(str, position) {
 	if (str.charCodeAt(idx) === 13 && str.charCodeAt(idx + 1) === 10) return [idx, 2];
 	return [idx, 1];
 }
-
 //#endregion
 //#region src/cache-inline/index.ts
 /**
@@ -320,6 +314,5 @@ function withFenceSourceMap(config, codec) {
 	((config.vite ??= {}).plugins ??= []).push(InjectPlugin);
 	return config;
 }
-
 //#endregion
-export { createTwoslashWithInlineCache };
+export { createTwoslashWithInlineCache };

package/dist/client.mjs

@@ -1,5 +1,4 @@
 import FloatingVue, { recomputeAllPoppers } from "floating-vue";
-
 //#region src/client.ts
 const isMobile = typeof navigator !== "undefined" && /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
 /**
@@ -82,6 +81,5 @@ const TwoslashFloatingVue = { install: (app, options = {}) => {
 		}
 	});
 } };
-
 //#endregion
-export { TwoslashFloatingVue as default };
+export { TwoslashFloatingVue as default };

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { a as rendererFloatingVue, i as defaultHoverInfoProcessor, n as TwoslashFloatingVueOptions, r as TwoslashFloatingVueRendererOptions, t as VitePressPluginTwoslashOptions } from "./types-CKSDIC5E.mjs";
+import { a as rendererFloatingVue, i as defaultHoverInfoProcessor, n as TwoslashFloatingVueOptions, r as TwoslashFloatingVueRendererOptions, t as VitePressPluginTwoslashOptions } from "./types-BvNUFoZh.mjs";
 import { ShikiTransformer } from "shiki";
 
 //#region src/index.d.ts

package/dist/index.mjs

@@ -5,8 +5,9 @@ import { defaultHoverInfoProcessor, rendererRich } from "@shikijs/twoslash";
 import { fromMarkdown } from "mdast-util-from-markdown";
 import { gfmFromMarkdown } from "mdast-util-gfm";
 import { defaultHandlers, toHast } from "mdast-util-to-hast";
-
 //#region src/renderer-floating-vue.ts
+const RE_JSDOC_LINK = /\{@link ([^}]*)\}/g;
+const RE_PARAM_NAME = /^([\w$-]+)/;
 function rendererFloatingVue(options = {}) {
 	const { classCopyIgnore = "vp-copy-ignore", classFloatingPanel = "twoslash-floating", classMarkdown = "vp-doc", floatingVueTheme = "twoslash", floatingVueThemeQuery = "twoslash-query", floatingVueThemeCompletion = "twoslash-completion" } = options.floatingVue || {};
 	const { errorRendering = "line" } = options;
@@ -85,7 +86,7 @@ function vPre(el) {
 	return el;
 }
 function renderMarkdown(md) {
-	return toHast(fromMarkdown(md.replace(/\{@link ([^}]*)\}/g, "$1"), { mdastExtensions: [gfmFromMarkdown()] }), { handlers: { code: (state, node) => {
+	return toHast(fromMarkdown(md.replace(RE_JSDOC_LINK, "$1"), { mdastExtensions: [gfmFromMarkdown()] }), { handlers: { code: (state, node) => {
 		const lang = node.lang || "";
 		if (lang) return {
 			type: "element",
@@ -102,7 +103,7 @@ function renderMarkdown(md) {
 	} } }).children;
 }
 function renderMarkdownInline(md, context) {
-	if (context === "tag:param") md = md.replace(/^([\w$-]+)/, "`$1` ");
+	if (context === "tag:param") md = md.replace(RE_PARAM_NAME, "`$1` ");
 	const children = renderMarkdown.call(this, md);
 	if (children.length === 1 && children[0].type === "element" && children[0].tagName === "p") return children[0].children;
 	return children;
@@ -128,9 +129,11 @@ function compose(parts) {
 		children: []
 	}];
 }
-
 //#endregion
 //#region src/index.ts
+const RE_NEWLINE = /\n/g;
+const RE_TWOSLASH = /\btwoslash\b/;
+const RE_LEFT_BRACE = /\{/g;
 /**
 * Create a Shiki transformer for VitePress to enable twoslash integration
 *
@@ -142,7 +145,7 @@ function transformerTwoslash(options = {}) {
 		const isCI = typeof process !== "undefined" && process?.env?.CI;
 		const isDev = typeof process !== "undefined" && process?.env?.NODE_ENV === "development";
 		const shouldThrow = (options.throws || isCI || !isDev) && options.throws !== false;
-		console.error(`\n\n--------\nTwoslash error in code:\n--------\n${code.split(/\n/g).slice(0, 15).join("\n").trim()}\n--------\n`);
+		console.error(`\n\n--------\nTwoslash error in code:\n--------\n${code.split(RE_NEWLINE).slice(0, 15).join("\n").trim()}\n--------\n`);
 		if (shouldThrow) throw error;
 		else console.error(error);
 		return removeTwoslashNotations(code);
@@ -162,7 +165,7 @@ function transformerTwoslash(options = {}) {
 		...options,
 		explicitTrigger
 	});
-	const trigger = explicitTrigger instanceof RegExp ? explicitTrigger : /\btwoslash\b/;
+	const trigger = explicitTrigger instanceof RegExp ? explicitTrigger : RE_TWOSLASH;
 	return {
 		...twoslash,
 		name: "@shikijs/vitepress-twoslash",
@@ -176,10 +179,9 @@ function transformerTwoslash(options = {}) {
 			return twoslash.preprocess.call(this, code, options);
 		},
 		postprocess(html) {
-			if (this.meta.twoslash) return html.replace(/\{/g, "{");
+			if (this.meta.twoslash) return html.replace(RE_LEFT_BRACE, "{");
 		}
 	};
 }
-
 //#endregion
-export { defaultHoverInfoProcessor, rendererFloatingVue, transformerTwoslash };
+export { defaultHoverInfoProcessor, rendererFloatingVue, transformerTwoslash };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shikijs/vitepress-twoslash",
   "type": "module",
-  "version": "4.0.2",
+  "version": "4.1.0",
   "description": "Enable Twoslash support in VitePress",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -45,11 +45,11 @@
     "mdast-util-gfm": "^3.1.0",
     "mdast-util-to-hast": "^13.2.1",
     "ohash": "^2.0.11",
-    "twoslash": "^0.3.6",
-    "twoslash-vue": "^0.3.6",
-    "vue": "^3.5.29",
-    "@shikijs/twoslash": "4.0.2",
-    "shiki": "4.0.2"
+    "twoslash": "^0.3.8",
+    "twoslash-vue": "^0.3.8",
+    "vue": "^3.5.34",
+    "@shikijs/twoslash": "4.1.0",
+    "shiki": "4.1.0"
   },
   "scripts": {
     "build": "tsdown",