@lvce-editor/activity-bar-worker 4.1.0 → 4.5.0

package/dist/activityBarWorkerMain.js

@@ -457,12 +457,12 @@ const getErrorConstructor = (message, type) => {
     switch (type) {
       case DomException:
         return DOMException;
-      case TypeError$1:
-        return TypeError;
-      case SyntaxError$1:
-        return SyntaxError;
       case ReferenceError$1:
         return ReferenceError;
+      case SyntaxError$1:
+        return SyntaxError;
+      case TypeError$1:
+        return TypeError;
       default:
         return Error;
     }
@@ -618,27 +618,27 @@ const getErrorProperty = (error, prettyError) => {
   if (error && error.code === E_COMMAND_NOT_FOUND) {
     return {
       code: MethodNotFound,
-      message: error.message,
-      data: error.stack
+      data: error.stack,
+      message: error.message
     };
   }
   return {
     code: Custom,
-    message: prettyError.message,
     data: {
-      stack: getStack(prettyError),
-      codeFrame: prettyError.codeFrame,
-      type: getErrorType(prettyError),
       code: prettyError.code,
-      name: prettyError.name
-    }
+      codeFrame: prettyError.codeFrame,
+      name: prettyError.name,
+      stack: getStack(prettyError),
+      type: getErrorType(prettyError)
+    },
+    message: prettyError.message
   };
 };
 const create$1$1 = (id, error) => {
   return {
-    jsonrpc: Two$1,
+    error,
     id,
-    error
+    jsonrpc: Two$1
   };
 };
 const getErrorResponse = (id, error, preparePrettyError, logError) => {
@@ -649,8 +649,8 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
 };
 const create$7 = (message, result) => {
   return {
-    jsonrpc: Two$1,
     id: message.id,
+    jsonrpc: Two$1,
     result: result ?? null
   };
 };
@@ -660,14 +660,14 @@ const getSuccessResponse = (message, result) => {
 };
 const getErrorResponseSimple = (id, error) => {
   return {
-    jsonrpc: Two$1,
-    id,
     error: {
       code: Custom,
+      data: error,
       // @ts-ignore
-      message: error.message,
-      data: error
-    }
+      message: error.message
+    },
+    id,
+    jsonrpc: Two$1
   };
 };
 const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
