@lvce-editor/status-bar-worker 3.10.0 → 3.12.0

package/dist/statusBarWorkerMain.js

@@ -2,7 +2,7 @@ const toCommandId = key => {
   const dotIndex = key.indexOf('.');
   return key.slice(dotIndex + 1);
 };
-const create$a = () => {
+const create$8 = () => {
   const states = Object.create(null);
   const commandMapRef = {};
   return {
@@ -123,12 +123,12 @@ const {
   getCommandIds,
   getKeys,
   registerCommands,
-  set: set$4,
+  set: set$3,
   wrapCommand,
   wrapGetter
-} = create$a();
+} = create$8();
 
-const create$9 = (uid, uri, x, y, width, height, platform, assetDir) => {
+const create$7 = (uid, uri, x, y, width, height, platform, assetDir) => {
   const state = {
     assetDir,
     errorCount: 0,
@@ -139,7 +139,7 @@ const create$9 = (uid, uri, x, y, width, height, platform, assetDir) => {
     uid,
     warningCount: 0
   };
-  set$4(uid, state, state);
+  set$3(uid, state, state);
 };
 
 const isEqual = (oldState, newState) => {
@@ -974,7 +974,7 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$1(id, errorProperty);
 };
-const create$8 = (message, result) => {
+const create$6 = (message, result) => {
   return {
     id: message.id,
     jsonrpc: Two$1,
@@ -983,7 +983,7 @@ const create$8 = (message, result) => {
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$8(message, resultProperty);
+  return create$6(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
@@ -1077,7 +1077,7 @@ const handleJsonRpcMessage = async (...args) => {
 
 const Two = '2.0';
 
-const create$7 = (method, params) => {
+const create$5 = (method, params) => {
   return {
     jsonrpc: Two,
     method,
@@ -1085,7 +1085,7 @@ const create$7 = (method, params) => {
   };
 };
 
-const create$6 = (id, method, params) => {
+const create$4 = (id, method, params) => {
   const message = {
     id,
     jsonrpc: Two,
@@ -1095,13 +1095,13 @@ const create$6 = (id, method, params) => {
   return message;
 };
 
-let id$1 = 0;
-const create$5 = () => {
-  return ++id$1;
+let id = 0;
+const create$3 = () => {
+  return ++id;
 };
 
 const registerPromise = map => {
-  const id = create$5();
+  const id = create$3();
   const {
     promise,
     resolve
@@ -1118,7 +1118,7 @@ const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer)
     id,
     promise
   } = registerPromise(callbacks);
-  const message = create$6(id, method, params);
+  const message = create$4(id, method, params);
   if (useSendAndTransfer && ipc.sendAndTransfer) {
     ipc.sendAndTransfer(message);
   } else {
@@ -1154,7 +1154,7 @@ const createRpc = ipc => {
      * @deprecated
      */
     send(method, ...params) {
-      const message = create$7(method, params);
+      const message = create$5(method, params);
       ipc.send(message);
     }
   };
@@ -1194,7 +1194,7 @@ const listen$1 = async (module, options) => {
   return ipc;
 };
 
-const create$4 = async ({
+const create$2 = async ({
   commandMap,
   isMessagePortOpen = true,
   messagePort
@@ -1212,65 +1212,6 @@ const create$4 = async ({
   return rpc;
 };
 
-const create$3 = async ({
-  commandMap,
-  isMessagePortOpen,
-  send
-}) => {
-  const {
-    port1,
-    port2
-  } = new MessageChannel();
-  await send(port1);
-  return create$4({
-    commandMap,
-    isMessagePortOpen,
-    messagePort: port2
-  });
-};
-
-const createSharedLazyRpc = factory => {
-  let rpcPromise;
-  const getOrCreate = () => {
-    if (!rpcPromise) {
-      rpcPromise = factory();
-    }
-    return rpcPromise;
-  };
-  return {
-    async dispose() {
-      const rpc = await getOrCreate();
-      await rpc.dispose();
-    },
-    async invoke(method, ...params) {
-      const rpc = await getOrCreate();
-      return rpc.invoke(method, ...params);
-    },
-    async invokeAndTransfer(method, ...params) {
-      const rpc = await getOrCreate();
-      return rpc.invokeAndTransfer(method, ...params);
-    },
-    async send(method, ...params) {
-      const rpc = await getOrCreate();
-      rpc.send(method, ...params);
-    }
-  };
-};
-
-const create$2 = async ({
-  commandMap,
-  isMessagePortOpen,
-  send
-}) => {
-  return createSharedLazyRpc(() => {
-    return create$3({
-      commandMap,
-      isMessagePortOpen,
-      send
-    });
-  });
-};
-
 const create$1 = async ({
   commandMap
 }) => {
@@ -1303,7 +1244,7 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$3 = (id, rpc) => {
+const set$2 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -1336,7 +1277,7 @@ const create = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$3(rpcId, mockRpc);
+      set$2(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove(rpcId);
@@ -1345,7 +1286,7 @@ const create = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$3(rpcId, rpc);
+      set$2(rpcId, rpc);
     }
   };
 };
@@ -1365,17 +1306,11 @@ const ClientX = 'event.clientX';
 const ClientY = 'event.clientY';
 const TargetName = 'event.target.name';
 
-const ExtensionHostWorker = 44;
 const ExtensionManagementWorker = 9006;
 const RendererWorker = 1;
 
 const SetDom2 = 'Viewlet.setDom2';
 
-const {
-  invoke: invoke$2,
-  set: set$2
-} = create(ExtensionHostWorker);
-
 const {
   invoke: invoke$1,
   set: set$1
@@ -1383,7 +1318,6 @@ const {
 
 const {
   invoke,
-  invokeAndTransfer,
   set
 } = create(RendererWorker);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
@@ -1393,10 +1327,6 @@ const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(y);
   await invoke('ContextMenu.show2', uid, menuId, x, y, args);
 };
-const sendMessagePortToExtensionHostWorker$1 = async (port, rpcId = 0) => {
-  const command = 'HandleMessagePort.handleMessagePort2';
-  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, command, rpcId);
-};
 const getPreference = async key => {
   return await invoke('Preferences.get', key);
 };
@@ -1460,52 +1390,6 @@ const handleContextMenu = async (state, button, x, y) => {
   return state;
 };
 
-const OnStatusBarItem = 'onStatusBarItem';
-
-const GetStatusBarItems = 'ExtensionHost.getStatusBarItems2';
-
-const activateByEvent = (event, assetDir, platform) => {
-  return invoke$1('Extensions.activateByEvent', event, assetDir, platform);
-};
-const getStatusBarItems$2 = () => {
-  return invoke$1('Extensions.getStatusBarItems');
-};
-
-const executeProviders = async ({
-  assetDir,
-  combineResults,
-  event,
-  method,
-  noProviderFoundMessage = 'No provider found',
-  noProviderFoundResult,
-  params,
-  platform
-}) => {
-  await activateByEvent(event, assetDir, platform);
-  // @ts-ignore
-  const result = await invoke$2(method, ...params);
-  return result;
-};
-
-const combineResults = results => {
-  return results.flat();
-};
-const getStatusBarItems$1 = async (assetDir, platform) => {
-  const legacyItems = executeProviders({
-    assetDir,
-    combineResults,
-    event: OnStatusBarItem,
-    method: GetStatusBarItems,
-    noProviderFoundMessage: 'No status bar item provider found',
-    noProviderFoundResult: [],
-    params: [],
-    platform
-  });
-  const isolatedItems = getStatusBarItems$2();
-  const results = await Promise.all([legacyItems, isolatedItems]);
-  return combineResults(results);
-};
-
 const getNotificationsStatusBarItem = enabled => {
   if (!enabled) {
     return [];
@@ -1576,6 +1460,11 @@ const getBuiltinStatusBarItems = async (errorCount, warningCount, {
   return [...getNotificationsStatusBarItem(notificationsEnabled), ...getProblemsStatusBarItem(errorCount, warningCount, problemsEnabled)];
 };
 
+const getExtensionStatusBarItems = async (assetDir, platform) => {
+  await invoke$1('Extensions.activateByEvent', 'onStatusBarItem', assetDir, platform);
+  return invoke$1('Extensions.getStatusBarItems');
+};
+
 const toStatusBarItem = uiStatusBarItem => {
   const elements = [];
   if (uiStatusBarItem.icon) {
@@ -1610,23 +1499,23 @@ const toStatusBarItem = uiStatusBarItem => {
   };
 };
 
-const getActualIcon = extensionHostStatusBarItem => {
-  if (extensionHostStatusBarItem.icon === 'branch') {
+const getActualIcon = extensionStatusBarItem => {
+  if (extensionStatusBarItem.icon === 'branch') {
     return 'MaskIconSourceControl';
   }
-  return extensionHostStatusBarItem.icon || '';
+  return extensionStatusBarItem.icon || '';
 };
-const toUiStatusBarItem = extensionHostStatusBarItem => {
+const toUiStatusBarItem = extensionStatusBarItem => {
   return {
-    ariaLabel: extensionHostStatusBarItem.ariaLabel || '',
-    command: extensionHostStatusBarItem.command || '',
-    icon: getActualIcon(extensionHostStatusBarItem),
-    name: extensionHostStatusBarItem.id || extensionHostStatusBarItem.name || '',
-    ...(extensionHostStatusBarItem.spinning === true && {
+    ariaLabel: extensionStatusBarItem.ariaLabel || '',
+    command: extensionStatusBarItem.command || '',
+    icon: getActualIcon(extensionStatusBarItem),
+    name: extensionStatusBarItem.id || extensionStatusBarItem.name || '',
+    ...(extensionStatusBarItem.spinning === true && {
       spinning: true
     }),
-    text: extensionHostStatusBarItem.text || '',
-    tooltip: extensionHostStatusBarItem.tooltip || ''
+    text: extensionStatusBarItem.text || '',
+    tooltip: extensionStatusBarItem.tooltip || ''
   };
 };
 
@@ -1649,8 +1538,7 @@ const getStatusBarItems = async ({
   if (!showItems) {
     return [];
   }
-  await activateByEvent('onStatusBarItem', assetDir, platform);
-  const extensionStatusBarItems = await getStatusBarItems$1(assetDir, platform);
+  const extensionStatusBarItems = await getExtensionStatusBarItems(assetDir, platform);
   const uiStatusBarItems = toUiStatusBarItems(extensionStatusBarItems);
   const extraItems = await getBuiltinStatusBarItems(errorCount, warningCount, {
     notificationsEnabled: builtinNotificationsEnabled,
@@ -1697,7 +1585,7 @@ const handleExtensionManagementChange = async () => {
     if (newState === newerState || oldState === newerState) {
       continue;
     }
-    set$4(uid, oldState, {
+    set$3(uid, oldState, {
       ...newState,
       ...newerState
     });
@@ -1709,29 +1597,14 @@ const commandMap$1 = {
 };
 
 const handleExtensionManagementMessagePort = async port => {
-  const rpc = await create$4({
+  const rpc = await create$2({
     commandMap: commandMap$1,
     messagePort: port
   });
   set$1(rpc);
 };
 
-const id = 7201;
-const sendMessagePortToExtensionHostWorker = async port => {
-  await sendMessagePortToExtensionHostWorker$1(port, id);
-};
-
-const initializeExtensionHostWorker = async () => {
-  const rpc = await create$2({
-    commandMap: {},
-    send: sendMessagePortToExtensionHostWorker
-  });
-  set$2(rpc);
-};
-
-const initialize = async () => {
-  await initializeExtensionHostWorker();
-};
+const initialize = async () => {};
 
 const getIndex = (items, item) => {
   for (let i = 0; i < items.length; i++) {
@@ -1975,7 +1848,7 @@ const render2 = (uid, diffResult) => {
     newState,
     oldState
   } = get$3(uid);
-  set$4(uid, newState, newState);
+  set$3(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
   return commands;
 };
@@ -2010,7 +1883,7 @@ const saveState = state => {
 };
 
 const commandMap = {
-  'StatusBar.create': create$9,
+  'StatusBar.create': create$7,
   'StatusBar.diff2': diff2,
   'StatusBar.getCommandIds': getCommandIds,
   'StatusBar.handleChange': wrapCommand(handleItemsChanged),

package/package.json

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