markmap-lib 0.14.5-alpha.19 → 0.14.5-alpha.22

package/dist/index.mjs

@@ -1,87 +1,51 @@
-/*! markmap-lib v0.14.5-alpha.19+5323905 | MIT License */
+/*! markmap-lib v0.14.5-alpha.22+04afb38 | MIT License */
 import _extends from '@babel/runtime/helpers/esm/extends';
-import { buildJSItem, persistCSS, persistJS, buildCSSItem, Hook, wrapFunction, noop, getFullUrl } from 'markmap-common';
 import { Remarkable } from 'remarkable';
+import { buildJSItem, buildCSSItem, Hook, wrapFunction, noop, UrlBuilder, persistCSS, persistJS } from 'markmap-common';
 import remarkableKatex from 'remarkable-katex';
-import Prism from 'prismjs';
-import loadLanguages from 'prismjs/components/index.js';
 import yaml from 'js-yaml';
+import hljs from 'highlight.js';
 
 const template = "<!DOCTYPE html>\n<html>\n<head>\n<meta charset=\"UTF-8\">\n<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">\n<meta http-equiv=\"X-UA-Compatible\" content=\"ie=edge\">\n<title>Markmap</title>\n<style>\n* {\n  margin: 0;\n  padding: 0;\n}\n#mindmap {\n  display: block;\n  width: 100vw;\n  height: 100vh;\n}\n</style>\n<!--CSS-->\n</head>\n<body>\n<svg id=\"mindmap\"></svg>\n<!--JS-->\n</body>\n</html>\n" ;
