@jsreport/jsreport-cli 3.0.0 → 3.1.2

package/lib/commands/init.js

@@ -1,13 +1,12 @@
-'use strict'
-
 const path = require('path')
 const fs = require('fs')
 const initializeApp = require('./_initializeApp')
 
 const description = 'Initializes the current working directory to start a jsreport application (server.js, *.config.json and package.json)'
 const command = 'init'
+const positionalArgs = '[versionToInstall]'
 
-exports.command = command
+exports.command = `${command} ${positionalArgs}`
 exports.description = description
 
 exports.builder = (yargs) => {
@@ -51,8 +50,8 @@ exports.handler = (argv) => {
   let cwd = argv.context.cwd
   let versionToInstall
 
-  if (argv._ && argv._[1]) {
-    versionToInstall = argv._[1]
+  if (argv && argv.versionToInstall != null) {
+    versionToInstall = argv.versionToInstall
   }
 
   if (argv.target != null) {

package/lib/commands/kill.js

@@ -1,9 +1,8 @@
-'use strict'
-
 const description = 'Kill a daemon jsreport process'
 const command = 'kill'
+const positionalArgs = '[uidOrpid]'
 
-exports.command = command
+exports.command = `${command} ${positionalArgs}`
 exports.description = description
 
 exports.builder = (yargs) => {
@@ -33,8 +32,8 @@ exports.handler = async (argv) => {
   let identifier
   let processInfo
 
-  if (argv._ && argv._[1]) {
-    identifier = argv._[1]
+  if (argv && argv.uidOrpid != null) {
+    identifier = argv.uidOrpid
   }
 
   if (!identifier) {

package/lib/commands/render.js

@@ -1,9 +1,7 @@
-'use strict'
-
 const util = require('util')
 const fs = require('fs')
 const jsreportClient = require('@jsreport/nodejs-client')
-const normalizePathOptionOrArg = require('../normalizePathOptionOrArg')
+const normalizePathOptionOrArg = require('../utils/normalizePathOptionOrArg')
 
 const writeFileAsync = util.promisify(fs.writeFile)
 
@@ -20,10 +18,7 @@ exports.builder = (yargs) => {
     request: {
       alias: 'r',
       description: 'Specifies a path to a json file containing option for the entire rendering request',
-      requiresArg: true,
-      coerce: (value) => {
-        return normalizePathOptionOrArg(cwd, 'request', value, { json: true, strict: true })
-      }
+      requiresArg: true
     },
     keepAlive: {
       alias: 'k',
@@ -33,50 +28,26 @@ exports.builder = (yargs) => {
     template: {
       alias: 't',
       description: 'Specifies a path to a json file containing options for template input or you can specify singular options doing --template.[option_name] value',
-      requiresArg: true,
-      coerce: (value) => {
-        if (typeof value !== 'string') {
-          if (value.content != null) {
-            value.content = normalizePathOptionOrArg(cwd, 'template.content', value.content, { strict: true })
-          }
-
-          if (value.helpers != null) {
-            value.helpers = normalizePathOptionOrArg(cwd, 'template.helpers', value.helpers, { strict: true })
-          }
-
-          return value
-        }
-
-        return normalizePathOptionOrArg(cwd, 'template', value, { json: true, strict: true })
-      }
+      requiresArg: true
     },
     data: {
       alias: 'd',
       description: 'Specifies a path to a json file containing options for data input',
-      requiresArg: true,
-      coerce: (value) => {
-        return normalizePathOptionOrArg(cwd, 'data', value, { json: true, strict: false })
-      }
+      requiresArg: true
     },
     out: {
       alias: 'o',
       description: 'Save rendering result into a file path',
       type: 'string',
       demandOption: true,
-      requiresArg: true,
-      coerce: (value) => {
-        return normalizePathOptionOrArg(cwd, 'out', value, { read: false, strict: true })
-      }
+      requiresArg: true
     },
     meta: {
       alias: 'm',
       description: 'Save response meta information into a file path',
       type: 'string',
       demandOption: false,
-      requiresArg: true,
-      coerce: (value) => {
-        return normalizePathOptionOrArg(cwd, 'meta', value, { read: false, strict: true })
-      }
+      requiresArg: true
     }
   }
 
@@ -93,6 +64,37 @@ exports.builder = (yargs) => {
       .usage(`${description}\n\n${getUsage('jsreport ' + command)}`)
       .group(options, 'Command options:')
       .options(commandOptions)
+      .middleware((argv) => {
+        if (argv.request != null) {
+          argv.request = normalizePathOptionOrArg(cwd, 'request', argv.request, { json: true, strict: true })
+        }
+
+        if (argv.template != null) {
+          if (typeof argv.template !== 'string') {
+            if (argv.template.content != null) {
+              argv.template.content = normalizePathOptionOrArg(cwd, 'template.content', argv.template.content, { strict: true })
+            }
+
+            if (argv.template.helpers != null) {
+              argv.template.helpers = normalizePathOptionOrArg(cwd, 'template.helpers', argv.template.helpers, { strict: true })
+            }
+          } else {
+            argv.template = normalizePathOptionOrArg(cwd, 'template', argv.template, { json: true, strict: true })
+          }
+        }
+
+        if (argv.data != null) {
+          argv.data = normalizePathOptionOrArg(cwd, 'data', argv.data, { json: true, strict: false })
+        }
+
+        if (argv.out != null) {
+          argv.out = normalizePathOptionOrArg(cwd, 'out', argv.out, { read: false, strict: true })
+        }
+
+        if (argv.meta != null) {
+          argv.meta = normalizePathOptionOrArg(cwd, 'meta', argv.meta, { read: false, strict: true })
+        }
+      }, true)
       .check((argv, hash) => {
         if (argv.user && !argv.serverUrl) {
           throw new Error('user option needs to be used with --serverUrl option')

package/lib/commands/repair.js

@@ -1,11 +1,10 @@
-'use strict'
-
 const initializeApp = require('./_initializeApp')
 
 const description = 'Repairs current working directory to start a jsreport application (It re-creates files server.js, *.config.json and package.json)'
 const command = 'repair'
+const positionalArgs = '[versionToInstall]'
 
-exports.command = command
+exports.command = `${command} ${positionalArgs}`
 exports.description = description
 
 exports.builder = (yargs) => {
@@ -35,8 +34,8 @@ exports.handler = (argv) => {
   const cwd = argv.context.cwd
   let versionToInstall
 
-  if (argv._ && argv._[1]) {
-    versionToInstall = argv._[1]
+  if (argv && argv.versionToInstall != null) {
+    versionToInstall = argv.versionToInstall
   }
 
   return initializeApp(

package/lib/commands/start.js

@@ -1,5 +1,3 @@
-'use strict'
-
 const description = 'Starts a jsreport process in current working directory'
 const command = 'start'
 

package/lib/commands/win-install.js

@@ -1,5 +1,3 @@
-'use strict'
-
 const path = require('path')
 const fs = require('fs')
 const platform = require('os').platform()

package/lib/commands/win-uninstall.js

@@ -1,5 +1,3 @@
-'use strict'
-
 const path = require('path')
 const fs = require('fs')
 const platform = require('os').platform()

package/lib/daemonHandler.js

@@ -5,8 +5,8 @@ const path = require('path')
 const fs = require('fs')
 const nssocket = require('nssocket')
 const lockfile = require('lockfile')
-const getTempPaths = require('./getTempPaths')
-const normalizeSocketPath = require('./normalizeSocketPath')
+const getTempPaths = require('./utils/getTempPaths')
+const normalizeSocketPath = require('./utils/normalizeSocketPath')
 
 const lock = util.promisify(lockfile.lock.bind(lockfile))
 const unlock = util.promisify(lockfile.unlock.bind(lockfile))

package/lib/daemonInstance.js

@@ -4,9 +4,9 @@ const fs = require('fs')
 const HttpsServer = require('https').Server
 const ipAddress = require('ip-address')
 const nssocket = require('nssocket')
-const startSocketServer = require('./startSocketServer.js')
-const instanceHandler = require('./instanceHandler.js')
-const errorUtils = require('./errorUtils')
+const instanceHandler = require('./instanceHandler')
+const startSocketServer = require('./utils/startSocketServer')
+const { getErrors } = require('./utils/error')
 
 const PID = process.pid
 
@@ -126,7 +126,7 @@ function start (customInstance, socketFile) {
             if (socketInitErr) {
               return socketToMaster.send(['init'], {
                 error: socketInitErr.message,
-                stacks: errorUtils.getErrors(socketInitErr).map(e => e.stack)
+                stacks: getErrors(socketInitErr).map(e => e.stack)
               })
             }
 
@@ -155,7 +155,7 @@ function start (customInstance, socketFile) {
 
           socketToMaster.send(['init'], {
             error: err.message,
-            stacks: errorUtils.getErrors(err).map(e => e.stack),
+            stacks: getErrors(err).map(e => e.stack),
             meta: Object.keys(meta).length > 0 ? meta : undefined
           })
 

package/lib/{registerExtensionsCommands.js → detectAndRegisterExtensionsCommands.js}

@@ -3,7 +3,7 @@
 const util = require('util')
 const path = require('path')
 const fs = require('fs')
-const { addStack } = require('./errorUtils')
+const { addStack } = require('./utils/error')
 const accessAsync = util.promisify(fs.access)
 
 module.exports = async (extensions, commander) => {

package/lib/keepAliveProcess.js

@@ -6,10 +6,10 @@ const fs = require('fs')
 const spawn = require('silent-spawn')
 const lockfile = require('lockfile')
 const omit = require('lodash.omit')
-const { addStack } = require('./errorUtils')
-const getTempPaths = require('./getTempPaths')
+const { addStack } = require('./utils/error')
+const getTempPaths = require('./utils/getTempPaths')
+const startSocketServer = require('./utils/startSocketServer')
 const daemonHandler = require('./daemonHandler')
-const startSocketServer = require('./startSocketServer')
 
 const lock = util.promisify(lockfile.lock.bind(lockfile))
 const unlock = util.promisify(lockfile.unlock.bind(lockfile))

package/lib/{errorUtils.js → utils/error.js}

@@ -58,7 +58,7 @@ function getErrors (err) {
     errors.push({
       message: parent.message,
       stack: currentStack || '',
-      meta: Object.keys(customProps).length > 0 ? customProps : undefined,
+      meta: Object.keys(customProps).length > 0 ? getSimpleProperties(customProps) : undefined,
       cleanState
     })
 
@@ -115,6 +115,28 @@ function getErrorMessages (err) {
   return messages
 }
 
+function getSimpleProperties (obj) {
+  const newObj = {}
+
+  for (const [key, value] of Object.entries(obj)) {
+    if (
+      value == null ||
+      typeof value === 'string' ||
+      typeof value === 'number' ||
+      typeof value === 'boolean' ||
+      typeof value === 'bigint'
+    ) {
+      newObj[key] = value
+    }
+  }
+
+  if (Object.keys(newObj).length === 0) {
+    return undefined
+  }
+
+  return newObj
+}
+
 function printError (err, logger) {
   const messages = getErrorMessages(err)
 

package/lib/{startSocketServer.js → utils/startSocketServer.js}

@@ -2,7 +2,7 @@
 
 const path = require('path')
 const fs = require('fs')
-const nanoid = require('nanoid')
+const { nanoid } = require('nanoid')
 const nssocket = require('nssocket')
 const normalizeSocketPath = require('./normalizeSocketPath')
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsreport/jsreport-cli",
-  "version": "3.0.0",
+  "version": "3.1.2",
   "description": "Command line interface for jsreport",
   "keywords": [
     "jsreport",
@@ -46,7 +46,7 @@
   "scripts": {
     "lint": "standard",
     "start": "cross-env JSREPORT_CLI_DEV=enabled node cli.js",
-    "test": "mocha --recursive \"./test/*.spec.js\" \"./test/commands/**/*.spec.js\" --timeout 28000 --exit",
+    "test": "mocha --recursive \"./test/*.spec.js\" \"./test/commands/**/*.spec.js\" --timeout 28000 --exit && standard",
     "test:watch": "mocha --recursive \"./test/*.spec.js\" \"./test/commands/**/*.spec.js\" --timeout 28000 --exit --watch"
   },
   "dependencies": {
@@ -60,21 +60,21 @@
     "liftoff": "3.1.0",
     "lockfile": "1.0.4",
     "lodash.omit": "4.5.0",
-    "nanoid": "1.0.2",
+    "nanoid": "3.2.0",
     "npm-install-package": "2.1.0",
     "nssocket": "0.6.0",
     "once": "1.4.0",
-    "prompt-tmp": "1.0.0",
+    "prompt": "1.3.0",
     "semver": "5.6.0",
     "silent-spawn": "0.4.0",
-    "yargs": "13.2.4"
+    "yargs": "17.3.1"
   },
   "devDependencies": {
-    "@jsreport/jsreport-authentication": "3.0.0",
-    "@jsreport/jsreport-core": "3.0.0",
-    "@jsreport/jsreport-express": "3.0.0",
-    "@jsreport/jsreport-fs-store": "3.0.0",
-    "@jsreport/jsreport-handlebars": "3.0.0",
+    "@jsreport/jsreport-authentication": "3.3.1",
+    "@jsreport/jsreport-core": "3.5.0",
+    "@jsreport/jsreport-express": "3.4.0",
+    "@jsreport/jsreport-fs-store": "3.2.0",
+    "@jsreport/jsreport-handlebars": "3.1.0",
     "cross-env": "5.2.1",
     "execa": "1.0.0",
     "handlebars": "4.7.7",
@@ -84,11 +84,11 @@
     "rimraf": "2.6.3",
     "should": "13.2.3",
     "sinon": "4.4.0",
-    "standard": "16.0.3",
+    "standard": "16.0.4",
     "std-mocks": "1.0.1"
   },
   "optionalDependencies": {
-    "winser-with-api": "1.0.1"
+    "winser-with-api": "1.0.2"
   },
   "engines": {
     "node": ">=16.11"