@lvce-editor/extension-detail-view 4.3.0 → 4.5.0

package/dist/extensionDetailViewWorkerMain.js

@@ -251,6 +251,10 @@ const Ul = 60;
 const Code$2 = 65;
 const Dt = 67;
 
+const ClientX = 'event.clientX';
+const ClientY = 'event.clientY';
+const TargetName = 'event.target.name';
+
 const DebugWorker = 55;
 const ExtensionHostWorker = 44;
 const FileSystemWorker$1 = 209;
@@ -302,6 +306,7 @@ const FeaturesList = 'FeaturesList';
 const FeatureWebView = 'FeatureWebView';
 const Large$1 = 'Large';
 const Link = 'Link';
+const Markdown = 'Markdown';
 const MoreInfo = 'MoreInfo';
 const MoreInfoEntry = 'MoreInfoEntry';
 const MoreInfoEntryKey = 'MoreInfoEntryKey';
@@ -2377,20 +2382,20 @@ const getSettingsVirtualDom = state => {
   return getFeatureSettingsVirtualDom(state.settings);
 };
 
-const HandleClickCategory = 'handleClickCategory';
-const HandleClickDisable = 'handleClickDisable';
-const HandleClickEnable = 'handleClickEnable';
-const HandleClickScrollToTop = 'handleClickScrollToTop';
-const HandleClickSetColorTheme = 'handleClickSetColorTheme';
-const HandleClickSettings = 'handleClickSettings';
-const HandleClickSize = 'handleClickSize';
-const HandleClickUninstall = 'handleClickUninstall';
-const HandleFeaturesClick = 'handleFeaturesClick';
-const HandleIconError = 'handleIconError';
-const HandleImageContextMenu = 'handleImageContextMenu';
-const HandleReadmeContextMenu = 'handleReadmeContextMenu';
-const HandleReadmeScroll = 'handleReadmeScroll';
-const HandleTabsClick = 'handleTabsClick';
+const HandleClickCategory = 1;
+const HandleClickDisable = 2;
+const HandleClickEnable = 3;
+const HandleClickScrollToTop = 4;
+const HandleClickSetColorTheme = 5;
+const HandleClickSettings = 6;
+const HandleClickSize = 7;
+const HandleClickUninstall = 8;
+const HandleFeaturesClick = 9;
+const HandleIconError = 10;
+const HandleImageContextMenu = 11;
+const HandleReadmeContextMenu = 12;
+const HandleReadmeScroll = 13;
+const HandleTabsClick = 14;
 
 const ActivationEvents = 'ActivationEvents';
 const Changelog = 'Changelog';
@@ -2479,6 +2484,17 @@ const getThemeMarkdown = (themes, iconThemes, productIconThemes) => {
   return markdown;
 };
 
+const supportsNormalCacheKey = locationProtocol => {
+  return locationProtocol === 'http:' || locationProtocol === 'https:';
+};
+const getMarkdownCacheKey = (hash, locationProtocol) => {
+  if (supportsNormalCacheKey(locationProtocol)) {
+    return `/markdown/${hash}`;
+  }
+  // workaround for electron bug
+  return `https://markdown/${hash}`;
+};
+
 const hash = async content => {
   const sourceBytes = new TextEncoder().encode(content);
   const digest = await crypto.subtle.digest('SHA-256', sourceBytes);
@@ -2543,9 +2559,9 @@ const set$3 = async (key, value) => {
   }));
 };
 
