@jsreport/jsreport-cli 3.2.2 → 3.2.3

package/README.md

@@ -7,6 +7,10 @@ See http://jsreport.net/learn/cli for documentation
 
 ## Changelog
 
+### 3.2.3
+
+- improve error logging
+
 ### 3.2.2
 
 - add support for tempDirectory and service name to win-install command

package/lib/utils/error.js

@@ -70,7 +70,6 @@ function getErrors (err) {
 
 function getErrorMessages (err) {
   const errors = getErrors(err)
-  let count = errors.length
   let cleanState = false
   const messages = []
   const stacks = []
@@ -85,34 +84,26 @@ function getErrorMessages (err) {
 
     customProps = JSON.stringify(customProps)
 
-    if (cleanState) {
-      messages.push(`${formatError(error)}`)
-    } else {
-      messages.push(`${formatError(error)} (${count})`)
-    }
+    messages.push(`${formatError(error)}`)
 
     if (customProps === '{}') {
       customProps = ''
     }
 
     if (currentStack !== '') {
-      const causedBy = `caused by error (${count}):`
-
       if (customProps !== '') {
-        stacks.push(`${causedBy}\n-> meta = ${customProps}\n-> stack\n${currentStack}`)
+        stacks.push(`-> meta = ${customProps}\n-> stack\n${currentStack}`)
       } else {
-        stacks.push(`${causedBy}\n-> stack\n${currentStack}`)
+        stacks.push(`-> stack\n${currentStack}`)
       }
     }
-
-    count--
   })
 
   if (!cleanState && stacks.length > 0) {
-    messages.push(`\n${stacks.join('\n')}`)
+    return [messages, stacks]
   }
 
-  return messages
+  return [messages, []]
 }
 
 function getSimpleProperties (obj) {
@@ -138,9 +129,37 @@ function getSimpleProperties (obj) {
 }
 
 function printError (err, logger) {
-  const messages = getErrorMessages(err)
+  const [messages, stacks] = getErrorMessages(err)
+
+  for (let idx = 0; idx < messages.length; idx++) {
+    messages[idx] += ` (${messages.length - idx})`
+
+    if (idx > 0) {
+      messages[idx] = lowerCaseFirstLetter(messages[idx])
+    }
+  }
+
+  let errorLog = messages.join('\n(because) ')
+
+  if (stacks.length > 0) {
+    const reversedStacks = [...stacks].reverse()
+
+    for (let idx = 0; idx < reversedStacks.length; idx++) {
+      reversedStacks[idx] = `-- error (${idx + 1}) --\n${reversedStacks[idx]}`
+    }
+
+    errorLog += `\n\n${reversedStacks.join('\nwrapped by:\n')}`
+  }
+
+  logger.error(errorLog)
+}
+
+function lowerCaseFirstLetter (str) {
+  if (str === '' || typeof str !== 'string') {
+    return str
+  }
 
-  logger.error(messages.join('. '))
+  return str.charAt(0).toLowerCase() + str.slice(1)
 }
 
 module.exports.printError = printError

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsreport/jsreport-cli",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "description": "Command line interface for jsreport",
   "keywords": [
     "jsreport",
@@ -71,8 +71,8 @@
   },
   "devDependencies": {
     "@jsreport/jsreport-authentication": "3.3.2",
-    "@jsreport/jsreport-core": "3.8.0",
-    "@jsreport/jsreport-express": "3.4.2",
+    "@jsreport/jsreport-core": "3.9.0",
+    "@jsreport/jsreport-express": "3.5.0",
     "@jsreport/jsreport-fs-store": "3.2.3",
     "@jsreport/jsreport-handlebars": "3.2.1",
     "cross-env": "5.2.1",