@lvce-editor/json-rpc 5.5.0 → 6.1.0

package/dist/index.js

@@ -120,6 +120,19 @@ 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);
 };
@@ -132,22 +145,17 @@ 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);
@@ -234,6 +242,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 {
@@ -246,7 +265,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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/json-rpc",
-  "version": "5.5.0",
+  "version": "6.1.0",
   "description": "JsonRpc implementation",
   "main": "dist/index.js",
   "type": "module",