@lvce-editor/main-area-worker 9.18.0 → 9.20.0

package/dist/mainAreaWorkerMain.js

@@ -1896,6 +1896,38 @@ const closeTabsRight = (state, groupId) => {
   return withGroups(addClosedTabs(state, closedTabs), newGroups);
 };
 
+const findGroupById = (state, groupId) => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  return groups.find(group => group.id === groupId);
+};
+
+const copyIntoNewWindow$1 = async state => {
+  const {
+    activeGroupId
+  } = state.layout;
+  const group = findGroupById(state, activeGroupId ?? 0);
+  if (!group) {
+    return state;
+  }
+  const {
+    activeTabId
+  } = group;
+  if (activeTabId === undefined) {
+    return state;
+  }
+  const tab = group.tabs.find(tab => tab.id === activeTabId);
+  if (!tab?.uri) {
+    return state;
+  }
+  await invoke('ElectronWindow.openNewWithUri', tab.uri);
+  return state;
+};
+
 const copyPath$1 = async (state, path) => {
   string(path);
   await writeClipBoardText(path);
@@ -1944,6 +1976,7 @@ const create$2 = (uid, uri, x, y, width, height, platform, assetDir, tabHeight =
     closedTabs: [],
     fileIconCache: {},
     height,
+    homeDirUri: '',
     iframes: [],
     initial: true,
     layout: {
@@ -3018,6 +3051,16 @@ const getCurrentState = state => {
   return state;
 };
 
+const getTitle = (uri, homeDir) => {
+  if (!uri) {
+    return '';
+  }
+  const normalizedHomeDir = homeDir.endsWith('/') ? homeDir.slice(0, -1) : homeDir;
+  if (uri.startsWith('file://') && normalizedHomeDir.startsWith('file://') && (uri === normalizedHomeDir || uri.startsWith(`${normalizedHomeDir}/`))) {
+    return `~${uri.slice(normalizedHomeDir.length)}`;
+  }
+  return uri;
+};
 const getBasename$1 = uri => {
   const lastSlashIndex = uri.lastIndexOf('/');
   if (lastSlashIndex === -1) {
@@ -3034,6 +3077,9 @@ const getInlineDiffLabel = uri => {
   return `${getBasename$1(workingTreeUri)} (Working Tree)`;
 };
 const getLabel = uri => {
+  if (uri === 'app://keybindings') {
+    return 'Keyboard Shortcuts';
+  }
   if (uri.startsWith('settings://')) {
     return 'Settings';
   }
@@ -3072,7 +3118,41 @@ const getEditorInputTitle = editorInput => {
   }
 };
 
-const createEmptyGroup = (state, uri, requestId, preview = false, title = getLabel(uri), editorType = 'text', editorInput) => {
+const getUriTitle = (uri, homeDirUri) => {
+  if (!uri) {
+    return undefined;
+  }
+  const title = getTitle(uri, homeDirUri);
+  return title === uri ? undefined : title;
+};
+const updateTabUriTitle = (tab, homeDirUri) => {
+  const uriTitle = getUriTitle(tab.uri, homeDirUri);
+  if (tab.uriTitle === uriTitle) {
+    return tab;
+  }
+  return {
+    ...tab,
+    uriTitle
+  };
+};
+const updateTabUriTitles = state => {
+  const {
+    layout
+  } = state;
+  const homeDirUri = state.homeDirUri || '';
+  return {
+    ...state,
+    layout: {
+      ...layout,
+      groups: layout.groups.map(group => ({
+        ...group,
+        tabs: group.tabs.map(tab => updateTabUriTitle(tab, homeDirUri))
+      }))
+    }
+  };
+};
+
+const createEmptyGroup$1 = (state, uri, requestId, preview = false, title = getLabel(uri), editorType = 'text', editorInput) => {
   const {
     layout
   } = state;
@@ -3094,7 +3174,8 @@ const createEmptyGroup = (state, uri, requestId, preview = false, title = getLab
     language: '',
     loadingState: 'loading',
     title,
-    uri
+    uri,
+    uriTitle: getUriTitle(uri, state.homeDirUri || '')
   };
   const newGroup = {
     activeTabId: newTab.id,
@@ -3188,7 +3269,8 @@ const ensureActiveGroup = (state, uri, preview = false, title = getLabel(uri), e
             language: '',
             loadingState: 'loading',
             title,
-            uri
+            uri,
+            uriTitle: getUriTitle(uri, state.homeDirUri || '')
           };
         });
         return {
@@ -3221,11 +3303,12 @@ const ensureActiveGroup = (state, uri, preview = false, title = getLabel(uri), e
       language: '',
       loadingState: 'loading',
       title,
-      uri: uri
+      uri: uri,
+      uriTitle: getUriTitle(uri, state.homeDirUri || '')
     };
     newState = openTab(state, activeGroup.id, newTab);
   } else {
-    newState = createEmptyGroup(state, uri, requestId, preview, title, editorType, editorInput);
+    newState = createEmptyGroup$1(state, uri, requestId, preview, title, editorType, editorInput);
   }
   return newState;
 };
@@ -3239,7 +3322,8 @@ const getStateWithTab = (currentState, editorInput, existingTab, shouldRetryExis
         errorMessage: '',
         loadingState: 'loading',
         title,
-        uri
+        uri,
+        uriTitle: getUriTitle(uri, currentState.homeDirUri || '')
       }),
       tabId: existingTab.tab.id
     };
@@ -3253,6 +3337,7 @@ const getStateWithTab = (currentState, editorInput, existingTab, shouldRetryExis
 
 const Directory = 3;
 const DirectoryExpanded = 4;
+const File = 7;
 
 const isLocalEditorInput = editorInput => {
   if (editorInput.type !== 'editor') {
@@ -3313,6 +3398,8 @@ const getIconsCached = (dirents, fileIconCache) => {
   return dirents.map(dirent => fileIconCache[dirent]);
 };
 
+const ExtensionDetailScheme = 'extension-detail://';
+const ExtensionIconName = 'extensions';
 const getBasename = uri => {
   const lastSlashIndex = uri.lastIndexOf('/');
   if (lastSlashIndex === -1) {
@@ -3331,10 +3418,17 @@ const getMissingTabs = (tabs, fileIconCache) => {
 };
 const tabToIconRequest = tab => {
   const uri = tab.uri || '';
+  if (uri.startsWith(ExtensionDetailScheme)) {
+    return {
+      name: ExtensionIconName,
+      path: uri,
+      type: Directory
+    };
+  }
   return {
     name: getBasename(uri),
     path: uri,
-    type: 0 // file type
+    type: File
   };
 };
 const getMissingIconRequestsForTabs = (tabs, fileIconCache) => {
@@ -3911,7 +4005,7 @@ const newFile = async state => {
     targetGroupId = activeGroup.id;
   } else {
     // No active group, create an empty one
-    newState = createEmptyGroup(state, '');
+    newState = createEmptyGroup$1(state, '');
     const updatedActiveGroupId = newState.layout.activeGroupId;
     if (!updatedActiveGroupId) {
       return state;
@@ -4296,7 +4390,8 @@ const handleUriChange = async (state, oldUri, newUri) => {
           return {
             ...tab,
             title: newTitle,
-            uri: newUri
+            uri: newUri,
+            uriTitle: getUriTitle(newUri, state.homeDirUri || '')
           };
         }
         return tab;
@@ -4361,6 +4456,27 @@ const initialize = async () => {
   set$3(rpc);
 };
 
+const toFileUri = path => {
+  if (!path) {
+    return '';
+  }
+  if (path.startsWith('file://')) {
+    return path;
+  }
+  if (path.startsWith('/')) {
+    return `file://${path}`;
+  }
+  return path;
+};
+const loadHomeDirUri = async () => {
+  try {
+    const homeDir = await invoke('Workspace.getHomeDir');
+    return typeof homeDir === 'string' ? toFileUri(homeDir) : '';
+  } catch {
+    return '';
+  }
+};
+
 const isValidTab = tab => {
   return tab && typeof tab.id === 'number' && typeof tab.title === 'string' && typeof tab.isDirty === 'boolean' && typeof tab.isPreview === 'boolean' && typeof tab.editorUid === 'number' && typeof tab.icon === 'string' && (tab.editorType === 'text' || tab.editorType === 'custom');
 };
@@ -4552,10 +4668,15 @@ const restoreAndCreateEditors = async (state, restoredLayout) => {
 };
 
 const loadContent = async (state, savedState) => {
+  const homeDirUri = await loadHomeDirUri();
+  const stateWithHomeDir = {
+    ...state,
+    homeDirUri
+  };
   const restoredLayout = tryRestoreLayout(savedState);
   if (restoredLayout) {
     // Restore and create editors
-    const editorState = await restoreAndCreateEditors(state, restoredLayout);
+    const editorState = await restoreAndCreateEditors(stateWithHomeDir, restoredLayout);
 
     // Load file icons with the updated editor state
     const {
@@ -4564,16 +4685,16 @@ const loadContent = async (state, savedState) => {
     } = await loadFileIcons(editorState);
 
     // Merge the results
-    const finalState = {
+    const finalState = updateTabUriTitles({
       ...editorState,
       fileIconCache,
       initial: false,
       layout: updatedLayout
-    };
+    });
     return finalState;
   }
   return {
-    ...state,
+    ...stateWithHomeDir,
     initial: false,
     layout: {
       activeGroupId: undefined,
@@ -4711,7 +4832,7 @@ const pin = () => {
 const splitAndMove = () => {
   return i18nString(SplitAndMove);
 };
-const moveIntoNewWindow = () => {
+const moveIntoNewWindow$1 = () => {
   return i18nString(MoveIntoNewWindow);
 };
 const copyIntoNewWindow = () => {
@@ -4793,16 +4914,6 @@ const getMenuEntries$2 = (state, groupId) => {
   }];
 };
 
-const findGroupById = (state, groupId) => {
-  const {
-    layout
-  } = state;
-  const {
-    groups
-  } = layout;
-  return groups.find(group => group.id === groupId);
-};
-
 // TODO should pass tab uri as argument or tab index
 const getMenuEntries$1 = state => {
   const {
@@ -4910,12 +5021,12 @@ const getMenuEntries$1 = state => {
     id: 'splitAndMove',
     label: splitAndMove()
   }, {
-    command: '',
+    command: 'MainArea.moveIntoNewWindow',
     flags: None,
     id: 'moveIntoNewWindow',
-    label: moveIntoNewWindow()
+    label: moveIntoNewWindow$1()
   }, {
-    command: '',
+    command: 'MainArea.copyIntoNewWindow',
     flags: None,
     id: 'copyIntoNewWindow',
     label: copyIntoNewWindow()
@@ -4939,8 +5050,30 @@ const getMenuEntries = async (state, props) => {
   }
 };
 
+const moveIntoNewWindow = async state => {
+  const {
+    activeGroupId
+  } = state.layout;
+  const group = findGroupById(state, activeGroupId ?? 0);
+  if (!group) {
+    return state;
+  }
+  const {
+    activeTabId
+  } = group;
+  if (activeTabId === undefined) {
+    return state;
+  }
+  const tab = group.tabs.find(tab => tab.id === activeTabId);
+  if (!tab?.uri) {
+    return state;
+  }
+  await invoke('ElectronWindow.openNewWithUri', tab.uri);
+  return closeTabAndSave(state, group.id, activeTabId);
+};
+
 const newWindow = async state => {
-  await invoke('Main.newWindow');
+  await invoke('ElectronWindow.openNew');
   return state;
 };
 
@@ -5508,7 +5641,7 @@ const renderTab = (tab, isActive, tabIndex, groupIndex) => {
     onContextMenu: HandleTabContextMenu,
     onMouseDown: HandleClickTab,
     role: 'tab',
-    title: tab.uri || tab.title,
+    title: tab.uriTitle || tab.uri || tab.title,
     type: Div
   }, {
     childCount: 0,
@@ -5985,6 +6118,178 @@ const saveState = state => {
   };
 };
 
+const flipDirection = direction => {
+  return direction === Horizontal ? Vertical : Horizontal;
+};
+const createEmptyGroup = () => {
+  return {
+    activeTabId: undefined,
+    focused: false,
+    id: create$1(),
+    isEmpty: true,
+    size: 100,
+    tabs: []
+  };
+};
+const getActiveGroupIndex = (groups, activeGroupId) => {
+  const activeIndex = groups.findIndex(group => group.id === activeGroupId);
+  if (activeIndex !== -1) {
+    return activeIndex;
+  }
+  const focusedIndex = groups.findIndex(group => group.focused);
+  if (focusedIndex !== -1) {
+    return focusedIndex;
+  }
+  return 0;
+};
+const mergeGroups = (target, groups, activeGroupId) => {
+  const allGroups = [target, ...groups];
+  const tabs = allGroups.flatMap(group => group.tabs);
+  const activeGroup = allGroups.find(group => group.id === activeGroupId) ?? groups.findLast(group => group.activeTabId !== undefined) ?? target;
+  const activeTabId = activeGroup.activeTabId ?? tabs[0]?.id;
+  return {
+    ...target,
+    activeTabId,
+    isEmpty: tabs.length === 0,
+    tabs
+  };
+};
+const getGroupsForSlotCount = (groups, slotCount, activeGroupId) => {
+  if (slotCount === 1) {
+    const firstGroup = groups[0] ?? createEmptyGroup();
+    return [mergeGroups(firstGroup, groups.slice(1), activeGroupId)];
+  }
+  if (groups.length === slotCount) {
+    return groups;
+  }
+  if (groups.length < slotCount) {
+    const missingGroups = Array.from({
+      length: slotCount - groups.length
+    }, createEmptyGroup);
+    return [...groups, ...missingGroups];
+  }
+  const retainedGroups = groups.slice(0, slotCount);
+  const extraGroups = groups.slice(slotCount);
+  const lastGroup = retainedGroups.at(-1);
+  if (!lastGroup) {
+    return retainedGroups;
+  }
+  return [...retainedGroups.slice(0, -1), mergeGroups(lastGroup, extraGroups, activeGroupId)];
+};
+const setEditorLayout = (state, direction, slots) => {
+  const {
+    layout
+  } = state;
+  const groups = getGroupsForSlotCount(layout.groups, slots.length, layout.activeGroupId);
+  const originalActiveIndex = layout.groups.findIndex(group => group.id === layout.activeGroupId);
+  const activeIndex = originalActiveIndex >= slots.length ? slots.length - 1 : getActiveGroupIndex(groups, layout.activeGroupId);
+  const nextGroups = groups.map((group, index) => {
+    const slot = slots[index];
+    const focused = index === activeIndex;
+    return {
+      ...group,
+      direction: slot.direction,
+      focused,
+      size: slot.size
+    };
+  });
+  return {
+    ...state,
+    layout: {
+      activeGroupId: nextGroups[activeIndex]?.id,
+      direction,
+      groups: nextGroups
+    }
+  };
+};
+const flipLayout = state => {
+  return {
+    ...state,
+    layout: {
+      ...state.layout,
+      direction: flipDirection(state.layout.direction),
+      groups: state.layout.groups.map(group => ({
+        ...group,
+        direction: group.direction === undefined ? undefined : flipDirection(group.direction)
+      }))
+    }
+  };
+};
+const setEditorLayoutSingle = state => {
+  return setEditorLayout(state, Horizontal, [{
+    size: 100
+  }]);
+};
+const setEditorLayoutTwoColumns = state => {
+  return setEditorLayout(state, Horizontal, [{
+    size: 50
+  }, {
+    size: 50
+  }]);
+};
+const setEditorLayoutThreeColumns = state => {
+  return setEditorLayout(state, Horizontal, [{
+    size: 33.333333
+  }, {
+    size: 33.333333
+  }, {
+    size: 33.333334
+  }]);
+};
+const setEditorLayoutTwoRows = state => {
+  return setEditorLayout(state, Vertical, [{
+    size: 50
+  }, {
+    size: 50
+  }]);
+};
+const setEditorLayoutThreeRows = state => {
+  return setEditorLayout(state, Vertical, [{
+    size: 33.333333
+  }, {
+    size: 33.333333
+  }, {
+    size: 33.333334
+  }]);
+};
+const setEditorLayoutGrid = state => {
+  return setEditorLayout(state, Horizontal, [{
+    direction: Vertical,
+    size: 25
+  }, {
+    direction: Vertical,
+    size: 25
+  }, {
+    direction: Vertical,
+    size: 25
+  }, {
+    direction: Vertical,
+    size: 25
+  }]);
+};
+const setEditorLayoutTwoRowsRight = state => {
+  return setEditorLayout(state, Horizontal, [{
+    size: 50
+  }, {
+    direction: Vertical,
+    size: 25
+  }, {
+    direction: Vertical,
+    size: 25
+  }]);
+};
+const setEditorLayoutTwoColumnsBottom = state => {
+  return setEditorLayout(state, Vertical, [{
+    size: 50
+  }, {
+    direction: Horizontal,
+    size: 25
+  }, {
+    direction: Horizontal,
+    size: 25
+  }]);
+};
+
 const splitDown = (state, groupId) => {
   const {
     layout
@@ -6155,10 +6460,12 @@ const commandMap = {
   'MainArea.closeSaved': wrapCommand(closeSaved$1),
   'MainArea.closeTabsByUris': wrapCommand(closeTabsByUris),
   'MainArea.closeTabsRight': wrapCommand(closeTabsRight),
+  'MainArea.copyIntoNewWindow': wrapCommand(copyIntoNewWindow$1),
   'MainArea.copyPath': wrapCommand(copyPath$1),
   'MainArea.copyRelativePath': wrapCommand(copyRelativePath$1),
   'MainArea.create': create$2,
   'MainArea.diff2': diff2,
+  'MainArea.flipEditorLayout': wrapCommand(flipLayout),
   'MainArea.focusNext': wrapCommand(focusNextTab),
   'MainArea.focusNextTab': wrapCommand(focusNextTab),
   'MainArea.focusPrevious': wrapCommand(focusPreviousTab),
@@ -6186,6 +6493,7 @@ const commandMap = {
   'MainArea.handleWorkspaceChange': wrapCommand(handleWorkspaceChange),
   'MainArea.initialize': initialize,
   'MainArea.loadContent': wrapCommand(loadContent),
+  'MainArea.moveIntoNewWindow': wrapCommand(moveIntoNewWindow),
   'MainArea.newFile': wrapCommand(newFile),
   'MainArea.newWindow': wrapCommand(newWindow),
   'MainArea.openInput': wrapCommand(openInput),
@@ -6199,6 +6507,14 @@ const commandMap = {
   'MainArea.save': wrapCommand(save),
   'MainArea.saveState': wrapGetter(saveState),
   'MainArea.selectTab': wrapCommand(selectTab),
+  'MainArea.setEditorLayoutGrid': wrapCommand(setEditorLayoutGrid),
+  'MainArea.setEditorLayoutSingle': wrapCommand(setEditorLayoutSingle),
+  'MainArea.setEditorLayoutThreeColumns': wrapCommand(setEditorLayoutThreeColumns),
+  'MainArea.setEditorLayoutThreeRows': wrapCommand(setEditorLayoutThreeRows),
+  'MainArea.setEditorLayoutTwoColumns': wrapCommand(setEditorLayoutTwoColumns),
+  'MainArea.setEditorLayoutTwoColumnsBottom': wrapCommand(setEditorLayoutTwoColumnsBottom),
+  'MainArea.setEditorLayoutTwoRows': wrapCommand(setEditorLayoutTwoRows),
+  'MainArea.setEditorLayoutTwoRowsRight': wrapCommand(setEditorLayoutTwoRowsRight),
   'MainArea.splitDown': wrapCommand(splitDown),
   'MainArea.splitLeft': wrapCommand(splitLeft),
   'MainArea.splitRight': wrapCommand(splitRight),

package/package.json

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