@lvce-editor/activity-bar-worker 4.0.0 → 4.1.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 => {
@@ -626,7 +647,7 @@ 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,
@@ -635,7 +656,7 @@ const create$3 = (message, result) => {
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$3(message, resultProperty);
+  return create$7(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
@@ -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
@@ -791,7 +792,7 @@ const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer)
     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 +828,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 +849,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 +858,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 +867,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,29 +878,6 @@ const create$2$1 = async ({
   const rpc = createRpc(ipc);
   return rpc;
 };
-const WebWorkerRpcClient = {
-  __proto__: null,
-  create: create$2$1
-};
-const createMockRpc = ({
-  commandMap
-}) => {
-  const invocations = [];
-  const invoke = (method, ...params) => {
-    invocations.push([method, ...params]);
-    const command = commandMap[method];
-    if (!command) {
-      throw new Error(`command ${method} not found`);
-    }
-    return command(...params);
-  };
-  const mockRpc = {
-    invocations,
-    invoke,
-    invokeAndTransfer: invoke
-  };
-  return mockRpc;
-};
 
 const Button$2 = 'button';
 const None$1 = 'none';
@@ -945,6 +927,26 @@ const SetPatches = 'Viewlet.setPatches';
 const FocusActivityBar = 5;
 const FocusExplorer = 13;
 
+const createMockRpc = ({
+  commandMap
+}) => {
+  const invocations = [];
+  const invoke = (method, ...params) => {
+    invocations.push([method, ...params]);
+    const command = commandMap[method];
+    if (!command) {
+      throw new Error(`command ${method} not found`);
+    }
+    return command(...params);
+  };
+  const mockRpc = {
+    invocations,
+    invoke,
+    invokeAndTransfer: invoke
+  };
+  return mockRpc;
+};
+
 const rpcs = Object.create(null);
 const set$2 = (id, rpc) => {
   rpcs[id] = rpc;
@@ -1845,12 +1847,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 +1872,7 @@ const handleSideBarViewletChange = (state, id, ...args) => {
     currentViewletId: id,
     filteredItems,
     selectedIndex: index,
-    sideBarVisible: true
+    sideBarVisible
   };
 };
 
@@ -1911,37 +1923,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
   };
@@ -2637,7 +2637,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.1.0",
   "description": "Explorer Worker",
   "repository": {
     "type": "git",