markmap-cli 0.14.5-alpha.16 → 0.14.5-alpha.18

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! markmap-cli v0.14.5-alpha.16+33e8294 | MIT License */
+/*! markmap-cli v0.14.5-alpha.18+44c9639 | MIT License */
 'use strict';
 
 var fs = require('fs');
@@ -27,7 +27,7 @@ function _extends() {
   return _extends.apply(this, arguments);
 }
 
-const TOOLBAR_VERSION = "0.14.5-alpha.16+33e8294";
+const TOOLBAR_VERSION = "0.14.5-alpha.18+44c9639";
 const TOOLBAR_CSS = `markmap-toolbar@${TOOLBAR_VERSION}/dist/style.css`;
 const TOOLBAR_JS = `markmap-toolbar@${TOOLBAR_VERSION}/dist/index.js`;
 const renderToolbar = () => {
@@ -55,9 +55,18 @@ function addToolbar(assets) {
     }]
   };
 }
+function removeVersionString(part) {
+  return part.replace(/@.+$/, '');
+}
 function localProvider(path) {
   const parts = path.split('/');
-  parts[0] = parts[0].replace(/@[\d.]+$/, '');
+  // xxx@0.0.0-alpha.0+aaaaaa
+  // @scope/xxx@0.0.0-alpha.0+aaaaaa
+  if (parts[0].startsWith('@')) {
+    parts[1] = removeVersionString(parts[1]);
+  } else {
+    parts[0] = removeVersionString(parts[0]);
+  }
   path = parts.join('/');
   return `/node_modules/${path}`;
 }
@@ -145,6 +154,9 @@ class FileSystemProvider extends BufferContentProvider {
 }
 function startServer(paddingBottom) {
   let ts = 0;
+  let root;
+  let line;
+  let offset = 0;
   const {
     mm,
     markmap
@@ -153,19 +165,43 @@ function startServer(paddingBottom) {
   function refresh() {
     fetch(`/data?ts=${ts}`).then(res => res.json()).then(res => {
       if (res.ts && res.ts > ts && res.result) {
-        const {
+        var _frontmatter;
+        let frontmatter;
+        ({
           root,
           frontmatter,
-          contentLineOffset
-        } = res.result;
-        mm.setOptions(markmap.deriveOptions(frontmatter == null ? void 0 : frontmatter.markmap));
+          contentLineOffset: offset
+        } = res.result);
+        mm.setOptions(markmap.deriveOptions((_frontmatter = frontmatter) == null ? void 0 : _frontmatter.markmap));
         mm.setData(root);
         if (!ts) mm.fit();
         ts = res.ts;
+        line = -1;
+      }
+      if (root && res.line != null && line !== res.line) {
+        line = res.line;
+        const active = findActiveNode();
+        if (active) mm.ensureView(active, {
+          bottom: paddingBottom
+        });
       }
       setTimeout(refresh, 300);
     });
   }
+  function findActiveNode() {
+    const lineWithoutFrontmatter = line - offset;
+    let best;
+    dfs(root);
+    return best;
+    function dfs(node) {
+      var _node$payload, _node$children;
+      const lines = (_node$payload = node.payload) == null ? void 0 : _node$payload.lines;
+      if (lines && lines[0] <= lineWithoutFrontmatter && lineWithoutFrontmatter < lines[1]) {
+        best = node;
+      }
+      (_node$children = node.children) == null ? void 0 : _node$children.forEach(dfs);
+    }
+  }
 }
 function setUpServer(transformer, provider, options) {
   let assets = transformer.getAssets();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markmap-cli",
-  "version": "0.14.5-alpha.16+33e8294",
+  "version": "0.14.5-alpha.18+44c9639",
   "description": "Create markmaps from CLI",
   "author": "Gerald <gera2ld@live.com>",
   "license": "MIT",
@@ -44,14 +44,14 @@
     "d3": "^6.2.0",
     "katex": "^0.16.0",
     "koa": "^2.13.1",
-    "markmap-common": "0.14.5-alpha.16+33e8294",
-    "markmap-lib": "0.14.5-alpha.16+33e8294",
-    "markmap-toolbar": "0.14.5-alpha.16+33e8294",
-    "markmap-view": "0.14.5-alpha.16+33e8294",
+    "markmap-common": "0.14.5-alpha.18+44c9639",
+    "markmap-lib": "0.14.5-alpha.18+44c9639",
+    "markmap-toolbar": "0.14.5-alpha.18+44c9639",
+    "markmap-view": "0.14.5-alpha.18+44c9639",
     "open": "^8.0.3",
     "prismjs": "^1.28.0",
     "update-notifier": "^5.1.0",
     "webfontloader": "^1.6.28"
   },
-  "gitHead": "33e8294050d7438f6cdadd5bf06a665560585195"
+  "gitHead": "44c96396827295d0b30c41404b95f688e3bff1e6"
 }