markmap-lib 0.13.5 → 0.13.6-alpha.4

package/dist/index.esm.js

@@ -1,21 +1,188 @@
-/*! markmap-lib v0.13.5 | MIT License */
-import _extends from '@babel/runtime/helpers/esm/extends';
-import { persistCSS, persistJS, wrapFunction, Hook } from 'markmap-common';
+/*! markmap-lib v0.13.6-alpha.4+70ae484 | 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.5"}`].map(src => ({
+const BASE_JS = [`https://cdn.jsdelivr.net/npm/d3@${"6.7.0"}`, `https://cdn.jsdelivr.net/npm/markmap-view@${"0.13.6-alpha.4+70ae484"}`].map(src => ({
   type: 'script',
   data: {
     src
   }
 }));
 function fillTemplate(root, assets, extra) {
-  extra = _extends({
+  extra = _extends$1({
     baseJs: BASE_JS
   }, extra);
   const {
@@ -51,6 +218,10 @@ function fillTemplate(root, assets, extra) {
 }
 
 var config$1 = {
+  versions: {
+    katex: "0.15.3",
+    webfontloader: "1.6.28"
+  },
   preloadScripts: [{
     type: 'script',
     data: {
@@ -124,6 +295,9 @@ transform: transform$2
 });
 
 var config = {
+  versions: {
+    prismjs: "1.28.0"
+  },
   preloadScripts: [{
     type: 'script',
     data: {
@@ -194,13 +368,21 @@ function transform(transformHooks) {
         const endOffset = content.indexOf('\n---\n');
         if (endOffset < 0) return;
         const raw = content.slice(4, endOffset);
+        let frontmatter;
 
         try {
-          context.frontmatter = yaml.load(raw);
+          var _frontmatter;
+
+          frontmatter = yaml.load(raw);
+
+          if ((_frontmatter = frontmatter) != null && _frontmatter.markmap) {
+            frontmatter.markmap = normalizeMarkmapJsonOptions(frontmatter.markmap);
+          }
         } catch (_unused) {
           return;
         }
 
+        context.frontmatter = frontmatter;
         const offset = endOffset + 5;
         ctx.args[0] = content.slice(offset);
       },
@@ -214,6 +396,30 @@ function transform(transformHooks) {
   return {};
 }
 
+function normalizeMarkmapJsonOptions(options) {
+  if (!options) return;
+  ['color', 'extraJs', 'extraCss'].forEach(key => {
+    if (options[key] != null) options[key] = normalizeStringArray(options[key]);
+  });
+  ['duration', 'maxWidth', 'initialExpandLevel'].forEach(key => {
+    if (options[key] != null) options[key] = normalizeNumber(options[key]);
+  });
+  return options;
+}
+
+function normalizeStringArray(value) {
+  var _result;
+
+  let result;
+  if (typeof value === 'string') result = [value];else if (Array.isArray(value)) result = value.filter(item => item && typeof item === 'string');
+  return (_result = result) != null && _result.length ? result : undefined;
+}
+
+function normalizeNumber(value) {
+  if (isNaN(+value)) return;
+  return +value;
+}
+
 var frontmatter = /*#__PURE__*/Object.freeze({
 __proto__: null,
 name: name,
@@ -229,7 +435,7 @@ function createTransformHooks() {
   };
 }
 
-const plugins = [katex, prism, frontmatter];
+const plugins = [frontmatter, katex, prism];
 
 function cleanNode(node) {
   if (node.type === 'heading') {
@@ -243,7 +449,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;
@@ -261,7 +467,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;
@@ -421,7 +627,7 @@ class Transformer {
     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
     });
   }
@@ -435,7 +641,7 @@ class Transformer {
 
     const styles = [];
     const scripts = [];
-    (_keys = keys) != null ? _keys : keys = Object.keys(this.assetsMap);
+    (_keys = keys) != null ? _keys : keys = this.plugins.map(plugin => plugin.name);
 
     for (const assets of keys.map(key => this.assetsMap[key])) {
       if (assets) {
@@ -455,9 +661,15 @@ class Transformer {
 
 
   getUsedAssets(features) {
-    return this.getAssets(Object.keys(features).filter(key => features[key]));
+    const keys = this.plugins.map(plugin => plugin.name).filter(name => features[name]);
+    return this.getAssets(keys);
   }
 
 }
 
-export { Transformer, plugins as builtInPlugins, fillTemplate };
+const transformerVersions = {
+  'markmap-lib': '0.13.6-alpha.4+70ae484',
+  d3: "6.7.0"
+};
+
+export { Transformer, plugins as builtInPlugins, fillTemplate, transformerVersions };

package/dist/index.js

@@ -1,8 +1,7 @@
-/*! markmap-lib v0.13.5 | MIT License */
+/*! markmap-lib v0.13.6-alpha.4+70ae484 | 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.5"}`].map(src => ({
+const BASE_JS = [`https://cdn.jsdelivr.net/npm/d3@${"6.7.0"}`, `https://cdn.jsdelivr.net/npm/markmap-view@${"0.13.6-alpha.4+70ae484"}`].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) => {
@@ -61,6 +228,10 @@ function fillTemplate(root, assets, extra) {
 }
 
 var config$1 = {
+  versions: {
+    katex: "0.15.3",
+    webfontloader: "1.6.28"
+  },
   preloadScripts: [{
     type: 'script',
     data: {
@@ -109,7 +280,7 @@ function transform$2(transformHooks) {
 
   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();
       }
@@ -134,6 +305,9 @@ transform: transform$2
 });
 
 var config = {
+  versions: {
+    prismjs: "1.28.0"
+  },
   preloadScripts: [{
     type: 'script',
     data: {
@@ -197,20 +371,28 @@ const name = 'frontmatter';
 function transform(transformHooks) {
   transformHooks.transform.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;
         const endOffset = content.indexOf('\n---\n');
         if (endOffset < 0) return;
         const raw = content.slice(4, endOffset);
+        let frontmatter;
 
         try {
-          context.frontmatter = yaml__default.load(raw);
+          var _frontmatter;
+
+          frontmatter = yaml__default.load(raw);
+
+          if ((_frontmatter = frontmatter) != null && _frontmatter.markmap) {
+            frontmatter.markmap = normalizeMarkmapJsonOptions(frontmatter.markmap);
+          }
         } catch (_unused) {
           return;
         }
 
+        context.frontmatter = frontmatter;
         const offset = endOffset + 5;
         ctx.args[0] = content.slice(offset);
       },
@@ -224,6 +406,30 @@ function transform(transformHooks) {
   return {};
 }
 
+function normalizeMarkmapJsonOptions(options) {
+  if (!options) return;
+  ['color', 'extraJs', 'extraCss'].forEach(key => {
+    if (options[key] != null) options[key] = normalizeStringArray(options[key]);
+  });
+  ['duration', 'maxWidth', 'initialExpandLevel'].forEach(key => {
+    if (options[key] != null) options[key] = normalizeNumber(options[key]);
+  });
+  return options;
+}
+
+function normalizeStringArray(value) {
+  var _result;
+
+  let result;
+  if (typeof value === 'string') result = [value];else if (Array.isArray(value)) result = value.filter(item => item && typeof item === 'string');
+  return (_result = result) != null && _result.length ? result : undefined;
+}
+
+function normalizeNumber(value) {
+  if (isNaN(+value)) return;
+  return +value;
+}
+
 var frontmatter = /*#__PURE__*/Object.freeze({
 __proto__: null,
 name: name,
@@ -232,14 +438,14 @@ transform: transform
 
 function createTransformHooks() {
   return {
-    parser: new markmapCommon.Hook(),
-    transform: new markmapCommon.Hook(),
-    htmltag: new markmapCommon.Hook(),
-    retransform: new markmapCommon.Hook()
+    parser: new Hook(),
+    transform: new Hook(),
+    htmltag: new Hook(),
+    retransform: new Hook()
   };
 }
 
-const plugins = [katex, prism, frontmatter];
+const plugins = [frontmatter, katex, prism];
 
 function cleanNode(node) {
   if (node.type === 'heading') {
@@ -318,7 +524,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);
       }
@@ -445,7 +651,7 @@ class Transformer {
 
     const styles = [];
     const scripts = [];
-    (_keys = keys) != null ? _keys : keys = Object.keys(this.assetsMap);
+    (_keys = keys) != null ? _keys : keys = this.plugins.map(plugin => plugin.name);
 
     for (const assets of keys.map(key => this.assetsMap[key])) {
       if (assets) {
@@ -465,11 +671,18 @@ class Transformer {
 
 
   getUsedAssets(features) {
-    return this.getAssets(Object.keys(features).filter(key => features[key]));
+    const keys = this.plugins.map(plugin => plugin.name).filter(name => features[name]);
+    return this.getAssets(keys);
   }
 
 }
 
+const transformerVersions = {
+  'markmap-lib': '0.13.6-alpha.4+70ae484',
+  d3: "6.7.0"
+};
+
 exports.Transformer = Transformer;
 exports.builtInPlugins = plugins;
 exports.fillTemplate = fillTemplate;
+exports.transformerVersions = transformerVersions;