@lvce-editor/main-area-worker 9.37.2 → 9.37.4

package/dist/mainAreaWorkerMain.js

@@ -1468,8 +1468,12 @@ const SetPatches = 'Viewlet.setPatches';
 const FocusEditorText = 12;
 
 const {
+  invoke: invoke$3,
   set: set$4
 } = create$4(ClipBoardWorker);
+const writeText = async text => {
+  return invoke$3('ClipBoard.writeText', text);
+};
 
 const {
   invoke: invoke$2,
@@ -1578,9 +1582,6 @@ const confirm$1 = async (message, options) => {
   const result = await invoke('ConfirmPrompt.prompt', message, options);
   return result;
 };
-const writeClipBoardText = async text => {
-  await invoke('ClipBoard.writeText', /* text */text);
-};
 
 const toCommandId = key => {
   const dotIndex = key.indexOf('.');
@@ -1873,7 +1874,7 @@ const withGroupsAndActiveGroup = (state, groups, activeGroupId) => {
 };
 
 const withEmptyGroups = state => {
-  return withGroupsAndActiveGroup(state, [], undefined);
+  return withGroupsAndActiveGroup(state, [], -1);
 };
 
 const withGroups = (state, groups) => {
@@ -1924,7 +1925,7 @@ const closeTab = (state, groupId, tabId) => {
         if (newTabs.length > 0) {
           newActiveTabId = newTabs[Math.min(tabIndex, newTabs.length - 1)].id;
         } else {
-          newActiveTabId = undefined;
+          newActiveTabId = -1;
         }
       }
       return {
@@ -1945,7 +1946,7 @@ const closeTab = (state, groupId, tabId) => {
     // If there are remaining groups, redistribute sizes
     if (remainingGroups.length > 0) {
       const redistributedGroups = redistributeSizesWithRounding(remainingGroups);
-      const newActiveGroupId = activeGroupId === groupId ? remainingGroups[0]?.id : activeGroupId;
+      const newActiveGroupId = activeGroupId === groupId ? remainingGroups[0]?.id ?? -1 : activeGroupId;
       return withGroupsAndActiveGroup(stateWithClosedTab, redistributedGroups, newActiveGroupId);
     }
 
@@ -1969,8 +1970,12 @@ const getTitle$1 = async editorUid => {
     return undefined;
   }
 };
-const createViewlet = async (viewletModuleId, editorUid, tabId, bounds, uri) => {
-  await invoke('Layout.createViewlet', viewletModuleId, editorUid, tabId, bounds, uri);
+const createViewlet = async (viewletModuleId, editorUid, tabId, bounds, uri, args) => {
+  if (args === undefined) {
+    await invoke('Layout.createViewlet', viewletModuleId, editorUid, tabId, bounds, uri);
+  } else {
+    await invoke('Layout.createViewlet', viewletModuleId, editorUid, tabId, bounds, uri, args);
+  }
   return getTitle$1(editorUid);
 };
 
@@ -2460,6 +2465,9 @@ const closeTabAndSave = async (state, groupId, tabId) => {
   return closeTabWithViewlet(state, groupId, tabId);
 };
 
+const isFocused$1 = group => {
+  return group.focused;
+};
 const getFocusedGroup = state => {
   const {
     layout
@@ -2467,7 +2475,7 @@ const getFocusedGroup = state => {
   const {
     groups
   } = layout;
-  return groups.find(group => group.focused);
+  return groups.find(isFocused$1);
 };
 
 const closeActiveEditor = async state => {
@@ -2478,7 +2486,7 @@ const closeActiveEditor = async state => {
   const {
     activeTabId
   } = focusedGroup;
-  if (activeTabId === undefined) {
+  if (activeTabId === -1) {
     return state;
   }
   return closeTabAndSave(state, focusedGroup.id, activeTabId);
@@ -2563,7 +2571,7 @@ const closeFocusedTab = async state => {
   const {
     activeTabId
   } = focusedGroup;
-  if (activeTabId === undefined) {
+  if (activeTabId === -1) {
     return state;
   }
   return closeTabAndSave(state, focusedGroup.id, activeTabId);
@@ -2578,7 +2586,7 @@ const closeOtherTabs = (state, groupId) => {
     groups
   } = layout;
   const targetGroupId = groupId ?? activeGroupId;
-  if (targetGroupId === undefined) {
+  if (targetGroupId === -1) {
     return state;
   }
   const group = groups.find(g => g.id === targetGroupId);
@@ -2588,7 +2596,7 @@ const closeOtherTabs = (state, groupId) => {
   const {
     activeTabId
   } = group;
-  if (activeTabId === undefined) {
+  if (activeTabId === -1) {
     return state;
   }
   const closedTabs = group.tabs.map((tab, tabIndex) => ({
@@ -2619,15 +2627,15 @@ const closeOtherTabs = (state, groupId) => {
 };
 
 const getNextActiveTabId = (tabs, newTabs, activeTabId) => {
-  if (activeTabId === undefined) {
-    return undefined;
+  if (activeTabId === -1) {
+    return -1;
   }
   if (newTabs.some(tab => tab.id === activeTabId)) {
     return activeTabId;
   }
   const activeTabIndex = tabs.findIndex(tab => tab.id === activeTabId);
   if (activeTabIndex === -1 || newTabs.length === 0) {
-    return undefined;
+    return -1;
   }
   return newTabs[Math.min(activeTabIndex, newTabs.length - 1)].id;
 };
@@ -2720,7 +2728,7 @@ const closeTabsRight = (state, groupId) => {
     activeTabId,
     tabs
   } = group;
-  if (activeTabId === undefined) {
+  if (activeTabId === -1) {
     return state;
   }
   const activeTabIndex = tabs.findIndex(tab => tab.id === activeTabId);
@@ -2768,14 +2776,14 @@ const copyIntoNewWindow$1 = async state => {
   const {
     activeGroupId
   } = layout;
-  const group = findGroupById(state, activeGroupId ?? 0);
+  const group = findGroupById(state, activeGroupId);
   if (!group) {
     return state;
   }
   const {
     activeTabId
   } = group;
-  if (activeTabId === undefined) {
+  if (activeTabId === -1) {
     return state;
   }
   const tab = group.tabs.find(tab => tab.id === activeTabId);
@@ -2788,15 +2796,14 @@ const copyIntoNewWindow$1 = async state => {
 
 const copyPath$1 = async (state, path) => {
   string(path);
-  await writeClipBoardText(path);
+  await writeText(path);
   return state;
 };
 
 const copyRelativePath$1 = async (state, path) => {
   string(path);
-  // TODO use clipboard worker
   const relativePath = await invoke('Workspace.pathBaseName', path);
-  await invoke('ClipBoard.writeText', relativePath);
+  await writeText(relativePath);
   return state;
 };
 
@@ -2828,7 +2835,7 @@ const create$1 = (uid, uri, x, y, width, height, platform, assetDir, tabHeight =
     iframes: [],
     initial: true,
     layout: {
-      activeGroupId: undefined,
+      activeGroupId: -1,
       direction: Horizontal,
       groups: []
     },
@@ -3656,7 +3663,9 @@ const restoreClosedTab = async state => {
   if (!restored) {
     return state;
   }
-  return selectTab(restored.newState, restored.groupIndex, restored.tabIndex);
+  const newState = await selectTab(restored.newState, restored.groupIndex, restored.tabIndex);
+  set(state.uid, state, newState);
+  return newState;
 };
 
 const focusEditorGroup = (state, groupId) => {
@@ -3924,7 +3933,7 @@ const ensureActiveGroup = (state, uri, preview = false, title = getLabel(uri), e
     activeGroupId,
     groups
   } = layout;
-  const activeGroup = activeGroupId === undefined ? groups.find(group => group.focused) : groups.find(group => group.id === activeGroupId);
+  const activeGroup = activeGroupId === -1 ? groups.find(group => group.focused) : groups.find(group => group.id === activeGroupId);
 
   // Generate a request ID for content loading
   const requestId = getNextRequestId();
@@ -4214,7 +4223,7 @@ const getActivePreviewEditorUid = state => {
     activeGroupId,
     groups
   } = layout;
-  const activeGroup = activeGroupId === undefined ? groups.find(group => group.focused) : groups.find(group => group.id === activeGroupId);
+  const activeGroup = activeGroupId === -1 ? groups.find(group => group.focused) : groups.find(group => group.id === activeGroupId);
   const activeTab = activeGroup?.tabs.find(tab => tab.id === activeGroup.activeTabId);
   return activeTab?.isPreview ? activeTab.editorUid : -1;
 };
@@ -4290,7 +4299,7 @@ const openInputWithContext = async (context, options) => {
     if (editorUid === -1) {
       throw new Error('invalid editorUid');
     }
-    const renderedTitle = await createViewlet(viewletModuleId, editorUid, tabId, bounds, uri);
+    const renderedTitle = await createViewlet(viewletModuleId, editorUid, tabId, bounds, uri, options.args);
     const latestState = context.getState();
     const readyState = handleViewletReady(latestState, editorUid, renderedTitle);
     await context.updateState(() => readyState);
@@ -4334,20 +4343,31 @@ const getOptionUriOptions = options => {
   return options.uri;
 };
 
-const getOpenInputOptions = options => {
+const getViewletContext = (options, viewletContext) => {
+  if (viewletContext !== undefined || typeof options === 'string') {
+    return viewletContext;
+  }
+  const context = Object.fromEntries(Object.entries(options).filter(([key]) => key !== 'focus' && key !== 'preview' && key !== 'uri'));
+  return Object.keys(context).length === 0 ? undefined : context;
+};
+const getOpenInputOptions = (options, focus = true, viewletContext) => {
   const uri = getOptionUriOptions(options);
   const preview = typeof options === 'string' ? false : options.preview ?? false;
+  const context = getViewletContext(options, viewletContext);
   return {
+    ...(context !== undefined && {
+      args: [context]
+    }),
     editorInput: getNormalizedOpenEditorInput(uri),
-    focus: typeof options === 'string' ? false : options.focus,
+    focus: typeof options === 'string' ? focus : options.focus,
     preview
   };
 };
-const openUri = async (state, options) => {
-  return openInput(state, getOpenInputOptions(options));
+const openUri = async (state, options, focus = true, viewletContext) => {
+  return openInput(state, getOpenInputOptions(options, focus, viewletContext));
 };
-const openUriWithContext = async (context, options) => {
-  await openInputWithContext(context, getOpenInputOptions(options));
+const openUriWithContext = async (context, options, focus = true, viewletContext) => {
+  await openInputWithContext(context, getOpenInputOptions(options, focus, viewletContext));
 };
 
 const retryOpen = async state => {
@@ -4550,7 +4570,7 @@ const splitEditorGroup$1 = (state, groupId, direction) => {
   const newGroupId = create$2();
   const splitLayoutDirection = getSplitLayoutDirection(direction);
   const baseNewGroup = {
-    activeTabId: undefined,
+    activeTabId: -1,
     direction: sourceGroup.direction,
     focused: true,
     id: newGroupId,
@@ -4589,7 +4609,7 @@ const handleClickAction = async (state, action, rawGroupId) => {
   if (action === RestoreClosedTab) {
     return restoreClosedTab(state);
   }
-  if (activeGroupId === undefined) {
+  if (activeGroupId === -1) {
     return state;
   }
   const activeGroup = getActiveGroup(groups, activeGroupId);
@@ -4852,36 +4872,10 @@ const parseUriList = value => {
   return value.split(lineSeparatorRegex).map(uri => uri.trim()).filter(uri => uri && !uri.startsWith('#'));
 };
 
-const windowsDriveLetterRegex = /^[a-zA-Z]:\\/;
-const encodeFilePath = path => {
-  return encodeURI(path).replaceAll('#', '%23').replaceAll('?', '%3F');
-};
-const toFileUri$1 = path => {
-  if (path.startsWith('file://')) {
-    return path;
-  }
-  if (windowsDriveLetterRegex.test(path)) {
-    const normalizedPath = path.replaceAll('\\', '/');
-    return `file:///${encodeFilePath(normalizedPath)}`;
-  }
-  return `file://${encodeFilePath(path)}`;
-};
-
 const suffixByHandleKind = {
   directory: '/',
   file: ''
 };
-const getDroppedElectronUris = async (itemIds, files) => {
-  if (itemIds.length > 0) {
-    await getFileHandles(itemIds);
-  }
-  const uris = [];
-  for (const file of files) {
-    const path = await invoke('FileSystemHandle.getFilePathElectron', file);
-    uris.push(toFileUri$1(path));
-  }
-  return uris;
-};
 const getDroppedBrowserUris = async itemIds => {
   if (itemIds.length === 0) {
     return [];
@@ -4922,6 +4916,34 @@ const getDroppedBrowserUris = async itemIds => {
   }
   return uris;
 };
+
+const windowsDriveLetterRegex = /^[a-zA-Z]:\\/;
+const encodeFilePath = path => {
+  return encodeURI(path).replaceAll('#', '%23').replaceAll('?', '%3F');
+};
+const toFileUri$1 = path => {
+  if (path.startsWith('file://')) {
+    return path;
+  }
+  if (windowsDriveLetterRegex.test(path)) {
+    const normalizedPath = path.replaceAll('\\', '/');
+    return `file:///${encodeFilePath(normalizedPath)}`;
+  }
+  return `file://${encodeFilePath(path)}`;
+};
+
+const getDroppedElectronUris = async (itemIds, files) => {
+  if (itemIds.length > 0) {
+    await getFileHandles(itemIds);
+  }
+  const uris = [];
+  for (const file of files) {
+    const path = await invoke('FileSystemHandle.getFilePathElectron', file);
+    uris.push(toFileUri$1(path));
+  }
+  return uris;
+};
+
 const getDroppedUris = async (itemIds, files = [], platform = Web) => {
   if (platform === Electron && files.length > 0) {
     return getDroppedElectronUris(itemIds, files);
@@ -5004,7 +5026,7 @@ const newFile = async state => {
   } = layout;
 
   // Find the active group
-  const activeGroup = activeGroupId === undefined ? groups.find(group => group.focused) : groups.find(group => group.id === activeGroupId);
+  const activeGroup = activeGroupId === -1 ? groups.find(group => group.focused) : groups.find(group => group.id === activeGroupId);
 
   // Prepare initial state
   let newState = state;
@@ -5029,7 +5051,7 @@ const newFile = async state => {
           if (group.id === targetGroupId) {
             return {
               ...group,
-              activeTabId: undefined,
+              activeTabId: -1,
               tabs: []
             };
           }
@@ -5638,7 +5660,7 @@ const isValidTab = tab => {
 };
 
 const isValidEditorGroup = group => {
-  return group && typeof group.id === 'number' && Array.isArray(group.tabs) && group.tabs.every(isValidTab) && (group.activeTabId === undefined || typeof group.activeTabId === 'number') && isLayoutDirection(group.direction) && typeof group.focused === 'boolean' && (group.segmentId === undefined || typeof group.segmentId === 'number') && typeof group.size === 'number' && group.size > 0 && typeof group.isEmpty === 'boolean';
+  return group && typeof group.id === 'number' && Array.isArray(group.tabs) && group.tabs.every(isValidTab) && typeof group.activeTabId === 'number' && isLayoutDirection(group.direction) && typeof group.focused === 'boolean' && (group.segmentId === undefined || typeof group.segmentId === 'number') && typeof group.size === 'number' && group.size > 0 && typeof group.isEmpty === 'boolean';
 };
 
 const isValidMainAreaLayout = layout => {
@@ -5646,7 +5668,7 @@ const isValidMainAreaLayout = layout => {
     return false;
   }
   const layoutObj = layout;
-  if (layoutObj.activeGroupId !== undefined && typeof layoutObj.activeGroupId !== 'number') {
+  if (typeof layoutObj.activeGroupId !== 'number') {
     return false;
   }
   if (!isLayoutDirection(layoutObj.direction)) {
@@ -5707,11 +5729,13 @@ const tryRestoreLayout = savedState => {
   // Mark all restored tabs as not dirty
   const normalizedLayout = {
     ...rawLayout,
+    activeGroupId: rawLayout.activeGroupId === undefined ? -1 : rawLayout.activeGroupId,
     direction: layoutDirection,
     groups: rawLayout.groups.map(group => {
       const groupDirection = normalizeGroupDirection(group, layoutDirection);
       return {
         ...group,
+        activeTabId: group?.activeTabId === undefined ? -1 : group.activeTabId,
         direction: groupDirection,
         tabs: Array.isArray(group?.tabs) ? group.tabs.map(normalizeRestoredTab) : []
       };
@@ -5876,7 +5900,7 @@ const loadContent$1 = async (state, savedState) => {
     ...stateWithHomeDir,
     initial: false,
     layout: {
-      activeGroupId: undefined,
+      activeGroupId: -1,
       direction: Horizontal,
       groups: []
     }
@@ -5884,7 +5908,11 @@ const loadContent$1 = async (state, savedState) => {
 };
 
 const handleWorkspaceChange = async (state, _workspacePath, savedState) => {
-  return loadContent$1(state, savedState);
+  const newState = await loadContent$1(state, savedState);
+  return {
+    ...newState,
+    closedTabs: []
+  };
 };
 
 const handleWorkspaceRefresh = async (state, refresh = {}) => {
@@ -6280,14 +6308,14 @@ const moveIntoNewWindow = async state => {
   const {
     activeGroupId
   } = layout;
-  const group = findGroupById(state, activeGroupId ?? 0);
+  const group = findGroupById(state, activeGroupId);
   if (!group) {
     return state;
   }
   const {
     activeTabId
   } = group;
-  if (activeTabId === undefined) {
+  if (activeTabId === -1) {
     return state;
   }
   const tab = group.tabs.find(tab => tab.id === activeTabId);
@@ -6431,16 +6459,19 @@ const getSashCss = (layout, width = 0) => {
   return getProtoSashCss(layout, width).map(renderSashCss);
 };
 
+const getSashCornerCss = (left, top) => {
+  return `.SashCorner {
+  left: ${left}%;
+  top: ${top}%;
+}`;
+};
 const getCss = (layout, width = 0, dragOverlay) => {
   const rules = [];
   if (layout) {
     rules.push(...getEditorGroupCss(layout), ...getDragOverlayCss(dragOverlay), ...getSashCss(layout, width));
     const sashCorner = getSashCorner(layout);
     if (sashCorner) {
-      rules.push(`.SashCorner {
-  left: ${sashCorner.leftOffset}%;
-  top: ${sashCorner.topOffset}%;
-}`);
+      rules.push(getSashCornerCss(sashCorner.leftOffset, sashCorner.topOffset));
     }
   }
   const css = rules.join('\n');
@@ -7588,7 +7619,7 @@ const getSavedTab = tab => {
 const getFilteredGroups = groups => {
   return groups.map(group => {
     const tabs = group.tabs.filter(tab => !tab.uri?.startsWith('untitled://')).map(getSavedTab);
-    const activeTabId = tabs.some(tab => tab.id === group.activeTabId) ? group.activeTabId : tabs[0]?.id;
+    const activeTabId = tabs.some(tab => tab.id === group.activeTabId) ? group.activeTabId : tabs[0]?.id ?? -1;
     return {
       ...group,
       activeTabId,
@@ -7611,7 +7642,7 @@ const saveState = state => {
   const {
     activeGroupId: originalActiveGroupId
   } = layout;
-  const activeGroupId = originalActiveGroupId !== undefined && filteredGroups.every(g => g.id !== originalActiveGroupId) ? undefined : originalActiveGroupId;
+  const activeGroupId = originalActiveGroupId !== -1 && filteredGroups.every(g => g.id !== originalActiveGroupId) ? -1 : originalActiveGroupId;
   return {
     layout: {
       ...layout,
@@ -7626,7 +7657,7 @@ const flipDirection = direction => {
 };
 const createEmptyGroup = direction => {
   return {
-    activeTabId: undefined,
+    activeTabId: -1,
     direction,
     focused: false,
     id: create$2(),
@@ -7649,8 +7680,8 @@ const getActiveGroupIndex = (groups, activeGroupId) => {
 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;
+  const activeGroup = allGroups.find(group => group.id === activeGroupId) ?? groups.findLast(group => group.activeTabId !== -1) ?? target;
+  const activeTabId = activeGroup.activeTabId === -1 ? tabs[0]?.id ?? -1 : activeGroup.activeTabId;
   return {
     ...target,
     activeTabId,
@@ -7705,7 +7736,7 @@ const setEditorLayout = (state, direction, slots) => {
   return {
     ...state,
     layout: {
-      activeGroupId: nextGroups[activeIndex]?.id,
+      activeGroupId: nextGroups[activeIndex]?.id ?? -1,
       direction,
       groups: nextGroups
     }
@@ -7845,7 +7876,7 @@ const splitDown = (state, groupId) => {
   if (groups.length === 0) {
     const initialGroupId = create$2();
     const initialGroup = {
-      activeTabId: undefined,
+      activeTabId: -1,
       direction,
       focused: true,
       id: initialGroupId,
@@ -7882,7 +7913,7 @@ const splitLeft = (state, groupId) => {
   if (groups.length === 0) {
     const initialGroupId = create$2();
     const initialGroup = {
-      activeTabId: undefined,
+      activeTabId: -1,
       direction,
       focused: true,
       id: initialGroupId,
@@ -7900,7 +7931,7 @@ const splitLeft = (state, groupId) => {
     };
     return splitEditorGroup$1(stateWithInitialGroup, initialGroupId, Left$1);
   }
-  const targetGroupId = groupId ?? activeGroupId ?? groups[0]?.id ?? 0;
+  const targetGroupId = groupId ?? (activeGroupId === -1 ? groups[0]?.id : activeGroupId) ?? 0;
   return splitEditorGroup$1(state, targetGroupId, Left$1);
 };
 
@@ -7918,7 +7949,7 @@ const splitRight = (state, groupId) => {
   if (groups.length === 0) {
     const initialGroupId = create$2();
     const initialGroup = {
-      activeTabId: undefined,
+      activeTabId: -1,
       direction,
       focused: true,
       id: initialGroupId,
@@ -7936,7 +7967,7 @@ const splitRight = (state, groupId) => {
     };
     return splitEditorGroup$1(stateWithInitialGroup, initialGroupId, Right$1);
   }
-  const targetGroupId = groupId ?? activeGroupId ?? groups[0]?.id ?? 0;
+  const targetGroupId = groupId ?? (activeGroupId === -1 ? groups[0]?.id : activeGroupId) ?? 0;
   return splitEditorGroup$1(state, targetGroupId, Right$1);
 };
 
@@ -7952,7 +7983,7 @@ const splitUp = (state, groupId) => {
   if (groups.length === 0) {
     const initialGroupId = create$2();
     const initialGroup = {
-      activeTabId: undefined,
+      activeTabId: -1,
       direction,
       focused: true,
       id: initialGroupId,

package/package.json

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