markmap-lib 0.15.8 → 0.15.9-alpha.5

package/dist/index.mjs

@@ -1,14 +1,17 @@
-import { Remarkable } from "remarkable";
 import { buildJSItem, buildCSSItem, Hook, wrapFunction, noop, UrlBuilder, persistCSS, persistJS } from "markmap-common";
+import { buildTree } from "markmap-html-parser";
+import { Remarkable } from "remarkable";
 import remarkableKatex from "remarkable-katex";
 import yaml from "js-yaml";
 import hljs from "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@${"7.8.5"}/dist/d3.min.js`,
-  `markmap-view@${"0.15.8"}/dist/browser/index.js`
+  `markmap-view@${"0.15.9-alpha.5"}/dist/browser/index.js`
 ];
-const name$3 = "katex";
+const svg_marked = `<svg width="16" height="16" fill="currentColor" viewBox="0 -3 24 24"><path d="M19 3H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2V5a2 2 0 0 0-2-2m-9 14-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8z"/></svg>`;
+const svg_unmarked = `<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 -3 24 24"><path fill-rule="evenodd" d="M6 5a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V6a1 1 0 0 0-1-1zM3 6a3 3 0 0 1 3-3h12a3 3 0 0 1 3 3v12a3 3 0 0 1-3 3H6a3 3 0 0 1-3-3v-5z" clip-rule="evenodd"/></svg>`;
+const name$4 = "katex";
 const preloadScripts$1 = [
   `katex@${"0.16.8"}/dist/katex.min.js`
 ].map((path) => buildJSItem(path));
