@lvce-editor/shared-process 0.11.12 → 0.12.1

package/src/parts/VError/VError.js

@@ -1,38 +1,21 @@
+import * as MergeStacks from '../MergeStacks/MergeStacks.js'
+import * as NormalizeErrorLine from '../NormalizeErrorLine/NormalizeErrorLine.js'
+
 const getCombinedMessage = (error, message) => {
-  let stringifiedError = `${error}`
-  if (stringifiedError.startsWith('Error: ')) {
-    stringifiedError = stringifiedError.slice(`Error: `.length)
-  } else if (stringifiedError.startsWith('VError: ')) {
-    stringifiedError = stringifiedError.slice(`VError: `.length)
-  }
+  const stringifiedError = NormalizeErrorLine.normalizeLine(`${error}`)
   if (message) {
     return `${message}: ${stringifiedError}`
   }
   return stringifiedError
 }
 
-const mergeStacks = (parent, child) => {
-  if (!child) {
-    return parent
-  }
-  const parentNewLineIndex = parent.indexOf('\n')
-  const childNewLineIndex = child.indexOf('\n')
-  const parentFirstLine = parent.slice(0, parentNewLineIndex)
-  const childRest = child.slice(childNewLineIndex)
-  const childFirstLine = child.slice(0, childNewLineIndex)
-  if (parentFirstLine.includes(childFirstLine)) {
-    return parentFirstLine + childRest
-  }
-  return child
-}
-
 export class VError extends Error {
   constructor(error, message) {
     const combinedMessage = getCombinedMessage(error, message)
     super(combinedMessage)
     this.name = 'VError'
     if (error instanceof Error) {
-      this.stack = mergeStacks(this.stack, error.stack)
+      this.stack = MergeStacks.mergeStacks(this.stack, error.stack)
     }
     if (error.codeFrame) {
       this.codeFrame = error.codeFrame