@lvce-editor/activity-bar-worker 7.9.3 → 7.10.0

package/dist/activityBarWorkerMain.js

@@ -249,7 +249,7 @@ const {
   get: get$2,
   getCommandIds,
   registerCommands,
-  set: set$4,
+  set: set$3,
   wrapCommand,
   wrapGetter
 } = create$a();
@@ -283,7 +283,7 @@ const create$9 = (id, uri, x, y, width, height, args, parentUid, platform = 0) =
     x,
     y
   };
-  set$4(id, state, state);
+  set$3(id, state, state);
   return state;
 };
 
@@ -1993,7 +1993,7 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$3 = (id, rpc) => {
+const set$2 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get = id => {
@@ -2026,7 +2026,7 @@ const create = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$3(rpcId, mockRpc);
+      set$2(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove(rpcId);
@@ -2035,15 +2035,11 @@ const create = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$3(rpcId, rpc);
+      set$2(rpcId, rpc);
     }
   };
 };
 
-const {
-  set: set$2
-} = create(6010);
-
 const {
   invoke: invoke$1,
   set: set$1
@@ -2061,10 +2057,6 @@ const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(y);
   await invoke('ContextMenu.show2', uid, menuId, x, y, args);
 };
-const sendMessagePortToAuthWorker = async (port, rpcId) => {
-  const command = 'HandleMessagePort.handleMessagePort';
-  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToAuthWorker', port, command, rpcId);
-};
 const sendMessagePortToExtensionManagementWorker = async (port, rpcId) => {
   const command = 'Extensions.handleMessagePort';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionManagementWorker', port, command, rpcId);
@@ -2080,6 +2072,11 @@ const handleClickAccount = async (state, eventX, eventY, viewletId) => {
     sideBarLocation,
     uid
   } = state;
+  try {
+    await invoke('Layout.refreshAuthState');
+  } catch {
+    // Keep the account menu available when auth is unavailable.
+  }
   await show2(uid, ACCOUNT_MENU_ID, eventX, eventY, {
     menuId: ACCOUNT_MENU_ID,
     openSubMenuToLeft: sideBarLocation === Right
@@ -2715,40 +2712,6 @@ const handleUpdateStateChange = async (state, config) => {
   };
 };
 
-const providerKeys = ['userLoginProvider', 'loginProvider', 'authProvider', 'provider'];
-const getUserLoginProvider = userInfo => {
-  if (!userInfo || typeof userInfo !== 'object') {
-    return 'GitHub';
-  }
-  const record = userInfo;
-  for (const key of providerKeys) {
-    if (typeof record[key] === 'string' && record[key]) {
-      return record[key];
-    }
-  }
-  return 'GitHub';
-};
-
-const getUserName = userInfo => {
-  if (!userInfo || typeof userInfo !== 'object') {
-    return '';
-  }
-  if (!('userName' in userInfo) || typeof userInfo.userName !== 'string') {
-    return '';
-  }
-  return userInfo.userName;
-};
-
-const getUserState = userInfo => {
-  if (!userInfo || typeof userInfo !== 'object') {
-    return undefined;
-  }
-  if (!('userState' in userInfo)) {
-    return undefined;
-  }
-  return userInfo.userState;
-};
-
 const getActiveView = async () => {
   try {
     const activeView = await invoke('Layout.getActiveSideBarView');
@@ -2758,39 +2721,17 @@ const getActiveView = async () => {
   }
 };
 
-const getUserInfo = async () => {
-  try {
-    return await invoke('Layout.getUserInfo');
-  } catch {
-    return undefined;
-  }
-};
-
 const loadPreferences = async (accountEnabled, platform) => {
-  const [accountEnabledNew, activeView, contributedViews, sidebarLocation, sideBarVisible, userInfo] = await Promise.all([getAccountEnabled(accountEnabled), getActiveView(), getContributedViews(platform), getSideBarPosition(), getSideBarVisible(), getUserInfo()]);
+  const [accountEnabledNew, activeView, contributedViews, sidebarLocation, sideBarVisible] = await Promise.all([getAccountEnabled(accountEnabled), getActiveView(), getContributedViews(platform), getSideBarPosition(), getSideBarVisible()]);
   return {
     accountEnabled: accountEnabledNew,
     activeView,
     contributedViews,
     sidebarLocation,
-    sideBarVisible,
-    userInfo
+    sideBarVisible
   };
 };
 
-const toUserLoginState = userState => {
-  switch (userState) {
-    case 'loggedIn':
-      return 'logged in';
-    case 'loggingIn':
-      return 'logging in';
-    case 'loggingOut':
-      return 'logging out';
-    default:
-      return 'logged out';
-  }
-};
-
 const loadContent = async state => {
   const {
     accountEnabled,
@@ -2803,15 +2744,11 @@ const loadContent = async state => {
     activeView,
     contributedViews,
     sidebarLocation,
-    sideBarVisible,
-    userInfo
+    sideBarVisible
   } = await loadPreferences(accountEnabled, platform);
   const newState = {
     ...state,
-    accountEnabled: accountEnabledNew,
-    userLoginProvider: getUserLoginProvider(userInfo),
-    userLoginState: toUserLoginState(getUserState(userInfo)),
-    userName: getUserName(userInfo)
+    accountEnabled: accountEnabledNew
   };
   const items = getActivityBarItems(newState, contributedViews);
   const index = items.findIndex(item => item.id === activeView);
@@ -3396,15 +3333,7 @@ const renderItems = (oldState, newState) => {
   return [SetDom2, uid, dom];
 };
 
-const hasSameItemIds = (oldState, newState) => {
-  const oldItems = oldState.filteredItems;
-  const newItems = newState.filteredItems;
-  return oldItems.length === newItems.length && oldItems.every((item, index) => item.id === newItems[index].id);
-};
 const renderIncremental = (oldState, newState) => {
-  if (!hasSameItemIds(oldState, newState)) {
-    return renderItems(oldState, newState);
-  }
   const oldDom = renderItems(oldState, oldState)[2];
   const newDom = renderItems(newState, newState)[2];
   const patches = diffTree(oldDom, newDom);
@@ -3448,7 +3377,7 @@ const render2 = (uid, diffResult) => {
     newState,
     oldState
   } = get$2(uid);
-  set$4(uid, newState, newState);
+  set$3(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
   return commands;
 };
@@ -3496,6 +3425,30 @@ const setAccountEnabled = (state, enabled) => {
   };
 };
 
+const providerKeys = ['userLoginProvider', 'loginProvider', 'authProvider', 'provider'];
+const getUserLoginProvider = userInfo => {
+  if (!userInfo || typeof userInfo !== 'object') {
+    return 'GitHub';
+  }
+  const record = userInfo;
+  for (const key of providerKeys) {
+    if (typeof record[key] === 'string' && record[key]) {
+      return record[key];
+    }
+  }
+  return 'GitHub';
+};
+
+const getUserName = userInfo => {
+  if (!userInfo || typeof userInfo !== 'object') {
+    return '';
+  }
+  if (!('userName' in userInfo) || typeof userInfo.userName !== 'string') {
+    return '';
+  }
+  return userInfo.userName;
+};
+
 const setUserLoginState = (state, userLoginState, userInfo) => {
   return {
     ...state,
@@ -3569,18 +3522,6 @@ const commandMap = {
   'ActivityBar.toggleActivityBarItem': wrapCommand(toggleActivityBarItem)
 };
 
-const send$1 = async port => {
-  // @ts-ignore
-  await sendMessagePortToAuthWorker(port);
-};
-const initializeAuthWorker = async () => {
-  const rpc = await create$2({
-    commandMap: {},
-    send: send$1
-  });
-  set$2(rpc);
-};
-
 const send = async port => {
   await sendMessagePortToExtensionManagementWorker(port, 0);
 };
@@ -3601,7 +3542,7 @@ const initializeRendererWorker = async () => {
 
 const listen = async () => {
   registerCommands(commandMap);
-  await Promise.all([initializeRendererWorker(), initializeAuthWorker(), initializeExtensionManagementWorker()]);
+  await Promise.all([initializeRendererWorker(), initializeExtensionManagementWorker()]);
 };
 
 const main = async () => {

package/package.json

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