@lvce-editor/main-area-worker 6.2.0 → 6.4.0

package/dist/mainAreaWorkerMain.js

@@ -2071,6 +2071,11 @@ const handleClickTab = async (state, groupIndexRaw, indexRaw) => {
   return selectTab(state, groupIndex, index);
 };
 
+const handleDoubleClick = async state => {
+  // TODO: implement handleDoubleClick
+  return state;
+};
+
 const handleResize = async (state, x, y, width, height) => {
   number(x);
   number(y);
@@ -2124,83 +2129,6 @@ const handleTabContextMenu = async (state, x, y) => {
   return state;
 };
 
-const handleWorkspaceChange = state => {
-  return {
-    ...state,
-    layout: {
-      ...state.layout,
-      activeGroupId: undefined,
-      groups: []
-    }
-  };
-};
-
-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$3(rpc);
-};
-
-const isValidTab = tab => {
-  return tab && typeof tab.id === 'number' && typeof tab.title === 'string' && typeof tab.isDirty === 'boolean' && typeof tab.editorUid === 'number' && typeof tab.icon === 'string' && (tab.editorType === 'text' || tab.editorType === 'custom');
-};
-
-const isValidEditorGroup = group => {
-  return group && typeof group.id === 'number' && Array.isArray(group.tabs) && group.tabs.every(isValidTab) && (group.activeTabId === undefined || typeof group.activeTabId === 'number') && typeof group.focused === 'boolean' && typeof group.size === 'number' && group.size > 0 && typeof group.isEmpty === 'boolean';
-};
-
-const isValidMainAreaLayout = layout => {
-  if (!layout || typeof layout !== 'object') {
-    return false;
-  }
-  const layoutObj = layout;
-  if (layoutObj.activeGroupId !== undefined && typeof layoutObj.activeGroupId !== 'number') {
-    return false;
-  }
-  if (layoutObj.direction !== 'horizontal' && layoutObj.direction !== 'vertical') {
-    return false;
-  }
-  if (!Array.isArray(layoutObj.groups)) {
-    return false;
-  }
-  if (!layoutObj.groups.every(isValidEditorGroup)) {
-    return false;
-  }
-  return true;
-};
-
-const tryRestoreLayout = savedState => {
-  if (savedState === undefined || savedState === null) {
-    return undefined;
-  }
-  if (typeof savedState !== 'object') {
-    return undefined;
-  }
-  const {
-    layout
-  } = savedState;
-  if (!isValidMainAreaLayout(layout)) {
-    return undefined;
-  }
-  return layout;
-};
-
 const getIconsCached = (dirents, fileIconCache) => {
   return dirents.map(dirent => fileIconCache[dirent]);
 };
@@ -2327,6 +2255,140 @@ const loadFileIcons = async state => {
   }
 };
 
