@slidev/parser 52.19.1 → 52.20.0

package/dist/core.d.mts

@@ -1,28 +1,28 @@
 import { a as TimesplitOutput, i as TimesplitInput, n as parseRangeString, o as parseTimesplits, r as parseTimeString, t as parseAspectRatio } from "./utils-DpcPp-I0.mjs";
 import { FontOptions, ResolvedFontOptions, SlidevConfig, SlidevDetectedFeatures, SlidevMarkdown, SlidevPreparserExtension, SlidevThemeMeta, SourceSlideInfo } from "@slidev/types";
 //#region src/config.d.ts
-declare function getDefaultConfig(): SlidevConfig;
-declare function resolveConfig(headmatter: any, themeMeta?: SlidevThemeMeta, filepath?: string, verify?: boolean): SlidevConfig;
-declare function verifyConfig(config: SlidevConfig, themeMeta?: SlidevThemeMeta, warn?: (v: string) => void): void;
-declare function resolveFonts(fonts?: FontOptions): ResolvedFontOptions;
+export declare function getDefaultConfig(): SlidevConfig;
+export declare function resolveConfig(headmatter: any, themeMeta?: SlidevThemeMeta, filepath?: string, verify?: boolean): SlidevConfig;
+export declare function verifyConfig(config: SlidevConfig, themeMeta?: SlidevThemeMeta, warn?: (v: string) => void): void;
+export declare function resolveFonts(fonts?: FontOptions): ResolvedFontOptions;
 //#endregion
 //#region src/core.d.ts
-interface SlidevParserOptions {
+export interface SlidevParserOptions {
   noParseYAML?: boolean;
   preserveCR?: boolean;
 }
-declare function stringify(data: SlidevMarkdown): string;
-declare function stringifySlide(data: SourceSlideInfo, idx?: number): string;
-declare function prettifySlide(data: SourceSlideInfo): SourceSlideInfo;
-declare function prettify(data: SlidevMarkdown): SlidevMarkdown;
+export declare function stringify(data: SlidevMarkdown): string;
+export declare function stringifySlide(data: SourceSlideInfo, idx?: number): string;
+export declare function prettifySlide(data: SourceSlideInfo): SourceSlideInfo;
+export declare function prettify(data: SlidevMarkdown): SlidevMarkdown;
 /**
  * Extract image URLs from slide content and frontmatter.
  * Strips code blocks first to avoid false positives.
  */
-declare function extractImagesUsage(content: string, frontmatter: Record<string, any>): string[];
-declare function detectFeatures(code: string): SlidevDetectedFeatures;
-declare function parseSlide(raw: string, options?: SlidevParserOptions): Omit<SourceSlideInfo, 'filepath' | 'index' | 'start' | 'contentStart' | 'end'>;
-declare function parse(markdown: string, filepath: string, extensions?: SlidevPreparserExtension[], options?: SlidevParserOptions): Promise<SlidevMarkdown>;
-declare function parseSync(markdown: string, filepath: string, options?: SlidevParserOptions): SlidevMarkdown;
+export declare function extractImagesUsage(content: string, frontmatter: Record<string, any>): string[];
+export declare function detectFeatures(code: string): SlidevDetectedFeatures;
+export declare function parseSlide(raw: string, options?: SlidevParserOptions): Omit<SourceSlideInfo, 'filepath' | 'index' | 'start' | 'contentStart' | 'end'>;
+export declare function parse(markdown: string, filepath: string, extensions?: SlidevPreparserExtension[], options?: SlidevParserOptions): Promise<SlidevMarkdown>;
+export declare function parseSync(markdown: string, filepath: string, options?: SlidevParserOptions): SlidevMarkdown;
 //#endregion
-export { SlidevParserOptions, TimesplitInput, TimesplitOutput, detectFeatures, extractImagesUsage, getDefaultConfig, parse, parseAspectRatio, parseRangeString, parseSlide, parseSync, parseTimeString, parseTimesplits, prettify, prettifySlide, resolveConfig, resolveFonts, stringify, stringifySlide, verifyConfig };
+export { TimesplitInput, TimesplitOutput, parseAspectRatio, parseRangeString, parseTimeString, parseTimesplits };

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.
@@ -273,12 +287,17 @@ function extractImagesUsage(content, frontmatter) {
 		"background"
 	]) {
 		const val = frontmatter[key];
-		if (typeof val === "string" && val && !val.startsWith("data:")) if (key === "background") {
-			if (IMAGE_EXTENSIONS.test(val) || val.startsWith("/") || val.startsWith("http")) images.add(val);
-		} else images.add(val);
+		if (typeof val === "string" && val && !val.startsWith("data:")) {
+			if (key === "background") {
+				if (IMAGE_EXTENSIONS.test(val) || val.startsWith("/") || val.startsWith("http")) images.add(val);
+			} else images.add(val);
+		}
+	}
+	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);
 	}
