@lvce-editor/status-bar-worker 3.33.1 → 3.35.0

package/dist/statusBarWorkerMain.js

@@ -331,175 +331,13 @@ const Status = 'status';
 
 const MaskIcon = 'MaskIcon';
 
-const Audio = 0;
 const Button$1 = 1;
-const Col = 2;
-const ColGroup = 3;
 const Div = 4;
-const H1 = 5;
-const Input = 6;
-const Kbd = 7;
 const Span = 8;
-const Table = 9;
-const TBody = 10;
-const Td = 11;
 const Text = 12;
-const Th = 13;
-const THead = 14;
-const Tr = 15;
-const I = 16;
-const Img = 17;
-const Root = 0;
-const Ins = 20;
-const Del = 21;
-const H2 = 22;
-const H3 = 23;
-const H4 = 24;
-const H5 = 25;
-const H6 = 26;
-const Article = 27;
-const Aside = 28;
-const Footer = 29;
-const Header = 30;
-const Nav = 40;
-const Section = 41;
-const Search = 42;
-const Dd = 43;
-const Dl = 44;
-const Figcaption = 45;
-const Figure = 46;
-const Hr = 47;
-const Li = 48;
-const Ol = 49;
-const P = 50;
-const Pre = 51;
-const A = 53;
-const Abbr = 54;
-const Br = 55;
-const Cite = 56;
-const Data = 57;
-const Time = 58;
-const Tfoot = 59;
-const Ul = 60;
-const Video = 61;
-const TextArea = 62;
-const Select = 63;
-const Option = 64;
-const Code = 65;
-const Label = 66;
-const Dt = 67;
-const Iframe = 68;
-const Main = 69;
-const Strong = 70;
-const Em = 71;
-const Style = 72;
-const Html = 73;
-const Head = 74;
-const Title = 75;
-const Meta = 76;
-const Canvas = 77;
-const Form = 78;
-const BlockQuote = 79;
-const Quote = 80;
-const Circle = 81;
-const Defs = 82;
-const Ellipse = 83;
-const G = 84;
-const Line = 85;
-const Path = 86;
-const Polygon = 87;
-const Polyline = 88;
-const Rect = 89;
-const Svg = 90;
-const Use = 91;
+const Progress = 92;
 const Reference = 100;
 
-const VirtualDomElements = {
-  __proto__: null,
-  A,
-  Abbr,
-  Article,
-  Aside,
-  Audio,
-  BlockQuote,
-  Br,
-  Button: Button$1,
-  Canvas,
-  Circle,
-  Cite,
-  Code,
-  Col,
-  ColGroup,
-  Data,
-  Dd,
-  Defs,
-  Del,
-  Div,
-  Dl,
-  Dt,
-  Ellipse,
-  Em,
-  Figcaption,
-  Figure,
-  Footer,
-  Form,
-  G,
-  H1,
-  H2,
-  H3,
-  H4,
-  H5,
-  H6,
-  Head,
-  Header,
-  Hr,
-  Html,
-  I,
-  Iframe,
-  Img,
-  Input,
-  Ins,
-  Kbd,
-  Label,
-  Li,
-  Line,
-  Main,
-  Meta,
-  Nav,
-  Ol,
-  Option,
-  P,
-  Path,
-  Polygon,
-  Polyline,
-  Pre,
-  Quote,
-  Rect,
-  Reference,
-  Root,
-  Search,
-  Section,
-  Select,
-  Span,
-  Strong,
-  Style,
-  Svg,
-  TBody,
-  THead,
-  Table,
-  Td,
-  Text,
-  TextArea,
-  Tfoot,
-  Th,
-  Time,
-  Title,
-  Tr,
-  Ul,
-  Use,
-  Video
-};
-
 const Button = 'event.button';
 const ClientX = 'event.clientX';
 const ClientY = 'event.clientY';
@@ -526,8 +364,6 @@ const text = data => {
   };
 };
 
-new Set(Object.values(VirtualDomElements));
-
 const SetText = 1;
 const Replace = 2;
 const SetAttribute = 3;
@@ -538,6 +374,7 @@ const NavigateParent = 8;
 const RemoveChild = 9;
 const NavigateSibling = 10;
 const SetReferenceNodeUid = 11;
+const MultiNavigation = 18;
 
 const isKey = key => {
   return key !== 'type' && key !== 'childCount';
@@ -598,6 +435,55 @@ const getChildrenWithCount = (nodes, startIndex, childCount) => {
   };
 };
 
