@lvce-editor/main-area-worker 9.32.3 → 9.32.5

package/dist/mainAreaWorkerMain.js

@@ -935,7 +935,10 @@ const constructError = (message, type, name) => {
   if (ErrorConstructor === Error) {
     const error = new Error(message);
     if (name && name !== 'VError') {
-      error.name = name;
+      Object.defineProperty(error, 'name', {
+        configurable: true,
+        value: name
+      });
     }
     return error;
   }
@@ -966,31 +969,45 @@ const getParentStack = error => {
 };
 const MethodNotFound = -32601;
 const Custom = -32001;
+const setStack = (error, stack) => {
+  const descriptor = Object.getOwnPropertyDescriptor(error, 'stack');
+  if (descriptor) {
+    if (!descriptor.configurable && !descriptor.writable) {
+      return;
+    }
+    if (!descriptor.configurable && descriptor.writable) {
+      error.stack = stack;
+      return;
+    }
+  }
+  Object.defineProperty(error, 'stack', {
+    configurable: true,
+    value: stack,
+    writable: true
+  });
+};
 const restoreExistingError = (error, currentStack) => {
   if (typeof error.stack === 'string') {
-    error.stack = error.stack + NewLine + currentStack;
+    setStack(error, `${error.stack}${NewLine}${currentStack}`);
   }
   return error;
 };
 const restoreMethodNotFoundError = (error, currentStack) => {
   const restoredError = new JsonRpcError(error.message);
   const parentStack = getParentStack(error);
-  restoredError.stack = parentStack + NewLine + currentStack;
+  setStack(restoredError, `${parentStack}${NewLine}${currentStack}`);
   return restoredError;
 };
 const restoreStackFromData = (restoredError, error, currentStack) => {
   if (error.data.stack && error.data.type && error.message) {
-    restoredError.stack = error.data.type + ': ' + error.message + NewLine + error.data.stack + NewLine + currentStack;
+    setStack(restoredError, `${error.data.type}: ${error.message}${NewLine}${error.data.stack}${NewLine}${currentStack}`);
     return;
   }
   if (error.data.stack) {
-    restoredError.stack = error.data.stack;
+    setStack(restoredError, error.data.stack);
   }
 };
 const applyDataProperties = (restoredError, error) => {
-  if (!error.data) {
-    return;
-  }
   restoreStackFromData(restoredError, error, getCurrentStack());
   if (error.data.codeFrame) {
     // @ts-ignore
@@ -1011,7 +1028,7 @@ const applyDirectProperties = (restoredError, error) => {
     const indexNewLine = getNewLineIndex(lowerStack);
     const parentStack = getParentStack(error);
     // @ts-ignore
-    restoredError.stack = parentStack + lowerStack.slice(indexNewLine);
+    setStack(restoredError, `${parentStack}${lowerStack.slice(indexNewLine)}`);
   }
   if (error.codeFrame) {
     // @ts-ignore
@@ -4504,6 +4521,7 @@ const EditorGroupHeader = 'EditorGroupHeader';
 const EmptyGroupHeader = 'EmptyGroupHeader';
 const EmptyGroupCloseButton = 'EmptyGroupCloseButton';
 const EditorGroup = 'EditorGroup';
+const EditorGroupEmpty = 'EditorGroup EditorGroupEmpty';
 const EditorGroupsHorizontal = 'EditorGroupsHorizontal';
 const EditorGroupsVertical = 'EditorGroupsVertical';
 const EditorContainer = 'EditorContainer';
@@ -4515,6 +4533,7 @@ const MaskIconCircleFilled = 'MaskIcon MaskIconCircleFilled';
 const MaskIconClose = 'MaskIcon MaskIconClose';
 const MaskIconExtensions = 'MaskIcon MaskIconExtensions';
 const MaskIconRecordKey = 'MaskIcon MaskIconRecordKey';
+const MaskIconSearch = 'MaskIcon MaskIconSearch';
 const TextEditor = 'TextEditor';
 const TextEditorLoading = 'TextEditor TextEditor--loading';
 const EditorContentLoading = 'EditorContent EditorContent--loading';
@@ -5340,7 +5359,7 @@ const restoreAndCreateEditors = async (state, restoredLayout) => {
   return newState;
 };
 
-const loadContent = async (state, savedState) => {
+const loadContent$1 = async (state, savedState) => {
   const homeDirUri = await loadHomeDirUri();
   const stateWithHomeDir = {
     ...state,
@@ -5378,7 +5397,7 @@ const loadContent = async (state, savedState) => {
 };
 
 const handleWorkspaceChange = async (state, _workspacePath, savedState) => {
-  return loadContent(state, savedState);
+  return loadContent$1(state, savedState);
 };
 
 const handleWorkspaceRefresh = async (state, refresh = {}) => {
@@ -6273,31 +6292,36 @@ const HandleSashCornerPointerDown = 20;
 const HandleSashCornerPointerMove = 21;
 const HandleSashCornerPointerUp = 22;
 
+const textEditorNode = {
+  childCount: 1,
+  className: TextEditor,
+  type: Div
+};
+const editorContentNode = {
+  childCount: 1,
+  className: EditorContent,
+  type: Pre
+};
 const renderContent = content => {
-  return [{
-    childCount: 1,
-    className: TextEditor,
-    type: Div
-  }, {
-    childCount: 1,
-    className: EditorContent,
-    type: Pre
-  }, text(content)];
+  return [textEditorNode, editorContentNode, text(content)];
 };
 
+const textEditorErrorNode = {
+  childCount: 1,
+  className: TextEditorError,
+  type: Div
+};
+const editorContentErrorNode = {
+  childCount: 2,
+  className: EditorContentError,
+  type: Div
+};
+const paragraphNode = {
+  childCount: 1,
+  type: P
+};
 const renderError = errorMessage => {
-  return [{
-    childCount: 1,
-    className: TextEditorError,
-    type: Div
-  }, {
-    childCount: 2,
-    className: EditorContentError,
-    type: Div
-  }, {
-    childCount: 1,
-    type: P
-  }, text(`Error: ${errorMessage}`), {
+  return [textEditorErrorNode, editorContentErrorNode, paragraphNode, text(`Error: ${errorMessage}`), {
     childCount: 1,
     className: mergeClassNames(Button, ButtonSecondary),
     'data-action': RetryOpen,
@@ -6307,16 +6331,18 @@ const renderError = errorMessage => {
   }, text(retry())];
 };
 
+const textEditorLoadingNode = {
+  childCount: 1,
+  className: TextEditorLoading,
+  type: Div
+};
+const editorContentLoadingNode = {
+  childCount: 1,
+  className: EditorContentLoading,
+  type: Div
+};
 const renderLoading = () => {
-  return [{
-    childCount: 1,
-    className: TextEditorLoading,
-    type: Div
-  }, {
-    childCount: 1,
-    className: EditorContentLoading,
-    type: Div
-  }, text('Loading...')];
+  return [textEditorLoadingNode, editorContentLoadingNode, text('Loading...')];
 };
 
 const renderViewletReference = tab => {
@@ -6355,6 +6381,16 @@ const renderEditor = tab => {
   return renderContent('');
 };
 
+const dirtyIconNode = {
+  childCount: 0,
+  className: MaskIconCircleFilled,
+  type: Div
+};
+const closeIconNode$1 = {
+  childCount: 0,
+  className: MaskIconClose,
+  type: Div
+};
 const renderTabActions = (isDirty, tabIndex, groupIndex) => {
   if (isDirty) {
     return [{
@@ -6365,11 +6401,7 @@ const renderTabActions = (isDirty, tabIndex, groupIndex) => {
       'data-index': tabIndex,
       onClick: HandleClickClose,
       type: Button$2
-    }, {
-      childCount: 0,
-      className: MaskIconCircleFilled,
-      type: Div
-    }];
+    }, dirtyIconNode];
   }
   return [{
     'aria-label': 'Close',
@@ -6379,23 +6411,26 @@ const renderTabActions = (isDirty, tabIndex, groupIndex) => {
     'data-index': tabIndex,
     onClick: HandleClickClose,
     type: Button$2
-  }, {
-    childCount: 0,
-    className: MaskIconClose,
-    type: Div
-  }];
+  }, closeIconNode$1];
 };
 
 const ExtensionDetailScheme = 'extension-detail://';
 const KeyBindingsUri = 'app://keybindings';
 const RunningExtensionsScheme = 'running-extensions://';
+const SearchEditorScheme = 'search-editor://';
+const tabIconNode = {
+  childCount: 1,
+  className: TabIcon,
+  role: None$1,
+  type: Div
+};
+const tabTitleNode = {
+  childCount: 1,
+  className: TabTitle,
+  type: Span
+};
 const renderMaskIcon = className => {
-  return [{
-    childCount: 1,
-    className: TabIcon,
-    role: None$1,
-    type: Div
-  }, {
+  return [tabIconNode, {
     childCount: 0,
     className,
     type: Div
@@ -6411,6 +6446,9 @@ const renderTabIcon = tab => {
   if (tab.uri?.startsWith(RunningExtensionsScheme)) {
     return renderMaskIcon(MaskIconExtensions);
   }
+  if (tab.uri?.startsWith(SearchEditorScheme)) {
+    return renderMaskIcon(MaskIconSearch);
+  }
   return [{
     childCount: 0,
     className: TabIcon,
@@ -6423,13 +6461,13 @@ const renderTab = (tab, isActive, tabIndex, groupIndex) => {
   const closeButtonNodes = renderTabActions(tab.isDirty, tabIndex, groupIndex);
   let className = MainTab;
   if (isActive) {
-    className += ' ' + MainTabSelected;
+    className = mergeClassNames(className, MainTabSelected);
   }
   if (tab.isDirty) {
-    className += ' ' + MainTabModified;
+    className = mergeClassNames(className, MainTabModified);
   }
   if (tab.isPreview) {
-    className += ' ' + MainTabPreview;
+    className = mergeClassNames(className, MainTabPreview);
   }
   return [{
     'aria-selected': isActive,
@@ -6443,11 +6481,7 @@ const renderTab = (tab, isActive, tabIndex, groupIndex) => {
     role: Tab$1,
     title: tab.uriTitle || tab.uri || tab.title,
     type: Div
-  }, ...renderTabIcon(tab), {
-    childCount: 1,
-    className: TabTitle,
-    type: Span
-  }, text(tab.title), ...closeButtonNodes];
+  }, ...renderTabIcon(tab), tabTitleNode, text(tab.title), ...closeButtonNodes];
 };
 
 const getTabsVirtualDom = (group, groupIndex, tabsChildCount) => {
@@ -6466,6 +6500,11 @@ const isHtmlFile = tab => {
   return tab.uri.endsWith('.html');
 };
 
+const previewIconNode = {
+  childCount: 0,
+  className: MaskIconPreview,
+  type: Div
+};
 const renderEditorGroupActions = (group, groupIndex, splitButtonEnabled) => {
   const activeTab = group.tabs.find(tab => tab.id === group.activeTabId);
   const showTogglePreview = isHtmlFile(activeTab);
@@ -6484,11 +6523,7 @@ const renderEditorGroupActions = (group, groupIndex, splitButtonEnabled) => {
       onClick: HandleClickAction,
       title: togglePreview(),
       type: Button$2
-    }, {
-      childCount: 0,
-      className: MaskIconPreview,
-      type: Div
-    });
+    }, previewIconNode);
   }
   if (splitButtonEnabled) {
     buttons.push({
@@ -6529,6 +6564,11 @@ const emptyHeader = {
   className: EmptyGroupHeader,
   type: Div
 };
+const closeIconNode = {
+  childCount: 0,
+  className: MaskIconClose,
+  type: Div
+};
 const renderEmptyGroupCloseButton = (group, groupIndex) => {
   return [emptyHeader, {
     childCount: 1,
@@ -6538,11 +6578,7 @@ const renderEmptyGroupCloseButton = (group, groupIndex) => {
     onClick: HandleClickAction,
     title: closeEditorGroup(),
     type: Button$2
-  }, {
-    childCount: 0,
-    className: MaskIconClose,
-    type: Div
-  }];
+  }, closeIconNode];
 };
 
 const renderWaterMark = groupId => {
@@ -6565,7 +6601,7 @@ const renderEmptyEditorGroup = (group, groupIndex, style, closeButtonEnabled = t
   const closeButtonDom = closeButtonEnabled ? renderEmptyGroupCloseButton(group) : [];
   return [{
     childCount: closeButtonEnabled ? 2 : 1,
-    className: EditorGroup,
+    className: EditorGroupEmpty,
     'data-groupId': String(group.id),
     onContextMenu: HandleContextMenu,
     style,
@@ -6574,6 +6610,11 @@ const renderEmptyEditorGroup = (group, groupIndex, style, closeButtonEnabled = t
   }, ...closeButtonDom, ...renderWaterMark(group.id)];
 };
 
+const editorContainerNode = {
+  childCount: 1,
+  className: EditorContainer,
+  type: Div
+};
 const renderEditorGroup = (group, groupIndex, splitButtonEnabled = false, sizeProperty = 'width', closeButtonEnabled = true) => {
   const activeTab = group.tabs.find(tab => tab.id === group.activeTabId);
   const style = `${sizeProperty}:${group.size}%;`;
@@ -6588,11 +6629,7 @@ const renderEditorGroup = (group, groupIndex, splitButtonEnabled = false, sizePr
     'data-groupId': String(group.id),
     style,
     type: Div
-  }, ...renderEditorGroupHeader(group, groupIndex, splitButtonEnabled), {
-    childCount: 1,
-    className: EditorContainer,
-    type: Div
-  }, ...renderEditor(activeTab)];
+  }, ...renderEditorGroupHeader(group, groupIndex, splitButtonEnabled), editorContainerNode, ...renderEditor(activeTab)];
 };
 
 const getSashClassName = direction => {
@@ -6617,22 +6654,24 @@ const renderSash = (direction, sashId) => {
   }];
 };
 
+const sashCornerNode = {
+  childCount: 0,
+  className: 'SashCorner',
+  onPointerDown: HandleSashCornerPointerDown,
+  role: None$1,
+  type: Button$2
+};
 const renderSashCorner = () => {
-  return {
-    childCount: 0,
-    className: 'SashCorner',
-    onPointerDown: HandleSashCornerPointerDown,
-    role: None$1,
-    type: Button$2
-  };
+  return sashCornerNode;
 };
 
+const mainNode$1 = {
+  childCount: 1,
+  className: Main,
+  type: Div
+};
 const renderSingleEditorGroup = (layout, splitButtonEnabled, sizeProperty = 'width') => {
-  return [{
-    childCount: 1,
-    className: Main,
-    type: Div
-  }, ...renderEditorGroup(layout.groups[0], 0, splitButtonEnabled, sizeProperty, false)];
+  return [mainNode$1, ...renderEditorGroup(layout.groups[0], 0, splitButtonEnabled, sizeProperty, false)];
 };
 
 const getDirectionClassName = (direction, isSplit) => {
@@ -6643,7 +6682,12 @@ const getDirectionClassName = (direction, isSplit) => {
 };
 const getContainerClassName = (direction, childCount) => {
   const directionClassName = getDirectionClassName(direction, childCount > 1);
-  return directionClassName ? `${EDITOR_GROUPS_CONTAINER} ${directionClassName}` : EDITOR_GROUPS_CONTAINER;
+  return directionClassName ? mergeClassNames(EDITOR_GROUPS_CONTAINER, directionClassName) : EDITOR_GROUPS_CONTAINER;
+};
+const mainNode = {
+  childCount: 1,
+  className: Main,
+  type: Div
 };
 const getSizeProperty = direction => {
   return direction === Vertical ? 'height' : 'width';
@@ -6717,11 +6761,7 @@ const getMainAreaVirtualDom = (layout, splitButtonEnabled = false) => {
   }
   const editorGroupsContainerClassName = getContainerClassName(direction, groups.length);
   if (groups.length === 0) {
-    return [{
-      childCount: 1,
-      className: Main,
-      type: Div
-    }, {
+    return [mainNode, {
       childCount: 0,
       className: editorGroupsContainerClassName,
       'data-groupId': '',
@@ -6736,11 +6776,7 @@ const getMainAreaVirtualDom = (layout, splitButtonEnabled = false) => {
   } = renderSegmentChildren(direction, groups, splitButtonEnabled);
   const sashCorner = getSashCorner(layout);
   const sashCornerChildren = sashCorner ? [renderSashCorner()] : [];
-  return [{
-    childCount: 1,
-    className: Main,
-    type: Div
-  }, {
+  return [mainNode, {
     childCount: childCount + sashCornerChildren.length,
     className: editorGroupsContainerClassName,
     role: None$1,
@@ -6962,6 +6998,13 @@ const reopenEditorWith = async context => {
   }
 };
 
+const resize$1 = (state, dimensions) => {
+  return {
+    ...state,
+    ...dimensions
+  };
+};
+
 const settingsUri = 'app://settings.json';
 const saveEditorAndHandleSettingsChange = async tab => {
   const editorState = await saveEditor(tab.editorUid);
@@ -7388,6 +7431,32 @@ const splitUp = (state, groupId) => {
   return splitEditorGroup$1(state, resolvedGroupId, 'up');
 };
 
+const pendingLoads = new Map();
+const loadContent = wrapSerialCommand(loadContent$1);
+const loadContentTracked = async (uid, ...args) => {
+  const loading = loadContent(uid, ...args);
+  pendingLoads.set(uid, loading);
+  try {
+    await loading;
+  } finally {
+    if (pendingLoads.get(uid) === loading) {
+      pendingLoads.delete(uid);
+    }
+  }
+};
+const resize = async (uid, dimensions) => {
+  const loading = pendingLoads.get(uid);
+  if (loading) {
+    await loading;
+  }
+  const instance = get(uid);
+  if (!instance) {
+    return [];
+  }
+  const resizedState = resize$1(instance.newState, dimensions);
+  set(uid, instance.oldState, resizedState);
+  return handleResize(resizedState, dimensions);
+};
 const commandMap = {
   'Main.closeActiveEditor': wrapSerialCommand(closeActiveEditor),
   'Main.closeAll': wrapSerialCommand(closeAll$1),
@@ -7445,8 +7514,7 @@ const commandMap = {
   'MainArea.handleHeaderDoubleClick': wrapSerialCommand(handleHeaderDoubleClick),
   'MainArea.handleIconThemeChange': wrapSerialCommand(handleIconThemeChange),
   'MainArea.handleModifiedStatusChange': wrapAsyncCommand(handleModifiedStatusChangeWithContext),
-  'MainArea.handleResize': wrapGetter(handleResize),
-  // TODO would need to have a function that returns newstate as well as commands
+  'MainArea.handleResize': resize,
   'MainArea.handleSashCornerPointerDown': wrapSerialCommand(handleSashCornerPointerDown),
   'MainArea.handleSashCornerPointerMove': wrapSerialCommand(handleSashCornerPointerMove),
   'MainArea.handleSashCornerPointerUp': wrapSerialCommand(handleSashCornerPointerUp),
@@ -7459,7 +7527,7 @@ const commandMap = {
   'MainArea.handleWorkspaceRefresh': wrapAsyncCommand(handleWorkspaceRefreshWithContext),
   'MainArea.hasActiveTextEditor': wrapGetter(hasActiveTextEditor),
   'MainArea.initialize': initialize,
-  'MainArea.loadContent': wrapSerialCommand(loadContent),
+  'MainArea.loadContent': loadContentTracked,
   'MainArea.moveIntoNewWindow': wrapSerialCommand(moveIntoNewWindow),
   'MainArea.newFile': wrapSerialCommand(newFile),
   'MainArea.newWindow': wrapSerialCommand(newWindow),
@@ -7470,7 +7538,7 @@ const commandMap = {
   'MainArea.render2': render2,
   'MainArea.renderEventListeners': renderEventListeners,
   'MainArea.reopenEditorWith': wrapSerialAsyncCommand(reopenEditorWith),
-  'MainArea.resize': wrapGetter(handleResize),
+  'MainArea.resize': resize,
   'MainArea.restoreClosedTab': wrapSerialCommand(restoreClosedTab),
   'MainArea.save': wrapSerialCommand(save),
   'MainArea.saveState': wrapGetter(saveState),

package/package.json

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