@lvce-editor/status-bar-worker 2.5.0 → 3.0.0

package/dist/statusBarWorkerMain.js

@@ -121,8 +121,9 @@ const terminate = () => {
 const {
   get: get$3,
   getCommandIds,
+  getKeys: getKeys$1,
   registerCommands,
-  set: set$3,
+  set: set$4,
   wrapCommand,
   wrapGetter
 } = create$a();
@@ -138,7 +139,7 @@ const create$9 = (uid, uri, x, y, width, height, platform, assetDir) => {
     uid,
     warningCount: 0
   };
-  set$3(uid, state, state);
+  set$4(uid, state, state);
 };
 
 const isEqual = (oldState, newState) => {
@@ -1212,7 +1213,7 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$2 = (id, rpc) => {
+const set$3 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -1245,7 +1246,7 @@ const create = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$2(rpcId, mockRpc);
+      set$3(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove(rpcId);
@@ -1254,7 +1255,7 @@ const create = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$2(rpcId, rpc);
+      set$3(rpcId, rpc);
     }
   };
 };
@@ -1273,15 +1274,21 @@ const Reference = 100;
 const TargetName = 'event.target.name';
 
 const ExtensionHostWorker = 44;
+const ExtensionManagementWorker = 9006;
 const RendererWorker = 1;
 
 const SetDom2 = 'Viewlet.setDom2';
 const SetPatches = 'Viewlet.setPatches';
 
+const {
+  invoke: invoke$2,
+  set: set$2
+} = create(ExtensionHostWorker);
+
 const {
   invoke: invoke$1,
   set: set$1
-} = create(ExtensionHostWorker);
+} = create(ExtensionManagementWorker);
 
 const {
   invoke,
@@ -1292,9 +1299,6 @@ const sendMessagePortToExtensionHostWorker$1 = async (port, rpcId = 0) => {
   const command = 'HandleMessagePort.handleMessagePort2';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, command, rpcId);
 };
-const activateByEvent$1 = (event, assetDir, platform) => {
-  return invoke('ExtensionHostManagement.activateByEvent', event, assetDir, platform);
-};
 const getPreference = async key => {
   return await invoke('Preferences.get', key);
 };
@@ -1305,7 +1309,7 @@ const handleClickExtensionStatusBarItem = async name => {
 
   try {
     // @ts-ignore
-    await invoke$1(`ExtensionHostStatusBar.executeCommand`, name);
+    await invoke$2(`ExtensionHostStatusBar.executeCommand`, name);
   } catch (error) {
     console.error(new VError(error, `Failed to execute status bar command: ${name}`));
   }
@@ -1358,8 +1362,10 @@ const OnStatusBarItem = 'onStatusBarItem';
 const GetStatusBarItems = 'ExtensionHost.getStatusBarItems2';
 
 const activateByEvent = (event, assetDir, platform) => {
-  // @ts-ignore
-  return activateByEvent$1(event, assetDir, platform);
+  return invoke$1('Extensions.activateByEvent', event, assetDir, platform);
+};
+const getStatusBarItems$2 = () => {
+  return invoke$1('Extensions.getStatusBarItems');
 };
 
 const executeProviders = async ({
@@ -1374,7 +1380,7 @@ const executeProviders = async ({
 }) => {
   await activateByEvent(event, assetDir, platform);
   // @ts-ignore
-  const result = await invoke$1(method, ...params);
+  const result = await invoke$2(method, ...params);
   return result;
 };
 
@@ -1382,7 +1388,7 @@ const combineResults = results => {
   return results.flat();
 };
 const getStatusBarItems$1 = (assetDir, platform) => {
-  return executeProviders({
+  const legacyItems = executeProviders({
     assetDir,
     combineResults,
     event: OnStatusBarItem,
@@ -1392,6 +1398,8 @@ const getStatusBarItems$1 = (assetDir, platform) => {
     params: [],
     platform
   });
+  const isolatedItems = getStatusBarItems$2();
+  return Promise.all([legacyItems, isolatedItems]).then(combineResults);
 };
 
 const getNotificationsStatusBarItem = enabled => {
@@ -1530,7 +1538,6 @@ const getStatusBarItems = async ({
     return [];
   }
   await activateByEvent('onStatusBarItem', assetDir, platform);
-  await activateByEvent('onSourceControl', assetDir, platform);
   const extensionStatusBarItems = await getStatusBarItems$1(assetDir, platform);
   const uiStatusBarItems = toUiStatusBarItems(extensionStatusBarItems);
   const extraItems = await getBuiltinStatusBarItems(errorCount, warningCount, {
@@ -1567,6 +1574,36 @@ const handleItemsChanged = async state => {
   return handleExtensionsChanged(state);
 };
 
+const handleExtensionManagementChange = async () => {
+  const uids = getKeys$1();
+  for (const uid of uids) {
+    const {
+      newState,
+      oldState
+    } = get$3(uid);
+    const newerState = await handleItemsChanged(newState);
+    if (newState === newerState || oldState === newerState) {
+      continue;
+    }
+    set$4(uid, oldState, {
+      ...newState,
+      ...newerState
+    });
+  }
+};
+
+const commandMap$1 = {
+  'StatusBar.handleChange': handleExtensionManagementChange
+};
+
+const handleExtensionManagementMessagePort = async port => {
+  const rpc = await create$4({
+    commandMap: commandMap$1,
+    messagePort: port
+  });
+  set$1(rpc);
+};
+
 const id = 7201;
 const sendMessagePortToExtensionHostWorker = async port => {
   await sendMessagePortToExtensionHostWorker$1(port, id);
@@ -1577,7 +1614,7 @@ const initializeExtensionHostWorker = async () => {
     commandMap: {},
     send: sendMessagePortToExtensionHostWorker
   });
-  set$1(rpc);
+  set$2(rpc);
 };
 
 const initialize = async () => {
@@ -1819,11 +1856,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];
@@ -1832,88 +1936,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,
@@ -1922,33 +1955,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 => {
@@ -2114,7 +2125,7 @@ const render2 = (uid, diffResult) => {
     newState,
     oldState
   } = get$3(uid);
-  set$3(uid, newState, newState);
+  set$4(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
   return commands;
 };
@@ -2155,6 +2166,7 @@ const commandMap = {
   'StatusBar.handleChange': wrapCommand(handleItemsChanged),
   'StatusBar.handleClick': wrapCommand(handleClick),
   'StatusBar.handleContextMenu': wrapCommand(handleContextMenu),
+  'StatusBar.handleExtensionManagementMessagePort': handleExtensionManagementMessagePort,
   'StatusBar.handleExtensionsChanged': wrapCommand(handleExtensionsChanged),
   'StatusBar.handleItemsChanged': wrapCommand(handleItemsChanged),
   'StatusBar.initialize': initialize,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/status-bar-worker",
-  "version": "2.5.0",
+  "version": "3.0.0",
   "description": "Status Bar Worker",
   "repository": {
     "type": "git",