@lvce-editor/main-area-worker 5.2.0 → 5.3.0

package/dist/mainAreaWorkerMain.js

@@ -2,7 +2,7 @@ const toCommandId = key => {
   const dotIndex = key.indexOf('.');
   return key.slice(dotIndex + 1);
 };
-const create$7 = () => {
+const create$6 = () => {
   const states = Object.create(null);
   const commandMapRef = {};
   return {
@@ -98,87 +98,6 @@ const closeAll$1 = state => {
   };
 };
 
-const {
-  get: get$2,
-  getCommandIds,
-  registerCommands,
-  set: set$4,
-  wrapCommand,
-  wrapGetter
-} = create$7();
-
-const create$6 = (uid, uri, x, y, width, height, platform, assetDir, tabHeight = 35) => {
-  const state = {
-    assetDir,
-    fileIconCache: {},
-    height,
-    layout: {
-      activeGroupId: undefined,
-      direction: 'horizontal',
-      groups: []
-    },
-    platform,
-    tabHeight,
-    uid,
-    width,
-    x,
-    y
-  };
-  set$4(uid, state, state);
-};
-
-const isEqual = (oldState, newState) => {
-  return oldState.layout === newState.layout;
-};
-
-const RenderItems = 4;
-
-const modules = [isEqual];
-const numbers = [RenderItems];
-
-const diff = (oldState, newState) => {
-  const diffResult = [];
-  for (let i = 0; i < modules.length; i++) {
-    const fn = modules[i];
-    if (!fn(oldState, newState)) {
-      diffResult.push(numbers[i]);
-    }
-  }
-  return diffResult;
-};
-
-const diff2 = uid => {
-  const {
-    newState,
-    oldState
-  } = get$2(uid);
-  const result = diff(oldState, newState);
-  return result;
-};
-
-const Button$1 = 'event.button';
-const ClientX = 'event.clientX';
-const ClientY = 'event.clientY';
-const TargetName = 'event.target.name';
-
-const Tab = 13;
-
-const Separator = 1;
-const None = 0;
-
-const SetDom2 = 'Viewlet.setDom2';
-
-const getMenuIds = () => {
-  return [Tab];
-};
-
-const handleClick = async (state, name) => {
-  if (!name) {
-    return state;
-  }
-  return state;
-};
-
 const ExtensionHostWorker = 44;
 const IconThemeWorker = 7009;
 const RendererWorker = 1;
@@ -699,7 +618,7 @@ const IpcParentWithMessagePort$1 = {
 
 const Two$1 = '2.0';
 const callbacks = Object.create(null);
-const get$1 = id => {
+const get$2 = id => {
   return callbacks[id];
 };
 const remove$1 = id => {
@@ -848,7 +767,7 @@ const warn = (...args) => {
   console.warn(...args);
 };
 const resolve = (id, response) => {
-  const fn = get$1(id);
+  const fn = get$2(id);
   if (!fn) {
     console.log(response);
     warn(`callback ${id} may already be disposed`);
@@ -1232,7 +1151,7 @@ const TransferMessagePortRpcParent = {
   __proto__: null,
   create: create$3
 };
-const create$2 = async ({
+const create$2$1 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -1244,7 +1163,7 @@ const create$2 = async ({
 };
 const WebWorkerRpcClient = {
   __proto__: null,
-  create: create$2
+  create: create$2$1
 };
 const createMockRpc = ({
   commandMap
@@ -1267,10 +1186,10 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$3 = (id, rpc) => {
+const set$4 = (id, rpc) => {
   rpcs[id] = rpc;
 };
-const get = id => {
+const get$1 = id => {
   return rpcs[id];
 };
 const remove = id => {
@@ -1278,21 +1197,21 @@ const remove = id => {
 };
 
 /* eslint-disable  @typescript-eslint/explicit-function-return-type */
-const create$1 = rpcId => {
+const create$2 = rpcId => {
   return {
     async dispose() {
-      const rpc = get(rpcId);
+      const rpc = get$1(rpcId);
       await rpc.dispose();
     },
     // @ts-ignore
     invoke(method, ...params) {
-      const rpc = get(rpcId);
+      const rpc = get$1(rpcId);
       // @ts-ignore
       return rpc.invoke(method, ...params);
     },
     // @ts-ignore
     invokeAndTransfer(method, ...params) {
-      const rpc = get(rpcId);
+      const rpc = get$1(rpcId);
       // @ts-ignore
       return rpc.invokeAndTransfer(method, ...params);
     },
@@ -1300,7 +1219,7 @@ const create$1 = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$3(rpcId, mockRpc);
+      set$4(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove(rpcId);
@@ -1309,19 +1228,19 @@ const create$1 = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$3(rpcId, rpc);
+      set$4(rpcId, rpc);
     }
   };
 };
 
 const {
-  set: set$2
-} = create$1(ExtensionHostWorker);
+  set: set$3
+} = create$2(ExtensionHostWorker);
 
 const {
   invoke: invoke$1,
-  set: set$1
-} = create$1(IconThemeWorker);
+  set: set$2
+} = create$2(IconThemeWorker);
 const getIcons = async iconRequests => {
   // @ts-ignore
   return invoke$1('IconTheme.getIcons', iconRequests);
@@ -1330,8 +1249,8 @@ const getIcons = async iconRequests => {
 const {
   invoke,
   invokeAndTransfer,
-  set
-} = create$1(RendererWorker);
+  set: set$1
+} = create$2(RendererWorker);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(uid);
   number(menuId);
@@ -1357,7 +1276,16 @@ const handleAttach = async command => {
   await invoke('Layout.attachViewlet', parentNodeSelector, command.instanceId);
 };
 
-const create = () => {
+const {
+  get,
+  getCommandIds,
+  registerCommands,
+  set,
+  wrapCommand,
+  wrapGetter
+} = create$6();
+
+const create$1 = () => {
   return Math.random();
 };
 
@@ -1430,7 +1358,7 @@ const loadTabContentAsync = async (tabId, path, requestId, getLatestState) => {
     }
 
     // Assign editorUid if tab doesn't have one yet
-    const editorUid = latestTab.editorUid === -1 ? create() : latestTab.editorUid;
+    const editorUid = latestTab.editorUid === -1 ? create$1() : latestTab.editorUid;
     return updateTab(latestState, tabId, {
       content,
       editorUid,
@@ -1467,7 +1395,7 @@ const createViewletForTab = (state, tabId, viewletModuleId, bounds) => {
   if (tab.editorUid !== -1 || tab.loadingState === 'loading' || tab.loadingState === 'loaded') {
     return state;
   }
-  const editorUid = create();
+  const editorUid = create$1();
   const newState = updateTab(state, tabId, {
     editorUid
   });
@@ -1547,9 +1475,9 @@ const handleCreate = async command => {
   const {
     newState: state,
     oldState
-  } = get$2(command.uid);
+  } = get(command.uid);
   const readyState = handleViewletReady(state, command.editorUid);
-  set$4(command.uid, oldState, readyState);
+  set(command.uid, oldState, readyState);
   return readyState;
 };
 
@@ -1648,6 +1576,98 @@ const closeTab = (state, groupId, tabId) => {
   };
 };
 
+const closeFocusedTab = 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 create = (uid, uri, x, y, width, height, platform, assetDir, tabHeight = 35) => {
+  const state = {
+    assetDir,
+    fileIconCache: {},
+    height,
+    layout: {
+      activeGroupId: undefined,
+      direction: 'horizontal',
+      groups: []
+    },
+    platform,
+    tabHeight,
+    uid,
+    width,
+    x,
+    y
+  };
+  set(uid, state, state);
+};
+
+const isEqual = (oldState, newState) => {
+  return oldState.layout === newState.layout;
+};
+
+const RenderItems = 4;
+
+const modules = [isEqual];
+const numbers = [RenderItems];
+
+const diff = (oldState, newState) => {
+  const diffResult = [];
+  for (let i = 0; i < modules.length; i++) {
+    const fn = modules[i];
+    if (!fn(oldState, newState)) {
+      diffResult.push(numbers[i]);
+    }
+  }
+  return diffResult;
+};
+
+const diff2 = uid => {
+  const {
+    newState,
+    oldState
+  } = get(uid);
+  const result = diff(oldState, newState);
+  return result;
+};
+
+const Button$1 = 'event.button';
+const ClientX = 'event.clientX';
+const ClientY = 'event.clientY';
+const TargetName = 'event.target.name';
+
+const Tab = 13;
+
+const Separator = 1;
+const None = 0;
+
+const SetDom2 = 'Viewlet.setDom2';
+
+const getMenuIds = () => {
+  return [Tab];
+};
+
+const handleClick = async (state, name) => {
+  if (!name) {
+    return state;
+  }
+  return state;
+};
+
 const handleClickCloseTab = (state, rawGroupIndex, rawIndex) => {
   if (!rawGroupIndex || !rawIndex) {
     return state;
@@ -1708,9 +1728,9 @@ const getNextRequestId = () => {
 const startContentLoading = async (oldState, state, tabId, path, requestId) => {
   try {
     const getLatestState = () => {
-      return get$2(state.uid).newState;
+      return get(state.uid).newState;
     };
-    set$4(state.uid, oldState, state);
+    set(state.uid, oldState, state);
     const newState = await loadTabContentAsync(tabId, path, requestId, getLatestState);
     return newState;
   } catch {
@@ -1842,7 +1862,7 @@ const selectTab = async (state, groupIndex, index) => {
         newState = createdState;
 
         // Store updated state before creating viewlet
-        set$4(uid, state, newState);
+        set(uid, state, newState);
 
         // Execute viewlet commands if any
         if (switchCommands.length > 0) {
@@ -1861,7 +1881,7 @@ const selectTab = async (state, groupIndex, index) => {
 
             // Mark viewlet as ready
             newState = handleViewletReady(newState, editorUid);
-            set$4(uid, state, newState);
+            set(uid, state, newState);
           }
         }
 
@@ -1876,7 +1896,7 @@ const selectTab = async (state, groupIndex, index) => {
       // Viewlet creation is optional - silently ignore if RendererWorker isn't available
     }
   }
-  set$4(uid, state, newState);
+  set(uid, state, newState);
 
   // Execute viewlet commands if any
   if (switchCommands.length > 0) {
@@ -1935,7 +1955,7 @@ const createExtensionHostRpc = async () => {
 
 const initialize = async () => {
   const rpc = await createExtensionHostRpc();
-  set$2(rpc);
+  set$3(rpc);
 };
 
 const isValidTab = tab => {
@@ -2113,7 +2133,7 @@ const createViewlets = async (layout, viewletModuleIds, bounds) => {
   for (const group of layout.groups) {
     const activeTab = group.tabs.find(tab => tab.id === group.activeTabId);
     if (activeTab && viewletModuleIds[activeTab.id]) {
-      const editorUid = activeTab.editorUid === -1 ? create() : activeTab.editorUid;
+      const editorUid = activeTab.editorUid === -1 ? create$1() : activeTab.editorUid;
       editorUids[activeTab.id] = editorUid;
       await createViewlet(viewletModuleIds[activeTab.id], editorUid, activeTab.id, bounds, activeTab.uri);
     }
@@ -2235,6 +2255,16 @@ const loadContent = async (state, savedState) => {
   };
 };
 
+const findGroupById = (state, groupId) => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  return groups.find(group => group.id === groupId);
+};
+
 const emptyObject = {};
 const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
 const i18nString = (key, placeholders = emptyObject) => {
@@ -2286,16 +2316,20 @@ const getMenuEntries$1 = state => {
     layout
   } = state;
   const {
-    activeGroupId,
-    groups
+    activeGroupId
   } = layout;
-  const group = groups[activeGroupId || 0];
+  const group = findGroupById(state, activeGroupId || 0);
+  if (!group) {
+    return [];
+  }
   const {
     activeTabId,
     tabs
   } = group;
-  const tab = tabs[activeTabId || 0];
-  object(tab);
+  const tab = tabs.find(t => t.id === activeTabId);
+  if (!tab) {
+    return [];
+  }
   const {
     uri: path
   } = tab;
@@ -2367,10 +2401,10 @@ const createEmptyGroup = (state, uri, requestId) => {
   const {
     groups
   } = layout;
-  const groupId = create();
+  const groupId = create$1();
   const title = getLabel(uri);
-  const tabId = create();
-  const editorUid = create();
+  const tabId = create$1();
+  const editorUid = create$1();
   const newTab = {
     content: '',
     editorType: 'text',
@@ -2404,7 +2438,7 @@ const createEmptyGroup = (state, uri, requestId) => {
 const openTab = (state, groupId, tab) => {
   const newTab = 'id' in tab && tab.id !== undefined ? tab : {
     ...tab,
-    id: create()
+    id: create$1()
   };
   const {
     layout
@@ -2450,8 +2484,8 @@ const ensureActiveGroup = (state, uri) => {
   if (activeGroup) {
     // Create a new tab with the URI in the active group
     const title = getLabel(uri);
-    const tabId = create();
-    const editorUid = create();
+    const tabId = create$1();
+    const editorUid = create$1();
     const newTab = {
       content: '',
       editorType: 'text',
@@ -2606,7 +2640,7 @@ const openUri = async (state, options) => {
     newState: switchedState
   } = switchViewlet(intermediateState1);
   intermediateState1 = switchedState;
-  set$4(uid, state, intermediateState1);
+  set(uid, state, intermediateState1);
 
   // @ts-ignore
 
@@ -2627,7 +2661,7 @@ const openUri = async (state, options) => {
   // This ensures we have any state updates that occurred during viewlet creation
   const {
     newState: latestState
-  } = get$2(uid);
+  } = get(uid);
 
   // Attachment is handled automatically by virtual DOM reference nodes
   const readyState = handleViewletReady(latestState, editorUid);
@@ -2866,8 +2900,8 @@ const render2 = (uid, diffResult) => {
   const {
     newState,
     oldState
-  } = get$2(uid);
-  set$4(uid, newState, newState);
+  } = get(uid);
+  set(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
   return commands;
 };
@@ -2907,7 +2941,8 @@ const saveState = state => {
 
 const commandMap = {
   'MainArea.closeAll': wrapCommand(closeAll$1),
-  'MainArea.create': create$6,
+  'MainArea.closeFocusedTab': wrapCommand(closeFocusedTab),
+  'MainArea.create': create,
   'MainArea.diff2': diff2,
   'MainArea.getCommandIds': getCommandIds,
   'MainArea.getMenuEntries': wrapGetter(getMenuEntries),
@@ -2945,14 +2980,14 @@ const createIconThemeWorkerRpc = async () => {
 
 const initializeIconThemeWorker = async () => {
   const rpc = await createIconThemeWorkerRpc();
-  set$1(rpc);
+  set$2(rpc);
 };
 
 const initializeRendererWorker = async () => {
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap
   });
-  set(rpc);
+  set$1(rpc);
 };
 
 const listen = async () => {
@@ -2969,7 +3004,7 @@ const main$1 = async () => {
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap
   });
-  set(rpc);
+  set$1(rpc);
 };
 
 const main = async () => {

package/package.json

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