@@ -697,35 +697,35 @@ const normalizeParams = args => {
   if (args.length === 1) {
     const options = args[0];
     return {
+      execute: options.execute,
       ipc: options.ipc,
+      logError: options.logError || defaultLogError,
       message: options.message,
-      execute: options.execute,
-      resolve: options.resolve || defaultResolve,
       preparePrettyError: options.preparePrettyError || defaultPreparePrettyError,
-      logError: options.logError || defaultLogError,
-      requiresSocket: options.requiresSocket || defaultRequiresSocket
+      requiresSocket: options.requiresSocket || defaultRequiresSocket,
+      resolve: options.resolve || defaultResolve
     };
   }
   return {
+    execute: args[2],
     ipc: args[0],
+    logError: args[5],
     message: args[1],
-    execute: args[2],
-    resolve: args[3],
     preparePrettyError: args[4],
-    logError: args[5],
-    requiresSocket: args[6]
+    requiresSocket: args[6],
+    resolve: args[3]
   };
 };
 const handleJsonRpcMessage = async (...args) => {
   const options = normalizeParams(args);
   const {
-    message,
-    ipc,
     execute,
-    resolve,
-    preparePrettyError,
+    ipc,
     logError,
-    requiresSocket
+    message,
+    preparePrettyError,
+    requiresSocket,
+    resolve
   } = options;
   if ('id' in message) {
     if ('method' in message) {
@@ -786,7 +786,6 @@ const registerPromise = map => {
   };
 };
 
-// @ts-ignore
 const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer) => {
   const {
     id,
@@ -879,54 +878,6 @@ const create$3 = async ({
   return rpc;
 };
 
-const Button$2 = 'button';
-const None$1 = 'none';
-const Tab$1 = 'tab';
-const ToolBar = 'toolbar';
-
-const Div = 4;
-const Text = 12;
-const Reference = 100;
-
-const Button$1 = 'event.button';
-const ClientX = 'event.clientX';
-const ClientY = 'event.clientY';
-
-const Enter = 3;
-const Space = 9;
-const PageUp = 10;
-const PageDown = 11;
-const End = 255;
-const Home = 12;
-const UpArrow = 14;
-const DownArrow = 16;
-
-const ActivityBar$3 = 1;
-const Settings$1 = 12;
-const ActivityBarAdditionalViews = 17;
-
-const Separator = 1;
-const None = 0;
-const Checked = 2;
-const Unchecked = 3;
-
-const LeftClick = 0;
-
-const Web = 1;
-
-const RendererWorker = 1;
-
-const Left = 1;
-const Right = 2;
-
-const SetCss = 'Viewlet.setCss';
-const SetDom2 = 'Viewlet.setDom2';
-const SetFocusContext = 'Viewlet.setFocusContext';
-const SetPatches = 'Viewlet.setPatches';
-
-const FocusActivityBar = 5;
-const FocusExplorer = 13;
-
 const createMockRpc = ({
   commandMap
 }) => {
@@ -995,6 +946,54 @@ const create$2 = rpcId => {
   };
 };
 
+const Button$2 = 'button';
+const None$1 = 'none';
+const Tab$1 = 'tab';
+const ToolBar = 'toolbar';
+
+const Div = 4;
+const Text = 12;
+const Reference = 100;
+
+const Button$1 = 'event.button';
+const ClientX = 'event.clientX';
+const ClientY = 'event.clientY';
+
+const Enter = 3;
+const Space = 9;
+const PageUp = 10;
+const PageDown = 11;
+const End = 255;
+const Home = 12;
+const UpArrow = 14;
+const DownArrow = 16;
+
+const ActivityBar$3 = 1;
+const Settings$1 = 12;
+const ActivityBarAdditionalViews = 17;
+
+const Separator = 1;
+const None = 0;
+const Checked = 2;
+const Unchecked = 3;
+
+const LeftClick = 0;
+
+const Web = 1;
+
+const RendererWorker = 1;
+
+const Left = 1;
+const Right = 2;
+
+const SetCss = 'Viewlet.setCss';
+const SetDom2 = 'Viewlet.setDom2';
+const SetFocusContext = 'Viewlet.setFocusContext';
+const SetPatches = 'Viewlet.setPatches';
+
+const FocusActivityBar = 5;
+const FocusExplorer = 13;
+
 const {
   invoke,
   set: set$1
@@ -1047,7 +1046,7 @@ const create$1 = () => {
     },
     getKeys() {
       return Object.keys(states).map(key => {
-        return Number.parseInt(key);
+        return Number.parseFloat(key);
       });
     },
     registerCommands(commandMap) {
@@ -1089,6 +1088,37 @@ const create$1 = () => {
         return fn(newState, ...args);
       };
       return wrapped;
+    },
+    wrapLoadContent(fn) {
+      const wrapped = async (uid, ...args) => {
+        const {
+          newState,
+          oldState
+        } = states[uid];
+        const result = await fn(newState, ...args);
+        const {
+          error,
+          state
+        } = result;
+        if (oldState === state || newState === state) {
+          return {
+            error
+          };
+        }
+        const latestOld = states[uid];
+        const latestNew = {
+          ...latestOld.newState,
+          ...state
+        };
+        states[uid] = {
+          newState: latestNew,
+          oldState: latestOld.oldState
+        };
+        return {
+          error
+        };
+      };
+      return wrapped;
     }
   };
 };
@@ -1128,6 +1158,7 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) =>
     uid: id,
     updateProgress: 0,
     updateState: '',
+    userLoginState: 'logged out',
     width,
     x,
     y
@@ -1145,7 +1176,7 @@ const isEqual$1 = (oldState, newState) => {
 };
 
 const isEqual = (oldState, newState) => {
-  return oldState.activityBarItems === newState.activityBarItems && oldState.filteredItems === newState.filteredItems && oldState.focusedIndex === newState.focusedIndex && oldState.updateProgress === newState.updateProgress && oldState.updateState === newState.updateState;
+  return oldState.activityBarItems === newState.activityBarItems && oldState.filteredItems === newState.filteredItems && oldState.focusedIndex === newState.focusedIndex && oldState.sideBarLocation === newState.sideBarLocation && oldState.sideBarVisible === newState.sideBarVisible && oldState.updateProgress === newState.updateProgress && oldState.updateState === newState.updateState;
 };
 
 const RenderItems = 4;
@@ -1243,16 +1274,21 @@ const getKeyBindings = () => {
 };
 
 const getMenuEntriesAccount = state => {
+  const signInLabel = state.userLoginState === 'logging in' ? 'Signing In...' : 'Sign In';
+  const signOutLabel = state.userLoginState === 'logging out' ? 'Signing Out...' : 'Sign Out';
+  if (state.userLoginState === 'logged in' || state.userLoginState === 'logging out') {
+    return [{
+      command: 'ActivityBar.handleClickSignOut',
+      flags: None,
+      id: 'signOut',
+      label: signOutLabel
+    }];
+  }
   return [{
-    command: 'Account.signIn',
+    command: 'ActivityBar.handleClickSignIn',
     flags: None,
     id: 'signIn',
-    label: 'Sign In'
-  }, {
-    command: 'Account.signOut',
-    flags: None,
-    id: 'signOut',
-    label: 'Sign Out'
+    label: signInLabel
   }];
 };
 
@@ -1464,15 +1500,28 @@ const getMenuEntriesSettings = state => {
   return items;
 };
 
-// Use a unique number for the Account menu ID
-const ACCOUNT_MENU_ID$1 = 1000;
+const show2 = async (uid, menuId, x, y, args) => {
+  await showContextMenu2(uid, menuId, x, y, args);
+};
+
+const ACCOUNT_MENU_ID = 32_122;
+const handleClickAccount = async (state, eventX, eventY, viewletId) => {
+  const {
+    uid
+  } = state;
+  await show2(uid, ACCOUNT_MENU_ID, eventX, eventY, {
+    menuId: ACCOUNT_MENU_ID
+  });
+  return state;
+};
+
 const getMenuEntries = (state, options) => {
   const {
     menuId
   } = options;
   switch (menuId) {
-    case ACCOUNT_MENU_ID$1:
-      return getMenuEntriesAccount();
+    case ACCOUNT_MENU_ID:
+      return getMenuEntriesAccount(state);
     case ActivityBar$3:
       return getMenuEntriesActivityBar(state);
     case ActivityBarAdditionalViews:
@@ -1485,7 +1534,7 @@ const getMenuEntries = (state, options) => {
 };
 
 const getMenuEntryIds = () => {
-  return [ActivityBar$3, ActivityBarAdditionalViews, Settings$1];
+  return [ActivityBar$3, ActivityBarAdditionalViews, Settings$1, ACCOUNT_MENU_ID];
 };
 
 const updateItemsWithBadgeCount = async items => {
@@ -1523,7 +1572,23 @@ const handleBlur = state => {
   };
 };
 
-const getIndexFromPosition = (y, eventX, eventY, itemHeight, itemCount, height) => {
+const isBottomItem = item => {
+  return item.id === 'Account' || item.id === 'Settings';
+};
+const getBottomItemCount = items => {
+  if (typeof items === 'number') {
+    return items > 1 ? 1 : 0;
+  }
+  return items.filter(isBottomItem).length;
+};
+const getItemCount = items => {
+  if (typeof items === 'number') {
+    return items;
+  }
+  return items.length;
+};
+const getIndexFromPosition = (y, eventX, eventY, itemHeight, items, height) => {
+  const itemCount = getItemCount(items);
   if (itemCount === 0) {
     return -1;
   }
@@ -1536,38 +1601,22 @@ const getIndexFromPosition = (y, eventX, eventY, itemHeight, itemCount, height)
     }
     return index;
   }
-  // Settings is always at the bottom (last item) when there are multiple items
-  const settingsBottomY = y + height;
-  const settingsTopY = settingsBottomY - itemHeight;
-  // Check if click is in the Settings area (bottom)
-  if (eventY >= settingsTopY && eventY < settingsBottomY) {
-    return itemCount - 1;
+  const bottomItemCount = getBottomItemCount(items);
+  const bottomItemsHeight = bottomItemCount * itemHeight;
+  const bottomItemsTopY = y + height - bottomItemsHeight;
+  if (bottomItemCount > 0 && eventY >= bottomItemsTopY && eventY < y + height) {
+    const relativeBottomY = eventY - bottomItemsTopY;
+    return itemCount - bottomItemCount + Math.floor(relativeBottomY / itemHeight);
   }
-  // Otherwise, calculate index from top items
+  const topItemCount = itemCount - bottomItemCount;
   const relativeY = eventY - y;
   const index = Math.floor(relativeY / itemHeight);
-  if (index < 0 || index >= itemCount - 1) {
+  if (index < 0 || index >= topItemCount) {
     return -1;
   }
   return index;
 };
 
-const show2 = async (uid, menuId, x, y, args) => {
-  await showContextMenu2(uid, menuId, x, y, args);
-};
-
-// Use a unique number for the Account menu ID
-const ACCOUNT_MENU_ID = 1000;
-const handleClickAccount = async (state, eventX, eventY, viewletId) => {
-  const {
-    uid
-  } = state;
-  await show2(uid, ACCOUNT_MENU_ID, eventX, eventY, {
-    menuId: ACCOUNT_MENU_ID
-  });
-  return state;
-};
-
 const handleClickAdditionalViews = async (state, eventX, eventY, viewletId) => {
   const {
     uid
@@ -1591,7 +1640,7 @@ const hide = async () => {
   await invoke('Layout.hideSideBar');
 };
 
-const handleClickOther = async (state, x, y, viewletId) => {
+const handleClickOther = async (state, viewletId) => {
   const {
     currentViewletId,
     sideBarVisible
@@ -1638,7 +1687,7 @@ const handleClickIndex = async (state, button, index, x, y) => {
     case 'Settings':
       return handleClickSettings(state, x, y);
     default:
-      return handleClickOther(state, x, y, viewletId);
+      return handleClickOther(state, viewletId);
   }
 };
 
@@ -1649,10 +1698,18 @@ const handleClick = async (state, button, eventX, eventY) => {
     itemHeight,
     y
   } = state;
-  const index = getIndexFromPosition(y, eventX, eventY, itemHeight, filteredItems.length, height);
+  const index = getIndexFromPosition(y, eventX, eventY, itemHeight, filteredItems, height);
   return handleClickIndex(state, button, index, eventX, eventY);
 };
 
+const handleClickSignIn = async state => {
+  return state;
+};
+
+const handleClickSignOut = async state => {
+  return state;
+};
+
 const handleContextMenu = async (state, button, eventX, eventY) => {
   const {
     uid
@@ -1719,6 +1776,15 @@ const handleResize = (state, dimensions) => {
   };
 };
 
+const getAccountEnabled = async defaultValue => {
+  try {
+    const value = await invoke('Preferences.get', 'activityBar.accountEnabled');
+    return typeof value === 'boolean' ? value : defaultValue;
+  } catch {
+    return defaultValue;
+  }
+};
+
 const Explorer = 'Explorer';
 const Extensions = 'Extensions';
 const RunAndDebug = 'Run And Debug';
@@ -1729,6 +1795,7 @@ const getActivityBarItems = state => {
   const {
     accountEnabled
   } = state;
+  const settingsFlags = Button | Enabled | (accountEnabled ? 0 : MarginTop);
   const items = [
   // Top
   {
@@ -1774,7 +1841,7 @@ const getActivityBarItems = state => {
     });
   }
   items.push({
-    flags: Button | Enabled | MarginTop,
+    flags: settingsFlags,
     icon: SettingsGear,
     id: 'Settings',
     keyShortcuts: '',
@@ -1811,27 +1878,39 @@ const handleSettingsChanged = async state => {
     itemHeight,
     selectedIndex
   } = state;
-  const items = getActivityBarItems(state);
+  const [accountEnabled, sidebarLocation] = await Promise.all([getAccountEnabled(state.accountEnabled), getSideBarPosition()]);
+  const newState = {
+    ...state,
+    accountEnabled
+  };
+  const items = getActivityBarItems(newState);
   const itemsWithSelected = markSelected(items, selectedIndex);
   const filteredItems = getFilteredActivityBarItems(itemsWithSelected, height, itemHeight);
   const newItems = await updateItemsWithBadgeCount(filteredItems);
-  const sidebarLocation = await getSideBarPosition();
   return {
-    ...state,
+    ...newState,
     activityBarItems: itemsWithSelected,
     filteredItems: newItems,
     sideBarLocation: sidebarLocation
   };
 };
 
+const clearItem = item => {
+  const withoutSelected = setFlag(item, Selected, false);
+  return setFlag(withoutSelected, Focused, false);
+};
 const handleSideBarHidden = state => {
-  const itemsCleared = state.activityBarItems.map(item => {
-    const withoutSelected = setFlag(item, Selected, false);
-    return setFlag(withoutSelected, Focused, false);
-  });
+  const {
+    activityBarItems,
+    height,
+    itemHeight
+  } = state;
+  const itemsCleared = activityBarItems.map(clearItem);
+  const filteredItems = getFilteredActivityBarItems(itemsCleared, height, itemHeight);
   return {
     ...state,
     activityBarItems: itemsCleared,
+    filteredItems,
     focusedIndex: -1,
     selectedIndex: -1,
     sideBarVisible: false
@@ -1928,15 +2007,19 @@ const loadContent = async state => {
     height,
     itemHeight
   } = state;
-  const items = getActivityBarItems(state);
-  const [activeView, sideBarVisible, sidebarLocation] = await Promise.all([getActiveView(), getSideBarVisible(), getSideBarPosition()]);
+  const [accountEnabled, activeView, sideBarVisible, sidebarLocation] = await Promise.all([getAccountEnabled(state.accountEnabled), getActiveView(), getSideBarVisible(), getSideBarPosition()]);
+  const newState = {
+    ...state,
+    accountEnabled
+  };
+  const items = getActivityBarItems(newState);
   const index = items.findIndex(item => item.id === activeView);
   const selectedIndex = sideBarVisible ? index : -1;
   const itemsWithSelected = markSelected(items, selectedIndex);
   const filteredItems = getFilteredActivityBarItems(itemsWithSelected, height, itemHeight);
   const newItems = await updateItemsWithBadgeCount(filteredItems);
   return {
-    ...state,
+    ...newState,
     activityBarItems: itemsWithSelected,
     currentViewletId: Explorer,
     filteredItems: newItems,
@@ -2292,6 +2375,10 @@ const HandleMouseDown = 4;
 
 const ActivityBar = 'ActivityBar';
 
+const getActivityBarItemHasPopup = item => {
+  return item.id === 'Account' || item.id === 'Settings';
+};
+
 const getAriaSelected = (isTab, isSelected) => {
   if (!isTab) {
     return undefined;
@@ -2340,10 +2427,12 @@ const getActivityBarItemInProgressDom = item => {
   const isFocused = flags & Focused;
   const role = isTab ? Tab$1 : Button$2;
   const ariaSelected = getAriaSelected(isTab, isSelected);
+  const ariaHasPopup = getActivityBarItemHasPopup(item) || undefined;
   const marginTop = flags & MarginTop;
   let className = getClassName(isFocused, marginTop, isSelected);
   className += ' ' + ActivityBarItemNested;
   return [{
+    ariaHasPopup,
     ariaLabel: '',
     ariaSelected,
     childCount: 2,
@@ -2375,10 +2464,12 @@ const getActivityBarItemWithBadgeDom = item => {
   const isFocused = flags & Focused;
   const role = isTab ? Tab$1 : Button$2;
   const ariaSelected = getAriaSelected(isTab, isSelected);
+  const ariaHasPopup = getActivityBarItemHasPopup(item) || undefined;
   const marginTop = flags & MarginTop;
   let className = getClassName(isFocused, marginTop, isSelected);
   className += ' ' + ActivityBarItemNested;
   return [{
+    ariaHasPopup,
     ariaLabel: '',
     ariaSelected,
     childCount: 2,
@@ -2414,6 +2505,7 @@ const getActivityBarItemVirtualDom = item => {
     icon,
     title
   } = item;
+  const ariaHasPopup = getActivityBarItemHasPopup(item) || undefined;
   const isTab = flags & Tab;
   const isSelected = flags & Selected;
   const isFocused = flags & Focused;
@@ -2424,6 +2516,7 @@ const getActivityBarItemVirtualDom = item => {
   const className = getClassName(isFocused, marginTop, isSelected);
   if (isSelected) {
     return [{
+      ariaHasPopup,
       ariaLabel: '',
       ariaSelected,
       childCount: 1,
@@ -2442,6 +2535,7 @@ const getActivityBarItemVirtualDom = item => {
     return getActivityBarItemWithBadgeDom(item);
   }
   return [{
+    ariaHasPopup,
     ariaLabel: '',
     ariaSelected,
     childCount: 0,
@@ -2492,6 +2586,9 @@ const renderIncremental = (oldState, newState) => {
   const oldDom = renderItems(oldState, oldState)[2];
   const newDom = renderItems(newState, newState)[2];
   const patches = diffTree(oldDom, newDom);
+  if (patches.length === 0) {
+    return [];
+  }
   return [SetPatches, newState.uid, patches];
 };
 
@@ -2582,6 +2679,13 @@ const setAccountEnabled = (state, enabled) => {
   };
 };
 
+const setUserLoginState = (state, userLoginState) => {
+  return {
+    ...state,
+    userLoginState
+  };
+};
+
 const toggleActivityBarItem = async (state, itemId) => {
   const {
     activityBarItems
@@ -2619,6 +2723,9 @@ const commandMap = {
   'ActivityBar.handleBlur': wrapCommand(handleBlur),
   'ActivityBar.handleClick': wrapCommand(handleClick),
   'ActivityBar.handleClickIndex': wrapCommand(handleClickIndex),
+  'ActivityBar.handleClickSettings': wrapCommand(handleClickSettings),
+  'ActivityBar.handleClickSignIn': wrapCommand(handleClickSignIn),
+  'ActivityBar.handleClickSignOut': wrapCommand(handleClickSignOut),
   'ActivityBar.handleContextMenu': wrapCommand(handleContextMenu),
   'ActivityBar.handleFocus': wrapCommand(handleFocus),
   'ActivityBar.handleSettingsChanged': wrapCommand(handleSettingsChanged),
@@ -2631,6 +2738,7 @@ const commandMap = {
   'ActivityBar.resize': wrapCommand(handleResize),
   'ActivityBar.saveState': wrapGetter(saveState),
   'ActivityBar.setAccountEnabled': wrapCommand(setAccountEnabled),
+  'ActivityBar.setUserLoginState': wrapCommand(setUserLoginState),
   'ActivityBar.terminate': terminate,
   'ActivityBar.toggleActivityBarItem': wrapCommand(toggleActivityBarItem)
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/activity-bar-worker",
-  "version": "4.1.0",
+  "version": "4.5.0",
   "description": "Explorer Worker",
   "repository": {
     "type": "git",