@lvce-editor/main-area-worker 9.57.0 → 9.58.0

package/dist/mainAreaWorkerMain.js

@@ -1503,17 +1503,98 @@ const getPreference = async key => {
   return await invoke$1('Preferences.get', key);
 };
 
+const maxClosedTabs = 20;
+const pendingOperations = new Map();
+const sessionId = encodeURIComponent(`session-${new Date().toISOString()}`);
+const getKey = uid => {
+  return `https://lvce-editor.invalid/closed-tabs/${sessionId}/${uid}`;
+};
+const run = async (uid, operation) => {
+  const previous = pendingOperations.get(uid)?.promise || Promise.resolve();
+  const id = {};
+  const current = (async () => {
+    await previous;
+    try {
+      return await operation();
+    } finally {
+      if (pendingOperations.get(uid)?.id === id) {
+        pendingOperations.delete(uid);
+      }
+    }
+  })();
+  pendingOperations.set(uid, {
+    id,
+    promise: current
+  });
+  return await current;
+};
+const isClosedTabEntry = value => {
+  if (!value || typeof value !== 'object') {
+    return false;
+  }
+  const entry = value;
+  return Boolean(entry.group && typeof entry.group === 'object' && entry.tab && typeof entry.tab === 'object' && typeof entry.groupIndex === 'number' && typeof entry.tabIndex === 'number');
+};
+const getEntries = async key => {
+  const entries = await invoke$1('CacheStorage.getJson', key);
+  return Array.isArray(entries) ? entries.filter(isClosedTabEntry) : [];
+};
+const compact = entry => {
+  return {
+    ...entry,
+    group: {
+      ...entry.group,
+      tabs: []
+    }
+  };
+};
+const add = (uid, entries) => {
+  if (entries.length === 0) {
+    return Promise.resolve();
+  }
+  return run(uid, async () => {
+    try {
+      const key = getKey(uid);
+      const existing = await getEntries(key);
+      const compactEntries = entries.map(compact);
+      await invoke$1('CacheStorage.setJson', key, [...existing, ...compactEntries].slice(-maxClosedTabs));
+    } catch {
+      // Closed tab history is optional and must never break editor commands.
+    }
+  });
+};
+const clear = uid => {
+  return run(uid, async () => {
+    try {
+      await invoke$1('CacheStorage.setJson', getKey(uid), []);
+    } catch {
+      // Closed tab history is optional and must never break workspace changes.
+    }
+  });
+};
+const takeLast = uid => {
+  return run(uid, async () => {
+    try {
+      const key = getKey(uid);
+      const entries = await getEntries(key);
+      const entry = entries.at(-1);
+      if (!isClosedTabEntry(entry)) {
+        return undefined;
+      }
+      await invoke$1('CacheStorage.setJson', key, entries.slice(0, -1));
+      return entry;
+    } catch {
+      return undefined;
+    }
+  });
+};
+
 const addClosedTabs = (state, entries) => {
-  const {
-    closedTabs
-  } = state;
   if (entries.length === 0) {
     return state;
   }
-  return {
-    ...state,
-    closedTabs: [...closedTabs, ...entries].slice(-20)
-  };
+  void add(state.uid, entries);
+  return state;
 };
 
 const getGroupIndexById = (state, groupId) => {
@@ -2530,7 +2611,6 @@ const normalizeLayoutDirection = direction => {
 const create$1 = (uid, uri, x, y, width, height, platform, assetDir, tabHeight = 35) => {
   const state = {
     assetDir,
-    closedTabs: [],
     fileIconCache: {},
     height,
     homeDirUri: '',
@@ -2541,8 +2621,8 @@ const create$1 = (uid, uri, x, y, width, height, platform, assetDir, tabHeight =
       direction: Horizontal,
       groups: []
     },
-    maxOpenEditorGroups: Infinity,
-    maxOpenEditors: Infinity,
+    maxOpenEditorGroups: -1,
+    maxOpenEditors: -1,
     minGroupHeightPx: 80,
     minGroupWidthPx: 250,
     platform,
@@ -4245,15 +4325,6 @@ const getRestoredTab = tab => {
     loadingState: undefined
   });
 };
-const getStateWithoutLastClosedTab = state => {
-  const {
-    closedTabs
-  } = state;
-  return {
-    ...state,
-    closedTabs: closedTabs.slice(0, -1)
-  };
-};
 const restoreExistingUri = (state, entry) => {
   const {
     layout
@@ -4276,14 +4347,13 @@ const restoreExistingUri = (state, entry) => {
   if (tabIndex === -1) {
     return undefined;
   }
-  const newStateWithoutClosedTab = getStateWithoutLastClosedTab(state);
-  const groups = focusGroup(newStateWithoutClosedTab.layout.groups, existing.groupId, existing.tab.id);
+  const groups = focusGroup(state.layout.groups, existing.groupId, existing.tab.id);
   return {
     groupIndex,
     newState: {
-      ...newStateWithoutClosedTab,
+      ...state,
       layout: {
-        ...newStateWithoutClosedTab.layout,
+        ...state.layout,
         activeGroupId: existing.groupId,
         groups
       }
@@ -4307,7 +4377,6 @@ const restoreIntoExistingGroup = (state, entry) => {
   const tabIndex = clampIndex(entry.tabIndex, 0, group.tabs.length);
   const tabs = [...group.tabs];
   tabs.splice(tabIndex, 0, restoredTab);
-  const newStateWithoutClosedTab = getStateWithoutLastClosedTab(state);
   const updatedGroups = groups.map((currentGroup, index) => {
     if (index === groupIndex) {
       return {
@@ -4326,9 +4395,9 @@ const restoreIntoExistingGroup = (state, entry) => {
   return {
     groupIndex,
     newState: {
-      ...newStateWithoutClosedTab,
+      ...state,
       layout: {
-        ...newStateWithoutClosedTab.layout,
+        ...state.layout,
         activeGroupId: group.id,
         groups: updatedGroups
       }
@@ -4346,18 +4415,17 @@ const createRestoredGroup = entry => {
   };
 };
 const restoreIntoRecreatedGroup = (state, entry) => {
-  const newStateWithoutClosedTab = getStateWithoutLastClosedTab(state);
   const restoredGroup = createRestoredGroup(entry);
   const {
     groups
-  } = newStateWithoutClosedTab.layout;
+  } = state.layout;
   if (groups.length === 0) {
     return {
       groupIndex: 0,
       newState: {
-        ...newStateWithoutClosedTab,
+        ...state,
         layout: {
-          ...newStateWithoutClosedTab.layout,
+          ...state.layout,
           activeGroupId: restoredGroup.id,
           groups: [restoredGroup]
         }
@@ -4374,9 +4442,9 @@ const restoreIntoRecreatedGroup = (state, entry) => {
   return {
     groupIndex,
     newState: {
-      ...newStateWithoutClosedTab,
+      ...state,
       layout: {
-        ...newStateWithoutClosedTab.layout,
+        ...state.layout,
         activeGroupId: restoredGroup.id,
         groups: redistributeSizesWithRounding(insertedGroups)
       }
@@ -4384,22 +4452,16 @@ const restoreIntoRecreatedGroup = (state, entry) => {
     tabIndex: 0
   };
 };
-const restoreClosedTabState = state => {
-  const {
-    closedTabs
-  } = state;
-  const entry = closedTabs.at(-1);
-  if (!entry) {
-    return undefined;
-  }
+const restoreClosedTabState = (state, entry) => {
   return restoreExistingUri(state, entry) || restoreIntoExistingGroup(state, entry) || restoreIntoRecreatedGroup(state, entry);
 };
 
 const restoreClosedTab = async state => {
-  const restored = restoreClosedTabState(state);
-  if (!restored) {
+  const entry = await takeLast(state.uid);
+  if (!entry) {
     return state;
   }
+  const restored = restoreClosedTabState(state, entry);
   const newState = await selectTab(restored.newState, restored.groupIndex, restored.tabIndex);
   set$1(state.uid, state, newState);
   return newState;
@@ -6395,11 +6457,8 @@ const loadContent$1 = async (state, savedState) => {
 };
 
 const handleWorkspaceChange = async (state, _workspacePath, savedState) => {
-  const newState = await loadContent$1(state, savedState);
-  return {
-    ...newState,
-    closedTabs: []
-  };
+  await clear(state.uid);
+  return loadContent$1(state, savedState);
 };
 
 const getEditorInputUris = editorInput => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/main-area-worker",
-  "version": "9.57.0",
+  "version": "9.58.0",
   "description": "Main Area Worker",
   "repository": {
     "type": "git",