fix: support custom assets for markmap

Author: gera2ld

README.md

@@ -72,26 +72,27 @@ plugins:
       base_path: docs
       encoding: utf-8
       file_extension: .mm.md
-      d3_version: 6.7.0
-      lib_version: 0.14.1
-      view_version: 0.14.0
+      d3_version: 7
+      lib_version: 0.15.3
+      view_version: 0.15.3
 ```
 
 In addition, feel free to define your favourite source urls like this:
 
 ```yaml
+plugins:
+  - markmap:
+      # disable the default assets first
+      d3_version: ''
+      lib_version: ''
+      view_version: ''
+
 extra_javascript:
-  - https://unpkg.com/d3@6.7.0/dist/d3.min.js
-  - https://unpkg.com/markmap-lib@0.14.1/dist/browser/index.min.js
-  - https://unpkg.com/markmap-view@0.14.0/dist/index.min.js
+  - https://unpkg.com/d3@7/dist/d3.min.js
+  - https://unpkg.com/markmap-lib@0.15.3/dist/browser/index.js
+  - https://unpkg.com/markmap-view@0.15.3/dist/browser/index.js
 ```
 
-:warning: The urls need to contain one of these keywords to be considered as deviation from default:
-
-* `markmap-d3`
-* `markmap-lib`
-* `markmap-view`
-
 ## Troubleshooting
 
 ### Nav tree lists markmaps

mkdocs_markmap/defaults.py

@@ -9,8 +9,8 @@ class JsModuleConfig(object):
     uri: str = attr.attrib()
 
 D3_LIB: JsModuleConfig = JsModuleConfig(
-    version='6.7.0',
-    uri='https://unpkg.com/d3@{}/dist/d3.min.js',
+    version='7',
+    uri='https://unpkg.com/d3@{}',
 )
 
 MARKMAP_LIB: JsModuleConfig = JsModuleConfig(

mkdocs_markmap/plugin.py

@@ -44,16 +44,10 @@ def markmap(self) -> Dict[str, str]:
         """
         Provides all markmap libraries defined in mkdocs.yml (if any)
         """
-        if self._markmap is None:            
-            extra_javascript = self.config.get('extra_javascript', [])
+        if self._markmap is None:
             self._markmap: Dict[str, str] = {}
-            for uri in extra_javascript:
-                for name in MARKMAP.keys():
-                    if f'markmap-{name}' in uri.lower():
-                        self._markmap[name] = uri
-
             for name, module in MARKMAP.items():
-                if name not in self._markmap:
+                if self.config[f'{name}_version']:
                     self._markmap[name] = module.uri.format(self.config[f'{name}_version'])
 
         return self._markmap
@@ -62,15 +56,15 @@ def _load_scripts(self, soup: BeautifulSoup, script_base_url: str, js_path: Path
         for script_url in self.markmap.values():
             if script_url.lower().startswith("http"):
                 try:
-                    src: str = script_base_url + download(js_path, script_url)
+                    src: str = script_base_url + download(js_path, script_url, extname='.js')
                 except Exception as e:
                     log.error(f'unable to download script: {script_url}')
                     src = script_url
 
             else:
                 log.info(f"static script detected: {script_url}")
                 src = script_url
-            
+
             script: Tag = soup.new_tag('script', src=src, type='text/javascript')
             soup.head.append(script)
 
@@ -85,7 +79,7 @@ def _add_statics(soup: BeautifulSoup):
             tag: Tag = soup.new_tag(tag_name, type=text_type)
             with open(path, 'r') as fp:
                 tag.string = fp.read()
-            getattr(soup, attribute).append(tag)    
+            getattr(soup, attribute).append(tag)
 
     def on_config(self, config: Config) -> Config:
         config['markdown_extensions'].append('markmap')

mkdocs_markmap/utils.py

@@ -1,10 +1,10 @@
 import logging
 import os
 from pathlib import Path
-
 from urllib.parse import unquote
-from requests.adapters import HTTPAdapter
+
 from requests import Response
+from requests.adapters import HTTPAdapter
 from requests.packages.urllib3.util.retry import Retry
 from requests.packages.urllib3.util.url import Url, parse_url
 from requests.sessions import Session
@@ -13,12 +13,15 @@
 log = logging.getLogger('mkdocs.markmap')
 
 
-def download(base_path: Path, url: str, flat: bool = False, force_reload: bool = False) -> str:
+def download(base_path: Path, url: str, flat: bool = False, force_reload: bool = False, extname: str = '') -> str:
     parsed_url: Url = parse_url(url)
     path: str = unquote(parsed_url.request_uri.split('?')[0])
     sub_path: str = os.path.basename(path) if flat else f'{parsed_url.hostname}{path}'
+    if extname != '' and not sub_path.endswith(extname):
+        sub_path += extname
     file_path: Path = base_path / sub_path
 
+
     file_path.parent.mkdir(parents=True, exist_ok=True)
     if force_reload or not file_path.exists():
         retries: Retry = Retry(connect=5, read=2, redirect=5)