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

package/dist/statusBarWorkerMain.js

@@ -54,49 +54,6 @@ class VError extends Error {
   }
 }
 
-class AssertionError extends Error {
-  constructor(message) {
-    super(message);
-    this.name = 'AssertionError';
-  }
-}
-const Object$1 = 1;
-const Number$1 = 2;
-const Array$1 = 3;
-const String = 4;
-const Boolean = 5;
-const Function = 6;
-const Null = 7;
-const Unknown = 8;
-const getType = value => {
-  switch (typeof value) {
-    case 'number':
-      return Number$1;
-    case 'function':
-      return Function;
-    case 'string':
-      return String;
-    case 'object':
-      if (value === null) {
-        return Null;
-      }
-      if (Array.isArray(value)) {
-        return Array$1;
-      }
-      return Object$1;
-    case 'boolean':
-      return Boolean;
-    default:
-      return Unknown;
-  }
-};
-const number = value => {
-  const type = getType(value);
-  if (type !== Number$1) {
-    throw new AssertionError('expected value to be of type number');
-  }
-};
-
 const isMessagePort = value => {
   return value && value instanceof MessagePort;
 };
@@ -225,8 +182,8 @@ const getModuleNotFoundError = stderr => {
   const messageIndex = lines.findIndex(isModuleNotFoundMessage);
   const message = lines[messageIndex];
   return {
-    message,
-    code: ERR_MODULE_NOT_FOUND
+    code: ERR_MODULE_NOT_FOUND,
+    message
   };
 };
 const isModuleNotFoundError = stderr => {
@@ -249,14 +206,14 @@ const isUnhelpfulNativeModuleError = stderr => {
 const getNativeModuleErrorMessage = stderr => {
   const message = getMessageCodeBlock(stderr);
   return {
-    message: `Incompatible native node module: ${message}`,
-    code: E_INCOMPATIBLE_NATIVE_MODULE
+    code: E_INCOMPATIBLE_NATIVE_MODULE,
+    message: `Incompatible native node module: ${message}`
   };
 };
 const getModuleSyntaxError = () => {
   return {
-    message: `ES Modules are not supported in electron`,
-    code: E_MODULES_NOT_SUPPORTED_IN_ELECTRON
+    code: E_MODULES_NOT_SUPPORTED_IN_ELECTRON,
+    message: `ES Modules are not supported in electron`
   };
 };
 const getHelpfulChildProcessError = (stdout, stderr) => {
@@ -275,8 +232,8 @@ const getHelpfulChildProcessError = (stdout, stderr) => {
     rest
   } = getDetails(lines);
   return {
-    message: actualMessage,
     code: '',
+    message: actualMessage,
     stack: rest
   };
 };
@@ -286,8 +243,8 @@ class IpcError extends VError {
     if (stdout || stderr) {
       // @ts-ignore
       const {
-        message,
         code,
+        message,
         stack
       } = getHelpfulChildProcessError(stdout, stderr);
       const cause = new Error(message);
@@ -348,8 +305,8 @@ const wrap$f = global => {
 };
 const waitForFirstMessage = async port => {
   const {
-    resolve,
-    promise
+    promise,
+    resolve
   } = Promise.withResolvers();
   port.addEventListener('message', resolve, {
     once: true
@@ -369,8 +326,8 @@ const listen$6 = async () => {
   const type = firstMessage.params[0];
   if (type === 'message-port') {
     parentIpc.send({
-      jsonrpc: '2.0',
       id: firstMessage.id,
+      jsonrpc: '2.0',
       result: null
     });
     parentIpc.dispose();
@@ -427,8 +384,8 @@ const removeListener = (emitter, type, callback) => {
 };
 const getFirstEvent = (eventEmitter, eventMap) => {
   const {
-    resolve,
-    promise
+    promise,
+    resolve
   } = Promise.withResolvers();
   const listenerMap = Object.create(null);
   const cleanup = value => {
@@ -440,8 +397,8 @@ const getFirstEvent = (eventEmitter, eventMap) => {
   for (const [event, type] of Object.entries(eventMap)) {
     const listener = event => {
       cleanup({
-        type,
-        event
+        event,
+        type
       });
     };
     addListener(eventEmitter, event, listener);
@@ -451,8 +408,8 @@ const getFirstEvent = (eventEmitter, eventMap) => {
 };
 const Message$1 = 3;
 const create$5$1 = async ({
-  messagePort,
-  isMessagePortOpen
+  isMessagePortOpen,
+  messagePort
 }) => {
   if (!isMessagePort(messagePort)) {
     throw new IpcError('port must be of type MessagePort');
@@ -465,8 +422,8 @@ const create$5$1 = async ({
   });
   messagePort.start();
   const {
-    type,
-    event
+    event,
+    type
   } = await eventPromise;
   if (type !== Message$1) {
     throw new IpcError('Failed to wait for ipc message');
@@ -506,56 +463,14 @@ const IpcParentWithMessagePort$1 = {
   wrap: wrap$5
 };
 
-const Two = '2.0';
-const create$4$1 = (method, params) => {
-  return {
-    jsonrpc: Two,
-    method,
-    params
-  };
-};
+const Two$1 = '2.0';
 const callbacks = Object.create(null);
-const set$4 = (id, fn) => {
-  callbacks[id] = fn;
-};
 const get$3 = id => {
   return callbacks[id];
 };
-const remove = id => {
+const remove$1 = id => {
   delete callbacks[id];
 };
-let id$1 = 0;
-const create$3$1 = () => {
-  return ++id$1;
-};
-const registerPromise = () => {
-  const id = create$3$1();
-  const {
-    resolve,
-    promise
-  } = Promise.withResolvers();
-  set$4(id, resolve);
-  return {
-    id,
-    promise
-  };
-};
-const create$2$1 = (method, params) => {
-  const {
-    id,
-    promise
-  } = registerPromise();
-  const message = {
-    jsonrpc: Two,
-    method,
-    params,
-    id
-  };
-  return {
-    message,
-    promise
-  };
-};
 class JsonRpcError extends Error {
   constructor(message) {
     super(message);
@@ -706,7 +621,7 @@ const resolve = (id, response) => {
     return;
   }
   fn(response);
-  remove(id);
+  remove$1(id);
 };
 const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
 const getErrorType = prettyError => {
@@ -751,7 +666,7 @@ const getErrorProperty = (error, prettyError) => {
 };
 const create$1$1 = (id, error) => {
   return {
-    jsonrpc: Two,
+    jsonrpc: Two$1,
     id,
     error
   };
@@ -762,20 +677,20 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$1(id, errorProperty);
 };
-const create$6 = (message, result) => {
+const create$4 = (message, result) => {
   return {
-    jsonrpc: Two,
+    jsonrpc: Two$1,
     id: message.id,
     result: result ?? null
   };
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$6(message, resultProperty);
+  return create$4(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
-    jsonrpc: Two,
+    jsonrpc: Two$1,
     id,
     error: {
       code: Custom,
@@ -862,29 +777,6 @@ const handleJsonRpcMessage = async (...args) => {
   }
   throw new JsonRpcError('unexpected message');
 };
-const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
-  const {
-    message,
-    promise
-  } = create$2$1(method, params);
-  if (useSendAndTransfer && ipc.sendAndTransfer) {
-    ipc.sendAndTransfer(message);
-  } else {
-    ipc.send(message);
-  }
-  const responseMessage = await promise;
-  return unwrapJsonRpcResult(responseMessage);
-};
-const send = (transport, method, ...params) => {
-  const message = create$4$1(method, params);
-  transport.send(message);
-};
-const invoke$2 = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, false);
-};
-const invokeAndTransfer$1 = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, true);
-};
 
 class CommandNotFoundError extends Error {
   constructor(command) {
@@ -907,24 +799,87 @@ const execute = (command, ...args) => {
   return fn(...args);
 };
 
+const Two = '2.0';
+const create$t = (method, params) => {
+  return {
+    jsonrpc: Two,
+    method,
+    params
+  };
+};
+const create$s = (id, method, params) => {
+  const message = {
+    id,
+    jsonrpc: Two,
+    method,
+    params
+  };
+  return message;
+};
+let id$1 = 0;
+const create$r = () => {
+  return ++id$1;
+};
+
+/* eslint-disable n/no-unsupported-features/es-syntax */
+
+const registerPromise = map => {
+  const id = create$r();
+  const {
+    promise,
+    resolve
+  } = Promise.withResolvers();
+  map[id] = resolve;
+  return {
+    id,
+    promise
+  };
+};
+
+// @ts-ignore
+const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer) => {
+  const {
+    id,
+    promise
+  } = registerPromise(callbacks);
+  const message = create$s(id, method, params);
+  if (useSendAndTransfer && ipc.sendAndTransfer) {
+    ipc.sendAndTransfer(message);
+  } else {
+    ipc.send(message);
+  }
+  const responseMessage = await promise;
+  return unwrapJsonRpcResult(responseMessage);
+};
 const createRpc = ipc => {
+  const callbacks = Object.create(null);
+  ipc._resolve = (id, response) => {
+    const fn = callbacks[id];
+    if (!fn) {
+      console.warn(`callback ${id} may already be disposed`);
+      return;
+    }
+    fn(response);
+    delete callbacks[id];
+  };
   const rpc = {
+    async dispose() {
+      await ipc?.dispose();
+    },
+    invoke(method, ...params) {
+      return invokeHelper(callbacks, ipc, method, params, false);
+    },
+    invokeAndTransfer(method, ...params) {
+      return invokeHelper(callbacks, ipc, method, params, true);
+    },
     // @ts-ignore
     ipc,
     /**
      * @deprecated
      */
     send(method, ...params) {
-      send(ipc, method, ...params);
-    },
-    invoke(method, ...params) {
-      return invoke$2(ipc, method, ...params);
-    },
-    invokeAndTransfer(method, ...params) {
-      return invokeAndTransfer$1(ipc, method, ...params);
-    },
-    async dispose() {
-      await ipc?.dispose();
+      const message = create$t(method, params);
+      ipc.send(message);
     }
   };
   return rpc;
@@ -941,7 +896,7 @@ const logError = () => {
 const handleMessage = event => {
   const actualRequiresSocket = event?.target?.requiresSocket || requiresSocket;
   const actualExecute = event?.target?.execute || execute;
-  return handleJsonRpcMessage(event.target, event.data, actualExecute, resolve, preparePrettyError, logError, actualRequiresSocket);
+  return handleJsonRpcMessage(event.target, event.data, actualExecute, event.target._resolve, preparePrettyError, logError, actualRequiresSocket);
 };
 const handleIpc = ipc => {
   if ('addEventListener' in ipc) {
@@ -961,13 +916,14 @@ const listen$1 = async (module, options) => {
 };
 const create$5 = async ({
   commandMap,
+  isMessagePortOpen = true,
   messagePort
 }) => {
   // TODO create a commandMap per rpc instance
   register(commandMap);
   const rawIpc = await IpcParentWithMessagePort$1.create({
-    messagePort,
-    isMessagePortOpen: true
+    isMessagePortOpen,
+    messagePort
   });
   const ipc = IpcParentWithMessagePort$1.wrap(rawIpc);
   handleIpc(ipc);
@@ -977,6 +933,7 @@ const create$5 = async ({
 };
 const create$3 = async ({
   commandMap,
+  isMessagePortOpen,
   send
 }) => {
   const {
@@ -986,6 +943,7 @@ const create$3 = async ({
   await send(port1);
   return create$5({
     commandMap,
+    isMessagePortOpen,
     messagePort: port2
   });
 };
@@ -993,7 +951,7 @@ const TransferMessagePortRpcParent = {
   __proto__: null,
   create: create$3
 };
-const create$4 = async ({
+const create$2$1 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -1005,12 +963,36 @@ const create$4 = async ({
 };
 const WebWorkerRpcClient = {
   __proto__: null,
-  create: create$4
+  create: create$2$1
+};
+const createMockRpc = ({
+  commandMap
+}) => {
+  const invocations = [];
+  const invoke = (method, ...params) => {
+    invocations.push([method, ...params]);
+    const command = commandMap[method];
+    if (!command) {
+      throw new Error(`command ${method} not found`);
+    }
+    return command(...params);
+  };
+  const mockRpc = {
+    invocations,
+    invoke,
+    invokeAndTransfer: invoke
+  };
+  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;
@@ -1018,7 +1000,11 @@ const set$3 = (id, rpc) => {
 const get$2 = id => {
   return rpcs[id];
 };
+const remove = id => {
+  delete rpcs[id];
+};
 
+/* eslint-disable  @typescript-eslint/explicit-function-return-type */
 const create$2 = rpcId => {
   return {
     async dispose() {
@@ -1037,6 +1023,18 @@ const create$2 = rpcId => {
       // @ts-ignore
       return rpc.invokeAndTransfer(method, ...params);
     },
+    registerMockRpc(commandMap) {
+      const mockRpc = createMockRpc({
+        commandMap
+      });
+      set$3(rpcId, mockRpc);
+      // @ts-ignore
+      mockRpc[Symbol.dispose] = () => {
+        remove(rpcId);
+      };
+      // @ts-ignore
+      return mockRpc;
+    },
     set(rpc) {
       set$3(rpcId, rpc);
     }
@@ -1072,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;
@@ -1120,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);
     }
   };
 };
@@ -1154,15 +1156,20 @@ const {
   getCommandIds,
   registerCommands,
   set,
-  wrapCommand} = create$1();
+  wrapCommand,
+  wrapGetter
+} = create$1();
 
 const create = (uid, uri, x, y, width, height, platform, assetDir) => {
   const state = {
     assetDir,
+    errorCount: 0,
+    initial: true,
     platform,
     statusBarItemsLeft: [],
     statusBarItemsRight: [],
-    uid
+    uid,
+    warningCount: 0
   };
   set(uid, state, state);
 };
@@ -1172,6 +1179,7 @@ const isEqual = (oldState, newState) => {
 };
 
 const RenderItems = 4;
+const RenderIncremental = 11;
 
 const modules = [isEqual];
 const numbers = [RenderItems];
@@ -1320,12 +1328,6 @@ const itemRightUpdate = (state, newItem) => {
   };
 };
 
-const ProblemsErrorIcon = 'ProblemsErrorIcon';
-const ProblemsWarningIcon = 'ProblemsWarningIcon';
-const StatusBarItem = 'StatusBarItem';
-const StatusBarItemsLeft = 'StatusBarItemsLeft';
-const StatusBarItemsRight = 'StatusBarItemsRight';
-
 const OnStatusBarItem = 'onStatusBarItem';
 
 const GetStatusBarItems = 'ExtensionHost.getStatusBarItems2';
@@ -1367,6 +1369,59 @@ const getStatusBarItems$1 = (assetDir, platform) => {
   });
 };
 
+const ProblemsErrorIcon = 'ProblemsErrorIcon';
+const ProblemsWarningIcon = 'ProblemsWarningIcon';
+const StatusBarItem = 'StatusBarItem';
+const StatusBarItemsLeft = 'StatusBarItemsLeft';
+const StatusBarItemsRight = 'StatusBarItemsRight';
+
+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 = [{
+    ariaLabel: 'Notifications',
+    command: '',
+    // TODO should show notifications center
+    elements: [{
+      type: 'text',
+      value: 'Notifications'
+    }],
+    name: Notifications,
+    tooltip: 'Notifications'
+  }, {
+    ariaLabel: getProblemsAriaLabel(errorCount, warningCount),
+    command: '',
+    // TODO should show problems view
+    elements: [{
+      type: 'icon',
+      value: ProblemsErrorIcon
+    }, {
+      type: 'text',
+      value: `${errorCount}`
+    }, {
+      type: 'icon',
+      value: ProblemsWarningIcon
+    }, {
+      type: 'text',
+      value: `${warningCount}`
+    }],
+    name: Problems,
+    tooltip: 'Problems'
+  }];
+  return extraItems;
+};
+
 const toStatusBarItem = uiStatusBarItem => {
   const elements = [];
   if (uiStatusBarItem.icon) {
@@ -1387,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,
@@ -1395,10 +1452,16 @@ const toStatusBarItem = uiStatusBarItem => {
   };
 };
 
+const getActualIcon = extensionHostStatusBarItem => {
+  if (extensionHostStatusBarItem.icon === 'branch') {
+    return 'Branch';
+  }
+  return extensionHostStatusBarItem.icon || '';
+};
 const toUiStatusBarItem = extensionHostStatusBarItem => {
   return {
     command: extensionHostStatusBarItem.command || '',
-    icon: extensionHostStatusBarItem.icon || '',
+    icon: getActualIcon(extensionHostStatusBarItem),
     name: extensionHostStatusBarItem.id || extensionHostStatusBarItem.name || '',
     text: extensionHostStatusBarItem.text || '',
     tooltip: extensionHostStatusBarItem.tooltip || ''
@@ -1412,39 +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 = [{
-    command: undefined,
-    elements: [{
-      type: 'text',
-      value: 'Notifications'
-    }],
-    name: Notifications,
-    tooltip: ''
-  }, {
-    command: undefined,
-    elements: [{
-      type: 'icon',
-      value: ProblemsErrorIcon
-    }, {
-      type: 'text',
-      value: '0'
-    }, {
-      type: 'icon',
-      value: ProblemsWarningIcon
-    }, {
-      type: 'text',
-      value: '0'
-    }],
-    name: Problems,
-    tooltip: ''
-  }];
+  const extraItems = await getBuiltinStatusBarItems(errorCount, warningCount);
   return [...uiStatusBarItems.map(toStatusBarItem), ...extraItems];
 };
 
@@ -1460,66 +1498,366 @@ 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: []
+    statusBarItemsRight: [],
+    warningCount: 0
   };
 };
 
 const Button$1 = 'button';
+const Status = 'status';
+
+const MaskIcon = 'MaskIcon';
 
 const Button = 1;
 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 getElementVirtualDom = element => {
+const getTextVirtualDom = element => {
+  return [{
+    childCount: 1,
+    className: 'StatusBarItemLabel',
+    type: Span
+  }, text(element.value)];
+};
+const getIconVirtualDom = element => {
+  return [{
+    childCount: 0,
+    className: mergeClassNames(MaskIcon, element.value),
+    type: Div
+  }];
+};
+const getStatusBarItemElementVirtualDom = element => {
   if (element.type === 'text') {
-    return [text(element.value)];
+    return getTextVirtualDom(element);
   }
   if (element.type === 'icon') {
-    return [{
-      childCount: 0,
-      className: element.value,
-      type: Div
-    }];
+    return getIconVirtualDom(element);
   }
   return [];
 };
+
 const getStatusBarItemVirtualDom = statusBarItem => {
   const {
+    ariaLabel,
     elements,
     name,
     tooltip
   } = statusBarItem;
-  const elementNodes = elements.flatMap(getElementVirtualDom);
-  return [{
-    childCount: elementNodes.length,
+  const elementNodes = elements.flatMap(getStatusBarItemElementVirtualDom);
+  const buttonNode = {
+    ariaLabel,
+    childCount: elements.length,
     className: StatusBarItem,
     name,
     role: Button$1,
     tabIndex: -1,
     title: tooltip,
     type: Button
-  }, ...elementNodes];
+  };
+  return [buttonNode, ...elementNodes];
 };
 
 const getStatusBarItemsVirtualDom = (items, className) => {
@@ -1548,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;
@@ -1563,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:
@@ -1608,16 +1956,11 @@ const resize = (state, dimensions) => {
   };
 };
 
-const saveState = uid => {
-  number(uid);
-  const value = get$1(uid);
-  const {
-    newState
-  } = value;
+const saveState = state => {
   const {
     statusBarItemsLeft,
     statusBarItemsRight
-  } = newState;
+  } = state;
   return {
     itemsLeft: statusBarItemsLeft,
     itemsRight: statusBarItemsRight
@@ -1637,7 +1980,7 @@ const commandMap = {
   'StatusBar.render2': render2,
   'StatusBar.renderEventListeners': renderEventListeners,
   'StatusBar.resize': wrapCommand(resize),
-  'StatusBar.saveState': saveState,
+  'StatusBar.saveState': wrapGetter(saveState),
   'StatusBar.terminate': terminate
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/status-bar-worker",
-  "version": "1.13.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"
   }
 }