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

package/dist/extensionDetailViewWorkerMain.js

@@ -951,6 +951,7 @@ const create$1 = (uid, uri, x, y, width, height, platform, assetDir) => {
     changelogVirtualDom: [],
     description: '',
     detailsVirtualDom: [],
+    displaySize: '',
     entries: [],
     extension: {},
     features: [],
@@ -961,7 +962,6 @@ const create$1 = (uid, uri, x, y, width, height, platform, assetDir) => {
     platform,
     readmeScrollTop: 0,
     resources: [],
-    sanitizedReadmeHtml: '',
     scrollToTopButtonEnabled: false,
     secondEntries: [],
     selectedFeature: '',
@@ -971,7 +971,10 @@ const create$1 = (uid, uri, x, y, width, height, platform, assetDir) => {
     showAdditionalDetailsBreakpoint: 600,
     sizeOnDisk: 0,
     uri,
-    width
+    width,
+    hasColorTheme: false,
+    isBuiltin: false,
+    sizeValue: 0
   };
   set$1(uid, state, state);
 };
@@ -1468,25 +1471,6 @@ 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');
@@ -1506,10 +1490,9 @@ const loadReadmeContent = async path => {
 const selectTabDetails = async state => {
   const {
     extension,
-    platform
+    baseUrl
   } = state;
   const readmeContent = await loadReadmeContent(extension.path);
-  const baseUrl = getBaseUrl(extension.path, platform);
   const readmeHtml = await renderMarkdown(readmeContent, {
     baseUrl
   });
@@ -1625,6 +1608,10 @@ 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);
@@ -1693,6 +1680,21 @@ 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',
@@ -1700,6 +1702,99 @@ const getCategories = () => {
   }];
 };
 
