@lvce-editor/process-explorer-worker 3.0.0 → 3.1.0

package/index.js

@@ -184,7 +184,7 @@ const {
   get: get$2,
   getCommandIds,
   registerCommands,
-  set: set$4,
+  set: set$5,
   wrapCommand,
   wrapLoadContent
 } = create$a();
@@ -193,7 +193,9 @@ const create$9 = (id, _uri, x, y, width, height, _args, parentUid, _platform = 0
   const state = {
     assetDir,
     collapsedPids: [],
+    errorCodeFrame: '',
     errorMessage: '',
+    errorStack: '',
     focus: 0,
     focused: false,
     focusedIndex: -1,
@@ -208,7 +210,7 @@ const create$9 = (id, _uri, x, y, width, height, _args, parentUid, _platform = 0
     x,
     y
   };
-  set$4(state.uid, state, state);
+  set$5(state.uid, state, state);
   return state;
 };
 
@@ -217,7 +219,7 @@ const isEqual$1 = (oldState, newState) => {
 };
 
 const isEqual = (oldState, newState) => {
-  return oldState.initial === newState.initial && oldState.errorMessage === newState.errorMessage && oldState.visibleProcesses === newState.visibleProcesses;
+  return oldState.initial === newState.initial && oldState.errorCodeFrame === newState.errorCodeFrame && oldState.errorMessage === newState.errorMessage && oldState.errorStack === newState.errorStack && oldState.visibleProcesses === newState.visibleProcesses;
 };
 
 const RenderItems = 1;
@@ -305,6 +307,7 @@ const Text = 12;
 const Th = 13;
 const THead = 14;
 const Tr = 15;
+const Pre = 51;
 
 const ClientX = 'event.clientX';
 const ClientY = 'event.clientY';
@@ -323,6 +326,7 @@ const Star = 131;
 
 const CtrlCmd = 1 << 11 >>> 0;
 
+const ErrorWorker = 3308;
 const FileSystemWorker$1 = 209;
 const RendererWorker = 1;
 
@@ -1487,7 +1491,7 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$3 = (id, rpc) => {
+const set$4 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get = id => {
@@ -1520,7 +1524,7 @@ const create = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$3(rpcId, mockRpc);
+      set$4(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove(rpcId);
@@ -1529,11 +1533,19 @@ const create = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$3(rpcId, rpc);
+      set$4(rpcId, rpc);
     }
   };
 };
 
+const {
+  invoke: invoke$2,
+  set: set$3
+} = create(ErrorWorker);
+const prepare = async error => {
+  return invoke$2('Errors.prepare', error);
+};
+
 const {
   set: set$2
 } = create(FileSystemWorker$1);
@@ -1548,6 +1560,10 @@ const {
   invokeAndTransfer,
   set: set$1
 } = create(RendererWorker);
+const sendMessagePortToErrorWorker$1 = async (port, rpcId) => {
+  const command = 'Errors.handleMessagePort';
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToErrorWorker', port, command, rpcId);
+};
 const sendMessagePortToFileSystemWorker$1 = async (port, rpcId) => {
   const command = 'FileSystem.handleMessagePort';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToFileSystemWorker', port, command, rpcId);
@@ -1623,6 +1639,17 @@ const getErrorMessage = error => {
   }
   return String(error);
 };
+const prepareError = async error => {
+  try {
+    return await prepare(error);
+  } catch {
+    return {
+      codeFrame: undefined,
+      message: getErrorMessage(error),
+      stack: undefined
+    };
+  }
+};
 const getFocusedIndex = (oldFocusedIndex, visibleProcesses) => {
   if (visibleProcesses.length === 0) {
     return -1;
@@ -1639,7 +1666,9 @@ const refresh = async state => {
     const visibleProcesses = getVisibleProcesses(processes, state.collapsedPids, rootPid);
     return {
       ...state,
+      errorCodeFrame: '',
       errorMessage: '',
+      errorStack: '',
       focusedIndex: getFocusedIndex(state.focusedIndex, visibleProcesses),
       initial: false,
       processes,
@@ -1647,9 +1676,12 @@ const refresh = async state => {
       visibleProcesses
     };
   } catch (error) {
+    const prettyError = await prepareError(error);
     return {
       ...state,
-      errorMessage: getErrorMessage(error),
+      errorCodeFrame: prettyError.codeFrame || '',
+      errorMessage: prettyError.message || getErrorMessage(error),
+      errorStack: prettyError.stack || '',
       initial: false
     };
   }
@@ -1810,23 +1842,37 @@ const getBodyDom = state => {
     type: TBody
   }, ...visibleProcesses.flatMap((process, index) => getRowDom(process, index, index === focusedIndex))];
 };
-const getErrorDom = errorMessage => {
-  if (!errorMessage) {
+const getErrorSectionDom = (value, type) => {
+  if (!value) {
     return [];
   }
   return [{
     childCount: 1,
+    type
+  }, text(value)];
+};
+const hasError = state => {
+  return Boolean(state.errorMessage || state.errorCodeFrame || state.errorStack);
+};
+const getErrorDom = state => {
+  const messageDom = getErrorSectionDom(state.errorMessage, Div);
+  const codeFrameDom = getErrorSectionDom(state.errorCodeFrame, Pre);
+  const stackDom = getErrorSectionDom(state.errorStack, Pre);
+  const childCount = messageDom.length / 2 + codeFrameDom.length / 2 + stackDom.length / 2;
+  return [{
+    childCount: 1,
+    className: `${Viewlet} ${ProcessExplorer}`,
+    role: None,
+    type: Div
+  }, {
+    childCount,
     className: Error$1,
     type: Div
-  }, text(errorMessage)];
+  }, ...messageDom, ...codeFrameDom, ...stackDom];
 };
-const getDom = state => {
-  if (state.initial) {
-    return [];
-  }
-  const errorDom = getErrorDom(state.errorMessage);
+const getTableDom = state => {
   return [{
-    childCount: 1 + (errorDom.length > 0 ? 1 : 0),
+    childCount: 1,
     className: `${Viewlet} ${ProcessExplorer}`,
     role: None,
     type: Div
@@ -1844,7 +1890,16 @@ const getDom = state => {
     role: Grid,
     tabIndex: 0,
     type: Table$1
-  }, ...getHeaderDom(), ...getBodyDom(state), ...errorDom];
+  }, ...getHeaderDom(), ...getBodyDom(state)];
+};
+const getDom = state => {
+  if (state.initial) {
+    return [];
+  }
+  if (hasError(state)) {
+    return getErrorDom(state);
+  }
+  return getTableDom(state);
 };
 const renderItems = (oldState, newState) => {
   return [SetDom2, newState.uid, getDom(newState)];
@@ -1880,7 +1935,7 @@ const render2 = (uid, diffResult) => {
     oldState,
     scheduledState
   } = get$2(uid);
-  set$4(uid, scheduledState, scheduledState);
+  set$5(uid, scheduledState, scheduledState);
   return applyRender(oldState, scheduledState, diffResult);
 };
 
@@ -1934,6 +1989,27 @@ const commandMap = {
   'ProcessExplorer.terminate': terminate
 };
 
+const sendMessagePortToErrorWorker = async port => {
+  await sendMessagePortToErrorWorker$1(port, 0);
+};
+
+const createErrorWorkerRpc = async () => {
+  try {
+    const rpc = await create$2({
+      commandMap: {},
+      send: sendMessagePortToErrorWorker
+    });
+    return rpc;
+  } catch (error) {
+    throw new VError(error, `Failed to create error worker rpc`);
+  }
+};
+
+const initializeErrorWorker = async () => {
+  const rpc = await createErrorWorkerRpc();
+  set$3(rpc);
+};
+
 const sendMessagePortToFileSystemWorker = async port => {
   await sendMessagePortToFileSystemWorker$1(port, 0);
 };
@@ -1964,7 +2040,7 @@ const initializeRendererWorker = async () => {
 
 const listen = async () => {
   registerCommands(commandMap);
-  await Promise.all([initializeRendererWorker(), initializeFileSystemWorker()]);
+  await Promise.all([initializeRendererWorker(), initializeFileSystemWorker(), initializeErrorWorker()]);
 };
 
 const main = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/process-explorer-worker",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "Explorer Worker",
   "repository": {
     "type": "git",