@lvce-editor/source-control-worker 3.10.0 → 3.10.2

package/dist/sourceControlWorkerMain.js

@@ -1927,13 +1927,13 @@ const get$1 = key => {
 const isCompatible = (extension, platform) => {
   return platform !== Web || extension?.compatibility?.web !== false;
 };
-const getExtensions = async platform => {
-  const extensions = await invoke$2('Extensions.getExtensions');
+const getExtensions = async (assetDir, platform) => {
+  const extensions = await invoke$1('Extensions.getAllExtensions', assetDir, platform);
   return extensions.filter(extension => isCompatible(extension, platform));
 };
 
-const requestSourceActions = async (platform = 0) => {
-  const extensions = await getExtensions(platform);
+const requestSourceActions = async (assetDir = '', platform = 0) => {
+  const extensions = await getExtensions(assetDir, platform);
   const newCache = Object.create(null);
   for (const extension of extensions) {
     if (!extension || !extension['source-control-actions']) {
@@ -1947,8 +1947,8 @@ const requestSourceActions = async (platform = 0) => {
   return newCache;
 };
 
-const requestSourceControlButtons = async (platform = 0) => {
-  const extensions = await getExtensions(platform);
+const requestSourceControlButtons = async (assetDir = '', platform = 0) => {
+  const extensions = await getExtensions(assetDir, platform);
   const buttons = [];
   for (const extension of extensions) {
     if (!extension || !Array.isArray(extension['source-control-buttons'])) {
@@ -2018,7 +2018,7 @@ const getNewDeltaPercent = (height, scrollBarHeight, relativeY) => {
   };
 };
 
-const loadContent = async (state, savedState) => {
+const loadContentActual = async (state, savedState) => {
   const {
     fileIconCache,
     height,
@@ -2052,8 +2052,8 @@ const loadContent = async (state, savedState) => {
   } = await getGroups(enabledProviderIds, root, assetDir, platform);
   const expandedGroups = restoreExpandedGroups(allGroups);
   const displayItems = getDisplayItems(allGroups, expandedGroups, iconDefinitions);
-  const actionsCache = enabledProviderIds.length === 0 ? Object.create(null) : await requestSourceActions(platform);
-  const sourceControlButtons = enabledProviderIds.length === 0 ? [] : await requestSourceControlButtons(platform);
+  const actionsCache = enabledProviderIds.length === 0 ? Object.create(null) : await requestSourceActions(assetDir, platform);
+  const sourceControlButtons = enabledProviderIds.length === 0 ? [] : await requestSourceControlButtons(assetDir, platform);
 
   // TODO make preferences async and more functional
   const splitButtonEnabled = await get$1('sourceControl.splitButtonEnabled');
@@ -2084,7 +2084,6 @@ const loadContent = async (state, savedState) => {
     gitRoot,
     headerHeight,
     iconDefinitions,
-    initial: false,
     inputBoxHeight,
     inputPlaceholder,
     inputValue,
@@ -2100,6 +2099,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 +3644,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 +3654,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 +3676,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.0",
+  "version": "3.10.2",
   "description": "Source Control Worker",
   "keywords": [
     "Lvce Editor"