markmap-lib 0.13.6-alpha.4 → 0.14.0

package/dist/index.esm.js

@@ -1,4 +1,4 @@
-/*! markmap-lib v0.13.6-alpha.4+70ae484 | MIT License */
+/*! markmap-lib v0.14.0 | MIT License */
 import _extends$1 from '@babel/runtime/helpers/esm/extends';
 import { Remarkable } from 'remarkable';
 import remarkableKatex from 'remarkable-katex';
@@ -6,7 +6,7 @@ import Prism from 'prismjs';
 import loadLanguages from 'prismjs/components/';
 import yaml from 'js-yaml';
 
-/*! markmap-common v0.13.4 | MIT License */
+/*! markmap-common v0.14.0 | MIT License */
 class Hook {
   constructor() {
     this.listeners = [];
@@ -175,7 +175,7 @@ function wrapFunction(fn, {
 }
 
 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 BASE_JS = [`https://cdn.jsdelivr.net/npm/d3@${"6.7.0"}`, `https://cdn.jsdelivr.net/npm/markmap-view@${"0.13.6-alpha.4+70ae484"}`].map(src => ({
+const BASE_JS = [`https://cdn.jsdelivr.net/npm/d3@${"6.7.0"}`, `https://cdn.jsdelivr.net/npm/markmap-view@${"0.14.0"}`].map(src => ({
   type: 'script',
   data: {
     src
@@ -219,13 +219,13 @@ function fillTemplate(root, assets, extra) {
 
 var config$1 = {
   versions: {
-    katex: "0.15.3",
+    katex: "0.16.0",
     webfontloader: "1.6.28"
   },
   preloadScripts: [{
     type: 'script',
     data: {
-      src: `https://cdn.jsdelivr.net/npm/katex@${"0.15.3"}/dist/katex.min.js`
+      src: `https://cdn.jsdelivr.net/npm/katex@${"0.16.0"}/dist/katex.min.js`
     }
   }],
   scripts: [{
@@ -259,11 +259,30 @@ var config$1 = {
   styles: [{
     type: 'stylesheet',
     data: {
-      href: `https://cdn.jsdelivr.net/npm/katex@${"0.15.3"}/dist/katex.min.css`
+      href: `https://cdn.jsdelivr.net/npm/katex@${"0.16.0"}/dist/katex.min.css`
     }
   }]
 };
 
+const npmPrefix = 'https://cdn.jsdelivr.net/npm/';
+/**
+ * Find NPM paths and resolve them to full URLs with the same package version as in this library.
+ */
+
+function resolveNpmPaths(paths, name, version) {
+  return paths.map(path => {
+    if (typeof path === 'string') {
+      if (path.startsWith(`${name}/`)) {
+        path = `${npmPrefix}${name}@${version}${path.slice(name.length)}`;
+      } else if (path.startsWith(`${name}@`)) {
+        path = `${npmPrefix}${path}`;
+      }
+    }
+
+    return path;
+  });
+}
+
 const name$2 = 'katex';
 function transform$2(transformHooks) {
   let enableFeature = () => {};
@@ -276,11 +295,24 @@ function transform$2(transformHooks) {
       }
     });
   });
-  transformHooks.transform.tap((_, context) => {
+  transformHooks.beforeParse.tap((_, context) => {
     enableFeature = () => {
       context.features[name$2] = true;
     };
   });
+  transformHooks.afterParse.tap((_, context) => {
+    const {
+      frontmatter
+    } = context;
+
+    if (frontmatter != null && frontmatter.markmap) {
+      ['extraJs', 'extraCss'].forEach(key => {
+        if (frontmatter.markmap[key]) {
+          frontmatter.markmap[key] = resolveNpmPaths(frontmatter.markmap[key], name$2, config$1.versions.katex);
+        }
+      });
+    }
+  });
   return {
     styles: config$1.styles,
     scripts: config$1.scripts
@@ -340,7 +372,7 @@ function transform$1(transformHooks) {
       }
     });
   });
-  transformHooks.transform.tap((_, context) => {
+  transformHooks.beforeParse.tap((_, context) => {
     enableFeature = () => {
       context.features[name$1] = true;
     };
@@ -359,7 +391,7 @@ transform: transform$1
 
 const name = 'frontmatter';
 function transform(transformHooks) {
-  transformHooks.transform.tap((md, context) => {
+  transformHooks.beforeParse.tap((md, context) => {
     const origParse = md.parse;
     md.parse = wrapFunction(origParse, {
       before(ctx) {
@@ -429,7 +461,8 @@ transform: transform
 function createTransformHooks() {
   return {
     parser: new Hook(),
-    transform: new Hook(),
+    beforeParse: new Hook(),
+    afterParse: new Hook(),
     htmltag: new Hook(),
     retransform: new Hook()
   };
@@ -621,8 +654,9 @@ class Transformer {
     const context = {
       features: {}
     };
-    this.hooks.transform.call(this.md, context);
+    this.hooks.beforeParse.call(this.md, context);
     const tokens = this.md.parse(content, {});
+    this.hooks.afterParse.call(this.md, context);
     let root = this.buildTree(tokens);
     cleanNode(root);
     if (((_root$children = root.children) == null ? void 0 : _root$children.length) === 1) root = root.children[0];
@@ -668,7 +702,7 @@ class Transformer {
 }
 
 const transformerVersions = {
-  'markmap-lib': '0.13.6-alpha.4+70ae484',
+  'markmap-lib': '0.14.0',
   d3: "6.7.0"
 };
 

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! markmap-lib v0.13.6-alpha.4+70ae484 | MIT License */
+/*! markmap-lib v0.14.0 | MIT License */
 'use strict';
 
 var _extends$1 = require('@babel/runtime/helpers/extends');
@@ -16,7 +16,7 @@ var Prism__default = /*#__PURE__*/_interopDefaultLegacy(Prism);
 var loadLanguages__default = /*#__PURE__*/_interopDefaultLegacy(loadLanguages);
 var yaml__default = /*#__PURE__*/_interopDefaultLegacy(yaml);
 
-/*! markmap-common v0.13.4 | MIT License */
+/*! markmap-common v0.14.0 | MIT License */
 class Hook {
   constructor() {
     this.listeners = [];
@@ -185,7 +185,7 @@ function wrapFunction(fn, {
 }
 
 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 BASE_JS = [`https://cdn.jsdelivr.net/npm/d3@${"6.7.0"}`, `https://cdn.jsdelivr.net/npm/markmap-view@${"0.13.6-alpha.4+70ae484"}`].map(src => ({
+const BASE_JS = [`https://cdn.jsdelivr.net/npm/d3@${"6.7.0"}`, `https://cdn.jsdelivr.net/npm/markmap-view@${"0.14.0"}`].map(src => ({
   type: 'script',
   data: {
     src
@@ -229,13 +229,13 @@ function fillTemplate(root, assets, extra) {
 
 var config$1 = {
   versions: {
-    katex: "0.15.3",
+    katex: "0.16.0",
     webfontloader: "1.6.28"
   },
   preloadScripts: [{
     type: 'script',
     data: {
-      src: `https://cdn.jsdelivr.net/npm/katex@${"0.15.3"}/dist/katex.min.js`
+      src: `https://cdn.jsdelivr.net/npm/katex@${"0.16.0"}/dist/katex.min.js`
     }
   }],
   scripts: [{
@@ -269,11 +269,30 @@ var config$1 = {
   styles: [{
     type: 'stylesheet',
     data: {
-      href: `https://cdn.jsdelivr.net/npm/katex@${"0.15.3"}/dist/katex.min.css`
+      href: `https://cdn.jsdelivr.net/npm/katex@${"0.16.0"}/dist/katex.min.css`
     }
   }]
 };
 
+const npmPrefix = 'https://cdn.jsdelivr.net/npm/';
+/**
+ * Find NPM paths and resolve them to full URLs with the same package version as in this library.
+ */
+
+function resolveNpmPaths(paths, name, version) {
+  return paths.map(path => {
+    if (typeof path === 'string') {
+      if (path.startsWith(`${name}/`)) {
+        path = `${npmPrefix}${name}@${version}${path.slice(name.length)}`;
+      } else if (path.startsWith(`${name}@`)) {
+        path = `${npmPrefix}${path}`;
+      }
+    }
+
+    return path;
+  });
+}
+
 const name$2 = 'katex';
 function transform$2(transformHooks) {
   let enableFeature = () => {};
@@ -286,11 +305,24 @@ function transform$2(transformHooks) {
       }
     });
   });
-  transformHooks.transform.tap((_, context) => {
+  transformHooks.beforeParse.tap((_, context) => {
     enableFeature = () => {
       context.features[name$2] = true;
     };
   });
+  transformHooks.afterParse.tap((_, context) => {
+    const {
+      frontmatter
+    } = context;
+
+    if (frontmatter != null && frontmatter.markmap) {
+      ['extraJs', 'extraCss'].forEach(key => {
+        if (frontmatter.markmap[key]) {
+          frontmatter.markmap[key] = resolveNpmPaths(frontmatter.markmap[key], name$2, config$1.versions.katex);
+        }
+      });
+    }
+  });
   return {
     styles: config$1.styles,
     scripts: config$1.scripts
@@ -350,7 +382,7 @@ function transform$1(transformHooks) {
       }
     });
   });
-  transformHooks.transform.tap((_, context) => {
+  transformHooks.beforeParse.tap((_, context) => {
     enableFeature = () => {
       context.features[name$1] = true;
     };
@@ -369,7 +401,7 @@ transform: transform$1
 
 const name = 'frontmatter';
 function transform(transformHooks) {
-  transformHooks.transform.tap((md, context) => {
+  transformHooks.beforeParse.tap((md, context) => {
     const origParse = md.parse;
     md.parse = wrapFunction(origParse, {
       before(ctx) {
@@ -439,7 +471,8 @@ transform: transform
 function createTransformHooks() {
   return {
     parser: new Hook(),
-    transform: new Hook(),
+    beforeParse: new Hook(),
+    afterParse: new Hook(),
     htmltag: new Hook(),
     retransform: new Hook()
   };
@@ -631,8 +664,9 @@ class Transformer {
     const context = {
       features: {}
     };
-    this.hooks.transform.call(this.md, context);
+    this.hooks.beforeParse.call(this.md, context);
     const tokens = this.md.parse(content, {});
+    this.hooks.afterParse.call(this.md, context);
     let root = this.buildTree(tokens);
     cleanNode(root);
     if (((_root$children = root.children) == null ? void 0 : _root$children.length) === 1) root = root.children[0];
@@ -678,7 +712,7 @@ class Transformer {
 }
 
 const transformerVersions = {
-  'markmap-lib': '0.13.6-alpha.4+70ae484',
+  'markmap-lib': '0.14.0',
   d3: "6.7.0"
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markmap-lib",
-  "version": "0.13.6-alpha.4+70ae484",
+  "version": "0.14.0",
   "description": "Visualize your Markdown as mindmaps with Markmap",
   "author": "Gerald <gera2ld@live.com>",
   "license": "MIT",
@@ -42,20 +42,20 @@
   "repository": "git@github.com:gera2ld/markmap.git",
   "devDependencies": {
     "@types/remarkable": "^2.0.3",
-    "markmap-common": "^0.13.4",
-    "markmap-view": "^0.13.6-alpha.4+70ae484",
+    "markmap-common": "^0.14.0",
+    "markmap-view": "^0.14.0",
     "webfontloader": "^1.6.28"
   },
   "dependencies": {
-    "@babel/runtime": "^7.16.3",
+    "@babel/runtime": "^7.18.9",
     "js-yaml": "^4.1.0",
-    "katex": "^0.15.1",
-    "prismjs": "^1.25.0",
+    "katex": "^0.16.0",
+    "prismjs": "^1.28.0",
     "remarkable": "^2.0.1",
-    "remarkable-katex": "^1.1.8"
+    "remarkable-katex": "^1.2.1"
   },
   "peerDependencies": {
-    "markmap-common": "^0.13.4"
+    "markmap-common": "*"
   },
-  "gitHead": "70ae4840c81db3ed8f7a143a11ce1cd6be9b4dbf"
+  "gitHead": "2d6a50992256a2d2e4d945c2c075ddc42d6ccb0d"
 }

package/types/types.d.ts

@@ -7,16 +7,19 @@ export interface ITransformHooks {
      */
     parser: Hook<[md: Remarkable]>;
     /**
-     * Tapped every time when Markdown content is transformed.
+     * Tapped every time before Markdown content is parsed.
      */
-    transform: Hook<[md: Remarkable, context: ITransformContext]>;
+    beforeParse: Hook<[md: Remarkable, 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>>]>;
     /**
-     * Indicate that the last transformation is not complete for reasons like
-     * lack of resources and is called when it is ready for a new transformation.
+     * Used in autoloader to force rerender when resource is loaded.
      */
     retransform: Hook<[]>;
 }