markmap-lib 0.16.0 → 0.16.1

package/dist/browser/index.iife.js

@@ -13992,16 +13992,47 @@
   const parse = getParse((content, options, isDocument2, context) => options.xmlMode || options._useHtmlParser2 ? parseDocument(content, options) : parseWithParse5(content, options, isDocument2, context));
   const load$2 = getLoad(parse, (dom, options) => options.xmlMode || options._useHtmlParser2 ? render$1(dom, options) : renderWithParse5(dom));
   load$2([]);
+  const defaultSelectorRules = {
+    "div,p": ({ $node }) => ({
+      queue: $node.children()
+    }),
+    "h1,h2,h3,h4,h5,h6": ({ $node, getContent }) => ({
+      ...getContent($node.contents())
+    }),
+    "ul,ol": ({ $node }) => ({
+      queue: $node.children(),
+      nesting: true
+    }),
+    li: ({ $node, getContent }) => {
+      const queue = $node.children().filter("ul,ol");
+      let content;
+      if ($node.contents().first().is("div,p")) {
+        content = getContent($node.children().first());
+      } else {
+        let $contents = $node.contents();
+        const i2 = $contents.index(queue);
+        if (i2 >= 0)
+          $contents = $contents.slice(0, i2);
+        content = getContent($contents);
+      }
+      return {
+        queue,
+        nesting: true,
+        ...content
+      };
+    },
+    "table,pre,p>img:only-child": ({ $node, getContent }) => ({
+      ...getContent($node)
+    })
+  };
+  const defaultOptions = {
+    selector: "h1,h2,h3,h4,h5,h6,ul,ol,li,table,pre,p>img:only-child",
+    selectorRules: defaultSelectorRules
+  };
   const MARKMAP_COMMENT_PREFIX = "markmap: ";
   const SELECTOR_HEADING = /^h[1-6]$/;
   const SELECTOR_LIST = /^[uo]l$/;
   const SELECTOR_LIST_ITEM = /^li$/;
-  const defaultOptions = {
-    selector: "h1,h2,h3,h4,h5,h6,ul,ol,li,table,pre,p>img:only-child",
-    selectorWrapper: "div,p",
-    selectorNesting: "ul,ol,li",
-    selectorPreserveTag: "table,pre,img"
-  };
   function getLevel(tagName) {
     if (SELECTOR_HEADING.test(tagName))
       return +tagName[1];
@@ -14028,43 +14059,28 @@
       childrenLevel: 0,
       children: []
     };
-    const elMap = {
-      [id]: $2("<div>")
-    };
     const headingStack = [];
     let skippingHeading = 0;
-    checkNode($root);
-    walkTree(rootNode, (node, next2) => {
-      next2();
-      const $el = elMap[node.id];
-      $el.contents().each((_, child) => {
-        if (child.type === "comment") {
-          const data22 = child.data.trim();
-          if (data22.startsWith(MARKMAP_COMMENT_PREFIX)) {
-            node.comments || (node.comments = []);
-            node.comments.push(data22.slice(MARKMAP_COMMENT_PREFIX.length).trim());
-            $2(child).remove();
-          }
-        }
-      });
-      const data2 = $el.data();
-      if (data2 && Object.keys(data2).length) {
-        node.data = data2;
-      }
-      node.html = (($el.is(options.selectorPreserveTag) ? $2.html($el) : $el.html()) || "").trimEnd();
-    });
+    checkNodes($root.children());
     return rootNode;
-    function addChild($child, parent2, nesting) {
-      const child = $child[0];
+    function addChild(props) {
+      var _a2;
+      const { parent: parent2 } = props;
       const node = {
         id: ++id,
-        tag: child.tagName,
-        html: "",
-        level: getLevel(child.tagName),
+        tag: props.tagName,
+        level: props.level,
+        html: props.html,
         childrenLevel: 0,
-        children: nesting ? [] : void 0,
+        children: props.nesting ? [] : void 0,
         parent: parent2.id
       };
+      if ((_a2 = props.comments) == null ? void 0 : _a2.length) {
+        node.comments = props.comments;
+      }
+      if (Object.keys(props.data || {}).length) {
+        node.data = props.data;
+      }
       if (parent2.children) {
         if (parent2.childrenLevel === 0 || parent2.childrenLevel > node.level) {
           parent2.children = [];
@@ -14074,7 +14090,6 @@
           parent2.children.push(node);
         }
       }
-      elMap[node.id] = $child;
       return node;
     }
     function getCurrentHeading(level) {
@@ -14084,45 +14099,64 @@
       }
       return heading2 || rootNode;
     }