-const renderMarkdownCached = async (markdown, options = {}) => {
+const renderMarkdownCached = async (markdown, options) => {
   const markdownHash = await hash(markdown); // TODO hash options also
-  const cacheKey = `/markdown/${markdownHash}`;
+  const cacheKey = getMarkdownCacheKey(markdownHash, options.locationProtocol);
   const hasItem = await has(cacheKey);
   if (hasItem) {
     const value = await get$1(cacheKey);
@@ -2556,12 +2572,12 @@ const renderMarkdownCached = async (markdown, options = {}) => {
   return html;
 };
 
-const renderMarkdown = async (markdown, options = {}) => {
+const renderMarkdown = async (markdown, options) => {
   const html = await renderMarkdownCached(markdown, options);
   return html;
 };
 
-const getThemeDetails = async (extension, baseUrl) => {
+const getThemeDetails = async (extension, baseUrl, locationProtocol) => {
   const {
     colorThemes,
     iconThemes,
@@ -2569,7 +2585,8 @@ const getThemeDetails = async (extension, baseUrl) => {
   } = extension;
   const markdown = getThemeMarkdown(colorThemes || [], iconThemes || [], productIconThemes || []);
   const rendered = await renderMarkdown(markdown, {
-    baseUrl
+    baseUrl,
+    locationProtocol
   });
   const themesMarkdownDom = await getMarkdownVirtualDom(rendered);
   return {
@@ -2995,7 +3012,8 @@ const create = (uid, uri, x, y, width, height, platform, assetDir) => {
     paddingLeft: 0,
     paddingRight: 0,
     showSideBar: true,
-    sideBarWidth: 0
+    sideBarWidth: 0,
+    locationProtocol: ''
   };
   set(uid, state, state);
 };
@@ -3232,7 +3250,8 @@ const selectFeature = async (state, name) => {
   const {
     features,
     extension,
-    baseUrl
+    baseUrl,
+    locationProtocol
   } = state;
   const newFeatures = features.map(feature => {
     if (feature.id === name) {
@@ -3247,7 +3266,7 @@ const selectFeature = async (state, name) => {
     };
   });
   const fn = getFeatureDetailsHandler(name);
-  const partialNewState = await fn(extension, baseUrl);
+  const partialNewState = await fn(extension, baseUrl, locationProtocol);
   return {
     ...state,
     ...partialNewState,
@@ -3408,11 +3427,13 @@ const selectTabChangelog = async state => {
   const {
     extension,
     baseUrl,
-    tabs
+    tabs,
+    locationProtocol
   } = state;
   const changelogContent = await loadChangelogContent(extension.path); // TODO use uri
   const changelogMarkdownHtml = await renderMarkdown(changelogContent, {
-    baseUrl
+    baseUrl,
+    locationProtocol
   });
   const changelogDom = await getMarkdownVirtualDom(changelogMarkdownHtml);
   const newTabs = tabs.map(tab => {
@@ -3452,12 +3473,14 @@ const selectTabDetails = async state => {
   const {
     baseUrl,
     readmeUrl,
-    tabs
+    tabs,
+    locationProtocol
   } = state;
   const readmeContent = await loadReadmeContent(readmeUrl);
   const readmeHtml = await renderMarkdown(readmeContent, {
     baseUrl,
-    linksExternal: true
+    linksExternal: true,
+    locationProtocol
   });
   const detailsDom = await getMarkdownVirtualDom(readmeHtml);
   const newTabs = tabs.map(tab => {
@@ -3480,14 +3503,15 @@ const selectTabFeatures = async state => {
     baseUrl,
     selectedFeature,
     features,
-    tabs
+    tabs,
+    locationProtocol
   } = state;
   if (features.length === 0) {
     return state;
   }
   const actualSelectedFeature = selectedFeature || Theme;
   const fn = getFeatureDetailsHandler(actualSelectedFeature);
-  const partialNewState = await fn(extension, baseUrl);
+  const partialNewState = await fn(extension, baseUrl, locationProtocol);
   const newTabs = tabs.map(tab => {
     return {
       ...tab,
@@ -3972,6 +3996,7 @@ const getInstallationEntries = (displaySize, extensionId, extensionVersion, exte
   }, {
     key: lastUpdated(),
     value: 'n/a',
+    // TODO get this from somewhere
     odd: true
   }, {
     key: size(),
@@ -4105,9 +4130,11 @@ const loadContent = async (state, platform, savedState, isTest = false) => {
   const [hasReadme, hasChangelog] = await Promise.all([existsFile(readmeUrl), existsFile(changelogUrl)]);
   const readmeContent = hasReadme ? await loadReadmeContent(readmeUrl) : noReadmeFound();
   const baseUrl = getBaseUrl(extension.path, platform);
+  const locationProtocol = location.protocol;
   const readmeHtml = await renderMarkdown(readmeContent, {
     baseUrl,
-    linksExternal: true
+    linksExternal: true,
+    locationProtocol
   });
   const detailsVirtualDom = await getMarkdownVirtualDom(readmeHtml, {
     scrollToTopEnabled: true
@@ -4175,7 +4202,8 @@ const loadContent = async (state, platform, savedState, isTest = false) => {
     sideBarWidth,
     sizeOnDisk: size,
     sizeValue,
-    tabs: enabledTabs
+    tabs: enabledTabs,
+    locationProtocol
   };
 };
 
@@ -4196,8 +4224,6 @@ const openImageInNewTab = async state => {
   return state;
 };
 
-/* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
-
 const createCss = object => {
   const inner = Object.entries(object).map(([key, value]) => `  --${key}: ${value}px;`).join('\n');
   const full = `:root {\n${inner}\n}`;
@@ -4298,6 +4324,14 @@ const getMoreInfoEntryValueTag = (onClick, code) => {
   return Dd;
 };
 
+const getExtraProps = title => {
+  if (title) {
+    return {
+      title
+    };
+  }
+  return {};
+};
 const getMoreInfoEntryValueVirtualDom = item => {
   const {
     value,
@@ -4307,12 +4341,13 @@ const getMoreInfoEntryValueVirtualDom = item => {
   } = item;
   const type = getMoreInfoEntryValueTag(onClick, code);
   const className = getMoreInfoEntryValueClassName(onClick, code);
+  const extraProps = getExtraProps(title);
   return [{
     type,
     className,
     childCount: 1,
     onClick,
-    title
+    ...extraProps
   }, text(value)];
 };
 
@@ -4396,7 +4431,7 @@ const getDetailsVirtualDom = (sanitizedReadmeHtml, width, scrollToTopButtonEnabl
   const contentDom = hasReadme ? sanitizedReadmeHtml : [{
     type: Div,
     childCount: 1,
-    className: 'Markdown'
+    className: Markdown
   }, text(noReadmeFound())];
   const dom = [{
     type: Div,
@@ -4718,19 +4753,20 @@ const render2 = (uid, diffResult) => {
   return commands;
 };
 
+// @ts-nocheck
 const renderEventListeners = () => {
   return [{
     name: HandleClickCategory,
-    params: ['handleClickCategory', 'event.target.name']
+    params: ['handleClickCategory', TargetName]
   }, {
     name: HandleIconError,
     params: ['handleIconError']
   }, {
     name: HandleReadmeContextMenu,
-    params: ['handleReadmeContextMenu', 'event.clientX', 'event.clientY', 'event.target.href', 'event.target.src']
+    params: ['handleReadmeContextMenu', ClientX, ClientY, 'event.target.href', 'event.target.src']
   }, {
     name: HandleImageContextMenu,
-    params: ['handleImageContextMenu', 'event.clientX', 'event.clientY'],
+    params: ['handleImageContextMenu', ClientX, ClientY],
     preventDefault: true
   }, {
     name: HandleReadmeScroll,
@@ -4738,13 +4774,13 @@ const renderEventListeners = () => {
     passive: true
   }, {
     name: HandleTabsClick,
-    params: ['handleTabsClick', 'event.target.name']
+    params: ['handleTabsClick', TargetName]
   }, {
     name: HandleFeaturesClick,
-    params: ['handleFeaturesClick', 'event.target.name']
+    params: ['handleFeaturesClick', TargetName]
   }, {
     name: HandleClickSize,
-    params: ['handleClickSize', 'event.target.name']
+    params: ['handleClickSize', TargetName]
   }, {
     name: HandleClickDisable,
     params: ['handleClickDisable']

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/extension-detail-view",
-  "version": "4.3.0",
+  "version": "4.5.0",
   "description": "Extension Detail View Worker",
   "repository": {
     "type": "git",
@@ -9,5 +9,8 @@
   "license": "MIT",
   "author": "Lvce Editor",
   "type": "module",
-  "main": "dist/extensionDetailViewWorkerMain.js"
+  "main": "dist/extensionDetailViewWorkerMain.js",
+  "dependencies": {
+    "@lvce-editor/constants": "^1.28.0"
+  }
 }