@lvce-editor/source-control-worker 3.10.1 → 3.10.3

package/dist/sourceControlWorkerMain.js

@@ -1340,6 +1340,8 @@ const SourceControl$1 = 22;
 const None = 0;
 
 const Web = 1;
+const Electron = 2;
+const Remote = 3;
 
 const SetCss = 'Viewlet.setCss';
 const SetDom2 = 'Viewlet.setDom2';
@@ -1622,12 +1624,17 @@ const getEnabledProviderIds$1 = (scheme, root, assetDir, platform) => {
     // noProviderFoundMessage: 'No source control provider found',
   });
 };
-const getIconDefinitions$1 = async providerId => {
-  // @ts-ignore
-  const result = await invoke$2('ExtensionHostSourceControl.getIconDefinitions', providerId);
-  return result;
+
+const isCompatible = (extension, platform) => {
+  return platform !== Web || extension?.compatibility?.web !== false;
+};
+const getExtensions = async (assetDir, platform) => {
+  const extensions = await invoke$1('Extensions.getAllExtensions', assetDir, platform);
+  return extensions.filter(extension => isCompatible(extension, platform));
 };
 
+const EmptyString = '';
+
 const Disk = 'file';
 
 const RE_PROTOCOL = /^([a-z-]+):\/\//;
@@ -1641,6 +1648,19 @@ const getProtocol = uri => {
   }
   return Disk;
 };
+const PROTOCOL_POST_FIX_LENGTH = 3;
+const getPath = (protocol, uri) => {
+  if (!uri) {
+    return '';
+  }
+  if (protocol === Disk && !uri.startsWith('file://')) {
+    return uri;
+  }
+  if (protocol === EmptyString) {
+    return uri;
+  }
+  return uri.slice(protocol.length + PROTOCOL_POST_FIX_LENGTH);
+};
 
 const acceptInput$1 = (providerId, text, assetDir, platform) => {
   string(providerId);
@@ -1704,12 +1724,29 @@ const getEnabledProviderIds = (scheme, root, assetDir, platform) => {
 const getGroups$1 = (providerId, root, assetDir, platform) => {
   return getGroups$2(providerId, root, assetDir, platform);
 };
-const getIconDefinitions = async providerIds => {
+const getIconDefinitions = async (providerIds, assetDir, platform) => {
   try {
     if (providerIds.length === 0) {
       return [];
     }
-    return await getIconDefinitions$1(providerIds[0]);
+    const extensions = await getExtensions(assetDir, platform);
+    const extension = extensions.find(extension => {
+      const idParts = typeof extension?.id === 'string' ? extension.id.split('.') : [];
+      return idParts[1] === providerIds[0];
+    });
+    if (!Array.isArray(extension?.['source-control-icons']) || typeof extension.uri !== 'string') {
+      return [];
+    }
+    const icons = extension['source-control-icons'].filter(icon => typeof icon === 'string');
+    return icons.map(icon => {
+      const uri = `${extension.uri}/${icon}`;
+      if (platform === Electron || platform === Remote) {
+        const protocol = getProtocol(uri);
+        const path = getPath(protocol, uri);
+        return `/remote${path.startsWith('/') ? '' : '/'}${path}`;
+      }
+      return uri;
+    });
   } catch {
     return [];
   }
@@ -1924,14 +1961,6 @@ const get$1 = key => {
   return getPreference(key);
 };
 
-const isCompatible = (extension, platform) => {
-  return platform !== Web || extension?.compatibility?.web !== false;
-};
-const getExtensions = async (assetDir, platform) => {
-  const extensions = await invoke$1('Extensions.getAllExtensions', assetDir, platform);
-  return extensions.filter(extension => isCompatible(extension, platform));
-};
-
 const requestSourceActions = async (assetDir = '', platform = 0) => {
   const extensions = await getExtensions(assetDir, platform);
   const newCache = Object.create(null);
@@ -2018,7 +2047,7 @@ const getNewDeltaPercent = (height, scrollBarHeight, relativeY) => {
   };
 };
 
-const loadContent = async (state, savedState) => {
+const loadContentActual = async (state, savedState) => {
   const {
     fileIconCache,
     height,
@@ -2045,7 +2074,7 @@ const loadContent = async (state, savedState) => {
   const enabledProviderIds = await getEnabledProviderIds(scheme, root, assetDir, platform);
   const providerUnavailableMessage = enabledProviderIds.length === 0 ? await getSourceControlUnavailableMessage(assetDir, platform) : '';
   const showGenerateCommitMessageButton = enabledProviderIds.length === 0 ? false : await getShowGenerateCommitMessageButton(enabledProviderIds[0], assetDir, platform);
-  const iconDefinitions = await getIconDefinitions(enabledProviderIds);
+  const iconDefinitions = await getIconDefinitions(enabledProviderIds, assetDir, platform);
   const {
     allGroups,
     gitRoot
@@ -2084,7 +2113,6 @@ const loadContent = async (state, savedState) => {
     gitRoot,
     headerHeight,
     iconDefinitions,
-    initial: false,
     inputBoxHeight,
     inputPlaceholder,
     inputValue,
@@ -2100,6 +2128,14 @@ const loadContent = async (state, savedState) => {
     visibleItems
   };
 };
+const loadContent = (state, savedState) => {
+  // eslint-disable-next-line unicorn/prefer-await
+  return loadContentActual(state, savedState).catch(error => ({
+    ...state,
+    loading: false,
+    providerUnavailableMessage: error.message
+  }));
+};
 
 const info = (...args) => {
   // @ts-ignore
@@ -3637,8 +3673,7 @@ const messageNode = {
 };
 const getSourceControlVirtualDom = (items, buttons, disabled, placeholder, inputMessage, message, loading, scrollBarHeight, scrollBarActive) => {
   const content = message ? [messageNode, text(message)] : [...getSourceControlHeaderVirtualDom(placeholder, inputMessage), ...buttons.flatMap(button => getSourceControlButtonVirtualDom(button, disabled)), ...getSourceControlListVirtualDom(items, scrollBarHeight, scrollBarActive)];
-  const progressDom = loading ? getProgressVirtualDom() : [];
-  const dom = [{
+  return [{
     ariaBusy: loading,
     childCount: (message ? 1 : 2 + buttons.length) + (loading ? 1 : 0),
     className: className,
@@ -3648,8 +3683,9 @@ const getSourceControlVirtualDom = (items, buttons, disabled, placeholder, input
     onWheel: HandleWheel,
     tabIndex: 0,
     type: Div
-  }, ...progressDom, ...content];
-  return dom;
+  },
+  // eslint-disable-next-line virtual-dom/no-conditional-spread
+  ...(loading ? getProgressVirtualDom() : []), ...content];
 };
 
 const renderItems = (oldState, newState) => {
@@ -3669,8 +3705,7 @@ const renderItems = (oldState, newState) => {
   if (initial) {
     return [SetDom2, id, []];
   }
-  const unavailableMessage = loading ? '' : providerUnavailableMessage;
-  const dom = getSourceControlVirtualDom(visibleItems, sourceControlButtons, items.length === 0, inputPlaceholder, inputMessage, unavailableMessage, loading, scrollBarHeight, scrollBarActive);
+  const dom = getSourceControlVirtualDom(visibleItems, sourceControlButtons, items.length === 0, inputPlaceholder, inputMessage, loading ? '' : providerUnavailableMessage, loading, scrollBarHeight, scrollBarActive);
   return [SetDom2, id, dom];
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/source-control-worker",
-  "version": "3.10.1",
+  "version": "3.10.3",
   "description": "Source Control Worker",
   "keywords": [
     "Lvce Editor"