-const baseJsPaths = [`d3@${"7.8.5"}/dist/d3.min.js`, `markmap-view@${"0.14.5-alpha.19"}/dist/browser/index.js`];
-function fillTemplate(root, assets, extra) {
-  var _extra, _extra$baseJs;
-  extra = _extends({}, extra);
-  (_extra$baseJs = (_extra = extra).baseJs) != null ? _extra$baseJs : _extra.baseJs = baseJsPaths.map(path => buildJSItem(path));
-  const {
-    scripts,
-    styles
-  } = assets;
-  const cssList = [...(styles ? persistCSS(styles) : [])];
-  const context = {
-    getMarkmap: () => window.markmap,
-    getOptions: extra.getOptions,
-    jsonOptions: extra.jsonOptions,
-    root
-  };
-  const jsList = [...persistJS([...extra.baseJs, ...(scripts || []), {
+const baseJsPaths = [`d3@${"7.8.5"}/dist/d3.min.js`, `markmap-view@${"0.14.5-alpha.22"}/dist/browser/index.js`];
+
+const name$3 = 'katex';
+const preloadScripts = [`katex@${"0.16.8"}/dist/katex.min.js`].map(path => buildJSItem(path));
+const webfontloader = buildJSItem(`webfontloader@${"1.6.28"}/webfontloader.js`);
+webfontloader.data.defer = true;
+const styles$1 = [`katex@${"0.16.8"}/dist/katex.min.css`].map(path => buildCSSItem(path));
+const config$1 = {
+  versions: {
+    katex: "0.16.8" ,
+    webfontloader: "1.6.28" 
+  },
+  preloadScripts,
+  scripts: [{
     type: 'iife',
     data: {
-      fn: (getMarkmap, getOptions, root, jsonOptions) => {
-        const markmap = getMarkmap();
-        window.mm = markmap.Markmap.create('svg#mindmap', (getOptions || markmap.deriveOptions)(jsonOptions), root);
+      fn: getMarkmap => {
+        window.WebFontConfig = {
+          custom: {
+            families: ['KaTeX_AMS', 'KaTeX_Caligraphic:n4,n7', 'KaTeX_Fraktur:n4,n7', 'KaTeX_Main:n4,n7,i4,i7', 'KaTeX_Math:i4,i7', 'KaTeX_Script', 'KaTeX_SansSerif:n4,n7,i4', 'KaTeX_Size1', 'KaTeX_Size2', 'KaTeX_Size3', 'KaTeX_Size4', 'KaTeX_Typewriter']
+          },
+          active: () => {
+            getMarkmap().refreshHook.call();
+          }
+        };
       },
-      getParams: ({
-        getMarkmap,
-        getOptions,
-        root,
-        jsonOptions
-      }) => {
-        return [getMarkmap, getOptions, root, jsonOptions];
+      getParams({
+        getMarkmap
+      }) {
+        return [getMarkmap];
       }
     }
-  }], context)];
-  const html = template.replace('<!--CSS-->', () => cssList.join('')).replace('<!--JS-->', () => jsList.join(''));
-  return html;
-}
-
-function getConfig$1() {
-  const preloadScripts = [`katex@${"0.16.8"}/dist/katex.min.js`].map(path => buildJSItem(path));
-  const webfontloader = buildJSItem(`webfontloader@${"1.6.28"}/webfontloader.js`);
-  webfontloader.data.defer = true;
-  const styles = [`katex@${"0.16.8"}/dist/katex.min.css`].map(path => buildCSSItem(path));
-  return {
-    versions: {
-      katex: "0.16.8" ,
-      webfontloader: "1.6.28" 
-    },
-    preloadScripts,
-    scripts: [{
-      type: 'iife',
-      data: {
-        fn: getMarkmap => {
-          window.WebFontConfig = {
-            custom: {
-              families: ['KaTeX_AMS', 'KaTeX_Caligraphic:n4,n7', 'KaTeX_Fraktur:n4,n7', 'KaTeX_Main:n4,n7,i4,i7', 'KaTeX_Math:i4,i7', 'KaTeX_Script', 'KaTeX_SansSerif:n4,n7,i4', 'KaTeX_Size1', 'KaTeX_Size2', 'KaTeX_Size3', 'KaTeX_Size4', 'KaTeX_Typewriter']
-            },
-            active: () => {
-              getMarkmap().refreshHook.call();
-            }
-          };
-        },
-        getParams({
-          getMarkmap
-        }) {
-          return [getMarkmap];
-        }
-      }
-    }, webfontloader],
-    styles
-  };
-}
+  }, webfontloader],
+  styles: styles$1
+};
 
-function createTransformHooks() {
+function createTransformHooks(transformer) {
   return {
+    transformer,
     parser: new Hook(),
     beforeParse: new Hook(),
     afterParse: new Hook(),
@@ -97,85 +61,34 @@ function definePlugin(plugin) {
   return plugin;
 }
 
-const name$3 = 'katex';
-var katex = definePlugin(() => {
-  const plugin = {
-    name: name$3,
-    config: getConfig$1(),
-    transform(transformHooks) {
-      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);
-        });
-      });
-      transformHooks.beforeParse.tap((_, context) => {
-        enableFeature = () => {
-          context.features[name$3] = true;
-        };
-      });
-      return {
-        styles: plugin.config.styles,
-        scripts: plugin.config.scripts
-      };
-    }
-  };
-  return plugin;
-});
-
-function getConfig() {
-  const preloadScripts = [`prismjs@${"1.29.0"}/components/prism-core.min.js`, `prismjs@${"1.29.0"}/plugins/autoloader/prism-autoloader.min.js`].map(path => buildJSItem(path));
-  const styles = [`prismjs@${"1.29.0"}/themes/prism.css`].map(path => buildCSSItem(path));
-  return {
-    versions: {
-      prismjs: "1.29.0" 
-    },
-    preloadScripts,
-    styles
-  };
-}
-
-const name$2 = 'prism';
-var prism = definePlugin(() => {
-  const plugin = {
-    name: name$2,
-    config: getConfig(),
-    transform(transformHooks) {
-      let enableFeature = noop;
-      transformHooks.parser.tap(md => {
-        md.set({
-          highlight: (str, lang) => {
-            enableFeature();
-            let grammar = Prism.languages[lang];
-            if (!grammar && lang) {
-              loadLanguages([lang]);
-              grammar = Prism.languages[lang];
-            }
-            if (grammar) {
-              return Prism.highlight(str, grammar, lang);
-            }
-            return '';
-          }
-        });
-      });
-      transformHooks.beforeParse.tap((_, context) => {
-        enableFeature = () => {
-          context.features[name$2] = true;
-        };
+const plugin$1 = definePlugin({
+  name: name$3,
+  config: config$1,
+  transform(transformHooks) {
+    var _plugin$config, _plugin$config2;
+    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);
       });
-      return {
-        styles: plugin.config.styles
+    });
+    transformHooks.beforeParse.tap((_, context) => {
+      enableFeature = () => {
+        context.features[name$3] = true;
       };
-    }
-  };
-  return plugin;
+    });
+    return {
+      styles: (_plugin$config = plugin$1.config) == null ? void 0 : _plugin$config.styles,
+      scripts: (_plugin$config2 = plugin$1.config) == null ? void 0 : _plugin$config2.scripts
+    };
+  }
 });
 
