markmap-cli 0.15.9-alpha.5 → 0.16.0

package/dist/dev-server.d.ts

@@ -1,17 +1,5 @@
-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;
-}
+import { IDevelopOptions, IContentProvider } from './types';
 export declare function develop(fileName: string | undefined, options: IDevelopOptions): Promise<{
     provider: IContentProvider;
     close(): Promise<void>;
 }>;
-export {};

package/dist/fetch-assets.d.ts

@@ -1 +1 @@
-export declare function fetchAssets(): Promise<void>;
+export declare function fetchAssets(assetsDir?: string): Promise<void>;

package/dist/index.d.ts

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

package/dist/index.js

@@ -1,22 +1,23 @@
 import { readFile, stat, mkdir, writeFile } from "fs/promises";
-import { resolve, join, dirname } from "path";
+import { join, resolve, dirname } from "path";
 import { fileURLToPath } from "url";
 import { Command } from "commander";
 import open from "open";
 import updateNotifier from "update-notifier";
 import { readPackageUp } from "read-package-up";
 import { buildCSSItem, buildJSItem, defer } from "markmap-common";
-import { Transformer, baseJsPaths } from "markmap-lib";
+import { Transformer } from "markmap-lib";
 export * from "markmap-lib";
-import { packageDirectory } from "pkg-dir";
-import { createReadStream, createWriteStream } from "fs";
-import { EventEmitter } from "events";
+import { fillTemplate, baseJsPaths } from "markmap-render";
 import { serve } from "@hono/node-server";
-import { Hono } from "hono";
 import chokidar from "chokidar";
+import { EventEmitter } from "events";
+import { createReadStream, createWriteStream } from "fs";
+import { Hono } from "hono";
 import { Readable } from "stream";
 import { finished } from "stream/promises";
-const TOOLBAR_VERSION = "0.15.9-alpha.5";
+const __vite_glob_0_0 = "data:application/octet-stream;base64,L2Fzc2V0cwo=";
+const TOOLBAR_VERSION = "0.16.0";
 const TOOLBAR_CSS = `markmap-toolbar@${TOOLBAR_VERSION}/dist/style.css`;
 const TOOLBAR_JS = `markmap-toolbar@${TOOLBAR_VERSION}/dist/index.js`;
 const ASSETS_PREFIX = "/assets/";
