@slidev/parser 52.14.2 → 52.15.0

package/dist/core.d.mts

@@ -1,4 +1,4 @@
-import { a as TimesplitOutput, i as TimesplitInput, n as parseRangeString, o as parseTimesplits, r as parseTimeString, t as parseAspectRatio } from "./utils-BwHfBd2q.mjs";
+import { a as TimesplitOutput, i as TimesplitInput, n as parseRangeString, o as parseTimesplits, r as parseTimeString, t as parseAspectRatio } from "./utils-Bas9O4Gd.mjs";
 import { FontOptions, ResolvedFontOptions, SlidevConfig, SlidevDetectedFeatures, SlidevMarkdown, SlidevPreparserExtension, SlidevThemeMeta, SourceSlideInfo } from "@slidev/types";
 
 //#region src/config.d.ts

package/dist/core.mjs

@@ -1,8 +1,10 @@
-import { i as parseTimeString, n as parseRangeString, r as parseTimesplits, t as parseAspectRatio } from "./utils-BiNCPCdQ.mjs";
+import { i as parseTimeString, n as parseRangeString, r as parseTimesplits, t as parseAspectRatio } from "./utils-CmVawvVO.mjs";
 import { ensurePrefix, toArray, uniq } from "@antfu/utils";
 import YAML from "yaml";
 
 //#region src/config.ts