-const name$1 = 'frontmatter';
+const name$2 = 'frontmatter';
 var frontmatter = definePlugin({
-  name: name$1,
+  name: name$2,
   transform(transformHooks) {
     transformHooks.beforeParse.tap((md, context) => {
       const {
@@ -223,9 +136,9 @@ function normalizeNumber(value) {
   return +value;
 }
 
-const name = 'npmUrl';
+const name$1 = 'npmUrl';
 var npmUrl = definePlugin({
-  name,
+  name: name$1,
   transform(transformHooks) {
     transformHooks.afterParse.tap((_, context) => {
       const {
@@ -238,7 +151,7 @@ var npmUrl = definePlugin({
           if (value) {
             markmap[key] = value.map(path => {
               if (path.startsWith('npm:')) {
-                return getFullUrl(path.slice(4));
+                return transformHooks.transformer.urlBuilder.getFullUrl(path.slice(4));
               }
               return path;
             });
@@ -250,7 +163,61 @@ var npmUrl = definePlugin({
   }
 });
 
-const plugins = [frontmatter, katex, prism, npmUrl];
+const name = 'hljs';
+const styles = [`highlight.js@${"11.8.0"}/styles/default.css`].map(path => buildCSSItem(path));
+const config = {
+  versions: {
+    hljs: "11.8.0" 
+  },
+  styles
+};
+const plugin = definePlugin({
+  name,
+  config,
+  transform(transformHooks) {
+    var _plugin$config;
+    let enableFeature = noop;
+    transformHooks.parser.tap(md => {
+      md.set({
+        highlight: (str, language) => {
+          enableFeature();
+          return hljs.highlightAuto(str, language ? [language] : undefined).value;
+        }
+      });
+    });
+    transformHooks.beforeParse.tap((_, context) => {
+      enableFeature = () => {
+        context.features[name] = true;
+      };
+    });
+    return {
+      styles: (_plugin$config = plugin.config) == null ? void 0 : _plugin$config.styles
+    };
+  }
+});
+
+const plugins = [frontmatter, plugin$1, plugin, npmUrl];
+
+function patchJSItem(transformer, item) {
+  if (item.type === 'script' && item.data.src) {
+    return _extends({}, item, {
+      data: _extends({}, item.data, {
+        src: transformer.urlBuilder.getFullUrl(item.data.src)
+      })
+    });
+  }
+  return item;
+}
+function patchCSSItem(transformer, item) {
+  if (item.type === 'stylesheet' && item.data.href) {
+    return _extends({}, item, {
+      data: _extends({}, item.data, {
+        href: transformer.urlBuilder.getFullUrl(item.data.href)
+      })
+    });
+  }
+  return item;
+}
 
 function cleanNode(node) {
   if (node.type === 'heading') {
@@ -300,7 +267,8 @@ function resetDepth(node, depth = 0) {
 class Transformer {
   constructor(plugins$1 = plugins) {
     this.assetsMap = {};
-    this.hooks = createTransformHooks();
+    this.urlBuilder = new UrlBuilder();
+    this.hooks = createTransformHooks(this);
     this.plugins = plugins$1.map(plugin => typeof plugin === 'function' ? plugin() : plugin);
     const assetsMap = {};
     for (const {
@@ -395,10 +363,7 @@ class Transformer {
         revoke();
         current.content = `${current.content || ''}${text}`;
       } else if (token.type === 'fence') {
-        let result = md.renderer.render([token], md.options, {});
-        // Remarkable only adds className to `<code>` but not `<pre>`, copy it to make PrismJS style work.
-        const matches = result.match(/<code( class="[^"]*")>/);
-        if (matches) result = result.replace('<pre>', `<pre${matches[1]}>`);
+        const result = md.renderer.render([token], md.options, {});
         current.children.push({
           type: token.type,
           depth: depth + 1,
@@ -444,8 +409,8 @@ class Transformer {
       }
     }
     return {
-      styles,
-      scripts
+      styles: styles.map(item => patchCSSItem(this, item)),
+      scripts: scripts.map(item => patchJSItem(this, item))
     };
   }
 
@@ -456,11 +421,46 @@ class Transformer {
     const keys = this.plugins.map(plugin => plugin.name).filter(name => features[name]);
     return this.getAssets(keys);
   }
+  fillTemplate(root, assets, extra) {
+    var _extra, _extra$baseJs;
+    extra = _extends({}, extra);
+    (_extra$baseJs = (_extra = extra).baseJs) != null ? _extra$baseJs : _extra.baseJs = baseJsPaths.map(path => this.urlBuilder.getFullUrl(path)).map(path => buildJSItem(path));
+    const {
+      scripts,
+      styles
+    } = assets;
+    const cssList = [...(styles ? persistCSS(styles) : [])];
+    const context = {
+      getMarkmap: () => window.markmap,
+      getOptions: extra.getOptions,
+      jsonOptions: extra.jsonOptions,
+      root
+    };
+    const jsList = [...persistJS([...extra.baseJs, ...(scripts || []), {
+      type: 'iife',
+      data: {
+        fn: (getMarkmap, getOptions, root, jsonOptions) => {
+          const markmap = getMarkmap();
+          window.mm = markmap.Markmap.create('svg#mindmap', (getOptions || markmap.deriveOptions)(jsonOptions), root);
+        },
+        getParams: ({
+          getMarkmap,
+          getOptions,
+          root,
+          jsonOptions
+        }) => {
+          return [getMarkmap, getOptions, root, jsonOptions];
+        }
+      }
+    }], context)];
+    const html = template.replace('<!--CSS-->', () => cssList.join('')).replace('<!--JS-->', () => jsList.join(''));
+    return html;
+  }
 }
 
 const transformerVersions = {
-  'markmap-lib': '0.14.5-alpha.19+5323905',
+  'markmap-lib': '0.14.5-alpha.22+04afb38',
   d3: "7.8.5"
 };
 
-export { Transformer, baseJsPaths, plugins as builtInPlugins, fillTemplate, transformerVersions };
+export { Transformer, baseJsPaths, plugins as builtInPlugins, template, transformerVersions };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markmap-lib",
-  "version": "0.14.5-alpha.19+5323905",
+  "version": "0.14.5-alpha.22+04afb38",
   "description": "Visualize your Markdown as mindmaps with Markmap",
   "author": "Gerald <gera2ld@live.com>",
   "license": "MIT",
@@ -47,12 +47,13 @@
   },
   "devDependencies": {
     "@types/remarkable": "^2.0.3",
-    "markmap-common": "0.14.5-alpha.19+5323905",
-    "markmap-view": "0.14.5-alpha.19+5323905",
+    "markmap-common": "0.14.5-alpha.22+04afb38",
+    "markmap-view": "0.14.5-alpha.22+04afb38",
     "webfontloader": "^1.6.28"
   },
   "dependencies": {
     "@babel/runtime": "^7.22.6",
+    "highlight.js": "^11.8.0",
     "js-yaml": "^4.1.0",
     "katex": "^0.16.8",
     "prismjs": "^1.29.0",
@@ -62,5 +63,5 @@
   "peerDependencies": {
     "markmap-common": "*"
   },
-  "gitHead": "532390588885518c11fa50b8a77c0694821cfecf"
+  "gitHead": "04afb38dd0a6f3b5e8eaffde3c29e9e38b215c35"
 }

package/types/constants.d.ts

@@ -0,0 +1,2 @@
+export declare const template: string;
+export declare const baseJsPaths: string[];

package/types/index.d.ts

@@ -1,5 +1,5 @@
 export * from './types';
-export * from './template';
+export * from './constants';
 export * from './transform';
 export declare const transformerVersions: {
     'markmap-lib': string;

package/types/plugins/base.d.ts

@@ -1,6 +1,6 @@
-import { ITransformHooks, ITransformPlugin } from '../types';
-export declare function createTransformHooks(): ITransformHooks;
+import { ITransformer, ITransformHooks, ITransformPlugin } from '../types';
+export declare function createTransformHooks(transformer: ITransformer): ITransformHooks;
 /**
  * This function is only used to help type checking.
  */
-export declare function definePlugin(plugin: ITransformPlugin | (() => ITransformPlugin)): ITransformPlugin | (() => ITransformPlugin);
+export declare function definePlugin(plugin: ITransformPlugin): ITransformPlugin;

package/types/plugins/frontmatter.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("../types").ITransformPlugin | (() => import("../types").ITransformPlugin);
+declare const _default: import("../types").ITransformPlugin;
 export default _default;

package/types/plugins/hljs.d.ts

@@ -0,0 +1,2 @@
+declare const plugin: import("../types").ITransformPlugin;
+export default plugin;

package/types/plugins/index.d.ts

@@ -1,2 +1,2 @@
 export * from './base';
-export declare const plugins: (import("..").ITransformPlugin | (() => import("..").ITransformPlugin))[];
+export declare const plugins: import("..").ITransformPlugin[];

package/types/plugins/katex.browser.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("../types").ITransformPlugin | (() => import("../types").ITransformPlugin);
-export default _default;
+declare const plugin: import("../types").ITransformPlugin;
+export default plugin;

package/types/plugins/katex.config.d.ts

@@ -1,5 +1,6 @@
 import { JSItem } from 'markmap-common';
-export declare function getConfig(): {
+export declare const name = "katex";
+export declare const config: {
     versions: {
         katex: string;
         webfontloader: string;

package/types/plugins/katex.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("../types").ITransformPlugin | (() => import("../types").ITransformPlugin);
-export default _default;
+declare const plugin: import("../types").ITransformPlugin;
+export default plugin;

package/types/plugins/npm-url.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("../types").ITransformPlugin | (() => import("../types").ITransformPlugin);
+declare const _default: import("../types").ITransformPlugin;
 export default _default;

package/types/plugins/prism.browser.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("../types").ITransformPlugin | (() => import("../types").ITransformPlugin);
-export default _default;
+declare const plugin: import("../types").ITransformPlugin;
+export default plugin;

package/types/plugins/prism.config.d.ts

@@ -1,4 +1,5 @@
-export declare function getConfig(): {
+export declare const name = "prism";
+export declare const config: {
     versions: {
         prismjs: string;
     };

package/types/plugins/prism.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("../types").ITransformPlugin | (() => import("../types").ITransformPlugin);
-export default _default;
+declare const plugin: import("../types").ITransformPlugin;
+export default plugin;

package/types/plugins/util.d.ts

@@ -1,4 +1,8 @@
+import { CSSItem, JSItem } from 'markmap-common';
+import { ITransformer } from '../types';
 /**
  * Find NPM paths and resolve them to full URLs with the same package version as in this library.
  */
 export declare function addDefaultVersions(paths: string[], name: string, version: string): string[];
+export declare function patchJSItem(transformer: ITransformer, item: JSItem): JSItem;
+export declare function patchCSSItem(transformer: ITransformer, item: CSSItem): CSSItem;

package/types/transform.d.ts

@@ -1,12 +1,13 @@
 import { Remarkable } from 'remarkable';
-import { IPureNode } from 'markmap-common';
-import { ITransformResult, ITransformPlugin, IAssets, ITransformHooks, IFeatures } from './types';
+import { UrlBuilder, JSItem, IMarkmapOptions, IMarkmapJSONOptions, IPureNode } from 'markmap-common';
+import { ITransformResult, ITransformPlugin, IAssets, ITransformHooks, IFeatures, ITransformer } from './types';
 import { plugins as builtInPlugins } from './plugins';
 export { builtInPlugins };
-export declare class Transformer {
+export declare class Transformer implements ITransformer {
     hooks: ITransformHooks;
     md: Remarkable;
     assetsMap: Record<string, IAssets>;
+    urlBuilder: UrlBuilder;
     plugins: ITransformPlugin[];
     constructor(plugins?: Array<ITransformPlugin | (() => ITransformPlugin)>);
     buildTree(tokens: Remarkable.Token[]): IPureNode;
@@ -19,4 +20,9 @@ export declare class Transformer {
      * Get used assets by features object returned by `transform`.
      */
     getUsedAssets(features: IFeatures): IAssets;
+    fillTemplate(root: IPureNode | null, assets: IAssets, extra?: {
+        baseJs?: JSItem[];
+        jsonOptions?: IMarkmapJSONOptions;
+        getOptions?: (jsonOptions: IMarkmapJSONOptions) => Partial<IMarkmapOptions>;
+    }): string;
 }

package/types/types.d.ts

@@ -1,7 +1,8 @@
 import type { Remarkable } from 'remarkable';
-import { CSSItem, JSItem, IPureNode, IWrapContext, Hook, IMarkmapJSONOptions } from 'markmap-common';
+import { UrlBuilder, CSSItem, JSItem, IPureNode, IWrapContext, Hook, IMarkmapJSONOptions } from 'markmap-common';
 type Htmltag = Remarkable.Rule<Remarkable.HtmlTagToken, string>;
 export interface ITransformHooks {
+    transformer: ITransformer;
     /**
      * Tapped once when the parser is created.
      */
@@ -41,6 +42,9 @@ export interface IMarkmapCreateOptions {
 export interface IFeatures {
     [key: string]: boolean;
 }
+export interface ITransformer {
+    urlBuilder: UrlBuilder;
+}
 export interface ITransformContext {
     features: IFeatures;
     content: string;

package/types/template.d.ts

@@ -1,8 +0,0 @@
-import { JSItem, IMarkmapOptions, IMarkmapJSONOptions, IPureNode } from 'markmap-common';
-import { IAssets } from './types';
-export declare const baseJsPaths: string[];
-export declare function fillTemplate(root: IPureNode | null, assets: IAssets, extra?: {
-    baseJs?: JSItem[];
-    jsonOptions?: IMarkmapJSONOptions;
-    getOptions?: (jsonOptions: IMarkmapJSONOptions) => Partial<IMarkmapOptions>;
-}): string;