@slidev/parser 52.15.2 → 52.16.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-Bas9O4Gd.mjs";
+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

package/dist/core.mjs

@@ -1,7 +1,6 @@
-import { i as parseTimeString, n as parseRangeString, r as parseTimesplits, t as parseAspectRatio } from "./utils-CmVawvVO.mjs";
+import { parseAspectRatio, parseRangeString, parseTimeString, parseTimesplits } from "./utils.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+)?$/;
@@ -192,7 +191,6 @@ function resolveDrawings(options = {}, filepath) {
 		syncAll
 	};
 }
-
 //#endregion
 //#region src/core.ts
 const RE_FRONTMATTER = /^---.*\r?\n([\s\S]*?)---/;
@@ -470,13 +468,12 @@ function scanMonacoReferencedMods(md) {
 	};
 }
 function hash(str) {
-	let hash$1 = 0;
+	let hash = 0;
 	for (let i = 0; i < str.length; i++) {
-		hash$1 = (hash$1 << 5) - hash$1 + str.charCodeAt(i);
-		hash$1 |= 0;
+		hash = (hash << 5) - hash + str.charCodeAt(i);
+		hash |= 0;
 	}
-	return hash$1.toString(36).slice(0, 12);
+	return hash.toString(36).slice(0, 12);
 }
-
 //#endregion
-export { detectFeatures, extractImagesUsage, getDefaultConfig, parse, parseAspectRatio, parseRangeString, parseSlide, parseSync, parseTimeString, parseTimesplits, prettify, prettifySlide, resolveConfig, resolveFonts, stringify, stringifySlide, verifyConfig };
+export { detectFeatures, extractImagesUsage, getDefaultConfig, parse, parseAspectRatio, parseRangeString, parseSlide, parseSync, parseTimeString, parseTimesplits, prettify, prettifySlide, resolveConfig, resolveFonts, stringify, stringifySlide, verifyConfig };

package/dist/fs.d.mts

@@ -1,15 +1,19 @@
-import { a as TimesplitOutput, i as TimesplitInput, n as parseRangeString, o as parseTimesplits, r as parseTimeString, t as parseAspectRatio } from "./utils-Bas9O4Gd.mjs";
+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 { SlidevParserOptions, detectFeatures, extractImagesUsage, getDefaultConfig, parse, parseSlide, parseSync, prettify, prettifySlide, resolveConfig, resolveFonts, stringify, stringifySlide, verifyConfig } from "./core.mjs";
 import { PreparserExtensionLoader, SlidevData, SlidevMarkdown } from "@slidev/types";
 
 //#region src/fs.d.ts
 declare function injectPreparserExtensionLoader(fn: PreparserExtensionLoader): void;
+interface LoadRootsInfo {
+  roots: string[];
+  userRoot: string;
+}
 /**
  * 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(userRoot: string, filepath: string, sources?: Record<string, string> | ((path: string) => Promise<string>), mode?: string): Promise<LoadedSlidevData>;
+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>;
 //#endregion
-export { LoadedSlidevData, SlidevParserOptions, TimesplitInput, TimesplitOutput, detectFeatures, extractImagesUsage, getDefaultConfig, injectPreparserExtensionLoader, load, parse, parseAspectRatio, parseRangeString, parseSlide, parseSync, parseTimeString, parseTimesplits, prettify, prettifySlide, resolveConfig, resolveFonts, save, stringify, stringifySlide, verifyConfig };
+export { LoadRootsInfo, LoadedSlidevData, SlidevParserOptions, TimesplitInput, TimesplitOutput, detectFeatures, extractImagesUsage, getDefaultConfig, injectPreparserExtensionLoader, load, parse, parseAspectRatio, parseRangeString, parseSlide, parseSync, parseTimeString, parseTimesplits, prettify, prettifySlide, resolveConfig, resolveFonts, save, stringify, stringifySlide, verifyConfig };

package/dist/fs.mjs

@@ -1,11 +1,10 @@
-import { i as parseTimeString, n as parseRangeString, r as parseTimesplits, t as parseAspectRatio } from "./utils-CmVawvVO.mjs";
+import { parseAspectRatio, parseRangeString, parseTimeString, parseTimesplits } from "./utils.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";
 import { existsSync } from "node:fs";
 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*$/;
@@ -15,7 +14,7 @@ let preparserExtensionLoader = null;
 function injectPreparserExtensionLoader(fn) {
 	preparserExtensionLoader = fn;
 }
-async function load(userRoot, filepath, sources = {}, mode) {
+async function load(options, filepath, sources = {}, mode) {
 	const loadSource = typeof sources === "function" ? sources : async (path) => sources[path] ?? readFile(path, "utf-8");
 	const markdown = await loadSource(filepath);
 	let extensions;
@@ -28,12 +27,12 @@ async function load(userRoot, filepath, sources = {}, mode) {
 			hm = lines.slice(1, hEnd).join("\n");
 		}
 		const o = YAML.parse(hm) ?? {};
-		extensions = await preparserExtensionLoader(o, filepath, mode);
+		extensions = await preparserExtensionLoader(options.roots, o, filepath, mode);
 	}
 	const markdownFiles = {};
 	const watchFiles = {};
 	const slides = [];
-	async function loadMarkdown(path, range$1, frontmatterOverride, importers) {
+	async function loadMarkdown(path, range, frontmatterOverride, importers) {
 		let md = markdownFiles[path];
 		if (!md) {
 			md = await parse(await loadSource(path), path, extensions);
@@ -41,7 +40,7 @@ async function load(userRoot, filepath, sources = {}, mode) {
 			watchFiles[path] = /* @__PURE__ */ new Set();
 		}
 		const directImporter = importers?.at(-1);
