@lvce-editor/status-bar-worker 1.14.0 → 1.15.0

package/dist/statusBarWorkerMain.js

@@ -407,7 +407,7 @@ const getFirstEvent = (eventEmitter, eventMap) => {
   return promise;
 };
 const Message$1 = 3;
-const create$5 = async ({
+const create$5$1 = async ({
   isMessagePortOpen,
   messagePort
 }) => {
@@ -458,7 +458,7 @@ const wrap$5 = messagePort => {
 };
 const IpcParentWithMessagePort$1 = {
   __proto__: null,
-  create: create$5,
+  create: create$5$1,
   signal: signal$1,
   wrap: wrap$5
 };
@@ -664,7 +664,7 @@ const getErrorProperty = (error, prettyError) => {
     }
   };
 };
-const create$1$2 = (id, error) => {
+const create$1$1 = (id, error) => {
   return {
     jsonrpc: Two$1,
     id,
@@ -675,9 +675,9 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const prettyError = preparePrettyError(error);
   logError(error, prettyError);
   const errorProperty = getErrorProperty(error, prettyError);
-  return create$1$2(id, errorProperty);
+  return create$1$1(id, errorProperty);
 };
-const create$3 = (message, result) => {
+const create$4 = (message, result) => {
   return {
     jsonrpc: Two$1,
     id: message.id,
@@ -686,7 +686,7 @@ const create$3 = (message, result) => {
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$3(message, resultProperty);
+  return create$4(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
@@ -800,14 +800,14 @@ const execute = (command, ...args) => {
 };
 
 const Two = '2.0';
-const create$s = (method, params) => {
+const create$t = (method, params) => {
   return {
     jsonrpc: Two,
     method,
     params
   };
 };
-const create$r = (id, method, params) => {
+const create$s = (id, method, params) => {
   const message = {
     id,
     jsonrpc: Two,
@@ -817,14 +817,14 @@ const create$r = (id, method, params) => {
   return message;
 };
 let id$1 = 0;
-const create$q = () => {
+const create$r = () => {
   return ++id$1;
 };
 
 /* eslint-disable n/no-unsupported-features/es-syntax */
 
 const registerPromise = map => {
-  const id = create$q();
+  const id = create$r();
   const {
     promise,
     resolve
@@ -842,7 +842,7 @@ const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer)
     id,
     promise
   } = registerPromise(callbacks);
-  const message = create$r(id, method, params);
+  const message = create$s(id, method, params);
   if (useSendAndTransfer && ipc.sendAndTransfer) {
     ipc.sendAndTransfer(message);
   } else {
@@ -878,7 +878,7 @@ const createRpc = ipc => {
      * @deprecated
      */
     send(method, ...params) {
-      const message = create$s(method, params);
+      const message = create$t(method, params);
       ipc.send(message);
     }
   };
@@ -914,7 +914,7 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$4 = async ({
+const create$5 = async ({
   commandMap,
   isMessagePortOpen = true,
   messagePort
@@ -931,7 +931,7 @@ const create$4 = async ({
   messagePort.start();
   return rpc;
 };
-const create$2$1 = async ({
+const create$3 = async ({
   commandMap,
   isMessagePortOpen,
   send
@@ -941,7 +941,7 @@ const create$2$1 = async ({
     port2
   } = new MessageChannel();
   await send(port1);
-  return create$4({
+  return create$5({
     commandMap,
     isMessagePortOpen,
     messagePort: port2
@@ -949,9 +949,9 @@ const create$2$1 = async ({
 };
 const TransferMessagePortRpcParent = {
   __proto__: null,
-  create: create$2$1
+  create: create$3
 };
-const create$1$1 = async ({
+const create$2$1 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -963,7 +963,7 @@ const create$1$1 = async ({
 };
 const WebWorkerRpcClient = {
   __proto__: null,
-  create: create$1$1
+  create: create$2$1
 };
 const createMockRpc = ({
   commandMap
@@ -985,9 +985,14 @@ const createMockRpc = ({
   return mockRpc;
 };
 
+const TargetName = 'event.target.name';
+
 const ExtensionHostWorker = 44;
 const RendererWorker = 1;
 
+const SetDom2 = 'Viewlet.setDom2';
+const SetPatches = 'Viewlet.setPatches';
+
 const rpcs = Object.create(null);
 const set$3 = (id, rpc) => {
   rpcs[id] = rpc;
@@ -1065,42 +1070,68 @@ const create$1 = () => {
   const states = Object.create(null);
   const commandMapRef = {};
   return {
-    get(uid) {
-      return states[uid];
+    clear() {
+      for (const key of Object.keys(states)) {
+        delete states[key];
+      }
     },
-    set(uid, oldState, newState) {
-      states[uid] = {
-        oldState,
-        newState
-      };
+    diff(uid, modules, numbers) {
+      const {
+        newState,
+        oldState
+      } = states[uid];
+      const diffResult = [];
+      for (let i = 0; i < modules.length; i++) {
+        const fn = modules[i];
+        if (!fn(oldState, newState)) {
+          diffResult.push(numbers[i]);
+        }
+      }
+      return diffResult;
     },
     dispose(uid) {
       delete states[uid];
     },
+    get(uid) {
+      return states[uid];
+    },
+    getCommandIds() {
+      const keys = Object.keys(commandMapRef);
+      const ids = keys.map(toCommandId);
+      return ids;
+    },
     getKeys() {
       return Object.keys(states).map(key => {
         return Number.parseInt(key);
       });
     },
-    clear() {
-      for (const key of Object.keys(states)) {
-        delete states[key];
-      }
+    registerCommands(commandMap) {
+      Object.assign(commandMapRef, commandMap);
+    },
+    set(uid, oldState, newState) {
+      states[uid] = {
+        newState,
+        oldState
+      };
     },
     wrapCommand(fn) {
       const wrapped = async (uid, ...args) => {
         const {
-          oldState,
-          newState
+          newState,
+          oldState
         } = states[uid];
         const newerState = await fn(newState, ...args);
         if (oldState === newerState || newState === newerState) {
           return;
         }
-        const latest = states[uid];
+        const latestOld = states[uid];
+        const latestNew = {
+          ...latestOld.newState,
+          ...newerState
+        };
         states[uid] = {
-          oldState: latest.oldState,
-          newState: newerState
+          newState: latestNew,
+          oldState: latestOld.oldState
         };
       };
       return wrapped;
@@ -1113,28 +1144,6 @@ const create$1 = () => {
         return fn(newState, ...args);
       };
       return wrapped;
-    },
-    diff(uid, modules, numbers) {
-      const {
-        oldState,
-        newState
-      } = states[uid];
-      const diffResult = [];
-      for (let i = 0; i < modules.length; i++) {
-        const fn = modules[i];
-        if (!fn(oldState, newState)) {
-          diffResult.push(numbers[i]);
-        }
-      }
-      return diffResult;
-    },
-    getCommandIds() {
-      const keys = Object.keys(commandMapRef);
-      const ids = keys.map(toCommandId);
-      return ids;
-    },
-    registerCommands(commandMap) {
-      Object.assign(commandMapRef, commandMap);
     }
   };
 };
@@ -1155,6 +1164,7 @@ const create = (uid, uri, x, y, width, height, platform, assetDir) => {
   const state = {
     assetDir,
     errorCount: 0,
+    initial: true,
     platform,
     statusBarItemsLeft: [],
     statusBarItemsRight: [],
@@ -1169,6 +1179,7 @@ const isEqual = (oldState, newState) => {
 };
 
 const RenderItems = 4;
+const RenderIncremental = 11;
 
 const modules = [isEqual];
 const numbers = [RenderItems];
@@ -1364,32 +1375,49 @@ const StatusBarItem = 'StatusBarItem';
 const StatusBarItemsLeft = 'StatusBarItemsLeft';
 const StatusBarItemsRight = 'StatusBarItemsRight';
 
-const getBuiltinStatusBarItems = async () => {
+const getProblemsAriaLabel = (errorCount, warningCount) => {
+  const parts = [];
+  if (errorCount > 0) {
+    parts.push(`${errorCount} ${errorCount === 1 ? 'Problem' : 'Problems'}`);
+  }
+  if (warningCount > 0) {
+    parts.push(`${warningCount} ${warningCount === 1 ? 'Warning' : 'Warnings'}`);
+  }
+  if (parts.length === 0) {
+    return 'No Problems';
+  }
+  return parts.join(', ');
+};
+const getBuiltinStatusBarItems = async (errorCount, warningCount) => {
   const extraItems = [{
-    command: undefined,
+    ariaLabel: 'Notifications',
+    command: '',
+    // TODO should show notifications center
     elements: [{
       type: 'text',
       value: 'Notifications'
     }],
     name: Notifications,
-    tooltip: ''
+    tooltip: 'Notifications'
   }, {
-    command: undefined,
+    ariaLabel: getProblemsAriaLabel(errorCount, warningCount),
+    command: '',
+    // TODO should show problems view
     elements: [{
       type: 'icon',
       value: ProblemsErrorIcon
     }, {
       type: 'text',
-      value: '0'
+      value: `${errorCount}`
     }, {
       type: 'icon',
       value: ProblemsWarningIcon
     }, {
       type: 'text',
-      value: '0'
+      value: `${warningCount}`
     }],
     name: Problems,
-    tooltip: ''
+    tooltip: 'Problems'
   }];
   return extraItems;
 };
@@ -1414,7 +1442,9 @@ const toStatusBarItem = uiStatusBarItem => {
       value: ''
     });
   }
+  const ariaLabel = uiStatusBarItem.text || uiStatusBarItem.tooltip || uiStatusBarItem.name;
   return {
+    ariaLabel,
     command: uiStatusBarItem.command || undefined,
     elements,
     name: uiStatusBarItem.name,
@@ -1445,14 +1475,14 @@ const toUiStatusBarItems = statusBarItems => {
   return statusBarItems.map(toUiStatusBarItem);
 };
 
-const getStatusBarItems = async (showItems, assetDir, platform) => {
+const getStatusBarItems = async (showItems, assetDir, platform, errorCount, warningCount) => {
   if (!showItems) {
     return [];
   }
   await activateByEvent('onSourceControl', assetDir, platform);
   const extensionStatusBarItems = await getStatusBarItems$1(assetDir, platform);
   const uiStatusBarItems = toUiStatusBarItems(extensionStatusBarItems);
-  const extraItems = await getBuiltinStatusBarItems();
+  const extraItems = await getBuiltinStatusBarItems(errorCount, warningCount);
   return [...uiStatusBarItems.map(toStatusBarItem), ...extraItems];
 };
 
@@ -1468,13 +1498,16 @@ const itemsVisible = async () => {
 const loadContent = async state => {
   const {
     assetDir,
-    platform
+    errorCount,
+    platform,
+    warningCount
   } = state;
   const statusBarItemsPreference = await itemsVisible();
-  const statusBarItems = await getStatusBarItems(statusBarItemsPreference, assetDir, platform);
+  const statusBarItems = await getStatusBarItems(statusBarItemsPreference, assetDir, platform, errorCount, warningCount);
   return {
     ...state,
     errorCount: 0,
+    initial: false,
     statusBarItemsLeft: [...statusBarItems],
     statusBarItemsRight: [],
     warningCount: 0
@@ -1482,6 +1515,7 @@ const loadContent = async state => {
 };
 
 const Button$1 = 'button';
+const Status = 'status';
 
 const MaskIcon = 'MaskIcon';
 
@@ -1490,22 +1524,295 @@ const Div = 4;
 const Span = 8;
 const Text = 12;
 
-const TargetName = 'event.target.name';
-
-const SetDom2 = 'Viewlet.setDom2';
-
 const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
 };
 
 const text = data => {
   return {
-    type: Text,
+    childCount: 0,
     text: data,
-    childCount: 0
+    type: Text
+  };
+};
+
+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 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) => {
+  const patches = [];
+  // 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;
+  }
+  // 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);
+  const newKeys = getKeys(newNode);
+  // 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 (!(key in newNode)) {
+      patches.push({
+        type: RemoveAttribute,
+        key
+      });
+    }
+  }
+  return patches;
+};
+
+const treeToArray = node => {
+  const result = [node.node];
+  for (const child of node.children) {
+    result.push(...treeToArray(child));
+  }
+  return result;
+};
+
+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];
+    const newNode = newChildren[i];
+    if (!oldNode && !newNode) {
+      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
+      indicesToRemove.push(i);
+    }
+  }
+  // Navigate back to parent if we ended at a child
+  if (currentChildIndex >= 0) {
+    patches.push({
+      type: NavigateParent
+    });
+    currentChildIndex = -1;
+  }
+  // Add remove patches in reverse order (highest index first)
+  // This ensures indices remain valid as we remove
+  for (let j = indicesToRemove.length - 1; j >= 0; j--) {
+    patches.push({
+      type: RemoveChild,
+      index: indicesToRemove[j]
+    });
+  }
+};
+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);
+  }
+};
+
+const removeTrailingNavigationPatches = patches => {
+  // Find the last non-navigation patch
+  let lastNonNavigationIndex = -1;
+  for (let i = patches.length - 1; i >= 0; i--) {
+    const patch = patches[i];
+    if (patch.type !== NavigateChild && patch.type !== NavigateParent && patch.type !== NavigateSibling) {
+      lastNonNavigationIndex = i;
+      break;
+    }
+  }
+  // Return patches up to and including the last non-navigation patch
+  return lastNonNavigationIndex === -1 ? [] : patches.slice(0, lastNonNavigationIndex + 1);
+};
+
+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 HandleClick = 11;
 
 const getTextVirtualDom = element => {
@@ -1534,12 +1841,14 @@ const getStatusBarItemElementVirtualDom = element => {
 
 const getStatusBarItemVirtualDom = statusBarItem => {
   const {
+    ariaLabel,
     elements,
     name,
     tooltip
   } = statusBarItem;
   const elementNodes = elements.flatMap(getStatusBarItemElementVirtualDom);
-  return [{
+  const buttonNode = {
+    ariaLabel,
     childCount: elements.length,
     className: StatusBarItem,
     name,
@@ -1547,7 +1856,8 @@ const getStatusBarItemVirtualDom = statusBarItem => {
     tabIndex: -1,
     title: tooltip,
     type: Button
-  }, ...elementNodes];
+  };
+  return [buttonNode, ...elementNodes];
 };
 
 const getStatusBarItemsVirtualDom = (items, className) => {
@@ -1576,6 +1886,7 @@ const getStatusBarVirtualDom = (statusBarItemsLeft, statusBarItemsRight) => {
     childCount: getChildCount(statusBarItemsLeft.length, statusBarItemsRight.length),
     className: 'StatusBar',
     onClick: HandleClick,
+    role: Status,
     type: Div
   }, ...getStatusBarItemsVirtualDom(statusBarItemsLeft, StatusBarItemsLeft), ...getStatusBarItemsVirtualDom(statusBarItemsRight, StatusBarItemsRight)];
   return dom;
@@ -1591,8 +1902,17 @@ const renderItems = (oldState, newState) => {
   return [SetDom2, uid, dom];
 };
 
+const renderIcremental = (oldState, newState) => {
+  const oldDom = renderItems(oldState, oldState)[2];
+  const newDom = renderItems(newState, newState)[2];
+  const patches = diffTree(oldDom, newDom);
+  return [SetPatches, newState.uid, patches];
+};
+
 const getRenderer = diffType => {
   switch (diffType) {
+    case RenderIncremental:
+      return renderIcremental;
     case RenderItems:
       return renderItems;
     default:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/status-bar-worker",
-  "version": "1.14.0",
+  "version": "1.15.0",
   "description": "Status Bar Worker",
   "repository": {
     "type": "git",
@@ -11,6 +11,6 @@
   "type": "module",
   "main": "dist/statusBarWorkerMain.js",
   "dependencies": {
-    "@lvce-editor/virtual-dom-worker": "^4.0.0"
+    "@lvce-editor/virtual-dom-worker": "^6.8.0"
   }
 }