@slidev/parser 52.19.2 → 52.20.0

package/dist/core.mjs

@@ -81,7 +81,11 @@ function resolveConfig(headmatter, themeMeta = {}, filepath, verify = false) {
 			...headmatter.config?.fonts,
 			...headmatter?.fonts
 		}),
-		drawings: resolveDrawings(headmatter.drawings, filepath),
+		drawings: resolveDrawings({
+			...themeMeta.defaults?.drawings,
+			...headmatter.config?.drawings,
+			...headmatter?.drawings
+		}, filepath),
 		htmlAttrs: {
 			...defaultConfig.htmlAttrs,
 			...themeMeta.defaults?.htmlAttrs,
@@ -204,6 +208,7 @@ const RE_TWEET_TAG = /<Tweet\b/;
 const RE_BLUESKY_TAG = /<BlueSky\b/;
 const RE_MERMAID_CODEBLOCK = /^```mermaid/m;
 const RE_HEADING = /^(#+) (.*)$/m;
+const RE_CODE_BLOCK = /^```[\s\S]+?^```/gm;
 const RE_LEADING_BACKTICKS = /^\s*`+/;
 const RE_CRLF = /\r?\n/g;
 function advanceHtmlCommentState(line, inHtmlComment) {
@@ -261,6 +266,15 @@ function matter(code, options) {
 	};
 }
 const IMAGE_EXTENSIONS = /\.(?:png|jpe?g|gif|svg|webp|avif|ico|bmp|tiff?)$/i;
+const RE_MD_IMAGE_TITLE = /\s+(?:"[^"]*"|'[^']*')\s*$/;
+/**
+* Strip the optional CommonMark title and the angle-bracket form from a
+* markdown image destination, so `![a](/x.png "Title")` yields `/x.png`.
+*/
+function normalizeMarkdownImageTarget(target) {
+	const url = target.trim().replace(RE_MD_IMAGE_TITLE, "").trim();
+	return url.startsWith("<") && url.endsWith(">") ? url.slice(1, -1).trim() : url;
+}
 /**
 * Extract image URLs from slide content and frontmatter.
 * Strips code blocks first to avoid false positives.
@@ -279,8 +293,11 @@ function extractImagesUsage(content, frontmatter) {
 			} else images.add(val);
 		}
 	}
-	const stripped = content.replace(/^```[\s\S]+?^```/gm, "");
-	for (const [, url] of stripped.matchAll(/!\[[^\]]*\]\(([^)]+)\)/g)) if (url && !url.startsWith("data:")) images.add(url.trim());
+	const stripped = content.replace(RE_CODE_BLOCK, "");
+	for (const [, target] of stripped.matchAll(/!\[[^\]]*\]\(([^)]+)\)/g)) {
+		const url = normalizeMarkdownImageTarget(target);
+		if (url && !url.startsWith("data:")) images.add(url);
+	}
 	for (const [, url] of stripped.matchAll(/\b(?:src|image)=["']([^"']+)["']/g)) if (url && !url.startsWith("data:") && !url.includes("{{") && IMAGE_EXTENSIONS.test(url)) images.add(url.trim());
 	for (const [, url] of stripped.matchAll(/:(?:src|image)=["']'([^']+)'["']/g)) if (url && !url.startsWith("data:") && IMAGE_EXTENSIONS.test(url)) images.add(url.trim());
 	for (const [, url] of stripped.matchAll(/url\(["']?([^"')]+)["']?\)/g)) if (url && !url.startsWith("data:") && IMAGE_EXTENSIONS.test(url)) images.add(url.trim());
@@ -313,7 +330,7 @@ function parseSlide(raw, options = {}) {
 	let level;
 	if (frontmatter.title || frontmatter.name) title = frontmatter.title || frontmatter.name;
 	else {
-		const match = content.match(RE_HEADING);
+		const match = content.replace(RE_CODE_BLOCK, "").match(RE_HEADING);
 		title = match?.[2]?.trim();
 		level = match?.[1]?.length;
 	}

package/dist/fs.mjs

@@ -54,6 +54,14 @@ async function load(options, filepath, sources = {}, mode) {
 		const directImporter = importers?.at(-1);
 		for (const index of parseRangeString(md.slides.length, range)) {
 			const subSlide = md.slides[index - 1];
+			if (!subSlide) {
+				md.errors ??= [];
+				md.errors.push({
+					row: 0,
+					message: `Slide ${index} does not exist in "${path}", which has ${md.slides.length} slides`
+				});
+				continue;
+			}
 			try {
 				await loadSlide(md, subSlide, frontmatterOverride, importers);
 			} catch (e) {

package/dist/utils.mjs

@@ -40,8 +40,10 @@ 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 (!RE_ALPHA.test(timestamp)) seconds = Number(timestamp);
-	else {
+	} else if (!RE_ALPHA.test(timestamp)) {
+		seconds = Number(timestamp);
+		if (Number.isNaN(seconds)) throw new TypeError("Invalid timestamp format");
+	} else {
 		const unitMap = {
 			s: 1,
 			sec: 1,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slidev/parser",
-  "version": "52.19.2",
+  "version": "52.20.0",
   "description": "Markdown parser for Slidev",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@antfu/utils": "^9.3.0",
-    "@slidev/types": "52.19.2",
+    "@slidev/types": "52.20.0",
     "pathe": "^2.0.3",
     "yaml": "^2.9.1"
   },