@lvce-editor/status-bar-worker 1.5.0 → 1.7.0

package/dist/statusBarWorkerMain.js

@@ -411,9 +411,103 @@ const IpcChildWithModuleWorkerAndMessagePort$1 = {
   listen: listen$6,
   wrap: wrap$e
 };
+const addListener = (emitter, type, callback) => {
+  if ('addEventListener' in emitter) {
+    emitter.addEventListener(type, callback);
+  } else {
+    emitter.on(type, callback);
+  }
+};
+const removeListener = (emitter, type, callback) => {
+  if ('removeEventListener' in emitter) {
+    emitter.removeEventListener(type, callback);
+  } else {
+    emitter.off(type, callback);
+  }
+};
+const getFirstEvent = (eventEmitter, eventMap) => {
+  const {
+    resolve,
+    promise
+  } = Promise.withResolvers();
+  const listenerMap = Object.create(null);
+  const cleanup = value => {
+    for (const event of Object.keys(eventMap)) {
+      removeListener(eventEmitter, event, listenerMap[event]);
+    }
+    resolve(value);
+  };
+  for (const [event, type] of Object.entries(eventMap)) {
+    const listener = event => {
+      cleanup({
+        type,
+        event
+      });
+    };
+    addListener(eventEmitter, event, listener);
+    listenerMap[event] = listener;
+  }
+  return promise;
+};
+const Message$1 = 3;
+const create$5$1 = async ({
+  messagePort,
+  isMessagePortOpen
+}) => {
+  if (!isMessagePort(messagePort)) {
+    throw new IpcError('port must be of type MessagePort');
+  }
+  if (isMessagePortOpen) {
+    return messagePort;
+  }
+  const eventPromise = getFirstEvent(messagePort, {
+    message: Message$1
+  });
+  messagePort.start();
+  const {
+    type,
+    event
+  } = await eventPromise;
+  if (type !== Message$1) {
+    throw new IpcError('Failed to wait for ipc message');
+  }
+  if (event.data !== readyMessage) {
+    throw new IpcError('unexpected first message');
+  }
+  return messagePort;
+};
+const signal$1 = messagePort => {
+  messagePort.start();
+};
+class IpcParentWithMessagePort extends Ipc {
+  getData = getData$2;
+  send(message) {
+    this._rawIpc.postMessage(message);
+  }
+  sendAndTransfer(message) {
+    const transfer = getTransferrables(message);
+    this._rawIpc.postMessage(message, transfer);
+  }
+  dispose() {
+    this._rawIpc.close();
+  }
+  onMessage(callback) {
+    this._rawIpc.addEventListener('message', callback);
+  }
+  onClose(callback) {}
+}
+const wrap$5 = messagePort => {
+  return new IpcParentWithMessagePort(messagePort);
+};
+const IpcParentWithMessagePort$1 = {
+  __proto__: null,
+  create: create$5$1,
+  signal: signal$1,
+  wrap: wrap$5
+};
 
 const Two = '2.0';
