@lvce-editor/status-bar-worker 1.13.0 → 1.14.0

package/dist/statusBarWorkerMain.js

@@ -54,49 +54,6 @@ class VError extends Error {
   }
 }
 
-class AssertionError extends Error {
-  constructor(message) {
-    super(message);
-    this.name = 'AssertionError';
-  }
-}
-const Object$1 = 1;
-const Number$1 = 2;
-const Array$1 = 3;
-const String = 4;
-const Boolean = 5;
-const Function = 6;
-const Null = 7;
-const Unknown = 8;
-const getType = value => {
-  switch (typeof value) {
-    case 'number':
-      return Number$1;
-    case 'function':
-      return Function;
-    case 'string':
-      return String;
-    case 'object':
-      if (value === null) {
-        return Null;
-      }
-      if (Array.isArray(value)) {
-        return Array$1;
-      }
-      return Object$1;
-    case 'boolean':
-      return Boolean;
-    default:
-      return Unknown;
-  }
-};
-const number = value => {
-  const type = getType(value);
-  if (type !== Number$1) {
-    throw new AssertionError('expected value to be of type number');
-  }
-};
-
 const isMessagePort = value => {
   return value && value instanceof MessagePort;
 };
@@ -225,8 +182,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 +206,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 +232,8 @@ const getHelpfulChildProcessError = (stdout, stderr) => {
     rest
   } = getDetails(lines);
   return {
-    message: actualMessage,
     code: '',
+    message: actualMessage,
     stack: rest
   };
 };
