@lvce-editor/status-bar-worker 3.32.1 → 3.32.3

package/dist/statusBarWorkerMain.js

@@ -263,15 +263,18 @@ const terminate = () => {
 const {
   get: get$5,
   getCommandIds,
-  getKeys,
+  getKeys: getKeys$1,
   registerCommands,
   set: set$9,
   wrapCommand,
   wrapGetter,
   wrapSerialAsyncCommand} = create$a();
 
-const create$9 = (uid, uri, x, y, width, height, platform, assetDir) => {
+const create$9 = (uid, uri, x, y, width, height, platform, assetDir, applicationId) => {
   const state = {
+    ...(applicationId !== undefined && {
+      applicationId
+    }),
     assetDir,
     errorCount: 0,
     initial: true,
@@ -509,6 +512,7 @@ const TextMeasurementWorker = 7011;
 
 const SetDom2 = 'Viewlet.setDom2';
 const SetFocusContext = 'Viewlet.setFocusContext';
+const SetPatches = 'Viewlet.setPatches';
 
 const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
@@ -524,6 +528,266 @@ const text = data => {
 
 new Set(Object.values(VirtualDomElements));
 
+const SetText = 1;
+const Replace = 2;
+const SetAttribute = 3;
+const RemoveAttribute = 4;
+const Add = 6;
+const NavigateChild = 7;
+const NavigateParent = 8;
+const RemoveChild = 9;
+const NavigateSibling = 10;
+const SetReferenceNodeUid = 11;
+
+const isKey = key => {
+  return key !== 'type' && key !== 'childCount';
+};
+
+const getKeys = node => {
+  const keys = Object.keys(node).filter(isKey);
+  return keys;
+};
+
+const arrayToTree = nodes => {
+  const result = [];
+  let i = 0;
+  while (i < nodes.length) {
+    const node = nodes[i];
+    const {
+      children,
+      nodesConsumed
+    } = getChildrenWithCount(nodes, i + 1, node.childCount || 0);
+    result.push({
+      node,
+      children
+    });
+    i += 1 + nodesConsumed;
+  }
+  return result;
+};
+const getChildrenWithCount = (nodes, startIndex, childCount) => {
+  if (childCount === 0) {
+    return {
+      children: [],
+      nodesConsumed: 0
+    };
+  }
+  const children = [];
+  let i = startIndex;
+  let remaining = childCount;
+  let totalConsumed = 0;
+  while (remaining > 0 && i < nodes.length) {
+    const node = nodes[i];
+    const nodeChildCount = node.childCount || 0;
+    const {
+      children: nodeChildren,
+      nodesConsumed
+    } = getChildrenWithCount(nodes, i + 1, nodeChildCount);
+    children.push({
+      node,
+      children: nodeChildren
+    });
+    const nodeSize = 1 + nodesConsumed;
+    i += nodeSize;
+    totalConsumed += nodeSize;
+    remaining--;
+  }
+  return {
+    children,
+    nodesConsumed: totalConsumed
+  };
+};
+
+const compareNodes = (oldNode, newNode) => {
+  // Check if node type changed - return null to signal incompatible nodes
+  // (caller should handle this with a Replace operation)
+  if (oldNode.type !== newNode.type) {
+    return null;
+  }
+  const patches = [];
+  // Handle reference nodes - special handling for uid changes
+  if (oldNode.type === Reference && oldNode.uid !== newNode.uid) {
+    patches.push({
+      type: SetReferenceNodeUid,
+      uid: newNode.uid
+    });
+  }
+  // Handle text nodes
+  if (oldNode.type === Text && newNode.type === Text) {
+    if (oldNode.text !== newNode.text) {
+      patches.push({
+        type: SetText,
+        value: newNode.text
+      });
+    }
+    return patches;
+  }
+  // Compare attributes
+  const oldKeys = getKeys(oldNode).filter(key => oldNode.type !== Reference || key !== 'uid');
+  const newKeys = getKeys(newNode).filter(key => newNode.type !== Reference || key !== 'uid');
+  // Check for attribute changes
+  for (const key of newKeys) {
+    if (oldNode[key] !== newNode[key]) {
+      patches.push({
+        type: SetAttribute,
+        key,
+        value: newNode[key]
+      });
+    }
+  }
+  // Check for removed attributes
+  for (const key of oldKeys) {
+    if (!Object.hasOwn(newNode, key)) {
+      patches.push({
+        type: RemoveAttribute,
+        key
+      });
+    }
+  }
+  return patches;
+};
+
+const treeToArray = node => {
+  const result = [];
+  const stack = [node];
+  while (stack.length > 0) {
+    const current = stack.pop();
+    result.push(current.node);
+    for (let i = current.children.length - 1; i >= 0; i--) {
+      stack.push(current.children[i]);
+    }
+  }
+  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);
+  let currentChildIndex = -1;
+  const indicesToRemove = [];
+  for (let i = 0; i < maxLength; i++) {
+    const oldNode = oldChildren[i];
+    const newNode = newChildren[i];
+    if (!oldNode && !newNode) {
+      continue;
+    }
+    if (!oldNode) {
+      currentChildIndex = navigateToParent(patches, currentChildIndex);
+      addTree(newNode, patches);
+      continue;
+    }
+    if (!newNode) {
+      indicesToRemove.push(i);
+      continue;
+    }
+    currentChildIndex = diffExistingChild(oldNode, newNode, patches, currentChildIndex, i);
+  }
+  navigateToParent(patches, currentChildIndex);
+  for (let j = indicesToRemove.length - 1; j >= 0; j--) {
+    patches.push({
+      type: RemoveChild,
+      index: indicesToRemove[j]
+    });
+  }
+};
+const diffTrees = (oldTree, newTree, patches, path) => {
+  if (path.length === 0 && oldTree.length === 1 && newTree.length === 1) {
+    diffRootNode(oldTree[0], newTree[0], patches);
+    return;
+  }
+  diffChildren(oldTree, newTree, patches);
+};
+
+const removeTrailingNavigationPatches = patches => {
+  while (patches.length > 0) {
+    const patch = patches.at(-1);
+    if (patch.type !== NavigateChild && patch.type !== NavigateParent && patch.type !== NavigateSibling) {
+      break;
+    }
+    patches.pop();
+  }
+  return patches;
+};
+
+const diffTree = (oldNodes, newNodes) => {
+  // Step 1: Convert flat arrays to tree structures
+  const oldTree = arrayToTree(oldNodes);
+  const newTree = arrayToTree(newNodes);
+  // Step 3: Compare the trees
+  const patches = [];
+  diffTrees(oldTree, newTree, patches, []);
+  // Remove trailing navigation patches since they serve no purpose
+  return removeTrailingNavigationPatches(patches);
+};
+
 const HandleContextMenu = 2;
 const HandleClick = 11;
 
@@ -1885,9 +2149,16 @@ const getPreference = async key => {
   return await invoke$2('Preferences.get', key);
 };
 
-const handleClickExtensionStatusBarItem = async name => {
+const invokeExtensionCommand = (applicationId, command, ...args) => {
+  if (applicationId !== undefined) {
+    return invoke$5('Extensions.invokeForApplication', applicationId, command, ...args);
+  }
+  return invoke$5(command, ...args);
+};
+
+const handleClickExtensionStatusBarItem = async (name, applicationId) => {
   try {
-    await invoke$5('Extensions.executeCommand', name);
+    await invokeExtensionCommand(applicationId, 'Extensions.executeCommand', name);
   } catch (error) {
     console.error(new VError(error, `Failed to execute status bar command: ${name}`));
   }
@@ -1907,6 +2178,7 @@ const handleClick = async (state, name) => {
     return state;
   }
   const {
+    applicationId,
     editorStatus,
     statusBarItemsLeft,
     statusBarItemsRight
@@ -1922,7 +2194,7 @@ const handleClick = async (state, name) => {
   } else if (isEditorStatus(item.name)) {
     await handleClickEditorStatus(item.name, editorStatus);
   } else if (item.command && !isEditorStatus(item.name)) {
-    await handleClickExtensionStatusBarItem(item.command);
+    await handleClickExtensionStatusBarItem(item.command, applicationId);
   }
   // TODO
   // sendExtensionWorker([/* statusBarItemHandleClick */ 7657, /* name */ name])
@@ -1946,9 +2218,9 @@ const show2 = async (uid, menuId, x, y, args) => {
   await invoke$1('Menu.show2', uid, menuId, x, y, args);
 };
 
-const getStatusBarItemContextMenuItems = async (extensionId, providerId) => {
+const getStatusBarItemContextMenuItems = async (extensionId, providerId, applicationId) => {
   try {
-    return await invoke$5('Extensions.getStatusBarItemContextMenuItems', extensionId, providerId);
+    return await invokeExtensionCommand(applicationId, 'Extensions.getStatusBarItemContextMenuItems', extensionId, providerId);
   } catch {
     return [];
   }
@@ -1958,7 +2230,7 @@ const StatusBar = 31;
 
 const handleContextMenu = async (state, button, x, y, targetName = '') => {
   const item = [...state.statusBarItemsLeft, ...state.statusBarItemsRight].find(statusBarItem => statusBarItem.name === targetName);
-  const contextMenuItems = item?.extensionId && item.providerId ? await getStatusBarItemContextMenuItems(item.extensionId, item.providerId) : [];
+  const contextMenuItems = item?.extensionId && item.providerId ? await getStatusBarItemContextMenuItems(item.extensionId, item.providerId, state.applicationId) : [];
   await show2(state.uid, StatusBar, x, y, {
     contextMenuItems,
     menuId: StatusBar
@@ -2190,7 +2462,25 @@ const handleEditorStatusChanged = (state, editorStatus, previous = state) => {
 };
 
 const renderIncremental = (oldState, newState) => {
-  return renderItems(oldState, newState);
+  if (oldState.initial) {
+    return renderItems(oldState, newState);
+  }
+  const oldDom = getStatusBarVirtualDom(oldState.visibleStatusBarItemsLeft, oldState.visibleStatusBarItemsRight);
+  const newDom = getStatusBarVirtualDom(newState.visibleStatusBarItemsLeft, newState.visibleStatusBarItemsRight);
+  // Structural and visibility changes can replace or reorder item groups.
+  // Keep their full-render fallback, including the renderer's ambiguous
+  // solitary Add encoding. Only patch a stable tree of the same items.
+  if (oldDom.length !== newDom.length || oldDom.some((node, index) => {
+    const other = newDom[index];
+    return node.type !== other.type || node.childCount !== other.childCount || node.className !== other.className || node.name !== other.name;
+  })) {
+    return renderItems(oldState, newState);
+  }
+  const patches = diffTree(oldDom, newDom);
+  if (patches.length === 0) {
+    return [];
+  }
+  return [SetPatches, newState.uid, patches];
 };
 
 const getRenderer = diffType => {
@@ -2333,11 +2623,17 @@ const render2 = async (uid, _diffResult) => {
     }
     newState = latestState;
   }
-  const diffResult = [...new Set([..._diffResult, ...diff(current.oldState, newState)])];
+  const changed = [...new Set([..._diffResult, ...diff(current.oldState, newState)])];
+  // A full replacement already includes every change; do not patch its new tree
+  // using paths calculated against the old tree.
+  const diffResult = changed.includes(RenderItems) ? changed.filter(type => type !== RenderIncremental) : changed;
   const {
     oldState
   } = current;
   const commands = applyRender(oldState, newState, diffResult);
+  // Advance synchronously: subsequent out-of-band updates must diff against
+  // the DOM commands just generated, including updates that revert a value.
+  set$9(uid, newState, newState);
   if (!isConnected()) {
     return commands;
   }
@@ -2371,7 +2667,7 @@ const handleEditorStatusChangedAll = async update => {
   };
   const editorStatus = applyUpdate(update);
   const changedUids = [];
-  for (const uid of getKeys()) {
+  for (const uid of getKeys$1()) {
     const {
       newState,
       oldState
@@ -2415,7 +2711,7 @@ const handleEditorStatusVisibilityChangedAll = async visible => {
   }
   setVisible(visible);
   const changedUids = [];
-  for (const uid of getKeys()) {
+  for (const uid of getKeys$1()) {
     const {
       newState,
       oldState
@@ -2510,9 +2806,9 @@ const getBuiltinStatusBarItems = async (errorCount, warningCount, {
   return [...getEditorStatusBarItems(editorStatus), ...getNotificationsStatusBarItem(notificationsEnabled, notificationCount), ...getProblemsStatusBarItem(errorCount, warningCount, problemsEnabled)];
 };
 
-const getExtensionStatusBarItems = async (assetDir, platform) => {
-  await invoke$5('Extensions.activateByEvent', 'onStatusBarItem', assetDir, platform);
-  return invoke$5('Extensions.getStatusBarItems');
+const getExtensionStatusBarItems = async (assetDir, platform, applicationId) => {
+  await invokeExtensionCommand(applicationId, 'Extensions.activateByEvent', 'onStatusBarItem', assetDir, platform);
+  return invokeExtensionCommand(applicationId, 'Extensions.getStatusBarItems');
 };
 
 const toStatusBarItem = uiStatusBarItem => {
@@ -2596,6 +2892,7 @@ const getNotificationCount = async () => {
   }
 };
 const getStatusBarItems = async ({
+  applicationId,
   assetDir,
   builtinNotificationsEnabled = true,
   builtinProblemsEnabled = true,
@@ -2608,7 +2905,7 @@ const getStatusBarItems = async ({
   if (!showItems) {
     return [];
   }
-  const extensionStatusBarItems = await getExtensionStatusBarItems(assetDir, platform);
+  const extensionStatusBarItems = await getExtensionStatusBarItems(assetDir, platform, applicationId);
   const notificationCount = await getNotificationCount();
   const uiStatusBarItems = toUiStatusBarItems(extensionStatusBarItems);
   const extraItems = await getBuiltinStatusBarItems(errorCount, warningCount, {
@@ -2623,6 +2920,7 @@ const getStatusBarItems = async ({
 const refreshVersions = Object.create(null);
 const handleExtensionsChanged = async state => {
   const {
+    applicationId,
     assetDir,
     errorCount,
     platform,
@@ -2634,6 +2932,7 @@ const handleExtensionsChanged = async state => {
   refreshVersions[uid] = refreshVersion;
   // TODO requery status bar items
   const statusBarItems = await getStatusBarItems({
+    applicationId,
     assetDir,
     builtinNotificationsEnabled: false,
     builtinProblemsEnabled: false,
@@ -2657,7 +2956,7 @@ const handleItemsChanged = async state => {
 };
 
 const handleExtensionManagementChange = async () => {
-  for (const uid of getKeys()) {
+  for (const uid of getKeys$1()) {
     const {
       newState,
       oldState
@@ -2705,7 +3004,7 @@ const set = count => {
 
 const handleNotificationCountChangedAll = async count => {
   set(count);
-  for (const uid of getKeys()) {
+  for (const uid of getKeys$1()) {
     const {
       newState,
       oldState
@@ -2855,6 +3154,7 @@ const loadStatusBarPreferences = async () => {
 
 const loadContent = async state => {
   const {
+    applicationId,
     assetDir,
     errorCount,
     platform,
@@ -2867,6 +3167,7 @@ const loadContent = async state => {
     itemsVisible
   } = await loadStatusBarPreferences();
   const statusBarItems = await getStatusBarItems({
+    applicationId,
     assetDir,
     builtinNotificationsEnabled: builtinNotificationsEnabled,
     builtinProblemsEnabled: builtinProblemsEnabled,

package/package.json

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