-const create$4 = (method, params) => {
+const create$4$1 = (method, params) => {
   return {
     jsonrpc: Two,
     method,
@@ -421,7 +515,7 @@ const create$4 = (method, params) => {
   };
 };
 const callbacks = Object.create(null);
-const set$2 = (id, fn) => {
+const set$4 = (id, fn) => {
   callbacks[id] = fn;
 };
 const get$3 = id => {
@@ -440,7 +534,7 @@ const registerPromise = () => {
     resolve,
     promise
   } = Promise.withResolvers();
-  set$2(id, resolve);
+  set$4(id, resolve);
   return {
     id,
     promise
@@ -668,7 +762,7 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$1(id, errorProperty);
 };
-const create$5 = (message, result) => {
+const create$6 = (message, result) => {
   return {
     jsonrpc: Two,
     id: message.id,
@@ -677,7 +771,7 @@ const create$5 = (message, result) => {
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$5(message, resultProperty);
+  return create$6(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
@@ -782,13 +876,13 @@ const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
   return unwrapJsonRpcResult(responseMessage);
 };
 const send = (transport, method, ...params) => {
-  const message = create$4(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 = (ipc, method, ...params) => {
+const invokeAndTransfer$1 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, true);
 };
 
@@ -827,7 +921,7 @@ const createRpc = ipc => {
       return invoke$2(ipc, method, ...params);
     },
     invokeAndTransfer(method, ...params) {
-      return invokeAndTransfer(ipc, method, ...params);
+      return invokeAndTransfer$1(ipc, method, ...params);
     },
     async dispose() {
       await ipc?.dispose();
@@ -865,7 +959,41 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
+const create$5 = async ({
+  commandMap,
+  messagePort
+}) => {
+  // TODO create a commandMap per rpc instance
+  register(commandMap);
+  const rawIpc = await IpcParentWithMessagePort$1.create({
+    messagePort,
+    isMessagePortOpen: true
+  });
+  const ipc = IpcParentWithMessagePort$1.wrap(rawIpc);
+  handleIpc(ipc);
+  const rpc = createRpc(ipc);
+  messagePort.start();
+  return rpc;
+};
 const create$3 = async ({
+  commandMap,
+  send
+}) => {
+  const {
+    port1,
+    port2
+  } = new MessageChannel();
+  await send(port1);
+  return create$5({
+    commandMap,
+    messagePort: port2
+  });
+};
+const TransferMessagePortRpcParent = {
+  __proto__: null,
+  create: create$3
+};
+const create$4 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -877,14 +1005,78 @@ const create$3 = async ({
 };
 const WebWorkerRpcClient = {
   __proto__: null,
-  create: create$3
+  create: create$4
+};
+
+const Button = 'button';
+
+const Div = 4;
+const Text = 12;
+
+const TargetName = 'event.target.name';
+
+const ExtensionHostWorker = 44;
+const RendererWorker = 1;
+const SourceControlWorker = 66;
+
+const SetDom2 = 'Viewlet.setDom2';
+
+const rpcs = Object.create(null);
+const set$3 = (id, rpc) => {
+  rpcs[id] = rpc;
+};
+const get$2 = id => {
+  return rpcs[id];
+};
+
+const create$2 = rpcId => {
+  return {
+    // @ts-ignore
+    invoke(method, ...params) {
+      const rpc = get$2(rpcId);
+      // @ts-ignore
+      return rpc.invoke(method, ...params);
+    },
+    // @ts-ignore
+    invokeAndTransfer(method, ...params) {
+      const rpc = get$2(rpcId);
+      // @ts-ignore
+      return rpc.invokeAndTransfer(method, ...params);
+    },
+    set(rpc) {
+      set$3(rpcId, rpc);
+    },
+    async dispose() {
+      const rpc = get$2(rpcId);
+      await rpc.dispose();
+    }
+  };
+};
+
+const {
+  invoke: invoke$1,
+  set: set$2} = create$2(ExtensionHostWorker);
+
+const {
+  invoke,
+  invokeAndTransfer,
+  set: set$1} = create$2(RendererWorker);
+const sendMessagePortToExtensionHostWorker$1 = async (port, rpcId = 0) => {
+  const command = 'HandleMessagePort.handleMessagePort2';
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, command, rpcId);
+};
+const activateByEvent$1 = event => {
+  return invoke('ExtensionHostManagement.activateByEvent', event);
+};
+const getPreference = async key => {
+  return await invoke('Preferences.get', key);
 };
 
 const toCommandId = key => {
   const dotIndex = key.indexOf('.');
   return key.slice(dotIndex + 1);
 };
-const create$2 = () => {
+const create$1 = () => {
   const states = Object.create(null);
   const commandMapRef = {};
   return {
@@ -966,17 +1158,19 @@ const terminate = () => {
 };
 
 const {
-  get: get$2,
-  set: set$1,
-  wrapCommand} = create$2();
+  get: get$1,
+  getCommandIds,
+  registerCommands,
+  set,
+  wrapCommand} = create$1();
 
-const create$1 = uid => {
+const create = uid => {
   const state = {
     statusBarItemsLeft: [],
     statusBarItemsRight: [],
     uid
   };
-  set$1(uid, state, state);
+  set(uid, state, state);
 };
 
 const isEqual = (oldState, newState) => {
@@ -1003,21 +1197,68 @@ const diff2 = uid => {
   const {
     newState,
     oldState
-  } = get$2(uid);
+  } = get$1(uid);
   const result = diff(oldState, newState);
   return result;
 };
 
-const handleClick = (state, name) => {
+const Notifications = 'Notifications';
+
+const getMatchingItem = (itemsLeft, itemsRight, name) => {
+  for (const item of itemsLeft) {
+    if (item.name === name) {
+      return item;
+    }
+  }
+  for (const item of itemsRight) {
+    if (item.name === name) {
+      return item;
+    }
+  }
+  return undefined;
+};
+const handleClickNotification = async () => {
+  // TODO toggle notifications
+};
+const handleClick = async (state, name) => {
+  if (!name) {
+    return state;
+  }
+  const {
+    statusBarItemsLeft,
+    statusBarItemsRight
+  } = state;
+  const item = getMatchingItem(statusBarItemsLeft, statusBarItemsRight, name);
+  if (!item) {
+    return state;
+  }
+  if (item.name === Notifications) {
+    await handleClickNotification();
+  }
   // TODO
   // sendExtensionWorker([/* statusBarItemHandleClick */ 7657, /* name */ name])
   return state;
 };
 
-const initializeRendererProcess = async () => {};
+const sendMessagePortToExtensionHostWorker = async port => {
+  await sendMessagePortToExtensionHostWorker$1(port, SourceControlWorker);
+};
+
+const createExtensionHostRpc = async () => {
+  try {
+    const rpc = await TransferMessagePortRpcParent.create({
+      commandMap: {},
+      send: sendMessagePortToExtensionHostWorker
+    });
+    return rpc;
+  } catch (error) {
+    throw new VError(error, `Failed to create extension host rpc`);
+  }
+};
 
 const initialize = async () => {
-  await initializeRendererProcess();
+  const rpc = await createExtensionHostRpc();
+  set$2(rpc);
 };
 
 const getIndex = (items, item) => {
@@ -1068,68 +1309,6 @@ const OnStatusBarItem = 'onStatusBarItem';
 
 const GetStatusBarItems = 'ExtensionHost.getStatusBarItems';
 
-const Button$1 = 'button';
-
-const Div = 4;
-const Text = 12;
-
-const Button = 'event.button';
-const ClientX = 'event.clientX';
-const ClientY = 'event.clientY';
-const DeltaMode = 'event.deltaMode';
-const DeltaY = 'event.deltaY';
-const TargetName = 'event.target.name';
-const TargetValue = 'event.target.value';
-
-const ExtensionHostWorker = 44;
-const RendererWorker = 1;
-
-const SetDom2 = 'Viewlet.setDom2';
-
-const rpcs = Object.create(null);
-const set = (id, rpc) => {
-  rpcs[id] = rpc;
-};
-const get$1 = id => {
-  return rpcs[id];
-};
-
-const create = rpcId => {
-  return {
-    // @ts-ignore
-    invoke(method, ...params) {
-      const rpc = get$1(rpcId);
-      // @ts-ignore
-      return rpc.invoke(method, ...params);
-    },
-    // @ts-ignore
-    invokeAndTransfer(method, ...params) {
-      const rpc = get$1(rpcId);
-      // @ts-ignore
-      return rpc.invokeAndTransfer(method, ...params);
-    },
-    set(rpc) {
-      set(rpcId, rpc);
-    },
-    async dispose() {
-      const rpc = get$1(rpcId);
-      await rpc.dispose();
-    }
-  };
-};
-
-const {
-  invoke: invoke$1} = create(ExtensionHostWorker);
-
-const {
-  invoke} = create(RendererWorker);
-const activateByEvent$1 = event => {
-  return invoke('ExtensionHostManagement.activateByEvent', event);
-};
-const getPreference = async key => {
-  return await invoke('Preferences.get', key);
-};
-
 const activateByEvent = event => {
   return activateByEvent$1(event);
 };
@@ -1184,7 +1363,14 @@ const getStatusBarItems = async showItems => {
   await activateByEvent('onSourceControl');
   const extensionStatusBarItems = await getStatusBarItems$1();
   const uiStatusBarItems = toUiStatusBarItems(extensionStatusBarItems);
-  return uiStatusBarItems;
+  const extraItems = [{
+    command: '',
+    icon: '',
+    name: Notifications,
+    text: 'Notifications',
+    tooltip: ''
+  }];
+  return [...uiStatusBarItems, ...extraItems];
 };
 
 const get = async key => {
@@ -1192,7 +1378,7 @@ const get = async key => {
 };
 
 const itemsVisible = async () => {
-  const statusBarItemsPreference = (await get('statusBar.itemsVisible')) ?? false;
+  const statusBarItemsPreference = (await get('statusBar.itemsVisible')) ?? true;
   return statusBarItemsPreference;
 };
 
@@ -1201,14 +1387,11 @@ const loadContent = async state => {
   const statusBarItems = await getStatusBarItems(statusBarItemsPreference);
   return {
     ...state,
-    statusBarItemsLeft: [...statusBarItems]
+    statusBarItemsLeft: [...statusBarItems],
+    statusBarItemsRight: []
   };
 };
 
-const StatusBarItem = 'StatusBarItem';
-const StatusBarItemsLeft = 'StatusBarItemsLeft';
-const StatusBarItemsRight = 'StatusBarItemsRight';
-
 const text = data => {
   return {
     type: Text,
@@ -1217,14 +1400,22 @@ const text = data => {
   };
 };
 
+const StatusBarItem = 'StatusBarItem';
+const StatusBarItemsLeft = 'StatusBarItemsLeft';
+const StatusBarItemsRight = 'StatusBarItemsRight';
+
+const HandleClick = 11;
+
 const getStatusBarItemVirtualDom = statusBarItem => {
   const {
+    name,
     tooltip
   } = statusBarItem;
   return [{
     childCount: 1,
     className: StatusBarItem,
-    role: Button$1,
+    name,
+    role: Button,
     tabIndex: -1,
     title: tooltip,
     type: Div
@@ -1232,6 +1423,9 @@ const getStatusBarItemVirtualDom = statusBarItem => {
 };
 
 const getStatusBarItemsVirtualDom = (items, className) => {
+  if (items.length === 0) {
+    return [];
+  }
   return [{
     childCount: items.length,
     className,
@@ -1239,14 +1433,23 @@ const getStatusBarItemsVirtualDom = (items, className) => {
   }, ...items.flatMap(getStatusBarItemVirtualDom)];
 };
 
-const getStatusBarVirtualDom = (statusBarItemsLeft, statusBarItemsRight) => {
-  const dom = [];
-  if (statusBarItemsLeft.length > 0) {
-    dom.push(...getStatusBarItemsVirtualDom(statusBarItemsLeft, StatusBarItemsLeft));
+const getChildCount = (leftCount, rightCount) => {
+  let count = 0;
+  if (leftCount > 0) {
+    count++;
   }
-  if (statusBarItemsRight.length > 0) {
-    dom.push(...getStatusBarItemsVirtualDom(statusBarItemsRight, StatusBarItemsRight));
+  if (rightCount > 0) {
+    count++;
   }
+  return count;
+};
+const getStatusBarVirtualDom = (statusBarItemsLeft, statusBarItemsRight) => {
+  const dom = [{
+    childCount: getChildCount(statusBarItemsLeft.length, statusBarItemsRight.length),
+    className: 'StatusBar',
+    onClick: HandleClick,
+    type: Div
+  }, ...getStatusBarItemsVirtualDom(statusBarItemsLeft, StatusBarItemsLeft), ...getStatusBarItemsVirtualDom(statusBarItemsRight, StatusBarItemsRight)];
   return dom;
 };
 
@@ -1285,56 +1488,16 @@ const render2 = (uid, diffResult) => {
   const {
     newState,
     oldState
-  } = get$2(uid);
-  set$1(uid, newState, newState);
+  } = get$1(uid);
+  set(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
   return commands;
 };
 
-const HandleClickAt = 1;
-const HandleContextMenu = 2;
-const HandleFocus = 3;
-const HandleInput = 4;
-const HandleMouseOutAt = 6;
-const HandleMouseOver = 7;
-const HandleMouseOverAt = 8;
-const HandleWheel = 9;
-const HandleClickAction = 10;
-
 const renderEventListeners = () => {
   return [{
-    name: HandleWheel,
-    params: ['handleWheel', DeltaMode, DeltaY],
-    passive: true
-  }, {
-    name: HandleFocus,
-    params: ['handleFocus']
-  }, {
-    name: HandleClickAt,
-    params: ['handleClickAt', ClientX, ClientY, TargetName]
-  }, {
-    name: HandleMouseOverAt,
-    params: ['handleMouseOverAt', ClientX, ClientY]
-  }, {
-    name: HandleMouseOver,
-    params: ['handleMouseOver', ClientX, ClientY]
-  }, {
-    name: HandleMouseOutAt,
-    params: ['handleMouseOutAt', ClientX, ClientY]
-  }, {
-    name: HandleInput,
-    params: ['handleInput', TargetValue]
-  }, {
-    name: HandleContextMenu,
-    params: ['handleContextMenu', Button, ClientX, ClientY],
-    preventDefault: true
-  }, {
-    name: HandleWheel,
-    params: ['handleWheel', DeltaMode, DeltaY],
-    passive: true
-  }, {
-    name: HandleClickAction,
-    params: ['handleActionClick', TargetName]
+    name: HandleClick,
+    params: ['handleClick', TargetName]
   }];
 };
 
@@ -1347,7 +1510,7 @@ const resize = (state, dimensions) => {
 
 const saveState = uid => {
   number(uid);
-  const value = get$2(uid);
+  const value = get$1(uid);
   const {
     newState
   } = value;
@@ -1362,8 +1525,9 @@ const saveState = uid => {
 };
 
 const commandMap = {
-  'StatusBar.create': create$1,
+  'StatusBar.create': create,
   'StatusBar.diff2': diff2,
+  'StatusBar.getCommandIds': getCommandIds,
   'StatusBar.handleClick': wrapCommand(handleClick),
   'StatusBar.initialize': initialize,
   'StatusBar.itemLeftUpdate': wrapCommand(itemLeftUpdate),
@@ -1378,9 +1542,11 @@ const commandMap = {
 };
 
 const listen = async () => {
-  await WebWorkerRpcClient.create({
+  registerCommands(commandMap);
+  const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap
   });
+  set$1(rpc);
 };
 
 const main = async () => {

package/package.json

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