@@ -286,8 +243,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 +305,8 @@ const wrap$f = global => {
 };
 const waitForFirstMessage = async port => {
   const {
-    resolve,
-    promise
+    promise,
+    resolve
   } = Promise.withResolvers();
   port.addEventListener('message', resolve, {
     once: true
@@ -369,8 +326,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();
@@ -427,8 +384,8 @@ const removeListener = (emitter, type, callback) => {
 };
 const getFirstEvent = (eventEmitter, eventMap) => {
   const {
-    resolve,
-    promise
+    promise,
+    resolve
   } = Promise.withResolvers();
   const listenerMap = Object.create(null);
   const cleanup = value => {
@@ -440,8 +397,8 @@ const getFirstEvent = (eventEmitter, eventMap) => {
   for (const [event, type] of Object.entries(eventMap)) {
     const listener = event => {
       cleanup({
-        type,
-        event
+        event,
+        type
       });
     };
     addListener(eventEmitter, event, listener);
@@ -450,9 +407,9 @@ const getFirstEvent = (eventEmitter, eventMap) => {
   return promise;
 };
 const Message$1 = 3;
-const create$5$1 = async ({
-  messagePort,
-  isMessagePortOpen
+const create$5 = async ({
+  isMessagePortOpen,
+  messagePort
 }) => {
   if (!isMessagePort(messagePort)) {
     throw new IpcError('port must be of type MessagePort');
@@ -465,8 +422,8 @@ const create$5$1 = async ({
   });
   messagePort.start();
   const {
-    type,
-    event
+    event,
+    type
   } = await eventPromise;
   if (type !== Message$1) {
     throw new IpcError('Failed to wait for ipc message');
@@ -501,61 +458,19 @@ const wrap$5 = messagePort => {
 };
 const IpcParentWithMessagePort$1 = {
   __proto__: null,
-  create: create$5$1,
+  create: create$5,
   signal: signal$1,
   wrap: wrap$5
 };
 
-const Two = '2.0';
-const create$4$1 = (method, params) => {
-  return {
-    jsonrpc: Two,
-    method,
-    params
-  };
-};
+const Two$1 = '2.0';
 const callbacks = Object.create(null);
-const set$4 = (id, fn) => {
-  callbacks[id] = fn;
-};
 const get$3 = id => {
   return callbacks[id];
 };
-const remove = id => {
+const remove$1 = id => {
   delete callbacks[id];
 };
-let id$1 = 0;
-const create$3$1 = () => {
-  return ++id$1;
-};
-const registerPromise = () => {
-  const id = create$3$1();
-  const {
-    resolve,
-    promise
-  } = Promise.withResolvers();
-  set$4(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);
@@ -706,7 +621,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 => {
@@ -749,9 +664,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
   };
@@ -760,22 +675,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$6 = (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$6(message, resultProperty);
+  return create$3(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
-    jsonrpc: Two,
+    jsonrpc: Two$1,
     id,
     error: {
       code: Custom,
@@ -862,29 +777,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$1(method, params);
-  transport.send(message);
-};
-const invoke$2 = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, false);
-};
-const invokeAndTransfer$1 = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, true);
-};
 
 class CommandNotFoundError extends Error {
   constructor(command) {
@@ -907,24 +799,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$1 = 0;
+const create$q = () => {
+  return ++id$1;
+};
+
+/* 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$2(ipc, method, ...params);
-    },
-    invokeAndTransfer(method, ...params) {
-      return invokeAndTransfer$1(ipc, method, ...params);
-    },
-    async dispose() {
-      await ipc?.dispose();
+      const message = create$s(method, params);
+      ipc.send(message);
     }
   };
   return rpc;
@@ -941,7 +896,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) {
@@ -959,15 +914,16 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$5 = async ({
+const create$4 = async ({
   commandMap,
+  isMessagePortOpen = true,
   messagePort
 }) => {
   // TODO create a commandMap per rpc instance
   register(commandMap);
   const rawIpc = await IpcParentWithMessagePort$1.create({
-    messagePort,
-    isMessagePortOpen: true
+    isMessagePortOpen,
+    messagePort
   });
   const ipc = IpcParentWithMessagePort$1.wrap(rawIpc);
   handleIpc(ipc);
@@ -975,8 +931,9 @@ const create$5 = async ({
   messagePort.start();
   return rpc;
 };
-const create$3 = async ({
+const create$2$1 = async ({
   commandMap,
+  isMessagePortOpen,
   send
 }) => {
   const {
@@ -984,16 +941,17 @@ const create$3 = async ({
     port2
   } = new MessageChannel();
   await send(port1);
-  return create$5({
+  return create$4({
     commandMap,
+    isMessagePortOpen,
     messagePort: port2
   });
 };
 const TransferMessagePortRpcParent = {
   __proto__: null,
-  create: create$3
+  create: create$2$1
 };
-const create$4 = async ({
+const create$1$1 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -1005,7 +963,26 @@ const create$4 = async ({
 };
 const WebWorkerRpcClient = {
   __proto__: null,
-  create: create$4
+  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 ExtensionHostWorker = 44;
@@ -1018,7 +995,11 @@ const set$3 = (id, rpc) => {
 const get$2 = 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() {
@@ -1037,6 +1018,18 @@ const create$2 = rpcId => {
       // @ts-ignore
       return rpc.invokeAndTransfer(method, ...params);
     },
+    registerMockRpc(commandMap) {
+      const mockRpc = createMockRpc({
+        commandMap
+      });
+      set$3(rpcId, mockRpc);
+      // @ts-ignore
+      mockRpc[Symbol.dispose] = () => {
+        remove(rpcId);
+      };
+      // @ts-ignore
+      return mockRpc;
+    },
     set(rpc) {
       set$3(rpcId, rpc);
     }
@@ -1154,15 +1147,19 @@ const {
   getCommandIds,
   registerCommands,
   set,
-  wrapCommand} = create$1();
+  wrapCommand,
+  wrapGetter
+} = create$1();
 
 const create = (uid, uri, x, y, width, height, platform, assetDir) => {
   const state = {
     assetDir,
+    errorCount: 0,
     platform,
     statusBarItemsLeft: [],
     statusBarItemsRight: [],
-    uid
+    uid,
+    warningCount: 0
   };
   set(uid, state, state);
 };
@@ -1320,12 +1317,6 @@ const itemRightUpdate = (state, newItem) => {
   };
 };
 
-const ProblemsErrorIcon = 'ProblemsErrorIcon';
-const ProblemsWarningIcon = 'ProblemsWarningIcon';
-const StatusBarItem = 'StatusBarItem';
-const StatusBarItemsLeft = 'StatusBarItemsLeft';
-const StatusBarItemsRight = 'StatusBarItemsRight';
-
 const OnStatusBarItem = 'onStatusBarItem';
 
 const GetStatusBarItems = 'ExtensionHost.getStatusBarItems2';
@@ -1367,6 +1358,42 @@ const getStatusBarItems$1 = (assetDir, platform) => {
   });
 };
 
+const ProblemsErrorIcon = 'ProblemsErrorIcon';
+const ProblemsWarningIcon = 'ProblemsWarningIcon';
+const StatusBarItem = 'StatusBarItem';
+const StatusBarItemsLeft = 'StatusBarItemsLeft';
+const StatusBarItemsRight = 'StatusBarItemsRight';
+
+const getBuiltinStatusBarItems = async () => {
+  const extraItems = [{
+    command: undefined,
+    elements: [{
+      type: 'text',
+      value: 'Notifications'
+    }],
+    name: Notifications,
+    tooltip: ''
+  }, {
+    command: undefined,
+    elements: [{
+      type: 'icon',
+      value: ProblemsErrorIcon
+    }, {
+      type: 'text',
+      value: '0'
+    }, {
+      type: 'icon',
+      value: ProblemsWarningIcon
+    }, {
+      type: 'text',
+      value: '0'
+    }],
+    name: Problems,
+    tooltip: ''
+  }];
+  return extraItems;
+};
+
 const toStatusBarItem = uiStatusBarItem => {
   const elements = [];
   if (uiStatusBarItem.icon) {
@@ -1395,10 +1422,16 @@ const toStatusBarItem = uiStatusBarItem => {
   };
 };
 
+const getActualIcon = extensionHostStatusBarItem => {
+  if (extensionHostStatusBarItem.icon === 'branch') {
+    return 'Branch';
+  }
+  return extensionHostStatusBarItem.icon || '';
+};
 const toUiStatusBarItem = extensionHostStatusBarItem => {
   return {
     command: extensionHostStatusBarItem.command || '',
-    icon: extensionHostStatusBarItem.icon || '',
+    icon: getActualIcon(extensionHostStatusBarItem),
     name: extensionHostStatusBarItem.id || extensionHostStatusBarItem.name || '',
     text: extensionHostStatusBarItem.text || '',
     tooltip: extensionHostStatusBarItem.tooltip || ''
@@ -1419,32 +1452,7 @@ const getStatusBarItems = async (showItems, assetDir, platform) => {
   await activateByEvent('onSourceControl', assetDir, platform);
   const extensionStatusBarItems = await getStatusBarItems$1(assetDir, platform);
   const uiStatusBarItems = toUiStatusBarItems(extensionStatusBarItems);
-  const extraItems = [{
-    command: undefined,
-    elements: [{
-      type: 'text',
-      value: 'Notifications'
-    }],
-    name: Notifications,
-    tooltip: ''
-  }, {
-    command: undefined,
-    elements: [{
-      type: 'icon',
-      value: ProblemsErrorIcon
-    }, {
-      type: 'text',
-      value: '0'
-    }, {
-      type: 'icon',
-      value: ProblemsWarningIcon
-    }, {
-      type: 'text',
-      value: '0'
-    }],
-    name: Problems,
-    tooltip: ''
-  }];
+  const extraItems = await getBuiltinStatusBarItems();
   return [...uiStatusBarItems.map(toStatusBarItem), ...extraItems];
 };
 
@@ -1466,21 +1474,30 @@ const loadContent = async state => {
   const statusBarItems = await getStatusBarItems(statusBarItemsPreference, assetDir, platform);
   return {
     ...state,
+    errorCount: 0,
     statusBarItemsLeft: [...statusBarItems],
-    statusBarItemsRight: []
+    statusBarItemsRight: [],
+    warningCount: 0
   };
 };
 
 const Button$1 = 'button';
 
+const MaskIcon = 'MaskIcon';
+
 const Button = 1;
 const Div = 4;
+const Span = 8;
 const Text = 12;
 
 const TargetName = 'event.target.name';
 
 const SetDom2 = 'Viewlet.setDom2';
 
+const mergeClassNames = (...classNames) => {
+  return classNames.filter(Boolean).join(' ');
+};
+
 const text = data => {
   return {
     type: Text,
@@ -1491,28 +1508,39 @@ const text = data => {
 
 const HandleClick = 11;
 
-const getElementVirtualDom = element => {
+const getTextVirtualDom = element => {
+  return [{
+    childCount: 1,
+    className: 'StatusBarItemLabel',
+    type: Span
+  }, text(element.value)];
+};
+const getIconVirtualDom = element => {
+  return [{
+    childCount: 0,
+    className: mergeClassNames(MaskIcon, element.value),
+    type: Div
+  }];
+};
+const getStatusBarItemElementVirtualDom = element => {
   if (element.type === 'text') {
-    return [text(element.value)];
+    return getTextVirtualDom(element);
   }
   if (element.type === 'icon') {
-    return [{
-      childCount: 0,
-      className: element.value,
-      type: Div
-    }];
+    return getIconVirtualDom(element);
   }
   return [];
 };
+
 const getStatusBarItemVirtualDom = statusBarItem => {
   const {
     elements,
     name,
     tooltip
   } = statusBarItem;
-  const elementNodes = elements.flatMap(getElementVirtualDom);
+  const elementNodes = elements.flatMap(getStatusBarItemElementVirtualDom);
   return [{
-    childCount: elementNodes.length,
+    childCount: elements.length,
     className: StatusBarItem,
     name,
     role: Button$1,
@@ -1608,16 +1636,11 @@ const resize = (state, dimensions) => {
   };
 };
 
-const saveState = uid => {
-  number(uid);
-  const value = get$1(uid);
-  const {
-    newState
-  } = value;
+const saveState = state => {
   const {
     statusBarItemsLeft,
     statusBarItemsRight
-  } = newState;
+  } = state;
   return {
     itemsLeft: statusBarItemsLeft,
     itemsRight: statusBarItemsRight
@@ -1637,7 +1660,7 @@ const commandMap = {
   'StatusBar.render2': render2,
   'StatusBar.renderEventListeners': renderEventListeners,
   'StatusBar.resize': wrapCommand(resize),
-  'StatusBar.saveState': saveState,
+  'StatusBar.saveState': wrapGetter(saveState),
   'StatusBar.terminate': terminate
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/status-bar-worker",
-  "version": "1.13.0",
+  "version": "1.14.0",
   "description": "Status Bar Worker",
   "repository": {
     "type": "git",