markmap-lib 0.13.6-alpha.2 → 0.13.6-alpha.5

package/dist/index.esm.js

@@ -1,21 +1,188 @@
-/*! markmap-lib v0.13.6-alpha.2+20a88ca | MIT License */
-import _extends from '@babel/runtime/helpers/esm/extends';
-import { persistCSS, persistJS, wrapFunction, Hook } from 'markmap-common';
+/*! markmap-lib v0.13.6-alpha.5+3a7e620 | MIT License */
+import _extends$1 from '@babel/runtime/helpers/esm/extends';
 import { Remarkable } from 'remarkable';
 import remarkableKatex from 'remarkable-katex';
 import Prism from 'prismjs';
 import loadLanguages from 'prismjs/components/';
 import yaml from 'js-yaml';
 
+/*! markmap-common v0.13.4 | MIT License */
+class Hook {
+  constructor() {
+    this.listeners = [];
+  }
+
+  tap(fn) {
+    this.listeners.push(fn);
+    return () => this.revoke(fn);
+  }
+
+  revoke(fn) {
+    const i = this.listeners.indexOf(fn);
+    if (i >= 0) this.listeners.splice(i, 1);
+  }
+
+  revokeAll() {
+    this.listeners.splice(0);
+  }
+
+  call(...args) {
+    for (const fn of this.listeners) {
+      fn(...args);
+    }
+  }
+
+}
+
+function _extends() {
+  _extends = Object.assign || function (target) {
+    for (var i = 1; i < arguments.length; i++) {
+      var source = arguments[i];
+
+      for (var key in source) {
+        if (Object.prototype.hasOwnProperty.call(source, key)) {
+          target[key] = source[key];
+        }
+      }
+    }
+
+    return target;
+  };
+
+  return _extends.apply(this, arguments);
+}
+
+function _objectWithoutPropertiesLoose(source, excluded) {
+  if (source == null) return {};
+  var target = {};
+  var sourceKeys = Object.keys(source);
+  var key, i;
+
+  for (i = 0; i < sourceKeys.length; i++) {
+    key = sourceKeys[i];
+    if (excluded.indexOf(key) >= 0) continue;
+    target[key] = source[key];
+  }
+
+  return target;
+}
+
+const _excluded = ["textContent"];
+
+function escapeHtml(html) {
+  return html.replace(/[&<"]/g, m => ({
+    '&': '&amp;',
+    '<': '&lt;',
+    '"': '&quot;'
+  })[m]);
+}
+
+function escapeScript(content) {
+  return content.replace(/<(\/script>)/g, '\\x3c$2');
+}
+
+function htmlOpen(tagName, attrs) {
+  const attrStr = attrs ? Object.entries(attrs).map(([key, value]) => {
+    if (value == null || value === false) return;
+    key = ` ${escapeHtml(key)}`;
+    if (value === true) return key;
+    return `${key}="${escapeHtml(value)}"`;
+  }).filter(Boolean).join('') : '';
+  return `<${tagName}${attrStr}>`;
+}
+
+function htmlClose(tagName) {
+  return `</${tagName}>`;
+}
+
+function wrapHtml(tagName, content, attrs) {
+  if (content == null) return htmlOpen(tagName, attrs);
+  return htmlOpen(tagName, attrs) + (content || '') + htmlClose(tagName);
+}
+
+function buildCode(fn, args) {
+  const params = args.map(arg => {
+    if (typeof arg === 'function') return arg.toString();
+    return JSON.stringify(arg != null ? arg : null);
+  }).join(',');
+  return `(${fn.toString()})(${params})`;
+}
+
+function persistJS(items, context) {
+  return items.map(item => {
+    if (item.type === 'script') {
+      const _item$data = item.data,
+            {
+        textContent
+      } = _item$data,
+            rest = _objectWithoutPropertiesLoose(_item$data, _excluded);
+
+      return wrapHtml('script', textContent || '', rest);
+    }
+
+    if (item.type === 'iife') {
+      const {
+        fn,
+        getParams
+      } = item.data;
+      return wrapHtml('script', escapeScript(buildCode(fn, (getParams == null ? void 0 : getParams(context)) || [])));
+    }
+
+    return '';
+  });
+}
+
+function persistCSS(items) {
+  return items.map(item => {
+    if (item.type === 'stylesheet') {
+      return wrapHtml('link', null, _extends({
+        rel: 'stylesheet'
+      }, item.data));
+    }
+    /* else if (item.type === 'style') */
+
+
+    return wrapHtml('style', item.data);
+  });
+}
+
+Math.random().toString(36).slice(2, 8);
+
+function wrapFunction(fn, {
+  before,
+  after
+}) {
+  return function wrapped(...args) {
+    const ctx = {
+      args,
+      thisObj: this
+    };
+
+    try {
+      if (before) before(ctx);
+    } catch (_unused) {// ignore
+    }
+
+    ctx.result = fn.apply(ctx.thisObj, ctx.args);
+
+    try {
+      if (after) after(ctx);
+    } catch (_unused2) {// ignore
+    }
+
+    return ctx.result;
+  };
+}
+
 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 BASE_JS = [`https://cdn.jsdelivr.net/npm/d3@${"6.7.0"}`, `https://cdn.jsdelivr.net/npm/markmap-view@${"0.13.6-alpha.2+20a88ca"}`].map(src => ({
+const BASE_JS = [`https://cdn.jsdelivr.net/npm/d3@${"6.7.0"}`, `https://cdn.jsdelivr.net/npm/markmap-view@${"0.13.5"}`].map(src => ({
   type: 'script',
   data: {
     src
   }
 }));
 function fillTemplate(root, assets, extra) {
-  extra = _extends({
+  extra = _extends$1({
     baseJs: BASE_JS
   }, extra);
   const {
@@ -52,13 +219,13 @@ function fillTemplate(root, assets, extra) {
 
 var config$1 = {
   versions: {
-    katex: "0.15.3",
+    katex: "0.16.0",
     webfontloader: "1.6.28"
   },
   preloadScripts: [{
     type: 'script',
     data: {
-      src: `https://cdn.jsdelivr.net/npm/katex@${"0.15.3"}/dist/katex.min.js`
+      src: `https://cdn.jsdelivr.net/npm/katex@${"0.16.0"}/dist/katex.min.js`
     }
   }],
   scripts: [{
@@ -92,11 +259,24 @@ var config$1 = {
   styles: [{
     type: 'stylesheet',
     data: {
-      href: `https://cdn.jsdelivr.net/npm/katex@${"0.15.3"}/dist/katex.min.css`
+      href: `https://cdn.jsdelivr.net/npm/katex@${"0.16.0"}/dist/katex.min.css`
     }
   }]
 };
 
+/**
+ * Find NPM paths and resolve them to full URLs with the same package version as in this library.
+ */
+function resolveNpmPaths(paths, name, version) {
+  return paths.map(path => {
+    if (typeof path === 'string' && path.startsWith(`${name}/`)) {
+      return `https://cdn.jsdelivr.net/npm/${name}@${version}${path.slice(name.length)}`;
+    }
+
+    return path;
+  });
+}
+
 const name$2 = 'katex';
 function transform$2(transformHooks) {
   let enableFeature = () => {};
@@ -109,11 +289,24 @@ function transform$2(transformHooks) {
       }
     });
   });
-  transformHooks.transform.tap((_, context) => {
+  transformHooks.beforeParse.tap((_, context) => {
     enableFeature = () => {
       context.features[name$2] = true;
     };
   });
+  transformHooks.afterParse.tap((_, context) => {
+    const {
+      frontmatter
+    } = context;
+
+    if (frontmatter != null && frontmatter.markmap) {
+      ['extraJs', 'extraCss'].forEach(key => {
+        if (frontmatter.markmap[key]) {
+          frontmatter.markmap[key] = resolveNpmPaths(frontmatter.markmap[key], name$2, config$1.versions.katex);
+        }
+      });
+    }
+  });
   return {
     styles: config$1.styles,
     scripts: config$1.scripts
@@ -173,7 +366,7 @@ function transform$1(transformHooks) {
       }
     });
   });
-  transformHooks.transform.tap((_, context) => {
+  transformHooks.beforeParse.tap((_, context) => {
     enableFeature = () => {
       context.features[name$1] = true;
     };
@@ -192,7 +385,7 @@ transform: transform$1
 
 const name = 'frontmatter';
 function transform(transformHooks) {
-  transformHooks.transform.tap((md, context) => {
+  transformHooks.beforeParse.tap((md, context) => {
     const origParse = md.parse;
     md.parse = wrapFunction(origParse, {
       before(ctx) {
@@ -262,7 +455,8 @@ transform: transform
 function createTransformHooks() {
   return {
     parser: new Hook(),
-    transform: new Hook(),
+    beforeParse: new Hook(),
+    afterParse: new Hook(),
     htmltag: new Hook(),
     retransform: new Hook()
   };
@@ -282,7 +476,7 @@ function cleanNode(node) {
       if (['paragraph', 'fence'].includes(item.type)) {
         if (!node.content) {
           node.content = item.content;
-          node.payload = _extends({}, node.payload, item.payload);
+          node.payload = _extends$1({}, node.payload, item.payload);
         }
 
         return false;
@@ -300,7 +494,7 @@ function cleanNode(node) {
     let index = (_node$payload$startIn = (_node$payload2 = node.payload) == null ? void 0 : _node$payload2.startIndex) != null ? _node$payload$startIn : 1;
     node.children.forEach(item => {
       if (item.type === 'list_item') {
-        item.payload = _extends({}, item.payload, {
+        item.payload = _extends$1({}, item.payload, {
           index
         });
         index += 1;
@@ -454,13 +648,14 @@ class Transformer {
     const context = {
       features: {}
     };
-    this.hooks.transform.call(this.md, context);
+    this.hooks.beforeParse.call(this.md, context);
     const tokens = this.md.parse(content, {});
+    this.hooks.afterParse.call(this.md, context);
     let root = this.buildTree(tokens);
     cleanNode(root);
     if (((_root$children = root.children) == null ? void 0 : _root$children.length) === 1) root = root.children[0];
     resetDepth(root);
-    return _extends({}, context, {
+    return _extends$1({}, context, {
       root
     });
   }
@@ -501,7 +696,7 @@ class Transformer {
 }
 
 const transformerVersions = {
-  'markmap-lib': '0.13.6-alpha.2+20a88ca',
+  'markmap-lib': '0.13.6-alpha.5+3a7e620',
   d3: "6.7.0"
 };
 

package/dist/index.js

@@ -1,8 +1,7 @@
-/*! markmap-lib v0.13.6-alpha.2+20a88ca | MIT License */
+/*! markmap-lib v0.13.6-alpha.5+3a7e620 | MIT License */
 'use strict';
 
-var _extends = require('@babel/runtime/helpers/extends');
-var markmapCommon = require('markmap-common');
+var _extends$1 = require('@babel/runtime/helpers/extends');
 var remarkable = require('remarkable');
 var remarkableKatex = require('remarkable-katex');
 var Prism = require('prismjs');
@@ -11,14 +10,182 @@ var yaml = require('js-yaml');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; }
 
-var _extends__default = /*#__PURE__*/_interopDefaultLegacy(_extends);
+var _extends__default = /*#__PURE__*/_interopDefaultLegacy(_extends$1);
 var remarkableKatex__default = /*#__PURE__*/_interopDefaultLegacy(remarkableKatex);
 var Prism__default = /*#__PURE__*/_interopDefaultLegacy(Prism);
 var loadLanguages__default = /*#__PURE__*/_interopDefaultLegacy(loadLanguages);
 var yaml__default = /*#__PURE__*/_interopDefaultLegacy(yaml);
 
+/*! markmap-common v0.13.4 | MIT License */
+class Hook {
+  constructor() {
+    this.listeners = [];
+  }
+
+  tap(fn) {
+    this.listeners.push(fn);
+    return () => this.revoke(fn);
+  }
+
+  revoke(fn) {
+    const i = this.listeners.indexOf(fn);
+    if (i >= 0) this.listeners.splice(i, 1);
+  }
+
+  revokeAll() {
+    this.listeners.splice(0);
+  }
+
+  call(...args) {
+    for (const fn of this.listeners) {
+      fn(...args);
+    }
+  }
+
+}
+
+function _extends() {
+  _extends = Object.assign || function (target) {
+    for (var i = 1; i < arguments.length; i++) {
+      var source = arguments[i];
+
+      for (var key in source) {
+        if (Object.prototype.hasOwnProperty.call(source, key)) {
+          target[key] = source[key];
+        }
+      }
+    }
+
+    return target;
+  };
+
+  return _extends.apply(this, arguments);
+}
+
+function _objectWithoutPropertiesLoose(source, excluded) {
+  if (source == null) return {};
+  var target = {};
+  var sourceKeys = Object.keys(source);
+  var key, i;
+
+  for (i = 0; i < sourceKeys.length; i++) {
+    key = sourceKeys[i];
+    if (excluded.indexOf(key) >= 0) continue;
+    target[key] = source[key];
+  }
+
+  return target;
+}
+
+const _excluded = ["textContent"];
+
+function escapeHtml(html) {
+  return html.replace(/[&<"]/g, m => ({
+    '&': '&amp;',
+    '<': '&lt;',
+    '"': '&quot;'
+  })[m]);
+}
+
+function escapeScript(content) {
+  return content.replace(/<(\/script>)/g, '\\x3c$2');
+}
+
+function htmlOpen(tagName, attrs) {
+  const attrStr = attrs ? Object.entries(attrs).map(([key, value]) => {
+    if (value == null || value === false) return;
+    key = ` ${escapeHtml(key)}`;
+    if (value === true) return key;
+    return `${key}="${escapeHtml(value)}"`;
+  }).filter(Boolean).join('') : '';
+  return `<${tagName}${attrStr}>`;
+}
+
+function htmlClose(tagName) {
+  return `</${tagName}>`;
+}
+
+function wrapHtml(tagName, content, attrs) {
+  if (content == null) return htmlOpen(tagName, attrs);
+  return htmlOpen(tagName, attrs) + (content || '') + htmlClose(tagName);
+}
+
+function buildCode(fn, args) {
+  const params = args.map(arg => {
+    if (typeof arg === 'function') return arg.toString();
+    return JSON.stringify(arg != null ? arg : null);
+  }).join(',');
+  return `(${fn.toString()})(${params})`;
+}
+
+function persistJS(items, context) {
+  return items.map(item => {
+    if (item.type === 'script') {
+      const _item$data = item.data,
+            {
+        textContent
+      } = _item$data,
+            rest = _objectWithoutPropertiesLoose(_item$data, _excluded);
+
+      return wrapHtml('script', textContent || '', rest);
+    }
+
+    if (item.type === 'iife') {
+      const {
+        fn,
+        getParams
+      } = item.data;
+      return wrapHtml('script', escapeScript(buildCode(fn, (getParams == null ? void 0 : getParams(context)) || [])));
+    }
+
+    return '';
+  });
+}
+
+function persistCSS(items) {
+  return items.map(item => {
+    if (item.type === 'stylesheet') {
+      return wrapHtml('link', null, _extends({
+        rel: 'stylesheet'
+      }, item.data));
+    }
+    /* else if (item.type === 'style') */
+
+
+    return wrapHtml('style', item.data);
+  });
+}
+
+Math.random().toString(36).slice(2, 8);
+
+function wrapFunction(fn, {
+  before,
+  after
+}) {
+  return function wrapped(...args) {
+    const ctx = {
+      args,
+      thisObj: this
+    };
+
+    try {
+      if (before) before(ctx);
+    } catch (_unused) {// ignore
+    }
+
+    ctx.result = fn.apply(ctx.thisObj, ctx.args);
+
+    try {
+      if (after) after(ctx);
+    } catch (_unused2) {// ignore
+    }
+
+    return ctx.result;
+  };
+}
+
 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 BASE_JS = [`https://cdn.jsdelivr.net/npm/d3@${"6.7.0"}`, `https://cdn.jsdelivr.net/npm/markmap-view@${"0.13.6-alpha.2+20a88ca"}`].map(src => ({
+const BASE_JS = [`https://cdn.jsdelivr.net/npm/d3@${"6.7.0"}`, `https://cdn.jsdelivr.net/npm/markmap-view@${"0.13.5"}`].map(src => ({
   type: 'script',
   data: {
     src
@@ -32,14 +199,14 @@ function fillTemplate(root, assets, extra) {
     scripts,
     styles
   } = assets;
-  const cssList = [...(styles ? markmapCommon.persistCSS(styles) : [])];
+  const cssList = [...(styles ? persistCSS(styles) : [])];
   const context = {
     getMarkmap: () => window.markmap,
     getOptions: extra.getOptions,
     jsonOptions: extra.jsonOptions,
     root
   };
-  const jsList = [...markmapCommon.persistJS([...extra.baseJs, ...(scripts || []), {
+  const jsList = [...persistJS([...extra.baseJs, ...(scripts || []), {
     type: 'iife',
     data: {
       fn: (getMarkmap, getOptions, root, jsonOptions) => {
@@ -62,13 +229,13 @@ function fillTemplate(root, assets, extra) {
 
 var config$1 = {
   versions: {
-    katex: "0.15.3",
+    katex: "0.16.0",
     webfontloader: "1.6.28"
   },
   preloadScripts: [{
     type: 'script',
     data: {
-      src: `https://cdn.jsdelivr.net/npm/katex@${"0.15.3"}/dist/katex.min.js`
+      src: `https://cdn.jsdelivr.net/npm/katex@${"0.16.0"}/dist/katex.min.js`
     }
   }],
   scripts: [{
@@ -102,28 +269,54 @@ var config$1 = {
   styles: [{
     type: 'stylesheet',
     data: {
-      href: `https://cdn.jsdelivr.net/npm/katex@${"0.15.3"}/dist/katex.min.css`
+      href: `https://cdn.jsdelivr.net/npm/katex@${"0.16.0"}/dist/katex.min.css`
     }
   }]
 };
 
+/**
+ * Find NPM paths and resolve them to full URLs with the same package version as in this library.
+ */
+function resolveNpmPaths(paths, name, version) {
+  return paths.map(path => {
+    if (typeof path === 'string' && path.startsWith(`${name}/`)) {
+      return `https://cdn.jsdelivr.net/npm/${name}@${version}${path.slice(name.length)}`;
+    }
+
+    return path;
+  });
+}
+
 const name$2 = 'katex';
 function transform$2(transformHooks) {
   let enableFeature = () => {};
 
   transformHooks.parser.tap(md => {
     md.use(remarkableKatex__default);
-    md.renderer.rules.katex = markmapCommon.wrapFunction(md.renderer.rules.katex, {
+    md.renderer.rules.katex = wrapFunction(md.renderer.rules.katex, {
       after: () => {
         enableFeature();
       }
     });
   });
-  transformHooks.transform.tap((_, context) => {
+  transformHooks.beforeParse.tap((_, context) => {
     enableFeature = () => {
       context.features[name$2] = true;
     };
   });
+  transformHooks.afterParse.tap((_, context) => {
+    const {
+      frontmatter
+    } = context;
+
+    if (frontmatter != null && frontmatter.markmap) {
+      ['extraJs', 'extraCss'].forEach(key => {
+        if (frontmatter.markmap[key]) {
+          frontmatter.markmap[key] = resolveNpmPaths(frontmatter.markmap[key], name$2, config$1.versions.katex);
+        }
+      });
+    }
+  });
   return {
     styles: config$1.styles,
     scripts: config$1.scripts
@@ -183,7 +376,7 @@ function transform$1(transformHooks) {
       }
     });
   });
-  transformHooks.transform.tap((_, context) => {
+  transformHooks.beforeParse.tap((_, context) => {
     enableFeature = () => {
       context.features[name$1] = true;
     };
@@ -202,9 +395,9 @@ transform: transform$1
 
 const name = 'frontmatter';
 function transform(transformHooks) {
-  transformHooks.transform.tap((md, context) => {
+  transformHooks.beforeParse.tap((md, context) => {
     const origParse = md.parse;
-    md.parse = markmapCommon.wrapFunction(origParse, {
+    md.parse = wrapFunction(origParse, {
       before(ctx) {
         const [content] = ctx.args;
         if (!content.startsWith('---\n')) return;
@@ -271,10 +464,11 @@ transform: transform
 
 function createTransformHooks() {
   return {
-    parser: new markmapCommon.Hook(),
-    transform: new markmapCommon.Hook(),
-    htmltag: new markmapCommon.Hook(),
-    retransform: new markmapCommon.Hook()
+    parser: new Hook(),
+    beforeParse: new Hook(),
+    afterParse: new Hook(),
+    htmltag: new Hook(),
+    retransform: new Hook()
   };
 }
 
@@ -357,7 +551,7 @@ class Transformer {
       breaks: true,
       maxNesting: Infinity
     });
-    md.renderer.rules.htmltag = markmapCommon.wrapFunction(md.renderer.rules.htmltag, {
+    md.renderer.rules.htmltag = wrapFunction(md.renderer.rules.htmltag, {
       after: ctx => {
         this.hooks.htmltag.call(ctx);
       }
@@ -464,8 +658,9 @@ class Transformer {
     const context = {
       features: {}
     };
-    this.hooks.transform.call(this.md, context);
+    this.hooks.beforeParse.call(this.md, context);
     const tokens = this.md.parse(content, {});
+    this.hooks.afterParse.call(this.md, context);
     let root = this.buildTree(tokens);
     cleanNode(root);
     if (((_root$children = root.children) == null ? void 0 : _root$children.length) === 1) root = root.children[0];
@@ -511,7 +706,7 @@ class Transformer {
 }
 
 const transformerVersions = {
-  'markmap-lib': '0.13.6-alpha.2+20a88ca',
+  'markmap-lib': '0.13.6-alpha.5+3a7e620',
   d3: "6.7.0"
 };