markmap-cli 0.15.5-alpha.1 → 0.15.6-alpha.4

package/dist/fetch-assets.d.ts

@@ -0,0 +1 @@
+export declare function fetchAssets(): Promise<void>;

package/{types → dist}/index.d.ts

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

package/dist/index.js

@@ -1,139 +1,101 @@
-/*! markmap-cli v0.15.5-alpha.1+013bf59 | MIT License */
-import { readFile, writeFile } from 'fs/promises';
-import { fileURLToPath } from 'url';
-import { Command } from 'commander';
-import open from 'open';
-import updateNotifier from 'update-notifier';
-import { readPackageUp } from 'read-pkg-up';
-import { buildCSSItem, buildJSItem, defer } from 'markmap-common';
-import { Transformer, baseJsPaths } from 'markmap-lib';
-export * from 'markmap-lib';
-import { join, extname } from 'path';
-import { createRequire } from 'module';
-import { packageDirectory } from 'pkg-dir';
-import { createReadStream } from 'fs';
-import { EventEmitter } from 'events';
-import http from 'http';
-import Koa from 'koa';
-import chokidar from 'chokidar';
-
-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.15.5-alpha.1";
+import { readFile, stat, mkdir, writeFile } from "fs/promises";
+import { resolve, extname, dirname } from "path";
+import { fileURLToPath } from "url";
+import { Command } from "commander";
+import open from "open";
+import updateNotifier from "update-notifier";
+import { readPackageUp } from "read-pkg-up";
+import { buildCSSItem, buildJSItem, defer } from "markmap-common";
+import { Transformer, baseJsPaths } from "markmap-lib";
+export * from "markmap-lib";
+import { packageDirectory } from "pkg-dir";
+import { createReadStream, createWriteStream } from "fs";
+import { EventEmitter } from "events";
+import http from "http";
+import Koa from "koa";
+import chokidar from "chokidar";
+import { Readable } from "stream";
+import { finished } from "stream/promises";
+const TOOLBAR_VERSION = "0.15.6-alpha.4";
 const TOOLBAR_CSS = `markmap-toolbar@${TOOLBAR_VERSION}/dist/style.css`;
 const TOOLBAR_JS = `markmap-toolbar@${TOOLBAR_VERSION}/dist/index.js`;
+const ASSETS_PREFIX = "/assets/";
 const renderToolbar = () => {
-  const {
-    markmap,
-    mm
-  } = window;
+  const { markmap, mm } = window;
   const toolbar = new markmap.Toolbar();
   toolbar.attach(mm);
   const el = toolbar.render();
-  el.setAttribute('style', 'position:absolute;bottom:20px;right:20px');
+  el.setAttribute("style", "position:absolute;bottom:20px;right:20px");
   document.body.append(el);
 };