-    function checkNode($el, node) {
-      $el.children().each((_, child) => {
+    function getContent($node) {
+      var _a2;
+      const result = extractMagicComments($node);
+      const html22 = (_a2 = $2.html(result.$node)) == null ? void 0 : _a2.trimEnd();
+      return { comments: result.comments, html: html22 };
+    }
+    function extractMagicComments($node) {
+      const comments = [];
+      $node = $node.filter((_, child) => {
+        if (child.type === "comment") {
+          const data2 = child.data.trim();
+          if (data2.startsWith(MARKMAP_COMMENT_PREFIX)) {
+            comments.push(data2.slice(MARKMAP_COMMENT_PREFIX.length).trim());
+            return false;
+          }
+        }
+        return true;
+      });
+      return { $node, comments };
+    }
+    function checkNodes($els, node) {
+      $els.each((_, child) => {
+        var _a2;
         const $child = $2(child);
-        if ($child.is(options.selectorWrapper)) {
-          checkNode($child);
+        const rule = (_a2 = Object.entries(options.selectorRules).find(
+          ([selector]) => $child.is(selector)
+        )) == null ? void 0 : _a2[1];
+        const result = rule == null ? void 0 : rule({ $node: $child, $: $2, getContent });
+        if ((result == null ? void 0 : result.queue) && !result.nesting) {
+          checkNodes(result.queue, node);
           return;
         }
-        if (!$child.is(options.selector)) {
-          const level2 = getLevel(child.tagName);
-          if (level2 <= 6) {
-            skippingHeading = level2;
+        const level = getLevel(child.tagName);
+        if (!result) {
+          if (level <= 6) {
+            skippingHeading = level;
           }
           return;
         }
-        const level = getLevel(child.tagName);
-        if (skippingHeading > 0 && level > skippingHeading) {
+        if (skippingHeading > 0 && level > skippingHeading)
           return;
-        }
-        skippingHeading = 0;
-        if ($child.is(options.selectorNesting)) {
-          const childNode2 = addChild(
-            $child,
-            node || getCurrentHeading(level),
-            true
-          );
-          if (childNode2) {
-            checkNode($child, childNode2);
-            $child.remove();
-          }
+        if (!$child.is(options.selector))
           return;
-        }
+        skippingHeading = 0;
         const isHeading = level <= 6;
-        const childNode = addChild(
-          $child,
-          node || getCurrentHeading(level),
-          isHeading
-        );
+        const childNode = addChild({
+          parent: node || getCurrentHeading(level),
+          nesting: !!result.queue || isHeading,
+          tagName: child.tagName,
+          level,
+          html: result.html || "",
+          comments: result.comments,
+          data: $child.data()
+        });
         if (isHeading)
           headingStack.push(childNode);
+        if (result.queue)
+          checkNodes(result.queue, childNode);
       });
     }
   }
@@ -21252,7 +21286,7 @@
     }
   }
   const transformerVersions = {
-    "markmap-lib": "0.16.0"
+    "markmap-lib": "0.16.1"
   };
   exports.Transformer = Transformer;
   exports.builtInPlugins = builtInPlugins;

package/dist/browser/index.mjs

@@ -478,7 +478,7 @@ class Transformer {
   }
 }
 const transformerVersions = {
-  "markmap-lib": "0.16.0"
+  "markmap-lib": "0.16.1"
 };
 export {
   Transformer,

package/dist/index.js

@@ -123,7 +123,7 @@ class Transformer {
   }
 }
 const transformerVersions = {
-  "markmap-lib": "0.16.0"
+  "markmap-lib": "0.16.1"
 };
 exports.Transformer = Transformer;
 exports.builtInPlugins = builtInPlugins;

package/dist/index.mjs

@@ -121,7 +121,7 @@ class Transformer {
   }
 }
 const transformerVersions = {
-  "markmap-lib": "0.16.0"
+  "markmap-lib": "0.16.1"
 };
 export {
   Transformer,

package/dist/index.no-plugins.js

@@ -129,7 +129,7 @@ class Transformer {
   }
 }
 const transformerVersions = {
-  "markmap-lib": "0.16.0"
+  "markmap-lib": "0.16.1"
 };
 exports.Transformer = Transformer;
 exports.builtInPlugins = builtInPlugins;

package/dist/index.no-plugins.mjs

@@ -127,7 +127,7 @@ class Transformer {
   }
 }
 const transformerVersions = {
-  "markmap-lib": "0.16.0"
+  "markmap-lib": "0.16.1"
 };
 export {
   Transformer,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markmap-lib",
-  "version": "0.16.0",
+  "version": "0.16.1",
   "description": "Visualize your Markdown as mindmaps with Markmap",
   "author": "Gerald <gera2ld@live.com>",
   "license": "MIT",
@@ -67,7 +67,7 @@
     "highlight.js": "^11.8.0",
     "js-yaml": "^4.1.0",
     "katex": "^0.16.8",
-    "markmap-html-parser": "0.16.0",
+    "markmap-html-parser": "0.16.1",
     "markmap-view": "0.16.0",
     "prismjs": "^1.29.0",
     "remarkable": "^2.0.1",
@@ -90,5 +90,5 @@
       "^(.*\\.svg)\\?raw$": "$1"
     }
   },
-  "gitHead": "caf3f840ad39c240ba522bfea83c57de62c6cac4"
+  "gitHead": "f10ad62ef03e02a1843484cca51521f48989fab7"
 }