@lvce-editor/extension-detail-view 5.8.0 → 5.10.0

package/dist/extensionDetailViewWorkerMain.js

@@ -2623,7 +2623,7 @@ const supportsNormalCacheKey = locationProtocol => {
 
 const getMarkdownCacheHash = async (markdown, options) => {
   const stringifiedOptions = JSON.stringify(options);
-  const contents = `${markdown}:${stringifiedOptions}`;
+  const contents = `${markdown}:${stringifiedOptions}:${options.commit}`;
   return hash(contents);
 };
 const getMarkdownCacheKey = async (markdown, options) => {
@@ -2636,7 +2636,7 @@ const getMarkdownCacheKey = async (markdown, options) => {
 };
 
 // TODO pass application name from renderer worker to not hardcode it
-const bucketName = 'markdown-cache';
+
 const cachedCaches = Object.create(null);
 const noopCache = {
   async match() {
@@ -2648,7 +2648,7 @@ const supportsStorageBuckets = () => {
   // @ts-ignore
   return Boolean(navigator.storageBuckets);
 };
-const getCacheInternal = async cacheName => {
+const getCacheInternal = async (cacheName, bucketName) => {
   if (!supportsStorageBuckets()) {
     return noopCache;
   }
@@ -2661,28 +2661,28 @@ const getCacheInternal = async cacheName => {
   const cache = await bucket.caches.open(cacheName);
   return cache;
 };
-const getCache = cacheName => {
+const getCache = (cacheName, bucketName) => {
   if (!(cacheName in cachedCaches)) {
-    cachedCaches[cacheName] = getCacheInternal(cacheName);
+    cachedCaches[cacheName] = getCacheInternal(cacheName, bucketName);
   }
   return cachedCaches[cacheName];
 };
 
 // TODO pass application name from renderer worker to not hardcode it
 const cacheName = 'lvce-editor/markdown-cache';
-const has = async key => {
-  const cache = await getCache(cacheName);
+const has = async (key, bucketName) => {
+  const cache = await getCache(cacheName, bucketName);
   const response = await cache.match(key);
   return Boolean(response);
 };
-const get$1 = async key => {
-  const cache = await getCache(cacheName);
+const get$1 = async (key, bucketName) => {
+  const cache = await getCache(cacheName, bucketName);
   const response = await cache.match(key);
   const text = await response?.text();
   return text || '';
 };
-const set$2 = async (key, value) => {
-  const cache = await getCache(cacheName);
+const set$2 = async (key, bucketName, value) => {
+  const cache = await getCache(cacheName, bucketName);
   await cache.put(key, new Response(value, {
     headers: {
       'Content-Length': `${value.length}`,
@@ -2693,13 +2693,14 @@ const set$2 = async (key, value) => {
 
 const renderMarkdownCached = async (markdown, options) => {
   const cacheKey = await getMarkdownCacheKey(markdown, options);
-  const hasItem = await has(cacheKey);
+  const bucketName = `markdown-cache`;
+  const hasItem = await has(cacheKey, bucketName);
   if (hasItem) {
-    const value = await get$1(cacheKey);
+    const value = await get$1(cacheKey, bucketName);
     return value; // TODO validate if it's valid
   }
   const html = await render(markdown, options);
-  await set$2(cacheKey, html);
+  await set$2(cacheKey, bucketName, html);
   return html;
 };
 
@@ -3085,6 +3086,7 @@ const create = (uid, uri, x, y, width, height, platform, assetDir) => {
     changelogScrollTop: 0,
     changelogVirtualDom: [],
     commands: [],
+    commit: '',
     description: '',
     detailsVirtualDom: [],
     disabled: false,
@@ -3623,7 +3625,7 @@ const isEnoentError = error => {
 const error = async error => {
   // TODO send message to error worker or log worker
   // @ts-ignore
-  console.error(message);
+  console.error(error);
 };
 
 const join = (...parts) => {
@@ -3739,12 +3741,25 @@ const selectTabFeatures = async state => {
       selected: tab.name === Features
     };
   });
+  const newFeatures = features.map(feature => {
+    if (feature.id === actualSelectedFeature) {
+      return {
+        ...feature,
+        selected: true
+      };
+    }
+    return {
+      ...feature,
+      selected: false
+    };
+  });
   return {
     ...state,
+    ...partialNewState,
+    features: newFeatures,
     selectedFeature: features[0].id || '',
     selectedTab: Features,
-    tabs: newTabs,
-    ...partialNewState
+    tabs: newTabs
   };
 };
 
@@ -3914,6 +3929,15 @@ const getBaseUrl = (extensionPath, platform) => {
   }
 };
 
+const getCommit = async () => {
+  try {
+    const commit = await invoke$1('Layout.getCommit');
+    return commit;
+  } catch {
+    return '';
+  }
+};
+
 const getExtensionIdFromUri = uri => {
   const id = uri.slice('extension-detail://'.length);
   return id;
@@ -4286,21 +4310,26 @@ const getLicenseLink = extension => {
   return '#';
 };
 
-const getRepositoryLinkRaw = extension => {
-  if (extension && hasProperty(extension, 'repository') && typeof extension.repository === 'string') {
-    return extension.repository; // TODO watch out for javascript: or other invalid links or path traversal
-  }
-  return '';
-};
 const ensureValidLink = link => {
   if (!link) {
     return '';
   }
-  const parsed = new URL(link);
-  if (parsed.protocol !== 'https:') {
+  try {
+    const parsed = new URL(link);
+    if (parsed.protocol !== 'https:') {
+      return '';
+    }
+    return link;
+  } catch {
     return '';
   }
-  return link;
+};
+
+const getRepositoryLinkRaw = extension => {
+  if (extension && hasProperty(extension, 'repository') && typeof extension.repository === 'string') {
+    return extension.repository; // TODO watch out for javascript: or other invalid links or path traversal
+  }
+  return '';
 };
 const getRepositoryLink = extension => {
   const raw = getRepositoryLinkRaw(extension);
@@ -4405,6 +4434,7 @@ const loadContent = async (state, platform, savedState, isTest = false) => {
   if (!extension) {
     throw new ExtensionNotFoundError(id);
   }
+  const commit = await getCommit();
   const headerData = loadHeaderContent(state, platform, extension);
   const {
     badge,
@@ -4426,6 +4456,7 @@ const loadContent = async (state, platform, savedState, isTest = false) => {
   const locationProtocol = location.protocol;
   const readmeHtml = await renderMarkdown(readmeContent, {
     baseUrl,
+    commit,
     linksExternal: true,
     locationProtocol
   });
@@ -4466,6 +4497,7 @@ const loadContent = async (state, platform, savedState, isTest = false) => {
     buttons,
     categories,
     changelogScrollTop,
+    commit,
     description,
     detailsVirtualDom,
     disabled,
@@ -5091,7 +5123,6 @@ const render2 = (uid, diffResult) => {
   return commands;
 };
 
-// @ts-nocheck
 const renderEventListeners = () => {
   return [{
     name: HandleAdditionalDetailContextMenu,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/extension-detail-view",
-  "version": "5.8.0",
+  "version": "5.10.0",
   "description": "Extension Detail View Worker",
   "repository": {
     "type": "git",