markmap-autoloader 0.14.5-alpha.21 → 0.14.5-alpha.24

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! markmap-autoloader v0.14.5-alpha.21+fb81f2c | MIT License */
+/*! markmap-autoloader v0.14.5-alpha.24+08dd40c | MIT License */
 this.markmap = this.markmap || {};
 (function (exports) {
 'use strict';
@@ -18,7 +18,7 @@ function _extends$1() {
   return _extends$1.apply(this, arguments);
 }
 
-/*! markmap-common v0.14.5-alpha.21+fb81f2c | MIT License */
+/*! markmap-common v0.14.5-alpha.24+08dd40c | MIT License */
 function _extends() {
   _extends = Object.assign ? Object.assign.bind() : function (target) {
     for (var i = 1; i < arguments.length; i++) {
@@ -33,6 +33,49 @@ function _extends() {
   };
   return _extends.apply(this, arguments);
 }
+const testPath = "npm2url/dist/index.cjs";
+const defaultProviders = {
+  jsdelivr: path => `https://cdn.jsdelivr.net/npm/${path}`,
+  unpkg: path => `https://unpkg.com/${path}`
+};
+class UrlBuilder {
+  constructor() {
+    this.providers = _extends({}, defaultProviders);
+    this.provider = "jsdelivr";
+  }
+  getFastestProvider(path = testPath) {
+    return Promise.any(Object.entries(this.providers).map(async ([name, factory]) => {
+      const res = await fetch(factory(path));
+      if (!res.ok) {
+        throw res;
+      }
+      await res.text();
+      return name;
+    }));
+  }
+  async findFastestProvider() {
+    this.provider = await this.getFastestProvider();
+    return this.provider;
+  }
+  setProvider(name, factory) {
+    if (factory) {
+      this.providers[name] = factory;
+    } else {
+      delete this.providers[name];
+    }
+  }
+  getFullUrl(path, provider = this.provider) {
+    if (path.includes("://")) {
+      return path;
+    }
+    const factory = this.providers[provider];
+    if (!factory) {
+      throw new Error(`Provider ${provider} not found`);
+    }
+    return factory(path);
+  }
+}
+const urlBuilder = new UrlBuilder();
 Math.random().toString(36).slice(2, 8);
 function memoize(fn) {
   const cache = {};
@@ -203,17 +246,6 @@ function mountDom(vnode) {
 function hm(...args) {
   return mountDom(h(...args));
 }
-const providers = {
-  jsdelivr: path => `https://cdn.jsdelivr.net/npm/${path}`,
-  unpkg: path => `https://unpkg.com/${path}`
-};
-function cdnUrl(provider, path) {
-  const factory = providers[provider];
-  if (!factory) {
-    throw new Error(`Provider ${provider} not found`);
-  }
-  return factory(path);
-}
 const memoizedPreloadJS = memoize(url => {
   document.head.append(hm('link', {
     rel: 'preload',
@@ -221,20 +253,27 @@ const memoizedPreloadJS = memoize(url => {
     href: url
   }));
 });
+const jsCache = {};
+const cssCache = {};
 async function loadJSItem(item, context) {
+  var _item$data;
+  const src = item.type === 'script' && ((_item$data = item.data) == null ? void 0 : _item$data.src) || '';
+  item.loaded || (item.loaded = jsCache[src]);
   if (!item.loaded) {
     if (item.type === 'script') {
       item.loaded = new Promise((resolve, reject) => {
-        var _item$data;
         document.head.append(hm('script', _extends({}, item.data, {
           onLoad: resolve,
           onError: reject
         })));
-        // Run inline script synchronously
-        if (!((_item$data = item.data) != null && _item$data.src)) resolve(undefined);
+        if (!src) {
+          // Run inline script synchronously
+          resolve(undefined);
+        }
       }).then(() => {
         item.loaded = true;
       });
+      if (src) jsCache[src] = item.loaded;
     }
     if (item.type === 'iife') {
       const {
@@ -248,8 +287,11 @@ async function loadJSItem(item, context) {
   await item.loaded;
 }
 function loadCSSItem(item) {
+  const url = item.type === 'stylesheet' && item.data.href || '';
+  item.loaded || (item.loaded = cssCache[url]);
   if (item.loaded) return;
   item.loaded = true;
+  if (url) cssCache[url] = true;
   if (item.type === 'style') {
     document.head.append(hm('style', {
       textContent: item.data
@@ -279,24 +321,19 @@ function loadCSS(items) {
     loadCSSItem(item);
   }
 }
-let provider = 'jsdelivr';
-function getFullUrl(path, overrideProvider = provider) {
-  if (path.includes('://')) return path;
-  return cdnUrl(overrideProvider, path);
-}
-function buildJSItem(path, overrideProvider) {
+function buildJSItem(path) {
   return {
     type: 'script',
     data: {
-      src: getFullUrl(path, overrideProvider)
+      src: path
     }
   };
 }
-function buildCSSItem(path, overrideProvider) {
+function buildCSSItem(path) {
   return {
     type: 'stylesheet',
     data: {
-      href: getFullUrl(path, overrideProvider)
+      href: path
     }
   };
 }
@@ -304,12 +341,14 @@ function buildCSSItem(path, overrideProvider) {
 var _window$markmap;
 const enabled = {};
 const autoLoaderOptions = _extends$1({
-  baseJs: [`d3@${"7.8.5"}`, `markmap-lib@${"0.14.5-alpha.21"}`, `markmap-view@${"0.14.5-alpha.21"}`, `markmap-toolbar@${"0.14.5-alpha.21"}`],
-  baseCss: [`markmap-toolbar@${"0.14.5-alpha.21"}/dist/style.css`],
+  baseJs: [`d3@${"7.8.5"}`, `markmap-lib@${"0.14.5-alpha.24"}`, `markmap-view@${"0.14.5-alpha.24"}`, `markmap-toolbar@${"0.14.5-alpha.24"}`],
+  baseCss: [`markmap-toolbar@${"0.14.5-alpha.24"}/dist/style.css`],
   manual: false,
   toolbar: false
 }, (_window$markmap = window.markmap) == null ? void 0 : _window$markmap.autoLoader);
-const ready = Promise.all([loadJS(autoLoaderOptions.baseJs.map(item => typeof item === 'string' ? buildJSItem(item) : item)), loadCSS(autoLoaderOptions.baseCss.map(item => typeof item === 'string' ? buildCSSItem(item) : item))]).then(() => {
+async function initialize() {
+  await urlBuilder.findFastestProvider();
+  await Promise.all([loadJS(autoLoaderOptions.baseJs.map(item => typeof item === 'string' ? buildJSItem(urlBuilder.getFullUrl(item)) : item)), loadCSS(autoLoaderOptions.baseCss.map(item => typeof item === 'string' ? buildCSSItem(urlBuilder.getFullUrl(item)) : item))]);
   const {
     markmap
   } = window;
@@ -318,7 +357,8 @@ const ready = Promise.all([loadJS(autoLoaderOptions.baseJs.map(item => typeof it
   // Insert global CSS to body so it has higher priority than prism.css, etc.
   document.body.prepend(style);
   autoLoaderOptions.onReady == null ? void 0 : autoLoaderOptions.onReady();
-});
+}
+const ready = initialize();
 function transform(transformer, content) {
   const result = transformer.transform(content);
   const keys = Object.keys(result.features).filter(key => !enabled[key]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markmap-autoloader",
-  "version": "0.14.5-alpha.21+fb81f2c",
+  "version": "0.14.5-alpha.24+08dd40c",
   "description": "Load markmaps automatically in HTML",
   "author": "Gerald <gera2ld@live.com>",
   "license": "MIT",
@@ -38,10 +38,10 @@
     "markmap-common": "*"
   },
   "devDependencies": {
-    "markmap-common": "0.14.5-alpha.21+fb81f2c",
-    "markmap-lib": "0.14.5-alpha.21+fb81f2c",
-    "markmap-toolbar": "0.14.5-alpha.21+fb81f2c",
-    "markmap-view": "0.14.5-alpha.21+fb81f2c"
+    "markmap-common": "0.14.5-alpha.24+08dd40c",
+    "markmap-lib": "0.14.5-alpha.24+08dd40c",
+    "markmap-toolbar": "0.14.5-alpha.24+08dd40c",
+    "markmap-view": "0.14.5-alpha.24+08dd40c"
   },
-  "gitHead": "fb81f2cb688f400f17f911774539267219f639ce"
+  "gitHead": "08dd40c9353058928a148f6b97d11e98ec1d328b"
 }