@lvce-editor/main-area-worker 9.9.0 → 9.11.0

package/dist/mainAreaWorkerMain.js

@@ -379,6 +379,26 @@ const closeSaved$1 = state => {
   return withGroups(state, newGroups);
 };
 
+const closeTabsByUris = (state, uris) => {
+  let currentState = state;
+  for (const uri of uris) {
+    while (true) {
+      const matchingGroup = currentState.layout.groups.find(group => {
+        return group.tabs.some(tab => tab.uri === uri);
+      });
+      if (!matchingGroup) {
+        break;
+      }
+      const matchingTab = matchingGroup.tabs.find(tab => tab.uri === uri);
+      if (!matchingTab) {
+        break;
+      }
+      currentState = closeTab(currentState, matchingGroup.id, matchingTab.id);
+    }
+  }
+  return currentState;
+};
+
 const getGroupById = (state, groupId) => {
   return state.layout.groups.find(group => group.id === groupId);
 };
@@ -1947,6 +1967,15 @@ const loadFileContent = async path => {
   const content = await readFile(path);
   return content;
 };
+const getLoadFileErrorMessage = error => {
+  if (!(error instanceof Error)) {
+    return 'Failed to load file content';
+  }
+  if (error.message.includes('EISDIR') || error.message.includes('illegal operation on a directory') || error.message.includes('is a directory')) {
+    return 'Expected a file but received a folder';
+  }
+  return error.message;
+};
 const loadTabContentAsync = async (tabId, path, requestId, getLatestState) => {
   try {
     await loadFileContent(path);
@@ -1984,7 +2013,7 @@ const loadTabContentAsync = async (tabId, path, requestId, getLatestState) => {
     if (latestTab.loadingState !== 'loading') {
       return latestState;
     }
-    const errorMessage = error instanceof Error ? error.message : 'Failed to load file content';
+    const errorMessage = getLoadFileErrorMessage(error);
     return updateTab(latestState, tabId, {
       errorMessage,
       loadingState: 'error'
@@ -2487,6 +2516,89 @@ const parseRawGroupId = rawGroupId => {
   return Number.isNaN(groupId) ? undefined : groupId;
 };
 
+const findTabByUri = (state, uri) => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  for (const group of groups) {
+    const tab = group.tabs.find(t => t.uri === uri);
+    if (tab) {
+      return {
+        groupId: group.id,
+        tab
+      };
+    }
+  }
+  return undefined;
+};
+
+const focusEditorGroup = (state, groupId) => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  const updatedGroups = groups.map(group => ({
+    ...group,
+    focused: group.id === groupId
+  }));
+  return {
+    ...state,
+    layout: {
+      ...layout,
+      activeGroupId: groupId,
+      groups: updatedGroups
+    }
+  };
+};
+
+const getActiveTabId = state => {
+  const {
+    layout
+  } = state;
+  const {
+    activeGroupId,
+    groups
+  } = layout;
+  const activeGroup = groups.find(g => g.id === activeGroupId);
+  return activeGroup?.activeTabId;
+};
+
+const getTabCount = state => {
+  return state.layout.groups.reduce((sum, group) => sum + group.tabs.length, 0);
+};
+
+const getCurrentState = state => {
+  const {
+    uid
+  } = state;
+  const stateFromStore = get(uid);
+  if (!stateFromStore) {
+    set(uid, state, state);
+    return state;
+  }
+  const storedState = stateFromStore.newState;
+  if (getTabCount(storedState) > getTabCount(state)) {
+    return storedState;
+  }
+  set(uid, state, state);
+  return state;
+};
+
+const getEditorInputEditorType = editorInput => {
+  switch (editorInput.type) {
+    case 'diff-editor':
+    case 'extension-detail-view':
+      return 'custom';
+    case 'editor':
+      return 'text';
+  }
+};
+
 const getBasename$1 = uri => {
   const lastSlashIndex = uri.lastIndexOf('/');
   if (lastSlashIndex === -1) {
@@ -2521,6 +2633,32 @@ const getLabel = uri => {
   return getBasename$1(uri);
 };
 
+const getEditorInputTitle = editorInput => {
+  switch (editorInput.type) {
+    case 'diff-editor':
+      {
+        const leftTitle = getLabel(editorInput.uriLeft);
+        const rightTitle = getLabel(editorInput.uriRight);
+        return `${leftTitle} - ${rightTitle}`;
+      }
+    case 'editor':
+      return getLabel(editorInput.uri);
+    case 'extension-detail-view':
+      return editorInput.extensionId;
+  }
+};
+
+const getEditorInputUri = editorInput => {
+  switch (editorInput.type) {
+    case 'diff-editor':
+      return `diff://?left=${encodeURIComponent(editorInput.uriLeft)}&right=${encodeURIComponent(editorInput.uriRight)}`;
+    case 'editor':
+      return editorInput.uri;
+    case 'extension-detail-view':
+      return `extension-detail://${editorInput.extensionId}`;
+  }
+};
+
 const createEmptyGroup = (state, uri, requestId, preview = false, title = getLabel(uri), editorType = 'text', editorInput) => {
   const {
     layout
@@ -2679,94 +2817,85 @@ const ensureActiveGroup = (state, uri, preview = false, title = getLabel(uri), e
   return newState;
 };
 
-const findTabByUri = (state, uri) => {
-  const {
-    layout
-  } = state;
-  const {
-    groups
-  } = layout;
-  for (const group of groups) {
-    const tab = group.tabs.find(t => t.uri === uri);
-    if (tab) {
-      return {
-        groupId: group.id,
-        tab
-      };
-    }
+const getStateWithTab = (currentState, editorInput, existingTab, shouldRetryExistingTab, uri, preview, title, editorType) => {
+  if (shouldRetryExistingTab && existingTab) {
+    const focusedState = focusEditorGroup(currentState, existingTab.groupId);
+    return {
+      stateWithTab: updateTab(focusedState, existingTab.tab.id, {
+        editorInput,
+        errorMessage: '',
+        loadingState: 'loading',
+        title,
+        uri
+      }),
+      tabId: existingTab.tab.id
+    };
   }
-  return undefined;
+  const stateWithTab = ensureActiveGroup(currentState, uri, preview, title, editorType, editorInput);
+  return {
+    stateWithTab,
+    tabId: getActiveTabId(stateWithTab)
+  };
 };
 
-const focusEditorGroup = (state, groupId) => {
+const Directory = 3;
+const DirectoryExpanded = 4;
+
+const isLocalEditorInput = editorInput => {
+  if (editorInput.type !== 'editor') {
+    return false;
+  }
+  return editorInput.uri.startsWith('file://') || !editorInput.uri.includes('://');
+};
+
+const shouldCheckDirectoryEditorInput = editorInput => {
+  if (!isLocalEditorInput(editorInput)) {
+    return false;
+  }
+  const baseName = editorInput.uri.slice(editorInput.uri.lastIndexOf('/') + 1);
+  return baseName.endsWith('/') || baseName !== '' && !baseName.includes('.');
+};
+
+const isDirectoryEditorInput = async editorInput => {
+  if (!shouldCheckDirectoryEditorInput(editorInput)) {
+    return false;
+  }
+  try {
+    const type = await invoke('FileSystem.stat', editorInput.uri);
+    return type === Directory;
+  } catch {
+    return false;
+  }
+};
+
+const switchTab = (state, groupId, tabId) => {
   const {
     layout
   } = state;
   const {
     groups
   } = layout;
-  const updatedGroups = groups.map(group => ({
-    ...group,
-    focused: group.id === groupId
-  }));
+  const updatedGroups = groups.map(group => {
+    if (group.id === groupId) {
+      const tabExists = group.tabs.some(tab => tab.id === tabId);
+      if (tabExists) {
+        return {
+          ...group,
+          activeTabId: tabId
+        };
+      }
+    }
+    return group;
+  });
   return {
     ...state,
     layout: {
       ...layout,
-      activeGroupId: groupId,
       groups: updatedGroups
     }
   };
 };
 
-const getActiveTabId = state => {
-  const {
-    layout
-  } = state;
-  const {
-    activeGroupId,
-    groups
-  } = layout;
-  const activeGroup = groups.find(g => g.id === activeGroupId);
-  return activeGroup?.activeTabId;
-};
-
-const getEditorInputEditorType = editorInput => {
-  switch (editorInput.type) {
-    case 'diff-editor':
-    case 'extension-detail-view':
-      return 'custom';
-    case 'editor':
-      return 'text';
-  }
-};
-
-const getEditorInputTitle = editorInput => {
-  switch (editorInput.type) {
-    case 'diff-editor':
-      {
-        const leftTitle = getLabel(editorInput.uriLeft);
-        const rightTitle = getLabel(editorInput.uriRight);
-        return `${leftTitle} - ${rightTitle}`;
-      }
-    case 'editor':
-      return getLabel(editorInput.uri);
-    case 'extension-detail-view':
-      return editorInput.extensionId;
-  }
-};
-
-const getEditorInputUri = editorInput => {
-  switch (editorInput.type) {
-    case 'diff-editor':
-      return `diff://?left=${encodeURIComponent(editorInput.uriLeft)}&right=${encodeURIComponent(editorInput.uriRight)}`;
-    case 'editor':
-      return editorInput.uri;
-    case 'extension-detail-view':
-      return `extension-detail://${editorInput.extensionId}`;
-  }
-};
-
 const getIconsCached = (dirents, fileIconCache) => {
   return dirents.map(dirent => fileIconCache[dirent]);
 };
@@ -2801,9 +2930,6 @@ const getMissingIconRequestsForTabs = (tabs, fileIconCache) => {
   return iconRequests;
 };
 
-const Directory = 3;
-const DirectoryExpanded = 4;
-
 const getSimpleIconRequestType = direntType => {
   if (direntType === Directory || direntType === DirectoryExpanded) {
     return 2;
@@ -2854,73 +2980,6 @@ const getFileIconsForTabs = async (tabs, fileIconCache) => {
   };
 };
 
-const switchTab = (state, groupId, tabId) => {
-  const {
-    layout
-  } = state;
-  const {
-    groups
-  } = layout;
-  const updatedGroups = groups.map(group => {
-    if (group.id === groupId) {
-      const tabExists = group.tabs.some(tab => tab.id === tabId);
-      if (tabExists) {
-        return {
-          ...group,
-          activeTabId: tabId
-        };
-      }
-    }
-    return group;
-  });
-  return {
-    ...state,
-    layout: {
-      ...layout,
-      groups: updatedGroups
-    }
-  };
-};
-
-const getTabCount = state => {
-  return state.layout.groups.reduce((sum, group) => sum + group.tabs.length, 0);
-};
-const getCurrentState = state => {
-  const {
-    uid
-  } = state;
-  const stateFromStore = get(uid);
-  if (!stateFromStore) {
-    set(uid, state, state);
-    return state;
-  }
-  const storedState = stateFromStore.newState;
-  if (getTabCount(storedState) > getTabCount(state)) {
-    return storedState;
-  }
-  set(uid, state, state);
-  return state;
-};
-const getStateWithTab = (currentState, editorInput, existingTab, shouldRetryExistingTab, uri, preview, title, editorType) => {
-  if (shouldRetryExistingTab && existingTab) {
-    const focusedState = focusEditorGroup(currentState, existingTab.groupId);
-    return {
-      stateWithTab: updateTab(focusedState, existingTab.tab.id, {
-        editorInput,
-        errorMessage: '',
-        loadingState: 'loading',
-        title,
-        uri
-      }),
-      tabId: existingTab.tab.id
-    };
-  }
-  const stateWithTab = ensureActiveGroup(currentState, uri, preview, title, editorType, editorInput);
-  return {
-    stateWithTab,
-    tabId: getActiveTabId(stateWithTab)
-  };
-};
 const updateTabIcon = async (uid, state, readyState, tabId) => {
   const newTab = findTabById(readyState, tabId);
   if (!newTab || !newTab.tab.uri) {
@@ -2954,6 +3013,7 @@ const updateTabIcon = async (uid, state, readyState, tabId) => {
     return undefined;
   }
 };
+
 const openInput = async (state, options) => {
   object(state);
   object(options);
@@ -2967,19 +3027,30 @@ const openInput = async (state, options) => {
   const uri = getEditorInputUri(editorInput);
   const title = getEditorInputTitle(editorInput);
   const editorType = getEditorInputEditorType(editorInput);
-  const existingTab = findTabByUri(state, uri);
+  const currentState = getCurrentState(state);
+  const existingTab = findTabByUri(currentState, uri);
   const shouldRetryExistingTab = !!existingTab && existingTab.tab.loadingState === 'error';
   if (existingTab && !shouldRetryExistingTab) {
-    const focusedState = focusEditorGroup(state, existingTab.groupId);
+    const focusedState = focusEditorGroup(currentState, existingTab.groupId);
     return switchTab(focusedState, existingTab.groupId, existingTab.tab.id);
   }
-  const previousTabId = getActiveTabId(state);
-  const currentState = getCurrentState(state);
+  const previousTabId = getActiveTabId(currentState);
   const {
     stateWithTab,
     tabId
   } = getStateWithTab(currentState, editorInput, existingTab, shouldRetryExistingTab, uri, preview, title, editorType);
   set(uid, state, stateWithTab);
+  if (await isDirectoryEditorInput(editorInput)) {
+    const {
+      newState: latestState
+    } = get(uid);
+    const errorState = updateTab(latestState, tabId, {
+      errorMessage: 'Expected a file but received a folder',
+      loadingState: 'error'
+    });
+    set(uid, state, errorState);
+    return errorState;
+  }
   try {
     const viewletModuleId = await getViewletModuleIdForEditorInput(editorInput);
     const {
@@ -4183,6 +4254,7 @@ const Pin = 'Pin';
 const SplitAndMove = 'Split & Move';
 const MoveIntoNewWindow = 'Move into New Window';
 const CopyIntoNewWindow = 'Copy into New Window';
+const NewTextFile = 'New Text File';
 const NewWindow = 'New Window';
 const OpenFile = 'Open File';
 const SplitDown = 'Split Down';
@@ -4214,6 +4286,9 @@ const splitEditorGroup = () => {
 const newWindow$1 = () => {
   return i18nString(NewWindow);
 };
+const newTextFile = () => {
+  return i18nString(NewTextFile);
+};
 const close = () => {
   return i18nString(Close);
 };
@@ -4300,6 +4375,11 @@ const getNewWindowMenuEntries = state => {
 const getMenuEntries$2 = (state, groupId) => {
   const groupArgs = getMenuEntryArgs(groupId);
   const entries = [{
+    command: 'MainArea.newFile',
+    flags: None,
+    id: 'newTextFile',
+    label: newTextFile()
+  }, {
     args: [QuickPick, 'file'],
     command: 'Viewlet.openWidget',
     flags: None,
@@ -4552,30 +4632,40 @@ const getSashOffset = (layout, groupIndex, width) => {
 const escapeCssAttributeValue = value => {
   return value.replaceAll('\\', '\\\\').replaceAll('"', '\\"');
 };
-const getSashCss = (layout, width = 0) => {
-  if (layout.groups.length <= 1) {
-    return [];
-  }
-  const rules = [];
+const toSashProperty = direction => {
+  return direction === Horizontal ? 'left' : 'top';
+};
+const renderSashCss = ({
+  property,
+  sashId,
+  value
+}) => {
+  const escapedSashId = escapeCssAttributeValue(sashId);
+  return `[data-sash-id="${escapedSashId}"] {
+  ${property}: ${value};
+}`;
+};
+const getProtoSashCss = (layout, width) => {
   const segments = getGroupSegments(layout.groups, layout.direction);
-  const sashPositionProperty = layout.direction === Horizontal ? 'left' : 'top';
+  const hasNestedSegments = segments.some(segment => segment.direction !== undefined);
+  const rules = [];
   let segmentOffset = 0;
   for (let i = 1; i < segments.length; i++) {
     segmentOffset += getSegmentSize(segments[i - 1]);
     const beforeGroupId = segments[i - 1].groups.at(-1)?.id || 0;
     const afterGroupId = segments[i].groups[0].id;
     const sashId = create(beforeGroupId, afterGroupId);
-    const escapedSashId = escapeCssAttributeValue(sashId);
-    const sashOffset = segments.some(segment => segment.direction !== undefined) || layout.direction !== Horizontal || !width ? `${segmentOffset}%` : getSashOffset(layout, i, width);
-    rules.push(`[data-sashId="${escapedSashId}"] {
-  ${sashPositionProperty}: ${sashOffset};
-}`);
+    const value = hasNestedSegments || layout.direction !== Horizontal || !width ? `${segmentOffset}%` : getSashOffset(layout, i, width);
+    rules.push({
+      property: toSashProperty(layout.direction),
+      sashId,
+      value
+    });
   }
   for (const segment of segments) {
     if (segment.direction === undefined || segment.groups.length <= 1) {
       continue;
     }
-    const nestedProperty = segment.direction === Horizontal ? 'left' : 'top';
     const segmentSize = getSegmentSize(segment);
     let nestedOffset = 0;
     for (let i = 1; i < segment.groups.length; i++) {
@@ -4583,20 +4673,35 @@ const getSashCss = (layout, width = 0) => {
       const beforeGroupId = segment.groups[i - 1].id;
       const afterGroupId = segment.groups[i].id;
       const sashId = create(beforeGroupId, afterGroupId);
-      const escapedSashId = escapeCssAttributeValue(sashId);
-      const relativeOffset = Number((nestedOffset / segmentSize * 100).toFixed(6));
-      rules.push(`[data-sashId="${escapedSashId}"] {
-  ${nestedProperty}: ${relativeOffset}%;
-}`);
+      const value = `${Number((nestedOffset / segmentSize * 100).toFixed(6))}%`;
+      rules.push({
+        property: toSashProperty(segment.direction),
+        sashId,
+        value
+      });
     }
   }
   return rules;
 };
+const getSashCss = (layout, width = 0) => {
+  if (layout.groups.length <= 1) {
+    return [];
+  }
+  return getProtoSashCss(layout, width).map(renderSashCss);
+};
 
 const getCss = (layout, width = 0) => {
   const rules = [`.MainArea {
 }`, `.editor-groups-container {
   overflow: auto;
+}`, `.SashBorder {
+  background: var(--SashBorder, gray);
+}`, `.SashBorderHorizontal {
+  width: 100%;
+  height: 1px;
+}`, `.SashBorderVertical {
+  width: 1px;
+  height: 100%;
 }`, `.EditorGroup {
   min-width: 250px;
   width: var(--EditorGroupWidth, auto);
@@ -5217,6 +5322,9 @@ const getSashClassName = direction => {
   return direction === Horizontal ? 'Sash SashVertical' : 'Sash SashHorizontal';
 };
 
+const getSashBorderClassName = direction => {
+  return direction === 1 ? 'SashBorder SashBorderVertical' : 'SashBorder SashBorderHorizontal';
+};
 const renderSash = (direction, sashId) => {
   return [{
     childCount: 1,
@@ -5227,7 +5335,7 @@ const renderSash = (direction, sashId) => {
     type: Button$2
   }, {
     childCount: 0,
-    className: 'SashBorder',
+    className: getSashBorderClassName(direction),
     type: Div
   }];
 };
@@ -5477,10 +5585,16 @@ const save = async state => {
 };
 
 const getFilteredGroups = groups => {
-  return groups.map(group => ({
-    ...group,
-    tabs: group.tabs.filter(tab => !tab.uri?.startsWith('untitled://')).map(normalizeTabEditorInput)
-  })).filter(group => group.tabs.length > 0);
+  return groups.map(group => {
+    const tabs = group.tabs.filter(tab => !tab.uri?.startsWith('untitled://')).map(normalizeTabEditorInput);
+    const activeTabId = tabs.some(tab => tab.id === group.activeTabId) ? group.activeTabId : tabs[0]?.id;
+    return {
+      ...group,
+      activeTabId,
+      isEmpty: tabs.length === 0,
+      tabs
+    };
+  });
 };
 
 const saveState = state => {
@@ -5640,6 +5754,26 @@ const splitUp = (state, groupId) => {
 };
 
 const commandMap = {
+  'Main.closeActiveEditor': wrapCommand(closeActiveEditor),
+  'Main.closeAll': wrapCommand(closeAll$1),
+  'Main.closeAllEditors': wrapCommand(closeAll$1),
+  'Main.closeFocusedTab': wrapCommand(closeFocusedTab),
+  'Main.closeOthers': wrapCommand(closeOtherTabs),
+  'Main.closeSaved': wrapCommand(closeSaved$1),
+  'Main.closeTabsByUris': wrapCommand(closeTabsByUris),
+  'Main.closeTabsRight': wrapCommand(closeTabsRight),
+  'Main.copyPath': wrapCommand(copyPath$1),
+  'Main.copyRelativePath': wrapCommand(copyRelativePath$1),
+  'Main.focusNext': wrapCommand(focusNextTab),
+  'Main.focusNextTab': wrapCommand(focusNextTab),
+  'Main.focusPrevious': wrapCommand(focusPreviousTab),
+  'Main.focusPreviousTab': wrapCommand(focusPreviousTab),
+  'Main.handleTabContextMenu': wrapCommand(handleTabContextMenu),
+  'Main.openInput': wrapCommand(openInput),
+  'Main.openUri': wrapCommand(openUri),
+  'Main.openUris': wrapCommand(openUris),
+  'Main.save': wrapCommand(save),
+  'Main.splitRight': wrapCommand(splitRight),
   'MainArea.closeActiveEditor': wrapCommand(closeActiveEditor),
   'MainArea.closeAll': wrapCommand(closeAll$1),
   'MainArea.closeAllEditors': wrapCommand(closeAll$1),
@@ -5647,6 +5781,7 @@ const commandMap = {
   'MainArea.closeFocusedTab': wrapCommand(closeFocusedTab),
   'MainArea.closeOthers': wrapCommand(closeOtherTabs),
   'MainArea.closeSaved': wrapCommand(closeSaved$1),
+  'MainArea.closeTabsByUris': wrapCommand(closeTabsByUris),
   'MainArea.closeTabsRight': wrapCommand(closeTabsRight),
   'MainArea.copyPath': wrapCommand(copyPath$1),
   'MainArea.copyRelativePath': wrapCommand(copyRelativePath$1),

package/package.json

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