+const RE_QUOTED_STRING = /^(['"]).*\1$/;
+const RE_FILENAME_STEM = /([^\\/]+?)(?:\.\w+)?$/;
 function getDefaultConfig() {
 	return {
 		theme: "default",
@@ -53,7 +55,8 @@ function getDefaultConfig() {
 		duration: "30min",
 		timer: "stopwatch",
 		magicMoveDuration: 800,
-		preloadImages: true
+		preloadImages: true,
+		clickAnimation: ""
 	};
 }
 function resolveConfig(headmatter, themeMeta = {}, filepath, verify = false) {
@@ -72,15 +75,23 @@ function resolveConfig(headmatter, themeMeta = {}, filepath, verify = false) {
 		...headmatter.config,
 		...headmatter,
 		fonts: resolveFonts({
+			...defaultConfig.fonts,
 			...themeMeta.defaults?.fonts,
 			...headmatter.config?.fonts,
 			...headmatter?.fonts
 		}),
 		drawings: resolveDrawings(headmatter.drawings, filepath),
 		htmlAttrs: {
+			...defaultConfig.htmlAttrs,
 			...themeMeta.defaults?.htmlAttrs,
 			...headmatter.config?.htmlAttrs,
 			...headmatter?.htmlAttrs
+		},
+		themeConfig: {
+			...defaultConfig.themeConfig,
+			...themeMeta.defaults?.themeConfig,
+			...headmatter.config?.themeConfig,
+			...headmatter?.themeConfig
 		}
 	};
 	if (config.highlighter === "shikiji") {
@@ -106,12 +117,12 @@ function verifyConfig(config, themeMeta = {}, warn = (v) => console.warn(`[slide
 }
 function resolveFonts(fonts = {}) {
 	const { fallbacks = true, italic = false, provider = "google" } = fonts;
-	let sans = toArray(fonts.sans).flatMap((i) => i.split(/,\s*/g)).map((i) => i.trim());
-	let serif = toArray(fonts.serif).flatMap((i) => i.split(/,\s*/g)).map((i) => i.trim());
-	let mono = toArray(fonts.mono).flatMap((i) => i.split(/,\s*/g)).map((i) => i.trim());
-	const weights = toArray(fonts.weights || "200,400,600").flatMap((i) => i.toString().split(/,\s*/g)).map((i) => i.trim());
-	const custom = toArray(fonts.custom).flatMap((i) => i.split(/,\s*/g)).map((i) => i.trim());
-	const local = toArray(fonts.local).flatMap((i) => i.split(/,\s*/g)).map((i) => i.trim());
+	let sans = toArray(fonts.sans).flatMap((i) => i.split(",")).map((i) => i.trim());
+	let serif = toArray(fonts.serif).flatMap((i) => i.split(",")).map((i) => i.trim());
+	let mono = toArray(fonts.mono).flatMap((i) => i.split(",")).map((i) => i.trim());
+	const weights = toArray(fonts.weights || "200,400,600").flatMap((i) => i.toString().split(",")).map((i) => i.trim());
+	const custom = toArray(fonts.custom).flatMap((i) => i.split(",")).map((i) => i.trim());
+	const local = toArray(fonts.local).flatMap((i) => i.split(",")).map((i) => i.trim());
 	const webfonts = fonts.webfonts ? fonts.webfonts : fallbacks ? uniq([
 		...sans,
 		...serif,
@@ -119,7 +130,7 @@ function resolveFonts(fonts = {}) {
 		...custom
 	]).filter((i) => !local.includes(i)) : [];
 	function toQuoted(font) {
-		if (/^(['"]).*\1$/.test(font)) return font;
+		if (RE_QUOTED_STRING.test(font)) return font;
 		return `"${font}"`;
 	}
 	if (fallbacks) {
@@ -176,7 +187,7 @@ function resolveDrawings(options = {}, filepath) {
 	const { enabled = true, persist = false, presenterOnly = false, syncAll = true } = options;
 	return {
 		enabled,
-		persist: typeof persist === "string" ? persist : persist ? `.slidev/drawings${filepath ? `/${filepath.match(/([^\\/]+?)(\.\w+)?$/)?.[1]}` : ""}` : false,
+		persist: typeof persist === "string" ? persist : persist ? `.slidev/drawings${filepath ? `/${filepath.match(RE_FILENAME_STEM)?.[1]}` : ""}` : false,
 		presenterOnly,
 		syncAll
 	};
@@ -184,6 +195,17 @@ function resolveDrawings(options = {}, filepath) {
 
 //#endregion
 //#region src/core.ts
+const RE_FRONTMATTER = /^---.*\r?\n([\s\S]*?)---/;
+const RE_YAML_CODEBLOCK = /^\s*```ya?ml([\s\S]*?)```/;
+const RE_DOLLAR_INLINE = /\$.*?\$/;
+const RE_DOLLAR_BLOCK = /\$\$/;
+const RE_MONACO_BLOCK = /\{monaco.*\}/;
+const RE_TWEET_TAG = /<Tweet\b/;
+const RE_BLUESKY_TAG = /<BlueSky\b/;
+const RE_MERMAID_CODEBLOCK = /^```mermaid/m;
+const RE_HEADING = /^(#+) (.*)$/m;
+const RE_LEADING_BACKTICKS = /^\s*`+/;
+const RE_CRLF = /\r?\n/g;
 function stringify(data) {
 	return `${data.slides.map(stringifySlide).join("\n").trim()}\n`;
 }
@@ -203,12 +225,12 @@ function prettify(data) {
 function matter(code, options) {
 	let type;
 	let raw;
-	let content = code.replace(/^---.*\r?\n([\s\S]*?)---/, (_, f) => {
+	let content = code.replace(RE_FRONTMATTER, (_, f) => {
 		type = "frontmatter";
 		raw = f;
 		return "";
 	});
-	if (type !== "frontmatter") content = content.replace(/^\s*```ya?ml([\s\S]*?)```/, (_, f) => {
+	if (type !== "frontmatter") content = content.replace(RE_YAML_CODEBLOCK, (_, f) => {
 		type = "yaml";
 		raw = f;
 		return "";
@@ -248,10 +270,11 @@ function extractImagesUsage(content, frontmatter) {
 }
 function detectFeatures(code) {
 	return {
-		katex: !!code.match(/\$.*?\$/) || !!code.match(/\$\$/),
-		monaco: code.match(/\{monaco.*\}/) ? scanMonacoReferencedMods(code) : false,
-		tweet: !!code.match(/<Tweet\b/),
-		mermaid: !!code.match(/^```mermaid/m)
+		katex: !!code.match(RE_DOLLAR_INLINE) || !!code.match(RE_DOLLAR_BLOCK),
+		monaco: RE_MONACO_BLOCK.test(code) ? scanMonacoReferencedMods(code) : false,
+		tweet: !!code.match(RE_TWEET_TAG),
+		bluesky: !!code.match(RE_BLUESKY_TAG),
+		mermaid: !!code.match(RE_MERMAID_CODEBLOCK)
 	};
 }
 function parseSlide(raw, options = {}) {
@@ -272,7 +295,7 @@ function parseSlide(raw, options = {}) {
 	let level;
 	if (frontmatter.title || frontmatter.name) title = frontmatter.title || frontmatter.name;
 	else {
-		const match = content.match(/^(#+) (.*)$/m);
+		const match = content.match(RE_HEADING);
 		title = match?.[2]?.trim();
 		level = match?.[1]?.length;
 	}
@@ -294,7 +317,7 @@ function parseSlide(raw, options = {}) {
 	};
 }
 async function parse(markdown, filepath, extensions, options = {}) {
-	const lines = markdown.split(options.preserveCR ? "\n" : /\r?\n/g);
+	const lines = markdown.split(options.preserveCR ? "\n" : RE_CRLF);
 	const slides = [];
 	let start = 0;
 	let contentStart = 0;
@@ -338,7 +361,7 @@ async function parse(markdown, filepath, extensions, options = {}) {
 				contentStart = i + 1;
 			}
 		} else if (line.trimStart().startsWith("```")) {
-			const codeBlockLevel = line.match(/^\s*`+/)[0];
+			const codeBlockLevel = line.match(RE_LEADING_BACKTICKS)[0];
 			let j = i + 1;
 			for (; j < lines.length; j++) if (lines[j].startsWith(codeBlockLevel)) break;
 			if (j !== lines.length) i = j;
@@ -352,7 +375,7 @@ async function parse(markdown, filepath, extensions, options = {}) {
 	};
 }
 function parseSync(markdown, filepath, options = {}) {
-	const lines = markdown.split(options.preserveCR ? "\n" : /\r?\n/g);
+	const lines = markdown.split(options.preserveCR ? "\n" : RE_CRLF);
 	const slides = [];
 	let start = 0;
 	let contentStart = 0;
@@ -381,7 +404,7 @@ function parseSync(markdown, filepath, options = {}) {
 				contentStart = i + 1;
 			}
 		} else if (line.trimStart().startsWith("```")) {
-			const codeBlockLevel = line.match(/^\s*`+/)[0];
+			const codeBlockLevel = line.match(RE_LEADING_BACKTICKS)[0];
 			let j = i + 1;
 			for (; j < lines.length; j++) if (lines[j].startsWith(codeBlockLevel)) break;
 			if (j !== lines.length) i = j;

package/dist/fs.d.mts

@@ -1,4 +1,4 @@
-import { a as TimesplitOutput, i as TimesplitInput, n as parseRangeString, o as parseTimesplits, r as parseTimeString, t as parseAspectRatio } from "./utils-BwHfBd2q.mjs";
+import { a as TimesplitOutput, i as TimesplitInput, n as parseRangeString, o as parseTimesplits, r as parseTimeString, t as parseAspectRatio } from "./utils-Bas9O4Gd.mjs";
 import { SlidevParserOptions, detectFeatures, extractImagesUsage, getDefaultConfig, parse, parseSlide, parseSync, prettify, prettifySlide, resolveConfig, resolveFonts, stringify, stringifySlide, verifyConfig } from "./core.mjs";
 import { PreparserExtensionLoader, SlidevData, SlidevMarkdown } from "@slidev/types";
 

package/dist/fs.mjs

@@ -1,4 +1,4 @@
-import { i as parseTimeString, n as parseRangeString, r as parseTimesplits, t as parseAspectRatio } from "./utils-BiNCPCdQ.mjs";
+import { i as parseTimeString, n as parseRangeString, r as parseTimesplits, t as parseAspectRatio } from "./utils-CmVawvVO.mjs";
 import { detectFeatures, extractImagesUsage, getDefaultConfig, parse, parseSlide, parseSync, prettify, prettifySlide, resolveConfig, resolveFonts, stringify, stringifySlide, verifyConfig } from "./core.mjs";
 import { slash } from "@antfu/utils";
 import YAML from "yaml";
@@ -7,6 +7,10 @@ import { readFile, writeFile } from "node:fs/promises";
 import { dirname, resolve } from "node:path";
 
 //#region src/fs.ts
+const RE_FRONTMATTER_START = /^---(?:[^-].*)?$/;
+const RE_BLANK_LINE = /^\s*$/;
+const RE_FRONTMATTER_END = /^---$/;
+const RE_CRLF = /\r?\n/g;
 let preparserExtensionLoader = null;
 function injectPreparserExtensionLoader(fn) {
 	preparserExtensionLoader = fn;
@@ -16,11 +20,11 @@ async function load(userRoot, filepath, sources = {}, mode) {
 	const markdown = await loadSource(filepath);
 	let extensions;
 	if (preparserExtensionLoader) {
-		const lines = markdown.split(/\r?\n/g);
+		const lines = markdown.split(RE_CRLF);
 		let hm = "";
-		if (lines[0].match(/^---([^-].*)?$/) && !lines[1]?.match(/^\s*$/)) {
+		if (RE_FRONTMATTER_START.test(lines[0]) && !lines[1]?.match(RE_BLANK_LINE)) {
 			let hEnd = 1;
-			while (hEnd < lines.length && !lines[hEnd].trimEnd().match(/^---$/)) hEnd++;
+			while (hEnd < lines.length && !RE_FRONTMATTER_END.test(lines[hEnd].trimEnd())) hEnd++;
 			hm = lines.slice(1, hEnd).join("\n");
 		}
 		const o = YAML.parse(hm) ?? {};

package/dist/index.d.mts

@@ -1,3 +1,3 @@
-import { a as TimesplitOutput, i as TimesplitInput, n as parseRangeString, o as parseTimesplits, r as parseTimeString, t as parseAspectRatio } from "./utils-BwHfBd2q.mjs";
+import { a as TimesplitOutput, i as TimesplitInput, n as parseRangeString, o as parseTimesplits, r as parseTimeString, t as parseAspectRatio } from "./utils-Bas9O4Gd.mjs";
 import { SlidevParserOptions, detectFeatures, extractImagesUsage, getDefaultConfig, parse, parseSlide, parseSync, prettify, prettifySlide, resolveConfig, resolveFonts, stringify, stringifySlide, verifyConfig } from "./core.mjs";
 export { SlidevParserOptions, TimesplitInput, TimesplitOutput, detectFeatures, extractImagesUsage, getDefaultConfig, parse, parseAspectRatio, parseRangeString, parseSlide, parseSync, parseTimeString, parseTimesplits, prettify, prettifySlide, resolveConfig, resolveFonts, stringify, stringifySlide, verifyConfig };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { i as parseTimeString, n as parseRangeString, r as parseTimesplits, t as parseAspectRatio } from "./utils-BiNCPCdQ.mjs";
+import { i as parseTimeString, n as parseRangeString, r as parseTimesplits, t as parseAspectRatio } from "./utils-CmVawvVO.mjs";
 import { detectFeatures, extractImagesUsage, getDefaultConfig, parse, parseSlide, parseSync, prettify, prettifySlide, resolveConfig, resolveFonts, stringify, stringifySlide, verifyConfig } from "./core.mjs";
 
 export { detectFeatures, extractImagesUsage, getDefaultConfig, parse, parseAspectRatio, parseRangeString, parseSlide, parseSync, parseTimeString, parseTimesplits, prettify, prettifySlide, resolveConfig, resolveFonts, stringify, stringifySlide, verifyConfig };

package/dist/{utils-BwHfBd2q.d.mts → utils-Bas9O4Gd.d.mts}

@@ -14,21 +14,6 @@ interface TimesplitOutput {
 declare function parseTimesplits(inputs: TimesplitInput[]): TimesplitOutput[];
 //#endregion
 //#region src/timesplit/timestring.d.ts
-/**
- * Parse timestamp into seconds
- *
- * Accepts:
- * - 10:50.1
- * - 10s
- * - 5m
- * - 3min
- * - 3mins 5secs
- * - 10.5m3s
- * - +10s
- * - 1h10m30s
- * - 1h4s
- * - 1:1:1
- */
 declare function parseTimeString(timestamp: string | number): {
   seconds: number;
   relative: boolean;

package/dist/{utils-BiNCPCdQ.mjs → utils-CmVawvVO.mjs}

@@ -16,6 +16,7 @@ import { isNumber, range, uniq } from "@antfu/utils";
 * - 1h4s
 * - 1:1:1
 */
+const RE_ALPHA = /[a-z]/i;
 function parseTimeString(timestamp) {
 	if (typeof timestamp === "number") return {
 		seconds: timestamp,
@@ -40,7 +41,7 @@ function parseTimeString(timestamp) {
 		else throw new TypeError("Invalid timestamp format");
 		if (Number.isNaN(h) || Number.isNaN(m) || Number.isNaN(s)) throw new TypeError("Invalid timestamp format");
 		seconds = (h || 0) * 3600 + (m || 0) * 60 + (s || 0);
-	} else if (!timestamp.match(/[a-z]/i)) seconds = Number(timestamp);
+	} else if (!RE_ALPHA.test(timestamp)) seconds = Number(timestamp);
 	else {
 		const unitMap = {
 			s: 1,
@@ -115,6 +116,7 @@ function parseTimesplits(inputs) {
 
 //#endregion
 //#region src/utils.ts
+const RE_ASPECT_RATIO_SEPARATOR = /[:/x|]/;
 /**
 * 1,3-5,8 => [1, 3, 4, 5, 8]
 */
@@ -135,7 +137,7 @@ function parseRangeString(total, rangeStr) {
 function parseAspectRatio(str) {
 	if (isNumber(str)) return str;
 	if (!Number.isNaN(+str)) return +str;
-	const [wStr = "", hStr = ""] = str.split(/[:/x|]/);
+	const [wStr = "", hStr = ""] = str.split(RE_ASPECT_RATIO_SEPARATOR);
 	const w = Number.parseFloat(wStr.trim());
 	const h = Number.parseFloat(hStr.trim());
 	if (Number.isNaN(w) || Number.isNaN(h) || h === 0) throw new Error(`Invalid aspect ratio "${str}"`);

package/dist/utils.d.mts

@@ -1,2 +1,2 @@
-import { a as TimesplitOutput, i as TimesplitInput, n as parseRangeString, o as parseTimesplits, r as parseTimeString, t as parseAspectRatio } from "./utils-BwHfBd2q.mjs";
+import { a as TimesplitOutput, i as TimesplitInput, n as parseRangeString, o as parseTimesplits, r as parseTimeString, t as parseAspectRatio } from "./utils-Bas9O4Gd.mjs";
 export { TimesplitInput, TimesplitOutput, parseAspectRatio, parseRangeString, parseTimeString, parseTimesplits };

package/dist/utils.mjs

@@ -1,3 +1,3 @@
-import { i as parseTimeString, n as parseRangeString, r as parseTimesplits, t as parseAspectRatio } from "./utils-BiNCPCdQ.mjs";
+import { i as parseTimeString, n as parseRangeString, r as parseTimesplits, t as parseAspectRatio } from "./utils-CmVawvVO.mjs";
 
 export { parseAspectRatio, parseRangeString, parseTimeString, parseTimesplits };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slidev/parser",
-  "version": "52.14.2",
+  "version": "52.15.0",
   "description": "Markdown parser for Slidev",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -30,8 +30,8 @@
   },
   "dependencies": {
     "@antfu/utils": "^9.3.0",
-    "yaml": "^2.8.2",
-    "@slidev/types": "52.14.2"
+    "yaml": "^2.8.3",
+    "@slidev/types": "52.15.0"
   },
   "scripts": {
     "build": "tsdown",