+const BYTE_UNITS = ['B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
+const BIBYTE_UNITS = ['B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'];
+const BIT_UNITS = ['b', 'kbit', 'Mbit', 'Gbit', 'Tbit', 'Pbit', 'Ebit', 'Zbit', 'Ybit'];
+const BIBIT_UNITS = ['b', 'kibit', 'Mibit', 'Gibit', 'Tibit', 'Pibit', 'Eibit', 'Zibit', 'Yibit'];
+
+/*
+Formats the given number using `Number#toLocaleString`.
+- If locale is a string, the value is expected to be a locale-key (for example: `de`).
+- If locale is true, the system default locale is used for translation.
+- If no value for locale is specified, the number is returned unmodified.
+*/
+const toLocaleString = (number, locale, options) => {
+  let result = number;
+  if (typeof locale === 'string' || Array.isArray(locale)) {
+    result = number.toLocaleString(locale, options);
+  } else if (locale === true || options !== undefined) {
+    result = number.toLocaleString(undefined, options);
+  }
+  return result;
+};
+const log10 = numberOrBigInt => {
+  if (typeof numberOrBigInt === 'number') {
+    return Math.log10(numberOrBigInt);
+  }
+  const string = numberOrBigInt.toString(10);
+  return string.length + Math.log10('0.' + string.slice(0, 15));
+};
+const log = numberOrBigInt => {
+  if (typeof numberOrBigInt === 'number') {
+    return Math.log(numberOrBigInt);
+  }
+  return log10(numberOrBigInt) * Math.log(10);
+};
+const divide = (numberOrBigInt, divisor) => {
+  if (typeof numberOrBigInt === 'number') {
+    return numberOrBigInt / divisor;
+  }
+  const integerPart = numberOrBigInt / BigInt(divisor);
+  const remainder = numberOrBigInt % BigInt(divisor);
+  return Number(integerPart) + Number(remainder) / divisor;
+};
+function prettyBytes(number, options) {
+  if (typeof number !== 'bigint' && !Number.isFinite(number)) {
+    throw new TypeError(`Expected a finite number, got ${typeof number}: ${number}`);
+  }
+  options = {
+    bits: false,
+    binary: false,
+    space: true,
+    ...options
+  };
+  const UNITS = options.bits ? options.binary ? BIBIT_UNITS : BIT_UNITS : options.binary ? BIBYTE_UNITS : BYTE_UNITS;
+  const separator = options.space ? ' ' : '';
+  if (options.signed && (typeof number === 'number' ? number === 0 : number === 0n)) {
+    return ` 0${separator}${UNITS[0]}`;
+  }
+  const isNegative = number < 0;
+  const prefix = isNegative ? '-' : options.signed ? '+' : '';
+  if (isNegative) {
+    number = -number;
+  }
+  let localeOptions;
+  if (options.minimumFractionDigits !== undefined) {
+    localeOptions = {
+      minimumFractionDigits: options.minimumFractionDigits
+    };
+  }
+  if (options.maximumFractionDigits !== undefined) {
+    localeOptions = {
+      maximumFractionDigits: options.maximumFractionDigits,
+      ...localeOptions
+    };
+  }
+  if (number < 1) {
+    const numberString = toLocaleString(number, options.locale, localeOptions);
+    return prefix + numberString + separator + UNITS[0];
+  }
+  const exponent = Math.min(Math.floor(options.binary ? log(number) / Math.log(1024) : log10(number) / 3), UNITS.length - 1);
+  number = divide(number, (options.binary ? 1024 : 1000) ** exponent);
+  if (!localeOptions) {
+    number = number.toPrecision(3);
+  }
+  const numberString = toLocaleString(Number(number), options.locale, localeOptions);
+  const unit = UNITS[exponent];
+  return prefix + numberString + separator + unit;
+}
+
+const getDisplaySize = size => {
+  return prettyBytes(size, {
+    maximumFractionDigits: 1
+  });
+};
+
 const getEntries = () => {
   return [{
     key: 'Identifier',
@@ -1811,6 +1906,10 @@ const getViewletSize = width => {
   return Large$1;
 };
 
+const hasColorThemes = extension => {
+  return Boolean(extension && extension.colorThemes && extension.colorThemes.length > 0);
+};
+
 const getSavedSelectedFeature = savedState => {
   if (savedState && typeof savedState === 'object' && 'selectedFeature' in savedState && typeof savedState.selectedFeature === 'string') {
     return savedState.selectedFeature;
@@ -1850,8 +1949,7 @@ const loadContent = async (state, platform, savedState) => {
   const readmeHtml = await renderMarkdown(readmeContent, {
     baseUrl
   });
-  const sanitizedReadmeHtml = readmeHtml;
-  const normalizedReadmeHtml = sanitizedReadmeHtml;
+  const detailsVirtualDom = await getMarkdownVirtualDom(readmeHtml);
   const iconSrc = getIcon(extension, platform, assetDir);
   const description = getDescription(extension);
   const name = getName(extension);
@@ -1863,26 +1961,34 @@ const loadContent = async (state, platform, savedState) => {
   const features = getFeatures(selectedFeature, extension);
   const extensionUri = extension.uri || extension.path;
   const folderSize = await getFolderSize(extensionUri);
+  const displaySize = getDisplaySize(size);
   const entries = getEntries();
   const secondEntries = getSecondEntries();
   const categories = getCategories();
   const resources = getResources();
+  const sizeValue = getViewletSize(width || 0);
+  const isBuiltin = extension?.builtin;
+  const hasColorTheme = hasColorThemes(extension);
   return {
     ...state,
-    selectedTab,
-    sanitizedReadmeHtml: normalizedReadmeHtml,
-    iconSrc,
-    name,
+    baseUrl,
+    categories,
     description,
-    sizeOnDisk: size,
+    detailsVirtualDom,
+    displaySize,
     entries,
-    secondEntries,
-    categories,
-    resources,
     extension,
-    baseUrl,
     features,
-    folderSize
+    folderSize,
+    hasColorTheme,
+    iconSrc,
+    isBuiltin,
+    name,
+    resources,
+    secondEntries,
+    selectedTab,
+    sizeOnDisk: size,
+    sizeValue
   };
 };
 
@@ -1986,106 +2092,13 @@ const TableCell = 'TableCell';
 const TableHeading = 'TableHeading';
 const Viewlet = 'Viewlet';
 
-const getBadge = (extension, state) => {
-  if (extension?.builtin && state.builtinExtensionsBadgeEnabled) {
+const getBadge = (builtin, badgeEnabled) => {
+  if (builtin && badgeEnabled) {
     return 'builtin';
   }
   return '';
 };
 
-const BYTE_UNITS = ['B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
-const BIBYTE_UNITS = ['B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'];
-const BIT_UNITS = ['b', 'kbit', 'Mbit', 'Gbit', 'Tbit', 'Pbit', 'Ebit', 'Zbit', 'Ybit'];
-const BIBIT_UNITS = ['b', 'kibit', 'Mibit', 'Gibit', 'Tibit', 'Pibit', 'Eibit', 'Zibit', 'Yibit'];
-
-/*
-Formats the given number using `Number#toLocaleString`.
-- If locale is a string, the value is expected to be a locale-key (for example: `de`).
-- If locale is true, the system default locale is used for translation.
-- If no value for locale is specified, the number is returned unmodified.
-*/
-const toLocaleString = (number, locale, options) => {
-  let result = number;
-  if (typeof locale === 'string' || Array.isArray(locale)) {
-    result = number.toLocaleString(locale, options);
-  } else if (locale === true || options !== undefined) {
-    result = number.toLocaleString(undefined, options);
-  }
-  return result;
-};
-const log10 = numberOrBigInt => {
-  if (typeof numberOrBigInt === 'number') {
-    return Math.log10(numberOrBigInt);
-  }
-  const string = numberOrBigInt.toString(10);
-  return string.length + Math.log10('0.' + string.slice(0, 15));
-};
-const log = numberOrBigInt => {
-  if (typeof numberOrBigInt === 'number') {
-    return Math.log(numberOrBigInt);
-  }
-  return log10(numberOrBigInt) * Math.log(10);
-};
-const divide = (numberOrBigInt, divisor) => {
-  if (typeof numberOrBigInt === 'number') {
-    return numberOrBigInt / divisor;
-  }
-  const integerPart = numberOrBigInt / BigInt(divisor);
-  const remainder = numberOrBigInt % BigInt(divisor);
-  return Number(integerPart) + Number(remainder) / divisor;
-};
-function prettyBytes(number, options) {
-  if (typeof number !== 'bigint' && !Number.isFinite(number)) {
-    throw new TypeError(`Expected a finite number, got ${typeof number}: ${number}`);
-  }
-  options = {
-    bits: false,
-    binary: false,
-    space: true,
-    ...options
-  };
-  const UNITS = options.bits ? options.binary ? BIBIT_UNITS : BIT_UNITS : options.binary ? BIBYTE_UNITS : BYTE_UNITS;
-  const separator = options.space ? ' ' : '';
-  if (options.signed && (typeof number === 'number' ? number === 0 : number === 0n)) {
-    return ` 0${separator}${UNITS[0]}`;
-  }
-  const isNegative = number < 0;
-  const prefix = isNegative ? '-' : options.signed ? '+' : '';
-  if (isNegative) {
-    number = -number;
-  }
-  let localeOptions;
-  if (options.minimumFractionDigits !== undefined) {
-    localeOptions = {
-      minimumFractionDigits: options.minimumFractionDigits
-    };
-  }
-  if (options.maximumFractionDigits !== undefined) {
-    localeOptions = {
-      maximumFractionDigits: options.maximumFractionDigits,
-      ...localeOptions
-    };
-  }
-  if (number < 1) {
-    const numberString = toLocaleString(number, options.locale, localeOptions);
-    return prefix + numberString + separator + UNITS[0];
-  }
-  const exponent = Math.min(Math.floor(options.binary ? log(number) / Math.log(1024) : log10(number) / 3), UNITS.length - 1);
-  number = divide(number, (options.binary ? 1024 : 1000) ** exponent);
-  if (!localeOptions) {
-    number = number.toPrecision(3);
-  }
-  const numberString = toLocaleString(Number(number), options.locale, localeOptions);
-  const unit = UNITS[exponent];
-  return prefix + numberString + separator + unit;
-}
-
-const getDisplaySize = size => {
-  return prettyBytes(size, {
-    maximumFractionDigits: 1
-  });
-};
-
 const HandleClickCategory = 'handleClickCategory';
 const HandleClickDisable = 'handleClickDisable';
 const HandleClickScrollToTop = 'handleClickScrollToTop';
@@ -2099,15 +2112,11 @@ const HandleReadmeContextMenu = 'handleReadmeContextMenu';
 const HandleReadmeWheel = 'handleReadmeWheel';
 const HandleTabsClick = 'handleTabsClick';
 
-const hasColorThemes = extension => {
-  return Boolean(extension && extension.colorThemes && extension.colorThemes.length > 0);
-};
-
-const getExtensionDetailButtons = extension => {
+const getExtensionDetailButtons = (hasColorTheme, isBuiltin) => {
   const allActions = [{
     label: setColorTheme$3(),
     onClick: HandleClickSetColorTheme,
-    enabled: hasColorThemes(extension),
+    enabled: hasColorTheme,
     name: SetColorTheme
   }, {
     label: disable(),
@@ -2117,7 +2126,7 @@ const getExtensionDetailButtons = extension => {
   }, {
     label: uninstall(),
     onClick: HandleClickUninstall,
-    enabled: !extension?.builtin,
+    enabled: !isBuiltin,
     name: Uninstall
   }];
   return allActions;
@@ -2340,7 +2349,8 @@ const getChildCount = (additionalDetails, scrollToTopEnabled) => {
   }
   return count;
 };
-const getDetailsVirtualDom = async (sanitizedReadmeHtml, displaySize, extensionId, extensionVersion, width, extensionUri, scrollToTopButtonEnabled, categories$1, resources$1, showAdditionalDetailsBreakpoint) => {
+const getDetailsVirtualDom = (sanitizedReadmeHtml, displaySize, extensionId, extensionVersion, width, extensionUri, scrollToTopButtonEnabled, categories$1, resources$1, showAdditionalDetailsBreakpoint // new parameter, no default
+) => {
   const firstHeading = installation();
   const entries = getInstallationEntries(displaySize, extensionId, extensionVersion, extensionUri);
   const secondHeading = marketplace();
@@ -2354,7 +2364,7 @@ const getDetailsVirtualDom = async (sanitizedReadmeHtml, displaySize, extensionI
     className: ExtensionDetailPanel,
     childCount: childCount,
     role: Panel
-  }, ...getScrollToTopVirtualDom(scrollToTopButtonEnabled), ...(await getMarkdownVirtualDom(sanitizedReadmeHtml)), ...getAdditionalDetailsVirtualDom(showAdditionalDetails, firstHeading, entries, secondHeading, secondEntries, thirdHeading, categories$1, fourthHeading, resources$1)];
+  }, ...getScrollToTopVirtualDom(scrollToTopButtonEnabled), ...sanitizedReadmeHtml, ...getAdditionalDetailsVirtualDom(showAdditionalDetails, firstHeading, entries, secondHeading, secondEntries, thirdHeading, categories$1, fourthHeading, resources$1)];
   return dom;
 };
 
@@ -2585,7 +2595,7 @@ const getVirtualDomChildCount = dom => {
   return stack.length;
 };
 
-const getFeatureThemesVirtualDom = async themesDom => {
+const getFeatureThemesVirtualDom = themesDom => {
   const childCount = getVirtualDomChildCount(themesDom);
   const heading = theme();
   return [{
@@ -2665,10 +2675,10 @@ const getFeatureWebViewsVirtualDom = extension => {
   }, ...webViews$1.flatMap(getWebViewVirtualDom)];
 };
 
-const getFeatureContentVirtualDom = async (features, themesDom, selectedFeature, extension) => {
+const getFeatureContentVirtualDom = (features, themesDom, selectedFeature, extension) => {
   switch (selectedFeature) {
     case Theme:
-      return await getFeatureThemesVirtualDom(themesDom);
+      return getFeatureThemesVirtualDom(themesDom);
     case Commands:
       return getFeatureCommandsVirtualDom(extension);
     case JsonValidation:
@@ -2710,7 +2720,7 @@ const getFeatureListVirtualDom = features => {
   }, ...features.flatMap(getFeatureListItemVirtualDom)];
 };
 
-const getFeaturesVirtualDom = async (features, themesDom, selectedFeature, extension) => {
+const getFeaturesVirtualDom = (features, themesDom, selectedFeature, extension) => {
   if (features.length === 0) {
     const none$1 = none();
     return [{
@@ -2727,15 +2737,15 @@ const getFeaturesVirtualDom = async (features, themesDom, selectedFeature, exten
     type: VirtualDomElements.Div,
     className: mergeClassNames(Sash, SashVertical),
     childCount: 0
-  }, ...(await getFeatureContentVirtualDom(features, themesDom, selectedFeature, extension))];
+  }, ...getFeatureContentVirtualDom(features, themesDom, selectedFeature, extension)];
 };
 
-const getExtensionDetailContentVirtualDom = async (sanitizedReadmeHtml, themesDom, selectedTab, features, displaySize, extensionId, extensionVersion, selectedFeature, extension, width, scrollToTopButtonEnabled, categories, resources, breakpoint) => {
+const getExtensionDetailContentVirtualDom = (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, breakpoint);
+      return getDetailsVirtualDom(sanitizedReadmeHtml, displaySize, extensionId, extensionVersion, width, extension.uri || extension.path || '', scrollToTopButtonEnabled, categories, resources, breakpoint);
     case Features$1:
-      return await getFeaturesVirtualDom(features, themesDom, selectedFeature, extension);
+      return getFeaturesVirtualDom(features, themesDom, selectedFeature, extension);
     case Changelog$1:
       return getChangelogVirtualDom();
     default:
@@ -2897,7 +2907,7 @@ const getClassNames = size => {
   }
 };
 
-const getExtensionDetailVirtualDom = async (newState, sanitizedReadmeHtml, selectedTab) => {
+const getExtensionDetailVirtualDom = (newState, selectedTab) => {
   // TODO move this to view model so that rendering occurs like
   // 1. state
   // 2. view model
@@ -2907,21 +2917,24 @@ const getExtensionDetailVirtualDom = async (newState, sanitizedReadmeHtml, selec
   const selectedFeature = newState?.selectedFeature || '';
   const extension = newState?.extension || {};
   const features = getFeatures(selectedFeature, extension);
-  const size = newState.folderSize || 0;
   const extensionId = newState?.extension?.id || 'n/a';
   const extensionVersion = newState?.extension?.version || 'n/a';
-  const displaySize = getDisplaySize(size);
+  const {
+    displaySize
+  } = newState;
   const width = newState?.width || 500;
   const tabs = getTabs(selectedTab);
-  const sizeValue = getViewletSize(newState?.width || 0);
+  const {
+    sizeValue
+  } = newState;
   const sizeClass = getClassNames(sizeValue);
-  const buttonDefs = getExtensionDetailButtons(extension);
+  const buttonDefs = getExtensionDetailButtons(newState.hasColorTheme, newState.isBuiltin);
   const {
     name,
     iconSrc,
     description
   } = newState;
-  const badge = getBadge(extension, newState);
+  const badge = getBadge(newState.isBuiltin, newState.builtinExtensionsBadgeEnabled); // TODO compute in loadContent
   const {
     settingsButtonEnabled
   } = newState;
@@ -2929,16 +2942,16 @@ 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, newState.showAdditionalDetailsBreakpoint))];
+  }, ...getExtensionDetailHeaderVirtualDom(name, iconSrc, description, badge, buttonDefs, settingsButtonEnabled), ...getTabsVirtualDom(tabs), ...getExtensionDetailContentVirtualDom(newState.detailsVirtualDom, themesHtml, selectedTab, features, displaySize, extensionId, extensionVersion, selectedFeature, extension, width, newState.scrollToTopButtonEnabled, newState.categories, newState.resources, newState.showAdditionalDetailsBreakpoint)];
   return dom;
 };
 
-const renderDom = async (oldState, newState) => {
-  const dom = await getExtensionDetailVirtualDom(newState, newState.sanitizedReadmeHtml, newState.selectedTab);
+const renderDom = (oldState, newState) => {
+  const dom = getExtensionDetailVirtualDom(newState, newState.selectedTab);
   return ['Viewlet.setDom2', dom];
 };
 
-const renderFocus = async (oldState, newState) => {
+const renderFocus = (oldState, newState) => {
   return ['Viewlet.focusElementByName', ''];
 };
 
@@ -2953,22 +2966,22 @@ const getRenderer = diffType => {
   }
 };
 
-const applyRender = async (oldState, newState, diffResult) => {
+const applyRender = (oldState, newState, diffResult) => {
   const commands = [];
   for (const item of diffResult) {
     const fn = getRenderer(item);
-    commands.push(await fn(oldState, newState));
+    commands.push(fn(oldState, newState));
   }
   return commands;
 };
 
-const render2 = async (uid, diffResult) => {
+const render2 = (uid, diffResult) => {
   const {
     oldState,
     newState
   } = get$1(uid);
   set$1(uid, oldState, newState);
-  const commands = await applyRender(oldState, newState, diffResult);
+  const commands = applyRender(oldState, newState, diffResult);
   return commands;
 };
 

package/package.json

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