@slidev/parser 0.49.0-beta.6 → 0.49.0

package/dist/{chunk-G3BCFBME.mjs → chunk-N73CSDH6.mjs}

@@ -313,6 +313,7 @@ async function parse(markdown, filepath, extensions) {
   const lines = markdown.split(/\r?\n/g);
   const slides = [];
   let start = 0;
+  let contentStart = 0;
   async function slice(end) {
     if (start === end)
       return;
@@ -322,6 +323,7 @@ async function parse(markdown, filepath, extensions) {
       filepath,
       index: slides.length,
       start,
+      contentStart,
       end
     };
     if (extensions) {
@@ -335,6 +337,7 @@ async function parse(markdown, filepath, extensions) {
     }
     slides.push(slide);
     start = end + 1;
+    contentStart = end + 1;
   }
   if (extensions) {
     for (const e of extensions) {
@@ -344,21 +347,26 @@ async function parse(markdown, filepath, extensions) {
   }
   for (let i = 0; i < lines.length; i++) {
     const line = lines[i].trimEnd();
-    if (line.match(/^---+/)) {
+    if (line.startsWith("---")) {
       await slice(i);
       const next = lines[i + 1];
-      if (line.match(/^---([^-].*)?$/) && !next?.match(/^\s*$/)) {
+      if (line[3] !== "-" && next?.trim()) {
         start = i;
         for (i += 1; i < lines.length; i++) {
-          if (lines[i].trimEnd().match(/^---$/))
+          if (lines[i].trimEnd() === "---")
             break;
         }
+        contentStart = i + 1;
       }
-    } else if (line.startsWith("```")) {
-      for (i += 1; i < lines.length; i++) {
-        if (lines[i].startsWith("```"))
+    } else if (line.trimStart().startsWith("```")) {
+      const codeBlockLevel = line.match(/^\s*`+/)[0];
+      let j = i + 1;
+      for (; j < lines.length; j++) {
+        if (lines[j].startsWith(codeBlockLevel))
           break;
       }
+      if (j !== lines.length)
+        i = j;
     }
   }
   if (start <= lines.length - 1)

package/dist/core.d.mts

@@ -19,7 +19,7 @@ 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): SlidevDetectedFeatures;
-declare function parseSlide(raw: string): Omit<SourceSlideInfo, 'filepath' | 'index' | 'start' | 'end'>;
+declare function parseSlide(raw: string): Omit<SourceSlideInfo, 'filepath' | 'index' | 'start' | 'contentStart' | 'end'>;
 declare function parse(markdown: string, filepath: string, extensions?: SlidevPreparserExtension[]): Promise<SlidevMarkdown>;
 
 export { detectFeatures, getDefaultConfig, parse, parseAspectRatio, parseRangeString, parseSlide, prettify, prettifySlide, resolveConfig, resolveFonts, stringify, stringifySlide, verifyConfig };

package/dist/core.mjs

@@ -12,7 +12,7 @@ import {
   stringify,
   stringifySlide,
   verifyConfig
-} from "./chunk-G3BCFBME.mjs";
+} from "./chunk-N73CSDH6.mjs";
 export {
   detectFeatures,
   getDefaultConfig,

package/dist/fs.mjs

@@ -12,7 +12,7 @@ import {
   stringify,
   stringifySlide,
   verifyConfig
-} from "./chunk-G3BCFBME.mjs";
+} from "./chunk-N73CSDH6.mjs";
 
 // src/fs.ts
 import { promises as fs } from "node:fs";
@@ -40,32 +40,40 @@ async function load(userRoot, filepath, content, mode) {
   }
   const markdownFiles = {};
   const slides = [];
-  async function loadMarkdown(path, range, frontmatterOverride) {
+  async function loadMarkdown(path, range, frontmatterOverride, importers) {
     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);
+    const directImporter = importers?.at(-1);
+    for (const index of parseRangeString(md.slides.length, range)) {
+      const subSlide = md.slides[index - 1];
+      await loadSlide(subSlide, frontmatterOverride, importers);
+      if (directImporter)
+        (directImporter.imports ??= []).push(subSlide);
+    }
     return md;
   }
-  async function loadSlide(slide, frontmatterOverride) {
+  async function loadSlide(slide, frontmatterOverride, importChain) {
     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);
+      const path = slash(
+        rawPath.startsWith("/") ? resolve(userRoot, rawPath.substring(1)) : resolve(dirname(slide.filepath), rawPath)
+      );
       frontmatterOverride = {
         ...slide.frontmatter,
         ...frontmatterOverride
       };
       delete frontmatterOverride.src;
-      await loadMarkdown(path, rangeRaw, frontmatterOverride);
+      await loadMarkdown(path, rangeRaw, frontmatterOverride, importChain ? [...importChain, slide] : [slide]);
     } else {
       slides.push({
         index: slides.length,
+        importChain,
         source: slide,
         frontmatter: { ...slide.frontmatter, ...frontmatterOverride },
         content: slide.content,
@@ -75,7 +83,7 @@ async function load(userRoot, filepath, content, mode) {
       });
     }
   }
-  const entry = await loadMarkdown(filepath);
+  const entry = await loadMarkdown(slash(filepath));
   const headmatter = {
     title: slides[0]?.title,
     ...entry.slides[0]?.frontmatter

package/dist/index.mjs

@@ -12,7 +12,7 @@ import {
   stringify,
   stringifySlide,
   verifyConfig
-} from "./chunk-G3BCFBME.mjs";
+} from "./chunk-N73CSDH6.mjs";
 export {
   detectFeatures,
   getDefaultConfig,

package/fs.d.ts

@@ -1 +1 @@
-export * from './dist/fs'
+export * from './dist/fs.mjs'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slidev/parser",
-  "version": "0.49.0-beta.6",
+  "version": "0.49.0",
   "description": "Markdown parser for Slidev",
   "author": "antfu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -39,9 +39,9 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@antfu/utils": "^0.7.7",
+    "@antfu/utils": "^0.7.8",
     "yaml": "^2.4.2",
-    "@slidev/types": "0.49.0-beta.6"
+    "@slidev/types": "0.49.0"
   },
   "scripts": {
     "build": "rimraf dist && tsup src/index.ts src/core.ts src/fs.ts",