-		for (const index of parseRangeString(md.slides.length, range$1)) {
+		for (const index of parseRangeString(md.slides.length, range)) {
 			const subSlide = md.slides[index - 1];
 			try {
 				await loadSlide(md, subSlide, frontmatterOverride, importers);
@@ -61,7 +60,7 @@ async function load(userRoot, filepath, sources = {}, mode) {
 		if (slide.frontmatter.disabled || slide.frontmatter.hide) return;
 		if (slide.frontmatter.src) {
 			const [rawPath, rangeRaw] = slide.frontmatter.src.split("#");
-			const path = slash(rawPath.startsWith("/") ? resolve(userRoot, rawPath.substring(1)) : resolve(dirname(slide.filepath), rawPath));
+			const path = slash(rawPath.startsWith("/") ? resolve(options.userRoot, rawPath.substring(1)) : resolve(dirname(slide.filepath), rawPath));
 			frontmatterOverride = {
 				...slide.frontmatter,
 				...frontmatterOverride
@@ -107,6 +106,5 @@ async function save(markdown) {
 	await writeFile(markdown.filepath, fileContent, "utf-8");
 	return fileContent;
 }
-
 //#endregion
-export { detectFeatures, extractImagesUsage, getDefaultConfig, injectPreparserExtensionLoader, load, parse, parseAspectRatio, parseRangeString, parseSlide, parseSync, parseTimeString, parseTimesplits, prettify, prettifySlide, resolveConfig, resolveFonts, save, stringify, stringifySlide, verifyConfig };
+export { detectFeatures, extractImagesUsage, getDefaultConfig, injectPreparserExtensionLoader, load, parse, parseAspectRatio, parseRangeString, parseSlide, parseSync, parseTimeString, parseTimesplits, prettify, prettifySlide, resolveConfig, resolveFonts, save, stringify, stringifySlide, verifyConfig };

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-Bas9O4Gd.mjs";
+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 { 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,3 @@
-import { i as parseTimeString, n as parseRangeString, r as parseTimesplits, t as parseAspectRatio } from "./utils-CmVawvVO.mjs";
+import { parseAspectRatio, parseRangeString, parseTimeString, parseTimesplits } from "./utils.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 };
+export { detectFeatures, extractImagesUsage, getDefaultConfig, parse, parseAspectRatio, parseRangeString, parseSlide, parseSync, parseTimeString, parseTimesplits, prettify, prettifySlide, resolveConfig, resolveFonts, stringify, stringifySlide, verifyConfig };

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-Bas9O4Gd.mjs";
+import { a as TimesplitOutput, i as TimesplitInput, n as parseRangeString, o as parseTimesplits, r as parseTimeString, t as parseAspectRatio } from "./utils-DpcPp-I0.mjs";
 export { TimesplitInput, TimesplitOutput, parseAspectRatio, parseRangeString, parseTimeString, parseTimesplits };

package/dist/utils.mjs

@@ -1,3 +1,144 @@
-import { i as parseTimeString, n as parseRangeString, r as parseTimesplits, t as parseAspectRatio } from "./utils-CmVawvVO.mjs";
-
-export { parseAspectRatio, parseRangeString, parseTimeString, parseTimesplits };
+import { isNumber, range, uniq } from "@antfu/utils";
+//#region src/timesplit/timestring.ts
+/**
+* Parse timestamp into seconds
+*
+* Accepts:
+* - 10:50.1
+* - 10s
+* - 5m
+* - 3min
+* - 3mins 5secs
+* - 10.5m3s
+* - +10s
+* - 1h10m30s
+* - 1h4s
+* - 1:1:1
+*/
+const RE_ALPHA = /[a-z]/i;
+function parseTimeString(timestamp) {
+	if (typeof timestamp === "number") return {
+		seconds: timestamp,
+		relative: false
+	};
+	const relative = timestamp.startsWith("+");
+	if (relative) timestamp = timestamp.slice(1);
+	let seconds = 0;
+	if (timestamp.includes(":")) {
+		const parts = timestamp.split(":").map(Number);
+		let h = 0;
+		let m = 0;
+		let s = 0;
+		if (parts.length === 3) {
+			h = parts[0];
+			m = parts[1];
+			s = parts[2];
+		} else if (parts.length === 2) {
+			m = parts[0];
+			s = parts[1];
+		} else if (parts.length === 1) s = parts[0];
+		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 {
+		const unitMap = {
+			s: 1,
+			sec: 1,
+			secs: 1,
+			m: 60,
+			min: 60,
+			mins: 60,
+			h: 3600,
+			hr: 3600,
+			hrs: 3600,
+			hour: 3600,
+			hours: 3600,
+			day: 86400,
+			days: 86400,
+			week: 604800,
+			weeks: 604800,
+			month: 2629746,
+			months: 2629746,
+			year: 31556952,
+			years: 31556952
+		};
+		const regex = /([\d.]+)([a-z]+)/gi;
+		const matches = timestamp.matchAll(regex);
+		if (matches) for (const match of matches) {
+			const value = Number(match[1]);
+			if (Number.isNaN(value)) throw new TypeError(`Invalid timestamp value: ${match[1]}`);
+			const unit = match[2].toLowerCase();
+			if (!(unit in unitMap)) throw new TypeError(`Invalid timestamp unit: ${unit}`);
+			seconds += value * unitMap[unit];
+		}
+		const remaining = timestamp.replace(regex, "").trim();
+		if (remaining) throw new TypeError(`Unknown timestamp remaining: ${remaining}`);
+	}
+	return {
+		seconds,
+		relative
+	};
+}
+//#endregion
+//#region src/timesplit/timesplit.ts
+function parseTimesplits(inputs) {
+	let ts = 0;
+	const outputs = [];
+	let current = {
+		timestampStart: ts,
+		timestampEnd: ts,
+		noStart: 0,
+		noEnd: 0,
+		title: "[start]"
+	};
+	outputs.push(current);
+	for (const input of inputs) {
+		const time = parseTimeString(input.timesplit);
+		const end = time.relative ? ts + time.seconds : time.seconds;
+		if (end < ts) throw new Error(`Timesplit end ${end} is before start ${ts}`);
+		current.timestampEnd = end;
+		current.noEnd = input.no;
+		if (input.title) current.title = input.title;
+		ts = end;
+		current = {
+			timestampStart: end,
+			timestampEnd: end,
+			noStart: input.no,
+			noEnd: input.no
+		};
+		outputs.push(current);
+	}
+	return outputs;
+}
+//#endregion
+//#region src/utils.ts
+const RE_ASPECT_RATIO_SEPARATOR = /[:/x|]/;
+/**
+* 1,3-5,8 => [1, 3, 4, 5, 8]
+*/
+function parseRangeString(total, rangeStr) {
+	if (!rangeStr || rangeStr === "all" || rangeStr === "*") return range(1, total + 1);
+	if (rangeStr === "none") return [];
+	const indexes = [];
+	for (const part of rangeStr.split(/[,;]/g)) if (!part.includes("-")) indexes.push(+part);
+	else {
+		const [start, end] = part.split("-", 2);
+		indexes.push(...range(+start, !end ? total + 1 : +end + 1));
+	}
+	return uniq(indexes).filter((i) => i <= total).sort((a, b) => a - b);
+}
+/**
+* Accepts `16/9` `1:1` `3x4`
+*/
+function parseAspectRatio(str) {
+	if (isNumber(str)) return str;
+	if (!Number.isNaN(+str)) return +str;
+	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}"`);
+	return w / h;
+}
+//#endregion
+export { parseAspectRatio, parseRangeString, parseTimeString, parseTimesplits };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slidev/parser",
-  "version": "52.15.2",
+  "version": "52.16.0",
   "description": "Markdown parser for Slidev",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -30,8 +30,11 @@
   },
   "dependencies": {
     "@antfu/utils": "^9.3.0",
-    "yaml": "^2.8.3",
-    "@slidev/types": "52.15.2"
+    "yaml": "^2.9.0",
+    "@slidev/types": "52.16.0"
+  },
+  "devDependencies": {
+    "tsdown-stale-guard": "^0.1.2"
   },
   "scripts": {
     "build": "tsdown",

package/dist/utils-CmVawvVO.mjs

@@ -1,148 +0,0 @@
-import { isNumber, range, uniq } from "@antfu/utils";
-
-//#region src/timesplit/timestring.ts
-/**
-* Parse timestamp into seconds
-*
-* Accepts:
-* - 10:50.1
-* - 10s
-* - 5m
-* - 3min
-* - 3mins 5secs
-* - 10.5m3s
-* - +10s
-* - 1h10m30s
-* - 1h4s
-* - 1:1:1
-*/
-const RE_ALPHA = /[a-z]/i;
-function parseTimeString(timestamp) {
-	if (typeof timestamp === "number") return {
-		seconds: timestamp,
-		relative: false
-	};
-	const relative = timestamp.startsWith("+");
-	if (relative) timestamp = timestamp.slice(1);
-	let seconds = 0;
-	if (timestamp.includes(":")) {
-		const parts = timestamp.split(":").map(Number);
-		let h = 0;
-		let m = 0;
-		let s = 0;
-		if (parts.length === 3) {
-			h = parts[0];
-			m = parts[1];
-			s = parts[2];
-		} else if (parts.length === 2) {
-			m = parts[0];
-			s = parts[1];
-		} else if (parts.length === 1) s = parts[0];
-		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 {
-		const unitMap = {
-			s: 1,
-			sec: 1,
-			secs: 1,
-			m: 60,
-			min: 60,
-			mins: 60,
-			h: 3600,
-			hr: 3600,
-			hrs: 3600,
-			hour: 3600,
-			hours: 3600,
-			day: 86400,
-			days: 86400,
-			week: 604800,
-			weeks: 604800,
-			month: 2629746,
-			months: 2629746,
-			year: 31556952,
-			years: 31556952
-		};
-		const regex = /([\d.]+)([a-z]+)/gi;
-		const matches = timestamp.matchAll(regex);
-		if (matches) for (const match of matches) {
-			const value = Number(match[1]);
-			if (Number.isNaN(value)) throw new TypeError(`Invalid timestamp value: ${match[1]}`);
-			const unit = match[2].toLowerCase();
-			if (!(unit in unitMap)) throw new TypeError(`Invalid timestamp unit: ${unit}`);
-			seconds += value * unitMap[unit];
-		}
-		const remaining = timestamp.replace(regex, "").trim();
-		if (remaining) throw new TypeError(`Unknown timestamp remaining: ${remaining}`);
-	}
-	return {
-		seconds,
-		relative
-	};
-}
-
-//#endregion
-//#region src/timesplit/timesplit.ts
-function parseTimesplits(inputs) {
-	let ts = 0;
-	const outputs = [];
-	let current = {
-		timestampStart: ts,
-		timestampEnd: ts,
-		noStart: 0,
-		noEnd: 0,
-		title: "[start]"
-	};
-	outputs.push(current);
-	for (const input of inputs) {
-		const time = parseTimeString(input.timesplit);
-		const end = time.relative ? ts + time.seconds : time.seconds;
-		if (end < ts) throw new Error(`Timesplit end ${end} is before start ${ts}`);
-		current.timestampEnd = end;
-		current.noEnd = input.no;
-		if (input.title) current.title = input.title;
-		ts = end;
-		current = {
-			timestampStart: end,
-			timestampEnd: end,
-			noStart: input.no,
-			noEnd: input.no
-		};
-		outputs.push(current);
-	}
-	return outputs;
-}
-
-//#endregion
-//#region src/utils.ts
-const RE_ASPECT_RATIO_SEPARATOR = /[:/x|]/;
-/**
-* 1,3-5,8 => [1, 3, 4, 5, 8]
-*/
-function parseRangeString(total, rangeStr) {
-	if (!rangeStr || rangeStr === "all" || rangeStr === "*") return range(1, total + 1);
-	if (rangeStr === "none") return [];
-	const indexes = [];
-	for (const part of rangeStr.split(/[,;]/g)) if (!part.includes("-")) indexes.push(+part);
-	else {
-		const [start, end] = part.split("-", 2);
-		indexes.push(...range(+start, !end ? total + 1 : +end + 1));
-	}
-	return uniq(indexes).filter((i) => i <= total).sort((a, b) => a - b);
-}
-/**
-* Accepts `16/9` `1:1` `3x4`
-*/
-function parseAspectRatio(str) {
-	if (isNumber(str)) return str;
-	if (!Number.isNaN(+str)) return +str;
-	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}"`);
-	return w / h;
-}
-
-//#endregion
-export { parseTimeString as i, parseRangeString as n, parseTimesplits as r, parseAspectRatio as t };