markmap-cli 0.14.5-alpha.21 → 0.14.5-alpha.22

package/bin/cli.js

@@ -1,9 +1,8 @@
 #!/usr/bin/env node
 
-const updateNotifier = require('update-notifier');
-const { main } = require('..');
-const pkg = require('../package.json');
+import { main } from '../dist/index.js';
 
-const notifier = updateNotifier({ pkg });
-notifier.notify();
-main(pkg.version);
+main().catch(err => {
+  console.error(err);
+  process.exitCode = 1;
+});

package/dist/index.js

@@ -1,16 +1,21 @@
-/*! markmap-cli v0.14.5-alpha.21+fb81f2c | MIT License */
-'use strict';
-
-var fs = require('fs');
-var commander = require('commander');
-var open = require('open');
-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');
+/*! markmap-cli v0.14.5-alpha.22+04afb38 | 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) {
@@ -27,7 +32,7 @@ function _extends() {
   return _extends.apply(this, arguments);
 }
 
-const TOOLBAR_VERSION = "0.14.5-alpha.21+fb81f2c";
+const TOOLBAR_VERSION = "0.14.5-alpha.22";
 const TOOLBAR_CSS = `markmap-toolbar@${TOOLBAR_VERSION}/dist/style.css`;
 const TOOLBAR_JS = `markmap-toolbar@${TOOLBAR_VERSION}/dist/index.js`;
 const renderToolbar = () => {
@@ -41,10 +46,10 @@ const renderToolbar = () => {
   el.setAttribute('style', 'position:absolute;bottom:20px;right:20px');
   document.body.append(el);
 };
-function addToolbar(assets) {
+function addToolbar(transformer, assets) {
   return {
-    styles: [...(assets.styles || []), ...[TOOLBAR_CSS].map(path => markmapCommon.buildCSSItem(path))],
-    scripts: [...(assets.scripts || []), ...[TOOLBAR_JS].map(path => markmapCommon.buildJSItem(path)), {
+    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 => {
@@ -70,6 +75,25 @@ function localProvider(path) {
   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];
+}
 
 function sequence(fn) {
   let promise;
@@ -83,7 +107,7 @@ function sequence(fn) {
 class BufferContentProvider {
   constructor() {
     this.deferredSet = new Set();
-    this.events = new events.EventEmitter();
+    this.events = new EventEmitter();
     this.ts = 0;
     this.content = '';
     this.line = -1;
@@ -100,7 +124,7 @@ class BufferContentProvider {
     });
   }
   async getUpdate(ts, timeout = 10000) {
-    const deferred = markmapCommon.defer();
+    const deferred = defer();
     this.deferredSet.add(deferred);
     setTimeout(() => {
       this.feed({}, deferred);
@@ -144,7 +168,7 @@ class FileSystemProvider extends BufferContentProvider {
     this.watcher = chokidar.watch(fileName).on('all', sequence(() => this.update()));
   }
   async update() {
-    const content = await fs.promises.readFile(this.fileName, 'utf8');
+    const content = await readFile(this.fileName, 'utf8');
     this.setContent(content);
   }
   dispose() {
@@ -205,8 +229,8 @@ function startServer(paddingBottom) {
 }
 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>`;
+  if (options.toolbar) assets = addToolbar(transformer, 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 === '/') {
@@ -223,12 +247,12 @@ function setUpServer(transformer, provider, options) {
       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);
+          const realpath = await resolveFile(relpath);
+          ctx.type = extname(relpath);
+          ctx.body = createReadStream(realpath);
           return;
-        } catch (_unused) {
-          // ignore
+        } catch (err) {
+          console.error(err);
         }
       }
       await next();
@@ -257,8 +281,9 @@ function setUpServer(transformer, provider, options) {
   };
 }
 async function develop(fileName, options) {
-  markmapCommon.setProvider('local', localProvider);
-  const transformer = new markmapLib.Transformer();
+  const transformer = new Transformer();
+  transformer.urlBuilder.setProvider('local', localProvider);
+  transformer.urlBuilder.provider = 'local';
   const provider = fileName ? new FileSystemProvider(fileName) : new BufferContentProvider();
   return setUpServer(transformer, provider, options);
 }
@@ -266,7 +291,7 @@ async function develop(fileName, options) {
 async function loadFile(path) {
   if (path.startsWith('/node_modules/')) {
     const relpath = path.slice(14);
-    return fs.promises.readFile(require.resolve(relpath), 'utf8');
+    return readFile(await resolveFile(relpath), 'utf8');
   }
   const res = await fetch(path);
   if (!res.ok) throw res;
@@ -288,12 +313,13 @@ async function inlineAssets(assets) {
   };
 }
 async function createMarkmap(options) {
+  const transformer = new Transformer();
   if (options.offline) {
-    markmapCommon.setProvider('local', localProvider);
+    transformer.urlBuilder.setProvider('local', localProvider);
+    transformer.urlBuilder.provider = 'local';
   } else {
-    await markmapCommon.findFastestProvider();
+    await transformer.urlBuilder.findFastestProvider();
   }
-  const transformer = new markmapLib.Transformer();
   const {
     root,
     features,
@@ -301,26 +327,35 @@ async function createMarkmap(options) {
   } = transformer.transform(options.content || '');
   let assets = transformer.getUsedAssets(features);
   assets = _extends({}, assets, {
-    scripts: [...markmapLib.baseJsPaths.map(path => markmapCommon.buildJSItem(path)), ...(assets.scripts || [])]
+    scripts: [...baseJsPaths.map(path => transformer.urlBuilder.getFullUrl(path)).map(path => buildJSItem(path)), ...(assets.scripts || [])]
   });
   if (options.toolbar) {
-    assets = addToolbar(assets);
+    assets = addToolbar(transformer, assets);
   }
   if (options.offline) {
     assets = await inlineAssets(assets);
   }
-  const html = markmapLib.fillTemplate(root, assets, {
+  const html = transformer.fillTemplate(root, assets, {
     baseJs: [],
     jsonOptions: frontmatter == null ? void 0 : frontmatter.markmap
   });
   const output = options.output || 'markmap.html';
-  await fs.promises.writeFile(output, html, 'utf8');
+  await writeFile(output, html, 'utf8');
   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('--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');
+async function main() {
+  var _await$readPackageUp;
+  const pkg = (_await$readPackageUp = 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
+  });
+  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`;
     if (cmd.watch) {
       await develop(input, {
@@ -341,9 +376,4 @@ function main(version) {
   program.parse(process.argv);
 }
 
-exports.createMarkmap = createMarkmap;
-exports.develop = develop;
-exports.main = main;
-Object.keys(markmapLib).forEach(function (k) {
-if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) exports[k] = markmapLib[k];
-});
+export { createMarkmap, develop, main };

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "markmap-cli",
-  "version": "0.14.5-alpha.21+fb81f2c",
+  "version": "0.14.5-alpha.22+04afb38",
   "description": "Create markmaps from CLI",
   "author": "Gerald <gera2ld@live.com>",
   "license": "MIT",
   "bin": {
     "markmap": "bin/cli.js"
   },
+  "engines": {
+    "node": ">=16"
+  },
   "keywords": [
     "markmap",
     "markdown",
@@ -22,15 +25,17 @@
     "url": "git+https://github.com/markmap/markmap.git"
   },
   "scripts": {
-    "dev": "rollup -wc rollup.conf.js",
+    "dev": "rollup -wc",
     "clean": "del-cli dist types",
     "build:types": "tsc",
-    "build:js": "rollup -c rollup.conf.js"
+    "build:js": "rollup -c"
   },
   "bugs": {
     "url": "https://github.com/markmap/markmap/issues"
   },
+  "type": "module",
   "main": "dist/index.js",
+  "module": "dist/index.js",
   "files": [
     "bin",
     "dist",
@@ -40,19 +45,21 @@
   "dependencies": {
     "@babel/runtime": "^7.22.6",
     "chokidar": "^3.5.3",
-    "commander": "^7.2.0",
+    "commander": "^11.0.0",
     "d3": "^7.8.5",
     "highlight.js": "^11.8.0",
     "katex": "^0.16.8",
     "koa": "^2.14.2",
-    "markmap-common": "0.14.5-alpha.21+fb81f2c",
-    "markmap-lib": "0.14.5-alpha.21+fb81f2c",
-    "markmap-toolbar": "0.14.5-alpha.21+fb81f2c",
-    "markmap-view": "0.14.5-alpha.21+fb81f2c",
-    "open": "^8.4.2",
+    "markmap-common": "0.14.5-alpha.22+04afb38",
+    "markmap-lib": "0.14.5-alpha.22+04afb38",
+    "markmap-toolbar": "0.14.5-alpha.22+04afb38",
+    "markmap-view": "0.14.5-alpha.22+04afb38",
+    "open": "^9.1.0",
+    "pkg-dir": "^7.0.0",
     "prismjs": "^1.29.0",
-    "update-notifier": "^5.1.0",
+    "read-pkg-up": "^10.0.0",
+    "update-notifier": "^6.0.2",
     "webfontloader": "^1.6.28"
   },
-  "gitHead": "fb81f2cb688f400f17f911774539267219f639ce"
+  "gitHead": "04afb38dd0a6f3b5e8eaffde3c29e9e38b215c35"
 }

package/types/index.d.ts

@@ -4,4 +4,4 @@ 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;
+export declare function main(): Promise<void>;

package/types/util.d.ts

@@ -1,4 +1,4 @@
-import { IAssets } from 'markmap-lib';
+import { IAssets, ITransformer } from 'markmap-lib';
 export interface IDevelopOptions {
     /**
      * Whether to open the generated markmap in browser
@@ -14,5 +14,6 @@ export interface IDevelopOptions {
      */
     offline: boolean;
 }
-export declare function addToolbar(assets: IAssets): IAssets;
+export declare function addToolbar(transformer: ITransformer, assets: IAssets): IAssets;
 export declare function localProvider(path: string): string;
+export declare function resolveFile(relpath: string): Promise<string>;