@jsreport/jsreport-cli 3.2.1 → 3.2.3

package/README.md

@@ -7,6 +7,14 @@ 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
+
 ### 3.2.0
 
 - change the configure command questions to fit better with new `trustUserCode` option

package/lib/commands/win-install.js

@@ -9,6 +9,17 @@ const command = 'win-install'
 exports.command = command
 exports.description = description
 
+exports.builder = (yargs) => {
+  return (
+    yargs
+      .usage('install jsreport as a windows service\njsreport win-install\njsreport win-install --name my-service --tempDirectory=mytemp')
+      .option('name', {
+        description: 'ServiceName',
+        type: 'string'
+      })
+  )
+}
+
 exports.handler = (argv) => {
   return new Promise((resolve, reject) => {
     const verbose = argv.verbose
@@ -50,13 +61,14 @@ exports.handler = (argv) => {
 
       pathToApp = appInfo.path
 
-      if (!appInfo.name) {
-        customError = new Error('To install app as windows service you need to pass "name" in appInfo')
+      serviceName = argv.name || appInfo.name
+      if (!serviceName) {
+        customError = new Error('To install app as windows service you need to pass "name" args or in appInfo')
         customError.cleanState = true
         return reject(customError)
       }
 
-      serviceName = appInfo.name
+      appInfo.name = serviceName
 
       if (appInfo.startcmd) {
         hasEntry = true
@@ -103,9 +115,15 @@ exports.handler = (argv) => {
       winser = Winser({ silent: !verbose, nssmPath: staticPaths.nssm })
     }
 
+    let tempDirectory = process.env.tempDirectory || argv.tempDirectory
+    if (tempDirectory) {
+      tempDirectory = path.isAbsolute(tempDirectory) ? tempDirectory : path.join(pathToApp, tempDirectory)
+    }
+
     winser.install({
       path: pathToApp,
-      autostart: true
+      autostart: true,
+      env: tempDirectory ? [`tempDirectory=${tempDirectory}`] : null
     }, (err) => {
       if (err) {
         const error = new Error('Error while trying to install windows service')

package/lib/commands/win-uninstall.js

@@ -9,6 +9,17 @@ const command = 'win-uninstall'
 exports.command = command
 exports.description = description
 
+exports.builder = (yargs) => {
+  return (
+    yargs
+      .usage('uninstall jsreport windows service\njsreport win-uninstall\njsreport win-uninstall --name my-service')
+      .option('name', {
+        description: 'ServiceName',
+        type: 'string'
+      })
+  )
+}
+
 exports.handler = (argv) => {
   return new Promise((resolve, reject) => {
     const verbose = argv.verbose
@@ -48,13 +59,14 @@ exports.handler = (argv) => {
 
       pathToApp = appInfo.path
 
-      if (!appInfo.name) {
-        customError = new Error('To uninstall windows service for app you need to pass "name" in appInfo')
+      serviceName = argv.name || appInfo.name
+      if (!serviceName) {
+        customError = new Error('To uninstall windows service for app you need to pass "name" in args or in appInfo')
         customError.cleanState = true
         return reject(customError)
       }
 
-      serviceName = appInfo.name
+      appInfo.name = serviceName
     } else {
       pathToApp = cwd
 

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.1",
+  "version": "3.2.3",
   "description": "Command line interface for jsreport",
   "keywords": [
     "jsreport",
@@ -70,11 +70,11 @@
     "yargs": "17.3.1"
   },
   "devDependencies": {
-    "@jsreport/jsreport-authentication": "3.3.1",
-    "@jsreport/jsreport-core": "3.6.1",
-    "@jsreport/jsreport-express": "3.4.1",
-    "@jsreport/jsreport-fs-store": "3.2.1",
-    "@jsreport/jsreport-handlebars": "3.1.0",
+    "@jsreport/jsreport-authentication": "3.3.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",
     "execa": "1.0.0",
     "handlebars": "4.7.7",