@lvce-editor/status-bar-worker 3.2.0 → 3.3.0

package/dist/statusBarWorkerMain.js

@@ -121,7 +121,7 @@ const terminate = () => {
 const {
   get: get$3,
   getCommandIds,
-  getKeys: getKeys$1,
+  getKeys,
   registerCommands,
   set: set$4,
   wrapCommand,
@@ -249,7 +249,7 @@ class AssertionError extends Error {
 const Object$1 = 1;
 const Number$1 = 2;
 const Array$1 = 3;
-const String = 4;
+const String$1 = 4;
 const Boolean$1 = 5;
 const Function = 6;
 const Null = 7;
@@ -261,7 +261,7 @@ const getType = value => {
     case 'function':
       return Function;
     case 'string':
-      return String;
+      return String$1;
     case 'object':
       if (value === null) {
         return Null;
@@ -1312,7 +1312,6 @@ const Button$1 = 1;
 const Div = 4;
 const Span = 8;
 const Text = 12;
-const Reference = 100;
 
 const Button = 'event.button';
 const ClientX = 'event.clientX';
@@ -1324,7 +1323,6 @@ const ExtensionManagementWorker = 9006;
 const RendererWorker = 1;
 
 const SetDom2 = 'Viewlet.setDom2';
-const SetPatches = 'Viewlet.setPatches';
 
 const {
   invoke: invoke$2,
@@ -1357,12 +1355,8 @@ const getPreference = async key => {
 };
 
 const handleClickExtensionStatusBarItem = async name => {
-  // TODO maybe relay this to extension management worker,
-  // and it forwards it to the right extension host?
-
   try {
-    // @ts-ignore
-    await invoke$2(`ExtensionHostStatusBar.executeCommand`, name);
+    await invoke$1('Extensions.executeCommand', name);
   } catch (error) {
     console.error(new VError(error, `Failed to execute status bar command: ${name}`));
   }
@@ -1449,7 +1443,7 @@ const executeProviders = async ({
 const combineResults = results => {
   return results.flat();
 };
-const getStatusBarItems$1 = (assetDir, platform) => {
+const getStatusBarItems$1 = async (assetDir, platform) => {
   const legacyItems = executeProviders({
     assetDir,
     combineResults,
@@ -1461,7 +1455,8 @@ const getStatusBarItems$1 = (assetDir, platform) => {
     platform
   });
   const isolatedItems = getStatusBarItems$2();
-  return Promise.all([legacyItems, isolatedItems]).then(combineResults);
+  const results = await Promise.all([legacyItems, isolatedItems]);
+  return combineResults(results);
 };
 
 const getNotificationsStatusBarItem = enabled => {
@@ -1514,13 +1509,13 @@ const getProblemsStatusBarItem = (errorCount, warningCount, enabled) => {
       value: ProblemsErrorIcon
     }, {
       type: 'text',
-      value: `${errorCount}`
+      value: String(errorCount)
     }, {
       type: 'icon',
       value: ProblemsWarningIcon
     }, {
       type: 'text',
-      value: `${warningCount}`
+      value: String(warningCount)
     }],
     name: Problems,
     tooltip: 'Problems'
@@ -1637,7 +1632,7 @@ const handleItemsChanged = async state => {
 };
 
 const handleExtensionManagementChange = async () => {
-  const uids = getKeys$1();
+  const uids = getKeys();
   for (const uid of uids) {
     const {
       newState,
@@ -1788,267 +1783,6 @@ const text = data => {
   };
 };
 
-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) => {
-  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 reference nodes - special handling for uid changes
-  if (oldNode.type === Reference) {
-    if (oldNode.uid !== newNode.uid) {
-      patches.push({
-        type: SetReferenceNodeUid,
-        uid: newNode.uid
-      });
-    }
-    return patches;
-  }
-  // 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 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 => {
-  // 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 HandleContextMenu = 2;
 const HandleClick = 11;
 
@@ -2153,10 +1887,7 @@ const renderItems = (oldState, newState) => {
 };
 
 const renderIncremental = (oldState, newState) => {
-  const oldDom = renderItems(oldState, oldState)[2];
-  const newDom = renderItems(newState, newState)[2];
-  const patches = diffTree(oldDom, newDom);
-  return [SetPatches, newState.uid, patches];
+  return renderItems(oldState, newState);
 };
 
 const getRenderer = diffType => {

package/package.json

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