@lvce-editor/status-bar-worker 2.1.0 → 2.3.0

package/dist/statusBarWorkerMain.js

@@ -463,6 +463,27 @@ const IpcParentWithMessagePort$1 = {
   wrap: wrap$5
 };
 
+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$3 = id => {
@@ -487,12 +508,12 @@ const getErrorConstructor = (message, type) => {
     switch (type) {
       case DomException:
         return DOMException;
-      case TypeError$1:
-        return TypeError;
-      case SyntaxError$1:
-        return SyntaxError;
       case ReferenceError$1:
         return ReferenceError;
+      case SyntaxError$1:
+        return SyntaxError;
+      case TypeError$1:
+        return TypeError;
       default:
         return Error;
     }
@@ -648,27 +669,27 @@ const getErrorProperty = (error, prettyError) => {
   if (error && error.code === E_COMMAND_NOT_FOUND) {
     return {
       code: MethodNotFound,
-      message: error.message,
-      data: error.stack
+      data: error.stack,
+      message: error.message
     };
   }
   return {
     code: Custom,
-    message: prettyError.message,
     data: {
-      stack: getStack(prettyError),
-      codeFrame: prettyError.codeFrame,
-      type: getErrorType(prettyError),
       code: prettyError.code,
-      name: prettyError.name
-    }
+      codeFrame: prettyError.codeFrame,
+      name: prettyError.name,
+      stack: getStack(prettyError),
+      type: getErrorType(prettyError)
+    },
+    message: prettyError.message
   };
 };
 const create$1$1 = (id, error) => {
   return {
-    jsonrpc: Two$1,
+    error,
     id,
-    error
+    jsonrpc: Two$1
   };
 };
 const getErrorResponse = (id, error, preparePrettyError, logError) => {
@@ -677,27 +698,27 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$1(id, errorProperty);
 };
-const create$4 = (message, result) => {
+const create$9 = (message, result) => {
   return {
-    jsonrpc: Two$1,
     id: message.id,
+    jsonrpc: Two$1,
     result: result ?? null
   };
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$4(message, resultProperty);
+  return create$9(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
-    jsonrpc: Two$1,
-    id,
     error: {
       code: Custom,
+      data: error,
       // @ts-ignore
-      message: error.message,
-      data: error
-    }
+      message: error.message
+    },
+    id,
+    jsonrpc: Two$1
   };
 };
 const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
@@ -727,35 +748,35 @@ const normalizeParams = args => {
   if (args.length === 1) {
     const options = args[0];
     return {
+      execute: options.execute,
       ipc: options.ipc,
+      logError: options.logError || defaultLogError,
       message: options.message,
-      execute: options.execute,
-      resolve: options.resolve || defaultResolve,
       preparePrettyError: options.preparePrettyError || defaultPreparePrettyError,
-      logError: options.logError || defaultLogError,
-      requiresSocket: options.requiresSocket || defaultRequiresSocket
+      requiresSocket: options.requiresSocket || defaultRequiresSocket,
+      resolve: options.resolve || defaultResolve
     };
   }
   return {
+    execute: args[2],
     ipc: args[0],
+    logError: args[5],
     message: args[1],
-    execute: args[2],
-    resolve: args[3],
     preparePrettyError: args[4],
-    logError: args[5],
-    requiresSocket: args[6]
+    requiresSocket: args[6],
+    resolve: args[3]
   };
 };
 const handleJsonRpcMessage = async (...args) => {
   const options = normalizeParams(args);
   const {
-    message,
-    ipc,
     execute,
-    resolve,
-    preparePrettyError,
+    ipc,
     logError,
-    requiresSocket
+    message,
+    preparePrettyError,
+    requiresSocket,
+    resolve
   } = options;
   if ('id' in message) {
     if ('method' in message) {
@@ -778,36 +799,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$8 = (method, params) => {
   return {
     jsonrpc: Two,
     method,
     params
   };
 };
-const create$s = (id, method, params) => {
+
+const create$7 = (id, method, params) => {
   const message = {
     id,
     jsonrpc: Two,
@@ -816,15 +818,14 @@ const create$s = (id, method, params) => {
   };
   return message;
 };
+
 let id$1 = 0;
-const create$r = () => {
+const create$6 = () => {
   return ++id$1;
 };
 
-/* eslint-disable n/no-unsupported-features/es-syntax */
-
 const registerPromise = map => {
-  const id = create$r();
+  const id = create$6();
   const {
     promise,
     resolve
@@ -836,13 +837,12 @@ const registerPromise = map => {
   };
 };
 
-// @ts-ignore
 const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer) => {
   const {
     id,
     promise
   } = registerPromise(callbacks);
-  const message = create$s(id, method, params);
+  const message = create$7(id, method, params);
   if (useSendAndTransfer && ipc.sendAndTransfer) {
     ipc.sendAndTransfer(message);
   } else {
@@ -878,12 +878,13 @@ const createRpc = ipc => {
      * @deprecated
      */
     send(method, ...params) {
-      const message = create$t(method, params);
+      const message = create$8(method, params);
       ipc.send(message);
     }
   };
   return rpc;
 };
+
 const requiresSocket = () => {
   return false;
 };
@@ -898,6 +899,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);
@@ -906,6 +908,7 @@ const handleIpc = ipc => {
     ipc.on('message', handleMessage);
   }
 };
+
 const listen$1 = async (module, options) => {
   const rawIpc = await module.listen(options);
   if (module.signal) {
@@ -914,6 +917,7 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
+
 const create$5 = async ({
   commandMap,
   isMessagePortOpen = true,
@@ -931,7 +935,8 @@ const create$5 = async ({
   messagePort.start();
   return rpc;
 };
-const create$3 = async ({
+
+const create$4 = async ({
   commandMap,
   isMessagePortOpen,
   send
@@ -947,11 +952,8 @@ const create$3 = async ({
     messagePort: port2
   });
 };
-const TransferMessagePortRpcParent = {
-  __proto__: null,
-  create: create$3
-};
-const create$2$1 = async ({
+
+const create$3 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -961,10 +963,7 @@ const create$2$1 = async ({
   const rpc = createRpc(ipc);
   return rpc;
 };
-const WebWorkerRpcClient = {
-  __proto__: null,
-  create: create$2$1
-};
+
 const createMockRpc = ({
   commandMap
 }) => {
@@ -985,14 +984,6 @@ const createMockRpc = ({
   return mockRpc;
 };
 
-const TargetName = 'event.target.name';
-
-const ExtensionHostWorker = 44;
-const RendererWorker = 1;
-
-const SetDom2 = 'Viewlet.setDom2';
-const SetPatches = 'Viewlet.setPatches';
-
 const rpcs = Object.create(null);
 const set$3 = (id, rpc) => {
   rpcs[id] = rpc;
@@ -1041,6 +1032,25 @@ const create$2 = rpcId => {
   };
 };
 
+const Button$1 = 'button';
+const Status = 'status';
+
+const MaskIcon = 'MaskIcon';
+
+const Button = 1;
+const Div = 4;
+const Span = 8;
+const Text = 12;
+const Reference = 100;
+
+const TargetName = 'event.target.name';
+
+const ExtensionHostWorker = 44;
+const RendererWorker = 1;
+
+const SetDom2 = 'Viewlet.setDom2';
+const SetPatches = 'Viewlet.setPatches';
+
 const {
   invoke: invoke$1,
   set: set$2
@@ -1102,7 +1112,7 @@ const create$1 = () => {
     },
     getKeys() {
       return Object.keys(states).map(key => {
-        return Number.parseInt(key);
+        return Number.parseFloat(key);
       });
     },
     registerCommands(commandMap) {
@@ -1144,6 +1154,37 @@ const create$1 = () => {
         return fn(newState, ...args);
       };
       return wrapped;
+    },
+    wrapLoadContent(fn) {
+      const wrapped = async (uid, ...args) => {
+        const {
+          newState,
+          oldState
+        } = states[uid];
+        const result = await fn(newState, ...args);
+        const {
+          error,
+          state
+        } = result;
+        if (oldState === state || newState === state) {
+          return {
+            error
+          };
+        }
+        const latestOld = states[uid];
+        const latestNew = {
+          ...latestOld.newState,
+          ...state
+        };
+        states[uid] = {
+          newState: latestNew,
+          oldState: latestOld.oldState
+        };
+        return {
+          error
+        };
+      };
+      return wrapped;
     }
   };
 };
@@ -1265,73 +1306,6 @@ const handleContextMenu = async state => {
   return state;
 };
 
-const id = 7201;
-const sendMessagePortToExtensionHostWorker = async port => {
-  await sendMessagePortToExtensionHostWorker$1(port, id);
-};
-
-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 () => {
-  const rpc = await createExtensionHostRpc();
-  set$2(rpc);
-};
-
-const getIndex = (items, item) => {
-  for (let i = 0; i < items.length; i++) {
-    if (items[i].name === item.name) {
-      return i;
-    }
-  }
-  return -1;
-};
-
-const updateArray = (items, newItem) => {
-  const index = getIndex(items, newItem);
-  const before = items.slice(0, index);
-  const after = items.slice(index + 1);
-  return [...before, newItem, ...after];
-};
-
-const itemLeftUpdate = (state, newItem) => {
-  return {
-    ...state,
-    statusBarItemsLeft: updateArray([...state.statusBarItemsLeft], newItem)
-  };
-};
-
-const itemRightCreate = (state, newItem) => {
-  const {
-    statusBarItemsRight
-  } = state;
-  const newStatusBarItemsRight = [...statusBarItemsRight, newItem];
-  return {
-    ...state,
-    statusBarItemsRight: newStatusBarItemsRight
-  };
-};
-
-const itemRightUpdate = (state, newItem) => {
-  const {
-    statusBarItemsRight
-  } = state;
-  const newStatusBarItemsRight = updateArray([...statusBarItemsRight], newItem);
-  return {
-    ...state,
-    statusBarItemsRight: newStatusBarItemsRight
-  };
-};
-
 const OnStatusBarItem = 'onStatusBarItem';
 
 const GetStatusBarItems = 'ExtensionHost.getStatusBarItems2';
@@ -1373,6 +1347,23 @@ const getStatusBarItems$1 = (assetDir, platform) => {
   });
 };
 
+const getNotificationsStatusBarItem = enabled => {
+  if (!enabled) {
+    return [];
+  }
+  return [{
+    ariaLabel: 'Notifications',
+    command: '',
+    // TODO should show notifications center
+    elements: [{
+      type: 'text',
+      value: 'Notifications'
+    }],
+    name: Notifications,
+    tooltip: 'Notifications'
+  }];
+};
+
 const ProblemsErrorIcon = 'ProblemsErrorIcon';
 const ProblemsWarningIcon = 'ProblemsWarningIcon';
 const StatusBarItem = 'StatusBarItem';
@@ -1392,18 +1383,12 @@ const getProblemsAriaLabel = (errorCount, warningCount) => {
   }
   return parts.join(', ');
 };
-const getBuiltinStatusBarItems = async (errorCount, warningCount) => {
-  const extraItems = [{
-    ariaLabel: 'Notifications',
-    command: '',
-    // TODO should show notifications center
-    elements: [{
-      type: 'text',
-      value: 'Notifications'
-    }],
-    name: Notifications,
-    tooltip: 'Notifications'
-  }, {
+
+const getProblemsStatusBarItem = (errorCount, warningCount, enabled) => {
+  if (!enabled) {
+    return [];
+  }
+  return [{
     ariaLabel: getProblemsAriaLabel(errorCount, warningCount),
     command: '',
     // TODO should show problems view
@@ -1423,7 +1408,13 @@ const getBuiltinStatusBarItems = async (errorCount, warningCount) => {
     name: Problems,
     tooltip: 'Problems'
   }];
-  return extraItems;
+};
+
+const getBuiltinStatusBarItems = async (errorCount, warningCount, {
+  notificationsEnabled = true,
+  problemsEnabled = true
+} = {}) => {
+  return [...getNotificationsStatusBarItem(notificationsEnabled), ...getProblemsStatusBarItem(errorCount, warningCount, problemsEnabled)];
 };
 
 const toStatusBarItem = uiStatusBarItem => {
@@ -1479,24 +1470,134 @@ const toUiStatusBarItems = statusBarItems => {
   return statusBarItems.map(toUiStatusBarItem);
 };
 
-const getStatusBarItems = async (showItems, assetDir, platform, errorCount, warningCount) => {
+const getStatusBarItems = async ({
+  assetDir,
+  builtinNotificationsEnabled = true,
+  builtinProblemsEnabled = true,
+  errorCount,
+  platform,
+  showItems,
+  warningCount
+}) => {
   if (!showItems) {
     return [];
   }
+  await activateByEvent('onStatusBarItem', assetDir, platform);
   await activateByEvent('onSourceControl', assetDir, platform);
   const extensionStatusBarItems = await getStatusBarItems$1(assetDir, platform);
   const uiStatusBarItems = toUiStatusBarItems(extensionStatusBarItems);
-  const extraItems = await getBuiltinStatusBarItems(errorCount, warningCount);
+  const extraItems = await getBuiltinStatusBarItems(errorCount, warningCount, {
+    notificationsEnabled: builtinNotificationsEnabled,
+    problemsEnabled: builtinProblemsEnabled
+  });
   return [...uiStatusBarItems.map(toStatusBarItem), ...extraItems];
 };
 
+const handleExtensionsChanged = async state => {
+  const {
+    assetDir,
+    errorCount,
+    platform,
+    warningCount
+  } = state;
+  // TODO requery status bar items
+  const statusBarItems = await getStatusBarItems({
+    assetDir,
+    builtinNotificationsEnabled: false,
+    builtinProblemsEnabled: false,
+    errorCount,
+    platform,
+    showItems: true,
+    warningCount
+  });
+  return {
+    ...state,
+    statusBarItemsLeft: [...statusBarItems]
+  };
+};
+
+const id = 7201;
+const sendMessagePortToExtensionHostWorker = async port => {
+  await sendMessagePortToExtensionHostWorker$1(port, id);
+};
+
+const createExtensionHostRpc = async () => {
+  try {
+    const rpc = await create$4({
+      commandMap: {},
+      send: sendMessagePortToExtensionHostWorker
+    });
+    return rpc;
+  } catch (error) {
+    throw new VError(error, `Failed to create extension host rpc`);
+  }
+};
+
+const initialize = async () => {
+  const rpc = await createExtensionHostRpc();
+  set$2(rpc);
+};
+
+const getIndex = (items, item) => {
+  for (let i = 0; i < items.length; i++) {
+    if (items[i].name === item.name) {
+      return i;
+    }
+  }
+  return -1;
+};
+
+const updateArray = (items, newItem) => {
+  const index = getIndex(items, newItem);
+  const before = items.slice(0, index);
+  const after = items.slice(index + 1);
+  return [...before, newItem, ...after];
+};
+
+const itemLeftUpdate = (state, newItem) => {
+  return {
+    ...state,
+    statusBarItemsLeft: updateArray([...state.statusBarItemsLeft], newItem)
+  };
+};
+
+const itemRightCreate = (state, newItem) => {
+  const {
+    statusBarItemsRight
+  } = state;
+  const newStatusBarItemsRight = [...statusBarItemsRight, newItem];
+  return {
+    ...state,
+    statusBarItemsRight: newStatusBarItemsRight
+  };
+};
+
+const itemRightUpdate = (state, newItem) => {
+  const {
+    statusBarItemsRight
+  } = state;
+  const newStatusBarItemsRight = updateArray([...statusBarItemsRight], newItem);
+  return {
+    ...state,
+    statusBarItemsRight: newStatusBarItemsRight
+  };
+};
+
 const get = async key => {
   return getPreference(key);
 };
 
-const itemsVisible = async () => {
-  const statusBarItemsPreference = (await get('statusBar.itemsVisible')) ?? true;
-  return statusBarItemsPreference;
+const getBooleanPreference = async key => {
+  const value = await get(key);
+  return value ?? true;
+};
+const loadStatusBarPreferences = async () => {
+  const [itemsVisible, builtinNotificationsEnabled, builtinProblemsEnabled] = await Promise.all([getBooleanPreference('statusBar.itemsVisible'), getBooleanPreference('statusBar.builtinNotificationsEnabled'), getBooleanPreference('statusBar.builtinProblemsEnabled')]);
+  return {
+    builtinNotificationsEnabled,
+    builtinProblemsEnabled,
+    itemsVisible
+  };
 };
 
 const loadContent = async state => {
@@ -1506,8 +1607,16 @@ const loadContent = async state => {
     platform,
     warningCount
   } = state;
-  const statusBarItemsPreference = await itemsVisible();
-  const statusBarItems = await getStatusBarItems(statusBarItemsPreference, assetDir, platform, errorCount, warningCount);
+  const statusBarPreferences = await loadStatusBarPreferences();
+  const statusBarItems = await getStatusBarItems({
+    assetDir,
+    builtinNotificationsEnabled: statusBarPreferences.builtinNotificationsEnabled,
+    builtinProblemsEnabled: statusBarPreferences.builtinProblemsEnabled,
+    errorCount,
+    platform,
+    showItems: statusBarPreferences.itemsVisible,
+    warningCount
+  });
   return {
     ...state,
     errorCount: 0,
@@ -1518,16 +1627,6 @@ const loadContent = async state => {
   };
 };
 
-const Button$1 = 'button';
-const Status = 'status';
-
-const MaskIcon = 'MaskIcon';
-
-const Button = 1;
-const Div = 4;
-const Span = 8;
-const Text = 12;
-
 const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
 };
@@ -1549,6 +1648,7 @@ const NavigateChild = 7;
 const NavigateParent = 8;
 const RemoveChild = 9;
 const NavigateSibling = 10;
+const SetReferenceNodeUid = 11;
 
 const isKey = key => {
   return key !== 'type' && key !== 'childCount';
@@ -1616,6 +1716,16 @@ const compareNodes = (oldNode, newNode) => {
   if (oldNode.type !== newNode.type) {
     return null;
   }
+  // Handle reference nodes - special handling for uid changes
+  if (oldNode.type === Reference) {
+    if (oldNode.uid !== newNode.uid) {
+      patches.push({
+        type: SetReferenceNodeUid,
+        uid: newNode.uid
+      });
+    }
+    return patches;
+  }
   // Handle text nodes
   if (oldNode.type === Text && newNode.type === Text) {
     if (oldNode.text !== newNode.text) {
@@ -1751,7 +1861,6 @@ const diffChildren = (oldChildren, newChildren, patches) => {
     patches.push({
       type: NavigateParent
     });
-    currentChildIndex = -1;
   }
   // Add remove patches in reverse order (highest index first)
   // This ensures indices remain valid as we remove
@@ -1995,6 +2104,7 @@ const commandMap = {
   'StatusBar.getCommandIds': getCommandIds,
   'StatusBar.handleClick': wrapCommand(handleClick),
   'StatusBar.handleContextMenu': wrapCommand(handleContextMenu),
+  'StatusBar.handleExtensionsChanged': wrapCommand(handleExtensionsChanged),
   'StatusBar.initialize': initialize,
   'StatusBar.itemLeftUpdate': wrapCommand(itemLeftUpdate),
   'StatusBar.itemRightCreate': wrapCommand(itemRightCreate),
@@ -2009,7 +2119,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/status-bar-worker",
-  "version": "2.1.0",
+  "version": "2.3.0",
   "description": "Status Bar Worker",
   "repository": {
     "type": "git",