@lvce-editor/main-area-worker 1.8.0 → 1.10.0

package/dist/mainAreaWorkerMain.js

@@ -96,12 +96,6 @@ const object = value => {
     throw new AssertionError('expected value to be of type object');
   }
 };
-const number = value => {
-  const type = getType(value);
-  if (type !== Number$1) {
-    throw new AssertionError('expected value to be of type number');
-  }
-};
 
 const isMessagePort = value => {
   return value && value instanceof MessagePort;
@@ -456,7 +450,7 @@ const getFirstEvent = (eventEmitter, eventMap) => {
   return promise;
 };
 const Message$1 = 3;
-const create$5 = async ({
+const create$5$1 = async ({
   isMessagePortOpen,
   messagePort
 }) => {
@@ -507,7 +501,7 @@ const wrap$5 = messagePort => {
 };
 const IpcParentWithMessagePort$1 = {
   __proto__: null,
-  create: create$5,
+  create: create$5$1,
   signal: signal$1,
   wrap: wrap$5
 };
@@ -726,7 +720,7 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$2(id, errorProperty);
 };
-const create$3 = (message, result) => {
+const create$5 = (message, result) => {
   return {
     jsonrpc: Two$1,
     id: message.id,
@@ -735,7 +729,7 @@ const create$3 = (message, result) => {
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$3(message, resultProperty);
+  return create$5(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
@@ -1059,7 +1053,7 @@ const remove = id => {
 };
 
 /* eslint-disable  @typescript-eslint/explicit-function-return-type */
-const create$2 = rpcId => {
+const create$3 = rpcId => {
   return {
     async dispose() {
       const rpc = get$1(rpcId);
@@ -1097,12 +1091,12 @@ const create$2 = rpcId => {
 
 const {
   set: set$2
-} = create$2(ExtensionHostWorker);
+} = create$3(ExtensionHostWorker);
 
 const {
   invokeAndTransfer,
   set: set$1
-} = create$2(RendererWorker);
+} = create$3(RendererWorker);
 const sendMessagePortToExtensionHostWorker$1 = async (port, rpcId = 0) => {
   const command = 'HandleMessagePort.handleMessagePort2';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, command, rpcId);
@@ -1112,7 +1106,7 @@ const toCommandId = key => {
   const dotIndex = key.indexOf('.');
   return key.slice(dotIndex + 1);
 };
-const create$1 = () => {
+const create$2 = () => {
   const states = Object.create(null);
   const commandMapRef = {};
   return {
@@ -1198,13 +1192,13 @@ const {
   getCommandIds,
   registerCommands,
   set,
-  wrapCommand} = create$1();
+  wrapCommand} = create$2();
 
-const create = (uid, uri, x, y, width, height, platform, assetDir) => {
+const create$1 = (uid, uri, x, y, width, height, platform, assetDir) => {
   const state = {
     assetDir,
     layout: {
-      activeGroupId: '',
+      activeGroupId: undefined,
       direction: 'horizontal',
       groups: []
     },
@@ -1250,9 +1244,87 @@ const handleClick = async (state, name) => {
   return state;
 };
 
-const handleClickCloseTab = (state, groupId, tabId) => {
-  // TODO
-  return state;
+const closeTab = (state, groupId, tabId) => {
+  const {
+    layout
+  } = state;
+  const {
+    activeGroupId,
+    groups
+  } = layout;
+  const newGroups = groups.map(group => {
+    if (group.id === groupId) {
+      const newTabs = group.tabs.filter(tab => tab.id !== tabId);
+      let newActiveTabId = group.activeTabId;
+      if (group.activeTabId === tabId) {
+        const tabIndex = group.tabs.findIndex(tab => tab.id === tabId);
+        if (newTabs.length > 0) {
+          newActiveTabId = newTabs[Math.min(tabIndex, newTabs.length - 1)].id;
+        } else {
+          newActiveTabId = undefined;
+        }
+      }
+      return {
+        ...group,
+        activeTabId: newActiveTabId,
+        tabs: newTabs
+      };
+    }
+    return group;
+  });
+
+  // If the group has no tabs left and there are other groups, remove the group
+  const groupWithNoTabs = newGroups.find(group => group.id === groupId && group.tabs.length === 0);
+  if (groupWithNoTabs && newGroups.length > 1) {
+    const remainingGroups = newGroups.filter(group => group.id !== groupId);
+    const redistributedGroups = remainingGroups.map(group => ({
+      ...group,
+      size: Math.round(100 / remainingGroups.length)
+    }));
+    const newActiveGroupId = activeGroupId === groupId ? remainingGroups[0]?.id : activeGroupId;
+    return {
+      ...state,
+      layout: {
+        ...layout,
+        activeGroupId: newActiveGroupId,
+        groups: redistributedGroups
+      }
+    };
+  }
+  return {
+    ...state,
+    layout: {
+      ...layout,
+      groups: newGroups
+    }
+  };
+};
+
+const handleClickCloseTab = (state, rawGroupIndex, rawIndex) => {
+  if (!rawGroupIndex || !rawIndex) {
+    return state;
+  }
+  const groupIndex = Number.parseInt(rawGroupIndex);
+  const index = Number.parseInt(rawIndex);
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+
+  // Validate indexes
+  if (groupIndex < 0 || groupIndex >= groups.length) {
+    return state;
+  }
+  const group = groups[groupIndex];
+  if (index < 0 || index >= group.tabs.length) {
+    return state;
+  }
+  const tab = group.tabs[index];
+  const groupId = group.id;
+  const tabId = tab.id;
+  return closeTab(state, groupId, tabId);
 };
 
 const selectTab = async (state, groupIndex, index) => {
@@ -1327,30 +1399,59 @@ const initialize = async () => {
   set$2(rpc);
 };
 
-const loadContent = async state => {
+const getTabs = async () => {
   const tabs = [{
     content: '',
     editorType: 'text',
-    id: '1',
+    id: 1,
     isDirty: false,
     title: 'tab 1'
   }, {
     content: '',
     editorType: 'text',
-    id: '2',
+    id: 2,
     isDirty: false,
     title: 'tab 2'
+  }, {
+    content: '',
+    editorType: 'text',
+    id: 3,
+    isDirty: false,
+    title: 'tab 3'
+  }, {
+    content: '',
+    editorType: 'text',
+    id: 4,
+    isDirty: false,
+    title: 'tab 4'
+  }, {
+    content: '',
+    editorType: 'text',
+    id: 5,
+    isDirty: false,
+    title: 'tab 5'
+  }, {
+    content: '',
+    editorType: 'text',
+    id: 6,
+    isDirty: false,
+    title: 'tab 6'
   }];
+  return tabs;
+};
+
+const loadContent = async state => {
+  const tabs = await getTabs();
   return {
     ...state,
     layout: {
-      activeGroupId: '0',
+      activeGroupId: 0,
       direction: 'horizontal',
       groups: [{
         activeTabId: tabs.length > 0 ? tabs[0].id : undefined,
         direction: 'horizontal',
         focused: false,
-        id: '0',
+        id: 0,
         size: 300,
         tabs
       }]
@@ -1358,14 +1459,185 @@ const loadContent = async state => {
   };
 };
 
+const findTabByUri = (state, uri) => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  for (const group of groups) {
+    const tab = group.tabs.find(t => t.path === 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
+    }
+  };
+};
+
+let idCounter = 0;
+const create = () => {
+  idCounter++;
+  return idCounter;
+};
+
+const openTab = (state, groupId, tab) => {
+  const newTab = {
+    ...tab,
+    id: create()
+  };
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  const updatedGroups = groups.map(group => {
+    if (group.id === groupId) {
+      return {
+        ...group,
+        activeTabId: newTab.id,
+        tabs: [...group.tabs, newTab]
+      };
+    }
+    return group;
+  });
+  return {
+    ...state,
+    layout: {
+      ...layout,
+      groups: updatedGroups
+    }
+  };
+};
+
+const getLabel = uri => {
+  if (uri.startsWith('settings://')) {
+    return 'Settings';
+  }
+  if (uri.startsWith('simple-browser://')) {
+    return 'Simple Browser';
+  }
+  return uri;
+  // return Workspace.pathBaseName(uri)
+};
+
+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 openUri = async (state, options) => {
   object(state);
   object(options);
+  const {
+    uri
+  } = options;
 
-  // TODO
-  return {
-    ...state
+  // Check if a tab with this URI already exists
+  const existingTab = findTabByUri(state, uri);
+  if (existingTab) {
+    // Tab exists, switch to it and focus its group
+    const focusedState = focusEditorGroup(state, existingTab.groupId);
+    return switchTab(focusedState, existingTab.groupId, existingTab.tab.id);
+  }
+
+  // Find the active group (by activeGroupId or focused flag)
+  const {
+    layout
+  } = state;
+  const {
+    activeGroupId,
+    groups
+  } = layout;
+  const activeGroup = activeGroupId === undefined ? groups.find(group => group.focused) : groups.find(group => group.id === activeGroupId);
+
+  // If no active group exists, create one
+  if (!activeGroup) {
+    const groupId = create();
+    const title = getLabel(uri);
+    const newTab = {
+      content: '',
+      editorType: 'text',
+      id: create(),
+      isDirty: false,
+      path: uri,
+      title
+    };
+    const newGroup = {
+      activeTabId: newTab.id,
+      focused: true,
+      id: groupId,
+      size: 100,
+      tabs: [newTab]
+    };
+    return {
+      ...state,
+      layout: {
+        ...layout,
+        activeGroupId: groupId,
+        groups: [...groups, newGroup]
+      }
+    };
+  }
+
+  // Create a new tab with the URI in the active group
+  const title = getLabel(uri);
+  const newTab = {
+    content: '',
+    editorType: 'text',
+    isDirty: false,
+    path: uri,
+    title
   };
+  return openTab(state, activeGroup.id, newTab);
 };
 
 const text = data => {
@@ -1381,7 +1653,15 @@ const CSS_CLASSES = {
 
 const renderEditor = tab => {
   if (!tab) {
-    return [text('Tab not found')];
+    return [{
+      childCount: 1,
+      className: 'TextEditor',
+      type: Div
+    }, {
+      childCount: 1,
+      className: 'EditorContent',
+      type: Pre
+    }, text('')];
   }
   if (tab.editorType === 'custom') {
     return [{
@@ -1421,6 +1701,8 @@ const renderTab = (tab, isActive, tabIndex, groupIndex) => {
   }, text(tab.isDirty ? `*${tab.title}` : tab.title), {
     childCount: 1,
     className: 'EditorTabCloseButton',
+    'data-groupIndex': groupIndex,
+    'data-index': tabIndex,
     onClick: HandleClickClose,
     type: Button
   }, text('×')];
@@ -1519,24 +1801,17 @@ const resize = (state, dimensions) => {
   };
 };
 
-const saveState = uid => {
-  number(uid);
-  const value = get(uid);
+const saveState = state => {
   const {
-    newState
-  } = value;
-  const {
-    statusBarItemsLeft,
-    statusBarItemsRight
-  } = newState;
+    layout
+  } = state;
   return {
-    itemsLeft: statusBarItemsLeft,
-    itemsRight: statusBarItemsRight
+    layout
   };
 };
 
 const commandMap = {
-  'MainArea.create': create,
+  'MainArea.create': create$1,
   'MainArea.diff2': diff2,
   'MainArea.getCommandIds': getCommandIds,
   'MainArea.handleClick': wrapCommand(handleClick),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/main-area-worker",
-  "version": "1.8.0",
+  "version": "1.10.0",
   "description": "Main Area Worker",
   "repository": {
     "type": "git",
@@ -11,6 +11,6 @@
   "type": "module",
   "main": "dist/mainAreaWorkerMain.js",
   "dependencies": {
-    "@lvce-editor/virtual-dom-worker": "^5.0.0"
+    "@lvce-editor/virtual-dom-worker": "^5.1.0"
   }
 }