-function addToolbar(transformer, assets) {
+function addToolbar(urlBuilder, assets) {
   return {
-    styles: [...(assets.styles || []), ...[TOOLBAR_CSS].map(path => transformer.urlBuilder.getFullUrl(path)).map(path => buildCSSItem(path))],
-    scripts: [...(assets.scripts || []), ...[TOOLBAR_JS].map(path => transformer.urlBuilder.getFullUrl(path)).map(path => buildJSItem(path)), {
-      type: 'iife',
-      data: {
-        fn: r => {
-          setTimeout(r);
-        },
-        getParams: () => [renderToolbar]
+    styles: [
+      ...assets.styles || [],
+      ...[TOOLBAR_CSS].map((path) => urlBuilder.getFullUrl(path)).map((path) => buildCSSItem(path))
+    ],
+    scripts: [
+      ...assets.scripts || [],
+      ...[TOOLBAR_JS].map((path) => urlBuilder.getFullUrl(path)).map((path) => buildJSItem(path)),
+      {
+        type: "iife",
+        data: {
+          fn: (r) => {
+            setTimeout(r);
+          },
+          getParams: () => [renderToolbar]
+        }
       }
-    }]
+    ]
   };
 }
-function removeVersionString(part) {
-  return part.replace(/@.+$/, '');
-}
 function localProvider(path) {
-  const parts = path.split('/');
-  // 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}`;
-}
-const require = createRequire(import.meta.url);
-async function doResolveFile(relpath) {
-  const parts = relpath.split('/');
-  const nameOffset = parts[0].startsWith('@') ? 2 : 1;
-  const name = parts.slice(0, nameOffset).join('/');
-  const filepath = parts.slice(nameOffset).join('/');
-  const mainPath = require.resolve(name);
-  const pkgDir = await packageDirectory({
-    cwd: mainPath
-  });
-  if (!pkgDir) throw new Error(`File not found: ${relpath}`);
-  const realpath = join(pkgDir, filepath);
-  return realpath;
-}
-const cache = {};
-function resolveFile(relpath) {
-  cache[relpath] || (cache[relpath] = doResolveFile(relpath));
-  return cache[relpath];
+  return `${ASSETS_PREFIX}${path}`;
 }
-
+const rootDirPromise = packageDirectory({
+  cwd: new URL(import.meta.url).pathname
+});
+const assetsDirPromise = rootDirPromise.then((rootDir) => {
+  if (!rootDir)
+    throw new Error("Could not find root dir");
+  return resolve(rootDir, `.${ASSETS_PREFIX}`);
+});
 function sequence(fn) {
   let promise;
   return () => {
     promise || (promise = fn().finally(() => {
-      promise = undefined;
+      promise = void 0;
     }));
     return promise;
   };
 }
 class BufferContentProvider {
   constructor() {
-    this.deferredSet = new Set();
+    this.deferredSet = /* @__PURE__ */ new Set();
     this.events = new EventEmitter();
     this.ts = 0;
-    this.content = '';
+    this.content = "";
     this.line = -1;
-    this.events.on('content', () => {
+    this.events.on("content", () => {
       this.feed({
         ts: this.ts,
         content: this.content
       });
     });
-    this.events.on('cursor', () => {
+    this.events.on("cursor", () => {
       this.feed({
         line: this.line
       });
     });
   }
-  async getUpdate(ts, timeout = 10000) {
+  async getUpdate(ts, timeout = 1e4) {
     const deferred = defer();
     this.deferredSet.add(deferred);
     setTimeout(() => {
       this.feed({}, deferred);
     }, timeout);
     if (ts < this.ts) {
-      this.feed({
-        ts: this.ts,
-        content: this.content
-      }, deferred);
+      this.feed({ ts: this.ts, content: this.content }, deferred);
     }
     return deferred.promise;
   }
@@ -150,25 +112,27 @@ class BufferContentProvider {
   }
   setCursor(line) {
     this.line = line;
-    this.events.emit('cursor');
+    this.events.emit("cursor");
   }
   setContent(content) {
     this.ts = Date.now();
     this.content = content;
-    this.events.emit('content');
+    this.events.emit("content");
   }
   dispose() {
-    /* noop */
   }
 }
 class FileSystemProvider extends BufferContentProvider {
   constructor(fileName) {
     super();
     this.fileName = fileName;
-    this.watcher = chokidar.watch(fileName).on('all', sequence(() => this.update()));
+    this.watcher = chokidar.watch(fileName).on(
+      "all",
+      sequence(() => this.update())
+    );
   }
   async update() {
-    const content = await readFile(this.fileName, 'utf8');
+    const content = await readFile(this.fileName, "utf8");
     this.setContent(content);
   }
   dispose() {
@@ -181,33 +145,25 @@ function startServer(paddingBottom) {
   let root;
   let line;
   let offset = 0;
-  const {
-    mm,
-    markmap
-  } = window;
+  const { mm, markmap } = window;
   refresh();
   function refresh() {
-    fetch(`/data?ts=${ts}`).then(res => res.json()).then(res => {
+    fetch(`/data?ts=${ts}`).then((res) => res.json()).then((res) => {
       if (res.ts && res.ts > ts && res.result) {
-        var _frontmatter;
         let frontmatter;
-        ({
-          root,
-          frontmatter,
-          contentLineOffset: offset
-        } = res.result);
-        mm.setOptions(markmap.deriveOptions((_frontmatter = frontmatter) == null ? void 0 : _frontmatter.markmap));
+        ({ root, frontmatter, contentLineOffset: offset } = res.result);
+        mm.setOptions(markmap.deriveOptions(frontmatter == null ? void 0 : frontmatter.markmap));
         mm.setData(root);
-        if (!ts) mm.fit();
+        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
-        });
+        if (active)
+          mm.ensureView(active, { bottom: paddingBottom });
       }
       setTimeout(refresh, 300);
     });
@@ -218,36 +174,37 @@ function startServer(paddingBottom) {
     dfs(root);
     return best;
     function dfs(node) {
-      var _node$payload, _node$children;
-      const lines = (_node$payload = node.payload) == null ? void 0 : _node$payload.lines;
+      var _a, _b;
+      const lines = (_a = node.payload) == null ? void 0 : _a.lines;
       if (lines && lines[0] <= lineWithoutFrontmatter && lineWithoutFrontmatter < lines[1]) {
         best = node;
       }
-      (_node$children = node.children) == null || _node$children.forEach(dfs);
+      (_b = node.children) == null ? void 0 : _b.forEach(dfs);
     }
   }
 }
 function setUpServer(transformer, provider, options) {
   let assets = transformer.getAssets();
-  if (options.toolbar) assets = addToolbar(transformer, assets);
-  const html = `${transformer.fillTemplate(null, assets)}<script>(${startServer.toString()})(${options.toolbar ? 60 : 0})</script>`;
+  if (options.toolbar)
+    assets = addToolbar(transformer.urlBuilder, assets);
+  const html = `${transformer.fillTemplate(
+    null,
+    assets
+  )}<script>(${startServer.toString()})(${options.toolbar ? 60 : 0})<\/script>`;
   const app = new Koa();
   app.use(async (ctx, next) => {
-    if (ctx.path === '/') {
+    if (ctx.path === "/") {
       ctx.body = html;
-    } else if (ctx.path === '/data') {
+    } else if (ctx.path === "/data") {
       const update = await provider.getUpdate(ctx.query.ts);
-      const result = update.content == null ? null : transformer.transform(update.content || '');
-      ctx.body = {
-        ts: update.ts,
-        result,
-        line: update.line
-      };
+      const result = update.content == null ? null : transformer.transform(update.content || "");
+      ctx.body = { ts: update.ts, result, line: update.line };
     } else {
-      if (ctx.path.startsWith('/node_modules/')) {
-        const relpath = ctx.path.slice(14);
+      if (ctx.path.startsWith(ASSETS_PREFIX)) {
+        const relpath = ctx.path.slice(ASSETS_PREFIX.length);
+        const assetsDir = await assetsDirPromise;
         try {
-          const realpath = await resolveFile(relpath);
+          const realpath = resolve(assetsDir, relpath);
           ctx.type = extname(relpath);
           ctx.body = createReadStream(realpath);
           return;
@@ -261,20 +218,24 @@ function setUpServer(transformer, provider, options) {
   const handle = app.callback();
   const server = http.createServer(handle);
   server.listen(() => {
-    const {
-      port
-    } = server.address();
+    const { port } = server.address();
     console.info(`Listening at http://localhost:${port}`);
-    if (options.open) open(`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();
-        }));
+        closing = new Promise(
+          (resolve2, reject) => server.close((err) => {
+            if (err)
+              reject(err);
+            else
+              resolve2();
+          })
+        );
       }
       return closing;
     }
@@ -282,31 +243,91 @@ function setUpServer(transformer, provider, options) {
 }
 async function develop(fileName, options) {
   const transformer = new Transformer();
-  transformer.urlBuilder.setProvider('local', localProvider);
-  transformer.urlBuilder.provider = 'local';
+  transformer.urlBuilder.setProvider("local", localProvider);
+  transformer.urlBuilder.provider = "local";
   const provider = fileName ? new FileSystemProvider(fileName) : new BufferContentProvider();
   return setUpServer(transformer, provider, options);
 }
-
+const providerName = "local-hook";
+async function fetchAssets() {
+  var _a, _b;
+  const transformer = new Transformer();
+  const { provider } = transformer.urlBuilder;
+  transformer.urlBuilder.setProvider(providerName, localProvider);
+  transformer.urlBuilder.provider = providerName;
+  let assets = transformer.getAssets();
+  assets = addToolbar(transformer.urlBuilder, assets);
+  delete transformer.urlBuilder.providers[providerName];
+  transformer.urlBuilder.provider = provider;
+  const pluginPaths = [
+    ...((_a = assets.scripts) == null ? void 0 : _a.map(
+      (item) => item.type === "script" && item.data.src || ""
+    )) || [],
+    ...((_b = assets.styles) == null ? void 0 : _b.map(
+      (item) => item.type === "stylesheet" && item.data.href || ""
+    )) || []
+  ].filter((url) => url.startsWith(ASSETS_PREFIX)).map((url) => url.slice(ASSETS_PREFIX.length));
+  const paths = [...baseJsPaths, ...pluginPaths];
+  const assetsDir = await assetsDirPromise;
+  const fastest = await transformer.urlBuilder.getFastestProvider();
+  await Promise.all(
+    paths.map(
+      (path) => downloadAsset(
+        resolve(assetsDir, path),
+        transformer.urlBuilder.getFullUrl(path, fastest)
+      )
+    )
+  );
+}
+async function downloadAsset(fullPath, url) {
+  try {
+    const result = await stat(fullPath);
+    if (result.isFile())
+      return;
+  } catch {
+  }
+  const res = await fetch(url);
+  if (!res.ok || !res.body)
+    throw new Error(`Failed to download: ${url}`);
+  await mkdir(dirname(fullPath), { recursive: true });
+  await finished(
+    Readable.fromWeb(res.body).pipe(
+      createWriteStream(fullPath)
+    )
+  );
+}
 async function loadFile(path) {
-  if (path.startsWith('/node_modules/')) {
-    const relpath = path.slice(14);
-    return readFile(await resolveFile(relpath), 'utf8');
+  if (path.startsWith(ASSETS_PREFIX)) {
+    const relpath = path.slice(ASSETS_PREFIX.length);
+    const assetsDir = await assetsDirPromise;
+    return readFile(resolve(assetsDir, relpath), "utf8");
   }
   const res = await fetch(path);
-  if (!res.ok) throw res;
+  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))]);
+  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
@@ -315,26 +336,27 @@ async function inlineAssets(assets) {
 async function createMarkmap(options) {
   const transformer = new Transformer();
   if (options.offline) {
-    transformer.urlBuilder.setProvider('local', localProvider);
-    transformer.urlBuilder.provider = 'local';
+    transformer.urlBuilder.setProvider("local", localProvider);
+    transformer.urlBuilder.provider = "local";
   } else {
     try {
       await transformer.urlBuilder.findFastestProvider();
-    } catch (_unused) {
-      // ignore
+    } catch {
     }
   }
-  const {
-    root,
-    features,
-    frontmatter
-  } = transformer.transform(options.content || '');
+  const { root, features, frontmatter } = transformer.transform(
+    options.content || ""
+  );
   let assets = transformer.getUsedAssets(features);
-  assets = _extends({}, assets, {
-    scripts: [...baseJsPaths.map(path => transformer.urlBuilder.getFullUrl(path)).map(path => buildJSItem(path)), ...(assets.scripts || [])]
-  });
+  assets = {
+    ...assets,
+    scripts: [
+      ...baseJsPaths.map((path) => transformer.urlBuilder.getFullUrl(path)).map((path) => buildJSItem(path)),
+      ...assets.scripts || []
+    ]
+  };
   if (options.toolbar) {
-    assets = addToolbar(transformer, assets);
+    assets = addToolbar(transformer.urlBuilder, assets);
   }
   if (options.offline) {
     assets = await inlineAssets(assets);
@@ -343,29 +365,40 @@ async function createMarkmap(options) {
     baseJs: [],
     jsonOptions: frontmatter == null ? void 0 : frontmatter.markmap
   });
-  const output = options.output || 'markmap.html';
-  await writeFile(output, html, 'utf8');
-  if (options.open) open(output);
+  const output = options.output || "markmap.html";
+  await writeFile(output, html, "utf8");
+  if (options.open)
+    open(output);
 }
 async function main() {
-  var _await$readPackageUp;
-  const pkg = (_await$readPackageUp = await readPackageUp({
+  var _a;
+  const pkg = (_a = await readPackageUp({
     cwd: fileURLToPath(import.meta.url)
-  })) == null ? void 0 : _await$readPackageUp.packageJson;
-  if (!pkg) throw new Error('package.json not found');
-  const notifier = updateNotifier({
-    pkg
-  });
+  })) == null ? void 0 : _a.packageJson;
+  if (!pkg)
+    throw new Error("package.json not found");
+  const notifier = updateNotifier({ pkg });
   notifier.notify();
   const program = new Command();
-  program.version(pkg.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 readFile(input, 'utf8');
-    const output = cmd.output || `${input.replace(/\.\w*$/, '')}.html`;
+  program.version(pkg.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) => {
+    let { offline } = cmd;
+    if (cmd.watch)
+      offline = true;
+    if (offline)
+      await fetchAssets();
+    const content = await readFile(input, "utf8");
+    const output = cmd.output || `${input.replace(/\.\w*$/, "")}.html`;
     if (cmd.watch) {
       await develop(input, {
         open: cmd.open,
         toolbar: cmd.toolbar,
-        offline: true
+        offline
       });
     } else {
       await createMarkmap({
@@ -373,11 +406,15 @@ async function main() {
         output,
         open: cmd.open,
         toolbar: cmd.toolbar,
-        offline: cmd.offline
+        offline
       });
     }
   });
   program.parse(process.argv);
 }
-
-export { createMarkmap, develop, main };
+export {
+  createMarkmap,
+  develop,
+  fetchAssets,
+  main
+};

package/{types → dist}/util.d.ts

@@ -1,4 +1,6 @@
-import { IAssets, ITransformer } from 'markmap-lib';
+import { UrlBuilder } from 'markmap-common';
+import { IAssets } from 'markmap-lib';
+export declare const ASSETS_PREFIX = "/assets/";
 export interface IDevelopOptions {
     /**
      * Whether to open the generated markmap in browser
@@ -14,6 +16,7 @@ export interface IDevelopOptions {
      */
     offline: boolean;
 }
-export declare function addToolbar(transformer: ITransformer, assets: IAssets): IAssets;
+export declare function addToolbar(urlBuilder: UrlBuilder, assets: IAssets): IAssets;
 export declare function localProvider(path: string): string;
-export declare function resolveFile(relpath: string): Promise<string>;
+export declare const rootDirPromise: Promise<string | undefined>;
+export declare const assetsDirPromise: Promise<string>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markmap-cli",
-  "version": "0.15.5-alpha.1+013bf59",
+  "version": "0.15.6-alpha.4+4734119",
   "description": "Create markmaps from CLI",
   "author": "Gerald <gera2ld@live.com>",
   "license": "MIT",
@@ -8,7 +8,7 @@
     "markmap": "bin/cli.js"
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   },
   "keywords": [
     "markmap",
@@ -25,10 +25,10 @@
     "url": "git+https://github.com/markmap/markmap.git"
   },
   "scripts": {
-    "dev": "rollup -wc",
-    "clean": "del-cli dist types",
+    "clean": "del-cli dist",
     "build:types": "tsc",
-    "build:js": "rollup -c"
+    "build:js": "vite build",
+    "postinstall": "node -e \"import('./dist/index.js').then(({ fetchAssets }) => fetchAssets()).catch(() => {})\""
   },
   "bugs": {
     "url": "https://github.com/markmap/markmap/issues"
@@ -38,28 +38,21 @@
   "module": "dist/index.js",
   "files": [
     "bin",
-    "dist",
-    "types"
+    "dist"
   ],
-  "typings": "types/index.d.ts",
+  "typings": "dist/index.d.ts",
   "dependencies": {
     "@babel/runtime": "^7.22.6",
     "chokidar": "^3.5.3",
     "commander": "^11.0.0",
-    "d3": "^7.8.5",
-    "highlight.js": "^11.8.0",
-    "katex": "^0.16.8",
     "koa": "^2.14.2",
-    "markmap-common": "0.15.5-alpha.1+013bf59",
-    "markmap-lib": "0.15.5-alpha.1+013bf59",
-    "markmap-toolbar": "0.15.5-alpha.1+013bf59",
-    "markmap-view": "0.15.5-alpha.1+013bf59",
+    "markmap-common": "0.15.5",
+    "markmap-lib": "0.15.6-alpha.4+4734119",
+    "markmap-toolbar": "0.15.6-alpha.4+4734119",
     "open": "^9.1.0",
     "pkg-dir": "^7.0.0",
-    "prismjs": "^1.29.0",
     "read-pkg-up": "^10.0.0",
-    "update-notifier": "^6.0.2",
-    "webfontloader": "^1.6.28"
+    "update-notifier": "^6.0.2"
   },
-  "gitHead": "013bf59b71f2253dc54249c4a5a3097bf686494f"
+  "gitHead": "473411985496abcc20a546978438614c48ec56cf"
 }