@lvce-editor/source-control-worker 3.6.3 → 3.6.5

package/dist/sourceControlWorkerMain.js

@@ -586,7 +586,10 @@ const constructError = (message, type, name) => {
   if (ErrorConstructor === Error) {
     const error = new Error(message);
     if (name && name !== 'VError') {
-      error.name = name;
+      Object.defineProperty(error, 'name', {
+        configurable: true,
+        value: name
+      });
     }
     return error;
   }
@@ -603,8 +606,10 @@ const getCurrentStack = () => {
   const currentStack = joinLines(splitLines(new Error().stack || '').slice(stackLinesToSkip));
   return currentStack;
 };
-const getNewLineIndex = (string, startIndex = undefined) => {
-  return string.indexOf(NewLine, startIndex);
+const getNewLineIndex = (string, startIndex) => {
+  {
+    return string.indexOf(NewLine);
+  }
 };
 const getParentStack = error => {
   let parentStack = error.stack || error.data || error.message || '';
@@ -615,55 +620,91 @@ const getParentStack = error => {
 };
 const MethodNotFound = -32601;
 const Custom = -32001;
+const setStack = (error, stack) => {
+  const descriptor = Object.getOwnPropertyDescriptor(error, 'stack');
+  if (descriptor) {
+    if (!descriptor.configurable && !descriptor.writable) {
+      return;
+    }
+    if (!descriptor.configurable && descriptor.writable) {
+      error.stack = stack;
+      return;
+    }
+  }
+  Object.defineProperty(error, 'stack', {
+    configurable: true,
+    value: stack,
+    writable: true
+  });
+};
+const restoreExistingError = (error, currentStack) => {
+  if (typeof error.stack === 'string') {
+    setStack(error, `${error.stack}${NewLine}${currentStack}`);
+  }
+  return error;
+};
+const restoreMethodNotFoundError = (error, currentStack) => {
+  const restoredError = new JsonRpcError(error.message);
+  const parentStack = getParentStack(error);
+  setStack(restoredError, `${parentStack}${NewLine}${currentStack}`);
+  return restoredError;
+};
+const restoreStackFromData = (restoredError, error, currentStack) => {
+  if (error.data.stack && error.data.type && error.message) {
+    setStack(restoredError, `${error.data.type}: ${error.message}${NewLine}${error.data.stack}${NewLine}${currentStack}`);
+    return;
+  }
+  if (error.data.stack) {
+    setStack(restoredError, error.data.stack);
+  }
+};
+const applyDataProperties = (restoredError, error) => {
+  restoreStackFromData(restoredError, error, getCurrentStack());
+  if (error.data.codeFrame) {
+    // @ts-ignore
+    restoredError.codeFrame = error.data.codeFrame;
+  }
+  if (error.data.code) {
+    // @ts-ignore
+    restoredError.code = error.data.code;
+  }
+  if (error.data.type) {
+    // @ts-ignore
+    restoredError.name = error.data.type;
+  }
+};
+const applyDirectProperties = (restoredError, error) => {
+  if (error.stack) {
+    const lowerStack = restoredError.stack || '';
+    const indexNewLine = getNewLineIndex(lowerStack);
+    const parentStack = getParentStack(error);
+    // @ts-ignore
+    setStack(restoredError, `${parentStack}${lowerStack.slice(indexNewLine)}`);
+  }
+  if (error.codeFrame) {
+    // @ts-ignore
+    restoredError.codeFrame = error.codeFrame;
+  }
+};
+const restoreMessageError = (error, _currentStack) => {
+  const restoredError = constructError(error.message, error.type, error.name);
+  if (error.data) {
+    applyDataProperties(restoredError, error);
+  } else {
+    applyDirectProperties(restoredError, error);
+  }
+  return restoredError;
+};
 const restoreJsonRpcError = error => {
   const currentStack = getCurrentStack();
   if (error && error instanceof Error) {
-    if (typeof error.stack === 'string') {
-      error.stack = error.stack + NewLine + currentStack;
-    }
-    return error;
+    return restoreExistingError(error, currentStack);
   }
   if (error && error.code && error.code === MethodNotFound) {
-    const restoredError = new JsonRpcError(error.message);
-    const parentStack = getParentStack(error);
-    restoredError.stack = parentStack + NewLine + currentStack;
-    return restoredError;
+    return restoreMethodNotFoundError(error, currentStack);
   }
   if (error && error.message) {
-    const restoredError = constructError(error.message, error.type, error.name);
-    if (error.data) {
-      if (error.data.stack && error.data.type && error.message) {
-        restoredError.stack = error.data.type + ': ' + error.message + NewLine + error.data.stack + NewLine + currentStack;
-      } else if (error.data.stack) {
-        restoredError.stack = error.data.stack;
-      }
-      if (error.data.codeFrame) {
-        // @ts-ignore
-        restoredError.codeFrame = error.data.codeFrame;
-      }
-      if (error.data.code) {
-        // @ts-ignore
-        restoredError.code = error.data.code;
-      }
-      if (error.data.type) {
-        // @ts-ignore
-        restoredError.name = error.data.type;
-      }
-    } else {
-      if (error.stack) {
-        const lowerStack = restoredError.stack || '';
-        // @ts-ignore
-        const indexNewLine = getNewLineIndex(lowerStack);
-        const parentStack = getParentStack(error);
-        // @ts-ignore
-        restoredError.stack = parentStack + lowerStack.slice(indexNewLine);
-      }
-      if (error.codeFrame) {
-        // @ts-ignore
-        restoredError.codeFrame = error.codeFrame;
-      }
-    }
-    return restoredError;
+    return restoreMessageError(error);
   }
   if (typeof error === 'string') {
     return new Error(`JsonRpc Error: ${error}`);
@@ -1081,70 +1122,19 @@ const create$1 = rpcId => {
   };
 };
 
-const None$1 = 'none';
-const ToolBar = 'toolbar';
-const Tree$1 = 'tree';
-const TreeItem$1 = 'treeitem';
-
-const Badge = 'Badge';
-const MaskIcon = 'MaskIcon';
-const SourceControlBadge = 'SourceControlBadge';
-
-const Directory = 3;
-const DirectoryExpanded = 4;
-const File = 7;
-
-const Button$2 = 1;
-const Div = 4;
-const Span = 8;
-const Text = 12;
-const Img = 17;
-const TextArea = 62;
-const Reference = 100;
-
-const Button$1 = 'event.button';
-const ClientX = 'event.clientX';
-const ClientY = 'event.clientY';
-const DeltaMode = 'event.deltaMode';
-const DeltaY = 'event.deltaY';
-const TargetName = 'event.target.name';
-const TargetValue = 'event.target.value';
-
-const Enter = 3;
-
-const User = 1;
-const Script = 2;
-
-const CtrlCmd = 1 << 11 >>> 0;
-
-const SourceControl$1 = 22;
-
-const None = 0;
-
-const Web = 1;
-
 const ExtensionHostWorker = 44;
 const ExtensionManagementWorker = 9006;
 const IconThemeWorker = 7009;
 const RendererWorker = 1;
 const SourceControlWorker = 66;
 
-const SetCss = 'Viewlet.setCss';
-const SetDom2 = 'Viewlet.setDom2';
-const SetFocusContext = 'Viewlet.setFocusContext';
-const SetValueByName = 'Viewlet.setValueByName';
-
-const List$1 = 1;
-const Tree = 2;
-
-const FocusSourceControlInput = 24;
-
 const {
-  invoke: invoke$1,
+  invoke: invoke$2,
   set: set$4
 } = create$1(ExtensionHostWorker);
 
 const {
+  invoke: invoke$1,
   set: set$3
 } = create$1(ExtensionManagementWorker);
 
@@ -1309,6 +1299,58 @@ const terminate = () => {
   globalThis.close();
 };
 
+const None$1 = 'none';
+const ToolBar = 'toolbar';
+const Tree$1 = 'tree';
+const TreeItem$1 = 'treeitem';
+
+const Badge = 'Badge';
+const MaskIcon = 'MaskIcon';
+const SourceControlBadge = 'SourceControlBadge';
+
+const Directory = 3;
+const DirectoryExpanded = 4;
+const File = 7;
+
+const Button$2 = 1;
+const Div = 4;
+const Span = 8;
+const Text = 12;
+const Img = 17;
+const TextArea = 62;
+const Reference = 100;
+
+const Button$1 = 'event.button';
+const ClientX = 'event.clientX';
+const ClientY = 'event.clientY';
+const DeltaMode = 'event.deltaMode';
+const DeltaY = 'event.deltaY';
+const TargetName = 'event.target.name';
+const TargetValue = 'event.target.value';
+
+const Enter = 3;
+
+const User = 1;
+const Script = 2;
+
+const CtrlCmd = 1 << 11 >>> 0;
+
+const SourceControl$1 = 22;
+
+const None = 0;
+
+const Web = 1;
+
+const SetCss = 'Viewlet.setCss';
+const SetDom2 = 'Viewlet.setDom2';
+const SetFocusContext = 'Viewlet.setFocusContext';
+const SetValueByName = 'Viewlet.setValueByName';
+
+const List$1 = 1;
+const Tree = 2;
+
+const FocusSourceControlInput = 24;
+
 const getActualDecorationIcon = (iconDefinitions, icon) => {
   if (typeof icon === 'number') {
     const value = iconDefinitions[icon];
@@ -1477,7 +1519,7 @@ const executeProvider = async ({
 }) => {
   await activateByEvent(event, assetDir, platform);
   // @ts-ignore
-  const result = await invoke$1(method, ...params);
+  const result = await invoke$2(method, ...params);
   return result;
 };
 
@@ -1582,7 +1624,7 @@ const getEnabledProviderIds$1 = (scheme, root, assetDir, platform) => {
 };
 const getIconDefinitions$1 = async providerId => {
   // @ts-ignore
-  const result = await invoke$1('ExtensionHostSourceControl.getIconDefinitions', providerId);
+  const result = await invoke$2('ExtensionHostSourceControl.getIconDefinitions', providerId);
   return result;
 };
 
@@ -1734,6 +1776,114 @@ const getNumberOfVisibleItems = (listHeight, itemHeight) => {
   return Math.ceil(listHeight / itemHeight) + 1;
 };
 
+const emptyObject = {};
+const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
+const i18nString = (key, placeholders = emptyObject) => {
+  if (placeholders === emptyObject) {
+    return key;
+  }
+  const replacer = (match, rest) => {
+    return placeholders[rest];
+  };
+  return key.replaceAll(RE_PLACEHOLDER, replacer);
+};
+
+const OpenChanges = 'Open Changes';
+const OpenFile = 'Open File';
+const OpenFileHead = 'Open File (HEAD)';
+const DiscardChanges = 'Discard Changes';
+const StageChanges = 'Stage Changes';
+const AddToGitignore = 'Add to gitignore';
+const RevealInExplorerView = 'Reveal in Explorer View';
+const OpenContainingFolder = 'Open Containing Folder';
+const ViewAsTree$1 = 'View As Tree';
+const CommitAndPush$1 = 'Commit and Push';
+const GenerateCommitMessage$1 = 'Generate Commit Message';
+const Refresh$2 = 'Refresh';
+const MessageEnterToCommitOnMaster = `Message (Enter) to commit on 'master'`;
+const SourceControlInput$1 = 'Source Control Input';
+const NoSourceControlProvider = 'No source control provider is enabled or installed.';
+const NoSourceControlExtensionsInstalled = 'No source control extensions are installed.';
+const SourceControlExtensionsDisabled = 'All installed source control extensions are disabled.';
+const NoSourceControlProviderForWorkspace = 'No source control provider is available for this workspace.';
+
+const openChanges = () => {
+  return i18nString(OpenChanges);
+};
+const openFile = () => {
+  return i18nString(OpenFile);
+};
+const openFileHead = () => {
+  return i18nString(OpenFileHead);
+};
+const discardChanges = () => {
+  return i18nString(DiscardChanges);
+};
+const stageChanges = () => {
+  return i18nString(StageChanges);
+};
+const addToGitignore = () => {
+  return i18nString(AddToGitignore);
+};
+const revealInExplorerView = () => {
+  return i18nString(RevealInExplorerView);
+};
+const openContainingFolder = () => {
+  return i18nString(OpenContainingFolder);
+};
+const viewAsTree$1 = () => {
+  return i18nString(ViewAsTree$1);
+};
+const commitAndPush = () => {
+  return i18nString(CommitAndPush$1);
+};
+const generateCommitMessage = () => {
+  return i18nString(GenerateCommitMessage$1);
+};
+const refresh$1 = () => {
+  return i18nString(Refresh$2);
+};
+const messageEnterToCommitOnMaster = () => {
+  return i18nString(MessageEnterToCommitOnMaster);
+};
+const sourceControlInput = () => {
+  return i18nString(SourceControlInput$1);
+};
+const noSourceControlProvider = () => {
+  return i18nString(NoSourceControlProvider);
+};
+const noSourceControlExtensionsInstalled = () => {
+  return i18nString(NoSourceControlExtensionsInstalled);
+};
+const sourceControlExtensionsDisabled = () => {
+  return i18nString(SourceControlExtensionsDisabled);
+};
+const noSourceControlProviderForWorkspace = () => {
+  return i18nString(NoSourceControlProviderForWorkspace);
+};
+
+const hasSourceControlActivation = extension => {
+  return Array.isArray(extension?.activation) && extension.activation.some(activationEvent => typeof activationEvent === 'string' && (activationEvent === 'onSourceControl' || activationEvent.startsWith('onSourceControl:')));
+};
+const isSourceControlExtension = extension => {
+  return Boolean(extension?.sourceControl) || hasSourceControlActivation(extension);
+};
+const getSourceControlUnavailableMessage = async (assetDir, platform) => {
+  try {
+    const extensions = await invoke$1('Extensions.getAllExtensions', assetDir, platform);
+    const sourceControlExtensions = extensions.filter(isSourceControlExtension);
+    if (sourceControlExtensions.length === 0) {
+      return noSourceControlExtensionsInstalled();
+    }
+    if (sourceControlExtensions.every(extension => extension.disabled === true)) {
+      return sourceControlExtensionsDisabled();
+    }
+    return noSourceControlProviderForWorkspace();
+  } catch {
+    return noSourceControlProvider();
+  }
+};
+
 const emptySourceControlButtons = [];
 
 const getContextId = (groupId, type) => {
@@ -1778,7 +1928,7 @@ const isCompatible = (extension, platform) => {
   return platform !== Web || extension?.compatibility?.web !== false;
 };
 const getExtensions = async platform => {
-  const extensions = await invoke$1('Extensions.getExtensions');
+  const extensions = await invoke$2('Extensions.getExtensions');
   return extensions.filter(extension => isCompatible(extension, platform));
 };
 
@@ -1866,80 +2016,6 @@ const getNewDeltaPercent = (height, scrollBarHeight, relativeY) => {
   };
 };
 
-const emptyObject = {};
-const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
-const i18nString = (key, placeholders = emptyObject) => {
-  if (placeholders === emptyObject) {
-    return key;
-  }
-  const replacer = (match, rest) => {
-    return placeholders[rest];
-  };
-  return key.replaceAll(RE_PLACEHOLDER, replacer);
-};
-
-const OpenChanges = 'Open Changes';
-const OpenFile = 'Open File';
-const OpenFileHead = 'Open File (HEAD)';
-const DiscardChanges = 'Discard Changes';
-const StageChanges = 'Stage Changes';
-const AddToGitignore = 'Add to gitignore';
-const RevealInExplorerView = 'Reveal in Explorer View';
-const OpenContainingFolder = 'Open Containing Folder';
-const ViewAsTree$1 = 'View As Tree';
-const CommitAndPush$1 = 'Commit and Push';
-const GenerateCommitMessage$1 = 'Generate Commit Message';
-const Refresh$2 = 'Refresh';
-const MessageEnterToCommitOnMaster = `Message (Enter) to commit on 'master'`;
-const SourceControlInput$1 = 'Source Control Input';
-const NoSourceControlProvider = 'No source control provider is enabled or installed.';
-
-const openChanges = () => {
-  return i18nString(OpenChanges);
-};
-const openFile = () => {
-  return i18nString(OpenFile);
-};
-const openFileHead = () => {
-  return i18nString(OpenFileHead);
-};
-const discardChanges = () => {
-  return i18nString(DiscardChanges);
-};
-const stageChanges = () => {
-  return i18nString(StageChanges);
-};
-const addToGitignore = () => {
-  return i18nString(AddToGitignore);
-};
-const revealInExplorerView = () => {
-  return i18nString(RevealInExplorerView);
-};
-const openContainingFolder = () => {
-  return i18nString(OpenContainingFolder);
-};
-const viewAsTree$1 = () => {
-  return i18nString(ViewAsTree$1);
-};
-const commitAndPush = () => {
-  return i18nString(CommitAndPush$1);
-};
-const generateCommitMessage = () => {
-  return i18nString(GenerateCommitMessage$1);
-};
-const refresh$1 = () => {
-  return i18nString(Refresh$2);
-};
-const messageEnterToCommitOnMaster = () => {
-  return i18nString(MessageEnterToCommitOnMaster);
-};
-const sourceControlInput = () => {
-  return i18nString(SourceControlInput$1);
-};
-const noSourceControlProvider = () => {
-  return i18nString(NoSourceControlProvider);
-};
-
 const loadContent = async (state, savedState) => {
   const {
     fileIconCache,
@@ -1965,6 +2041,7 @@ const loadContent = async (state, savedState) => {
     platform
   } = state;
   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 {
@@ -2012,6 +2089,7 @@ const loadContent = async (state, savedState) => {
     items: displayItems,
     loading: false,
     maxLineY,
+    providerUnavailableMessage,
     root,
     scrollBarHeight,
     showGenerateCommitMessageButton,
@@ -2097,6 +2175,7 @@ const createDefaultState = () => ({
   minLineY: 0,
   platform: 0,
   providerId: '',
+  providerUnavailableMessage: '',
   root: '/',
   scrollBarActive: false,
   scrollBarHeight: 0,
@@ -2158,7 +2237,7 @@ const isEqual$3 = (oldState, newState) => {
 };
 
 const isEqual$2 = (oldState, newState) => {
-  return oldState.allGroups === newState.allGroups && oldState.deltaY === newState.deltaY && oldState.items === newState.items && oldState.loading === newState.loading && oldState.maxLineY === newState.maxLineY && oldState.minLineY === newState.minLineY && oldState.scrollBarActive === newState.scrollBarActive && oldState.scrollBarHeight === newState.scrollBarHeight && oldState.sourceControlButtons === newState.sourceControlButtons && oldState.visibleItems === newState.visibleItems;
+  return oldState.allGroups === newState.allGroups && oldState.deltaY === newState.deltaY && oldState.items === newState.items && oldState.loading === newState.loading && oldState.maxLineY === newState.maxLineY && oldState.minLineY === newState.minLineY && oldState.providerUnavailableMessage === newState.providerUnavailableMessage && oldState.scrollBarActive === newState.scrollBarActive && oldState.scrollBarHeight === newState.scrollBarHeight && oldState.sourceControlButtons === newState.sourceControlButtons && oldState.visibleItems === newState.visibleItems;
 };
 
 const RenderItems = 4;
@@ -3291,7 +3370,10 @@ const getSourceControlButtonVirtualDom = (button, disabled) => {
     ...(!disabled && {
       onClick: HandleClickSourceControlButton
     })
-  }, getIconVirtualDom(icon, Span), text(label)];
+  }, {
+    ...getIconVirtualDom(icon, Span),
+    name: label
+  }, text(label)];
 };
 
 const getSourceControlInputDom = (inputPlaceholder, inputMessage) => {
@@ -3564,13 +3646,13 @@ const getSourceControlVirtualDom = (items, buttons, disabled, placeholder, input
 
 const renderItems = (oldState, newState) => {
   const {
-    enabledProviderIds,
     id,
     initial,
     inputMessage,
     inputPlaceholder,
     items,
     loading,
+    providerUnavailableMessage,
     scrollBarActive,
     scrollBarHeight,
     sourceControlButtons,
@@ -3579,7 +3661,7 @@ const renderItems = (oldState, newState) => {
   if (initial) {
     return [SetDom2, id, []];
   }
-  const unavailableMessage = !loading && enabledProviderIds.length === 0 ? noSourceControlProvider() : '';
+  const unavailableMessage = loading ? '' : providerUnavailableMessage;
   const dom = getSourceControlVirtualDom(visibleItems, sourceControlButtons, items.length === 0, inputPlaceholder, inputMessage, unavailableMessage, loading, scrollBarHeight, scrollBarActive);
   return [SetDom2, id, dom];
 };

package/package.json

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