+const isNavigationPatch = patch => {
+  switch (patch.type) {
+    case NavigateChild:
+    case NavigateParent:
+    case NavigateSibling:
+      return true;
+    default:
+      return false;
+  }
+};
+const getNavigationIndex = patch => {
+  switch (patch.type) {
+    case NavigateChild:
+    case NavigateSibling:
+      return patch.index;
+    default:
+      return 0;
+  }
+};
+const appendNavigationPatch = (patches, type, index) => {
+  const previousPatch = patches.at(-1);
+  if (!previousPatch) {
+    patches.push(type === NavigateParent ? {
+      type
+    } : {
+      index,
+      type
+    });
+    return;
+  }
+  if (previousPatch.type === MultiNavigation) {
+    previousPatch.navigations.push(type, index);
+    return;
+  }
+  if (isNavigationPatch(previousPatch)) {
+    patches[patches.length - 1] = {
+      navigations: [previousPatch.type, getNavigationIndex(previousPatch), type, index],
+      type: MultiNavigation
+    };
+    return;
+  }
+  patches.push(type === NavigateParent ? {
+    type
+  } : {
+    index,
+    type
+  });
+};
+
 const compareNodes = (oldNode, newNode) => {
   // Check if node type changed - return null to signal incompatible nodes
   // (caller should handle this with a Replace operation)
@@ -662,25 +548,17 @@ const treeToArray = node => {
 
 const navigateToChild = (patches, currentChildIndex, index) => {
   if (currentChildIndex === -1) {
-    patches.push({
-      type: NavigateChild,
-      index
-    });
+    appendNavigationPatch(patches, NavigateChild, index);
     return index;
   }
   if (currentChildIndex !== index) {
-    patches.push({
-      type: NavigateSibling,
-      index
-    });
+    appendNavigationPatch(patches, NavigateSibling, index);
   }
   return index;
 };
 const navigateToParent = (patches, currentChildIndex) => {
   if (currentChildIndex >= 0) {
-    patches.push({
-      type: NavigateParent
-    });
+    appendNavigationPatch(patches, NavigateParent, 0);
   }
   return -1;
 };
@@ -696,6 +574,29 @@ const replaceTree = (newNode, patches) => {
     nodes: treeToArray(newNode)
   });
 };
