@lvce-editor/extension-detail-view 3.31.0 → 3.32.0

package/dist/extensionDetailViewWorkerMain.js

@@ -944,30 +944,34 @@ const {
 
 const create$1 = (uid, uri, x, y, width, height, platform, assetDir) => {
   const state = {
+    assetDir: assetDir || '',
+    baseUrl: '',
+    builtinExtensionsBadgeEnabled: true,
+    categories: [],
+    changelogVirtualDom: [],
     description: '',
-    iconSrc: '',
-    selectedFeature: '',
-    name: '',
-    sanitizedReadmeHtml: '',
-    selectedTab: '',
-    sizeOnDisk: 0,
-    width,
-    uri,
+    detailsVirtualDom: [],
     entries: [],
-    secondEntries: [],
-    categories: [],
-    resources: [],
-    selectedFeatureMarkdownDom: '',
     extension: {},
-    baseUrl: '',
     features: [],
+    featuresVirtualDom: [],
     folderSize: 0,
-    assetDir: assetDir || '',
+    iconSrc: '',
+    name: '',
     platform,
     readmeScrollTop: 0,
+    resources: [],
+    sanitizedReadmeHtml: '',
+    scrollToTopButtonEnabled: false,
+    secondEntries: [],
+    selectedFeature: '',
+    themesMarkdownDom: [],
+    selectedTab: '',
     settingsButtonEnabled: false,
-    builtinExtensionsBadgeEnabled: true,
-    scrollToTopButtonEnabled: false
+    showAdditionalDetailsBreakpoint: 600,
+    sizeOnDisk: 0,
+    uri,
+    width
   };
   set$1(uid, state, state);
 };
@@ -1402,10 +1406,61 @@ const SetColorTheme = 'SetColorTheme';
 const Disable = 'Disable';
 const Uninstall = 'Uninstall';
 
+const getMarkdownVirtualDom = async html => {
+  string(html);
+  const dom = await getMarkdownDom(html);
+  return dom;
+};
+
+const readFile = async uri => {
+  return readFile$1(uri);
+};
+
+const ENOENT = 'ENOENT';
+
+const isEnoentError = error => {
+  return error && error.code === ENOENT;
+};
+
+const join = (pathSeparator, ...parts) => {
+  return parts.join(pathSeparator);
+};
+
+const loadChangelogContent = async path => {
+  try {
+    const changelogUrl = join('/', path, 'CHANGELOG.md');
+    const changelogContent = await readFile(changelogUrl);
+    return changelogContent;
+  } catch (error) {
+    if (isEnoentError(error)) {
+      return '';
+    }
+    // TODO send message to error worker
+    // @ts-ignore
+    console.error(new VError(error, 'Failed to load Changelog content'));
+    return `${error}`;
+  }
+};
+
+const renderMarkdown = async (markdown, options = {}) => {
+  const html = await renderMarkdown$1(markdown, options);
+  return html;
+};
+
 const selectTabChangelog = async state => {
+  const {
+    extension,
+    baseUrl
+  } = state;
+  const changelogContent = await loadChangelogContent(extension.path); // TODO use uri
+  const changelogMarkdownHtml = await renderMarkdown(changelogContent, {
+    baseUrl
+  });
+  const changelogDom = await getMarkdownVirtualDom(changelogMarkdownHtml);
   return {
     ...state,
-    selectedTab: Changelog$1
+    selectedTab: Changelog$1,
+    changelogVirtualDom: changelogDom
   };
 };
 
@@ -1413,11 +1468,56 @@ const selectTabDefault = async state => {
   return state;
 };
 
+const getRemoteSrc = uri => {
+  const src = `/remote${uri}`;
+  return src;
+};
+
+const Web = 1;
+const Electron = 2;
+const Remote = 3;
+
+const getBaseUrl = (extensionPath, platform) => {
+  switch (platform) {
+    case Remote:
+    case Electron:
+      return getRemoteSrc(extensionPath + '/');
+    default:
+      return extensionPath;
+  }
+};
+
+const loadReadmeContent = async path => {
+  try {
+    const readmeUrl = join('/', path, 'README.md');
+    const readmeContent = await readFile(readmeUrl);
+    return readmeContent;
+  } catch (error) {
+    if (isEnoentError(error)) {
+      return '';
+    }
+    // TODO send message to error worker
+    // @ts-ignore
+    console.error(new VError(error, 'Failed to load Readme content'));
+    return `${error}`;
+  }
+};
+
 const selectTabDetails = async state => {
-  // TODO load readmo markdown here
+  const {
+    extension,
+    platform
+  } = state;
+  const readmeContent = await loadReadmeContent(extension.path);
+  const baseUrl = getBaseUrl(extension.path, platform);
+  const readmeHtml = await renderMarkdown(readmeContent, {
+    baseUrl
+  });
+  const detailsDom = await getMarkdownVirtualDom(readmeHtml);
   return {
     ...state,
-    selectedTab: Details
+    selectedTab: Details,
+    detailsVirtualDom: detailsDom
   };
 };
 
@@ -1454,30 +1554,31 @@ const getThemeMarkdown = (themes, iconThemes, productIconThemes) => {
   return markdown;
 };
 
-const renderMarkdown = async (markdown, options = {}) => {
-  const html = await renderMarkdown$1(markdown, options);
-  return html;
-};
-
-const selectTab$1 = async state => {
+const selectTabFeatures = async state => {
   const {
     extension,
-    baseUrl
+    baseUrl,
+    selectedFeature
   } = state;
-  const {
-    colorThemes,
-    iconThemes,
-    productIconThemes
-  } = extension;
-  // TODO do this depending on featured tab content
-  const markdown = getThemeMarkdown(colorThemes || [], iconThemes || [], productIconThemes || []);
-  const rendered = await renderMarkdown(markdown, {
-    baseUrl
-  });
+
+  // Only generate theme markdown when the selected feature is actually "Theme"
+  let themesMarkdownDom = [];
+  if (!selectedFeature || selectedFeature === Theme) {
+    const {
+      colorThemes,
+      iconThemes,
+      productIconThemes
+    } = extension;
+    const markdown = getThemeMarkdown(colorThemes || [], iconThemes || [], productIconThemes || []);
+    const rendered = await renderMarkdown(markdown, {
+      baseUrl
+    });
+    themesMarkdownDom = await getMarkdownVirtualDom(rendered);
+  }
   return {
     ...state,
     selectedTab: Features$1,
-    selectedFeatureMarkdownDom: rendered
+    themesMarkdownDom: themesMarkdownDom
   };
 };
 
@@ -1486,7 +1587,7 @@ const getSelectTabHandler = selectedTab => {
     case Details:
       return selectTabDetails;
     case Features$1:
-      return selectTab$1;
+      return selectTabFeatures;
     case Changelog$1:
       return selectTabChangelog;
     default:
@@ -1524,10 +1625,6 @@ const isThemeExtension = extension => {
   return extension.name && extension.name.endsWith(' Theme');
 };
 
-const Web = 1;
-const Electron = 2;
-const Remote = 3;
-
 const getIcon = (extension, platform, assetDir) => {
   if (!extension) {
     return extensionDefaultIcon(assetDir);
@@ -1596,21 +1693,6 @@ const getExtension = async (id, platform) => {
   }
 };
 
-const getRemoteSrc = uri => {
-  const src = `/remote${uri}`;
-  return src;
-};
-
-const getBaseUrl = (extensionPath, platform) => {
-  switch (platform) {
-    case Remote:
-    case Electron:
-      return getRemoteSrc(extensionPath + '/');
-    default:
-      return extensionPath;
-  }
-};
-
 const getCategories = () => {
   return [{
     id: 'themes',
@@ -1729,36 +1811,6 @@ const getViewletSize = width => {
   return Large$1;
 };
 
-const readFile = async uri => {
-  return readFile$1(uri);
-};
-
-const ENOENT = 'ENOENT';
-
-const isEnoentError = error => {
-  return error && error.code === ENOENT;
-};
-
-const join = (pathSeparator, ...parts) => {
-  return parts.join(pathSeparator);
-};
-
-const loadReadmeContent = async path => {
-  try {
-    const readmeUrl = join('/', path, 'README.md');
-    const readmeContent = await readFile(readmeUrl);
-    return readmeContent;
-  } catch (error) {
-    if (isEnoentError(error)) {
-      return '';
-    }
-    // TODO send message to error worker
-    // @ts-ignore
-    console.error(new VError(error, 'Failed to load Readme content'));
-    return `${error}`;
-  }
-};
-
 const getSavedSelectedFeature = savedState => {
   if (savedState && typeof savedState === 'object' && 'selectedFeature' in savedState && typeof savedState.selectedFeature === 'string') {
     return savedState.selectedFeature;
@@ -2253,12 +2305,6 @@ const getInstallationEntries = (displaySize, extensionId, extensionVersion, exte
   return entries;
 };
 
-const getMarkdownVirtualDom = async html => {
-  string(html);
-  const dom = await getMarkdownDom(html);
-  return dom;
-};
-
 const getMarketplaceEntries = () => {
   return [{
     key: 'Published',
@@ -2294,14 +2340,13 @@ const getChildCount = (additionalDetails, scrollToTopEnabled) => {
   }
   return count;
 };
-const getDetailsVirtualDom = async (sanitizedReadmeHtml, displaySize, extensionId, extensionVersion, width, extensionUri, scrollToTopButtonEnabled, categories$1, resources$1) => {
+const getDetailsVirtualDom = async (sanitizedReadmeHtml, displaySize, extensionId, extensionVersion, width, extensionUri, scrollToTopButtonEnabled, categories$1, resources$1, showAdditionalDetailsBreakpoint) => {
   const firstHeading = installation();
   const entries = getInstallationEntries(displaySize, extensionId, extensionVersion, extensionUri);
   const secondHeading = marketplace();
   const secondEntries = getMarketplaceEntries();
   const thirdHeading = categories();
   const fourthHeading = resources();
-  const showAdditionalDetailsBreakpoint = 600;
   const showAdditionalDetails = width > showAdditionalDetailsBreakpoint;
   const childCount = getChildCount(showAdditionalDetails, scrollToTopButtonEnabled);
   const dom = [{
@@ -2540,9 +2585,8 @@ const getVirtualDomChildCount = dom => {
   return stack.length;
 };
 
-const getFeatureThemesVirtualDom = async themesHtml => {
-  const markdownDom = await getMarkdownVirtualDom(themesHtml);
-  const childCount = getVirtualDomChildCount(markdownDom);
+const getFeatureThemesVirtualDom = async themesDom => {
+  const childCount = getVirtualDomChildCount(themesDom);
   const heading = theme();
   return [{
     type: VirtualDomElements.Div,
@@ -2552,7 +2596,7 @@ const getFeatureThemesVirtualDom = async themesHtml => {
     type: VirtualDomElements.Div,
     className: DefaultMarkdown,
     childCount
-  }, ...markdownDom];
+  }, ...themesDom];
 };
 
 const toWebView = rawWebView => {
@@ -2621,10 +2665,10 @@ const getFeatureWebViewsVirtualDom = extension => {
   }, ...webViews$1.flatMap(getWebViewVirtualDom)];
 };
 
-const getFeatureContentVirtualDom = async (features, themesHtml, selectedFeature, extension) => {
+const getFeatureContentVirtualDom = async (features, themesDom, selectedFeature, extension) => {
   switch (selectedFeature) {
     case Theme:
-      return await getFeatureThemesVirtualDom(themesHtml);
+      return await getFeatureThemesVirtualDom(themesDom);
     case Commands:
       return getFeatureCommandsVirtualDom(extension);
     case JsonValidation:
@@ -2666,7 +2710,7 @@ const getFeatureListVirtualDom = features => {
   }, ...features.flatMap(getFeatureListItemVirtualDom)];
 };
 
-const getFeaturesVirtualDom = async (features, themesHtml, selectedFeature, extension) => {
+const getFeaturesVirtualDom = async (features, themesDom, selectedFeature, extension) => {
   if (features.length === 0) {
     const none$1 = none();
     return [{
@@ -2683,15 +2727,15 @@ const getFeaturesVirtualDom = async (features, themesHtml, selectedFeature, exte
     type: VirtualDomElements.Div,
     className: mergeClassNames(Sash, SashVertical),
     childCount: 0
-  }, ...(await getFeatureContentVirtualDom(features, themesHtml, selectedFeature, extension))];
+  }, ...(await getFeatureContentVirtualDom(features, themesDom, selectedFeature, extension))];
 };
 
-const getExtensionDetailContentVirtualDom = async (sanitizedReadmeHtml, themesHtml, selectedTab, features, displaySize, extensionId, extensionVersion, selectedFeature, extension, width, scrollToTopButtonEnabled, categories, resources) => {
+const getExtensionDetailContentVirtualDom = async (sanitizedReadmeHtml, themesDom, selectedTab, features, displaySize, extensionId, extensionVersion, selectedFeature, extension, width, scrollToTopButtonEnabled, categories, resources, breakpoint) => {
   switch (selectedTab) {
     case Details:
-      return await getDetailsVirtualDom(sanitizedReadmeHtml, displaySize, extensionId, extensionVersion, width, extension.uri || extension.path || '', scrollToTopButtonEnabled, categories, resources);
+      return await getDetailsVirtualDom(sanitizedReadmeHtml, displaySize, extensionId, extensionVersion, width, extension.uri || extension.path || '', scrollToTopButtonEnabled, categories, resources, breakpoint);
     case Features$1:
-      return await getFeaturesVirtualDom(features, themesHtml, selectedFeature, extension);
+      return await getFeaturesVirtualDom(features, themesDom, selectedFeature, extension);
     case Changelog$1:
       return getChangelogVirtualDom();
     default:
@@ -2748,6 +2792,17 @@ const getExtensionDetailHeaderActionsVirtualDom = (buttonDefs, settingsButtonEna
   return dom;
 };
 
+const getExtensionDetailIconVirtualDom = iconSrc => {
+  return {
+    type: VirtualDomElements.Img,
+    className: ExtensionDetailIcon,
+    alt: '',
+    draggable: false,
+    childCount: 0,
+    src: iconSrc
+  };
+};
+
 const getNameBadgeVirtualDom = badge => {
   if (!badge) {
     return [];
@@ -2772,14 +2827,7 @@ const getExtensionDetailHeaderVirtualDom = (name, iconSrc, description, badge, b
     type: VirtualDomElements.Div,
     className: ExtensionDetailHeader,
     childCount: 2
-  }, {
-    type: VirtualDomElements.Img,
-    className: ExtensionDetailIcon,
-    alt: '',
-    draggable: false,
-    childCount: 0,
-    src: iconSrc
-  }, {
+  }, getExtensionDetailIconVirtualDom(iconSrc), {
     type: VirtualDomElements.Div,
     className: ExtensionDetailHeaderDetails,
     childCount: 3
@@ -2855,7 +2903,7 @@ const getExtensionDetailVirtualDom = async (newState, sanitizedReadmeHtml, selec
   // 2. view model
   // 3. virtual dom
   // 4. dom
-  const themesHtml = newState?.selectedFeatureMarkdownDom || '';
+  const themesHtml = newState.themesMarkdownDom;
   const selectedFeature = newState?.selectedFeature || '';
   const extension = newState?.extension || {};
   const features = getFeatures(selectedFeature, extension);
@@ -2881,7 +2929,7 @@ const getExtensionDetailVirtualDom = async (newState, sanitizedReadmeHtml, selec
     type: VirtualDomElements.Div,
     className: mergeClassNames(Viewlet, ExtensionDetail, sizeClass),
     childCount: 3
-  }, ...getExtensionDetailHeaderVirtualDom(name, iconSrc, description, badge, buttonDefs, settingsButtonEnabled), ...getTabsVirtualDom(tabs), ...(await getExtensionDetailContentVirtualDom(sanitizedReadmeHtml, themesHtml, selectedTab, features, displaySize, extensionId, extensionVersion, selectedFeature, extension, width, newState.scrollToTopButtonEnabled, newState.categories, newState.resources))];
+  }, ...getExtensionDetailHeaderVirtualDom(name, iconSrc, description, badge, buttonDefs, settingsButtonEnabled), ...getTabsVirtualDom(tabs), ...(await getExtensionDetailContentVirtualDom(sanitizedReadmeHtml, themesHtml, selectedTab, features, displaySize, extensionId, extensionVersion, selectedFeature, extension, width, newState.scrollToTopButtonEnabled, newState.categories, newState.resources, newState.showAdditionalDetailsBreakpoint))];
   return dom;
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/extension-detail-view",
-  "version": "3.31.0",
+  "version": "3.32.0",
   "description": "Extension Detail View Worker",
   "license": "MIT",
   "author": "Lvce Editor",