vuepress-plugin-md-power 1.0.0-rc.164 → 1.0.0-rc.166

package/lib/node/index.js

@@ -1007,10 +1007,7 @@ async function imageSizePlugin(app, md, type = false) {
 	md.renderer.rules.image = (tokens, idx, options, env, self) => {
 		if (!env.filePathRelative || !env.filePath) return imageRule(tokens, idx, options, env, self);
 		const token = tokens[idx];
-		const src = token.attrGet("src");
-		const width = token.attrGet("width");
-		const height = token.attrGet("height");
-		const size = resolveSize(src, width, height, env);
+		const size = resolveSize(token.attrGet("src"), token.attrGet("width"), token.attrGet("height"), env);
 		if (size) {
 			token.attrSet("width", `${size.width}`);
 			token.attrSet("height", `${size.height}`);
@@ -1026,8 +1023,7 @@ async function imageSizePlugin(app, md, type = false) {
 			const token = tokens[idx];
 			token.content = token.content.replace(REG_IMG_TAG, (raw, info) => {
 				const { attrs: attrs$1 } = resolveAttrs(info);
-				const src = attrs$1.src || attrs$1.srcset;
-				const size = resolveSize(src, attrs$1.width, attrs$1.height, env);
+				const size = resolveSize(attrs$1.src || attrs$1.srcset, attrs$1.width, attrs$1.height, env);
 				if (!size) return raw;
 				attrs$1.width = size.width;
 				attrs$1.height = size.height;
@@ -1092,15 +1088,9 @@ async function scanRemoteImageSize(app) {
 		if ((await fs.stat(filepath$1)).isFile() && !filepath$1.includes(".vuepress") && !filepath$1.includes("node_modules") && filepath$1.endsWith(".md")) {
 			const content = await fs.readFile(filepath$1, "utf-8");
 			const syntaxMatched = content.match(REG_IMG) ?? [];
-			for (const img of syntaxMatched) {
-				const src = img.slice(img.indexOf("](") + 2, -1);
-				addList(src.split(/\s+/)[0]);
-			}
+			for (const img of syntaxMatched) addList(img.slice(img.indexOf("](") + 2, -1).split(/\s+/)[0]);
 			const tagMatched = content.match(REG_IMG_TAG) ?? [];
-			for (const img of tagMatched) {
-				const src = img.match(REG_IMG_TAG_SRC)?.[2] ?? "";
-				addList(src);
-			}
+			for (const img of tagMatched) addList(img.match(REG_IMG_TAG_SRC)?.[2] ?? "");
 		}
 	}
 	function addList(src) {
@@ -2516,11 +2506,10 @@ const tabs = (md) => {
 		openRender: ({ active, data }, tokens, index, _, env) => {
 			const { meta } = tokens[index];
 			const titles = data.map(({ title }) => md.renderInline(title, cleanMarkdownEnv(env)));
-			const tabsData = data.map((item, dataIndex) => {
+			return `<Tabs id="${index}" :data='${stringifyProp(data.map((item, dataIndex) => {
 				const { id = titles[dataIndex] } = item;
 				return { id };
-			});
-			return `<Tabs id="${index}" :data='${stringifyProp(tabsData)}'${active === -1 ? "" : ` :active="${active}"`}${meta.id ? ` tab-id="${meta.id}"` : ""}>
+			}))}'${active === -1 ? "" : ` :active="${active}"`}${meta.id ? ` tab-id="${meta.id}"` : ""}>
 ${titles.map((title, titleIndex) => `<template #title${titleIndex}="{ value, isActive }">${title}</template>`).join("")}`;
 		},
 		closeRender: () => `</Tabs>`,
@@ -2812,8 +2801,7 @@ function demoWatcher(app, watchers) {
 		if (tasks[path$3]) {
 			const code$1 = readFileSync(path$3);
 			if (code$1 === false) return;
-			const source = parseEmbedCode(code$1);
-			compileCode(source, tasks[path$3]);
+			compileCode(parseEmbedCode(code$1), tasks[path$3]);
 		}
 	});
 	watcher.on("unlink", (path$3) => {
@@ -2966,8 +2954,7 @@ const normalContainerRender = {
 			env.demoFiles.push(demo);
 			insertSetupScript(demo, env);
 		}
-		const source = parseContainerCode(codeMap);
-		compileCode(source, output);
+		compileCode(parseContainerCode(codeMap), output);
 		return `<VPDemoNormal${stringifyAttrs({
 			":config": name,
 			title,
@@ -3528,9 +3515,8 @@ const acfunPlugin = (md) => {
 		},
 		content(meta) {
 			const { id, width, height, ratio, title } = meta;
-			const src = `${AC_FUN_LINK}/${id}`;
 			return `<VPVideoEmbed${stringifyAttrs({
-				src,
+				src: `${AC_FUN_LINK}/${id}`,
 				width,
 				height,
 				ratio,
@@ -3936,8 +3922,7 @@ function resolveIcon(content, options) {
 //#endregion
 //#region src/node/icon/icon.ts
 function iconRender(content, options) {
-	const icon = resolveIcon(content, options);
-	return `<VPIcon${stringifyAttrs(icon)} />`;
+	return `<VPIcon${stringifyAttrs(resolveIcon(content, options))} />`;
 }
 const iconPlugin = (md, options = {}) => {
 	/**
@@ -4032,10 +4017,7 @@ function normalizeLink(link) {
 //#region src/node/inline/abbr.ts
 const abbrPlugin = (md) => {
 	const { arrayReplaceAt, escapeRE, lib } = md.utils;
-	const OTHER_CHARS = " \r\n$+<=>^`|~";
-	const UNICODE_PUNCTUATION_REGEXP = lib.ucmicro.P.source;
-	const UNICODE_SPACE_REGEXP = lib.ucmicro.Z.source;
-	const WORDING_REGEXP_TEXT = `${UNICODE_PUNCTUATION_REGEXP}|${UNICODE_SPACE_REGEXP}|[${OTHER_CHARS.split("").map(escapeRE).join("")}]`;
+	const WORDING_REGEXP_TEXT = `${lib.ucmicro.P.source}|${lib.ucmicro.Z.source}|[${" \r\n$+<=>^`|~".split("").map(escapeRE).join("")}]`;
 	const abbrDefinition = (state, startLine, _endLine, silent) => {
 		let labelEnd = -1;
 		let pos = state.bMarks[startLine] + state.tShift[startLine];
@@ -4174,8 +4156,7 @@ const annotationPlugin = (md) => {
 		const label = tokens[idx].meta.label;
 		const data = env.annotations[`:${label}`];
 		return `<Annotation label="${label}" :total="${data.sources.length}">${data.sources.map((source, i) => {
-			const annotation = data.rendered[i] ??= md.render(source, cleanMarkdownEnv(env, ["references"]));
-			return `<template #item-${i}>${annotation}</template>`;
+			return `<template #item-${i}>${data.rendered[i] ??= md.render(source, cleanMarkdownEnv(env, ["references"]))}</template>`;
 		}).join("")}</Annotation>`;
 	};
 	md.inline.ruler.before("image", "annotation_ref", annotationRef);