@@ -52,14 +53,6 @@ function addToolbar(urlBuilder, assets) {
 function localProvider(path) {
   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 createStreamBody(stream) {
   const body = new ReadableStream({
     start(controller) {
@@ -76,6 +69,9 @@ function createStreamBody(stream) {
   });
   return body;
 }
+const config = {
+  assetsDir: fileURLToPath(new URL((/* @__PURE__ */ Object.assign({ "../.gitignore": __vite_glob_0_0 }))[`../.${ASSETS_PREFIX}`], import.meta.url))
+};
 var getMimeType = (filename) => {
   const regexp = /\.([a-zA-Z0-9]+?)$/;
   const match = filename.match(regexp);
@@ -282,12 +278,12 @@ function startServer(paddingBottom) {
     dfs(root);
     return best;
     function dfs(node) {
-      var _a, _b;
-      const lines = (_a = node.payload) == null ? void 0 : _a.lines;
-      if (lines && lines[0] <= lineWithoutFrontmatter && lineWithoutFrontmatter < lines[1]) {
+      var _a, _b, _c;
+      const [start, end] = ((_b = (_a = node.payload) == null ? void 0 : _a.lines) == null ? void 0 : _b.split(",").map((s) => +s)) || [];
+      if (start >= 0 && start <= lineWithoutFrontmatter && lineWithoutFrontmatter < end) {
         best = node;
       }
-      (_b = node.children) == null ? void 0 : _b.forEach(dfs);
+      (_c = node.children) == null ? void 0 : _c.forEach(dfs);
     }
   }
 }
@@ -295,10 +291,9 @@ async function setUpServer(transformer, provider, options) {
   let assets = transformer.getAssets();
   if (options.toolbar)
     assets = addToolbar(transformer.urlBuilder, assets);
-  const html = `${transformer.fillTemplate(
-    null,
-    assets
-  )}<script>(${startServer.toString()})(${options.toolbar ? 60 : 0})<\/script>`;
+  const html = `${fillTemplate(null, assets, {
+    urlBuilder: transformer.urlBuilder
+  })}<script>(${startServer.toString()})(${options.toolbar ? 60 : 0})<\/script>`;
   const app = new Hono();
   app.get("/", (c) => c.html(html));
   app.get("/~data", async (c) => {
@@ -312,7 +307,7 @@ async function setUpServer(transformer, provider, options) {
     await ((_a = provider[cmd]) == null ? void 0 : _a.call(provider, ...args));
     return c.body(null, 204);
   });
-  const assetsDir = await assetsDirPromise;
+  const { assetsDir } = config;
   app.get(`${ASSETS_PREFIX}*`, async (c) => {
     const relpath = c.req.path.slice(ASSETS_PREFIX.length);
     const realpath = join(assetsDir, relpath);
@@ -367,7 +362,7 @@ async function develop(fileName, options) {
   return setUpServer(transformer, provider, options);
 }
 const providerName = "local-hook";
-async function fetchAssets() {
+async function fetchAssets(assetsDir = config.assetsDir) {
   var _a, _b;
   const transformer = new Transformer();
   const { provider } = transformer.urlBuilder;
@@ -386,7 +381,6 @@ async function fetchAssets() {
     )) || []
   ].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(
@@ -417,8 +411,7 @@ async function downloadAsset(fullPath, url) {
 async function loadFile(path) {
   if (path.startsWith(ASSETS_PREFIX)) {
     const relpath = path.slice(ASSETS_PREFIX.length);
-    const assetsDir = await assetsDirPromise;
-    return readFile(resolve(assetsDir, relpath), "utf8");
+    return readFile(resolve(config.assetsDir, relpath), "utf8");
   }
   const res = await fetch(path);
   if (!res.ok)
@@ -479,9 +472,10 @@ async function createMarkmap(options) {
   if (options.offline) {
     assets = await inlineAssets(assets);
   }
-  const html = transformer.fillTemplate(root, assets, {
+  const html = fillTemplate(root, assets, {
     baseJs: [],
-    jsonOptions: frontmatter == null ? void 0 : frontmatter.markmap
+    jsonOptions: frontmatter == null ? void 0 : frontmatter.markmap,
+    urlBuilder: transformer.urlBuilder
   });
   const output = options.output || "markmap.html";
   await writeFile(output, html, "utf8");
@@ -531,6 +525,7 @@ async function main() {
   program.parse(process.argv);
 }
 export {
+  config,
   createMarkmap,
   develop,
   fetchAssets,

package/dist/types.d.ts

@@ -0,0 +1,28 @@
+export interface IDevelopOptions {
+    /**
+     * Whether to open the generated markmap in browser
+     */
+    open: boolean;
+    /**
+     * 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;
+    /** Port number for the devServer to listen. */
+    port?: number;
+}
+export interface IFileUpdate {
+    ts?: number;
+    content?: string;
+    line?: number;
+}
+export interface IContentProvider {
+    getUpdate: (ts: number, timeout?: number) => Promise<IFileUpdate>;
+    setContent: (content: string) => void;
+    setCursor: (line: number) => void;
+    dispose: () => void;
+}

package/dist/util.d.ts

@@ -3,25 +3,9 @@ import type { ReadStream } from 'fs';
 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
-     */
-    open: boolean;
-    /**
-     * 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;
-    /** Port number for the devServer to listen. */
-    port?: number;
-}
 export declare function addToolbar(urlBuilder: UrlBuilder, assets: IAssets): IAssets;
 export declare function localProvider(path: string): string;
-export declare const rootDirPromise: Promise<string | undefined>;
-export declare const assetsDirPromise: Promise<string>;
 export declare function createStreamBody(stream: ReadStream): ReadableStream<any>;
+export declare const config: {
+    assetsDir: string;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markmap-cli",
-  "version": "0.15.9-alpha.5+c64866f",
+  "version": "0.16.0",
   "description": "Create markmaps from CLI",
   "author": "Gerald <gera2ld@live.com>",
   "license": "MIT",
@@ -28,6 +28,7 @@
     "clean": "del-cli dist",
     "build:types": "tsc",
     "build:js": "vite build",
+    "build": "run-s clean build:*",
     "postinstall": "node -e \"import('./dist/index.js').then(({ fetchAssets }) => fetchAssets()).catch(() => {})\""
   },
   "bugs": {
@@ -47,13 +48,14 @@
     "chokidar": "^3.5.3",
     "commander": "^11.1.0",
     "hono": "^3.11.8",
-    "markmap-common": "0.15.9-alpha.5+c64866f",
-    "markmap-lib": "0.15.9-alpha.5+c64866f",
-    "markmap-toolbar": "0.15.9-alpha.5+c64866f",
+    "markmap-common": "0.16.0",
+    "markmap-lib": "0.16.0",
+    "markmap-render": "0.16.0",
+    "markmap-toolbar": "0.16.0",
     "open": "^10.0.0",
     "pkg-dir": "^8.0.0",
     "read-package-up": "^11.0.0",
     "update-notifier": "^7.0.0"
   },
-  "gitHead": "c64866fb4873a99923be18ea70715aa49a6dabef"
+  "gitHead": "caf3f840ad39c240ba522bfea83c57de62c6cac4"
 }