@lvce-editor/title-bar-worker 4.25.4 → 4.25.6

package/dist/titleBarWorkerMain.js

@@ -721,6 +721,23 @@ const restoreMessageError = (error, _currentStack) => {
   }
   return restoredError;
 };
+const getFallbackMessage = error => {
+  if (error && typeof error.message === 'string' && error.message) {
+    return error.message;
+  }
+  if (error && error.data) {
+    return getFallbackMessage(error.data);
+  }
+  const stringified = String(error);
+  if (stringified !== '[object Object]') {
+    return stringified;
+  }
+  try {
+    return JSON.stringify(error);
+  } catch {
+    return stringified;
+  }
+};
 const restoreJsonRpcError = error => {
   const currentStack = getCurrentStack();
   if (error && error instanceof Error) {
@@ -729,13 +746,13 @@ const restoreJsonRpcError = error => {
   if (error && error.code && error.code === MethodNotFound) {
     return restoreMethodNotFoundError(error, currentStack);
   }
+  if (error && error.error) {
+    return restoreJsonRpcError(error.error);
+  }
   if (error && error.message) {
     return restoreMessageError(error);
   }
-  if (typeof error === 'string') {
-    return new Error(`JsonRpc Error: ${error}`);
-  }
-  return new Error(`JsonRpc Error: ${error}`);
+  return new Error(`JsonRpc Error: ${getFallbackMessage(error)}`);
 };
 const unwrapJsonRpcResult = responseMessage => {
   if ('error' in responseMessage) {
@@ -2663,7 +2680,7 @@ const getSaveFlags = hasActiveTextEditor => {
   }
   return Disabled;
 };
-const getMenuEntries$b = async (platform, autoSave$1, hasActiveTextEditor = false) => {
+const getMenuEntries$b = async (platform, autoSave$1, hasActiveTextEditor = false, hasOpenWorkspace = false) => {
   const autoSaveValue = autoSave$1 ?? (await getAutoSave());
   const saveFlags = getSaveFlags(hasActiveTextEditor);
   const entries = [{
@@ -2708,7 +2725,7 @@ const getMenuEntries$b = async (platform, autoSave$1, hasActiveTextEditor = fals
     label: autoSave()
   }, menuEntrySeparator, {
     command: 'Workspace.close',
-    flags: RestoreFocus,
+    flags: hasOpenWorkspace ? RestoreFocus : Disabled,
     id: 'closeFolder',
     label: closeFolder()
   }];
@@ -3215,7 +3232,7 @@ const getMenuEntries2 = async (state, props) => {
     case Edit$2:
       return getMenuEntries$d();
     case File$3:
-      return getMenuEntries$b(props.platform, undefined, await hasOpenTextEditor());
+      return getMenuEntries$b(props.platform, undefined, await hasOpenTextEditor(), Boolean(state.workspaceUri));
     case Go$2:
       return getMenuEntries$a();
     case Help$3:
@@ -5354,19 +5371,33 @@ const selectIndexNone = async (state, item) => {
   const {
     uid
   } = state;
-  await executeMenuItemCommand(item);
   const storedState = get(uid);
   const latestState = storedState?.newState ?? state;
-  const newState = {
+  const closedState = {
     ...latestState,
     focusedIndex: -1,
     isMenuOpen: false,
     menus: []
   };
   if (storedState) {
-    set$1(uid, storedState.oldState, newState, newState);
+    set$1(uid, storedState.oldState, closedState, closedState);
+    if (latestState.menus.length > 0) {
+      const [command, ...args] = renderMenus(latestState, closedState);
+      await invoke$2(command, ...args);
+    }
   }
-  return newState;
+  await executeMenuItemCommand(item);
+  const latestCommandState = get(uid)?.newState ?? closedState;
+  const finalState = {
+    ...latestCommandState,
+    focusedIndex: -1,
+    isMenuOpen: false,
+    menus: []
+  };
+  if (storedState) {
+    set$1(uid, finalState, finalState, finalState);
+  }
+  return finalState;
 };
 
 const selectIndexRestoreEditorFocus = async (state, item) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/title-bar-worker",
-  "version": "4.25.4",
+  "version": "4.25.6",
   "description": "Title Bar Worker",
   "repository": {
     "type": "git",