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

package/dist/index.js

@@ -1,19 +1,35 @@
-/*! markmap-cli v0.14.5-alpha.13+50ca560 | MIT License */
+/*! markmap-cli v0.14.5-alpha.16+33e8294 | 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 markmapLib = require('markmap-lib');
+var path = require('path');
 var events = require('events');
 var http = require('http');
 var Koa = require('koa');
 var chokidar = require('chokidar');
 
-const TOOLBAR_VERSION = "0.14.5-alpha.13+50ca560";
-const TOOLBAR_CSS = `markmap-toolbar@${TOOLBAR_VERSION}/dist/style.min.css`;
-const TOOLBAR_JS = `markmap-toolbar@${TOOLBAR_VERSION}/dist/index.umd.min.js`;
+function _extends() {
+  _extends = Object.assign ? Object.assign.bind() : function (target) {
+    for (var i = 1; i < arguments.length; i++) {
+      var source = arguments[i];
+      for (var key in source) {
+        if (Object.prototype.hasOwnProperty.call(source, key)) {
+          target[key] = source[key];
+        }
+      }
+    }
+    return target;
+  };
+  return _extends.apply(this, arguments);
+}
+
+const TOOLBAR_VERSION = "0.14.5-alpha.16+33e8294";
+const TOOLBAR_CSS = `markmap-toolbar@${TOOLBAR_VERSION}/dist/style.css`;
+const TOOLBAR_JS = `markmap-toolbar@${TOOLBAR_VERSION}/dist/index.js`;
 const renderToolbar = () => {
   const {
     markmap,
@@ -27,8 +43,8 @@ const renderToolbar = () => {
 };
 function addToolbar(assets) {
   return {
-    styles: [...(assets.styles || []), ...[TOOLBAR_CSS].map(markmapCommon.buildCSSItem)],
-    scripts: [...(assets.scripts || []), ...[TOOLBAR_JS].map(markmapCommon.buildJSItem), {
+    styles: [...(assets.styles || []), ...[TOOLBAR_CSS].map(path => markmapCommon.buildCSSItem(path))],
+    scripts: [...(assets.scripts || []), ...[TOOLBAR_JS].map(path => markmapCommon.buildJSItem(path)), {
       type: 'iife',
       data: {
         fn: r => {
@@ -39,21 +55,18 @@ function addToolbar(assets) {
     }]
   };
 }
-class Defer {
-  constructor() {
-    this.promise = new Promise((resolve, reject) => {
-      this.resolve = resolve;
-      this.reject = reject;
-    });
-  }
+function localProvider(path) {
+  const parts = path.split('/');
+  parts[0] = parts[0].replace(/@[\d.]+$/, '');
+  path = parts.join('/');
+  return `/node_modules/${path}`;
 }
 
-/* eslint-disable max-classes-per-file */
 function sequence(fn) {
   let promise;
   return () => {
     promise || (promise = fn().finally(() => {
-      promise = null;
+      promise = undefined;
     }));
     return promise;
   };
@@ -63,6 +76,8 @@ class BufferContentProvider {
     this.deferredSet = new Set();
     this.events = new events.EventEmitter();
     this.ts = 0;
+    this.content = '';
+    this.line = -1;
     this.events.on('content', () => {
       this.feed({
         ts: this.ts,
@@ -76,7 +91,7 @@ class BufferContentProvider {
     });
   }
   async getUpdate(ts, timeout = 10000) {
-    const deferred = new Defer();
+    const deferred = markmapCommon.defer();
     this.deferredSet.add(deferred);
     setTimeout(() => {
       this.feed({}, deferred);
@@ -169,6 +184,17 @@ function setUpServer(transformer, provider, options) {
         line: update.line
       };
     } else {
+      if (ctx.path.startsWith('/node_modules/')) {
+        const relpath = ctx.path.slice(14);
+        try {
+          const realpath = require.resolve(relpath);
+          ctx.type = path.extname(relpath);
+          ctx.body = fs.createReadStream(realpath);
+          return;
+        } catch (_unused) {
+          // ignore
+        }
+      }
       await next();
     }
   });
@@ -195,12 +221,42 @@ function setUpServer(transformer, provider, options) {
   };
 }
 async function develop(fileName, options) {
+  markmapCommon.setProvider('local', localProvider);
   const transformer = new markmapLib.Transformer();
   const provider = fileName ? new FileSystemProvider(fileName) : new BufferContentProvider();
   return setUpServer(transformer, provider, options);
 }
 
+async function loadFile(path) {
+  if (path.startsWith('/node_modules/')) {
+    const relpath = path.slice(14);
+    return fs.promises.readFile(require.resolve(relpath), 'utf8');
+  }
+  const res = await fetch(path);
+  if (!res.ok) throw res;
+  return res.text();
+}
+async function inlineAssets(assets) {
+  const [scripts, styles] = await Promise.all([Promise.all((assets.scripts || []).map(async item => item.type === 'script' && item.data.src ? {
+    type: 'script',
+    data: {
+      textContent: await loadFile(item.data.src)
+    }
+  } : item)), Promise.all((assets.styles || []).map(async item => item.type === 'stylesheet' ? {
+    type: 'style',
+    data: await loadFile(item.data.href)
+  } : item))]);
+  return {
+    scripts,
+    styles
+  };
+}
 async function createMarkmap(options) {
+  if (options.offline) {
+    markmapCommon.setProvider('local', localProvider);
+  } else {
+    await markmapCommon.findFastestProvider();
+  }
   const transformer = new markmapLib.Transformer();
   const {
     root,
@@ -208,8 +264,17 @@ async function createMarkmap(options) {
     frontmatter
   } = transformer.transform(options.content || '');
   let assets = transformer.getUsedAssets(features);
-  if (options.toolbar) assets = addToolbar(assets);
+  assets = _extends({}, assets, {
+    scripts: [...markmapLib.baseJsPaths.map(path => markmapCommon.buildJSItem(path)), ...(assets.scripts || [])]
+  });
+  if (options.toolbar) {
+    assets = addToolbar(assets);
+  }
+  if (options.offline) {
+    assets = await inlineAssets(assets);
+  }
   const html = markmapLib.fillTemplate(root, assets, {
+    baseJs: [],
     jsonOptions: frontmatter == null ? void 0 : frontmatter.markmap
   });
   const output = options.output || 'markmap.html';
@@ -218,20 +283,22 @@ async function createMarkmap(options) {
 }
 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) => {
+  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('--offline', 'Inline all assets to allow the generated HTML to work offline').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,
-        toolbar: cmd.toolbar
+        toolbar: cmd.toolbar,
+        offline: true
       });
     } else {
       await createMarkmap({
         content,
         output,
         open: cmd.open,
-        toolbar: cmd.toolbar
+        toolbar: cmd.toolbar,
+        offline: cmd.offline
       });
     }
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markmap-cli",
-  "version": "0.14.5-alpha.13+50ca560",
+  "version": "0.14.5-alpha.16+33e8294",
   "description": "Create markmaps from CLI",
   "author": "Gerald <gera2ld@live.com>",
   "license": "MIT",
@@ -41,15 +41,17 @@
     "@babel/runtime": "^7.13.10",
     "chokidar": "^3.5.1",
     "commander": "^7.1.0",
+    "d3": "^6.2.0",
+    "katex": "^0.16.0",
     "koa": "^2.13.1",
-    "markmap-common": "0.14.5-alpha.13+50ca560",
-    "markmap-lib": "0.14.5-alpha.13+50ca560",
+    "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",
     "open": "^8.0.3",
-    "update-notifier": "^5.1.0"
+    "prismjs": "^1.28.0",
+    "update-notifier": "^5.1.0",
+    "webfontloader": "^1.6.28"
   },
-  "devDependencies": {
-    "markmap-toolbar": "0.14.5-alpha.13+50ca560",
-    "markmap-view": "0.14.5-alpha.13+50ca560"
-  },
-  "gitHead": "50ca5603019498f93dba6485c96d0a5630b221e5"
+  "gitHead": "33e8294050d7438f6cdadd5bf06a665560585195"
 }

package/types/util.d.ts

@@ -1,17 +1,18 @@
 import { IAssets } from 'markmap-lib';
 export interface IDevelopOptions {
     /**
-     * whether to open the generated markmap in browser
+     * Whether to open the generated markmap in browser
      */
     open: boolean;
     /**
-     * whether to show default toolbar
+     * Whether to show the default toolbar
      */
     toolbar: boolean;
+    /**
+     * Whether to inline all assets to make the HTML work offline.
+     * Ignored in watching mode.
+     */
+    offline: boolean;
 }
 export declare function addToolbar(assets: IAssets): IAssets;
-export declare class Defer<T> {
-    resolve: (value: T) => void;
-    reject: (err: Error) => void;
-    promise: Promise<unknown>;
-}
+export declare function localProvider(path: string): string;