@lvce-editor/activity-bar-worker 2.3.0 → 3.1.0

package/dist/activityBarWorkerMain.js

@@ -225,8 +225,8 @@ const getModuleNotFoundError = stderr => {
   const messageIndex = lines.findIndex(isModuleNotFoundMessage);
   const message = lines[messageIndex];
   return {
-    message,
-    code: ERR_MODULE_NOT_FOUND
+    code: ERR_MODULE_NOT_FOUND,
+    message
   };
 };
 const isModuleNotFoundError = stderr => {
@@ -249,14 +249,14 @@ const isUnhelpfulNativeModuleError = stderr => {
 const getNativeModuleErrorMessage = stderr => {
   const message = getMessageCodeBlock(stderr);
   return {
-    message: `Incompatible native node module: ${message}`,
-    code: E_INCOMPATIBLE_NATIVE_MODULE
+    code: E_INCOMPATIBLE_NATIVE_MODULE,
+    message: `Incompatible native node module: ${message}`
   };
 };
 const getModuleSyntaxError = () => {
   return {
-    message: `ES Modules are not supported in electron`,
-    code: E_MODULES_NOT_SUPPORTED_IN_ELECTRON
+    code: E_MODULES_NOT_SUPPORTED_IN_ELECTRON,
+    message: `ES Modules are not supported in electron`
   };
 };
 const getHelpfulChildProcessError = (stdout, stderr) => {
@@ -275,8 +275,8 @@ const getHelpfulChildProcessError = (stdout, stderr) => {
     rest
   } = getDetails(lines);
   return {
-    message: actualMessage,
     code: '',
+    message: actualMessage,
     stack: rest
   };
 };
@@ -286,8 +286,8 @@ class IpcError extends VError {
     if (stdout || stderr) {
       // @ts-ignore
       const {
-        message,
         code,
+        message,
         stack
       } = getHelpfulChildProcessError(stdout, stderr);
       const cause = new Error(message);
@@ -348,8 +348,8 @@ const wrap$f = global => {
 };
 const waitForFirstMessage = async port => {
   const {
-    resolve,
-    promise
+    promise,
+    resolve
   } = Promise.withResolvers();
   port.addEventListener('message', resolve, {
     once: true
@@ -369,8 +369,8 @@ const listen$6 = async () => {
   const type = firstMessage.params[0];
   if (type === 'message-port') {
     parentIpc.send({
-      jsonrpc: '2.0',
       id: firstMessage.id,
+      jsonrpc: '2.0',
       result: null
     });
     parentIpc.dispose();
@@ -412,56 +412,14 @@ const IpcChildWithModuleWorkerAndMessagePort$1 = {
   wrap: wrap$e
 };
 
-const Two = '2.0';
-const create$4 = (method, params) => {
-  return {
-    jsonrpc: Two,
-    method,
-    params
-  };
-};
+const Two$1 = '2.0';
 const callbacks = Object.create(null);
-const set$3 = (id, fn) => {
-  callbacks[id] = fn;
-};
 const get$2 = id => {
   return callbacks[id];
 };
-const remove = id => {
+const remove$1 = id => {
   delete callbacks[id];
 };
-let id = 0;
-const create$3$1 = () => {
-  return ++id;
-};
-const registerPromise = () => {
-  const id = create$3$1();
-  const {
-    resolve,
-    promise
-  } = Promise.withResolvers();
-  set$3(id, resolve);
-  return {
-    id,
-    promise
-  };
-};
-const create$2$1 = (method, params) => {
-  const {
-    id,
-    promise
-  } = registerPromise();
-  const message = {
-    jsonrpc: Two,
-    method,
-    params,
-    id
-  };
-  return {
-    message,
-    promise
-  };
-};
 class JsonRpcError extends Error {
   constructor(message) {
     super(message);
@@ -612,7 +570,7 @@ const resolve = (id, response) => {
     return;
   }
   fn(response);
-  remove(id);
+  remove$1(id);
 };
 const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
 const getErrorType = prettyError => {
@@ -655,9 +613,9 @@ const getErrorProperty = (error, prettyError) => {
     }
   };
 };
-const create$1$1 = (id, error) => {
+const create$1$2 = (id, error) => {
   return {
-    jsonrpc: Two,
+    jsonrpc: Two$1,
     id,
     error
   };
@@ -666,22 +624,22 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const prettyError = preparePrettyError(error);
   logError(error, prettyError);
   const errorProperty = getErrorProperty(error, prettyError);
-  return create$1$1(id, errorProperty);
+  return create$1$2(id, errorProperty);
 };
-const create$5 = (message, result) => {
+const create$3 = (message, result) => {
   return {
-    jsonrpc: Two,
+    jsonrpc: Two$1,
     id: message.id,
     result: result ?? null
   };
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$5(message, resultProperty);
+  return create$3(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
-    jsonrpc: Two,
+    jsonrpc: Two$1,
     id,
     error: {
       code: Custom,
@@ -768,29 +726,6 @@ const handleJsonRpcMessage = async (...args) => {
   }
   throw new JsonRpcError('unexpected message');
 };
-const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
-  const {
-    message,
-    promise
-  } = create$2$1(method, params);
-  if (useSendAndTransfer && ipc.sendAndTransfer) {
-    ipc.sendAndTransfer(message);
-  } else {
-    ipc.send(message);
-  }
-  const responseMessage = await promise;
-  return unwrapJsonRpcResult(responseMessage);
-};
-const send = (transport, method, ...params) => {
-  const message = create$4(method, params);
-  transport.send(message);
-};
-const invoke$1 = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, false);
-};
-const invokeAndTransfer = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, true);
-};
 
 class CommandNotFoundError extends Error {
   constructor(command) {
@@ -813,24 +748,87 @@ const execute = (command, ...args) => {
   return fn(...args);
 };
 
+const Two = '2.0';
+const create$s = (method, params) => {
+  return {
+    jsonrpc: Two,
+    method,
+    params
+  };
+};
+const create$r = (id, method, params) => {
+  const message = {
+    id,
+    jsonrpc: Two,
+    method,
+    params
+  };
+  return message;
+};
+let id = 0;
+const create$q = () => {
+  return ++id;
+};
+
+/* eslint-disable n/no-unsupported-features/es-syntax */
+
+const registerPromise = map => {
+  const id = create$q();
+  const {
+    promise,
+    resolve
+  } = Promise.withResolvers();
+  map[id] = resolve;
+  return {
+    id,
+    promise
+  };
+};
+
+// @ts-ignore
+const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer) => {
+  const {
+    id,
+    promise
+  } = registerPromise(callbacks);
+  const message = create$r(id, method, params);
+  if (useSendAndTransfer && ipc.sendAndTransfer) {
+    ipc.sendAndTransfer(message);
+  } else {
+    ipc.send(message);
+  }
+  const responseMessage = await promise;
+  return unwrapJsonRpcResult(responseMessage);
+};
 const createRpc = ipc => {
+  const callbacks = Object.create(null);
+  ipc._resolve = (id, response) => {
+    const fn = callbacks[id];
+    if (!fn) {
+      console.warn(`callback ${id} may already be disposed`);
+      return;
+    }
+    fn(response);
+    delete callbacks[id];
+  };
   const rpc = {
+    async dispose() {
+      await ipc?.dispose();
+    },
+    invoke(method, ...params) {
+      return invokeHelper(callbacks, ipc, method, params, false);
+    },
+    invokeAndTransfer(method, ...params) {
+      return invokeHelper(callbacks, ipc, method, params, true);
+    },
     // @ts-ignore
     ipc,
     /**
      * @deprecated
      */
     send(method, ...params) {
-      send(ipc, method, ...params);
-    },
-    invoke(method, ...params) {
-      return invoke$1(ipc, method, ...params);
-    },
-    invokeAndTransfer(method, ...params) {
-      return invokeAndTransfer(ipc, method, ...params);
-    },
-    async dispose() {
-      await ipc?.dispose();
+      const message = create$s(method, params);
+      ipc.send(message);
     }
   };
   return rpc;
@@ -847,7 +845,7 @@ const logError = () => {
 const handleMessage = event => {
   const actualRequiresSocket = event?.target?.requiresSocket || requiresSocket;
   const actualExecute = event?.target?.execute || execute;
-  return handleJsonRpcMessage(event.target, event.data, actualExecute, resolve, preparePrettyError, logError, actualRequiresSocket);
+  return handleJsonRpcMessage(event.target, event.data, actualExecute, event.target._resolve, preparePrettyError, logError, actualRequiresSocket);
 };
 const handleIpc = ipc => {
   if ('addEventListener' in ipc) {
@@ -865,7 +863,7 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$3 = async ({
+const create$1$1 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -877,7 +875,26 @@ const create$3 = async ({
 };
 const WebWorkerRpcClient = {
   __proto__: null,
-  create: create$3
+  create: create$1$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';
@@ -930,9 +947,17 @@ const set$2 = (id, rpc) => {
 const get$1 = id => {
   return rpcs[id];
 };
+const remove = id => {
+  delete rpcs[id];
+};
 
+/* eslint-disable  @typescript-eslint/explicit-function-return-type */
 const create$2 = rpcId => {
   return {
+    async dispose() {
+      const rpc = get$1(rpcId);
+      await rpc.dispose();
+    },
     // @ts-ignore
     invoke(method, ...params) {
       const rpc = get$1(rpcId);
@@ -945,19 +970,28 @@ const create$2 = rpcId => {
       // @ts-ignore
       return rpc.invokeAndTransfer(method, ...params);
     },
+    registerMockRpc(commandMap) {
+      const mockRpc = createMockRpc({
+        commandMap
+      });
+      set$2(rpcId, mockRpc);
+      // @ts-ignore
+      mockRpc[Symbol.dispose] = () => {
+        remove(rpcId);
+      };
+      // @ts-ignore
+      return mockRpc;
+    },
     set(rpc) {
       set$2(rpcId, rpc);
-    },
-    async dispose() {
-      const rpc = get$1(rpcId);
-      await rpc.dispose();
     }
   };
 };
 
 const {
   invoke,
-  set: set$1} = create$2(RendererWorker);
+  set: set$1
+} = create$2(RendererWorker);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(uid);
   number(menuId);
@@ -1065,6 +1099,7 @@ const {
 // TODO parentUid might ot be needed
 const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) => {
   const state = {
+    accountEnabled: false,
     activityBarItems: [],
     currentViewletId: '',
     filteredItems: [],
@@ -1195,6 +1230,20 @@ const getKeyBindings = () => {
   }];
 };
 
+const getMenuEntriesAccount = state => {
+  return [{
+    command: 'Account.signIn',
+    flags: None,
+    id: 'signIn',
+    label: 'Sign In'
+  }, {
+    command: 'Account.signOut',
+    flags: None,
+    id: 'signOut',
+    label: 'Sign Out'
+  }];
+};
+
 const Tab = 1;
 const Button = 1 << 1;
 const Progress = 1 << 2;
@@ -1215,6 +1264,7 @@ const i18nString = (key, placeholders = emptyObject) => {
   return key.replaceAll(RE_PLACEHOLDER, replacer);
 };
 
+const Account$1 = 'Account';
 const Explorer$1 = 'Explorer';
 const Search$2 = 'Search';
 const SourceControl$2 = 'Source Control';
@@ -1231,6 +1281,9 @@ const ColorTheme = 'Color Theme';
 const CommandPalette = 'Command Palette';
 const KeyboardShortcuts = 'Keyboard Shortcuts';
 
+const account = () => {
+  return i18nString(Account$1);
+};
 const explorer = () => {
   return i18nString(Explorer$1);
 };
@@ -1401,11 +1454,15 @@ const getMenuEntriesSettings = state => {
   return items;
 };
 
+// Use a unique number for the Account menu ID
+const ACCOUNT_MENU_ID$1 = 1000;
 const getMenuEntries = (state, options) => {
   const {
     menuId
   } = options;
   switch (menuId) {
+    case ACCOUNT_MENU_ID$1:
+      return getMenuEntriesAccount();
     case ActivityBar$3:
       return getMenuEntriesActivityBar(state);
     case ActivityBarAdditionalViews:
@@ -1489,6 +1546,18 @@ const show2 = async (uid, menuId, x, y, args) => {
   await showContextMenu2(uid, menuId, x, y, args);
 };
 
+// Use a unique number for the Account menu ID
+const ACCOUNT_MENU_ID = 1000;
+const handleClickAccount = async (state, eventX, eventY, viewletId) => {
+  const {
+    uid
+  } = state;
+  await show2(uid, ACCOUNT_MENU_ID, eventX, eventY, {
+    menuId: ACCOUNT_MENU_ID
+  });
+  return state;
+};
+
 const handleClickAdditionalViews = async (state, eventX, eventY, viewletId) => {
   const {
     uid
@@ -1552,6 +1621,8 @@ const handleClickIndex = async (state, button, index, x, y) => {
   const item = filteredItems[index];
   const viewletId = item.id;
   switch (viewletId) {
+    case 'Account':
+      return handleClickAccount(state, x, y);
     case 'Additional Views':
       return handleClickAdditionalViews(state, x, y, viewletId);
     case 'Settings':
@@ -1582,6 +1653,7 @@ const handleContextMenu = async (state, button, eventX, eventY) => {
   return state;
 };
 
+const Account = 'Account';
 const DebugAlt2 = 'DebugAlt2';
 const Extensions$1 = 'Extensions';
 const Files = 'Files';
@@ -1730,8 +1802,20 @@ const RunAndDebug = 'Run And Debug';
 const Search = 'Search';
 const SourceControl = 'Source Control';
 
-const getActivityBarItems = () => {
-  return [
+const getActiveView = async () => {
+  try {
+    const activeView = await invoke('Layout.getActiveSideBarView');
+    return activeView;
+  } catch {
+    return Explorer;
+  }
+};
+
+const getActivityBarItems = state => {
+  const {
+    accountEnabled
+  } = state;
+  const items = [
   // Top
   {
     flags: Tab | Enabled,
@@ -1763,15 +1847,26 @@ const getActivityBarItems = () => {
     id: Extensions,
     keyShortcuts: 'Control+Shift+X',
     title: extensions()
-  },
+  }
   // Bottom
-  {
+  ];
+  if (accountEnabled) {
+    items.push({
+      flags: Button | Enabled | MarginTop,
+      icon: Account,
+      id: 'Account',
+      keyShortcuts: '',
+      title: account()
+    });
+  }
+  items.push({
     flags: Button | Enabled | MarginTop,
     icon: SettingsGear,
     id: 'Settings',
     keyShortcuts: '',
     title: settings()
-  }];
+  });
+  return items;
 };
 
 const loadContent = async (state, savedState) => {
@@ -1779,9 +1874,10 @@ const loadContent = async (state, savedState) => {
     height,
     itemHeight
   } = state;
-  const items = getActivityBarItems();
-  const explorerIndex = 0;
-  const itemsWithSelected = markSelected(items, explorerIndex);
+  const items = getActivityBarItems(state);
+  const activeView = await getActiveView();
+  const index = items.findIndex(item => item.id === activeView);
+  const itemsWithSelected = markSelected(items, index);
   const filteredItems = getFilteredActivityBarItems(itemsWithSelected, height, itemHeight);
   const newItems = await updateItemsWithBadgeCount(filteredItems);
   return {
@@ -1789,7 +1885,7 @@ const loadContent = async (state, savedState) => {
     activityBarItems: itemsWithSelected,
     currentViewletId: Explorer,
     filteredItems: newItems,
-    selectedIndex: explorerIndex,
+    selectedIndex: index,
     sideBarLocation: Left,
     sideBarVisible: true
   };
@@ -1824,9 +1920,9 @@ const mergeClassNames = (...classNames) => {
 
 const text = data => {
   return {
-    type: Text,
+    childCount: 0,
     text: data,
-    childCount: 0
+    type: Text
   };
 };
 

package/package.json

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