markmap-cli 0.5.3 → 0.13.0

package/README.md

@@ -29,10 +29,9 @@ Create a markmap from a Markdown input file
 
 Options:
   -V, --version          output the version number
-  -o, --output <output>  specify filename of the output HTML
-  --enable-mathjax       enable MathJax support
-  --enable-prism         enable PrismJS support
   --no-open              do not open the output file after generation
+  --no-toolbar           do not show toolbar
+  -o, --output <output>  specify filename of the output HTML
   -w, --watch            watch the input file and update output on the fly, note that this feature is for development only
   -h, --help             display help for command
 ```

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! markmap-cli v0.5.3 | MIT License */
+/*! markmap-cli v0.13.0 | MIT License */
 'use strict';
 
 var fs = require('fs');
@@ -10,14 +10,14 @@ var http = require('http');
 var Koa = require('koa');
 var chokidar = require('chokidar');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e['default'] : e; }
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; }
 
 var open__default = /*#__PURE__*/_interopDefaultLegacy(open);
 var http__default = /*#__PURE__*/_interopDefaultLegacy(http);
 var Koa__default = /*#__PURE__*/_interopDefaultLegacy(Koa);
 var chokidar__default = /*#__PURE__*/_interopDefaultLegacy(chokidar);
 
-const TOOLBAR_VERSION = "0.1.6";
+const TOOLBAR_VERSION = "0.13.0";
 const TOOLBAR_CSS = `npm/markmap-toolbar@${TOOLBAR_VERSION}/dist/style.min.css`;
 const TOOLBAR_JS = `npm/markmap-toolbar@${TOOLBAR_VERSION}/dist/index.umd.min.js`;
 
@@ -59,8 +59,6 @@ function addToolbar(assets) {
 }
 class Defer {
   constructor() {
-    this.resolve = void 0;
-    this.reject = void 0;
     this.promise = new Promise((resolve, reject) => {
       this.resolve = resolve;
       this.reject = reject;
@@ -69,6 +67,8 @@ class Defer {
 
 }
 
+/* eslint-disable max-classes-per-file */
+
 function consecutive(fn) {
   let promise;
   return () => {
@@ -88,8 +88,6 @@ class BufferContentProvider {
     this.deferredSet = new Set();
     this.events = new events.EventEmitter();
     this.ts = 0;
-    this.content = void 0;
-    this.line = void 0;
     this.events.on('content', () => {
       this.feed({
         ts: this.ts,
@@ -152,7 +150,6 @@ class FileSystemProvider extends BufferContentProvider {
   constructor(fileName) {
     super();
     this.fileName = fileName;
-    this.watcher = void 0;
     this.watcher = chokidar__default.watch(fileName).on('all', consecutive(() => this.update()));
   }
 
@@ -170,57 +167,34 @@ class FileSystemProvider extends BufferContentProvider {
 
 function startServer(paddingBottom) {
   let ts = 0;
-  let root;
-  let line;
   const {
-    mm
+    mm,
+    markmap
   } = window;
   refresh();
 
   function refresh() {
     fetch(`/data?ts=${ts}`).then(res => res.json()).then(res => {
       if (res.ts && res.ts > ts && res.result) {
-        mm.setData(root = res.result.root);
+        const {
+          root,
+          frontmatter
+        } = res.result;
+        mm.setOptions(markmap.deriveOptions(frontmatter == null ? void 0 : frontmatter.markmap));
+        mm.setData(root);
         if (!ts) mm.fit();
         ts = res.ts;
-        line = null;
-      }
-
-      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() {
-    let best;
-    dfs(root);
-    return best;
-
-    function dfs(node) {
-      var _node$p, _node$c;
-
-      const lines = (_node$p = node.p) == null ? void 0 : _node$p.lines;
-
-      if (lines && lines[0] <= line && line < lines[1]) {
-        best = node;
-      }
-
-      (_node$c = node.c) == null ? void 0 : _node$c.forEach(dfs);
-    }
-  }
 }
 
 function setUpServer(transformer, provider, options) {
   let assets = transformer.getAssets();
   if (options.toolbar) assets = addToolbar(assets);
-  const html = markmapLib.fillTemplate(null, assets) + `<script>(${startServer.toString()})(${options.toolbar ? 60 : 0})</script>`;
+  const html = `${markmapLib.fillTemplate(null, assets)}<script>(${startServer.toString()})(${options.toolbar ? 60 : 0})</script>`;
   const app = new Koa__default();
   app.use(async (ctx, next) => {
     if (ctx.path === '/') {
@@ -273,11 +247,14 @@ async function createMarkmap(options) {
   const transformer = new markmapLib.Transformer();
   const {
     root,
-    features
+    features,
+    frontmatter
   } = transformer.transform(options.content || '');
   let assets = transformer.getUsedAssets(features);
   if (options.toolbar) assets = addToolbar(assets);
-  const html = markmapLib.fillTemplate(root, assets);
+  const html = markmapLib.fillTemplate(root, assets, {
+    jsonOptions: frontmatter == null ? void 0 : frontmatter.markmap
+  });
   const output = options.output || 'markmap.html';
   await fs.promises.writeFile(output, html, 'utf8');
   if (options.open) open__default(output);
@@ -308,6 +285,6 @@ function main(version) {
 exports.createMarkmap = createMarkmap;
 exports.develop = develop;
 exports.main = main;
-Object.keys(markmapLib).forEach(function (k) {
+for (var k in markmapLib) {
 if (k !== 'default' && !exports.hasOwnProperty(k)) exports[k] = markmapLib[k];
-});
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markmap-cli",
-  "version": "0.5.3",
+  "version": "0.13.0",
   "description": "Create markmaps from CLI",
   "author": "Gerald <gera2ld@live.com>",
   "license": "MIT",
@@ -24,7 +24,6 @@
   "scripts": {
     "dev": "rollup -wc rollup.conf.js",
     "clean": "del-cli dist types",
-    "lint": "eslint --ext .ts .",
     "build:types": "tsc",
     "build:js": "rollup -c rollup.conf.js"
   },
@@ -43,12 +42,12 @@
     "chokidar": "^3.5.1",
     "commander": "^7.1.0",
     "koa": "^2.13.1",
-    "markmap-lib": "^0.11.6",
+    "markmap-lib": "^0.13.0",
     "open": "^8.0.3",
     "update-notifier": "^5.1.0"
   },
   "engines": {
     "node": ">=10"
   },
-  "gitHead": "c9550d629898dc67dc86acaded00a0327e7a2fb0"
+  "gitHead": "4f5096be2e5ee0d666c0868dbb0d163b19b00ffe"
 }

package/types/dev-server.d.ts

@@ -1,17 +1,17 @@
-import { IDevelopOptions } from './util';
-interface IFileUpdate {
-    ts?: number;
-    content?: string;
-    line?: number;
-}
-interface IContentProvider {
-    getUpdate: (ts: number, timeout?: number) => Promise<IFileUpdate>;
-    setContent: (content: string) => void;
-    setCursor: (line: number) => void;
-    dispose: () => void;
-}
-export declare function develop(fileName: string | undefined, options: IDevelopOptions): Promise<{
-    provider: IContentProvider;
-    close(): Promise<void>;
-}>;
-export {};
+import { IDevelopOptions } from './util';
+interface IFileUpdate {
+    ts?: number;
+    content?: string;
+    line?: number;
+}
+interface IContentProvider {
+    getUpdate: (ts: number, timeout?: number) => Promise<IFileUpdate>;
+    setContent: (content: string) => void;
+    setCursor: (line: number) => void;
+    dispose: () => void;
+}
+export declare function develop(fileName: string | undefined, options: IDevelopOptions): Promise<{
+    provider: IContentProvider;
+    close(): Promise<void>;
+}>;
+export {};

package/types/index.d.ts

@@ -1,7 +1,7 @@
-import type { IMarkmapCreateOptions } from 'markmap-lib';
-import { IDevelopOptions } from './util';
-import { develop } from './dev-server';
-export * from 'markmap-lib';
-export { develop };
-export declare function createMarkmap(options: IMarkmapCreateOptions & IDevelopOptions): Promise<void>;
-export declare function main(version: string): void;
+import type { IMarkmapCreateOptions } from 'markmap-lib';
+import { IDevelopOptions } from './util';
+import { develop } from './dev-server';
+export * from 'markmap-lib';
+export { develop };
+export declare function createMarkmap(options: IMarkmapCreateOptions & IDevelopOptions): Promise<void>;
+export declare function main(version: string): void;

package/types/util.d.ts

@@ -1,17 +1,17 @@
-import { IAssets } from 'markmap-lib';
-export interface IDevelopOptions {
-    /**
-     * whether to open the generated markmap in browser
-     */
-    open: boolean;
-    /**
-     * whether to show default toolbar
-     */
-    toolbar: boolean;
-}
-export declare function addToolbar(assets: IAssets): IAssets;
-export declare class Defer<T> {
-    resolve: (value: T) => void;
-    reject: (err: Error) => void;
-    promise: Promise<unknown>;
-}
+import { IAssets } from 'markmap-lib';
+export interface IDevelopOptions {
+    /**
+     * whether to open the generated markmap in browser
+     */
+    open: boolean;
+    /**
+     * whether to show default toolbar
+     */
+    toolbar: boolean;
+}
+export declare function addToolbar(assets: IAssets): IAssets;
+export declare class Defer<T> {
+    resolve: (value: T) => void;
+    reject: (err: Error) => void;
+    promise: Promise<unknown>;
+}