@lvce-editor/activity-bar-worker 7.1.0 → 7.3.0

package/dist/activityBarWorkerMain.js

@@ -13,13 +13,13 @@ const create$a = () => {
     },
     diff(uid, modules, numbers) {
       const {
-        newState,
-        oldState
+        oldState,
+        scheduledState
       } = states[uid];
       const diffResult = [];
       for (let i = 0; i < modules.length; i++) {
         const fn = modules[i];
-        if (!fn(oldState, newState)) {
+        if (!fn(oldState, scheduledState)) {
           diffResult.push(numbers[i]);
         }
       }
@@ -37,17 +37,16 @@ const create$a = () => {
       return ids;
     },
     getKeys() {
-      return Object.keys(states).map(key => {
-        return Number.parseFloat(key);
-      });
+      return Object.keys(states).map(Number);
     },
     registerCommands(commandMap) {
       Object.assign(commandMapRef, commandMap);
     },
-    set(uid, oldState, newState) {
+    set(uid, oldState, newState, scheduledState) {
       states[uid] = {
         newState,
-        oldState
+        oldState,
+        scheduledState: scheduledState ?? newState
       };
     },
     wrapCommand(fn) {
@@ -67,7 +66,8 @@ const create$a = () => {
         };
         states[uid] = {
           newState: latestNew,
-          oldState: latestOld.oldState
+          oldState: latestOld.oldState,
+          scheduledState: latestNew
         };
       };
       return wrapped;
@@ -104,7 +104,8 @@ const create$a = () => {
         };
         states[uid] = {
           newState: latestNew,
-          oldState: latestOld.oldState
+          oldState: latestOld.oldState,
+          scheduledState: latestNew
         };
         return {
           error
@@ -159,8 +160,17 @@ const create$9 = (id, uri, x, y, width, height, args, parentUid, platform = 0) =
   return state;
 };
 
+const getCustomIconSignature = items => {
+  return items.map(item => {
+    if (!item.customIconClass || !item.customIconUrl) {
+      return '';
+    }
+    return `${item.customIconClass}\n${item.customIconUrl}`;
+  }).filter(Boolean).join('\n');
+};
+
 const isEqual$2 = (oldState, newState) => {
-  return oldState.itemHeight === newState.itemHeight;
+  return oldState.itemHeight === newState.itemHeight && getCustomIconSignature(oldState.filteredItems) === getCustomIconSignature(newState.filteredItems);
 };
 
 const isEqual$1 = (oldState, newState) => {
@@ -481,7 +491,7 @@ const getMenuEntriesActivityBar = state => {
   } = state;
   const topItems = activityBarItems.filter(item => !(item.flags & Button));
   const bottomItems = activityBarItems.filter(item => item.flags & Button);
-  const entries = [...topItems.map(toContextMenuItem$1)];
+  const entries = topItems.map(toContextMenuItem$1);
   if (bottomItems.length > 0) {
     entries.push(menuEntrySeparator, ...bottomItems.map(toContextMenuItem$1));
   }
@@ -628,7 +638,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;
@@ -640,7 +650,7 @@ const getType = value => {
     case 'function':
       return Function;
     case 'string':
-      return String;
+      return String$1;
     case 'object':
       if (value === null) {
         return Null;
@@ -1162,8 +1172,10 @@ const getCurrentStack = () => {
   const currentStack = joinLines(splitLines(new Error().stack || '').slice(stackLinesToSkip));
   return currentStack;
 };
-const getNewLineIndex = (string, startIndex = undefined) => {
-  return string.indexOf(NewLine, startIndex);
+const getNewLineIndex = (string, startIndex) => {
+  {
+    return string.indexOf(NewLine);
+  }
 };
 const getParentStack = error => {
   let parentStack = error.stack || error.data || error.message || '';
@@ -1174,55 +1186,77 @@ const getParentStack = error => {
 };
 const MethodNotFound = -32601;
 const Custom = -32001;
+const restoreExistingError = (error, currentStack) => {
+  if (typeof error.stack === 'string') {
+    error.stack = error.stack + NewLine + currentStack;
+  }
+  return error;
+};
+const restoreMethodNotFoundError = (error, currentStack) => {
+  const restoredError = new JsonRpcError(error.message);
+  const parentStack = getParentStack(error);
+  restoredError.stack = parentStack + NewLine + currentStack;
+  return restoredError;
+};
+const restoreStackFromData = (restoredError, error, currentStack) => {
+  if (error.data.stack && error.data.type && error.message) {
+    restoredError.stack = error.data.type + ': ' + error.message + NewLine + error.data.stack + NewLine + currentStack;
+    return;
+  }
+  if (error.data.stack) {
+    restoredError.stack = error.data.stack;
+  }
+};
+const applyDataProperties = (restoredError, error) => {
+  if (!error.data) {
+    return;
+  }
+  restoreStackFromData(restoredError, error, getCurrentStack());
+  if (error.data.codeFrame) {
+    // @ts-ignore
+    restoredError.codeFrame = error.data.codeFrame;
+  }
+  if (error.data.code) {
+    // @ts-ignore
+    restoredError.code = error.data.code;
+  }
+  if (error.data.type) {
+    // @ts-ignore
+    restoredError.name = error.data.type;
+  }
+};
+const applyDirectProperties = (restoredError, error) => {
+  if (error.stack) {
+    const lowerStack = restoredError.stack || '';
+    const indexNewLine = getNewLineIndex(lowerStack);
+    const parentStack = getParentStack(error);
+    // @ts-ignore
+    restoredError.stack = parentStack + lowerStack.slice(indexNewLine);
+  }
+  if (error.codeFrame) {
+    // @ts-ignore
+    restoredError.codeFrame = error.codeFrame;
+  }
+};
+const restoreMessageError = (error, _currentStack) => {
+  const restoredError = constructError(error.message, error.type, error.name);
+  if (error.data) {
+    applyDataProperties(restoredError, error);
+  } else {
+    applyDirectProperties(restoredError, error);
+  }
+  return restoredError;
+};
 const restoreJsonRpcError = error => {
   const currentStack = getCurrentStack();
   if (error && error instanceof Error) {
-    if (typeof error.stack === 'string') {
-      error.stack = error.stack + NewLine + currentStack;
-    }
-    return error;
+    return restoreExistingError(error, currentStack);
   }
   if (error && error.code && error.code === MethodNotFound) {
-    const restoredError = new JsonRpcError(error.message);
-    const parentStack = getParentStack(error);
-    restoredError.stack = parentStack + NewLine + currentStack;
-    return restoredError;
+    return restoreMethodNotFoundError(error, currentStack);
   }
   if (error && error.message) {
-    const restoredError = constructError(error.message, error.type, error.name);
-    if (error.data) {
-      if (error.data.stack && error.data.type && error.message) {
-        restoredError.stack = error.data.type + ': ' + error.message + NewLine + error.data.stack + NewLine + currentStack;
-      } else if (error.data.stack) {
-        restoredError.stack = error.data.stack;
-      }
-      if (error.data.codeFrame) {
-        // @ts-ignore
-        restoredError.codeFrame = error.data.codeFrame;
-      }
-      if (error.data.code) {
-        // @ts-ignore
-        restoredError.code = error.data.code;
-      }
-      if (error.data.type) {
-        // @ts-ignore
-        restoredError.name = error.data.type;
-      }
-    } else {
-      if (error.stack) {
-        const lowerStack = restoredError.stack || '';
-        // @ts-ignore
-        const indexNewLine = getNewLineIndex(lowerStack);
-        const parentStack = getParentStack(error);
-        // @ts-ignore
-        restoredError.stack = parentStack + lowerStack.slice(indexNewLine);
-      }
-      if (error.codeFrame) {
-        // @ts-ignore
-        restoredError.codeFrame = error.codeFrame;
-      }
-    }
-    return restoredError;
+    return restoreMessageError(error);
   }
   if (typeof error === 'string') {
     return new Error(`JsonRpc Error: ${error}`);
@@ -1754,7 +1788,7 @@ const updateItemsWithBadgeCount = async items => {
     const badgeCounts = await invoke('Layout.getBadgeCounts');
     const newItems = items.map(item => {
       const badgeCount = badgeCounts[item.id] || 0;
-      const badgeText = badgeCount ? `${badgeCount}` : '';
+      const badgeText = badgeCount ? String(badgeCount) : '';
       return {
         ...item,
         badgeText
@@ -2022,6 +2056,23 @@ const handleExtensionManagementMessagePort = async port => {
   set$1(rpc);
 };
 
+const hashString = value => {
+  let hash = 2_166_136_261;
+  for (const character of value) {
+    hash ^= character.codePointAt(0) || 0;
+    hash = Math.imul(hash, 16_777_619);
+  }
+  return (hash >>> 0).toString(36);
+};
+const getCustomIconClass = (id, iconUrl) => {
+  const hashInput = id + '\n' + iconUrl;
+  return `MaskIconCustomView${hashString(hashInput)}`;
+};
+
+const isCustomIconUrl = icon => {
+  return icon.startsWith('http://') || icon.startsWith('https://') || icon.startsWith('file://') || icon.startsWith('/');
+};
+
 const Explorer = 'Explorer';
 const Extensions = 'Extensions';
 const RunAndDebug = 'Run And Debug';
@@ -2029,13 +2080,24 @@ const Search = 'Search';
 const SourceControl = 'Source Control';
 
 const toActivityBarItem = view => {
-  return {
+  const icon = view.icon || Extensions$1;
+  const customIconUrl = isCustomIconUrl(icon) ? icon : undefined;
+  const customIconClass = customIconUrl ? getCustomIconClass(view.id, customIconUrl) : undefined;
+  const item = {
     flags: Tab | Enabled,
-    icon: view.icon || Extensions$1,
+    icon,
     id: view.id,
     keyShortcuts: '',
     title: view.title || view.id
   };
+  if (customIconClass && customIconUrl) {
+    return {
+      ...item,
+      customIconClass,
+      customIconUrl
+    };
+  }
+  return item;
 };
 const getActivityBarItems = (state, contributedViews = []) => {
   const {
@@ -2274,6 +2336,16 @@ const handleUpdateStateChange = async (state, config) => {
   };
 };
 
+const getUserState = userInfo => {
+  if (!userInfo || typeof userInfo !== 'object') {
+    return undefined;
+  }
+  if (!('userState' in userInfo)) {
+    return undefined;
+  }
+  return userInfo.userState;
+};
+
 const getActiveView = async () => {
   try {
     const activeView = await invoke('Layout.getActiveSideBarView');
@@ -2291,14 +2363,16 @@ const getUserInfo = async () => {
   }
 };
 
-const getUserState = userInfo => {
-  if (!userInfo || typeof userInfo !== 'object') {
-    return undefined;
-  }
-  if (!('userState' in userInfo)) {
-    return undefined;
-  }
-  return userInfo.userState;
+const loadPreferences = async (accountEnabled, platform) => {
+  const [accountEnabledNew, activeView, contributedViews, sidebarLocation, sideBarVisible, userInfo] = await Promise.all([getAccountEnabled(accountEnabled), getActiveView(), getContributedViews(platform), getSideBarPosition(), getSideBarVisible(), getUserInfo()]);
+  return {
+    accountEnabled: accountEnabledNew,
+    activeView,
+    contributedViews,
+    sidebarLocation,
+    sideBarVisible,
+    userInfo
+  };
 };
 
 const toUserLoginState = userState => {
@@ -2321,7 +2395,14 @@ const loadContent = async state => {
     itemHeight,
     platform
   } = state;
-  const [accountEnabledNew, activeView, contributedViews, sideBarVisible, sidebarLocation, userInfo] = await Promise.all([getAccountEnabled(accountEnabled), getActiveView(), getContributedViews(platform), getSideBarVisible(), getSideBarPosition(), getUserInfo()]);
+  const {
+    accountEnabled: accountEnabledNew,
+    activeView,
+    contributedViews,
+    sidebarLocation,
+    sideBarVisible,
+    userInfo
+  } = await loadPreferences(accountEnabled, platform);
   const newState = {
     ...state,
     accountEnabled: accountEnabledNew,
@@ -2345,19 +2426,44 @@ const loadContent = async state => {
   };
 };
 
-const getCss = itemHeight => {
+const escapeCssUrl = url => {
+  return url.replaceAll('\\', '\\\\').replaceAll('"', '\\"').replaceAll('\n', '\\a ').replaceAll('\r', '\\d ').replaceAll('\f', '\\c ');
+};
+
+const getCustomIconCss = items => {
+  const seen = new Set();
+  let css = '';
+  for (const item of items) {
+    const {
+      customIconClass,
+      customIconUrl
+    } = item;
+    if (!customIconClass || !customIconUrl || seen.has(customIconClass)) {
+      continue;
+    }
+    seen.add(customIconClass);
+    css += `.${customIconClass} {
+  mask-image: url("${escapeCssUrl(customIconUrl)}");
+}
+`;
+  }
+  return css;
+};
+
+const getCss = (itemHeight, items = []) => {
   return `:root {
   --ActivityBarItemHeight: var(--${itemHeight}px);
 }
-`;
+${getCustomIconCss(items)}`;
 };
 
 const renderCss = (oldState, newState) => {
   const {
+    filteredItems,
     itemHeight,
     uid
   } = newState;
-  const css = getCss(itemHeight);
+  const css = getCss(itemHeight, filteredItems);
   return [SetCss, uid, css];
 };
 
@@ -2451,12 +2557,12 @@ const getChildrenWithCount = (nodes, startIndex, childCount) => {
 };
 
 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;
   }
+  const patches = [];
   // Handle reference nodes - special handling for uid changes
   if (oldNode.type === Reference) {
     if (oldNode.uid !== newNode.uid) {
@@ -2492,7 +2598,7 @@ const compareNodes = (oldNode, newNode) => {
   }
   // Check for removed attributes
   for (const key of oldKeys) {
-    if (!(key in newNode)) {
+    if (!Object.hasOwn(newNode, key)) {
       patches.push({
         type: RemoveAttribute,
         key
@@ -2704,10 +2810,16 @@ const getClassName = (isFocused, marginTop, isSelected) => {
   return mergeClassNames(...classNames);
 };
 
+const getIconClass = (item, builtinPrefix) => {
+  if (item.customIconClass) {
+    return item.customIconClass;
+  }
+  return `${builtinPrefix}${item.icon}`;
+};
+
 const getActivityBarItemInProgressDom = item => {
   const {
     flags,
-    icon,
     title
   } = item;
   const isTab = flags & Tab;
@@ -2730,7 +2842,7 @@ const getActivityBarItemInProgressDom = item => {
     type: Div
   }, {
     childCount: 0,
-    className: mergeClassNames(Icon, `MaskIcon${icon}`),
+    className: mergeClassNames(Icon, getIconClass(item, 'MaskIcon')),
     role: None$1,
     type: Div
   }, ...getBadgeVirtualDom()];
@@ -2740,7 +2852,6 @@ const getActivityBarItemWithBadgeDom = item => {
   const {
     badgeText,
     flags,
-    icon,
     title
   } = item;
   if (!badgeText) {
@@ -2767,7 +2878,7 @@ const getActivityBarItemWithBadgeDom = item => {
     type: Div
   }, {
     childCount: 0,
-    className: mergeClassNames(Icon, `MaskIcon${icon}`),
+    className: mergeClassNames(Icon, getIconClass(item, 'MaskIcon')),
     role: None$1,
     type: Div
   }, {
@@ -2777,10 +2888,10 @@ const getActivityBarItemWithBadgeDom = item => {
   }, text(badgeText)];
 };
 
-const getIconVirtualDom = (icon, type = Div) => {
+const getIconVirtualDom = (icon, type = Div, customIconClass = '') => {
   return {
     childCount: 0,
-    className: `MaskIcon MaskIcon${icon}`,
+    className: customIconClass ? `MaskIcon ${customIconClass}` : `MaskIcon MaskIcon${icon}`,
     role: None$1,
     type
   };
@@ -2812,7 +2923,7 @@ const getActivityBarItemVirtualDom = item => {
       role,
       title,
       type: Div
-    }, getIconVirtualDom(icon)];
+    }, getIconVirtualDom(icon, Div, item.customIconClass)];
   }
 
   // TODO support progress on selected activity bar item
@@ -2827,7 +2938,7 @@ const getActivityBarItemVirtualDom = item => {
     ariaLabel: '',
     ariaSelected,
     childCount: 0,
-    className: mergeClassNames(className, `Icon${icon}`),
+    className: mergeClassNames(className, getIconClass(item, 'Icon')),
     role,
     title,
     type: Div

package/package.json

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