markmap-cli 0.14.4 → 0.15.0-alpha.0

package/dist/index.js

@@ -1,26 +1,19 @@
-/*! markmap-cli v0.14.4 | MIT License */
+/*! markmap-cli v0.15.0-alpha.0 | MIT License */
 'use strict';
 
 var fs = require('fs');
 var commander = require('commander');
 var open = require('open');
 var markmapLib = require('markmap-lib');
+var markmapCommon = require('markmap-common');
 var events = require('events');
 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; }
-
-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.14.4";
-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`;
-
+const TOOLBAR_VERSION = "0.15.0-alpha.0";
+const TOOLBAR_CSS = `markmap-toolbar@${TOOLBAR_VERSION}/dist/style.min.css`;
+const TOOLBAR_JS = `markmap-toolbar@${TOOLBAR_VERSION}/dist/index.umd.min.js`;
 const renderToolbar = () => {
   const {
     markmap,
@@ -32,21 +25,10 @@ const renderToolbar = () => {
   el.setAttribute('style', 'position:absolute;bottom:20px;right:20px');
   document.body.append(el);
 };
-
 function addToolbar(assets) {
   return {
-    styles: [...(assets.styles || []), {
-      type: 'stylesheet',
-      data: {
-        href: `https://cdn.jsdelivr.net/${TOOLBAR_CSS}`
-      }
-    }],
-    scripts: [...(assets.scripts || []), {
-      type: 'script',
-      data: {
-        src: `https://cdn.jsdelivr.net/${TOOLBAR_JS}`
-      }
-    }, {
+    styles: [...(assets.styles || []), ...[TOOLBAR_CSS].map(markmapCommon.buildCSSItem)],
+    scripts: [...(assets.scripts || []), ...[TOOLBAR_JS].map(markmapCommon.buildJSItem), {
       type: 'iife',
       data: {
         fn: r => {
@@ -64,25 +46,18 @@ class Defer {
       this.reject = reject;
     });
   }
-
 }
 
 /* eslint-disable max-classes-per-file */
-
-function consecutive(fn) {
+function sequence(fn) {
   let promise;
   return () => {
-    if (!promise) {
-      promise = fn();
-      promise.catch(() => {}).then(() => {
-        promise = null;
-      });
-    }
-
+    promise || (promise = fn().finally(() => {
+      promise = null;
+    }));
     return promise;
   };
 }
-
 class BufferContentProvider {
   constructor() {
     this.deferredSet = new Set();
@@ -100,24 +75,20 @@ class BufferContentProvider {
       });
     });
   }
-
   async getUpdate(ts, timeout = 10000) {
     const deferred = new Defer();
     this.deferredSet.add(deferred);
     setTimeout(() => {
       this.feed({}, deferred);
     }, timeout);
-
     if (ts < this.ts) {
       this.feed({
         ts: this.ts,
         content: this.content
       }, deferred);
     }
-
     return deferred.promise;
   }
-
   feed(data, deferred) {
     if (deferred) {
       deferred.resolve(data);
@@ -126,45 +97,37 @@ class BufferContentProvider {
       for (const d of this.deferredSet) {
         d.resolve(data);
       }
-
       this.deferredSet.clear();
     }
   }
-
   setCursor(line) {
     this.line = line;
     this.events.emit('cursor');
   }
-
   setContent(content) {
     this.ts = Date.now();
     this.content = content;
     this.events.emit('content');
   }
-
-  dispose() {}
-
+  dispose() {
+    /* noop */
+  }
 }
-
 class FileSystemProvider extends BufferContentProvider {
   constructor(fileName) {
     super();
     this.fileName = fileName;
-    this.watcher = chokidar__default.watch(fileName).on('all', consecutive(() => this.update()));
+    this.watcher = chokidar.watch(fileName).on('all', sequence(() => this.update()));
   }
-
   async update() {
     const content = await fs.promises.readFile(this.fileName, 'utf8');
     this.setContent(content);
   }
-
   dispose() {
     super.dispose();
     this.watcher.close();
   }
-
 }
-
 function startServer(paddingBottom) {
   let ts = 0;
   const {
@@ -172,30 +135,28 @@ function startServer(paddingBottom) {
     markmap
   } = window;
   refresh();
-
   function refresh() {
     fetch(`/data?ts=${ts}`).then(res => res.json()).then(res => {
       if (res.ts && res.ts > ts && res.result) {
         const {
           root,
-          frontmatter
+          frontmatter,
+          contentLineOffset
         } = res.result;
         mm.setOptions(markmap.deriveOptions(frontmatter == null ? void 0 : frontmatter.markmap));
         mm.setData(root);
         if (!ts) mm.fit();
         ts = res.ts;
       }
-
       setTimeout(refresh, 300);
     });
   }
 }
-
 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 app = new Koa__default();
+  const app = new Koa();
   app.use(async (ctx, next) => {
     if (ctx.path === '/') {
       ctx.body = html;
@@ -212,31 +173,27 @@ function setUpServer(transformer, provider, options) {
     }
   });
   const handle = app.callback();
-  const server = http__default.createServer(handle);
+  const server = http.createServer(handle);
   server.listen(() => {
     const {
       port
     } = server.address();
     console.info(`Listening at http://localhost:${port}`);
-    if (options.open) open__default(`http://localhost:${port}`);
+    if (options.open) open(`http://localhost:${port}`);
   });
   let closing;
   return {
     provider,
-
     close() {
       if (!closing) {
         closing = new Promise((resolve, reject) => server.close(err => {
           if (err) reject(err);else resolve();
         }));
       }
-
       return closing;
     }
-
   };
 }
-
 async function develop(fileName, options) {
   const transformer = new markmapLib.Transformer();
   const provider = fileName ? new FileSystemProvider(fileName) : new BufferContentProvider();
@@ -257,14 +214,13 @@ async function createMarkmap(options) {
   });
   const output = options.output || 'markmap.html';
   await fs.promises.writeFile(output, html, 'utf8');
-  if (options.open) open__default(output);
+  if (options.open) open(output);
 }
 function main(version) {
   const program = new commander.Command();
   program.version(version).description('Create a markmap from a Markdown input file').arguments('<input>').option('--no-open', 'do not open the output file after generation').option('--no-toolbar', 'do not show toolbar').option('-o, --output <output>', 'specify filename of the output HTML').option('-w, --watch', 'watch the input file and update output on the fly, note that this feature is for development only').action(async (input, cmd) => {
     const content = await fs.promises.readFile(input, 'utf8');
     const output = cmd.output || `${input.replace(/\.\w*$/, '')}.html`;
-
     if (cmd.watch) {
       await develop(input, {
         open: cmd.open,
@@ -285,6 +241,6 @@ function main(version) {
 exports.createMarkmap = createMarkmap;
 exports.develop = develop;
 exports.main = main;
-for (var k in markmapLib) {
-if (k !== 'default' && !exports.hasOwnProperty(k)) exports[k] = markmapLib[k];
-}
+Object.keys(markmapLib).forEach(function (k) {
+if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) exports[k] = markmapLib[k];
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markmap-cli",
-  "version": "0.14.4",
+  "version": "0.15.0-alpha.0",
   "description": "Create markmaps from CLI",
   "author": "Gerald <gera2ld@live.com>",
   "license": "MIT",
@@ -12,14 +12,14 @@
     "markdown",
     "mindmap"
   ],
-  "homepage": "https://github.com/gera2ld/markmap/packages/markmap-cli#readme",
+  "homepage": "https://github.com/markmap/markmap/packages/markmap-cli#readme",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/gera2ld/markmap.git"
+    "url": "git+https://github.com/markmap/markmap.git"
   },
   "scripts": {
     "dev": "rollup -wc rollup.conf.js",
@@ -28,7 +28,7 @@
     "build:js": "rollup -c rollup.conf.js"
   },
   "bugs": {
-    "url": "https://github.com/gera2ld/markmap/issues"
+    "url": "https://github.com/markmap/markmap/issues"
   },
   "main": "dist/index.js",
   "files": [
@@ -42,16 +42,14 @@
     "chokidar": "^3.5.1",
     "commander": "^7.1.0",
     "koa": "^2.13.1",
-    "markmap-common": "^0.14.2",
-    "markmap-lib": "^0.14.4",
+    "markmap-common": "0.15.0-alpha.0",
+    "markmap-lib": "0.15.0-alpha.0",
     "open": "^8.0.3",
     "update-notifier": "^5.1.0"
   },
   "devDependencies": {
-    "markmap-view": "^0.14.4"
+    "markmap-toolbar": "0.15.0-alpha.0",
+    "markmap-view": "0.15.0-alpha.0"
   },
-  "engines": {
-    "node": ">=10"
-  },
-  "gitHead": "8eb2fa223ab85d1a7699d2c9660fdb5fac24acd1"
+  "gitHead": "cea14d4791b8483481a99baa5d256017f52f267c"
 }

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import type { IMarkmapCreateOptions } from 'markmap-lib';
+import { type IMarkmapCreateOptions } from 'markmap-lib';
 import { IDevelopOptions } from './util';
 import { develop } from './dev-server';
 export * from 'markmap-lib';