@lvce-editor/status-bar-worker 3.28.0 → 3.30.0

package/dist/statusBarWorkerMain.js

@@ -265,11 +265,10 @@ const {
   getCommandIds,
   getKeys,
   registerCommands,
-  set: set$7,
+  set: set$6,
   wrapCommand,
   wrapGetter,
-  wrapSerialCommand
-} = create$8();
+  wrapSerialAsyncCommand} = create$8();
 
 const create$7 = (uid, uri, x, y, width, height, platform, assetDir) => {
   const state = {
@@ -282,7 +281,7 @@ const create$7 = (uid, uri, x, y, width, height, platform, assetDir) => {
     uid,
     warningCount: 0
   };
-  set$7(uid, state, state);
+  set$6(uid, state, state);
 };
 
 const isEqual = (oldState, newState) => {
@@ -1289,6 +1288,9 @@ const restoreExistingError = (error, currentStack) => {
 };
 const restoreMethodNotFoundError = (error, currentStack) => {
   const restoredError = new JsonRpcError(error.message);
+  Object.assign(restoredError, {
+    code: error.code
+  });
   const parentStack = getParentStack(error);
   setStack(restoredError, `${parentStack}${NewLine}${currentStack}`);
   return restoredError;
@@ -1308,9 +1310,13 @@ const applyDataProperties = (restoredError, error) => {
     // @ts-ignore
     restoredError.codeFrame = error.data.codeFrame;
   }
-  if (error.data.code) {
+  if (typeof error.data.code === 'string' || typeof error.data.code === 'number') {
     // @ts-ignore
-    restoredError.code = error.data.code;
+    Object.defineProperty(restoredError, 'code', {
+      configurable: true,
+      value: error.data.code,
+      writable: true
+    });
   }
   if (error.data.type) {
     // @ts-ignore
@@ -1332,6 +1338,13 @@ const applyDirectProperties = (restoredError, error) => {
 };
 const restoreMessageError = (error, _currentStack) => {
   const restoredError = constructError(error.message, error.type, error.name);
+  if (typeof error.code === 'string' || typeof error.code === 'number') {
+    Object.defineProperty(restoredError, 'code', {
+      configurable: true,
+      value: error.code,
+      writable: true
+    });
+  }
   if (error.data) {
     applyDataProperties(restoredError, error);
   } else {
@@ -1410,7 +1423,7 @@ const getErrorProperty = (error, prettyError) => {
   return {
     code: Custom,
     data: {
-      code: prettyError.code,
+      code: prettyError.code ?? error?.code,
       codeFrame: prettyError.codeFrame,
       name: prettyError.name,
       stack: getStack(prettyError),
@@ -1447,7 +1460,12 @@ const getErrorResponseSimple = (id, error) => {
   return {
     error: {
       code: Custom,
-      data: error,
+      data: error instanceof Error ? {
+        ...error,
+        code: 'code' in error ? error.code : undefined,
+        stack: error.stack,
+        type: error.name
+      } : error,
       // @ts-ignore
       message: error.message
     },
@@ -1702,7 +1720,7 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$6 = (id, rpc) => {
+const set$5 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$3 = id => {
@@ -1735,7 +1753,7 @@ const create = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$6(rpcId, mockRpc);
+      set$5(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove(rpcId);
@@ -1744,24 +1762,24 @@ const create = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$6(rpcId, rpc);
+      set$5(rpcId, rpc);
     }
   };
 };
 
 const {
   invoke: invoke$3,
-  set: set$5
+  set: set$4
 } = create(ExtensionManagementWorker);
 
 const {
   invoke: invoke$2,
-  set: set$4
+  set: set$3
 } = create(RendererProcess);
 
 const {
   invoke: invoke$1,
-  set: set$3
+  set: set$2
 } = create(RendererWorker);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(uid);
@@ -1867,6 +1885,27 @@ const handleContextMenu = async (state, button, x, y) => {
   return state;
 };
 
+let editorStatus;
+const get$2 = () => editorStatus;
+const applyUpdate = update => {
+  if (update === undefined) {
+    editorStatus = undefined;
+    return editorStatus;
+  }
+  // Older editor workers omit these fields; retain their original display defaults.
+  const next = {
+    endOfLine: 'lf',
+    insertSpaces: true,
+    ...editorStatus,
+    ...update
+  };
+  if (typeof next.column !== 'number' || typeof next.encoding !== 'string' || typeof next.endOfLine !== 'string' || typeof next.insertSpaces !== 'boolean' || typeof next.languageId !== 'string' || typeof next.line !== 'number' || typeof next.tabSize !== 'number') {
+    throw new TypeError('The first editor status update must contain a complete status');
+  }
+  editorStatus = next;
+  return editorStatus;
+};
+
 const textItem = (name, text, ariaLabel, tooltip) => ({
   ariaLabel,
   command: '',
@@ -1896,6 +1935,156 @@ const getEditorStatusBarItems = status => {
   return [textItem(EditorPosition, `Ln ${line}, Col ${column}`, `Line ${line}, Column ${column}`, 'Go to Line/Column'), textItem(EditorIndentation, indentationLabel, indentationLabel, 'Select Indentation'), textItem(EditorEncoding, encodingLabel, `Encoding: ${encodingLabel}`, 'Select Encoding'), textItem(EditorEndOfLine, endOfLineLabel, `End of Line: ${endOfLineLabel}`, 'Select End of Line Sequence'), textItem(EditorLanguage, languageId, `Language: ${languageId}`, 'Select Language Mode')];
 };
 
+const dependencies = {
+  [EditorEncoding]: ['encoding'],
+  [EditorEndOfLine]: ['endOfLine'],
+  [EditorIndentation]: ['insertSpaces', 'tabSize'],
+  [EditorLanguage]: ['languageId'],
+  [EditorPosition]: ['line', 'column']
+};
+const handleEditorStatusChanged = (state, editorStatus, previous = state) => {
+  const {
+    statusBarItemsRight
+  } = state;
+  const oldStatus = previous.editorStatus;
+  if (!editorStatus) {
+    if (!oldStatus) {
+      return state;
+    }
+    return {
+      ...state,
+      editorStatus,
+      statusBarItemsRight: statusBarItemsRight.filter(item => !isEditorStatus(item.name))
+    };
+  }
+  const replacements = new Map();
+  for (const item of getEditorStatusBarItems(editorStatus)) {
+    if (!oldStatus || dependencies[item.name].some(key => oldStatus[key] !== editorStatus[key])) {
+      replacements.set(item.name, item);
+    }
+  }
+  if (replacements.size === 0) {
+    return state;
+  }
+  const updatedItems = statusBarItemsRight.map(item => {
+    const replacement = replacements.get(item.name);
+    replacements.delete(item.name);
+    return replacement || item;
+  });
+  const notificationIndex = updatedItems.findIndex(item => item.name === Notifications);
+  updatedItems.splice(notificationIndex === -1 ? updatedItems.length : notificationIndex, 0, ...replacements.values());
+  return {
+    ...state,
+    editorStatus,
+    statusBarItemsRight: updatedItems
+  };
+};
+
+const renderIncremental = (oldState, newState) => {
+  return renderItems(oldState, newState);
+};
+
+const getRenderer = diffType => {
+  switch (diffType) {
+    case RenderIncremental:
+      return renderIncremental;
+    case RenderItems:
+      return renderItems;
+    default:
+      throw new Error('unknown renderer');
+  }
+};
+
+const applyRender = (oldState, newState, diffResult) => {
+  const commands = [];
+  for (const item of diffResult) {
+    const fn = getRenderer(item);
+    const result = fn(oldState, newState);
+    if (result.length > 0) {
+      commands.push(result);
+    }
+  }
+  return commands;
+};
+
+const state = {
+  connected: false
+};
+const isConnected = () => {
+  const {
+    connected
+  } = state;
+  return connected;
+};
+const invoke = (method, ...params) => {
+  return invoke$2(method, ...params);
+};
+const set$1 = rpc => {
+  set$3(rpc);
+  state.connected = true;
+};
+
+const renderDirect = async (uid, commands) => {
+  const rendererWorkerCommands = commands.filter(command => command[0] === SetFocusContext);
+  const rendererProcessCommands = commands.filter(command => command[0] !== SetFocusContext);
+  const transactionId = await invoke('Viewlet.queueCommands', uid, rendererProcessCommands);
+  return [...rendererWorkerCommands, ['Viewlet.commitPending', uid, transactionId]];
+};
+const render2 = (uid, diffResult) => {
+  const {
+    newState,
+    oldState
+  } = get$5(uid);
+  set$6(uid, newState, newState);
+  const commands = applyRender(oldState, newState, diffResult);
+  if (!isConnected()) {
+    return commands;
+  }
+  return renderDirect(uid, commands);
+};
+
+const renderOutOfBand = async uid => {
+  if (!isConnected()) {
+    return;
+  }
+  const {
+    newState
+  } = get$5(uid);
+  if (newState.initial) {
+    return;
+  }
+  const diffResult = diff2(uid);
+  if (diffResult.length === 0) {
+    return;
+  }
+  const commands = await render2(uid, diffResult);
+  if (commands.length === 0) {
+    return;
+  }
+  await invoke('Viewlet.sendMultiple', commands);
+};
+
+const handleEditorStatusChangedAll = async update => {
+  const previous = {
+    editorStatus: get$2()
+  };
+  const editorStatus = applyUpdate(update);
+  const changedUids = [];
+  for (const uid of getKeys()) {
+    const {
+      newState,
+      oldState
+    } = get$5(uid);
+    const newerState = handleEditorStatusChanged(newState, editorStatus, previous);
+    if (newState === newerState || oldState === newerState) {
+      continue;
+    }
+    set$6(uid, oldState, newerState);
+    changedUids.push(uid);
+  }
+  await Promise.all(changedUids.map(renderOutOfBand));
+};
+
 const getAriaLabel = count => {
   if (count === 0) {
     return 'No Notifications';
@@ -2105,90 +2294,6 @@ const handleItemsChanged = async state => {
   return handleExtensionsChanged(state);
 };
 
-const renderIncremental = (oldState, newState) => {
-  return renderItems(oldState, newState);
-};
-
-const getRenderer = diffType => {
-  switch (diffType) {
-    case RenderIncremental:
-      return renderIncremental;
-    case RenderItems:
-      return renderItems;
-    default:
-      throw new Error('unknown renderer');
-  }
-};
-
-const applyRender = (oldState, newState, diffResult) => {
-  const commands = [];
-  for (const item of diffResult) {
-    const fn = getRenderer(item);
-    const result = fn(oldState, newState);
-    if (result.length > 0) {
-      commands.push(result);
-    }
-  }
-  return commands;
-};
-
-const state = {
-  connected: false
-};
-const isConnected = () => {
-  const {
-    connected
-  } = state;
-  return connected;
-};
-const invoke = (method, ...params) => {
-  return invoke$2(method, ...params);
-};
-const set$2 = rpc => {
-  set$4(rpc);
-  state.connected = true;
-};
-
-const renderDirect = async (uid, commands) => {
-  const rendererWorkerCommands = commands.filter(command => command[0] === SetFocusContext);
-  const rendererProcessCommands = commands.filter(command => command[0] !== SetFocusContext);
-  const transactionId = await invoke('Viewlet.queueCommands', uid, rendererProcessCommands);
-  return [...rendererWorkerCommands, ['Viewlet.commitPending', uid, transactionId]];
-};
-const render2 = (uid, diffResult) => {
-  const {
-    newState,
-    oldState
-  } = get$5(uid);
-  set$7(uid, newState, newState);
-  const commands = applyRender(oldState, newState, diffResult);
-  if (!isConnected()) {
-    return commands;
-  }
-  return renderDirect(uid, commands);
-};
-
-const renderOutOfBand = async uid => {
-  if (!isConnected()) {
-    return;
-  }
-  const {
-    newState
-  } = get$5(uid);
-  if (newState.initial) {
-    return;
-  }
-  const diffResult = diff2(uid);
-  if (diffResult.length === 0) {
-    return;
-  }
-  const commands = await render2(uid, diffResult);
-  if (commands.length === 0) {
-    return;
-  }
-  await invoke('Viewlet.sendMultiple', commands);
-};
-
 const handleExtensionManagementChange = async () => {
   for (const uid of getKeys()) {
     const {
@@ -2199,7 +2304,7 @@ const handleExtensionManagementChange = async () => {
     if (newState === newerState || oldState === newerState) {
       continue;
     }
-    set$7(uid, oldState, {
+    set$6(uid, oldState, {
       ...newState,
       ...newerState
     });
@@ -2226,15 +2331,15 @@ const handleNotificationCountChanged = (state, count) => {
 };
 
 let latestCount;
-const get$2 = () => {
+const get$1 = () => {
   return latestCount;
 };
-const set$1 = count => {
+const set = count => {
   latestCount = count;
 };
 
 const handleNotificationCountChangedAll = async count => {
-  set$1(count);
+  set(count);
   for (const uid of getKeys()) {
     const {
       newState,
@@ -2244,7 +2349,7 @@ const handleNotificationCountChangedAll = async count => {
     if (newState === newerState || oldState === newerState) {
       continue;
     }
-    set$7(uid, oldState, newerState);
+    set$6(uid, oldState, newerState);
     await renderOutOfBand(uid);
   }
 };
@@ -2259,61 +2364,10 @@ const handleExtensionManagementMessagePort = async port => {
     commandMap: commandMap$1,
     messagePort: port
   });
-  set$5(rpc);
-};
-
-let editorStatus;
-const get$1 = () => editorStatus;
-const set = value => {
-  editorStatus = value;
-};
-
-const equals = (oldStatus, newStatus) => {
-  if (!oldStatus || !newStatus) {
-    return oldStatus === newStatus;
-  }
-  return oldStatus.column === newStatus.column && oldStatus.endOfLine === newStatus.endOfLine && oldStatus.encoding === newStatus.encoding && oldStatus.insertSpaces === newStatus.insertSpaces && oldStatus.languageId === newStatus.languageId && oldStatus.line === newStatus.line && oldStatus.tabSize === newStatus.tabSize;
-};
-const updateItems = (items, status) => {
-  const remainingItems = items.filter(item => !isEditorStatus(item.name));
-  const editorItems = getEditorStatusBarItems(status);
-  if (editorItems.length === 0) {
-    return remainingItems;
-  }
-  const notificationIndex = remainingItems.findIndex(item => item.name === Notifications);
-  const insertIndex = notificationIndex === -1 ? remainingItems.length : notificationIndex;
-  return [...remainingItems.slice(0, insertIndex), ...editorItems, ...remainingItems.slice(insertIndex)];
-};
-const handleEditorStatusChanged = (state, editorStatus) => {
-  const {
-    editorStatus: oldEditorStatus,
-    statusBarItemsRight
-  } = state;
-  if (equals(oldEditorStatus, editorStatus)) {
-    return state;
-  }
-  return {
-    ...state,
-    editorStatus,
-    statusBarItemsRight: updateItems(statusBarItemsRight, editorStatus)
-  };
+  set$4(rpc);
 };
 
-const handleEditorStatusChangedAll = async editorStatus => {
-  set(editorStatus);
-  for (const uid of getKeys()) {
-    const {
-      newState,
-      oldState
-    } = get$5(uid);
-    const newerState = handleEditorStatusChanged(newState, editorStatus);
-    if (newState === newerState || oldState === newerState) {
-      continue;
-    }
-    set$7(uid, oldState, newerState);
-    await renderOutOfBand(uid);
-  }
-};
+const supportsEditorStatusDeltas = () => true;
 
 const handleMessagePort = async (port, viewletCommandMap, setAsRendererProcess = true) => {
   const executeViewletCommand = async (uid, command, ...args) => {
@@ -2327,12 +2381,13 @@ const handleMessagePort = async (port, viewletCommandMap, setAsRendererProcess =
   const rpc = await create$2({
     commandMap: {
       'StatusBar.handleEditorStatusChanged': handleEditorStatusChangedAll,
+      'StatusBar.supportsEditorStatusDeltas': supportsEditorStatusDeltas,
       'Viewlet.executeViewletCommand': executeViewletCommand
     },
     messagePort: port
   });
   if (setAsRendererProcess) {
-    set$2(rpc);
+    set$1(rpc);
   }
 };
 
@@ -2437,7 +2492,7 @@ const loadContent = async state => {
     platform,
     warningCount
   } = state;
-  const editorStatus = get$1();
+  const editorStatus = get$2();
   const {
     builtinNotificationsEnabled,
     builtinProblemsEnabled,
@@ -2462,13 +2517,34 @@ const loadContent = async state => {
     statusBarItemsRight: statusBarItems.filter(item => isRight(item.name)),
     warningCount: 0
   };
-  const latestNotificationCount = get$2();
+  const currentState = itemsVisible ? handleEditorStatusChanged(loadedState, get$2()) : loadedState;
+  const latestNotificationCount = get$1();
   if (latestNotificationCount === undefined) {
-    return loadedState;
+    return currentState;
   }
-  return handleNotificationCountChanged(loadedState, latestNotificationCount);
+  return handleNotificationCountChanged(currentState, latestNotificationCount);
 };
 
+const refreshExtensionItems = wrapSerialAsyncCommand(async context => {
+  const state = context.getState();
+  const {
+    statusBarItemsLeft
+  } = state;
+  const updated = await handleItemsChanged(state);
+  if (updated === state) {
+    return;
+  }
+  await context.updateState(current => {
+    if (current.statusBarItemsLeft !== statusBarItemsLeft) {
+      return current;
+    }
+    return {
+      ...current,
+      statusBarItemsLeft: updated.statusBarItemsLeft
+    };
+  });
+});
+
 const renderEventListeners = () => {
   return [{
     name: HandleContextMenu,
@@ -2517,7 +2593,6 @@ const setComponentState = wrapCommand(applyComponentState);
 
 const handleDirectMessagePort = (port, setAsRendererProcess = true) => handleMessagePort(port, commandMap, setAsRendererProcess);
 const activateOnWorkspaceChange = wrapCommand(handleWorkspaceChange);
-const refreshExtensionItems = wrapSerialCommand(handleItemsChanged);
 const handleWorkspaceChangeAndRefresh = async (uid, workspacePath) => {
   await activateOnWorkspaceChange(uid, workspacePath);
   await refreshExtensionItems(uid);
@@ -2528,12 +2603,13 @@ const commandMap = {
   'StatusBar.getCommandIds': getCommandIds,
   'StatusBar.getComponentDom': getComponentDom,
   'StatusBar.getComponentState': getComponentState,
-  'StatusBar.handleChange': wrapSerialCommand(handleItemsChanged),
+  'StatusBar.handleChange': refreshExtensionItems,
   'StatusBar.handleClick': wrapCommand(handleClick),
   'StatusBar.handleContextMenu': wrapCommand(handleContextMenu),
+  'StatusBar.handleEditorStatusChanged': handleEditorStatusChangedAll,
   'StatusBar.handleExtensionManagementMessagePort': handleExtensionManagementMessagePort,
-  'StatusBar.handleExtensionsChanged': wrapCommand(handleExtensionsChanged),
-  'StatusBar.handleItemsChanged': wrapSerialCommand(handleItemsChanged),
+  'StatusBar.handleExtensionsChanged': refreshExtensionItems,
+  'StatusBar.handleItemsChanged': refreshExtensionItems,
   'StatusBar.handleMessagePort': handleDirectMessagePort,
   'StatusBar.handleNotificationCountChanged': wrapCommand(handleNotificationCountChanged),
   'StatusBar.handleProblemsSummaryChange': wrapCommand(handleProblemsSummaryChange),
@@ -2548,6 +2624,7 @@ const commandMap = {
   'StatusBar.resize': wrapCommand(resize),
   'StatusBar.saveState': wrapGetter(saveState),
   'StatusBar.setComponentState': setComponentState,
+  'StatusBar.supportsEditorStatusDeltas': supportsEditorStatusDeltas,
   'StatusBar.terminate': terminate
 };
 
@@ -2555,7 +2632,7 @@ const initializeRenderWorker = async () => {
   const rpc = await create$1({
     commandMap: commandMap
   });
-  set$3(rpc);
+  set$2(rpc);
 };
 
 const listen = async () => {

package/package.json

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