-	const stripped = content.replace(/^```[\s\S]+?^```/gm, "");
-	for (const [, url] of stripped.matchAll(/!\[[^\]]*\]\(([^)]+)\)/g)) if (url && !url.startsWith("data:")) images.add(url.trim());
 	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());
@@ -311,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.d.mts

@@ -7,9 +7,9 @@ import { PreparserExtensionLoader, SlidevData, SlidevMarkdown } from "@slidev/ty
  * Inlined here (rather than imported from the `slidev` package) because
  * `@slidev/parser` must stay independent of `@slidev/slidev`.
  */
-declare function isPathInsideRoots(filePath: string, roots: string[]): boolean;
-declare function injectPreparserExtensionLoader(fn: PreparserExtensionLoader): void;
-interface LoadRootsInfo {
+export declare function isPathInsideRoots(filePath: string, roots: string[]): boolean;
+export declare function injectPreparserExtensionLoader(fn: PreparserExtensionLoader): void;
+export interface LoadRootsInfo {
   roots: string[];
   userRoot: string;
   /**
@@ -23,8 +23,8 @@ interface LoadRootsInfo {
  * Slidev data without config and themeMeta,
  * because config and themeMeta depends on the theme to be loaded.
  */
-type LoadedSlidevData = Omit<SlidevData, 'config' | 'themeMeta'>;
-declare function load(options: LoadRootsInfo, filepath: string, sources?: Record<string, string> | ((path: string) => Promise<string>), mode?: string): Promise<LoadedSlidevData>;
-declare function save(markdown: SlidevMarkdown): Promise<string>;
+export type LoadedSlidevData = Omit<SlidevData, 'config' | 'themeMeta'>;
+export declare function load(options: LoadRootsInfo, filepath: string, sources?: Record<string, string> | ((path: string) => Promise<string>), mode?: string): Promise<LoadedSlidevData>;
+export declare function save(markdown: SlidevMarkdown): Promise<string>;
 //#endregion
-export { LoadRootsInfo, LoadedSlidevData, SlidevParserOptions, TimesplitInput, TimesplitOutput, detectFeatures, extractImagesUsage, getDefaultConfig, injectPreparserExtensionLoader, isPathInsideRoots, load, parse, parseAspectRatio, parseRangeString, parseSlide, parseSync, parseTimeString, parseTimesplits, prettify, prettifySlide, resolveConfig, resolveFonts, save, stringify, stringifySlide, verifyConfig };
+export { SlidevParserOptions, TimesplitInput, TimesplitOutput, detectFeatures, extractImagesUsage, getDefaultConfig, parse, parseAspectRatio, parseRangeString, parseSlide, parseSync, parseTimeString, parseTimesplits, prettify, prettifySlide, resolveConfig, resolveFonts, stringify, stringifySlide, verifyConfig };

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.1",
+  "version": "52.20.0",
   "description": "Markdown parser for Slidev",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -30,9 +30,9 @@
   },
   "dependencies": {
     "@antfu/utils": "^9.3.0",
+    "@slidev/types": "52.20.0",
     "pathe": "^2.0.3",
-    "yaml": "^2.9.0",
-    "@slidev/types": "52.19.1"
+    "yaml": "^2.9.1"
   },
   "devDependencies": {
     "tsdown-stale-guard": "^0.1.3"