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

package/dist/activityBarWorkerMain.js

@@ -160,49 +160,6 @@ const create$9 = (id, uri, x, y, width, height, args, parentUid, platform = 0) =
   return state;
 };
 
-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 isCustomIconUrl = icon => {
-  return icon.startsWith('http://') || icon.startsWith('https://') || icon.startsWith('file://') || icon.startsWith('/');
-};
-const getCustomIconClass = (id, iconUrl) => {
-  const hashInput = id + '\n' + iconUrl;
-  return `MaskIconCustomView${hashString(hashInput)}`;
-};
-const getIconClass = (item, builtinPrefix) => {
-  if (item.customIconClass) {
-    return item.customIconClass;
-  }
-  return `${builtinPrefix}${item.icon}`;
-};
-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 getCustomIconSignature = items => {
   return items.map(item => {
     if (!item.customIconClass || !item.customIconUrl) {
@@ -1215,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 || '';
@@ -1227,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}`);
@@ -2075,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';
@@ -2338,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');
@@ -2355,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 => {
@@ -2385,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,
@@ -2409,6 +2426,30 @@ const loadContent = async state => {
   };
 };
 
+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);
@@ -2769,6 +2810,13 @@ 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,

package/package.json

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