markmap-lib 0.15.0-alpha.0 → 0.15.1

package/dist/index.js

@@ -1,89 +1,53 @@
-/*! markmap-lib v0.15.0-alpha.0 | MIT License */
+/*! markmap-lib v0.15.1 | MIT License */
 'use strict';
 
 var _extends = require('@babel/runtime/helpers/extends');
-var markmapCommon = require('markmap-common');
 var remarkable = require('remarkable');
+var markmapCommon = require('markmap-common');
 var remarkableKatex = require('remarkable-katex');
-var Prism = require('prismjs');
-var loadLanguages = require('prismjs/components/');
 var yaml = require('js-yaml');
+var hljs = require('highlight.js');
 
-const template = "<!DOCTYPE html>\n<html>\n<head>\n<meta charset=\"UTF-8\">\n<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">\n<meta http-equiv=\"X-UA-Compatible\" content=\"ie=edge\">\n<title>Markmap</title>\n<style>\n* {\n  margin: 0;\n  padding: 0;\n}\n#mindmap {\n  display: block;\n  width: 100vw;\n  height: 100vh;\n}\n</style>\n<!--CSS-->\n</head>\n<body>\n<svg id=\"mindmap\"></svg>\n<!--JS-->\n</body>\n</html>\n";
-const baseJsPaths = [`d3@${"6.2.0"}`, `markmap-view@${"0.15.0-alpha.0"}`];
-function fillTemplate(root, assets, extra) {
-  var _extra, _extra$baseJs;
-  extra = _extends({}, extra);
-  (_extra$baseJs = (_extra = extra).baseJs) != null ? _extra$baseJs : _extra.baseJs = baseJsPaths.map(markmapCommon.buildJSItem);
-  const {
-    scripts,
-    styles
-  } = assets;
-  const cssList = [...(styles ? markmapCommon.persistCSS(styles) : [])];
-  const context = {
-    getMarkmap: () => window.markmap,
-    getOptions: extra.getOptions,
-    jsonOptions: extra.jsonOptions,
-    root
-  };
-  const jsList = [...markmapCommon.persistJS([...extra.baseJs, ...(scripts || []), {
+const template = "<!DOCTYPE html>\n<html>\n<head>\n<meta charset=\"UTF-8\">\n<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">\n<meta http-equiv=\"X-UA-Compatible\" content=\"ie=edge\">\n<title>Markmap</title>\n<style>\n* {\n  margin: 0;\n  padding: 0;\n}\n#mindmap {\n  display: block;\n  width: 100vw;\n  height: 100vh;\n}\n</style>\n<!--CSS-->\n</head>\n<body>\n<svg id=\"mindmap\"></svg>\n<!--JS-->\n</body>\n</html>\n" ;
+const baseJsPaths = [`d3@${"7.8.5"}/dist/d3.min.js`, `markmap-view@${"0.15.0"}/dist/browser/index.js`];
+
+const name$3 = 'katex';
+const preloadScripts = [`katex@${"0.16.8"}/dist/katex.min.js`].map(path => markmapCommon.buildJSItem(path));
+const webfontloader = markmapCommon.buildJSItem(`webfontloader@${"1.6.28"}/webfontloader.js`);
+webfontloader.data.defer = true;
+const styles$1 = [`katex@${"0.16.8"}/dist/katex.min.css`].map(path => markmapCommon.buildCSSItem(path));
+const config$1 = {
+  versions: {
+    katex: "0.16.8" ,
+    webfontloader: "1.6.28" 
+  },
+  preloadScripts,
+  scripts: [{
     type: 'iife',
     data: {
-      fn: (getMarkmap, getOptions, root, jsonOptions) => {
-        const markmap = getMarkmap();
-        window.mm = markmap.Markmap.create('svg#mindmap', (getOptions || markmap.deriveOptions)(jsonOptions), root);
+      fn: getMarkmap => {
+        window.WebFontConfig = {
+          custom: {
+            families: ['KaTeX_AMS', 'KaTeX_Caligraphic:n4,n7', 'KaTeX_Fraktur:n4,n7', 'KaTeX_Main:n4,n7,i4,i7', 'KaTeX_Math:i4,i7', 'KaTeX_Script', 'KaTeX_SansSerif:n4,n7,i4', 'KaTeX_Size1', 'KaTeX_Size2', 'KaTeX_Size3', 'KaTeX_Size4', 'KaTeX_Typewriter']
+          },
+          active: () => {
+            getMarkmap().refreshHook.call();
+          }
+        };
       },
-      getParams: ({
-        getMarkmap,
-        getOptions,
-        root,
-        jsonOptions
-      }) => {
-        return [getMarkmap, getOptions, root, jsonOptions];
+      getParams({
+        getMarkmap
+      }) {
+        return [getMarkmap];
       }
     }
-  }], context)];
-  const html = template.replace('<!--CSS-->', () => cssList.join('')).replace('<!--JS-->', () => jsList.join(''));
-  return html;
-}
-
-function getConfig$1() {
-  const preloadScripts = [`katex@${"0.16.0"}/dist/katex.min.js`].map(markmapCommon.buildJSItem);
-  const webfontloader = markmapCommon.buildJSItem(`webfontloader@${"1.6.28"}/webfontloader.js`);
-  webfontloader.data.defer = true;
-  const styles = [`katex@${"0.16.0"}/dist/katex.min.css`].map(markmapCommon.buildCSSItem);
-  return {
-    versions: {
-      katex: "0.16.0",
-      webfontloader: "1.6.28"
-    },
-    preloadScripts,
-    scripts: [{
-      type: 'iife',
-      data: {
-        fn: getMarkmap => {
-          window.WebFontConfig = {
-            custom: {
-              families: ['KaTeX_AMS', 'KaTeX_Caligraphic:n4,n7', 'KaTeX_Fraktur:n4,n7', 'KaTeX_Main:n4,n7,i4,i7', 'KaTeX_Math:i4,i7', 'KaTeX_Script', 'KaTeX_SansSerif:n4,n7,i4', 'KaTeX_Size1', 'KaTeX_Size2', 'KaTeX_Size3', 'KaTeX_Size4', 'KaTeX_Typewriter']
-            },
-            active: () => {
-              getMarkmap().refreshHook.call();
-            }
-          };
-        },
-        getParams({
-          getMarkmap
-        }) {
-          return [getMarkmap];
-        }
-      }
-    }, webfontloader],
-    styles
-  };
-}
+  }, webfontloader],
+  styles: styles$1
+};
 
-function createTransformHooks() {
+function createTransformHooks(transformer) {
   return {
+    transformer,
     parser: new markmapCommon.Hook(),
     beforeParse: new markmapCommon.Hook(),
     afterParse: new markmapCommon.Hook(),
@@ -99,85 +63,34 @@ function definePlugin(plugin) {
   return plugin;
 }
 
-const name$3 = 'katex';
-var katex = definePlugin(() => {
-  const plugin = {
-    name: name$3,
-    config: getConfig$1(),
-    transform(transformHooks) {
-      let enableFeature = markmapCommon.noop;
-      transformHooks.parser.tap(md => {
-        md.use(remarkableKatex);
-        md.renderer.rules.katex = markmapCommon.wrapFunction(md.renderer.rules.katex, (render, ...args) => {
-          enableFeature();
-          return render(...args);
-        });
-      });
-      transformHooks.beforeParse.tap((_, context) => {
-        enableFeature = () => {
-          context.features[name$3] = true;
-        };
-      });
-      return {
-        styles: plugin.config.styles,
-        scripts: plugin.config.scripts
-      };
-    }
-  };
-  return plugin;
-});
-
-function getConfig() {
-  const preloadScripts = [`prismjs@${"1.28.0"}/components/prism-core.min.js`, `prismjs@${"1.28.0"}/plugins/autoloader/prism-autoloader.min.js`].map(markmapCommon.buildJSItem);
-  const styles = [`prismjs@${"1.28.0"}/themes/prism.css`].map(markmapCommon.buildCSSItem);
-  return {
-    versions: {
-      prismjs: "1.28.0"
-    },
-    preloadScripts,
-    styles
-  };
-}
-
-const name$2 = 'prism';
-var prism = definePlugin(() => {
-  const plugin = {
-    name: name$2,
-    config: getConfig(),
-    transform(transformHooks) {
-      let enableFeature = markmapCommon.noop;
-      transformHooks.parser.tap(md => {
-        md.set({
-          highlight: (str, lang) => {
-            enableFeature();
-            let grammar = Prism.languages[lang];
-            if (!grammar && lang) {
-              loadLanguages([lang]);
-              grammar = Prism.languages[lang];
-            }
-            if (grammar) {
-              return Prism.highlight(str, grammar, lang);
-            }
-            return '';
-          }
-        });
-      });
-      transformHooks.beforeParse.tap((_, context) => {
-        enableFeature = () => {
-          context.features[name$2] = true;
-        };
+const plugin$1 = definePlugin({
+  name: name$3,
+  config: config$1,
+  transform(transformHooks) {
+    var _plugin$config, _plugin$config2;
+    let enableFeature = markmapCommon.noop;
+    transformHooks.parser.tap(md => {
+      md.use(remarkableKatex);
+      md.renderer.rules.katex = markmapCommon.wrapFunction(md.renderer.rules.katex, (render, ...args) => {
+        enableFeature();
+        return render(...args);
       });
-      return {
-        styles: plugin.config.styles
+    });
+    transformHooks.beforeParse.tap((_, context) => {
+      enableFeature = () => {
+        context.features[name$3] = true;
       };
-    }
-  };
-  return plugin;
+    });
+    return {
+      styles: (_plugin$config = plugin$1.config) == null ? void 0 : _plugin$config.styles,
+      scripts: (_plugin$config2 = plugin$1.config) == null ? void 0 : _plugin$config2.scripts
+    };
+  }
 });
 
-const name$1 = 'frontmatter';
+const name$2 = 'frontmatter';
 var frontmatter = definePlugin({
-  name: name$1,
+  name: name$2,
   transform(transformHooks) {
     transformHooks.beforeParse.tap((md, context) => {
       const {
@@ -225,20 +138,22 @@ function normalizeNumber(value) {
   return +value;
 }
 
-const name = 'npmUrl';
+const name$1 = 'npmUrl';
 var npmUrl = definePlugin({
-  name,
+  name: name$1,
   transform(transformHooks) {
     transformHooks.afterParse.tap((_, context) => {
       const {
         frontmatter
       } = context;
-      if (frontmatter != null && frontmatter.markmap) {
+      const markmap = frontmatter == null ? void 0 : frontmatter.markmap;
+      if (markmap) {
         ['extraJs', 'extraCss'].forEach(key => {
-          if (frontmatter.markmap[key]) {
-            frontmatter.markmap[key] = frontmatter.markmap[key].map(path => {
+          const value = markmap[key];
+          if (value) {
+            markmap[key] = value.map(path => {
               if (path.startsWith('npm:')) {
-                return markmapCommon.getFullUrl(path.slice(4));
+                return transformHooks.transformer.urlBuilder.getFullUrl(path.slice(4));
               }
               return path;
             });
@@ -250,7 +165,61 @@ var npmUrl = definePlugin({
   }
 });
 
-const plugins = [frontmatter, katex, prism, npmUrl];
+const name = 'hljs';
+const styles = [`highlight.js@${"11.8.0"}/styles/default.css`].map(path => markmapCommon.buildCSSItem(path));
+const config = {
+  versions: {
+    hljs: "11.8.0" 
+  },
+  styles
+};
+const plugin = definePlugin({
+  name,
+  config,
+  transform(transformHooks) {
+    var _plugin$config;
+    let enableFeature = markmapCommon.noop;
+    transformHooks.parser.tap(md => {
+      md.set({
+        highlight: (str, language) => {
+          enableFeature();
+          return hljs.highlightAuto(str, language ? [language] : undefined).value;
+        }
+      });
+    });
+    transformHooks.beforeParse.tap((_, context) => {
+      enableFeature = () => {
+        context.features[name] = true;
+      };
+    });
+    return {
+      styles: (_plugin$config = plugin.config) == null ? void 0 : _plugin$config.styles
+    };
+  }
+});
+
+const plugins = [frontmatter, plugin$1, plugin, npmUrl];
+
+function patchJSItem(transformer, item) {
+  if (item.type === 'script' && item.data.src) {
+    return _extends({}, item, {
+      data: _extends({}, item.data, {
+        src: transformer.urlBuilder.getFullUrl(item.data.src)
+      })
+    });
+  }
+  return item;
+}
+function patchCSSItem(transformer, item) {
+  if (item.type === 'stylesheet' && item.data.href) {
+    return _extends({}, item, {
+      data: _extends({}, item.data, {
+        href: transformer.urlBuilder.getFullUrl(item.data.href)
+      })
+    });
+  }
+  return item;
+}
 
 function cleanNode(node) {
   if (node.type === 'heading') {
@@ -284,9 +253,7 @@ function cleanNode(node) {
       }
     });
   }
-  if (node.children.length === 0) {
-    delete node.children;
-  } else {
+  if (node.children.length > 0) {
     node.children.forEach(child => cleanNode(child));
     if (node.children.length === 1 && !node.children[0].content) {
       node.children = node.children[0].children;
@@ -294,16 +261,16 @@ function cleanNode(node) {
   }
 }
 function resetDepth(node, depth = 0) {
-  var _node$children;
   node.depth = depth;
-  (_node$children = node.children) == null ? void 0 : _node$children.forEach(child => {
+  node.children.forEach(child => {
     resetDepth(child, depth + 1);
   });
 }
 class Transformer {
   constructor(plugins$1 = plugins) {
     this.assetsMap = {};
-    this.hooks = createTransformHooks();
+    this.urlBuilder = new markmapCommon.UrlBuilder();
+    this.hooks = createTransformHooks(this);
     this.plugins = plugins$1.map(plugin => typeof plugin === 'function' ? plugin() : plugin);
     const assetsMap = {};
     for (const {
@@ -343,13 +310,13 @@ class Transformer {
     const stack = [root];
     let depth = 0;
     for (const token of tokens) {
+      const payload = {};
+      if (token.lines) {
+        payload.lines = token.lines;
+      }
       let current = stack[stack.length - 1];
       if (token.type.endsWith('_open')) {
         const type = token.type.slice(0, -5);
-        const payload = {};
-        if (token.lines) {
-          payload.lines = token.lines;
-        }
         if (type === 'heading') {
           depth = token.hLevel;
           while (((_current = current) == null ? void 0 : _current.depth) >= depth) {
@@ -384,10 +351,13 @@ class Transformer {
         }
       } else if (token.type === 'inline') {
         const revoke = this.hooks.htmltag.tap(ctx => {
-          const comment = ctx.result.match(/^<!--([\s\S]*?)-->$/);
+          var _ctx$result;
+          const comment = (_ctx$result = ctx.result) == null ? void 0 : _ctx$result.match(/^<!--([\s\S]*?)-->$/);
           const data = comment == null ? void 0 : comment[1].trim().split(' ');
-          if (data[0] === 'fold') {
-            current.payload.fold = ['all', 'recursively'].includes(data[1]) ? 2 : 1;
+          if ((data == null ? void 0 : data[0]) === 'fold') {
+            current.payload = _extends({}, current.payload, {
+              fold: ['all', 'recursively'].includes(data[1]) ? 2 : 1
+            });
             ctx.result = '';
           }
         });
@@ -395,15 +365,13 @@ class Transformer {
         revoke();
         current.content = `${current.content || ''}${text}`;
       } else if (token.type === 'fence') {
-        let result = md.renderer.render([token], md.options, {});
-        // Remarkable only adds className to `<code>` but not `<pre>`, copy it to make PrismJS style work.
-        const matches = result.match(/<code( class="[^"]*")>/);
-        if (matches) result = result.replace('<pre>', `<pre${matches[1]}>`);
+        const result = md.renderer.render([token], md.options, {});
         current.children.push({
           type: token.type,
           depth: depth + 1,
           content: result,
-          children: []
+          children: [],
+          payload
         });
       } else ;
     }
@@ -443,8 +411,8 @@ class Transformer {
       }
     }
     return {
-      styles,
-      scripts
+      styles: styles.map(item => patchCSSItem(this, item)),
+      scripts: scripts.map(item => patchJSItem(this, item))
     };
   }
 
@@ -455,15 +423,50 @@ class Transformer {
     const keys = this.plugins.map(plugin => plugin.name).filter(name => features[name]);
     return this.getAssets(keys);
   }
+  fillTemplate(root, assets, extra) {
+    var _extra, _extra$baseJs;
+    extra = _extends({}, extra);
+    (_extra$baseJs = (_extra = extra).baseJs) != null ? _extra$baseJs : _extra.baseJs = baseJsPaths.map(path => this.urlBuilder.getFullUrl(path)).map(path => markmapCommon.buildJSItem(path));
+    const {
+      scripts,
+      styles
+    } = assets;
+    const cssList = [...(styles ? markmapCommon.persistCSS(styles) : [])];
+    const context = {
+      getMarkmap: () => window.markmap,
+      getOptions: extra.getOptions,
+      jsonOptions: extra.jsonOptions,
+      root
+    };
+    const jsList = [...markmapCommon.persistJS([...extra.baseJs, ...(scripts || []), {
+      type: 'iife',
+      data: {
+        fn: (getMarkmap, getOptions, root, jsonOptions) => {
+          const markmap = getMarkmap();
+          window.mm = markmap.Markmap.create('svg#mindmap', (getOptions || markmap.deriveOptions)(jsonOptions), root);
+        },
+        getParams: ({
+          getMarkmap,
+          getOptions,
+          root,
+          jsonOptions
+        }) => {
+          return [getMarkmap, getOptions, root, jsonOptions];
+        }
+      }
+    }], context)];
+    const html = template.replace('<!--CSS-->', () => cssList.join('')).replace('<!--JS-->', () => jsList.join(''));
+    return html;
+  }
 }
 
 const transformerVersions = {
-  'markmap-lib': '0.15.0-alpha.0',
-  d3: "6.2.0"
+  'markmap-lib': '0.15.1',
+  d3: "7.8.5"
 };
 
 exports.Transformer = Transformer;
 exports.baseJsPaths = baseJsPaths;
 exports.builtInPlugins = plugins;
-exports.fillTemplate = fillTemplate;
+exports.template = template;
 exports.transformerVersions = transformerVersions;