@lvce-editor/main-area-worker 9.63.0 → 9.64.0

package/dist/mainAreaWorkerMain.js

@@ -598,6 +598,9 @@ const restoreExistingError = (error, currentStack) => {
 };
 const restoreMethodNotFoundError = (error, currentStack) => {
   const restoredError = new JsonRpcError(error.message);
+  Object.assign(restoredError, {
+    code: error.code
+  });
   const parentStack = getParentStack(error);
   setStack(restoredError, `${parentStack}${NewLine}${currentStack}`);
   return restoredError;
@@ -617,9 +620,13 @@ const applyDataProperties = (restoredError, error) => {
     // @ts-ignore
     restoredError.codeFrame = error.data.codeFrame;
   }
-  if (error.data.code) {
+  if (typeof error.data.code === 'string' || typeof error.data.code === 'number') {
     // @ts-ignore
-    restoredError.code = error.data.code;
+    Object.defineProperty(restoredError, 'code', {
+      configurable: true,
+      value: error.data.code,
+      writable: true
+    });
   }
   if (error.data.type) {
     // @ts-ignore
@@ -641,6 +648,13 @@ const applyDirectProperties = (restoredError, error) => {
 };
 const restoreMessageError = (error, _currentStack) => {
   const restoredError = constructError(error.message, error.type, error.name);
+  if (typeof error.code === 'string' || typeof error.code === 'number') {
+    Object.defineProperty(restoredError, 'code', {
+      configurable: true,
+      value: error.code,
+      writable: true
+    });
+  }
   if (error.data) {
     applyDataProperties(restoredError, error);
   } else {
@@ -719,7 +733,7 @@ const getErrorProperty = (error, prettyError) => {
   return {
     code: Custom,
     data: {
-      code: prettyError.code,
+      code: prettyError.code ?? error?.code,
       codeFrame: prettyError.codeFrame,
       name: prettyError.name,
       stack: getStack(prettyError),
@@ -756,7 +770,12 @@ const getErrorResponseSimple = (id, error) => {
   return {
     error: {
       code: Custom,
-      data: error,
+      data: error instanceof Error ? {
+        ...error,
+        code: 'code' in error ? error.code : undefined,
+        stack: error.stack,
+        type: error.name
+      } : error,
       // @ts-ignore
       message: error.message
     },
@@ -1503,6 +1522,8 @@ const getPreference = async key => {
   return await invoke$2('Preferences.get', key);
 };
 
+const cacheName = 'lvce0main-area-tabs';
+const cacheDuration = 90 * 24 * 60 * 60 * 1000;
 const maxClosedTabs = 20;
 const pendingOperations = new Map();
 const sessionId = encodeURIComponent(`session-${new Date().toISOString()}`);
@@ -1536,9 +1557,23 @@ const isClosedTabEntry = value => {
   return Boolean(entry.group && typeof entry.group === 'object' && entry.tab && typeof entry.tab === 'object' && typeof entry.groupIndex === 'number' && typeof entry.tabIndex === 'number');
 };
 const getEntries = async key => {
-  const entries = await invoke$2('CacheStorage.getJson', key);
+  const cache = await caches.open(cacheName);
+  const response = await cache.match(key);
+  const entries = response ? await response.json() : [];
   return Array.isArray(entries) ? entries.filter(isClosedTabEntry) : [];
 };
+const setEntries = async (key, entries) => {
+  const cache = await caches.open(cacheName);
+  const value = JSON.stringify(entries);
+  const expires = new Date(Date.now() + cacheDuration).toUTCString();
+  await cache.put(key, new Response(value, {
+    headers: {
+      'Content-Length': String(value.length),
+      'Content-Type': 'application/json',
+      Expires: expires
+    }
+  }));
+};
 const compact = entry => {
   return {
     ...entry,
@@ -1557,7 +1592,7 @@ const add = (uid, entries) => {
       const key = getKey(uid);
       const existing = await getEntries(key);
       const compactEntries = entries.map(compact);
-      await invoke$2('CacheStorage.setJson', key, [...existing, ...compactEntries].slice(-maxClosedTabs));
+      await setEntries(key, [...existing, ...compactEntries].slice(-maxClosedTabs));
     } catch {
       // Closed tab history is optional and must never break editor commands.
     }
@@ -1566,7 +1601,7 @@ const add = (uid, entries) => {
 const clear = uid => {
   return run(uid, async () => {
     try {
-      await invoke$2('CacheStorage.setJson', getKey(uid), []);
+      await setEntries(getKey(uid), []);
     } catch {
       // Closed tab history is optional and must never break workspace changes.
     }
@@ -1581,7 +1616,7 @@ const takeLast = uid => {
       if (!isClosedTabEntry(entry)) {
         return undefined;
       }
-      await invoke$2('CacheStorage.setJson', key, entries.slice(0, -1));
+      await setEntries(key, entries.slice(0, -1));
       return entry;
     } catch {
       return undefined;
@@ -2804,7 +2839,7 @@ const getEditorInputUri = editorInput => {
     case 'webview':
       return editorInput.uri;
     case 'extension-detail-view':
-      return `extension-detail://${editorInput.extensionId}`;
+      return `extension-detail:///${encodeURIComponent(editorInput.extensionId)}`;
     case 'process-explorer':
       return 'process-explorer://';
     case 'running-extensions':
@@ -2849,6 +2884,12 @@ const hasBinaryFileSuffix = uri => {
   const cleanPath = pathName.slice(0, endIndex).toLowerCase();
   return binaryFileSuffixes.some(suffix => cleanPath.endsWith(suffix));
 };
+const getExtensionId = uri => {
+  if (uri.startsWith('extension-detail:///')) {
+    return decodeURIComponent(uri.slice('extension-detail:///'.length).split('/', 1)[0]);
+  }
+  return uri.slice('extension-detail://'.length).split('/', 1)[0];
+};
 const getEditorInputFromUri = uri => {
   if (uri.startsWith('diff://?') && URL.canParse(uri)) {
     const parsed = new URL(uri);
@@ -2863,8 +2904,7 @@ const getEditorInputFromUri = uri => {
     }
   }
   if (uri.startsWith('extension-detail://')) {
-    const extensionIdWithPath = uri.slice('extension-detail://'.length);
-    const extensionId = extensionIdWithPath.split('/', 1)[0];
+    const extensionId = getExtensionId(uri);
     if (extensionId) {
       return {
         extensionId,
@@ -2943,7 +2983,7 @@ const normalizeTabEditorInput = tab => {
   if (!editorInput) {
     return Object.hasOwn(tab, 'editorType') ? rest : tab;
   }
-  const uri = typeof tab.uri === 'string' ? tab.uri : getEditorInputUri(editorInput);
+  const uri = editorInput.type !== 'extension-detail-view' && typeof tab.uri === 'string' ? tab.uri : getEditorInputUri(editorInput);
   return {
     ...rest,
     editorInput,
@@ -3766,8 +3806,7 @@ const EditorGroupsHorizontal = 'EditorGroupsHorizontal';
 const EditorGroupsVertical = 'EditorGroupsVertical';
 const EditorContainer = 'EditorContainer';
 const EditorGroupActions = 'EditorGroupActions';
-const EditorGroupActionButton = 'EditorGroupActionButton';
-const SplitEditorGroupButton = 'SplitEditorGroupButton';
+const SplitEditorGroupButton = 'EditorGroupActionButton SplitEditorGroupButton';
 const MaskIconPreview = 'MaskIcon MaskIconPreview';
 const MaskIconCircleFilled = 'MaskIcon MaskIconCircleFilled';
 const MaskIconClose = 'MaskIcon MaskIconClose';
@@ -3836,6 +3875,10 @@ const getDragOverlayVirtualDom = () => {
   return dragOverlayVirtualDom;
 };
 
+const getEditorGroupClassName = groupId => {
+  return `EditorGroup-${String(groupId).replaceAll('.', '-')}`;
+};
+
 const offsetsMatch = (first, second) => {
   return Math.abs(first - second) < 1e-6;
 };
@@ -3884,10 +3927,6 @@ const getSashCorner = layout => {
   };
 };
 
-const getEditorGroupClassName = groupId => {
-  return `EditorGroup-${groupId}`;
-};
-
 const CloseGroup = 'close-group';
 const ConfigureLargeFileLimit = 'configure-large-file-limit';
 const OpenLargeFile = 'open-large-file';
@@ -4400,7 +4439,7 @@ const renderEditorGroupActions = (group, groupIndex, splitButtonEnabled) => {
   if (splitButtonEnabled) {
     buttons.push({
       childCount: 1,
-      className: mergeClassNames(EditorGroupActionButton, SplitEditorGroupButton),
+      className: SplitEditorGroupButton,
       'data-action': SplitRight$1,
       'data-groupId': String(group.id),
       name: SplitRight$1,
@@ -4469,14 +4508,13 @@ const renderWaterMark = groupId => {
 
 const Focusable = 0;
 
-const renderEmptyEditorGroup = (group, groupIndex, style, closeButtonEnabled = true) => {
+const renderEmptyEditorGroup = (group, groupIndex, closeButtonEnabled = true) => {
   const closeButtonDom = closeButtonEnabled ? renderEmptyGroupCloseButton(group) : [];
   return [{
     childCount: closeButtonEnabled ? 2 : 1,
     className: mergeClassNames(EditorGroupEmpty, getEditorGroupClassName(group.id)),
     'data-groupId': String(group.id),
     onContextMenu: HandleContextMenu,
-    style,
     tabIndex: Focusable,
     type: Div
   }, ...closeButtonDom, ...renderWaterMark(group.id)];
@@ -4487,19 +4525,17 @@ const editorContainerNode = {
   className: EditorContainer,
   type: Div
 };
-const renderEditorGroup = (group, groupIndex, splitButtonEnabled = false, sizeProperty = 'width', closeButtonEnabled = true, tabDropIndicator) => {
+const renderEditorGroup = (group, groupIndex, splitButtonEnabled = false, closeButtonEnabled = true, tabDropIndicator) => {
   const activeTab = group.tabs.find(tab => tab.id === group.activeTabId);
-  const style = `${sizeProperty}:${group.size}%;`;
   const hasTabs = group.tabs.length > 0;
   const hasEmptyGroupCloseButton = !hasTabs;
   if (hasEmptyGroupCloseButton) {
-    return renderEmptyEditorGroup(group, groupIndex, style, closeButtonEnabled);
+    return renderEmptyEditorGroup(group, groupIndex, closeButtonEnabled);
   }
   return [{
     childCount: 2,
     className: mergeClassNames(EditorGroup, getEditorGroupClassName(group.id)),
     'data-groupId': String(group.id),
-    style,
     type: Div
   }, ...renderEditorGroupHeader(group, groupIndex, splitButtonEnabled, tabDropIndicator), editorContainerNode, ...renderEditor(activeTab)];
 };
@@ -4547,11 +4583,11 @@ const mainNode$1 = {
   onDrop: HandleDrop,
   type: Div
 };
-const renderSingleEditorGroup = (layout, splitButtonEnabled, sizeProperty = 'width', tabDropIndicator) => {
+const renderSingleEditorGroup = (layout, splitButtonEnabled, tabDropIndicator) => {
   const {
     groups
   } = layout;
-  return [mainNode$1, ...renderEditorGroup(groups[0], 0, splitButtonEnabled, sizeProperty, false, tabDropIndicator)];
+  return [mainNode$1, ...renderEditorGroup(groups[0], 0, splitButtonEnabled, false, tabDropIndicator)];
 };
 
 const create = (beforeGroupId, afterGroupId) => {
@@ -4603,14 +4639,10 @@ const addDragOverlay = (dom, dragOverlay) => {
     childCount: dom[0].childCount + 1
   }, dom[1], ...dom.slice(2), getDragOverlayVirtualDom()];
 };
-const getSizeProperty = direction => {
-  return direction === Vertical ? 'height' : 'width';
-};
 const renderSegmentChildren = (direction, groups, splitButtonEnabled, tabDropIndicator) => {
   const segments = getGroupSegments(groups, direction);
   const children = [];
   let childCount = 0;
-  const sizeProperty = getSizeProperty(direction);
   for (let i = 0; i < segments.length; i++) {
     const segment = segments[i];
     if (i > 0) {
@@ -4622,16 +4654,14 @@ const renderSegmentChildren = (direction, groups, splitButtonEnabled, tabDropInd
       childCount++;
     }
     if (segment.direction === undefined) {
-      children.push(...renderEditorGroup(segment.groups[0], segment.startIndex, splitButtonEnabled, sizeProperty, true, tabDropIndicator));
+      children.push(...renderEditorGroup(segment.groups[0], segment.startIndex, splitButtonEnabled, true, tabDropIndicator));
       childCount++;
       continue;
     }
     const nestedDirection = segment.direction;
-    const nestedSizeProperty = getSizeProperty(nestedDirection);
     const nestedChildCount = segment.groups.length + segment.groups.length - 1;
     const nestedChildren = [];
     let nestedCount = 0;
-    const segmentSize = getSegmentSize(segment);
     for (let j = 0; j < segment.groups.length; j++) {
       if (j > 0) {
         const beforeGroupId = segment.groups[j - 1].id;
@@ -4641,18 +4671,13 @@ const renderSegmentChildren = (direction, groups, splitButtonEnabled, tabDropInd
         nestedCount++;
       }
       const group = segment.groups[j];
-      const normalizedSize = Number((group.size / segmentSize * 100).toFixed(6));
-      nestedChildren.push(...renderEditorGroup({
-        ...group,
-        size: normalizedSize
-      }, segment.startIndex + j, splitButtonEnabled, nestedSizeProperty, true, tabDropIndicator));
+      nestedChildren.push(...renderEditorGroup(group, segment.startIndex + j, splitButtonEnabled, true, tabDropIndicator));
       nestedCount++;
     }
     children.push({
       childCount: nestedChildCount,
-      className: getContainerClassName(nestedDirection, segment.groups.length),
+      className: mergeClassNames(getContainerClassName(nestedDirection, segment.groups.length), `${getEditorGroupClassName(segment.groups[0].id)}-Segment`),
       role: None$2,
-      style: `${sizeProperty}:${segmentSize}%;`,
       type: Div
     });
     children.push(...nestedChildren);
@@ -4669,9 +4694,8 @@ const getMainAreaVirtualDom = (layout, splitButtonEnabled = false, dragOverlay,
     direction,
     groups
   } = layout;
-  const sizeProperty = getSizeProperty(direction);
   if (groups.length === 1) {
-    return addDragOverlay(renderSingleEditorGroup(layout, splitButtonEnabled, sizeProperty, tabDropIndicator), dragOverlay);
+    return addDragOverlay(renderSingleEditorGroup(layout, splitButtonEnabled, tabDropIndicator), dragOverlay);
   }
   const editorGroupsContainerClassName = getContainerClassName(direction, groups.length);
   if (groups.length === 0) {
@@ -8084,17 +8108,34 @@ const getDragOverlayCss = dragOverlay => {
 }`];
 };
 
+const getSizeCss = (className, direction, size) => {
+  const width = direction === Vertical ? 100 : size;
+  const height = direction === Vertical ? size : 100;
+  return `.${className} {
+  width: ${width}%;
+  height: ${height}%;
+}`;
+};
 const getEditorGroupCss = layout => {
   const {
     direction,
     groups
   } = layout;
-  const groupSizeVariable = direction === Vertical ? '--EditorGroupHeight' : '--EditorGroupWidth';
-  return groups.map(group => {
-    return `.${getEditorGroupClassName(group.id)} {
-  ${groupSizeVariable}: ${group.size}%;
-}`;
-  });
+  const rules = [];
+  for (const segment of getGroupSegments(groups, direction)) {
+    if (segment.direction === undefined) {
+      const group = segment.groups[0];
+      rules.push(getSizeCss(getEditorGroupClassName(group.id), direction, group.size));
+      continue;
+    }
+    const segmentSize = getSegmentSize(segment);
+    rules.push(getSizeCss(`${getEditorGroupClassName(segment.groups[0].id)}-Segment`, direction, segmentSize));
+    for (const group of segment.groups) {
+      const normalizedSize = Number((group.size / segmentSize * 100).toFixed(6));
+      rules.push(getSizeCss(getEditorGroupClassName(group.id), segment.direction, normalizedSize));
+    }
+  }
+  return rules;
 };
 
 const MIN_GROUP_WIDTH_PX = 250;

package/package.json

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