+const appendPatch = (patches, patch) => {
+  switch (patch.type) {
+    case MultiNavigation:
+      for (let i = 0; i < patch.navigations.length; i += 2) {
+        appendNavigationPatch(patches, patch.navigations[i], patch.navigations[i + 1]);
+      }
+      return;
+    case NavigateChild:
+    case NavigateSibling:
+      appendNavigationPatch(patches, patch.type, patch.index);
+      return;
+    case NavigateParent:
+      appendNavigationPatch(patches, patch.type, 0);
+      return;
+    default:
+      patches.push(patch);
+  }
+};
+const appendPatches = (patches, newPatches) => {
+  for (const patch of newPatches) {
+    appendPatch(patches, patch);
+  }
+};
 const diffExistingChild = (oldNode, newNode, patches, currentChildIndex, index) => {
   const nodePatches = compareNodes(oldNode.node, newNode.node);
   if (nodePatches === null) {
@@ -704,16 +605,16 @@ const diffExistingChild = (oldNode, newNode, patches, currentChildIndex, index)
     return nextChildIndex;
   }
   const hasChildrenToCompare = oldNode.children.length > 0 || newNode.children.length > 0;
-  if (nodePatches.length === 0 && !hasChildrenToCompare) {
+  const childPatches = [];
+  if (hasChildrenToCompare) {
+    diffChildren(oldNode.children, newNode.children, childPatches);
+  }
+  if (nodePatches.length === 0 && childPatches.length === 0) {
     return currentChildIndex;
   }
   const nextChildIndex = navigateToChild(patches, currentChildIndex, index);
-  if (nodePatches.length > 0) {
-    patches.push(...nodePatches);
-  }
-  if (hasChildrenToCompare) {
-    diffChildren(oldNode.children, newNode.children, patches);
-  }
+  patches.push(...nodePatches);
+  appendPatches(patches, childPatches);
   return nextChildIndex;
 };
 const diffRootNode = (oldNode, newNode, patches) => {
@@ -769,7 +670,7 @@ const diffTrees = (oldTree, newTree, patches, path) => {
 const removeTrailingNavigationPatches = patches => {
   while (patches.length > 0) {
     const patch = patches.at(-1);
-    if (patch.type !== NavigateChild && patch.type !== NavigateParent && patch.type !== NavigateSibling) {
+    if (patch.type !== NavigateChild && patch.type !== NavigateParent && patch.type !== NavigateSibling && patch.type !== MultiNavigation) {
       break;
     }
     patches.pop();
@@ -813,6 +714,22 @@ const getIconVirtualDom = (element, name) => {
     type: Div
   }];
 };
+const getProgressVirtualDom = (element, name) => {
+  const node = {
+    ariaLabel: element.ariaLabel,
+    className: 'StatusBarItemProgress',
+    max: element.max,
+    name,
+    type: Progress
+  };
+  if (element.value !== undefined) {
+    return [{
+      ...node,
+      value: element.value
+    }];
+  }
+  return [node];
+};
 const getStatusBarItemElementVirtualDom = (element, name) => {
   if (element.type === 'text') {
     return getTextVirtualDom(element, name);
@@ -820,6 +737,9 @@ const getStatusBarItemElementVirtualDom = (element, name) => {
   if (element.type === 'icon') {
     return getIconVirtualDom(element, name);
   }
+  if (element.type === 'progress') {
+    return getProgressVirtualDom(element, name);
+  }
   return [];
 };
 
@@ -1944,6 +1864,9 @@ const logError = () => {
   // handled by renderer worker
 };
 const handleMessage = event => {
+  if (event.data === 'ready') {
+    return Promise.resolve();
+  }
   const actualRequiresSocket = event?.target?.requiresSocket || requiresSocket;
   const actualExecute = event?.target?.execute || execute;
   return handleJsonRpcMessage(event.target, event.data, actualExecute, event.target._resolve, preparePrettyError, logError, actualRequiresSocket);
@@ -2515,6 +2438,7 @@ const fontSize = 12;
 const fontFamily = 'system-ui, Ubuntu, Droid Sans, sans-serif';
 const itemPaddingAndMargin = 16;
 const iconWidth = 20;
+const progressWidth = 69;
 const horizontalGroupPadding = 14;
 const measuredWidths = new WeakMap();
 const fallbackTextWidth = 150;
@@ -2528,6 +2452,16 @@ const measureTextWidths = async values => {
     return values.map(() => fallbackTextWidth);
   }
 };
+const getElementWidth = (element, textWidths, textIndex) => {
+  switch (element.type) {
+    case 'icon':
+      return iconWidth;
+    case 'progress':
+      return progressWidth;
+    case 'text':
+      return textWidths[textIndex];
+  }
+};
 const getItemWidths = async items => {
   const unmeasuredItems = [...new Set(items.filter(item => !measuredWidths.has(item)))];
   const textElements = unmeasuredItems.flatMap(item => item.elements.filter(element => element.type === 'text'));
@@ -2536,10 +2470,8 @@ const getItemWidths = async items => {
   for (const item of unmeasuredItems) {
     let itemWidth = itemPaddingAndMargin;
     for (const element of item.elements) {
-      if (element.type === 'icon') {
-        itemWidth += iconWidth;
-      } else {
-        itemWidth += textWidths[textIndex];
+      itemWidth += getElementWidth(element, textWidths, textIndex);
+      if (element.type === 'text') {
         textIndex++;
       }
     }
@@ -3082,6 +3014,50 @@ const handleProblemsSummaryChange = (state, summary) => {
   };
 };
 
+const itemName = 'update-progress';
+const handleUpdateProgress = (state, progress) => {
+  const {
+    statusBarItemsLeft
+  } = state;
+  const updatedStatusBarItems = statusBarItemsLeft.filter(item => item.name !== itemName);
+  if (progress === null) {
+    return {
+      ...state,
+      statusBarItemsLeft: updatedStatusBarItems
+    };
+  }
+  const value = progress === undefined ? undefined : Math.max(0, Math.min(1, progress));
+  const percentage = value === undefined ? undefined : Math.round(value * 100);
+  const ariaLabel = percentage === undefined ? 'Update download progress' : `Update download progress ${percentage}%`;
+  const progressElement = {
+    ariaLabel: 'Update download progress',
+    max: 1,
+    type: 'progress'
+  };
+  const elements = [{
+    type: 'text',
+    value: 'Update'
+  }];
+  if (value === undefined) {
+    elements.push(progressElement);
+  } else {
+    elements.push({
+      ...progressElement,
+      value
+    });
+  }
+  const item = {
+    ariaLabel,
+    elements,
+    name: itemName,
+    tooltip: ariaLabel
+  };
+  return {
+    ...state,
+    statusBarItemsLeft: [...updatedStatusBarItems, item]
+  };
+};
+
 const handleWorkspaceChange = async state => {
   const {
     assetDir,
@@ -3295,6 +3271,7 @@ const commandMap = {
   'StatusBar.handleMessagePort': handleDirectMessagePort,
   'StatusBar.handleNotificationCountChanged': wrapCommand(handleNotificationCountChanged),
   'StatusBar.handleProblemsSummaryChange': wrapCommand(handleProblemsSummaryChange),
+  'StatusBar.handleUpdateProgress': wrapCommand(handleUpdateProgress),
   'StatusBar.handleWorkspaceChange': handleWorkspaceChangeAndRefresh,
   'StatusBar.initialize': initialize,
   'StatusBar.itemLeftUpdate': wrapCommand(itemLeftUpdate),

package/package.json

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