markmap-lib 0.16.1 → 0.16.3-alpha.2

package/dist/plugins.mjs

@@ -1,14 +1,13 @@
 import { Hook, buildJSItem, buildCSSItem, noop, wrapFunction } from "markmap-common";
 import yaml from "js-yaml";
 import hljs from "highlight.js";
-import remarkableKatex from "remarkable-katex";
+import katexPlugin from "@iktakahiro/markdown-it-katex";
 function createTransformHooks(transformer) {
   return {
     transformer,
     parser: new Hook(),
     beforeParse: new Hook(),
     afterParse: new Hook(),
-    htmltag: new Hook(),
     retransform: new Hook()
   };
 }
@@ -26,27 +25,22 @@ const plugin$3 = definePlugin({
   name: name$5,
   transform(transformHooks) {
     transformHooks.parser.tap((md) => {
-      md.core.ruler.before(
-        "inline",
-        "checkbox",
-        (state) => {
-          for (let i = 2; i < state.tokens.length; i += 1) {
-            const token = state.tokens[i];
-            if (token.type === "inline" && token.content) {
-              const prevType = state.tokens[i - 1].type;
-              const prevPrevType = state.tokens[i - 2].type;
-              if (prevType === "heading_open" || prevType === "paragraph_open" && prevPrevType === "list_item_open") {
-                token.content = token.content.replace(
-                  /^\[(.)\] /,
-                  (m, g) => images[g] ? `${images[g]} ` : m
-                );
-              }
+      md.core.ruler.before("inline", "checkbox", (state) => {
+        for (let i = 2; i < state.tokens.length; i += 1) {
+          const token = state.tokens[i];
+          if (token.type === "inline" && token.content) {
+            const prevType = state.tokens[i - 1].type;
+            const prevPrevType = state.tokens[i - 2].type;
+            if (prevType === "heading_open" || prevType === "paragraph_open" && prevPrevType === "list_item_open") {
+              token.content = token.content.replace(
+                /^\[(.)\] /,
+                (m, g) => images[g] ? `${images[g]} ` : m
+              );
             }
           }
-          return false;
-        },
-        {}
-      );
+        }
+        return false;
+      });
     });
     return {};
   }
@@ -207,14 +201,16 @@ const plugin$1 = definePlugin({
     var _a, _b;
     let enableFeature = noop;
     transformHooks.parser.tap((md) => {
-      md.use(remarkableKatex);
-      md.renderer.rules.katex = wrapFunction(
-        md.renderer.rules.katex,
-        (render, ...args) => {
-          enableFeature();
-          return render(...args);
+      md.use(katexPlugin);
+      ["math_block", "math_inline"].forEach((key) => {
+        const fn = md.renderer.rules[key];
+        if (fn) {
+          md.renderer.rules[key] = wrapFunction(fn, (render, ...args) => {
+            enableFeature();
+            return render(...args);
+          });
         }
-      );
+      });
     });
     transformHooks.beforeParse.tap((_, context) => {
       enableFeature = () => {
@@ -259,32 +255,20 @@ const plugin = definePlugin({
   name,
   transform(transformHooks) {
     transformHooks.parser.tap((md) => {
-      Object.entries(md.renderer.rules).forEach(([key, value]) => {
-        if (typeof value === "function") {
-          md.renderer.rules[key] = patchRule(value);
-        } else {
-          Object.entries(value).forEach(([k, v]) => {
-            value[k] = patchRule(v);
-          });
+      md.renderer.renderAttrs = wrapFunction(
+        md.renderer.renderAttrs,
+        (renderAttrs, token) => {
+          let attrs = renderAttrs(token);
+          if (token.block && token.map) {
+            attrs += ` data-lines=${token.map.join(",")}`;
+          }
+          return attrs;
         }
-      });
+      );
     });
     return {};
   }
 });
-function patchRule(rule, _key) {
-  return wrapFunction(rule, (render, tokens, idx, ...rest) => {
-    let html = render(tokens, idx, ...rest);
-    const { lines } = tokens[idx];
-    if (lines) {
-      html = html.replace(
-        /^<[\w-]+/,
-        (m) => `${m} data-lines="${lines.join(",")}"`
-      );
-    }
-    return html;
-  });
-}
 const pluginSourceLines = plugin;
 const plugins = [
   pluginFrontmatter,

package/dist/transform.d.ts

@@ -1,11 +1,11 @@
+import type MarkdownIt from 'markdown-it';
 import { UrlBuilder } from 'markmap-common';
 import { IHtmlParserOptions } from 'markmap-html-parser';
-import { Remarkable } from 'remarkable';
 import { IAssets, IFeatures, ITransformHooks, ITransformPlugin, ITransformResult, ITransformer } from './types';
 export declare const builtInPlugins: ITransformPlugin[];
 export declare class Transformer implements ITransformer {
     hooks: ITransformHooks;
-    md: Remarkable;
+    md: MarkdownIt;
     assetsMap: Record<string, IAssets>;
     urlBuilder: UrlBuilder;
     plugins: ITransformPlugin[];

package/dist/types.d.ts

@@ -1,26 +1,21 @@
-import { CSSItem, Hook, IPureNode, IWrapContext, JSItem, UrlBuilder } from 'markmap-common';
+import type MarkdownIt from 'markdown-it';
+import { CSSItem, Hook, IPureNode, JSItem, UrlBuilder } from 'markmap-common';
 import { IHtmlParserOptions } from 'markmap-html-parser';
 import { IMarkmapJSONOptions as IMarkmapJSONOptionsForView } from 'markmap-view';
-import type { Remarkable } from 'remarkable';
-type Htmltag = Remarkable.Rule<Remarkable.HtmlTagToken, string>;
 export interface ITransformHooks {
     transformer: ITransformer;
     /**
      * Tapped once when the parser is created.
      */
-    parser: Hook<[md: Remarkable]>;
+    parser: Hook<[md: MarkdownIt]>;
     /**
      * Tapped every time before Markdown content is parsed.
      */
-    beforeParse: Hook<[md: Remarkable, context: ITransformContext]>;
+    beforeParse: Hook<[md: MarkdownIt, context: ITransformContext]>;
     /**
      * Tapped every time after Markdown content is parsed.
      */
-    afterParse: Hook<[md: Remarkable, context: ITransformContext]>;
-    /**
-     * Tapped when Remarkable renders an HTML tag in Markdown.
-     */
-    htmltag: Hook<[ctx: IWrapContext<Parameters<Htmltag>, ReturnType<Htmltag>>]>;
+    afterParse: Hook<[md: MarkdownIt, context: ITransformContext]>;
     /**
      * Used in autoloader to force rerender when resource is loaded.
      */
@@ -54,6 +49,7 @@ export interface ITransformContext {
     features: IFeatures;
     content: string;
     frontmatter?: {
+        title?: string;
         markmap?: IMarkmapJSONOptions;
     };
     /** The index of line where content without frontmatter starts */
@@ -73,4 +69,3 @@ export interface ITransformPlugin {
      */
     transform: (transformHooks: ITransformHooks) => IAssets;
 }
-export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markmap-lib",
-  "version": "0.16.1",
+  "version": "0.16.3-alpha.2+0f4c3f8",
   "description": "Visualize your Markdown as mindmaps with Markmap",
   "author": "Gerald <gera2ld@live.com>",
   "license": "MIT",
@@ -58,20 +58,25 @@
   },
   "devDependencies": {
     "@highlightjs/cdn-assets": "^11.8.0",
-    "@types/remarkable": "^2.0.3",
+    "@types/katex": "^0.16.7",
+    "@types/markdown-it": "^14.0.0",
     "markmap-common": "0.16.0",
     "webfontloader": "^1.6.28"
   },
   "dependencies": {
     "@babel/runtime": "^7.22.6",
+    "@iktakahiro/markdown-it-katex": "^4.0.1",
     "highlight.js": "^11.8.0",
     "js-yaml": "^4.1.0",
     "katex": "^0.16.8",
+    "markdown-it": "^14.1.0",
+    "markdown-it-ins": "^4.0.0",
+    "markdown-it-mark": "^4.0.0",
+    "markdown-it-sub": "^2.0.0",
+    "markdown-it-sup": "^2.0.0",
     "markmap-html-parser": "0.16.1",
-    "markmap-view": "0.16.0",
-    "prismjs": "^1.29.0",
-    "remarkable": "^2.0.1",
-    "remarkable-katex": "^1.2.1"
+    "markmap-view": "0.16.3-alpha.2+0f4c3f8",
+    "prismjs": "^1.29.0"
   },
   "peerDependencies": {
     "markmap-common": "*"
@@ -90,5 +95,5 @@
       "^(.*\\.svg)\\?raw$": "$1"
     }
   },
-  "gitHead": "f10ad62ef03e02a1843484cca51521f48989fab7"
+  "gitHead": "0f4c3f84ff21f0957ec3dbf338ed7a453f050638"
 }