@lvce-editor/main-area-worker 9.67.10 → 9.68.1

package/dist/mainAreaWorkerMain.js

@@ -1926,7 +1926,15 @@ const wrapSerialCommand = fn => {
 const state$1 = {
   configured: false,
   lastId: -1,
-  nextId: 0
+  nextId: 0,
+  reservedIds: new Set()
+};
+const reserve = ids => {
+  for (const id of ids) {
+    if (id >= state$1.nextId && id <= state$1.lastId) {
+      state$1.reservedIds.add(id);
+    }
+  }
 };
 const configure = (start, end) => {
   const {
@@ -1946,13 +1954,16 @@ const create$2 = () => {
   const {
     configured,
     lastId,
-    nextId
+    reservedIds
   } = state$1;
   if (!configured) {
     // Compatibility with renderer versions that do not assign worker id ranges.
     return Math.random();
   }
-  if (nextId > lastId) {
+  while (reservedIds.delete(state$1.nextId)) {
+    state$1.nextId++;
+  }
+  if (state$1.nextId > lastId) {
     throw new Error('Component id range exhausted');
   }
   return state$1.nextId++;
@@ -2310,11 +2321,23 @@ const closeTabWithViewlet = async (state, groupId, tabId) => {
   return newState;
 };
 
+const legacyRenderers = new WeakSet();
 const saveEditor = async (editorUid, skipFormatting = false) => {
-  if (skipFormatting) {
-    return invoke$2('Editor.save', editorUid, true);
+  const args = skipFormatting ? [editorUid, true] : [editorUid];
+  const rpc = get$2(RendererWorker);
+  if (legacyRenderers.has(rpc)) {
+    return invoke$2('Editor.save', ...args);
+  }
+  try {
+    return await invoke$2('Viewlet.save', ...args);
+  } catch (error) {
+    // Older renderers support only text editors. Never retry an actual save failure.
+    if (!(error instanceof Error) || !['Command not found Viewlet.save', 'Command "Viewlet.save" not found (renderer worker)'].includes(error.message)) {
+      throw error;
+    }
+    legacyRenderers.add(rpc);
+    return invoke$2('Editor.save', ...args);
   }
-  return invoke$2('Editor.save', editorUid);
 };
 
 const promptLegacy = async (message, discardPrompt) => {
@@ -7852,6 +7875,9 @@ const updateTabs = (state, editorUids) => {
 };
 
 const restoreAndCreateEditors = async (state, restoredLayout) => {
+  // Saved tab/group IDs can overlap the range assigned to a fresh renderer.
+  // Reserve them before creating editors or opening any additional tabs.
+  reserve(restoredLayout.groups.flatMap(group => [group.id, ...group.tabs.map(tab => tab.id)]));
   let newState = {
     ...state,
     layout: restoredLayout
@@ -8850,6 +8876,23 @@ const save = async state => {
 const saveWithoutFormatting = async state => {
   return saveInternal(state, true);
 };
+const saveAll = async context => {
+  const initialState = context.getState();
+  const tabs = initialState.layout.groups.flatMap(group => group.tabs).filter(tab => tab.isDirty && tab.loadingState !== 'loading');
+  for (const tab of tabs) {
+    const current = context.getState().layout.groups.flatMap(group => group.tabs).find(item => item.id === tab.id);
+    if (!current?.isDirty || current.editorUid !== tab.editorUid) {
+      continue;
+    }
+    const result = await saveEditorAndHandleSettingsChange(current, initialState.applicationId);
+    if (result?.modified) {
+      continue;
+    }
+    await context.updateState(state => updateTab(state, tab.id, {
+      isDirty: false
+    }));
+  }
+};
 
 const getSavedTab = tab => {
   const normalizedTab = normalizeTabEditorInput(tab);
@@ -9206,6 +9249,7 @@ const commandMap = {
   'Main.openUris': wrapSerialAsyncCommand(openUrisWithContext),
   'Main.restoreClosedTab': wrapSerialCommand(restoreClosedTab),
   'Main.save': wrapSerialCommand(save),
+  'Main.saveAll': wrapAsyncCommand(saveAll),
   'Main.saveState': wrapGetter(saveState),
   'Main.splitRight': splitRightAndResize,
   'MainArea.closeActiveEditor': wrapSerialCommand(closeActiveEditor),
@@ -9287,6 +9331,7 @@ const commandMap = {
   'MainArea.resize': resize,
   'MainArea.restoreClosedTab': wrapSerialCommand(restoreClosedTab),
   'MainArea.save': wrapSerialCommand(save),
+  'MainArea.saveAll': wrapAsyncCommand(saveAll),
   'MainArea.saveState': wrapGetter(saveState),
   'MainArea.saveWithoutFormatting': wrapSerialCommand(saveWithoutFormatting),
   'MainArea.selectTab': wrapSerialCommand(selectTab),

package/package.json

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