@lvce-editor/activity-bar-worker 4.0.0 → 4.4.0

package/dist/activityBarWorkerMain.js

@@ -412,6 +412,27 @@ const IpcChildWithModuleWorkerAndMessagePort$1 = {
   wrap: wrap$e
 };
 
+class CommandNotFoundError extends Error {
+  constructor(command) {
+    super(`Command not found ${command}`);
+    this.name = 'CommandNotFoundError';
+  }
+}
+const commands = Object.create(null);
+const register = commandMap => {
+  Object.assign(commands, commandMap);
+};
+const getCommand = key => {
+  return commands[key];
+};
+const execute = (command, ...args) => {
+  const fn = getCommand(command);
+  if (!fn) {
+    throw new CommandNotFoundError(command);
+  }
+  return fn(...args);
+};
+
 const Two$1 = '2.0';
 const callbacks = Object.create(null);
 const get$2 = id => {
@@ -436,12 +457,12 @@ const getErrorConstructor = (message, type) => {
     switch (type) {
       case DomException:
         return DOMException;
-      case TypeError$1:
-        return TypeError;
-      case SyntaxError$1:
-        return SyntaxError;
       case ReferenceError$1:
         return ReferenceError;
+      case SyntaxError$1:
+        return SyntaxError;
+      case TypeError$1:
+        return TypeError;
       default:
         return Error;
     }
@@ -597,27 +618,27 @@ const getErrorProperty = (error, prettyError) => {
   if (error && error.code === E_COMMAND_NOT_FOUND) {
     return {
       code: MethodNotFound,
-      message: error.message,
-      data: error.stack
+      data: error.stack,
+      message: error.message
     };
   }
   return {
     code: Custom,
-    message: prettyError.message,
     data: {
-      stack: getStack(prettyError),
-      codeFrame: prettyError.codeFrame,
-      type: getErrorType(prettyError),
       code: prettyError.code,
-      name: prettyError.name
-    }
+      codeFrame: prettyError.codeFrame,
+      name: prettyError.name,
+      stack: getStack(prettyError),
+      type: getErrorType(prettyError)
+    },
+    message: prettyError.message
   };
 };
 const create$1$1 = (id, error) => {
   return {
-    jsonrpc: Two$1,
+    error,
     id,
-    error
+    jsonrpc: Two$1
   };
 };
 const getErrorResponse = (id, error, preparePrettyError, logError) => {
@@ -626,27 +647,27 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$1(id, errorProperty);
 };
-const create$3 = (message, result) => {
+const create$7 = (message, result) => {
   return {
-    jsonrpc: Two$1,
     id: message.id,
+    jsonrpc: Two$1,
     result: result ?? null
   };
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$3(message, resultProperty);
+  return create$7(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
-    jsonrpc: Two$1,
-    id,
     error: {
       code: Custom,
+      data: error,
       // @ts-ignore
-      message: error.message,
-      data: error
-    }
+      message: error.message
+    },
+    id,
+    jsonrpc: Two$1
   };
 };
 const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
@@ -676,35 +697,35 @@ const normalizeParams = args => {
   if (args.length === 1) {
     const options = args[0];
     return {
+      execute: options.execute,
       ipc: options.ipc,
+      logError: options.logError || defaultLogError,
       message: options.message,
-      execute: options.execute,
-      resolve: options.resolve || defaultResolve,
       preparePrettyError: options.preparePrettyError || defaultPreparePrettyError,
-      logError: options.logError || defaultLogError,
-      requiresSocket: options.requiresSocket || defaultRequiresSocket
+      requiresSocket: options.requiresSocket || defaultRequiresSocket,
+      resolve: options.resolve || defaultResolve
     };
   }
   return {
+    execute: args[2],
     ipc: args[0],
+    logError: args[5],
     message: args[1],
-    execute: args[2],
-    resolve: args[3],
     preparePrettyError: args[4],
-    logError: args[5],
-    requiresSocket: args[6]
+    requiresSocket: args[6],
+    resolve: args[3]
   };
 };
 const handleJsonRpcMessage = async (...args) => {
   const options = normalizeParams(args);
   const {
-    message,
-    ipc,
     execute,
-    resolve,
-    preparePrettyError,
+    ipc,
     logError,
-    requiresSocket
+    message,
+    preparePrettyError,
+    requiresSocket,
+    resolve
   } = options;
   if ('id' in message) {
     if ('method' in message) {
@@ -727,36 +748,17 @@ const handleJsonRpcMessage = async (...args) => {
   throw new JsonRpcError('unexpected message');
 };
 
-class CommandNotFoundError extends Error {
-  constructor(command) {
-    super(`Command not found ${command}`);
-    this.name = 'CommandNotFoundError';
-  }
-}
-const commands = Object.create(null);
-const register = commandMap => {
-  Object.assign(commands, commandMap);
-};
-const getCommand = key => {
-  return commands[key];
-};
-const execute = (command, ...args) => {
-  const fn = getCommand(command);
-  if (!fn) {
-    throw new CommandNotFoundError(command);
-  }
-  return fn(...args);
-};
-
 const Two = '2.0';
-const create$t = (method, params) => {
+
+const create$6 = (method, params) => {
   return {
     jsonrpc: Two,
     method,
     params
   };
 };
-const create$s = (id, method, params) => {
+
+const create$5 = (id, method, params) => {
   const message = {
     id,
     jsonrpc: Two,
@@ -765,15 +767,14 @@ const create$s = (id, method, params) => {
   };
   return message;
 };
+
 let id = 0;
-const create$r = () => {
+const create$4 = () => {
   return ++id;
 };
 
-/* eslint-disable n/no-unsupported-features/es-syntax */
-
 const registerPromise = map => {
-  const id = create$r();
+  const id = create$4();
   const {
     promise,
     resolve
@@ -785,13 +786,12 @@ const registerPromise = map => {
   };
 };
 
-// @ts-ignore
 const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer) => {
   const {
     id,
     promise
   } = registerPromise(callbacks);
-  const message = create$s(id, method, params);
+  const message = create$5(id, method, params);
   if (useSendAndTransfer && ipc.sendAndTransfer) {
     ipc.sendAndTransfer(message);
   } else {
@@ -827,12 +827,13 @@ const createRpc = ipc => {
      * @deprecated
      */
     send(method, ...params) {
-      const message = create$t(method, params);
+      const message = create$6(method, params);
       ipc.send(message);
     }
   };
   return rpc;
 };
+
 const requiresSocket = () => {
   return false;
 };
@@ -847,6 +848,7 @@ const handleMessage = event => {
   const actualExecute = event?.target?.execute || execute;
   return handleJsonRpcMessage(event.target, event.data, actualExecute, event.target._resolve, preparePrettyError, logError, actualRequiresSocket);
 };
+
 const handleIpc = ipc => {
   if ('addEventListener' in ipc) {
     ipc.addEventListener('message', handleMessage);
@@ -855,6 +857,7 @@ const handleIpc = ipc => {
     ipc.on('message', handleMessage);
   }
 };
+
 const listen$1 = async (module, options) => {
   const rawIpc = await module.listen(options);
   if (module.signal) {
@@ -863,7 +866,8 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$2$1 = async ({
+
+const create$3 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -873,10 +877,7 @@ const create$2$1 = async ({
   const rpc = createRpc(ipc);
   return rpc;
 };
-const WebWorkerRpcClient = {
-  __proto__: null,
-  create: create$2$1
-};
+
 const createMockRpc = ({
   commandMap
 }) => {
@@ -897,54 +898,6 @@ const createMockRpc = ({
   return mockRpc;
 };
 
-const Button$2 = 'button';
-const None$1 = 'none';
-const Tab$1 = 'tab';
-const ToolBar = 'toolbar';
-
-const Div = 4;
-const Text = 12;
-const Reference = 100;
-
-const Button$1 = 'event.button';
-const ClientX = 'event.clientX';
-const ClientY = 'event.clientY';
-
-const Enter = 3;
-const Space = 9;
-const PageUp = 10;
-const PageDown = 11;
-const End = 255;
-const Home = 12;
-const UpArrow = 14;
-const DownArrow = 16;
-
-const ActivityBar$3 = 1;
-const Settings$1 = 12;
-const ActivityBarAdditionalViews = 17;
-
-const Separator = 1;
-const None = 0;
-const Checked = 2;
-const Unchecked = 3;
-
-const LeftClick = 0;
-
-const Web = 1;
-
-const RendererWorker = 1;
-
-const Left = 1;
-const Right = 2;
-
-const SetCss = 'Viewlet.setCss';
-const SetDom2 = 'Viewlet.setDom2';
-const SetFocusContext = 'Viewlet.setFocusContext';
-const SetPatches = 'Viewlet.setPatches';
-
-const FocusActivityBar = 5;
-const FocusExplorer = 13;
-
 const rpcs = Object.create(null);
 const set$2 = (id, rpc) => {
   rpcs[id] = rpc;
@@ -993,6 +946,54 @@ const create$2 = rpcId => {
   };
 };
 
+const Button$2 = 'button';
+const None$1 = 'none';
+const Tab$1 = 'tab';
+const ToolBar = 'toolbar';
+
+const Div = 4;
+const Text = 12;
+const Reference = 100;
+
+const Button$1 = 'event.button';
+const ClientX = 'event.clientX';
+const ClientY = 'event.clientY';
+
+const Enter = 3;
+const Space = 9;
+const PageUp = 10;
+const PageDown = 11;
+const End = 255;
+const Home = 12;
+const UpArrow = 14;
+const DownArrow = 16;
+
+const ActivityBar$3 = 1;
+const Settings$1 = 12;
+const ActivityBarAdditionalViews = 17;
+
+const Separator = 1;
+const None = 0;
+const Checked = 2;
+const Unchecked = 3;
+
+const LeftClick = 0;
+
+const Web = 1;
+
+const RendererWorker = 1;
+
+const Left = 1;
+const Right = 2;
+
+const SetCss = 'Viewlet.setCss';
+const SetDom2 = 'Viewlet.setDom2';
+const SetFocusContext = 'Viewlet.setFocusContext';
+const SetPatches = 'Viewlet.setPatches';
+
+const FocusActivityBar = 5;
+const FocusExplorer = 13;
+
 const {
   invoke,
   set: set$1
@@ -1045,7 +1046,7 @@ const create$1 = () => {
     },
     getKeys() {
       return Object.keys(states).map(key => {
-        return Number.parseInt(key);
+        return Number.parseFloat(key);
       });
     },
     registerCommands(commandMap) {
@@ -1087,6 +1088,37 @@ const create$1 = () => {
         return fn(newState, ...args);
       };
       return wrapped;
+    },
+    wrapLoadContent(fn) {
+      const wrapped = async (uid, ...args) => {
+        const {
+          newState,
+          oldState
+        } = states[uid];
+        const result = await fn(newState, ...args);
+        const {
+          error,
+          state
+        } = result;
+        if (oldState === state || newState === state) {
+          return {
+            error
+          };
+        }
+        const latestOld = states[uid];
+        const latestNew = {
+          ...latestOld.newState,
+          ...state
+        };
+        states[uid] = {
+          newState: latestNew,
+          oldState: latestOld.oldState
+        };
+        return {
+          error
+        };
+      };
+      return wrapped;
     }
   };
 };
@@ -1126,6 +1158,7 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) =>
     uid: id,
     updateProgress: 0,
     updateState: '',
+    userLoginState: 'logged out',
     width,
     x,
     y
@@ -1143,7 +1176,7 @@ const isEqual$1 = (oldState, newState) => {
 };
 
 const isEqual = (oldState, newState) => {
-  return oldState.activityBarItems === newState.activityBarItems && oldState.filteredItems === newState.filteredItems && oldState.focusedIndex === newState.focusedIndex && oldState.updateProgress === newState.updateProgress && oldState.updateState === newState.updateState;
+  return oldState.activityBarItems === newState.activityBarItems && oldState.filteredItems === newState.filteredItems && oldState.focusedIndex === newState.focusedIndex && oldState.sideBarLocation === newState.sideBarLocation && oldState.sideBarVisible === newState.sideBarVisible && oldState.updateProgress === newState.updateProgress && oldState.updateState === newState.updateState;
 };
 
 const RenderItems = 4;
@@ -1589,7 +1622,7 @@ const hide = async () => {
   await invoke('Layout.hideSideBar');
 };
 
-const handleClickOther = async (state, x, y, viewletId) => {
+const handleClickOther = async (state, viewletId) => {
   const {
     currentViewletId,
     sideBarVisible
@@ -1636,7 +1669,7 @@ const handleClickIndex = async (state, button, index, x, y) => {
     case 'Settings':
       return handleClickSettings(state, x, y);
     default:
-      return handleClickOther(state, x, y, viewletId);
+      return handleClickOther(state, viewletId);
   }
 };
 
@@ -1822,14 +1855,22 @@ const handleSettingsChanged = async state => {
   };
 };
 
+const clearItem = item => {
+  const withoutSelected = setFlag(item, Selected, false);
+  return setFlag(withoutSelected, Focused, false);
+};
 const handleSideBarHidden = state => {
-  const itemsCleared = state.activityBarItems.map(item => {
-    const withoutSelected = setFlag(item, Selected, false);
-    return setFlag(withoutSelected, Focused, false);
-  });
+  const {
+    activityBarItems,
+    height,
+    itemHeight
+  } = state;
+  const itemsCleared = activityBarItems.map(clearItem);
+  const filteredItems = getFilteredActivityBarItems(itemsCleared, height, itemHeight);
   return {
     ...state,
     activityBarItems: itemsCleared,
+    filteredItems,
     focusedIndex: -1,
     selectedIndex: -1,
     sideBarVisible: false
@@ -1845,12 +1886,22 @@ const findIndex = (activityBarItems, id) => {
   return -1;
 };
 
-const handleSideBarViewletChange = (state, id, ...args) => {
+const getSideBarVisible = async () => {
+  try {
+    const visible = await invoke('Layout.getSideBarVisible');
+    return visible;
+  } catch {
+    return true;
+  }
+};
+
+const handleSideBarViewletChange = async (state, id, ...args) => {
   const {
     activityBarItems,
     height,
     itemHeight
   } = state;
+  const sideBarVisible = await getSideBarVisible();
   const index = findIndex(activityBarItems, id);
   const newActivityBarItems = markSelected(activityBarItems, index);
   const filteredItems = getFilteredActivityBarItems(newActivityBarItems, height, itemHeight);
@@ -1860,7 +1911,7 @@ const handleSideBarViewletChange = (state, id, ...args) => {
     currentViewletId: id,
     filteredItems,
     selectedIndex: index,
-    sideBarVisible: true
+    sideBarVisible
   };
 };
 
@@ -1911,37 +1962,25 @@ const getActiveView = async () => {
   }
 };
 
-const getSideBarVisible = async () => {
-  try {
-    const visible = await invoke('Layout.getSideBarVisible');
-    return visible;
-  } catch {
-    return true;
-  }
-};
-
 const loadContent = async state => {
   const {
     height,
     itemHeight
   } = state;
   const items = getActivityBarItems(state);
-  // TODO parallelize async calls
-  // or add one function that returns all needed data
-  const activeView = await getActiveView();
-  const sideBarVisible = await getSideBarVisible();
+  const [activeView, sideBarVisible, sidebarLocation] = await Promise.all([getActiveView(), getSideBarVisible(), getSideBarPosition()]);
   const index = items.findIndex(item => item.id === activeView);
-  const itemsWithSelected = markSelected(items, index);
+  const selectedIndex = sideBarVisible ? index : -1;
+  const itemsWithSelected = markSelected(items, selectedIndex);
   const filteredItems = getFilteredActivityBarItems(itemsWithSelected, height, itemHeight);
   const newItems = await updateItemsWithBadgeCount(filteredItems);
-  const sidebarLocation = await getSideBarPosition();
   return {
     ...state,
     activityBarItems: itemsWithSelected,
     currentViewletId: Explorer,
     filteredItems: newItems,
     initial: false,
-    selectedIndex: index,
+    selectedIndex,
     sideBarLocation: sidebarLocation,
     sideBarVisible
   };
@@ -2492,6 +2531,9 @@ const renderIncremental = (oldState, newState) => {
   const oldDom = renderItems(oldState, oldState)[2];
   const newDom = renderItems(newState, newState)[2];
   const patches = diffTree(oldDom, newDom);
+  if (patches.length === 0) {
+    return [];
+  }
   return [SetPatches, newState.uid, patches];
 };
 
@@ -2619,6 +2661,7 @@ const commandMap = {
   'ActivityBar.handleBlur': wrapCommand(handleBlur),
   'ActivityBar.handleClick': wrapCommand(handleClick),
   'ActivityBar.handleClickIndex': wrapCommand(handleClickIndex),
+  'ActivityBar.handleClickSettings': wrapCommand(handleClickSettings),
   'ActivityBar.handleContextMenu': wrapCommand(handleContextMenu),
   'ActivityBar.handleFocus': wrapCommand(handleFocus),
   'ActivityBar.handleSettingsChanged': wrapCommand(handleSettingsChanged),
@@ -2637,7 +2680,7 @@ const commandMap = {
 
 const listen = async () => {
   registerCommands(commandMap);
-  const rpc = await WebWorkerRpcClient.create({
+  const rpc = await create$3({
     commandMap: commandMap
   });
   set$1(rpc);

package/package.json

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