@lvce-editor/activity-bar-worker 6.1.0 → 7.0.0

package/dist/activityBarWorkerMain.js

@@ -1070,7 +1070,7 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$3 = (id, rpc) => {
+const set$4 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -1103,7 +1103,7 @@ const create$2 = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$3(rpcId, mockRpc);
+      set$4(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove(rpcId);
@@ -1112,13 +1112,13 @@ const create$2 = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$3(rpcId, rpc);
+      set$4(rpcId, rpc);
     }
   };
 };
 
 const {
-  set: set$2
+  set: set$3
 } = create$2(6010);
 
 const Button$2 = 'button';
@@ -1156,6 +1156,7 @@ const LeftClick = 0;
 
 const Web = 1;
 
+const ExtensionManagementWorker = 9006;
 const RendererWorker = 1;
 
 const Left = 1;
@@ -1169,6 +1170,11 @@ const SetPatches = 'Viewlet.setPatches';
 const FocusActivityBar = 5;
 const FocusExplorer = 13;
 
+const {
+  invoke: invoke$1,
+  set: set$2
+} = create$2(ExtensionManagementWorker);
+
 const {
   invoke,
   invokeAndTransfer,
@@ -1642,11 +1648,11 @@ const getNumberOfVisibleItems = state => {
 };
 const getHiddenItems = state => {
   const numberOfVisibleItems = getNumberOfVisibleItems(state);
-  const items = state.activityBarItems;
+  const items = state.activityBarItems.filter(item => item.flags & Enabled);
   if (numberOfVisibleItems >= items.length) {
     return [];
   }
-  return state.activityBarItems.slice(numberOfVisibleItems - 2, -1);
+  return items.slice(numberOfVisibleItems - 2, -1);
 };
 
 const toContextMenuItem = activityBarItem => {
@@ -1849,12 +1855,13 @@ const SourceControl$1 = 'SourceControl';
 const Ellipsis = 'Ellipsis';
 
 const getFilteredActivityBarItems = (items, height, itemHeight) => {
+  const enabledItems = items.filter(item => item.flags & Enabled);
   const numberOfVisibleItems = getNumberOfVisibleItems({
     height,
     itemHeight
   });
-  if (numberOfVisibleItems >= items.length) {
-    return items;
+  if (numberOfVisibleItems >= enabledItems.length) {
+    return enabledItems;
   }
   const showMoreItem = {
     flags: Button,
@@ -1863,7 +1870,7 @@ const getFilteredActivityBarItems = (items, height, itemHeight) => {
     keyShortcuts: '',
     title: additionalViews()
   };
-  return [...items.slice(0, numberOfVisibleItems - 2), showMoreItem, items.at(-1)];
+  return [...enabledItems.slice(0, numberOfVisibleItems - 2), showMoreItem, enabledItems.at(-1)];
 };
 
 const setFlag = (item, flag, enabled) => {
@@ -2001,42 +2008,14 @@ const handleContextMenu = async (state, button, eventX, eventY) => {
   return state;
 };
 
-const handleFocus = state => {
-  return {
-    ...state,
-    focused: true
-  };
-};
-
-const handleResize = (state, dimensions) => {
-  const {
-    activityBarItems,
-    itemHeight
-  } = state;
-  const {
-    height,
-    width,
-    x,
-    y
-  } = dimensions;
-  const filteredItems = getFilteredActivityBarItems(activityBarItems, height, itemHeight);
-  return {
-    ...state,
-    filteredItems,
-    height,
-    width,
-    x,
-    y
-  };
-};
+const commandMap$1 = {};
 
-const getAccountEnabled = async defaultValue => {
-  try {
-    const value = await invoke('Preferences.get', 'activityBar.accountEnabled');
-    return typeof value === 'boolean' ? value : defaultValue;
-  } catch {
-    return defaultValue;
-  }
+const handleExtensionManagementMessagePort = async port => {
+  const rpc = await create$6({
+    commandMap: commandMap$1,
+    messagePort: port
+  });
+  set$2(rpc);
 };
 
 const Explorer = 'Explorer';
@@ -2045,7 +2024,16 @@ const RunAndDebug = 'Run And Debug';
 const Search = 'Search';
 const SourceControl = 'Source Control';
 
-const getActivityBarItems = state => {
+const toActivityBarItem = view => {
+  return {
+    flags: Tab | Enabled,
+    icon: view.icon || Extensions$1,
+    id: view.id,
+    keyShortcuts: '',
+    title: view.title || view.id
+  };
+};
+const getActivityBarItems = (state, contributedViews = []) => {
   const {
     accountEnabled
   } = state;
@@ -2082,7 +2070,7 @@ const getActivityBarItems = state => {
     id: Extensions,
     keyShortcuts: 'Control+Shift+X',
     title: extensions()
-  }
+  }, ...contributedViews.map(toActivityBarItem)
   // Bottom
   ];
   if (accountEnabled) {
@@ -2104,6 +2092,70 @@ const getActivityBarItems = state => {
   return items;
 };
 
+const getContributedViews = async platform => {
+  try {
+    return await invoke$1('Extensions.getViews', '', platform);
+  } catch {
+    return [];
+  }
+};
+
+const handleExtensionsChanged = async state => {
+  const {
+    height,
+    itemHeight,
+    selectedIndex
+  } = state;
+  const contributedViews = await getContributedViews(state.platform);
+  const items = getActivityBarItems(state, contributedViews);
+  const itemsWithSelected = markSelected(items, selectedIndex);
+  const filteredItems = getFilteredActivityBarItems(itemsWithSelected, height, itemHeight);
+  const newItems = await updateItemsWithBadgeCount(filteredItems);
+  return {
+    ...state,
+    activityBarItems: itemsWithSelected,
+    filteredItems: newItems
+  };
+};
+
+const handleFocus = state => {
+  return {
+    ...state,
+    focused: true
+  };
+};
+
+const handleResize = (state, dimensions) => {
+  const {
+    activityBarItems,
+    itemHeight
+  } = state;
+  const {
+    height,
+    width,
+    x,
+    y
+  } = dimensions;
+  const filteredItems = getFilteredActivityBarItems(activityBarItems, height, itemHeight);
+  return {
+    ...state,
+    filteredItems,
+    height,
+    width,
+    x,
+    y
+  };
+};
+
+const getAccountEnabled = async defaultValue => {
+  try {
+    const value = await invoke('Preferences.get', 'activityBar.accountEnabled');
+    return typeof value === 'boolean' ? value : defaultValue;
+  } catch {
+    return defaultValue;
+  }
+};
+
 const getSideBarPosition = async () => {
   try {
     return await invoke('Layout.getSideBarPosition');
@@ -2118,12 +2170,12 @@ const handleSettingsChanged = async state => {
     itemHeight,
     selectedIndex
   } = state;
-  const [accountEnabled, sidebarLocation] = await Promise.all([getAccountEnabled(state.accountEnabled), getSideBarPosition()]);
+  const [accountEnabled, contributedViews, sidebarLocation] = await Promise.all([getAccountEnabled(state.accountEnabled), getContributedViews(state.platform), getSideBarPosition()]);
   const newState = {
     ...state,
     accountEnabled
   };
-  const items = getActivityBarItems(newState);
+  const items = getActivityBarItems(newState, contributedViews);
   const itemsWithSelected = markSelected(items, selectedIndex);
   const filteredItems = getFilteredActivityBarItems(itemsWithSelected, height, itemHeight);
   const newItems = await updateItemsWithBadgeCount(filteredItems);
@@ -2262,15 +2314,16 @@ const loadContent = async state => {
   const {
     accountEnabled,
     height,
-    itemHeight
+    itemHeight,
+    platform
   } = state;
-  const [accountEnabledNew, activeView, sideBarVisible, sidebarLocation, userInfo] = await Promise.all([getAccountEnabled(accountEnabled), getActiveView(), getSideBarVisible(), getSideBarPosition(), getUserInfo()]);
+  const [accountEnabledNew, activeView, contributedViews, sideBarVisible, sidebarLocation, userInfo] = await Promise.all([getAccountEnabled(accountEnabled), getActiveView(), getContributedViews(platform), getSideBarVisible(), getSideBarPosition(), getUserInfo()]);
   const newState = {
     ...state,
     accountEnabled: accountEnabledNew,
     userLoginState: toUserLoginState(getUserState(userInfo))
   };
-  const items = getActivityBarItems(newState);
+  const items = getActivityBarItems(newState, contributedViews);
   const index = items.findIndex(item => item.id === activeView);
   const selectedIndex = sideBarVisible ? index : -1;
   const itemsWithSelected = markSelected(items, selectedIndex);
@@ -2453,11 +2506,78 @@ const treeToArray = node => {
   return result;
 };
 
+const navigateToChild = (patches, currentChildIndex, index) => {
+  if (currentChildIndex === -1) {
+    patches.push({
+      type: NavigateChild,
+      index
+    });
+    return index;
+  }
+  if (currentChildIndex !== index) {
+    patches.push({
+      type: NavigateSibling,
+      index
+    });
+  }
+  return index;
+};
+const navigateToParent = (patches, currentChildIndex) => {
+  if (currentChildIndex >= 0) {
+    patches.push({
+      type: NavigateParent
+    });
+  }
+  return -1;
+};
+const addTree = (newNode, patches) => {
+  patches.push({
+    type: Add,
+    nodes: treeToArray(newNode)
+  });
+};
+const replaceTree = (newNode, patches) => {
+  patches.push({
+    type: Replace,
+    nodes: treeToArray(newNode)
+  });
+};
+const diffExistingChild = (oldNode, newNode, patches, currentChildIndex, index) => {
+  const nodePatches = compareNodes(oldNode.node, newNode.node);
+  if (nodePatches === null) {
+    const nextChildIndex = navigateToChild(patches, currentChildIndex, index);
+    replaceTree(newNode, patches);
+    return nextChildIndex;
+  }
+  const hasChildrenToCompare = oldNode.children.length > 0 || newNode.children.length > 0;
+  if (nodePatches.length === 0 && !hasChildrenToCompare) {
+    return currentChildIndex;
+  }
+  const nextChildIndex = navigateToChild(patches, currentChildIndex, index);
+  if (nodePatches.length > 0) {
+    patches.push(...nodePatches);
+  }
+  if (hasChildrenToCompare) {
+    diffChildren(oldNode.children, newNode.children, patches);
+  }
+  return nextChildIndex;
+};
+const diffRootNode = (oldNode, newNode, patches) => {
+  const nodePatches = compareNodes(oldNode.node, newNode.node);
+  if (nodePatches === null) {
+    replaceTree(newNode, patches);
+    return;
+  }
+  if (nodePatches.length > 0) {
+    patches.push(...nodePatches);
+  }
+  if (oldNode.children.length > 0 || newNode.children.length > 0) {
+    diffChildren(oldNode.children, newNode.children, patches);
+  }
+};
 const diffChildren = (oldChildren, newChildren, patches) => {
   const maxLength = Math.max(oldChildren.length, newChildren.length);
-  // Track where we are: -1 means at parent, >= 0 means at child index
   let currentChildIndex = -1;
-  // Collect indices of children to remove (we'll add these patches at the end in reverse order)
   const indicesToRemove = [];
   for (let i = 0; i < maxLength; i++) {
     const oldNode = oldChildren[i];
@@ -2466,88 +2586,17 @@ const diffChildren = (oldChildren, newChildren, patches) => {
       continue;
     }
     if (!oldNode) {
-      // Add new node - we should be at the parent
-      if (currentChildIndex >= 0) {
-        // Navigate back to parent
-        patches.push({
-          type: NavigateParent
-        });
-        currentChildIndex = -1;
-      }
-      // Flatten the entire subtree so renderInternal can handle it
-      const flatNodes = treeToArray(newNode);
-      patches.push({
-        type: Add,
-        nodes: flatNodes
-      });
-    } else if (newNode) {
-      // Compare nodes to see if we need any patches
-      const nodePatches = compareNodes(oldNode.node, newNode.node);
-      // If nodePatches is null, the node types are incompatible - need to replace
-      if (nodePatches === null) {
-        // Navigate to this child
-        if (currentChildIndex === -1) {
-          patches.push({
-            type: NavigateChild,
-            index: i
-          });
-          currentChildIndex = i;
-        } else if (currentChildIndex !== i) {
-          patches.push({
-            type: NavigateSibling,
-            index: i
-          });
-          currentChildIndex = i;
-        }
-        // Replace the entire subtree
-        const flatNodes = treeToArray(newNode);
-        patches.push({
-          type: Replace,
-          nodes: flatNodes
-        });
-        // After replace, we're at the new element (same position)
-        continue;
-      }
-      // Check if we need to recurse into children
-      const hasChildrenToCompare = oldNode.children.length > 0 || newNode.children.length > 0;
-      // Only navigate to this element if we need to do something
-      if (nodePatches.length > 0 || hasChildrenToCompare) {
-        // Navigate to this child if not already there
-        if (currentChildIndex === -1) {
-          patches.push({
-            type: NavigateChild,
-            index: i
-          });
-          currentChildIndex = i;
-        } else if (currentChildIndex !== i) {
-          patches.push({
-            type: NavigateSibling,
-            index: i
-          });
-          currentChildIndex = i;
-        }
-        // Apply node patches (these apply to the current element, not children)
-        if (nodePatches.length > 0) {
-          patches.push(...nodePatches);
-        }
-        // Compare children recursively
-        if (hasChildrenToCompare) {
-          diffChildren(oldNode.children, newNode.children, patches);
-        }
-      }
-    } else {
-      // Remove old node - collect the index for later removal
+      currentChildIndex = navigateToParent(patches, currentChildIndex);
+      addTree(newNode, patches);
+      continue;
+    }
+    if (!newNode) {
       indicesToRemove.push(i);
+      continue;
     }
+    currentChildIndex = diffExistingChild(oldNode, newNode, patches, currentChildIndex, i);
   }
-  // Navigate back to parent if we ended at a child
-  if (currentChildIndex >= 0) {
-    patches.push({
-      type: NavigateParent
-    });
-  }
-  // Add remove patches in reverse order (highest index first)
-  // This ensures indices remain valid as we remove
+  navigateToParent(patches, currentChildIndex);
   for (let j = indicesToRemove.length - 1; j >= 0; j--) {
     patches.push({
       type: RemoveChild,
@@ -2556,33 +2605,11 @@ const diffChildren = (oldChildren, newChildren, patches) => {
   }
 };
 const diffTrees = (oldTree, newTree, patches, path) => {
-  // At the root level (path.length === 0), we're already AT the element
-  // So we compare the root node directly, then compare its children
   if (path.length === 0 && oldTree.length === 1 && newTree.length === 1) {
-    const oldNode = oldTree[0];
-    const newNode = newTree[0];
-    // Compare root nodes
-    const nodePatches = compareNodes(oldNode.node, newNode.node);
-    // If nodePatches is null, the root node types are incompatible - need to replace
-    if (nodePatches === null) {
-      const flatNodes = treeToArray(newNode);
-      patches.push({
-        type: Replace,
-        nodes: flatNodes
-      });
-      return;
-    }
-    if (nodePatches.length > 0) {
-      patches.push(...nodePatches);
-    }
-    // Compare children
-    if (oldNode.children.length > 0 || newNode.children.length > 0) {
-      diffChildren(oldNode.children, newNode.children, patches);
-    }
-  } else {
-    // Non-root level or multiple root elements - use the regular comparison
-    diffChildren(oldTree, newTree, patches);
+    diffRootNode(oldTree[0], newTree[0], patches);
+    return;
   }
+  diffChildren(oldTree, newTree, patches);
 };
 
 const removeTrailingNavigationPatches = patches => {
@@ -2985,6 +3012,8 @@ const commandMap = {
   'ActivityBar.handleClickSignIn': wrapCommand(handleClickSignIn),
   'ActivityBar.handleClickSignOut': wrapCommand(handleClickSignOut),
   'ActivityBar.handleContextMenu': wrapCommand(handleContextMenu),
+  'ActivityBar.handleExtensionManagementMessagePort': handleExtensionManagementMessagePort,
+  'ActivityBar.handleExtensionsChanged': wrapCommand(handleExtensionsChanged),
   'ActivityBar.handleFocus': wrapCommand(handleFocus),
   'ActivityBar.handleSettingsChanged': wrapCommand(handleSettingsChanged),
   'ActivityBar.handleSideBarStateChange': wrapCommand(handleSideBarStateChange),
@@ -3009,7 +3038,7 @@ const initializeAuthWorker = async () => {
     commandMap: {},
     send
   });
-  set$2(rpc);
+  set$3(rpc);
 };
 
 const listen = async () => {

package/package.json

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