markmap-lib 0.17.3-beta.4 → 0.18.1-alpha.1

package/dist/browser/index.iife.js

@@ -14058,7 +14058,7 @@
     }
     function getCurrentHeading(level) {
       let heading2;
-      while ((heading2 = headingStack.at(-1)) && heading2.level >= level) {
+      while ((heading2 = headingStack[headingStack.length - 1]) && heading2.level >= level) {
         headingStack.pop();
       }
       return heading2 || rootNode;
@@ -14145,6 +14145,7 @@
       };
       if (htmlNode.data) {
         node.payload = {
+          tag: htmlNode.tag,
           ...htmlNode.data
         };
       }
@@ -25273,8 +25274,10 @@ ${end2.comment}` : end2.comment;
           ...context.parserOptions,
           ...(_a2 = frontmatter == null ? void 0 : frontmatter.markmap) == null ? void 0 : _a2.htmlParser
         };
-        context.content = content.slice(match.index + match[0].length);
-        context.contentLineOffset = content.slice(0, match.index).split("\n").length + 1;
+        context.frontmatterInfo = {
+          lines: content.slice(0, match.index).split("\n").length + 1,
+          offset: match.index + match[0].length
+        };
       });
       return {};
     }
@@ -25968,13 +25971,19 @@ ${end2.comment}` : end2.comment;
   const plugin = definePlugin({
     name,
     transform(transformHooks) {
+      let frontmatterLines = 0;
+      transformHooks.beforeParse.tap((_md, context) => {
+        var _a2;
+        frontmatterLines = ((_a2 = context.frontmatterInfo) == null ? void 0 : _a2.lines) || 0;
+      });
       transformHooks.parser.tap((md) => {
         md.renderer.renderAttrs = wrapFunction(
           md.renderer.renderAttrs,
           (renderAttrs, token) => {
             let attrs = renderAttrs(token);
             if (token.block && token.map) {
-              attrs += ` data-lines=${token.map.join(",")}`;
+              const lineRange = token.map.map((line) => line + frontmatterLines);
+              attrs += ` data-lines=${lineRange.join(",")}`;
             }
             return attrs;
           }
@@ -26029,16 +26038,24 @@ ${end2.comment}` : end2.comment;
       const context = {
         content,
         features: {},
-        contentLineOffset: 0,
         parserOptions: fallbackParserOptions
       };
       this.hooks.beforeParse.call(this.md, context);
-      const html2 = this.md.render(context.content, {});
+      let { content: rawContent } = context;
+      if (context.frontmatterInfo)
+        rawContent = rawContent.slice(context.frontmatterInfo.offset);
+      const html2 = this.md.render(rawContent, {});
       this.hooks.afterParse.call(this.md, context);
       const root2 = cleanNode(buildTree(html2, context.parserOptions));
       root2.content || (root2.content = `${((_a2 = context.frontmatter) == null ? void 0 : _a2.title) || ""}`);
       return { ...context, root: root2 };
     }
+    resolveJS(item) {
+      return patchJSItem(this.urlBuilder, item);
+    }
+    resolveCSS(item) {
+      return patchCSSItem(this.urlBuilder, item);
+    }
     /**
      * Get all assets from enabled plugins or filter them by plugin names as keys.
      */
@@ -26053,10 +26070,17 @@ ${end2.comment}` : end2.comment;
         }
       }
       return {
-        styles: styles2.map((item) => patchCSSItem(this.urlBuilder, item)),
-        scripts: scripts.map((item) => patchJSItem(this.urlBuilder, item))
+        styles: styles2.map((item) => this.resolveCSS(item)),
+        scripts: scripts.map((item) => this.resolveJS(item))
       };
     }
+    getPreloadScripts() {
+      const scripts = this.plugins.flatMap((plugin2) => {
+        var _a2;
+        return ((_a2 = plugin2.config) == null ? void 0 : _a2.preloadScripts) || [];
+      }).map((item) => this.resolveJS(item));
+      return { scripts };
+    }
     /**
      * Get used assets by features object returned by `transform`.
      */
@@ -26066,10 +26090,12 @@ ${end2.comment}` : end2.comment;
     }
   }
   const transformerVersions = {
-    "markmap-lib": "0.17.3-beta.4"
+    "markmap-lib": "0.18.1-alpha.1"
   };
   exports.Transformer = Transformer;
   exports.builtInPlugins = builtInPlugins;
+  exports.patchCSSItem = patchCSSItem;
+  exports.patchJSItem = patchJSItem;
   exports.transformerVersions = transformerVersions;
   Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 })(this.markmap = this.markmap || {}, window.katex);

package/dist/browser/index.mjs

@@ -85,8 +85,10 @@ const pluginFrontmatter = definePlugin({
         ...context.parserOptions,
         ...(_a = frontmatter == null ? void 0 : frontmatter.markmap) == null ? void 0 : _a.htmlParser
       };
-      context.content = content.slice(match.index + match[0].length);
-      context.contentLineOffset = content.slice(0, match.index).split("\n").length + 1;
+      context.frontmatterInfo = {
+        lines: content.slice(0, match.index).split("\n").length + 1,
+        offset: match.index + match[0].length
+      };
     });
     return {};
   }
@@ -358,13 +360,19 @@ const name = "sourceLines";
 const plugin = definePlugin({
   name,
   transform(transformHooks) {
+    let frontmatterLines = 0;
+    transformHooks.beforeParse.tap((_md, context) => {
+      var _a;
+      frontmatterLines = ((_a = context.frontmatterInfo) == null ? void 0 : _a.lines) || 0;
+    });
     transformHooks.parser.tap((md) => {
       md.renderer.renderAttrs = wrapFunction(
         md.renderer.renderAttrs,
         (renderAttrs, token) => {
           let attrs = renderAttrs(token);
           if (token.block && token.map) {
-            attrs += ` data-lines=${token.map.join(",")}`;
+            const lineRange = token.map.map((line) => line + frontmatterLines);
+            attrs += ` data-lines=${lineRange.join(",")}`;
           }
           return attrs;
         }
@@ -419,16 +427,24 @@ class Transformer {
     const context = {
       content,
       features: {},
-      contentLineOffset: 0,
       parserOptions: fallbackParserOptions
     };
     this.hooks.beforeParse.call(this.md, context);
-    const html = this.md.render(context.content, {});
+    let { content: rawContent } = context;
+    if (context.frontmatterInfo)
+      rawContent = rawContent.slice(context.frontmatterInfo.offset);
+    const html = this.md.render(rawContent, {});
     this.hooks.afterParse.call(this.md, context);
     const root = cleanNode(buildTree(html, context.parserOptions));
     root.content || (root.content = `${((_a = context.frontmatter) == null ? void 0 : _a.title) || ""}`);
     return { ...context, root };
   }
+  resolveJS(item) {
+    return patchJSItem(this.urlBuilder, item);
+  }
+  resolveCSS(item) {
+    return patchCSSItem(this.urlBuilder, item);
+  }
   /**
    * Get all assets from enabled plugins or filter them by plugin names as keys.
    */
@@ -443,10 +459,17 @@ class Transformer {
       }
     }
     return {
-      styles: styles2.map((item) => patchCSSItem(this.urlBuilder, item)),
-      scripts: scripts.map((item) => patchJSItem(this.urlBuilder, item))
+      styles: styles2.map((item) => this.resolveCSS(item)),
+      scripts: scripts.map((item) => this.resolveJS(item))
     };
   }
+  getPreloadScripts() {
+    const scripts = this.plugins.flatMap((plugin2) => {
+      var _a;
+      return ((_a = plugin2.config) == null ? void 0 : _a.preloadScripts) || [];
+    }).map((item) => this.resolveJS(item));
+    return { scripts };
+  }
   /**
    * Get used assets by features object returned by `transform`.
    */
@@ -456,10 +479,12 @@ class Transformer {
   }
 }
 const transformerVersions = {
-  "markmap-lib": "0.17.3-beta.4"
+  "markmap-lib": "0.18.1-alpha.1"
 };
 export {
   Transformer,
   builtInPlugins,
+  patchCSSItem,
+  patchJSItem,
   transformerVersions
 };

package/dist/index.d.ts

@@ -1,5 +1,6 @@
-export * from './types';
 export * from './transform';
+export * from './types';
+export * from './util';
 export declare const transformerVersions: {
     'markmap-lib': string | undefined;
 };

package/dist/index.js

@@ -78,16 +78,24 @@ class Transformer {
     const context = {
       content,
       features: {},
-      contentLineOffset: 0,
       parserOptions: fallbackParserOptions
     };
     this.hooks.beforeParse.call(this.md, context);
-    const html = this.md.render(context.content, {});
+    let { content: rawContent } = context;
+    if (context.frontmatterInfo)
+      rawContent = rawContent.slice(context.frontmatterInfo.offset);
+    const html = this.md.render(rawContent, {});
     this.hooks.afterParse.call(this.md, context);
     const root = cleanNode(markmapHtmlParser.buildTree(html, context.parserOptions));
     root.content || (root.content = `${((_a = context.frontmatter) == null ? void 0 : _a.title) || ""}`);
     return { ...context, root };
   }
+  resolveJS(item) {
+    return patchJSItem(this.urlBuilder, item);
+  }
+  resolveCSS(item) {
+    return patchCSSItem(this.urlBuilder, item);
+  }
   /**
    * Get all assets from enabled plugins or filter them by plugin names as keys.
    */
@@ -102,10 +110,17 @@ class Transformer {
       }
     }
     return {
-      styles: styles.map((item) => patchCSSItem(this.urlBuilder, item)),
-      scripts: scripts.map((item) => patchJSItem(this.urlBuilder, item))
+      styles: styles.map((item) => this.resolveCSS(item)),
+      scripts: scripts.map((item) => this.resolveJS(item))
     };
   }
+  getPreloadScripts() {
+    const scripts = this.plugins.flatMap((plugin) => {
+      var _a;
+      return ((_a = plugin.config) == null ? void 0 : _a.preloadScripts) || [];
+    }).map((item) => this.resolveJS(item));
+    return { scripts };
+  }
   /**
    * Get used assets by features object returned by `transform`.
    */
@@ -115,8 +130,10 @@ class Transformer {
   }
 }
 const transformerVersions = {
-  "markmap-lib": "0.17.3-beta.4"
+  "markmap-lib": "0.18.1-alpha.1"
 };
 exports.Transformer = Transformer;
 exports.builtInPlugins = builtInPlugins;
+exports.patchCSSItem = patchCSSItem;
+exports.patchJSItem = patchJSItem;
 exports.transformerVersions = transformerVersions;

package/dist/index.mjs

@@ -76,16 +76,24 @@ class Transformer {
     const context = {
       content,
       features: {},
-      contentLineOffset: 0,
       parserOptions: fallbackParserOptions
     };
     this.hooks.beforeParse.call(this.md, context);
-    const html = this.md.render(context.content, {});
+    let { content: rawContent } = context;
+    if (context.frontmatterInfo)
+      rawContent = rawContent.slice(context.frontmatterInfo.offset);
+    const html = this.md.render(rawContent, {});
     this.hooks.afterParse.call(this.md, context);
     const root = cleanNode(buildTree(html, context.parserOptions));
     root.content || (root.content = `${((_a = context.frontmatter) == null ? void 0 : _a.title) || ""}`);
     return { ...context, root };
   }
+  resolveJS(item) {
+    return patchJSItem(this.urlBuilder, item);
+  }
+  resolveCSS(item) {
+    return patchCSSItem(this.urlBuilder, item);
+  }
   /**
    * Get all assets from enabled plugins or filter them by plugin names as keys.
    */
@@ -100,10 +108,17 @@ class Transformer {
       }
     }
     return {
-      styles: styles.map((item) => patchCSSItem(this.urlBuilder, item)),
-      scripts: scripts.map((item) => patchJSItem(this.urlBuilder, item))
+      styles: styles.map((item) => this.resolveCSS(item)),
+      scripts: scripts.map((item) => this.resolveJS(item))
     };
   }
+  getPreloadScripts() {
+    const scripts = this.plugins.flatMap((plugin) => {
+      var _a;
+      return ((_a = plugin.config) == null ? void 0 : _a.preloadScripts) || [];
+    }).map((item) => this.resolveJS(item));
+    return { scripts };
+  }
   /**
    * Get used assets by features object returned by `transform`.
    */
@@ -113,10 +128,12 @@ class Transformer {
   }
 }
 const transformerVersions = {
-  "markmap-lib": "0.17.3-beta.4"
+  "markmap-lib": "0.18.1-alpha.1"
 };
 export {
   Transformer,
   builtInPlugins,
+  patchCSSItem,
+  patchJSItem,
   transformerVersions
 };

package/dist/index.no-plugins.js

@@ -86,16 +86,24 @@ class Transformer {
     const context = {
       content,
       features: {},
-      contentLineOffset: 0,
       parserOptions: fallbackParserOptions
     };
     this.hooks.beforeParse.call(this.md, context);
-    const html = this.md.render(context.content, {});
+    let { content: rawContent } = context;
+    if (context.frontmatterInfo)
+      rawContent = rawContent.slice(context.frontmatterInfo.offset);
+    const html = this.md.render(rawContent, {});
     this.hooks.afterParse.call(this.md, context);
     const root = cleanNode(markmapHtmlParser.buildTree(html, context.parserOptions));
     root.content || (root.content = `${((_a = context.frontmatter) == null ? void 0 : _a.title) || ""}`);
     return { ...context, root };
   }
+  resolveJS(item) {
+    return patchJSItem(this.urlBuilder, item);
+  }
+  resolveCSS(item) {
+    return patchCSSItem(this.urlBuilder, item);
+  }
   /**
    * Get all assets from enabled plugins or filter them by plugin names as keys.
    */
@@ -110,10 +118,17 @@ class Transformer {
       }
     }
     return {
-      styles: styles.map((item) => patchCSSItem(this.urlBuilder, item)),
-      scripts: scripts.map((item) => patchJSItem(this.urlBuilder, item))
+      styles: styles.map((item) => this.resolveCSS(item)),
+      scripts: scripts.map((item) => this.resolveJS(item))
     };
   }
+  getPreloadScripts() {
+    const scripts = this.plugins.flatMap((plugin) => {
+      var _a;
+      return ((_a = plugin.config) == null ? void 0 : _a.preloadScripts) || [];
+    }).map((item) => this.resolveJS(item));
+    return { scripts };
+  }
   /**
    * Get used assets by features object returned by `transform`.
    */
@@ -123,8 +138,10 @@ class Transformer {
   }
 }
 const transformerVersions = {
-  "markmap-lib": "0.17.3-beta.4"
+  "markmap-lib": "0.18.1-alpha.1"
 };
 exports.Transformer = Transformer;
 exports.builtInPlugins = builtInPlugins;
+exports.patchCSSItem = patchCSSItem;
+exports.patchJSItem = patchJSItem;
 exports.transformerVersions = transformerVersions;

package/dist/index.no-plugins.mjs

@@ -84,16 +84,24 @@ class Transformer {
     const context = {
       content,
       features: {},
-      contentLineOffset: 0,
       parserOptions: fallbackParserOptions
     };
     this.hooks.beforeParse.call(this.md, context);
-    const html = this.md.render(context.content, {});
+    let { content: rawContent } = context;
+    if (context.frontmatterInfo)
+      rawContent = rawContent.slice(context.frontmatterInfo.offset);
+    const html = this.md.render(rawContent, {});
     this.hooks.afterParse.call(this.md, context);
     const root = cleanNode(buildTree(html, context.parserOptions));
     root.content || (root.content = `${((_a = context.frontmatter) == null ? void 0 : _a.title) || ""}`);
     return { ...context, root };
   }
+  resolveJS(item) {
+    return patchJSItem(this.urlBuilder, item);
+  }
+  resolveCSS(item) {
+    return patchCSSItem(this.urlBuilder, item);
+  }
   /**
    * Get all assets from enabled plugins or filter them by plugin names as keys.
    */
@@ -108,10 +116,17 @@ class Transformer {
       }
     }
     return {
-      styles: styles.map((item) => patchCSSItem(this.urlBuilder, item)),
-      scripts: scripts.map((item) => patchJSItem(this.urlBuilder, item))
+      styles: styles.map((item) => this.resolveCSS(item)),
+      scripts: scripts.map((item) => this.resolveJS(item))
     };
   }
+  getPreloadScripts() {
+    const scripts = this.plugins.flatMap((plugin) => {
+      var _a;
+      return ((_a = plugin.config) == null ? void 0 : _a.preloadScripts) || [];
+    }).map((item) => this.resolveJS(item));
+    return { scripts };
+  }
   /**
    * Get used assets by features object returned by `transform`.
    */
@@ -121,10 +136,12 @@ class Transformer {
   }
 }
 const transformerVersions = {
-  "markmap-lib": "0.17.3-beta.4"
+  "markmap-lib": "0.18.1-alpha.1"
 };
 export {
   Transformer,
   builtInPlugins,
+  patchCSSItem,
+  patchJSItem,
   transformerVersions
 };

package/dist/plugins.js

@@ -74,8 +74,10 @@ const pluginFrontmatter = definePlugin({
         ...context.parserOptions,
         ...(_a = frontmatter == null ? void 0 : frontmatter.markmap) == null ? void 0 : _a.htmlParser
       };
-      context.content = content.slice(match.index + match[0].length);
-      context.contentLineOffset = content.slice(0, match.index).split("\n").length + 1;
+      context.frontmatterInfo = {
+        lines: content.slice(0, match.index).split("\n").length + 1,
+        offset: match.index + match[0].length
+      };
     });
     return {};
   }
@@ -255,13 +257,19 @@ const name = "sourceLines";
 const plugin = definePlugin({
   name,
   transform(transformHooks) {
+    let frontmatterLines = 0;
+    transformHooks.beforeParse.tap((_md, context) => {
+      var _a;
+      frontmatterLines = ((_a = context.frontmatterInfo) == null ? void 0 : _a.lines) || 0;
+    });
     transformHooks.parser.tap((md) => {
       md.renderer.renderAttrs = markmapCommon.wrapFunction(
         md.renderer.renderAttrs,
         (renderAttrs, token) => {
           let attrs = renderAttrs(token);
           if (token.block && token.map) {
-            attrs += ` data-lines=${token.map.join(",")}`;
+            const lineRange = token.map.map((line) => line + frontmatterLines);
+            attrs += ` data-lines=${lineRange.join(",")}`;
           }
           return attrs;
         }

package/dist/plugins.mjs

@@ -72,8 +72,10 @@ const pluginFrontmatter = definePlugin({
         ...context.parserOptions,
         ...(_a = frontmatter == null ? void 0 : frontmatter.markmap) == null ? void 0 : _a.htmlParser
       };
-      context.content = content.slice(match.index + match[0].length);
-      context.contentLineOffset = content.slice(0, match.index).split("\n").length + 1;
+      context.frontmatterInfo = {
+        lines: content.slice(0, match.index).split("\n").length + 1,
+        offset: match.index + match[0].length
+      };
     });
     return {};
   }
@@ -253,13 +255,19 @@ const name = "sourceLines";
 const plugin = definePlugin({
   name,
   transform(transformHooks) {
+    let frontmatterLines = 0;
+    transformHooks.beforeParse.tap((_md, context) => {
+      var _a;
+      frontmatterLines = ((_a = context.frontmatterInfo) == null ? void 0 : _a.lines) || 0;
+    });
     transformHooks.parser.tap((md) => {
       md.renderer.renderAttrs = wrapFunction(
         md.renderer.renderAttrs,
         (renderAttrs, token) => {
           let attrs = renderAttrs(token);
           if (token.block && token.map) {
-            attrs += ` data-lines=${token.map.join(",")}`;
+            const lineRange = token.map.map((line) => line + frontmatterLines);
+            attrs += ` data-lines=${lineRange.join(",")}`;
           }
           return attrs;
         }

package/dist/transform.d.ts

@@ -1,5 +1,5 @@
 import type MarkdownIt from 'markdown-it';
-import { UrlBuilder } from 'markmap-common';
+import { CSSItem, JSItem, UrlBuilder } from 'markmap-common';
 import { IHtmlParserOptions } from 'markmap-html-parser';
 import { IAssets, IFeatures, ITransformHooks, ITransformPlugin, ITransformResult, ITransformer } from './types';
 export declare const builtInPlugins: ITransformPlugin[];
@@ -11,10 +11,13 @@ export declare class Transformer implements ITransformer {
     plugins: ITransformPlugin[];
     constructor(plugins?: Array<ITransformPlugin | (() => ITransformPlugin)>);
     transform(content: string, fallbackParserOptions?: Partial<IHtmlParserOptions>): ITransformResult;
+    resolveJS(item: JSItem): JSItem;
+    resolveCSS(item: CSSItem): CSSItem;
     /**
      * Get all assets from enabled plugins or filter them by plugin names as keys.
      */
     getAssets(keys?: string[]): IAssets;
+    getPreloadScripts(): IAssets;
     /**
      * Get used assets by features object returned by `transform`.
      */

package/dist/types.d.ts

@@ -52,8 +52,10 @@ export interface ITransformContext {
         title?: string;
         markmap?: IMarkmapJSONOptions;
     };
-    /** The index of line where content without frontmatter starts */
-    contentLineOffset: number;
+    frontmatterInfo?: {
+        lines: number;
+        offset: number;
+    };
     parserOptions?: Partial<IHtmlParserOptions>;
 }
 export interface ITransformResult extends ITransformContext {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markmap-lib",
-  "version": "0.17.3-beta.4+120a195",
+  "version": "0.18.1-alpha.1+f00ade4",
   "description": "Visualize your Markdown as mindmaps with Markmap",
   "author": "Gerald <gera2ld@live.com>",
   "license": "MIT",
@@ -61,7 +61,7 @@
     "@highlightjs/cdn-assets": "^11.8.0",
     "@types/katex": "^0.16.7",
     "@types/markdown-it": "^14.0.0",
-    "markmap-common": "0.17.3-beta.4+120a195",
+    "markmap-common": "0.18.0",
     "webfontloader": "^1.6.28"
   },
   "dependencies": {
@@ -74,8 +74,8 @@
     "markdown-it-mark": "^4.0.0",
     "markdown-it-sub": "^2.0.0",
     "markdown-it-sup": "^2.0.0",
-    "markmap-html-parser": "0.17.3-beta.4+120a195",
-    "markmap-view": "0.17.3-beta.4+120a195",
+    "markmap-html-parser": "0.18.0",
+    "markmap-view": "0.18.0",
     "prismjs": "^1.29.0",
     "yaml": "^2.5.1"
   },
@@ -96,5 +96,5 @@
       "^(.*\\.svg)\\?raw$": "$1"
     }
   },
-  "gitHead": "120a1954940590e194130156a4c5fb60d82c0b3d"
+  "gitHead": "f00ade49c4b34f9c34579e67cd185ad29afd6950"
 }