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

package/dist/extensionDetailViewWorkerMain.js

@@ -30,6 +30,7 @@ const Id = 'ID';
 const Identifier = 'Identifier';
 const ImportTime = 'Import Time: ';
 const Installation = 'Installation';
+const InvalidLink = 'Invalid link';
 const Issues = 'Issues';
 const JsonValidation$1 = 'Json Validation';
 const Label = 'Label';
@@ -42,12 +43,14 @@ const NoReadmeFound = 'No Readme Found.';
 const OpenImageInNewTab = 'Open Image in New Tab';
 const OpenInNewTab = 'Open in New Tab';
 const ProgrammingLanguages$1 = 'Programming Languages';
+const PropertyMustBeOfTypeString = 'Property must be a string';
 const Published = 'Published';
 const Repository = 'Repository';
 const Resources$1 = 'Resources';
 const RuntimeStatus$1 = 'Runtime Status';
 const SaveImageAs = 'Save Image as';
 const Schema = 'Schema';
+const SchemaNotFound = 'Schema not found';
 const ScrollToTop$1 = 'Scroll to top';
 const SelectedFeatureUnknownOrUnsupported = 'Selected feature is unknown or unsupported';
 const Selector = 'Selector';
@@ -207,6 +210,15 @@ const repository = () => {
 const license = () => {
   return i18nString(License);
 };
+const propertyMustBeOfTypeString = () => {
+  return i18nString(PropertyMustBeOfTypeString);
+};
+const schemaNotFound = () => {
+  return i18nString(SchemaNotFound);
+};
+const invalidLink = () => {
+  return i18nString(InvalidLink);
+};
 
 const getActivationEventsDetails = async extension => {
   const activationEvents = extension.activation || [];
@@ -305,7 +317,7 @@ const Features$1 = 'Features';
 const FeaturesList = 'FeaturesList';
 const FeatureWebView = 'FeatureWebView';
 const Large$1 = 'Large';
-const Link = 'Link';
+const Link$1 = 'Link';
 const Markdown = 'Markdown';
 const MoreInfo = 'MoreInfo';
 const MoreInfoEntry = 'MoreInfoEntry';
@@ -323,6 +335,7 @@ const SettingsIcon = 'SettingsIcon';
 const Small$1 = 'Small';
 const Table = 'Table';
 const TableCell = 'TableCell';
+const TableCellInvalid = 'TableCellInvalid';
 const TableHeading = 'TableHeading';
 const Viewlet = 'Viewlet';
 
@@ -363,6 +376,7 @@ const getActivationEventsVirtualDom = state => {
 
 const Text = 1;
 const Code = 2;
+const Link = 7;
 
 const getCommandTableEntry = command => {
   // TODO watch out for command being null/undefined/number/string/array
@@ -424,31 +438,58 @@ const getTableHeadingVirtualDom = heading => {
   }, text(heading)];
 };
 
-const getCellCodeVirtualDom = value => {
+const getCellCodeVirtualDom = (value, props) => {
+  const tdClassName = props?.className ? `${TableCell} ${props.className}` : TableCell;
   return [{
     type: Td,
-    className: TableCell,
-    childCount: 1
+    className: tdClassName,
+    childCount: 1,
+    ...(props?.title ? {
+      title: props.title
+    } : {})
   }, {
     type: Code$2,
     childCount: 1
   }, text(value)];
 };
 
-const getCellTextVirtualDom = value => {
+const getCellLinkVirtualDom = (value, props) => {
+  const tdClassName = props?.className ? `${TableCell} ${props.className}` : TableCell;
   return [{
     type: Td,
-    className: TableCell,
+    className: tdClassName,
+    childCount: 1,
+    ...(props?.title ? {
+      title: props.title
+    } : {})
+  }, {
+    type: A,
+    className: Link$1,
+    href: props?.href,
     childCount: 1
   }, text(value)];
 };
 
+const getCellTextVirtualDom = (value, props) => {
+  const tdClassName = props?.className ? `${TableCell} ${props.className}` : TableCell;
+  return [{
+    type: Td,
+    className: tdClassName,
+    childCount: 1,
+    ...(props?.title ? {
+      title: props.title
+    } : {})
+  }, text(value)];
+};
+
 const getCellRenderer = type => {
   switch (type) {
     case Code:
       return getCellCodeVirtualDom;
     case Text:
       return getCellTextVirtualDom;
+    case Link:
+      return getCellLinkVirtualDom;
     default:
       throw new Error(`unexpected cell type ${type}`);
   }
@@ -457,10 +498,11 @@ const getCellRenderer = type => {
 const getCellVirtualDom = entry => {
   const {
     value,
-    type
+    type,
+    ...props
   } = entry;
   const fn = getCellRenderer(type);
-  return fn(value);
+  return fn(value, props);
 };
 
 const getTableRowVirtualDom = entries => {
@@ -509,24 +551,187 @@ const getCommandsVirtualDom = state => {
   return getFeatureCommandsVirtualDom(state.commands);
 };
 
-const getJsonValidationTableEntry = validation => {
-  // TODO handle case when validation is invalid like null
+const isExternalLink = schema => {
+  return schema.startsWith('http://') || schema.startsWith('https://');
+};
+const hasWhitespace = value => {
+  return /\s/.test(value);
+};
+const isOnlyDotsOrEmpty = value => {
+  const trimmed = value.trim();
+  return trimmed === '' || /^\.*$/.test(trimmed);
+};
+const isValidHttpUrl = value => {
+  try {
+    const url = new URL(value);
+    return (url.protocol === 'http:' || url.protocol === 'https:') && !!url.hostname;
+  } catch {
+    return false;
+  }
+};
+const isValidRelativePath = value => {
+  // Disallow schemes and whitespace
+  if (hasWhitespace(value)) {
+    return false;
+  }
+  if (value.includes('://')) {
+    return false;
+  }
+  if (isOnlyDotsOrEmpty(value)) {
+    return false;
+  }
+  // Allow paths like ./a.json, ../a.json, /a.json, schemas/a.json, a/b.json
+  if (!/^[./]?[A-Za-z0-9._\-/]+$/.test(value)) {
+    return false;
+  }
+  // Must contain at least one alphanumeric character
+  if (!/[A-Za-z0-9]/.test(value)) {
+    return false;
+  }
+  return true;
+};
+const getSchemaLinkUrl = (schema, extensionUri) => {
+  if (!schema || typeof schema !== 'string') {
+    return '';
+  }
+  const trimmed = schema.trim();
+  if (trimmed !== schema) {
+    return '';
+  }
+  if (isExternalLink(schema)) {
+    return isValidHttpUrl(schema) ? schema : '';
+  }
+  if (!isValidRelativePath(schema)) {
+    return '';
+  }
+  try {
+    return new URL(schema, extensionUri).toString();
+  } catch {
+    return '';
+  }
+};
+
+const existsJson = async schemaUrl => {
+  try {
+    // TODO verify that response header is json
+    const response = await fetch(schemaUrl, {
+      method: 'HEAD'
+    });
+    return response.ok;
+  } catch {
+    return false;
+  }
+};
+const getJsonValidationInfos = async (extensionUri, validations) => {
+  const validationInfos = [];
+  for (const validation of validations) {
+    const schema = validation.schema ?? validation.url;
+    const schemaLinkUrl = getSchemaLinkUrl(schema, extensionUri);
+    const {
+      fileMatch
+    } = validation;
+    if (typeof schema !== 'string') {
+      validationInfos.push({
+        isValid: false,
+        stringValue: JSON.stringify(schema),
+        schemaUrl: '',
+        errorMessage: propertyMustBeOfTypeString(),
+        fileMatch
+      });
+    } else if (schema && !schemaLinkUrl) {
+      validationInfos.push({
+        isValid: false,
+        stringValue: schema,
+        schemaUrl: schemaLinkUrl,
+        errorMessage: invalidLink(),
+        fileMatch
+      });
+    } else if (schemaLinkUrl) {
+      if (await existsJson(schemaLinkUrl)) {
+        validationInfos.push({
+          isValid: true,
+          stringValue: schema,
+          schemaUrl: schemaLinkUrl,
+          errorMessage: '',
+          fileMatch
+        });
+      } else {
+        validationInfos.push({
+          isValid: false,
+          stringValue: schema,
+          schemaUrl: schemaLinkUrl,
+          errorMessage: schemaNotFound(),
+          fileMatch
+        });
+      }
+    } else {
+      validationInfos.push({
+        isValid: true,
+        stringValue: schema,
+        schemaUrl: schemaLinkUrl,
+        errorMessage: '',
+        fileMatch
+      });
+    }
+  }
+  return validationInfos;
+};
+
+const getJsonValidationTableEntry = validationInfo => {
   const {
+    isValid,
+    errorMessage,
+    schemaUrl,
+    stringValue,
     fileMatch
-  } = validation;
-  const schema = validation.schema ?? validation.url;
+  } = validationInfo;
+  if (!isValid && schemaUrl) {
+    return [{
+      type: Code,
+      value: fileMatch
+    }, {
+      type: Link,
+      value: stringValue,
+      href: schemaUrl,
+      className: TableCellInvalid,
+      title: errorMessage
+    }];
+  }
+  if (!isValid) {
+    return [{
+      type: Text,
+      value: fileMatch
+    }, {
+      type: Text,
+      value: stringValue,
+      className: TableCellInvalid,
+      title: errorMessage
+    }];
+  }
+  if (schemaUrl) {
+    return [{
+      type: Code,
+      value: fileMatch
+    }, {
+      type: Link,
+      value: stringValue,
+      href: schemaUrl
+    }];
+  }
   return [{
     type: Code,
     value: fileMatch
   }, {
-    type: Code,
-    value: schema
+    type: Text,
+    value: stringValue
   }];
 };
 
 const getJsonValidationDetails = async extension => {
   const validations = extension.jsonValidation || [];
-  const rows = validations.map(getJsonValidationTableEntry);
+  const extensionUri = extension.uri || '';
+  const validationInfos = await getJsonValidationInfos(extensionUri, validations);
+  const rows = validationInfos.map(getJsonValidationTableEntry);
   return {
     jsonValidation: rows
   };
@@ -2396,6 +2601,7 @@ const HandleImageContextMenu = 11;
 const HandleReadmeContextMenu = 12;
 const HandleReadmeScroll = 13;
 const HandleTabsClick = 14;
+const HandleAdditionalDetailContextMenu = 15;
 
 const ActivationEvents = 'ActivationEvents';
 const Changelog = 'Changelog';
@@ -2487,12 +2693,13 @@ const getThemeMarkdown = (themes, iconThemes, productIconThemes) => {
 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}`;
+  return `https://-/markdown/${hash}`;
 };
 
 const hash = async content => {
@@ -3134,6 +3341,10 @@ const getMenus = () => {
   }];
 };
 
+const handleAdditionalDetailContextMenu = state => {
+  return state;
+};
+
 const openExtensionSearch = async searchValue => {
   await openExtensionSearch$1();
   await setExtensionsSearchValue(searchValue);
@@ -4302,7 +4513,7 @@ const getMoreInfoEntryKeyVirtualDom = item => {
   return [parentNode, text(key)];
 };
 
-const classLink = mergeClassNames(MoreInfoEntryValue, Link);
+const classLink = mergeClassNames(MoreInfoEntryValue, Link$1);
 const classCode = mergeClassNames(MoreInfoEntryValue, Code$1);
 const getMoreInfoEntryValueClassName = (onClick, code) => {
   if (onClick) {
@@ -4324,13 +4535,15 @@ const getMoreInfoEntryValueTag = (onClick, code) => {
   return Dd;
 };
 
-const getExtraProps = title => {
+const getExtraProps = (title, onClick) => {
+  const props = Object.create(null);
   if (title) {
-    return {
-      title
-    };
+    props.title = title;
   }
-  return {};
+  if (onClick) {
+    props.tabIndex = 0;
+  }
+  return props;
 };
 const getMoreInfoEntryValueVirtualDom = item => {
   const {
@@ -4341,7 +4554,7 @@ const getMoreInfoEntryValueVirtualDom = item => {
   } = item;
   const type = getMoreInfoEntryValueTag(onClick, code);
   const className = getMoreInfoEntryValueClassName(onClick, code);
-  const extraProps = getExtraProps(title);
+  const extraProps = getExtraProps(title, onClick);
   return [{
     type,
     className,
@@ -4410,7 +4623,8 @@ const getAdditionalDetailsVirtualDom = (showAdditionalDetails, firstHeading, ent
     type: Div,
     className: AdditionalDetails,
     tabIndex: 0,
-    childCount: 4
+    childCount: 4,
+    onClick: HandleAdditionalDetailContextMenu
   }, ...getAdditionalDetailsEntryVirtualDom(firstHeading, entries, getMoreInfoVirtualDom), ...getAdditionalDetailsEntryVirtualDom(secondHeading, secondEntries, getMoreInfoVirtualDom), ...getAdditionalDetailsEntryVirtualDom(thirdHeading, categories, getCategoriesDom), ...getAdditionalDetailsEntryVirtualDom(fourthHeading, resources, getResourcesVirtualDom)];
 };
 
@@ -4756,6 +4970,10 @@ const render2 = (uid, diffResult) => {
 // @ts-nocheck
 const renderEventListeners = () => {
   return [{
+    name: HandleAdditionalDetailContextMenu,
+    params: ['handleAdditionalDetailsContextMenu'],
+    preventDefault: true
+  }, {
     name: HandleClickCategory,
     params: ['handleClickCategory', TargetName]
   }, {
@@ -4839,6 +5057,7 @@ const commandMap = {
   'ExtensionDetail.getMenuEntries': getMenuEntries,
   'ExtensionDetail.getMenus': getMenus,
   'ExtensionDetail.handleClickCategory': wrapCommand(handleClickCategory),
+  'ExtensionDetail.handleAdditionalDetailsContextMenu': wrapCommand(handleAdditionalDetailContextMenu),
   'ExtensionDetail.handleClickDisable': wrapCommand(handleClickDisable),
   'ExtensionDetail.handleClickEnable': wrapCommand(handleClickEnable),
   'ExtensionDetail.handleClickScrollToTop': wrapCommand(handleClickScrollToTop),

package/package.json

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