@slidev/parser 0.48.0-beta.0 → 0.48.0-beta.10

package/dist/{chunk-VLX5KDW3.mjs → chunk-TPG7RJUH.mjs}

@@ -35,6 +35,9 @@ function isTruthy(v) {
 }
 var isNumber = (val) => typeof val === "number";
 var isObject = (val) => toString(val) === "[object Object]";
+function slash(str) {
+  return str.replace(/\\/g, "/");
+}
 function objectMap(obj, fn) {
   return Object.fromEntries(
     Object.entries(obj).map(([k, v]) => fn(k, v)).filter(notNullish)
@@ -243,16 +246,10 @@ function resolveDrawings(options = {}, filepath) {
 
 // src/core.ts
 function stringify(data) {
-  return `${data.slides.filter((slide) => slide.source === void 0 || slide.inline !== void 0).map((slide, idx) => stringifySlide(slide.inline || slide, idx)).join("\n").trim()}
+  return `${data.slides.map(stringifySlide).join("\n").trim()}
 `;
 }
-function filterDisabled(data) {
-  data.slides = data.slides.filter((i) => !i.frontmatter?.disabled);
-  return data;
-}
 function stringifySlide(data, idx = 0) {
-  if (data.raw == null)
-    prettifySlide(data);
   return data.raw.startsWith("---") || idx === 0 ? data.raw : `---
 ${data.raw.startsWith("\n") ? data.raw : `
 ${data.raw}`}`;
@@ -354,7 +351,7 @@ function parseSlide(raw) {
     note
   };
 }
-async function parse(markdown, filepath, themeMeta, extensions, onHeadmatter) {
+async function parse(markdown, filepath, extensions) {
   const lines = markdown.split(/\r?\n/g);
   const slides = [];
   let start = 0;
@@ -364,6 +361,7 @@ async function parse(markdown, filepath, themeMeta, extensions, onHeadmatter) {
     const raw = lines.slice(start, end).join("\n");
     const slide = {
       ...parseSlide(raw),
+      filepath,
       index: slides.length,
       start,
       end
@@ -380,19 +378,6 @@ async function parse(markdown, filepath, themeMeta, extensions, onHeadmatter) {
     slides.push(slide);
     start = end + 1;
   }
-  {
-    let hm = "";
-    if (lines[0].match(/^---([^-].*)?$/) && !lines[1]?.match(/^\s*$/)) {
-      let hEnd = 1;
-      while (hEnd < lines.length && !lines[hEnd].trimEnd().match(/^---$/))
-        hEnd++;
-      hm = lines.slice(1, hEnd).join("\n");
-    }
-    if (onHeadmatter) {
-      const o = YAML.load(hm) ?? {};
-      extensions = await onHeadmatter(o, extensions ?? [], filepath);
-    }
-  }
   if (extensions) {
     for (const e of extensions) {
       if (e.transformRawLines)
@@ -420,18 +405,10 @@ async function parse(markdown, filepath, themeMeta, extensions, onHeadmatter) {
   }
   if (start <= lines.length - 1)
     await slice(lines.length);
-  const headmatter = slides[0]?.frontmatter || {};
-  headmatter.title = headmatter.title || slides[0]?.title;
-  const config = resolveConfig(headmatter, themeMeta, filepath);
-  const features = detectFeatures(markdown);
   return {
-    raw: markdown,
     filepath,
-    slides,
-    config,
-    features,
-    headmatter,
-    themeMeta
+    raw: markdown,
+    slides
   };
 }
 function mergeFeatureFlags(a, b) {
@@ -451,6 +428,7 @@ function scanMonacoModules(md) {
 }
 
 export {
+  slash,
   parseRangeString,
   parseAspectRatio,
   getDefaultConfig,
@@ -458,7 +436,6 @@ export {
   verifyConfig,
   resolveFonts,
   stringify,
-  filterDisabled,
   stringifySlide,
   prettifySlide,
   prettify,

package/dist/core.d.mts

@@ -1,4 +1,4 @@
-import { SlidevConfig, SlidevThemeMeta, FontOptions, ResolvedFontOptions, SlidevMarkdown, SlideInfoBase, SlidevFeatureFlags, SlidevPreparserExtension, PreparserExtensionFromHeadmatter } from '@slidev/types';
+import { SlidevConfig, SlidevThemeMeta, FontOptions, ResolvedFontOptions, SlidevMarkdown, SourceSlideInfo, SlidevFeatureFlags, SlidevPreparserExtension } from '@slidev/types';
 
 /**
  * 1,3-5,8 => [1, 3, 4, 5, 8]
@@ -15,14 +15,13 @@ declare function verifyConfig(config: SlidevConfig, themeMeta?: SlidevThemeMeta,
 declare function resolveFonts(fonts?: FontOptions): ResolvedFontOptions;
 
 declare function stringify(data: SlidevMarkdown): string;
-declare function filterDisabled(data: SlidevMarkdown): SlidevMarkdown;
-declare function stringifySlide(data: SlideInfoBase, idx?: number): string;
-declare function prettifySlide(data: SlideInfoBase): SlideInfoBase;
+declare function stringifySlide(data: SourceSlideInfo, idx?: number): string;
+declare function prettifySlide(data: SourceSlideInfo): SourceSlideInfo;
 declare function prettify(data: SlidevMarkdown): SlidevMarkdown;
 declare function detectFeatures(code: string): SlidevFeatureFlags;
-declare function parseSlide(raw: string): SlideInfoBase;
-declare function parse(markdown: string, filepath?: string, themeMeta?: SlidevThemeMeta, extensions?: SlidevPreparserExtension[], onHeadmatter?: PreparserExtensionFromHeadmatter): Promise<SlidevMarkdown>;
+declare function parseSlide(raw: string): Omit<SourceSlideInfo, 'filepath' | 'index' | 'start' | 'end'>;
+declare function parse(markdown: string, filepath: string, extensions?: SlidevPreparserExtension[]): Promise<SlidevMarkdown>;
 declare function mergeFeatureFlags(a: SlidevFeatureFlags, b: SlidevFeatureFlags): SlidevFeatureFlags;
 declare function scanMonacoModules(md: string): string[];
 
-export { detectFeatures, filterDisabled, getDefaultConfig, mergeFeatureFlags, parse, parseAspectRatio, parseRangeString, parseSlide, prettify, prettifySlide, resolveConfig, resolveFonts, scanMonacoModules, stringify, stringifySlide, verifyConfig };
+export { detectFeatures, getDefaultConfig, mergeFeatureFlags, parse, parseAspectRatio, parseRangeString, parseSlide, prettify, prettifySlide, resolveConfig, resolveFonts, scanMonacoModules, stringify, stringifySlide, verifyConfig };

package/dist/core.mjs

@@ -1,6 +1,5 @@
 import {
   detectFeatures,
-  filterDisabled,
   getDefaultConfig,
   mergeFeatureFlags,
   parse,
@@ -15,10 +14,9 @@ import {
   stringify,
   stringifySlide,
   verifyConfig
-} from "./chunk-VLX5KDW3.mjs";
+} from "./chunk-TPG7RJUH.mjs";
 export {
   detectFeatures,
-  filterDisabled,
   getDefaultConfig,
   mergeFeatureFlags,
   parse,

package/dist/fs.d.mts

@@ -1,9 +1,13 @@
-import { PreparserExtensionLoader, SlidevThemeMeta, SlidevMarkdown, SlideInfoWithPath } from '@slidev/types';
-export { detectFeatures, filterDisabled, getDefaultConfig, mergeFeatureFlags, parse, parseAspectRatio, parseRangeString, parseSlide, prettify, prettifySlide, resolveConfig, resolveFonts, scanMonacoModules, stringify, stringifySlide, verifyConfig } from './core.mjs';
+import { PreparserExtensionLoader, SlidevData, SlidevMarkdown } from '@slidev/types';
+export { detectFeatures, getDefaultConfig, mergeFeatureFlags, parse, parseAspectRatio, parseRangeString, parseSlide, prettify, prettifySlide, resolveConfig, resolveFonts, scanMonacoModules, stringify, stringifySlide, verifyConfig } from './core.mjs';
 
 declare function injectPreparserExtensionLoader(fn: PreparserExtensionLoader): void;
-declare function load(filepath: string, themeMeta?: SlidevThemeMeta, content?: string): Promise<SlidevMarkdown>;
-declare function save(data: SlidevMarkdown, filepath?: string): Promise<void>;
-declare function saveExternalSlide(slide: SlideInfoWithPath): Promise<void>;
+/**
+ * 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, content?: string): Promise<LoadedSlidevData>;
+declare function save(markdown: SlidevMarkdown): Promise<void>;
 
-export { injectPreparserExtensionLoader, load, save, saveExternalSlide };
+export { type LoadedSlidevData, injectPreparserExtensionLoader, load, save };

package/dist/fs.mjs

@@ -1,6 +1,5 @@
 import {
   detectFeatures,
-  filterDisabled,
   getDefaultConfig,
   mergeFeatureFlags,
   parse,
@@ -12,93 +11,91 @@ import {
   resolveConfig,
   resolveFonts,
   scanMonacoModules,
+  slash,
   stringify,
   stringifySlide,
   verifyConfig
-} from "./chunk-VLX5KDW3.mjs";
+} from "./chunk-TPG7RJUH.mjs";
 
 // src/fs.ts
 import { promises as fs } from "node:fs";
 import { dirname, resolve } from "node:path";
+import YAML from "js-yaml";
 var preparserExtensionLoader = null;
 function injectPreparserExtensionLoader(fn) {
   preparserExtensionLoader = fn;
 }
-async function load(filepath, themeMeta, content) {
-  const dir = dirname(filepath);
+async function load(userRoot, filepath, content) {
   const markdown = content ?? await fs.readFile(filepath, "utf-8");
-  const preparserExtensions = [];
-  const data = await parse(markdown, filepath, themeMeta, [], async (headmatter, exts, filepath2) => {
-    preparserExtensions.splice(
-      0,
-      preparserExtensions.length,
-      ...exts,
-      ...preparserExtensionLoader ? await preparserExtensionLoader(headmatter, filepath2) : []
-    );
-    return preparserExtensions;
-  });
-  const entries = /* @__PURE__ */ new Set([
-    filepath
-  ]);
-  for (let iSlide = 0; iSlide < data.slides.length; ) {
-    const baseSlide = data.slides[iSlide];
-    if (!baseSlide.frontmatter.src) {
-      iSlide++;
-      continue;
+  let extensions;
+  if (preparserExtensionLoader) {
+    const lines = markdown.split(/\r?\n/g);
+    let hm = "";
+    if (lines[0].match(/^---([^-].*)?$/) && !lines[1]?.match(/^\s*$/)) {
+      let hEnd = 1;
+      while (hEnd < lines.length && !lines[hEnd].trimEnd().match(/^---$/))
+        hEnd++;
+      hm = lines.slice(1, hEnd).join("\n");
     }
-    data.slides.splice(iSlide, 1);
-    if (baseSlide.frontmatter.hide)
-      continue;
-    const srcExpression = baseSlide.frontmatter.src;
-    let path;
-    if (srcExpression.startsWith("/"))
-      path = resolve(dir, srcExpression.substring(1));
-    else if (baseSlide.source?.filepath)
-      path = resolve(dirname(baseSlide.source.filepath), srcExpression);
-    else
-      path = resolve(dir, srcExpression);
-    const raw = await fs.readFile(path, "utf-8");
-    const subSlides = await parse(raw, path, themeMeta, preparserExtensions);
-    for (const [offset, subSlide] of subSlides.slides.entries()) {
-      const slide = { ...baseSlide };
-      slide.source = {
-        filepath: path,
-        ...subSlide
-      };
-      if (offset === 0 && !baseSlide.frontmatter.srcSequence) {
-        slide.inline = { ...baseSlide };
-        delete slide.inline.frontmatter.src;
-        Object.assign(slide, slide.source, { raw: null });
-      } else {
-        Object.assign(slide, slide.source);
-      }
-      const baseSlideFrontMatterWithoutSrc = { ...baseSlide.frontmatter };
-      delete baseSlideFrontMatterWithoutSrc.src;
-      slide.frontmatter = {
-        ...subSlide.frontmatter,
-        ...baseSlideFrontMatterWithoutSrc,
-        srcSequence: `${baseSlide.frontmatter.srcSequence ? `${baseSlide.frontmatter.srcSequence},` : ""}${srcExpression}`
+    const o = YAML.load(hm) ?? {};
+    extensions = await preparserExtensionLoader(o, filepath);
+  }
+  const markdownFiles = {};
+  const slides = [];
+  async function loadMarkdown(path, range, frontmatterOverride) {
+    let md = markdownFiles[path];
+    if (!md) {
+      const raw = await fs.readFile(path, "utf-8");
+      md = await parse(raw, path, extensions);
+      markdownFiles[path] = md;
+    }
+    for (const index of parseRangeString(md.slides.length, range))
+      await loadSlide(md.slides[index - 1], frontmatterOverride);
+    return md;
+  }
+  async function loadSlide(slide, frontmatterOverride) {
+    if (slide.frontmatter.disabled || slide.frontmatter.hide)
+      return;
+    if (slide.frontmatter.src) {
+      const [rawPath, rangeRaw] = slide.frontmatter.src.split("#");
+      const path = rawPath.startsWith("/") ? resolve(userRoot, rawPath.substring(1)) : resolve(dirname(slide.filepath), rawPath);
+      frontmatterOverride = {
+        ...slide.frontmatter,
+        ...frontmatterOverride
       };
-      data.features = mergeFeatureFlags(data.features, detectFeatures(raw));
-      entries.add(path);
-      data.slides.splice(iSlide + offset, 0, slide);
+      delete frontmatterOverride.src;
+      await loadMarkdown(path, rangeRaw, frontmatterOverride);
+    } else {
+      slides.push({
+        index: slides.length,
+        source: slide,
+        frontmatter: { ...slide.frontmatter, ...frontmatterOverride },
+        content: slide.content,
+        note: slide.note,
+        title: slide.title,
+        level: slide.level
+      });
     }
   }
-  for (let iSlide = 0; iSlide < data.slides.length; iSlide++)
-    data.slides[iSlide].index = iSlide === 0 ? 0 : 1 + data.slides[iSlide - 1].index;
-  data.entries = Array.from(entries);
-  return data;
-}
-async function save(data, filepath) {
-  filepath = filepath || data.filepath;
-  await fs.writeFile(filepath, stringify(data), "utf-8");
+  const entry = await loadMarkdown(filepath);
+  const headmatter = {
+    title: slides[0]?.title,
+    ...entry.slides[0]?.frontmatter
+  };
+  return {
+    slides,
+    entry,
+    headmatter,
+    features: detectFeatures(slides.map((s) => s.source.raw).join("")),
+    markdownFiles,
+    watchFiles: Object.keys(markdownFiles).map(slash)
+  };
 }
-async function saveExternalSlide(slide) {
-  await fs.writeFile(slide.filepath, stringifySlide(slide), "utf-8");
+async function save(markdown) {
+  await fs.writeFile(markdown.filepath, stringify(markdown), "utf-8");
 }
 export {
   detectFeatures,
-  filterDisabled,
   getDefaultConfig,
   injectPreparserExtensionLoader,
   load,
@@ -112,7 +109,6 @@ export {
   resolveConfig,
   resolveFonts,
   save,
-  saveExternalSlide,
   scanMonacoModules,
   stringify,
   stringifySlide,

package/dist/index.d.mts

@@ -1,2 +1,2 @@
-export { detectFeatures, filterDisabled, getDefaultConfig, mergeFeatureFlags, parse, parseAspectRatio, parseRangeString, parseSlide, prettify, prettifySlide, resolveConfig, resolveFonts, scanMonacoModules, stringify, stringifySlide, verifyConfig } from './core.mjs';
+export { detectFeatures, getDefaultConfig, mergeFeatureFlags, parse, parseAspectRatio, parseRangeString, parseSlide, prettify, prettifySlide, resolveConfig, resolveFonts, scanMonacoModules, stringify, stringifySlide, verifyConfig } from './core.mjs';
 import '@slidev/types';

package/dist/index.mjs

@@ -1,6 +1,5 @@
 import {
   detectFeatures,
-  filterDisabled,
   getDefaultConfig,
   mergeFeatureFlags,
   parse,
@@ -15,10 +14,9 @@ import {
   stringify,
   stringifySlide,
   verifyConfig
-} from "./chunk-VLX5KDW3.mjs";
+} from "./chunk-TPG7RJUH.mjs";
 export {
   detectFeatures,
-  filterDisabled,
   getDefaultConfig,
   mergeFeatureFlags,
   parse,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slidev/parser",
-  "version": "0.48.0-beta.0",
+  "version": "0.48.0-beta.10",
   "description": "Markdown parser for Slidev",
   "author": "antfu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "js-yaml": "^4.1.0",
-    "@slidev/types": "0.48.0-beta.0"
+    "@slidev/types": "0.48.0-beta.10"
   },
   "scripts": {
     "build": "rimraf dist && tsup src/index.ts src/core.ts src/fs.ts",