markmap-cli 0.15.9-alpha.0 → 0.15.9-alpha.12

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

package/dist/index.js

@@ -8,15 +8,14 @@ import { readPackageUp } from "read-package-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 { 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.0";
+const TOOLBAR_VERSION = "0.15.8";
 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 +51,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 +67,10 @@ function createStreamBody(stream) {
   });
   return body;
 }
+const rootDir = new URL(import.meta.url).pathname;
+const config = {
+  assetsDir: resolve(rootDir, `.${ASSETS_PREFIX}`)
+};
 var getMimeType = (filename) => {
   const regexp = /\.([a-zA-Z0-9]+?)$/;
   const match = filename.match(regexp);
@@ -282,12 +277,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);
     }
   }
 }
@@ -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)
@@ -531,6 +524,7 @@ async function main() {
   program.parse(process.argv);
 }
 export {
+  config,
   createMarkmap,
   develop,
   fetchAssets,

package/dist/util.d.ts

@@ -22,6 +22,7 @@ export interface IDevelopOptions {
 }
 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.0+9cb40e7",
+  "version": "0.15.9-alpha.12+e2132d2",
   "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,13 @@
     "chokidar": "^3.5.3",
     "commander": "^11.1.0",
     "hono": "^3.11.8",
-    "markmap-common": "0.15.9-alpha.0+9cb40e7",
-    "markmap-lib": "0.15.9-alpha.0+9cb40e7",
-    "markmap-toolbar": "0.15.9-alpha.0+9cb40e7",
+    "markmap-common": "0.15.9-alpha.12+e2132d2",
+    "markmap-lib": "0.15.9-alpha.12+e2132d2",
+    "markmap-toolbar": "0.15.9-alpha.12+e2132d2",
     "open": "^10.0.0",
     "pkg-dir": "^8.0.0",
     "read-package-up": "^11.0.0",
     "update-notifier": "^7.0.0"
   },
-  "gitHead": "9cb40e7e9ec0aa1f25a2de6a74912cd0c21f52ed"
+  "gitHead": "e2132d2615f5b19e246478dc9dbb6b6ca4d6d75f"
 }