@@ -74,8 +77,8 @@ function createTransformHooks(transformer) {
 function definePlugin(plugin2) {
   return plugin2;
 }
-const plugin$1 = definePlugin({
-  name: name$3,
+const plugin$2 = definePlugin({
+  name: name$4,
   config: config$1,
   transform(transformHooks) {
     var _a, _b;
@@ -92,18 +95,18 @@ const plugin$1 = definePlugin({
     });
     transformHooks.beforeParse.tap((_, context) => {
       enableFeature = () => {
-        context.features[name$3] = true;
+        context.features[name$4] = true;
       };
     });
     return {
-      styles: (_a = plugin$1.config) == null ? void 0 : _a.styles,
-      scripts: (_b = plugin$1.config) == null ? void 0 : _b.scripts
+      styles: (_a = plugin$2.config) == null ? void 0 : _a.styles,
+      scripts: (_b = plugin$2.config) == null ? void 0 : _b.scripts
     };
   }
 });
-const name$2 = "frontmatter";
+const name$3 = "frontmatter";
 const frontmatter = definePlugin({
-  name: name$2,
+  name: name$3,
   transform(transformHooks) {
     transformHooks.beforeParse.tap((md, context) => {
       const { content } = context;
@@ -157,9 +160,9 @@ function normalizeNumber(value) {
     return;
   return +value;
 }
-const name$1 = "npmUrl";
+const name$2 = "npmUrl";
 const npmUrl = definePlugin({
-  name: name$1,
+  name: name$2,
   transform(transformHooks) {
     transformHooks.afterParse.tap((_, context) => {
       const { frontmatter: frontmatter2 } = context;
@@ -183,7 +186,7 @@ const npmUrl = definePlugin({
     return {};
   }
 });
-const name = "hljs";
+const name$1 = "hljs";
 const preloadScripts = [
   `@highlightjs/cdn-assets@${"11.8.0"}/highlight.min.js`
 ].map((path) => buildJSItem(path));
@@ -198,8 +201,8 @@ const config = {
   preloadScripts,
   styles
 };
-const plugin = definePlugin({
-  name,
+const plugin$1 = definePlugin({
+  name: name$1,
   config,
   transform(transformHooks) {
     var _a;
@@ -214,15 +217,46 @@ const plugin = definePlugin({
     });
     transformHooks.beforeParse.tap((_, context) => {
       enableFeature = () => {
-        context.features[name] = true;
+        context.features[name$1] = true;
       };
     });
     return {
-      styles: (_a = plugin.config) == null ? void 0 : _a.styles
+      styles: (_a = plugin$1.config) == null ? void 0 : _a.styles
     };
   }
 });
-const plugins = [frontmatter, plugin$1, plugin, npmUrl];
+const name = "checkbox";
+const plugin = definePlugin({
+  name,
+  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") {
+                if (token.content.startsWith("[ ]")) {
+                  token.content = `${svg_unmarked} ${token.content.slice(3)}`;
+                } else if (token.content.startsWith("[x]")) {
+                  token.content = `${svg_marked} ${token.content.slice(3)}`;
+                }
+              }
+            }
+          }
+          return false;
+        },
+        {}
+      );
+    });
+    return {};
+  }
+});
+const plugins = [frontmatter, plugin$2, plugin$1, npmUrl, plugin];
 function patchJSItem(urlBuilder, item) {
   if (item.type === "script" && item.data.src) {
     return {
@@ -248,50 +282,19 @@ function patchCSSItem(urlBuilder, item) {
   return item;
 }
 function cleanNode(node) {
-  var _a, _b;
-  if (node.type === "heading") {
-    node.children = node.children.filter((item) => item.type !== "paragraph");
-  } else if (node.type === "list_item") {
-    node.children = node.children.filter((item) => {
-      if (["paragraph", "fence"].includes(item.type)) {
-        if (!node.content) {
-          node.content = item.content;
-          node.payload = {
-            ...node.payload,
-            ...item.payload
-          };
-        }
-        return false;
-      }
-      return true;
-    });
-    if (((_a = node.payload) == null ? void 0 : _a.index) != null) {
-      node.content = `${node.payload.index}. ${node.content}`;
-    }
-  } else if (node.type === "ordered_list") {
-    let index = ((_b = node.payload) == null ? void 0 : _b.startIndex) ?? 1;
-    node.children.forEach((item) => {
-      if (item.type === "list_item") {
-        item.payload = {
-          ...item.payload,
-          index
-        };
-        index += 1;
-      }
-    });
+  while (!node.content && node.children.length === 1) {
+    node = node.children[0];
   }
-  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;
-    }
+  while (node.children.length === 1 && !node.children[0].content) {
+    node = {
+      ...node,
+      children: node.children[0].children
+    };
   }
-}
-function resetDepth(node, depth = 0) {
-  node.depth = depth;
-  node.children.forEach((child) => {
-    resetDepth(child, depth + 1);
-  });
+  return {
+    ...node,
+    children: node.children.map(cleanNode)
+  };
 }
 class Transformer {
   constructor(plugins$1 = plugins) {
@@ -322,100 +325,22 @@ class Transformer {
     this.md = md;
     this.hooks.parser.call(md);
   }
-  buildTree(tokens) {
-    const { md } = this;
-    const root = {
-      type: "root",
-      depth: 0,
-      content: "",
-      children: [],
-      payload: {}
-    };
-    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);
-        if (type === "heading") {
-          depth = token.hLevel;
-          while ((current == null ? void 0 : current.depth) >= depth) {
-            stack.pop();
-            current = stack[stack.length - 1];
-          }
-        } else {
-          depth = Math.max(depth, (current == null ? void 0 : current.depth) || 0) + 1;
-          if (type === "ordered_list") {
-            payload.startIndex = token.order;
-          }
-        }
-        const item = {
-          type,
-          depth,
-          payload,
-          content: "",
-          children: []
-        };
-        current.children.push(item);
-        stack.push(item);
-      } else if (!current) {
-        continue;
-      } else if (token.type === `${current.type}_close`) {
-        if (current.type === "heading") {
-          depth = current.depth;
-        } else {
-          stack.pop();
-          depth = 0;
-        }
-      } else if (token.type === "inline") {
-        const revoke = this.hooks.htmltag.tap((ctx) => {
-          var _a;
-          const comment = (_a = ctx.result) == null ? void 0 : _a.match(/^<!--([\s\S]*?)-->$/);
-          const data = comment == null ? void 0 : comment[1].trim().split(" ");
-          if ((data == null ? void 0 : data[0]) === "fold") {
-            current.payload = {
-              ...current.payload,
-              fold: ["all", "recursively"].includes(data[1]) ? 2 : 1
-            };
-            ctx.result = "";
-          }
-        });
-        const text = md.renderer.render([token], md.options, {});
-        revoke();
-        current.content = `${current.content || ""}${text}`;
-      } else if (token.type === "fence") {
-        const result = md.renderer.render([token], md.options, {});
-        current.children.push({
-          type: token.type,
-          depth: depth + 1,
-          content: result,
-          children: [],
-          payload
-        });
-      } else
-        ;
-    }
-    return root;
-  }
-  transform(content) {
-    var _a;
+  transform(content, opts) {
+    var _a, _b;
     const context = {
       content,
       features: {},
       contentLineOffset: 0
     };
     this.hooks.beforeParse.call(this.md, context);
-    const tokens = this.md.parse(context.content, {});
+    const html = this.md.render(context.content, {});
     this.hooks.afterParse.call(this.md, context);
-    let root = this.buildTree(tokens);
-    cleanNode(root);
-    if (((_a = root.children) == null ? void 0 : _a.length) === 1)
-      root = root.children[0];
-    resetDepth(root);
+    const root = cleanNode(
+      buildTree(html, {
+        ...(_b = (_a = context.frontmatter) == null ? void 0 : _a.markmap) == null ? void 0 : _b.htmlParser,
+        ...opts
+      })
+    );
     return { ...context, root };
   }
   /**
@@ -495,6 +420,8 @@ export {
   Transformer,
   baseJsPaths,
   plugins as builtInPlugins,
+  svg_marked,
+  svg_unmarked,
   template,
   transformerVersions
 };

package/dist/plugins/checkbox.d.ts

@@ -0,0 +1,2 @@
+declare const plugin: import("../types").ITransformPlugin;
+export default plugin;

package/dist/transform.d.ts

@@ -1,7 +1,8 @@
+import { IMarkmapOptions, IPureNode, JSItem, UrlBuilder } from 'markmap-common';
+import { IHtmlParserOptions } from 'markmap-html-parser';
 import { Remarkable } from 'remarkable';
-import { UrlBuilder, JSItem, IMarkmapOptions, IMarkmapJSONOptions, IPureNode } from 'markmap-common';
-import { ITransformResult, ITransformPlugin, IAssets, ITransformHooks, IFeatures, ITransformer } from './types';
 import { plugins as builtInPlugins } from './plugins';
+import { IAssets, IFeatures, ITransformHooks, ITransformPlugin, ITransformResult, ITransformer, IMarkmapJSONOptions } from './types';
 export { builtInPlugins };
 export declare class Transformer implements ITransformer {
     hooks: ITransformHooks;
@@ -10,8 +11,7 @@ export declare class Transformer implements ITransformer {
     urlBuilder: UrlBuilder;
     plugins: ITransformPlugin[];
     constructor(plugins?: Array<ITransformPlugin | (() => ITransformPlugin)>);
-    buildTree(tokens: Remarkable.Token[]): IPureNode;
-    transform(content: string): ITransformResult;
+    transform(content: string, opts?: Partial<IHtmlParserOptions>): ITransformResult;
     /**
      * Get all assets from enabled plugins or filter them by plugin names as keys.
      */

package/dist/types.d.ts

@@ -1,5 +1,7 @@
+import { CSSItem, Hook, IPureNode, IWrapContext, JSItem, UrlBuilder } from 'markmap-common';
+import { IHtmlParserOptions } from 'markmap-html-parser';
+import { IMarkmapJSONOptions as IMarkmapJSONOptionsForView } from 'markmap-view';
 import type { Remarkable } from 'remarkable';
-import { UrlBuilder, CSSItem, JSItem, IPureNode, IWrapContext, Hook, IMarkmapJSONOptions } from 'markmap-common';
 type Htmltag = Remarkable.Rule<Remarkable.HtmlTagToken, string>;
 export interface ITransformHooks {
     transformer: ITransformer;
@@ -45,6 +47,9 @@ export interface IFeatures {
 export interface ITransformer {
     urlBuilder: UrlBuilder;
 }
+export interface IMarkmapJSONOptions extends IMarkmapJSONOptionsForView {
+    htmlParser?: Partial<IHtmlParserOptions>;
+}
 export interface ITransformContext {
     features: IFeatures;
     content: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markmap-lib",
-  "version": "0.15.8",
+  "version": "0.15.9-alpha.5+c64866f",
   "description": "Visualize your Markdown as mindmaps with Markmap",
   "author": "Gerald <gera2ld@live.com>",
   "license": "MIT",
@@ -47,8 +47,8 @@
   "devDependencies": {
     "@highlightjs/cdn-assets": "^11.8.0",
     "@types/remarkable": "^2.0.3",
-    "markmap-common": "0.15.6",
-    "markmap-view": "0.15.8",
+    "markmap-common": "0.15.9-alpha.5+c64866f",
+    "markmap-view": "0.15.9-alpha.5+c64866f",
     "webfontloader": "^1.6.28"
   },
   "dependencies": {
@@ -56,6 +56,7 @@
     "highlight.js": "^11.8.0",
     "js-yaml": "^4.1.0",
     "katex": "^0.16.8",
+    "markmap-html-parser": "0.15.9-alpha.5+c64866f",
     "prismjs": "^1.29.0",
     "remarkable": "^2.0.1",
     "remarkable-katex": "^1.2.1"
@@ -73,5 +74,5 @@
       ]
     }
   },
-  "gitHead": "d5a29ab4064a5496f879de04d730d7192461d3c5"
+  "gitHead": "c64866fb4873a99923be18ea70715aa49a6dabef"
 }