@lvce-editor/activity-bar-worker 7.9.0 → 7.9.3

package/dist/activityBarWorkerMain.js

@@ -3,10 +3,67 @@ const toCommandId = key => {
   return key.slice(dotIndex + 1);
 };
 const create$a = () => {
+  const commandQueues = new Map();
+  const generations = Object.create(null);
   const states = Object.create(null);
   const commandMapRef = {};
+  const getGeneration = uid => generations[uid] || 0;
+  const isCurrentGeneration = (uid, generation) => {
+    return states[uid] !== undefined && getGeneration(uid) === generation;
+  };
+  const updateState = (uid, generation, fallbackState, updater) => {
+    if (!isCurrentGeneration(uid, generation)) {
+      return Promise.resolve(fallbackState);
+    }
+    const current = states[uid];
+    const updatedState = updater(current.newState);
+    if (updatedState !== current.newState) {
+      states[uid] = {
+        newState: updatedState,
+        oldState: current.oldState,
+        scheduledState: updatedState
+      };
+    }
+    return Promise.resolve(updatedState);
+  };
+  const createAsyncCommandContext = (uid, generation) => {
+    let latestState = states[uid].newState;
+    return {
+      getState: () => {
+        if (isCurrentGeneration(uid, generation)) {
+          latestState = states[uid].newState;
+        }
+        return latestState;
+      },
+      updateState: async updater => {
+        latestState = await updateState(uid, generation, latestState, updater);
+        return latestState;
+      }
+    };
+  };
+  const enqueueCommand = async (uid, command) => {
+    const previous = commandQueues.get(uid) || Promise.resolve();
+    const run = async () => {
+      try {
+        await previous;
+      } catch {
+        // The previous caller receives its error; later commands must still run.
+      }
+      await command();
+    };
+    const current = run();
+    commandQueues.set(uid, current);
+    try {
+      await current;
+    } finally {
+      if (commandQueues.get(uid) === current) {
+        commandQueues.delete(uid);
+      }
+    }
+  };
   return {
     clear() {
+      commandQueues.clear();
       for (const key of Object.keys(states)) {
         delete states[key];
       }
@@ -26,6 +83,7 @@ const create$a = () => {
       return diffResult;
     },
     dispose(uid) {
+      commandQueues.delete(uid);
       delete states[uid];
     },
     get(uid) {
@@ -43,14 +101,27 @@ const create$a = () => {
       Object.assign(commandMapRef, commandMap);
     },
     set(uid, oldState, newState, scheduledState) {
+      const current = states[uid];
+      if (!current || oldState === newState && newState !== current.newState) {
+        generations[uid] = getGeneration(uid) + 1;
+      }
       states[uid] = {
         newState,
         oldState,
         scheduledState: scheduledState ?? newState
       };
     },
+    wrapAsyncCommand(fn) {
+      const wrapped = async (uid, ...args) => {
+        const generation = getGeneration(uid);
+        const context = createAsyncCommandContext(uid, generation);
+        await fn(context, ...args);
+      };
+      return wrapped;
+    },
     wrapCommand(fn) {
       const wrapped = async (uid, ...args) => {
+        const generation = getGeneration(uid);
         const {
           newState,
           oldState
@@ -59,6 +130,9 @@ const create$a = () => {
         if (oldState === newerState || newState === newerState) {
           return;
         }
+        if (!isCurrentGeneration(uid, generation)) {
+          return;
+        }
         const latestOld = states[uid];
         const latestNew = {
           ...latestOld.newState,
@@ -83,6 +157,7 @@ const create$a = () => {
     },
     wrapLoadContent(fn) {
       const wrapped = async (uid, ...args) => {
+        const generation = getGeneration(uid);
         const {
           newState,
           oldState
@@ -97,6 +172,11 @@ const create$a = () => {
             error
           };
         }
+        if (!isCurrentGeneration(uid, generation)) {
+          return {
+            error
+          };
+        }
         const latestOld = states[uid];
         const latestNew = {
           ...latestOld.newState,
@@ -112,6 +192,51 @@ const create$a = () => {
         };
       };
       return wrapped;
+    },
+    wrapSerialAsyncCommand(fn) {
+      const wrapped = async (uid, ...args) => {
+        await enqueueCommand(uid, async () => {
+          if (!states[uid]) {
+            return;
+          }
+          const generation = getGeneration(uid);
+          const context = createAsyncCommandContext(uid, generation);
+          await fn(context, ...args);
+        });
+      };
+      return wrapped;
+    },
+    wrapSerialCommand(fn) {
+      const wrapped = async (uid, ...args) => {
+        await enqueueCommand(uid, async () => {
+          if (!states[uid]) {
+            return;
+          }
+          const generation = getGeneration(uid);
+          const {
+            newState,
+            oldState
+          } = states[uid];
+          const newerState = await fn(newState, ...args);
+          if (oldState === newerState || newState === newerState) {
+            return;
+          }
+          if (!isCurrentGeneration(uid, generation)) {
+            return;
+          }
+          const latestOld = states[uid];
+          const latestNew = {
+            ...latestOld.newState,
+            ...newerState
+          };
+          states[uid] = {
+            newState: latestNew,
+            oldState: latestOld.oldState,
+            scheduledState: latestNew
+          };
+        });
+      };
+      return wrapped;
     }
   };
 };
@@ -241,15 +366,180 @@ const focusNone = state => {
   return focusIndex(state, -1);
 };
 
-const Button$2 = 'button';
+const Button$3 = 'button';
 const None$1 = 'none';
 const Tab$1 = 'tab';
 const ToolBar = 'toolbar';
 
+const Audio = 0;
+const Button$2 = 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$3 = 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 Reference = 100;
 
+const VirtualDomElements = {
+  __proto__: null,
+  A,
+  Abbr,
+  Article,
+  Aside,
+  Audio,
+  BlockQuote,
+  Br,
+  Button: Button$2,
+  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: Search$3,
+  Section,
+  Select,
+  Span,
+  Strong,
+  Style,
+  Svg,
+  TBody,
+  THead,
+  Table,
+  Td,
+  Text,
+  TextArea,
+  Tfoot,
+  Th,
+  Time,
+  Title,
+  Tr,
+  Ul,
+  Use,
+  Video
+};
+
 const Button$1 = 'event.button';
 const ClientX = 'event.clientX';
 const ClientY = 'event.clientY';
@@ -330,8 +620,12 @@ const getKeyBindings = () => {
 
 const ACCOUNT_SUBMENU_ID = 32_123;
 const getAccountLabel = state => {
-  const name = state.userName || 'Account';
-  const provider = state.userLoginProvider || 'GitHub';
+  const {
+    userLoginProvider,
+    userName
+  } = state;
+  const name = userName || 'Account';
+  const provider = userLoginProvider || 'GitHub';
   return `${name} (${provider})`;
 };
 const getMenuEntriesAccountLoggedIn = state => {
@@ -389,15 +683,15 @@ const Focused = 1 << 5;
 const MarginTop = 1 << 6;
 
 const emptyObject = {};
-const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
 const i18nString = (key, placeholders = emptyObject) => {
   if (placeholders === emptyObject) {
     return key;
   }
-  const replacer = (match, rest) => {
-    return placeholders[rest];
-  };
-  return key.replaceAll(RE_PLACEHOLDER, replacer);
+  let result = key;
+  for (const [placeholder, replacement] of Object.entries(placeholders)) {
+    result = result.split(`{${placeholder}}`).join(String(replacement));
+  }
+  return result;
 };
 
 const Account$1 = 'Account';
@@ -533,8 +827,11 @@ const getNumberOfVisibleItems = state => {
   return numberOfVisibleItemsTop;
 };
 const getHiddenItems = state => {
+  const {
+    activityBarItems
+  } = state;
   const numberOfVisibleItems = getNumberOfVisibleItems(state);
-  const items = state.activityBarItems.filter(item => item.flags & Enabled);
+  const items = activityBarItems.filter(item => item.flags & Enabled);
   if (numberOfVisibleItems >= items.length) {
     return [];
   }
@@ -735,7 +1032,6 @@ const walkValue = (value, transferrables, isTransferrable) => {
     for (const property of Object.values(value)) {
       walkValue(property, transferrables, isTransferrable);
     }
-    return;
   }
 };
 const getTransferrables = value => {
@@ -889,7 +1185,14 @@ class IpcError extends VError {
       const cause = new Error(message);
       // @ts-ignore
       cause.code = code;
-      cause.stack = stack;
+      if (stack) {
+        Object.defineProperty(cause, 'stack', {
+          configurable: true,
+          enumerable: false,
+          value: stack,
+          writable: true
+        });
+      }
       super(cause, betterMessage);
     } else {
       super(betterMessage);
@@ -1826,8 +2129,11 @@ const updateItemsWithBadgeCount = async items => {
 };
 
 const updateStateItems = (state, activityBarItems) => {
+  const {
+    filteredItems: currentFilteredItems
+  } = state;
   const itemById = new Map(activityBarItems.map(item => [item.id, item]));
-  const filteredItems = state.filteredItems.map(item => itemById.get(item.id) || item);
+  const filteredItems = currentFilteredItems.map(item => itemById.get(item.id) || item);
   return {
     ...state,
     activityBarItems,
@@ -1835,7 +2141,10 @@ const updateStateItems = (state, activityBarItems) => {
   };
 };
 const applyBadgeCountChanges = (state, badgeCounts) => {
-  const activityBarItems = state.activityBarItems.map(item => {
+  const {
+    activityBarItems: currentActivityBarItems
+  } = state;
+  const activityBarItems = currentActivityBarItems.map(item => {
     if (!Object.hasOwn(badgeCounts, item.id)) {
       return item;
     }
@@ -1851,8 +2160,11 @@ const handleBadgeCountChange = async (state, badgeCounts) => {
   if (badgeCounts) {
     return applyBadgeCountChanges(state, badgeCounts);
   }
-  const newActivityBarItems = await updateItemsWithBadgeCount(state.activityBarItems);
-  if (newActivityBarItems === state.activityBarItems) {
+  const {
+    activityBarItems
+  } = state;
+  const newActivityBarItems = await updateItemsWithBadgeCount(activityBarItems);
+  if (newActivityBarItems === activityBarItems) {
     return state;
   }
   return updateStateItems(state, newActivityBarItems);
@@ -1958,24 +2270,6 @@ const getFilteredActivityBarItems = (items, height, itemHeight) => {
   return [...enabledItems.slice(0, numberOfVisibleItems - 2), showMoreItem, enabledItems.at(-1)];
 };
 
-const setFlag = (item, flag, enabled) => {
-  return {
-    ...item,
-    flags: enabled ? item.flags | flag : item.flags & ~flag
-  };
-};
-
-const markSelected = (items, selectedIndex) => {
-  return items.map((item, index) => {
-    const isSelected = index === selectedIndex;
-    return setFlag(item, Selected, isSelected);
-  });
-};
-
-const toggle = async id => {
-  await invoke('Layout.toggleSideBarView', id);
-};
-
 const getSideBarChange = (sideBarVisible, currentViewletId, viewletId) => {
   if (sideBarVisible) {
     if (currentViewletId === viewletId) {
@@ -1994,6 +2288,25 @@ const getSideBarChange = (sideBarVisible, currentViewletId, viewletId) => {
     viewletId
   };
 };
+
+const setFlag = (item, flag, enabled) => {
+  return {
+    ...item,
+    flags: enabled ? item.flags | flag : item.flags & ~flag
+  };
+};
+
+const markSelected = (items, selectedIndex) => {
+  return items.map((item, index) => {
+    const isSelected = index === selectedIndex;
+    return setFlag(item, Selected, isSelected);
+  });
+};
+
+const toggle = async id => {
+  await invoke('Layout.toggleSideBarView', id);
+};
+
 const handleClickOther = async (state, viewletId) => {
   const {
     activityBarItems,
@@ -2066,7 +2379,10 @@ const getIndexFromTarget = (state, targetName) => {
   if (!targetName) {
     return -1;
   }
-  return state.filteredItems.findIndex(item => item.id === targetName);
+  const {
+    filteredItems
+  } = state;
+  return filteredItems.findIndex(item => item.id === targetName);
 };
 const handleClick = async (state, button, eventX, eventY, targetName = '') => {
   const {
@@ -2124,7 +2440,7 @@ const getCustomIconClass = (id, iconUrl) => {
 };
 
 const isCustomIconUrl = icon => {
-  return icon.startsWith('http://') || icon.startsWith('https://') || icon.startsWith('file://') || icon.startsWith('/');
+  return icon.startsWith('http://') || icon.startsWith('https://') || icon.startsWith('file://') || icon.startsWith('lvce://') || icon.startsWith('/');
 };
 
 const Explorer = 'Explorer';
@@ -2214,7 +2530,11 @@ const getActivityBarItems = (state, contributedViews = []) => {
 
 const getContributedViews = async platform => {
   try {
-    return await invoke$1('Extensions.getViews', '', platform);
+    const views = await invoke$1('Extensions.getViews', '', platform);
+    if (!Array.isArray(views)) {
+      return [];
+    }
+    return views.filter(view => view?.type !== 'preview');
   } catch {
     return [];
   }
@@ -2224,9 +2544,10 @@ const handleExtensionsChanged = async state => {
   const {
     height,
     itemHeight,
+    platform,
     selectedIndex
   } = state;
-  const contributedViews = await getContributedViews(state.platform);
+  const contributedViews = await getContributedViews(platform);
   const items = getActivityBarItems(state, contributedViews);
   const itemsWithSelected = markSelected(items, selectedIndex);
   const activityBarItems = await updateItemsWithBadgeCount(itemsWithSelected);
@@ -2286,11 +2607,13 @@ const getSideBarPosition = async () => {
 
 const handleSettingsChanged = async state => {
   const {
+    accountEnabled: currentAccountEnabled,
     height,
     itemHeight,
+    platform,
     selectedIndex
   } = state;
-  const [accountEnabled, contributedViews, sidebarLocation] = await Promise.all([getAccountEnabled(state.accountEnabled), getContributedViews(state.platform), getSideBarPosition()]);
+  const [accountEnabled, contributedViews, sidebarLocation] = await Promise.all([getAccountEnabled(currentAccountEnabled), getContributedViews(platform), getSideBarPosition()]);
   const newState = {
     ...state,
     accountEnabled
@@ -2320,12 +2643,14 @@ const clearItem = item => {
   const withoutSelected = setFlag(item, Selected, false);
   return setFlag(withoutSelected, Focused, false);
 };
-const handleSideBarStateChange = async (state, id = state.currentViewletId, sideBarVisibleOverride) => {
+const handleSideBarStateChange = async (state, id, sideBarVisibleOverride) => {
   const {
     activityBarItems,
+    currentViewletId,
     height,
     itemHeight
   } = state;
+  const resolvedId = id === undefined ? currentViewletId : id;
   const sideBarVisible = typeof sideBarVisibleOverride === 'boolean' ? sideBarVisibleOverride : await getSideBarVisible();
   if (!sideBarVisible) {
     const itemsCleared = activityBarItems.map(clearItem);
@@ -2339,13 +2664,13 @@ const handleSideBarStateChange = async (state, id = state.currentViewletId, side
       sideBarVisible: false
     };
   }
-  const selectedIndex = findIndex(activityBarItems, id);
+  const selectedIndex = findIndex(activityBarItems, resolvedId);
   const newActivityBarItems = markSelected(activityBarItems, selectedIndex);
   const filteredItems = getFilteredActivityBarItems(newActivityBarItems, height, itemHeight);
   return {
     ...state,
     activityBarItems: newActivityBarItems,
-    currentViewletId: id,
+    currentViewletId: resolvedId,
     filteredItems,
     selectedIndex,
     sideBarVisible
@@ -2566,6 +2891,8 @@ const text = data => {
   };
 };
 
+new Set(Object.values(VirtualDomElements));
+
 const SetText = 1;
 const Replace = 2;
 const SetAttribute = 3;
@@ -2905,7 +3232,7 @@ const getActivityBarItemInProgressDom = item => {
   const isTab = flags & Tab;
   const isSelected = flags & Selected;
   const isFocused = flags & Focused;
-  const role = isTab ? Tab$1 : Button$2;
+  const role = isTab ? Tab$1 : Button$3;
   const ariaSelected = getAriaSelected(isTab, isSelected);
   const ariaHasPopup = getActivityBarItemHasPopup(item) || undefined;
   const marginTop = flags & MarginTop;
@@ -2913,7 +3240,6 @@ const getActivityBarItemInProgressDom = item => {
   className += ' ' + ActivityBarItemNested;
   return [{
     ariaHasPopup,
-    ariaLabel: '',
     ariaSelected,
     childCount: 2,
     className,
@@ -2942,7 +3268,7 @@ const getActivityBarItemWithBadgeDom = item => {
   const isTab = flags & Tab;
   const isSelected = flags & Selected;
   const isFocused = flags & Focused;
-  const role = isTab ? Tab$1 : Button$2;
+  const role = isTab ? Tab$1 : Button$3;
   const ariaSelected = getAriaSelected(isTab, isSelected);
   const ariaHasPopup = getActivityBarItemHasPopup(item) || undefined;
   const marginTop = flags & MarginTop;
@@ -2950,7 +3276,6 @@ const getActivityBarItemWithBadgeDom = item => {
   className += ' ' + ActivityBarItemNested;
   return [{
     ariaHasPopup,
-    ariaLabel: '',
     ariaSelected,
     childCount: 2,
     className,
@@ -2994,14 +3319,13 @@ const getActivityBarItemVirtualDom = item => {
   const isSelected = flags & Selected;
   const isFocused = flags & Focused;
   const isProgress = flags & Progress;
-  const role = isTab ? Tab$1 : Button$2;
+  const role = isTab ? Tab$1 : Button$3;
   const ariaSelected = getAriaSelected(isTab, isSelected);
   const marginTop = flags & MarginTop;
   const className = getClassName(isFocused, marginTop, isSelected);
   if (isSelected && !badgeText) {
     return [{
       ariaHasPopup,
-      ariaLabel: '',
       ariaSelected,
       childCount: 1,
       className,
@@ -3024,7 +3348,6 @@ const getActivityBarItemVirtualDom = item => {
   }
   return [{
     ariaHasPopup,
-    ariaLabel: '',
     ariaSelected,
     childCount: 0,
     className: mergeClassNames(className, getIconClass(item, 'Icon')),
@@ -3040,6 +3363,8 @@ const getVirtualDom = visibleItems => {
   return dom;
 };
 
+const Focusable = 0;
+
 const className = mergeClassNames(Viewlet, ActivityBar$1);
 const getActivityBarVirtualDom = visibleItems => {
   return [{
@@ -3053,7 +3378,7 @@ const getActivityBarVirtualDom = visibleItems => {
     onFocus: HandleFocus,
     onMouseDown: HandleMouseDown,
     role: ToolBar,
-    tabIndex: 0,
+    tabIndex: Focusable,
     type: Div
   }, ...getVirtualDom(visibleItems)];
 };
@@ -3071,7 +3396,15 @@ const renderItems = (oldState, newState) => {
   return [SetDom2, uid, dom];
 };
 
+const hasSameItemIds = (oldState, newState) => {
+  const oldItems = oldState.filteredItems;
+  const newItems = newState.filteredItems;
+  return oldItems.length === newItems.length && oldItems.every((item, index) => item.id === newItems[index].id);
+};
 const renderIncremental = (oldState, newState) => {
+  if (!hasSameItemIds(oldState, newState)) {
+    return renderItems(oldState, newState);
+  }
   const oldDom = renderItems(oldState, oldState)[2];
   const newDom = renderItems(newState, newState)[2];
   const patches = diffTree(oldDom, newDom);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/activity-bar-worker",
-  "version": "7.9.0",
+  "version": "7.9.3",
   "description": "Explorer Worker",
   "repository": {
     "type": "git",