+const getBasename = uri => {
+  const lastSlashIndex = uri.lastIndexOf('/');
+  if (lastSlashIndex === -1) {
+    return uri;
+  }
+  return uri.slice(lastSlashIndex + 1);
+};
+const getLabel = uri => {
+  if (uri.startsWith('settings://')) {
+    return 'Settings';
+  }
+  if (uri.startsWith('simple-browser://')) {
+    return 'Simple Browser';
+  }
+  return getBasename(uri);
+};
+
+const handleUriChange = async (state, oldUri, newUri) => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  const newTitle = getLabel(newUri);
+  const updatedGroups = groups.map(group => {
+    return {
+      ...group,
+      tabs: group.tabs.map(tab => {
+        if (tab.uri === oldUri) {
+          return {
+            ...tab,
+            title: newTitle,
+            uri: newUri
+          };
+        }
+        return tab;
+      })
+    };
+  });
+  const stateWithUpdatedUri = {
+    ...state,
+    layout: {
+      ...layout,
+      groups: updatedGroups
+    }
+  };
+
+  // Load icons for the new URI
+  const result = await loadFileIcons(stateWithUpdatedUri);
+  return {
+    ...stateWithUpdatedUri,
+    fileIconCache: result.fileIconCache,
+    layout: result.updatedLayout
+  };
+};
+
+const handleWorkspaceChange = state => {
+  return {
+    ...state,
+    layout: {
+      ...state.layout,
+      activeGroupId: undefined,
+      groups: []
+    }
+  };
+};
+
+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$3(rpc);
+};
+
+const isValidTab = tab => {
+  return tab && typeof tab.id === 'number' && typeof tab.title === 'string' && typeof tab.isDirty === 'boolean' && typeof tab.editorUid === 'number' && typeof tab.icon === 'string' && (tab.editorType === 'text' || tab.editorType === 'custom');
+};
+
+const isValidEditorGroup = group => {
+  return group && typeof group.id === 'number' && Array.isArray(group.tabs) && group.tabs.every(isValidTab) && (group.activeTabId === undefined || typeof group.activeTabId === 'number') && typeof group.focused === 'boolean' && typeof group.size === 'number' && group.size > 0 && typeof group.isEmpty === 'boolean';
+};
+
+const isValidMainAreaLayout = layout => {
+  if (!layout || typeof layout !== 'object') {
+    return false;
+  }
+  const layoutObj = layout;
+  if (layoutObj.activeGroupId !== undefined && typeof layoutObj.activeGroupId !== 'number') {
+    return false;
+  }
+  if (layoutObj.direction !== 'horizontal' && layoutObj.direction !== 'vertical') {
+    return false;
+  }
+  if (!Array.isArray(layoutObj.groups)) {
+    return false;
+  }
+  if (!layoutObj.groups.every(isValidEditorGroup)) {
+    return false;
+  }
+  return true;
+};
+
+const tryRestoreLayout = savedState => {
+  if (savedState === undefined || savedState === null) {
+    return undefined;
+  }
+  if (typeof savedState !== 'object') {
+    return undefined;
+  }
+  const {
+    layout
+  } = savedState;
+  if (!isValidMainAreaLayout(layout)) {
+    return undefined;
+  }
+  return layout;
+};
+
 const createViewlets = async (layout, viewletModuleIds, bounds) => {
   const editorUids = {};
   for (const group of layout.groups) {
@@ -2578,23 +2640,6 @@ const getMenuEntries = async (state, props) => {
   }
 };
 
-const getBasename = uri => {
-  const lastSlashIndex = uri.lastIndexOf('/');
-  if (lastSlashIndex === -1) {
-    return uri;
-  }
-  return uri.slice(lastSlashIndex + 1);
-};
-const getLabel = uri => {
-  if (uri.startsWith('settings://')) {
-    return 'Settings';
-  }
-  if (uri.startsWith('simple-browser://')) {
-    return 'Simple Browser';
-  }
-  return getBasename(uri);
-};
-
 const createEmptyGroup = (state, uri, requestId) => {
   const {
     layout
@@ -2636,6 +2681,18 @@ const createEmptyGroup = (state, uri, requestId) => {
   };
 };
 
+const getActiveTabId = state => {
+  const {
+    layout
+  } = state;
+  const {
+    activeGroupId,
+    groups
+  } = layout;
+  const activeGroup = groups.find(g => g.id === activeGroupId);
+  return activeGroup?.activeTabId;
+};
+
 const openTab = (state, groupId, tab) => {
   const newTab = 'id' in tab && tab.id !== undefined ? tab : {
     ...tab,
@@ -2668,6 +2725,111 @@ const openTab = (state, groupId, tab) => {
   };
 };
 
+const newFile = async state => {
+  object(state);
+  const {
+    layout,
+    uid
+  } = state;
+  const {
+    activeGroupId,
+    groups
+  } = layout;
+
+  // Find the active group
+  const activeGroup = activeGroupId === undefined ? groups.find(group => group.focused) : groups.find(group => group.id === activeGroupId);
+
+  // Prepare initial state
+  let newState = state;
+  let targetGroupId;
+  if (activeGroup) {
+    targetGroupId = activeGroup.id;
+  } else {
+    // No active group, create an empty one
+    newState = createEmptyGroup(state, '');
+    const updatedActiveGroupId = newState.layout.activeGroupId;
+    if (!updatedActiveGroupId) {
+      return state;
+    }
+    targetGroupId = updatedActiveGroupId;
+
+    // Remove the tab that createEmptyGroup created, we'll add our own
+    newState = {
+      ...newState,
+      layout: {
+        ...newState.layout,
+        groups: newState.layout.groups.map(group => {
+          if (group.id === targetGroupId) {
+            return {
+              ...group,
+              activeTabId: undefined,
+              tabs: []
+            };
+          }
+          return group;
+        })
+      }
+    };
+  }
+
+  // Get previous active tab ID for viewlet switching
+  getActiveTabId(newState);
+
+  // Create a new empty tab
+  const tabId = create$1();
+  const editorUid = create$1();
+  const newTab = {
+    editorType: 'text',
+    editorUid,
+    errorMessage: '',
+    icon: '',
+    id: tabId,
+    isDirty: false,
+    language: 'plaintext',
+    loadingState: 'loading',
+    title: 'Untitled',
+    uri: 'untitled:///1'
+  };
+  const stateWithNewTab = openTab(newState, targetGroupId, newTab);
+
+  // Calculate bounds: use main area bounds minus tab height
+  const bounds = {
+    height: stateWithNewTab.height - stateWithNewTab.tabHeight,
+    width: stateWithNewTab.width,
+    x: stateWithNewTab.x,
+    y: stateWithNewTab.y + stateWithNewTab.tabHeight
+  };
+  const stateWithViewlet = createViewletForTab(stateWithNewTab, tabId);
+  let intermediateState = stateWithViewlet;
+
+  // Switch viewlet (detach old, attach new if ready)
+  const {
+    newState: switchedState
+  } = switchViewlet(intermediateState);
+  intermediateState = switchedState;
+  set(uid, state, intermediateState);
+
+  // Get the tab to extract editorUid
+  const tabWithViewlet = findTabById(intermediateState, tabId);
+  if (!tabWithViewlet) {
+    return intermediateState;
+  }
+  const {
+    editorUid: actualEditorUid
+  } = tabWithViewlet.tab;
+  if (actualEditorUid === -1) {
+    throw new Error(`invalid editorUid`);
+  }
+  await createViewlet('Editor', actualEditorUid, tabId, bounds, newTab.uri || '');
+
+  // After viewlet is created, get the latest state and mark it as ready
+  const {
+    newState: latestState
+  } = get(uid);
+  const readyState = handleViewletReady(latestState, actualEditorUid);
+  return readyState;
+};
+
 const ensureActiveGroup = (state, uri) => {
   // Find the active group (by activeGroupId or focused flag)
   const {
@@ -2748,18 +2910,6 @@ const focusEditorGroup = (state, groupId) => {
   };
 };
 
-const getActiveTabId = state => {
-  const {
-    layout
-  } = state;
-  const {
-    activeGroupId,
-    groups
-  } = layout;
-  const activeGroup = groups.find(g => g.id === activeGroupId);
-  return activeGroup?.activeTabId;
-};
-
 const getOptionUriOptions = options => {
   let uri = '';
   if (typeof options === 'string') {
@@ -2826,13 +2976,12 @@ const openUri = async (state, options) => {
     return newState;
   }
 
-  // Calculate bounds: use main area bounds minus 35px for tab height
-  const TAB_HEIGHT = 35;
+  // Calculate bounds: use main area bounds minus tab height
   const bounds = {
-    height: newState.height - TAB_HEIGHT,
+    height: newState.height - newState.tabHeight,
     width: newState.width,
     x: newState.x,
-    y: newState.y + TAB_HEIGHT
+    y: newState.y + newState.tabHeight
   };
   const stateWithViewlet = createViewletForTab(newState, tabId);
   let intermediateState1 = stateWithViewlet;
@@ -3339,8 +3488,9 @@ const renderEditorGroupActions = (group, groupIndex, splitButtonEnabled) => {
 const renderEditorGroupHeader = (group, groupIndex, splitButtonEnabled) => {
   const tabsChildCount = group.tabs.length;
   const actions = renderEditorGroupActions(group, groupIndex, splitButtonEnabled);
+  const hasActions = actions.length > 0;
   return [{
-    childCount: actions.length > 0 ? 2 : 1,
+    childCount: hasActions ? 2 : 1,
     className: 'EditorGroupHeader',
     role: 'none',
     type: Div
@@ -3471,6 +3621,10 @@ const getActiveTab = state => {
   };
 };
 
+const saveEditor = async editorUid => {
+  await invoke('Editor.save', editorUid);
+};
+
 const save = async state => {
   const activeTabData = getActiveTab(state);
   if (!activeTabData) {
@@ -3482,7 +3636,7 @@ const save = async state => {
   if (tab.loadingState === 'loading') {
     return state;
   }
-  await invoke('Editor.save', tab.editorUid);
+  await saveEditor(tab.editorUid);
   if (!tab.isDirty) {
     return state;
   }
@@ -3495,8 +3649,26 @@ const saveState = state => {
   const {
     layout
   } = state;
+
+  // Filter out untitled editors from tabs
+  const filteredGroups = layout.groups.map(group => ({
+    ...group,
+    tabs: group.tabs.filter(tab => !tab.uri?.startsWith('untitled://'))
+  }))
+  // Remove groups that become empty after filtering
+  .filter(group => group.tabs.length > 0);
+
+  // Update activeGroupId if it points to a removed group
+  const {
+    activeGroupId: originalActiveGroupId
+  } = layout;
+  const activeGroupId = originalActiveGroupId !== undefined && !filteredGroups.some(g => g.id === originalActiveGroupId) ? undefined : originalActiveGroupId;
   return {
-    layout
+    layout: {
+      ...layout,
+      activeGroupId,
+      groups: filteredGroups
+    }
   };
 };
 
@@ -3582,11 +3754,14 @@ const commandMap = {
   'MainArea.handleClickAction': wrapCommand(handleClickAction),
   'MainArea.handleClickCloseTab': wrapCommand(handleClickCloseTab),
   'MainArea.handleClickTab': wrapCommand(handleClickTab),
+  'MainArea.handleDoubleClick': wrapCommand(handleDoubleClick),
   'MainArea.handleResize': wrapCommand(handleResize),
   'MainArea.handleTabContextMenu': wrapCommand(handleTabContextMenu),
+  'MainArea.handleUriChange': wrapCommand(handleUriChange),
   'MainArea.handleWorkspaceChange': wrapCommand(handleWorkspaceChange),
   'MainArea.initialize': initialize,
   'MainArea.loadContent': wrapCommand(loadContent),
+  'MainArea.newFile': wrapCommand(newFile),
   'MainArea.openUri': wrapCommand(openUri),
   'MainArea.refresh': wrapCommand(refresh),
   'MainArea.render2': render2,

package/package.json

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