markmap-lib 0.16.0 → 0.16.3-alpha.2

package/dist/browser/index.mjs

@@ -1,15 +1,26 @@
 import { Hook, buildJSItem, buildCSSItem, loadJS, noop, wrapFunction, UrlBuilder } from "markmap-common";
 import { buildTree } from "markmap-html-parser";
-import { Remarkable } from "remarkable";
+import MarkdownIt from "markdown-it";
+import md_ins from "markdown-it-ins";
+import md_mark from "markdown-it-mark";
+import md_sub from "markdown-it-sub";
+import md_sup from "markdown-it-sup";
 import yaml from "js-yaml";
-import remarkableKatex from "remarkable-katex";
+import katexPlugin from "@iktakahiro/markdown-it-katex";
+function initializeMarkdownIt() {
+  const md = MarkdownIt({
+    html: true,
+    breaks: true
+  });
+  md.use(md_ins).use(md_mark).use(md_sub).use(md_sup);
+  return md;
+}
 function createTransformHooks(transformer) {
   return {
     transformer,
     parser: new Hook(),
     beforeParse: new Hook(),
     afterParse: new Hook(),
-    htmltag: new Hook(),
     retransform: new Hook()
   };
 }
@@ -27,27 +38,22 @@ const plugin$3 = definePlugin({
   name: name$5,
   transform(transformHooks) {
     transformHooks.parser.tap((md) => {
-      md.core.ruler.before(
-        "inline",
-        "checkbox",
-        (state) => {
-          for (let i = 2; i < state.tokens.length; i += 1) {
-            const token = state.tokens[i];
-            if (token.type === "inline" && token.content) {
-              const prevType = state.tokens[i - 1].type;
-              const prevPrevType = state.tokens[i - 2].type;
-              if (prevType === "heading_open" || prevType === "paragraph_open" && prevPrevType === "list_item_open") {
-                token.content = token.content.replace(
-                  /^\[(.)\] /,
-                  (m, g) => images[g] ? `${images[g]} ` : m
-                );
-              }
+      md.core.ruler.before("inline", "checkbox", (state) => {
+        for (let i = 2; i < state.tokens.length; i += 1) {
+          const token = state.tokens[i];
+          if (token.type === "inline" && token.content) {
+            const prevType = state.tokens[i - 1].type;
+            const prevPrevType = state.tokens[i - 2].type;
+            if (prevType === "heading_open" || prevType === "paragraph_open" && prevPrevType === "list_item_open") {
+              token.content = token.content.replace(
+                /^\[(.)\] /,
+                (m, g) => images[g] ? `${images[g]} ` : m
+              );
             }
           }
-          return false;
-        },
-        {}
-      );
+        }
+        return false;
+      });
     });
     return {};
   }
@@ -187,6 +193,22 @@ const plugin$2 = definePlugin({
   }
 });
 const pluginHljs = plugin$2;
+function addDefaultVersions(paths, name2, version) {
+  return paths.map((path) => {
+    if (typeof path === "string" && !path.includes("://")) {
+      if (!path.startsWith("npm:")) {
+        path = `npm:${path}`;
+      }
+      const prefixLength = 4 + name2.length;
+      if (path.startsWith(`npm:${name2}/`)) {
+        path = `${path.slice(0, prefixLength)}@${version}${path.slice(
+          prefixLength
+        )}`;
+      }
+    }
+    return path;
+  });
+}
 const name$2 = "katex";
 const preloadScripts = [
   `katex@${"0.16.8"}/dist/katex.min.js`
@@ -240,22 +262,6 @@ const config = {
   ],
   styles
 };
-function addDefaultVersions(paths, name2, version) {
-  return paths.map((path) => {
-    if (typeof path === "string" && !path.includes("://")) {
-      if (!path.startsWith("npm:")) {
-        path = `npm:${path}`;
-      }
-      const prefixLength = 4 + name2.length;
-      if (path.startsWith(`npm:${name2}/`)) {
-        path = `${path.slice(0, prefixLength)}@${version}${path.slice(
-          prefixLength
-        )}`;
-      }
-    }
-    return path;
-  });
-}
 const plugin$1 = definePlugin({
   name: name$2,
   config,
@@ -284,12 +290,15 @@ const plugin$1 = definePlugin({
     };
     let enableFeature = noop;
     transformHooks.parser.tap((md) => {
-      md.use(remarkableKatex);
-      md.renderer.rules.katex = (tokens, idx) => {
-        enableFeature();
-        const result = renderKatex(tokens[idx].content, !!tokens[idx].block);
-        return result;
-      };
+      md.use(katexPlugin);
+      ["math_block", "math_inline"].forEach((key) => {
+        const fn = (tokens, idx) => {
+          enableFeature();
+          const result = renderKatex(tokens[idx].content, !!tokens[idx].block);
+          return result;
+        };
+        md.renderer.rules[key] = fn;
+      });
     });
     transformHooks.beforeParse.tap((_, context) => {
       enableFeature = () => {
@@ -351,32 +360,20 @@ const plugin = definePlugin({
   name,
   transform(transformHooks) {
     transformHooks.parser.tap((md) => {
-      Object.entries(md.renderer.rules).forEach(([key, value]) => {
-        if (typeof value === "function") {
-          md.renderer.rules[key] = patchRule(value);
-        } else {
-          Object.entries(value).forEach(([k, v]) => {
-            value[k] = patchRule(v);
-          });
+      md.renderer.renderAttrs = wrapFunction(
+        md.renderer.renderAttrs,
+        (renderAttrs, token) => {
+          let attrs = renderAttrs(token);
+          if (token.block && token.map) {
+            attrs += ` data-lines=${token.map.join(",")}`;
+          }
+          return attrs;
         }
-      });
+      );
     });
     return {};
   }
 });
-function patchRule(rule, _key) {
-  return wrapFunction(rule, (render, tokens, idx, ...rest) => {
-    let html = render(tokens, idx, ...rest);
-    const { lines } = tokens[idx];
-    if (lines) {
-      html = html.replace(
-        /^<[\w-]+/,
-        (m) => `${m} data-lines="${lines.join(",")}"`
-      );
-    }
-    return html;
-  });
-}
 const pluginSourceLines = plugin;
 const plugins = [
   pluginFrontmatter,
@@ -415,24 +412,12 @@ class Transformer {
       assetsMap[name2] = transform(this.hooks);
     }
     this.assetsMap = assetsMap;
-    const md = new Remarkable("full", {
-      html: true,
-      breaks: true,
-      maxNesting: Infinity
-    });
-    md.renderer.rules.htmltag = wrapFunction(
-      md.renderer.rules.htmltag,
-      (render, ...args) => {
-        const result = render(...args);
-        this.hooks.htmltag.call({ args, result });
-        return result;
-      }
-    );
+    const md = initializeMarkdownIt();
     this.md = md;
     this.hooks.parser.call(md);
   }
   transform(content, opts) {
-    var _a, _b;
+    var _a, _b, _c;
     const context = {
       content,
       features: {},
@@ -447,6 +432,7 @@ class Transformer {
         ...opts
       })
     );
+    root.content || (root.content = `${((_c = context.frontmatter) == null ? void 0 : _c.title) || ""}`);
     return { ...context, root };
   }
   /**
@@ -478,7 +464,7 @@ class Transformer {
   }
 }
 const transformerVersions = {
-  "markmap-lib": "0.16.0"
+  "markmap-lib": "0.16.3-alpha.2+0f4c3f8"
 };
 export {
   Transformer,

package/dist/index.js

@@ -2,11 +2,23 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const markmapCommon = require("markmap-common");
 const markmapHtmlParser = require("markmap-html-parser");
-const remarkable = require("remarkable");
+const MarkdownIt = require("markdown-it");
+const md_ins = require("markdown-it-ins");
+const md_mark = require("markdown-it-mark");
+const md_sub = require("markdown-it-sub");
+const md_sup = require("markdown-it-sup");
 const plugins = require("./plugins.js");
 require("js-yaml");
 require("highlight.js");
-require("remarkable-katex");
+require("@iktakahiro/markdown-it-katex");
+function initializeMarkdownIt() {
+  const md = MarkdownIt({
+    html: true,
+    breaks: true
+  });
+  md.use(md_ins).use(md_mark).use(md_sub).use(md_sup);
+  return md;
+}
 function patchJSItem(urlBuilder, item) {
   if (item.type === "script" && item.data.src) {
     return {
@@ -60,24 +72,12 @@ class Transformer {
       assetsMap[name] = transform(this.hooks);
     }
     this.assetsMap = assetsMap;
-    const md = new remarkable.Remarkable("full", {
-      html: true,
-      breaks: true,
-      maxNesting: Infinity
-    });
-    md.renderer.rules.htmltag = markmapCommon.wrapFunction(
-      md.renderer.rules.htmltag,
-      (render, ...args) => {
-        const result = render(...args);
-        this.hooks.htmltag.call({ args, result });
-        return result;
-      }
-    );
+    const md = initializeMarkdownIt();
     this.md = md;
     this.hooks.parser.call(md);
   }
   transform(content, opts) {
-    var _a, _b;
+    var _a, _b, _c;
     const context = {
       content,
       features: {},
@@ -92,6 +92,7 @@ class Transformer {
         ...opts
       })
     );
+    root.content || (root.content = `${((_c = context.frontmatter) == null ? void 0 : _c.title) || ""}`);
     return { ...context, root };
   }
   /**
@@ -123,7 +124,7 @@ class Transformer {
   }
 }
 const transformerVersions = {
-  "markmap-lib": "0.16.0"
+  "markmap-lib": "0.16.3-alpha.2+0f4c3f8"
 };
 exports.Transformer = Transformer;
 exports.builtInPlugins = builtInPlugins;

package/dist/index.mjs

@@ -1,10 +1,22 @@
-import { UrlBuilder, wrapFunction } from "markmap-common";
+import { UrlBuilder } from "markmap-common";
 import { buildTree } from "markmap-html-parser";
-import { Remarkable } from "remarkable";
+import MarkdownIt from "markdown-it";
+import md_ins from "markdown-it-ins";
+import md_mark from "markdown-it-mark";
+import md_sub from "markdown-it-sub";
+import md_sup from "markdown-it-sup";
 import { plugins, createTransformHooks } from "./plugins.mjs";
 import "js-yaml";
 import "highlight.js";
-import "remarkable-katex";
+import "@iktakahiro/markdown-it-katex";
+function initializeMarkdownIt() {
+  const md = MarkdownIt({
+    html: true,
+    breaks: true
+  });
+  md.use(md_ins).use(md_mark).use(md_sub).use(md_sup);
+  return md;
+}
 function patchJSItem(urlBuilder, item) {
   if (item.type === "script" && item.data.src) {
     return {
@@ -58,24 +70,12 @@ class Transformer {
       assetsMap[name] = transform(this.hooks);
     }
     this.assetsMap = assetsMap;
-    const md = new Remarkable("full", {
-      html: true,
-      breaks: true,
-      maxNesting: Infinity
-    });
-    md.renderer.rules.htmltag = wrapFunction(
-      md.renderer.rules.htmltag,
-      (render, ...args) => {
-        const result = render(...args);
-        this.hooks.htmltag.call({ args, result });
-        return result;
-      }
-    );
+    const md = initializeMarkdownIt();
     this.md = md;
     this.hooks.parser.call(md);
   }
   transform(content, opts) {
-    var _a, _b;
+    var _a, _b, _c;
     const context = {
       content,
       features: {},
@@ -90,6 +90,7 @@ class Transformer {
         ...opts
       })
     );
+    root.content || (root.content = `${((_c = context.frontmatter) == null ? void 0 : _c.title) || ""}`);
     return { ...context, root };
   }
   /**
@@ -121,7 +122,7 @@ class Transformer {
   }
 }
 const transformerVersions = {
-  "markmap-lib": "0.16.0"
+  "markmap-lib": "0.16.3-alpha.2+0f4c3f8"
 };
 export {
   Transformer,

package/dist/index.no-plugins.js

@@ -2,14 +2,25 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const markmapCommon = require("markmap-common");
 const markmapHtmlParser = require("markmap-html-parser");
-const remarkable = require("remarkable");
+const MarkdownIt = require("markdown-it");
+const md_ins = require("markdown-it-ins");
+const md_mark = require("markdown-it-mark");
+const md_sub = require("markdown-it-sub");
+const md_sup = require("markdown-it-sup");
+function initializeMarkdownIt() {
+  const md = MarkdownIt({
+    html: true,
+    breaks: true
+  });
+  md.use(md_ins).use(md_mark).use(md_sub).use(md_sup);
+  return md;
+}
 function createTransformHooks(transformer) {
   return {
     transformer,
     parser: new markmapCommon.Hook(),
     beforeParse: new markmapCommon.Hook(),
     afterParse: new markmapCommon.Hook(),
-    htmltag: new markmapCommon.Hook(),
     retransform: new markmapCommon.Hook()
   };
 }
@@ -66,24 +77,12 @@ class Transformer {
       assetsMap[name] = transform(this.hooks);
     }
     this.assetsMap = assetsMap;
-    const md = new remarkable.Remarkable("full", {
-      html: true,
-      breaks: true,
-      maxNesting: Infinity
-    });
-    md.renderer.rules.htmltag = markmapCommon.wrapFunction(
-      md.renderer.rules.htmltag,
-      (render, ...args) => {
-        const result = render(...args);
-        this.hooks.htmltag.call({ args, result });
-        return result;
-      }
-    );
+    const md = initializeMarkdownIt();
     this.md = md;
     this.hooks.parser.call(md);
   }
   transform(content, opts) {
-    var _a, _b;
+    var _a, _b, _c;
     const context = {
       content,
       features: {},
@@ -98,6 +97,7 @@ class Transformer {
         ...opts
       })
     );
+    root.content || (root.content = `${((_c = context.frontmatter) == null ? void 0 : _c.title) || ""}`);
     return { ...context, root };
   }
   /**
@@ -129,7 +129,7 @@ class Transformer {
   }
 }
 const transformerVersions = {
-  "markmap-lib": "0.16.0"
+  "markmap-lib": "0.16.3-alpha.2+0f4c3f8"
 };
 exports.Transformer = Transformer;
 exports.builtInPlugins = builtInPlugins;

package/dist/index.no-plugins.mjs

@@ -1,13 +1,24 @@
-import { Hook, UrlBuilder, wrapFunction } from "markmap-common";
+import { Hook, UrlBuilder } from "markmap-common";
 import { buildTree } from "markmap-html-parser";
-import { Remarkable } from "remarkable";
+import MarkdownIt from "markdown-it";
+import md_ins from "markdown-it-ins";
+import md_mark from "markdown-it-mark";
+import md_sub from "markdown-it-sub";
+import md_sup from "markdown-it-sup";
+function initializeMarkdownIt() {
+  const md = MarkdownIt({
+    html: true,
+    breaks: true
+  });
+  md.use(md_ins).use(md_mark).use(md_sub).use(md_sup);
+  return md;
+}
 function createTransformHooks(transformer) {
   return {
     transformer,
     parser: new Hook(),
     beforeParse: new Hook(),
     afterParse: new Hook(),
-    htmltag: new Hook(),
     retransform: new Hook()
   };
 }
@@ -64,24 +75,12 @@ class Transformer {
       assetsMap[name] = transform(this.hooks);
     }
     this.assetsMap = assetsMap;
-    const md = new Remarkable("full", {
-      html: true,
-      breaks: true,
-      maxNesting: Infinity
-    });
-    md.renderer.rules.htmltag = wrapFunction(
-      md.renderer.rules.htmltag,
-      (render, ...args) => {
-        const result = render(...args);
-        this.hooks.htmltag.call({ args, result });
-        return result;
-      }
-    );
+    const md = initializeMarkdownIt();
     this.md = md;
     this.hooks.parser.call(md);
   }
   transform(content, opts) {
-    var _a, _b;
+    var _a, _b, _c;
     const context = {
       content,
       features: {},
@@ -96,6 +95,7 @@ class Transformer {
         ...opts
       })
     );
+    root.content || (root.content = `${((_c = context.frontmatter) == null ? void 0 : _c.title) || ""}`);
     return { ...context, root };
   }
   /**
@@ -127,7 +127,7 @@ class Transformer {
   }
 }
 const transformerVersions = {
-  "markmap-lib": "0.16.0"
+  "markmap-lib": "0.16.3-alpha.2+0f4c3f8"
 };
 export {
   Transformer,

package/dist/markdown-it.d.ts

@@ -0,0 +1,2 @@
+import MarkdownIt from 'markdown-it';
+export declare function initializeMarkdownIt(): MarkdownIt;

package/dist/plugins.js

@@ -3,14 +3,13 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const markmapCommon = require("markmap-common");
 const yaml = require("js-yaml");
 const hljs = require("highlight.js");
-const remarkableKatex = require("remarkable-katex");
+const katexPlugin = require("@iktakahiro/markdown-it-katex");
 function createTransformHooks(transformer) {
   return {
     transformer,
     parser: new markmapCommon.Hook(),
     beforeParse: new markmapCommon.Hook(),
     afterParse: new markmapCommon.Hook(),
-    htmltag: new markmapCommon.Hook(),
     retransform: new markmapCommon.Hook()
   };
 }
@@ -28,27 +27,22 @@ const plugin$3 = definePlugin({
   name: name$5,
   transform(transformHooks) {
     transformHooks.parser.tap((md) => {
-      md.core.ruler.before(
-        "inline",
-        "checkbox",
-        (state) => {
-          for (let i = 2; i < state.tokens.length; i += 1) {
-            const token = state.tokens[i];
-            if (token.type === "inline" && token.content) {
-              const prevType = state.tokens[i - 1].type;
-              const prevPrevType = state.tokens[i - 2].type;
-              if (prevType === "heading_open" || prevType === "paragraph_open" && prevPrevType === "list_item_open") {
-                token.content = token.content.replace(
-                  /^\[(.)\] /,
-                  (m, g) => images[g] ? `${images[g]} ` : m
-                );
-              }
+      md.core.ruler.before("inline", "checkbox", (state) => {
+        for (let i = 2; i < state.tokens.length; i += 1) {
+          const token = state.tokens[i];
+          if (token.type === "inline" && token.content) {
+            const prevType = state.tokens[i - 1].type;
+            const prevPrevType = state.tokens[i - 2].type;
+            if (prevType === "heading_open" || prevType === "paragraph_open" && prevPrevType === "list_item_open") {
+              token.content = token.content.replace(
+                /^\[(.)\] /,
+                (m, g) => images[g] ? `${images[g]} ` : m
+              );
             }
           }
-          return false;
-        },
-        {}
-      );
+        }
+        return false;
+      });
     });
     return {};
   }
@@ -209,14 +203,16 @@ const plugin$1 = definePlugin({
     var _a, _b;
     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);
+      md.use(katexPlugin);
+      ["math_block", "math_inline"].forEach((key) => {
+        const fn = md.renderer.rules[key];
+        if (fn) {
+          md.renderer.rules[key] = markmapCommon.wrapFunction(fn, (render, ...args) => {
+            enableFeature();
+            return render(...args);
+          });
         }
-      );
+      });
     });
     transformHooks.beforeParse.tap((_, context) => {
       enableFeature = () => {
@@ -261,32 +257,20 @@ const plugin = definePlugin({
   name,
   transform(transformHooks) {
     transformHooks.parser.tap((md) => {
-      Object.entries(md.renderer.rules).forEach(([key, value]) => {
-        if (typeof value === "function") {
-          md.renderer.rules[key] = patchRule(value);
-        } else {
-          Object.entries(value).forEach(([k, v]) => {
-            value[k] = patchRule(v);
-          });
+      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(",")}`;
+          }
+          return attrs;
         }
-      });
+      );
     });
     return {};
   }
 });
-function patchRule(rule, _key) {
-  return markmapCommon.wrapFunction(rule, (render, tokens, idx, ...rest) => {
-    let html = render(tokens, idx, ...rest);
-    const { lines } = tokens[idx];
-    if (lines) {
-      html = html.replace(
-        /^<[\w-]+/,
-        (m) => `${m} data-lines="${lines.join(",")}"`
-      );
-    }
-    return html;
-  });
-}
 const pluginSourceLines = plugin;
 const plugins = [
   pluginFrontmatter,