@lvce-editor/main-area-worker 6.3.0 → 6.5.0

package/dist/mainAreaWorkerMain.js

@@ -87,17 +87,6 @@ const terminate = () => {
   globalThis.close();
 };
 
-const closeAll$1 = state => {
-  return {
-    ...state,
-    layout: {
-      ...state.layout,
-      activeGroupId: undefined,
-      groups: []
-    }
-  };
-};
-
 const Button$1 = 1;
 const Div = 4;
 const Span = 8;
@@ -1628,6 +1617,37 @@ const closeTab = (state, groupId, tabId) => {
   };
 };
 
+const closeActiveEditor = state => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  const focusedGroup = groups.find(group => group.focused);
+  if (!focusedGroup) {
+    return state;
+  }
+  const {
+    activeTabId
+  } = focusedGroup;
+  if (activeTabId === undefined) {
+    return state;
+  }
+  return closeTab(state, focusedGroup.id, activeTabId);
+};
+
+const closeAll$1 = state => {
+  return {
+    ...state,
+    layout: {
+      ...state.layout,
+      activeGroupId: undefined,
+      groups: []
+    }
+  };
+};
+
 const closeFocusedTab = state => {
   const {
     layout
@@ -2129,83 +2149,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]);
 };
@@ -2332,6 +2275,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) {
@@ -2583,23 +2660,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
@@ -2747,7 +2807,8 @@ const newFile = async state => {
     isDirty: false,
     language: 'plaintext',
     loadingState: 'loading',
-    title: 'Untitled'
+    title: 'Untitled',
+    uri: 'untitled:///1'
   };
   const stateWithNewTab = openTab(newState, targetGroupId, newTab);
 
@@ -2779,7 +2840,7 @@ const newFile = async state => {
   if (actualEditorUid === -1) {
     throw new Error(`invalid editorUid`);
   }
-  await createViewlet('Editor', actualEditorUid, tabId, bounds, 'untitled:///1');
+  await createViewlet('Editor', actualEditorUid, tabId, bounds, newTab.uri || '');
 
   // After viewlet is created, get the latest state and mark it as ready
   const {
@@ -3702,6 +3763,7 @@ const splitRight = (state, groupId) => {
 };
 
 const commandMap = {
+  'MainArea.closeActiveEditor': wrapCommand(closeActiveEditor),
   'MainArea.closeAll': wrapCommand(closeAll$1),
   'MainArea.closeFocusedTab': wrapCommand(closeFocusedTab),
   'MainArea.create': create,
@@ -3716,6 +3778,7 @@ const commandMap = {
   '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),

package/package.json

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