@lvce-editor/file-system-worker 1.3.0 → 1.4.0

package/dist/fileSystemWorkerMain.js

@@ -627,6 +627,16 @@ const constructError = (message, type, name) => {
   }
   return new ErrorConstructor(message);
 };
+const joinLines = lines => {
+  return lines.join(NewLine);
+};
+const splitLines = lines => {
+  return lines.split(NewLine);
+};
+const getCurrentStack = () => {
+  const currentStack = joinLines(splitLines(new Error().stack || '').slice(2));
+  return currentStack;
+};
 const getNewLineIndex = (string, startIndex = undefined) => {
   return string.indexOf(NewLine, startIndex);
 };
@@ -637,19 +647,16 @@ const getParentStack = error => {
   }
   return parentStack;
 };
-const joinLines = lines => {
-  return lines.join(NewLine);
-};
 const MethodNotFound = -32601;
 const Custom = -32001;
-const splitLines = lines => {
-  return lines.split(NewLine);
-};
 const restoreJsonRpcError = error => {
+  const currentStack = getCurrentStack();
   if (error && error instanceof Error) {
+    if (typeof error.stack === 'string') {
+      error.stack = error.stack + NewLine + currentStack;
+    }
     return error;
   }
-  const currentStack = joinLines(splitLines(new Error().stack || '').slice(1));
   if (error && error.code && error.code === MethodNotFound) {
     const restoredError = new JsonRpcError(error.message);
     const parentStack = getParentStack(error);
@@ -730,6 +737,17 @@ const getErrorType = prettyError => {
   }
   return undefined;
 };
+const isAlreadyStack = line => {
+  return line.trim().startsWith('at ');
+};
+const getStack = prettyError => {
+  const stackString = prettyError.stack || '';
+  const newLineIndex = stackString.indexOf('\n');
+  if (newLineIndex !== -1 && !isAlreadyStack(stackString.slice(0, newLineIndex))) {
+    return stackString.slice(newLineIndex + 1);
+  }
+  return stackString;
+};
 const getErrorProperty = (error, prettyError) => {
   if (error && error.code === E_COMMAND_NOT_FOUND) {
     return {
@@ -742,7 +760,7 @@ const getErrorProperty = (error, prettyError) => {
     code: Custom,
     message: prettyError.message,
     data: {
-      stack: prettyError.stack,
+      stack: getStack(prettyError),
       codeFrame: prettyError.codeFrame,
       type: getErrorType(prettyError),
       code: prettyError.code,
@@ -1002,7 +1020,7 @@ const WebWorkerRpcClient = {
 };
 
 const rpcs = Object.create(null);
-const set$9 = (id, rpc) => {
+const set$b = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get = id => {
@@ -1026,7 +1044,7 @@ const create = rpcId => {
       return rpc.invokeAndTransfer(method, ...params);
     },
     set(rpc) {
-      set$9(rpcId, rpc);
+      set$b(rpcId, rpc);
     }
   };
 };
@@ -1037,21 +1055,21 @@ const RpcId = {
   __proto__: null,
   FileSystemWorker: FileSystemWorker$1};
 const {
-  invokeAndTransfer: invokeAndTransfer$4,
-  set: set$4
-} = create(RendererWorker$1);
-const RendererWorker = {
+  invoke: invoke$6,
+  set: set$6
+} = create(FileSystemProcess$1);
+const FileSystemProcess = {
   __proto__: null,
-  invokeAndTransfer: invokeAndTransfer$4,
-  set: set$4
+  invoke: invoke$6,
+  set: set$6
 };
 const {
-  invoke: invoke$2,
+  invokeAndTransfer: invokeAndTransfer$2,
   set: set$2
-} = create(FileSystemProcess$1);
-const FileSystemProcess = {
+} = create(RendererWorker$1);
+const RendererWorker = {
   __proto__: null,
-  invoke: invoke$2,
+  invokeAndTransfer: invokeAndTransfer$2,
   set: set$2
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/file-system-worker",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "File System Worker",
   "keywords": [
     "Lvce Editor"