@jsreport/jsreport-cli 4.0.3 → 4.0.5

package/README.md

@@ -7,6 +7,14 @@ See http://jsreport.net/learn/cli for documentation
 
 ## Changelog
 
+### 4.0.5
+
+- update dev prompt to prompts to fix audit
+
+### 4.0.4
+
+- dont use console.error(e.stack) and just console.error(e) to avoid loosing e.cause inner error
+
 ### 4.0.3
 
 - update nodejs-client to fix audit

package/example.server.js

@@ -1,14 +1,14 @@
-const jsreport = require('$moduleName$')()
-
-if (process.env.JSREPORT_CLI) {
-  // export jsreport instance to make it possible to use jsreport-cli
-  module.exports = jsreport
-} else {
-  jsreport.init().then(() => {
-    // running
-  }).catch((e) => {
-    // error during startup
-    console.error(e.stack)
-    process.exit(1)
-  })
-}
+const jsreport = require('$moduleName$')()
+
+if (process.env.JSREPORT_CLI) {
+  // export jsreport instance to make it possible to use jsreport-cli
+  module.exports = jsreport
+} else {
+  jsreport.init().then(() => {
+    // running
+  }).catch((e) => {
+    // error during startup
+    console.error(e)
+    process.exit(1)
+  })
+}

package/lib/commander/startProcessing.js

@@ -1,5 +1,5 @@
 const yargs = require('yargs')
-const prompt = require('prompt')
+const prompts = require('prompts')
 const startCommand = require('./startCommand')
 const jsreportInstance = require('./jsreportInstance')
 const cliPackageJson = require('../../package.json')
@@ -158,37 +158,27 @@ module.exports = async function startProcessing (commander, logger, args) {
         argv.password = needsPassword
       }, true)
     } else {
-      await new Promise((resolve, reject) => {
-        prompt.start()
-
-        prompt.message = ''
-
-        prompt.get([{
+      try {
+        const response = await prompts({
+          type: 'password',
           name: 'password',
-          description: 'Password',
-          message: 'Password can\'t be empty',
-          type: 'string',
-          hidden: true,
-          required: true
-        }], (err, result) => {
-          if (err) {
-            const errorToReject = new Error('No value for password option')
-            errorToReject.cleanState = true
-
-            commander.emit('started', errorToReject, null)
-
-            return reject(errorToReject)
-          }
+          message: 'Password',
+          validate: value => value.trim() === '' ? 'Password can\'t be empty' : true
+        })
 
-          // we add middleware to pre-define the "p/password" option to
-          commander._cli.middleware((argv) => {
-            argv.p = result.password
-            argv.password = result.password
-          }, true)
+        // we add middleware to pre-define the "p/password" option to
+        commander._cli.middleware((argv) => {
+          argv.p = response.password
+          argv.password = response.password
+        }, true)
+      } catch (error) {
+        const errorToReject = new Error('No value for password option')
+        errorToReject.cleanState = true
 
-          resolve()
-        })
-      })
+        commander.emit('started', errorToReject, null)
+
+        throw errorToReject
+      }
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsreport/jsreport-cli",
-  "version": "4.0.3",
+  "version": "4.0.5",
   "description": "Command line interface for jsreport",
   "keywords": [
     "jsreport",
@@ -50,7 +50,7 @@
     "test:watch": "mocha --recursive \"./test/*.spec.js\" \"./test/commands/**/*.spec.js\" --timeout 28000 --exit --watch"
   },
   "dependencies": {
-    "@jsreport/nodejs-client": "4.0.2",
+    "@jsreport/nodejs-client": "4.0.3",
     "chalk": "2.4.2",
     "cliui": "7.0.4",
     "inquirer": "8.2.0",
@@ -64,16 +64,16 @@
     "npm-install-package": "2.1.0",
     "nssocket": "0.6.0",
     "once": "1.4.0",
-    "prompt": "1.3.0",
+    "prompts": "2.4.2",
     "semver": "7.5.4",
     "silent-spawn": "0.4.0",
     "yargs": "17.3.1"
   },
   "devDependencies": {
-    "@jsreport/jsreport-authentication": "4.1.0",
-    "@jsreport/jsreport-core": "4.2.1",
-    "@jsreport/jsreport-express": "4.1.0",
-    "@jsreport/jsreport-fs-store": "4.0.1",
+    "@jsreport/jsreport-authentication": "4.2.2",
+    "@jsreport/jsreport-core": "4.5.0",
+    "@jsreport/jsreport-express": "4.1.3",
+    "@jsreport/jsreport-fs-store": "4.0.4",
     "@jsreport/jsreport-handlebars": "4.0.1",
     "cross-env": "5.2.1",
     "execa": "1.0.0",

package/test/testUtils.js

@@ -1,197 +1,197 @@
-const path = require('path')
-const fs = require('fs')
-
-module.exports = ({
-  baseDir,
-  rootDirectory,
-  defaultOpts,
-  defaultExtensions = [],
-  cliModuleName = '@jsreport/jsreport-cli',
-  deps
-}) => {
-  const {
-    extend,
-    mkdirp,
-    rimraf,
-    execa
-  } = deps
-
-  return {
-    getTempDir: getTempDir.bind(undefined, baseDir),
-    cleanTempDir: cleanTempDir.bind(undefined, baseDir),
-    createTempDir: createTempDir.bind(undefined, baseDir),
-    setup: setup.bind(undefined, baseDir),
-    init: init.bind(undefined, baseDir),
-    exec: exec.bind(undefined, baseDir)
-  }
-
-  function getTempDir (baseDir, dir) {
-    return path.join(baseDir, dir)
-  }
-
-  function cleanTempDir (baseDir, dir) {
-    const fullDir = getTempDir(baseDir, dir)
-    let dirs
-
-    try {
-      dirs = fs.readdirSync(fullDir)
-    } catch (e) {}
-
-    if (!dirs) {
-      return
-    }
-
-    dirs.forEach((d) => {
-      rimraf.sync(path.join(fullDir, d))
-    })
-  }
-
-  function createTempDir (baseDir, dir) {
-    const fullDir = getTempDir(baseDir, dir)
-    mkdirp.sync(fullDir)
-    return fullDir
-  }
-
-  async function setup (baseDir, dir, extensions = [], cliRunnerExtension, opts) {
-    cleanTempDir(baseDir, dir)
-
-    const tempDir = createTempDir(baseDir, dir)
-
-    const tempDataDir = createTempDir(baseDir, `${dir}/data`)
-
-    let optionsToUse = extend(true, {
-      rootDirectory,
-      store: {
-        provider: 'memory'
-      },
-      extensions: {
-        'fs-store': {
-          dataDirectory: tempDataDir
-        }
-      }
-    }, defaultOpts)
-
-    if (opts) {
-      optionsToUse = extend(true, {}, optionsToUse, opts)
-    }
-
-    fs.writeFileSync(
-      path.join(tempDir, './package.json'),
-      JSON.stringify({
-        name: dir,
-        dependencies: {
-          '@jsreport/jsreport-core': '*'
-        },
-        jsreport: {
-          entryPoint: 'server.js'
-        }
-      }, null, 2)
-    )
-
-    fs.writeFileSync(
-      path.join(tempDir, './instance.js'),
-      `
-        process.env.cli_instance_lookup_fallback = process.env.cli_instance_lookup_fallback != null ? process.env.cli_instance_lookup_fallback : 'enabled'
-
-        const defaultOpts = ${optionsToUse != null ? JSON.stringify(optionsToUse) : 'undefined'}
-
-        module.exports = (initOpts) => {
-          return (
-            require('@jsreport/jsreport-core')(initOpts != null ? initOpts : defaultOpts)
-              .use(require(\`${escapePath(cliModuleName)}\`)())
-              ${defaultExtensions && defaultExtensions.length > 0 ? defaultExtensions.map((e) => `.use(require(\`${escapePath(e)}\`)())`).join('') : ''}
-              ${extensions && extensions.length > 0 ? extensions.map((e) => `.use(require(\`${escapePath(e)}\`)())`).join('') : ''}
-          )
-        }
-
-        module.exports.defaultOpts = defaultOpts
-      `
-    )
-
-    fs.writeFileSync(
-      path.join(tempDir, './server.js'),
-      `
-        const createJsreport = require('./instance')
-
-        if (process.env.JSREPORT_CLI) {
-          module.exports = createJsreport()
-        } else {
-          createJsreport().init().catch(function (e) {
-            console.error("error on jsreport init")
-            console.error(e.stack)
-            process.exit(1)
-          })
-        }
-      `
-    )
-
-    fs.writeFileSync(
-      path.join(tempDir, './cliRunner.js'),
-      `
-      const createJsreport = require('./instance')
-
-      const commander = require(\`${escapePath(cliModuleName)}\`).commander(undefined, {
-        instance: process.env.noDefaultInstance != null ? undefined : createJsreport()
-      })
-
-      ${cliRunnerExtension != null ? cliRunnerExtension : ''}
-
-      commander.start(process.argv.slice(2))
-      `
-    )
-  }
-
-  async function init (baseDir, dir, opts) {
-    const fullDir = getTempDir(baseDir, dir)
-
-    const createJsreport = require(path.join(fullDir, 'instance.js'))
-
-    const jsreport = createJsreport(
-      extend(true, {}, createJsreport.defaultOpts, opts)
-    )
-
-    await jsreport.init()
-
-    return jsreport
-  }
-
-  function exec (baseDir, dir, cmd = '', opts) {
-    const defaultCWD = getTempDir(baseDir, dir)
-    const cliRunner = path.join(defaultCWD, 'cliRunner.js')
-
-    const file = process.execPath
-    const fullCmd = `${process.env.debugCLI ? '--inspect-brk ' : ''}${cliRunner} ${cmd}`
-
-    // this should be replaced when execa.command (v2) is released
-    const args = (
-      fullCmd
-        .trim()
-        .split(/ +/g)
-        .reduce((tokens, token, index) => {
-          if (index === 0) {
-            return [token]
-          }
-
-          const previousToken = tokens[tokens.length - 1]
-
-          if (previousToken.endsWith('\\')) {
-            return [...tokens.slice(0, -1), `${previousToken.slice(0, -1)} ${token}`]
-          }
-
-          return [...tokens, token]
-        }, [])
-    )
-
-    const execaResult = execa(file, args, {
-      env: Object.assign({ DEBUG: 'jsreport' }, opts != null ? opts.env : undefined),
-      cwd: opts && opts.cwd != null ? opts.cwd : defaultCWD,
-      windowsHide: true
-    })
-
-    return execaResult
-  }
-}
-
-function escapePath (pathStr) {
-  return pathStr.replace(/\\/g, '\\\\')
-}
+const path = require('path')
+const fs = require('fs')
+
+module.exports = ({
+  baseDir,
+  rootDirectory,
+  defaultOpts,
+  defaultExtensions = [],
+  cliModuleName = '@jsreport/jsreport-cli',
+  deps
+}) => {
+  const {
+    extend,
+    mkdirp,
+    rimraf,
+    execa
+  } = deps
+
+  return {
+    getTempDir: getTempDir.bind(undefined, baseDir),
+    cleanTempDir: cleanTempDir.bind(undefined, baseDir),
+    createTempDir: createTempDir.bind(undefined, baseDir),
+    setup: setup.bind(undefined, baseDir),
+    init: init.bind(undefined, baseDir),
+    exec: exec.bind(undefined, baseDir)
+  }
+
+  function getTempDir (baseDir, dir) {
+    return path.join(baseDir, dir)
+  }
+
+  function cleanTempDir (baseDir, dir) {
+    const fullDir = getTempDir(baseDir, dir)
+    let dirs
+
+    try {
+      dirs = fs.readdirSync(fullDir)
+    } catch (e) {}
+
+    if (!dirs) {
+      return
+    }
+
+    dirs.forEach((d) => {
+      rimraf.sync(path.join(fullDir, d))
+    })
+  }
+
+  function createTempDir (baseDir, dir) {
+    const fullDir = getTempDir(baseDir, dir)
+    mkdirp.sync(fullDir)
+    return fullDir
+  }
+
+  async function setup (baseDir, dir, extensions = [], cliRunnerExtension, opts) {
+    cleanTempDir(baseDir, dir)
+
+    const tempDir = createTempDir(baseDir, dir)
+
+    const tempDataDir = createTempDir(baseDir, `${dir}/data`)
+
+    let optionsToUse = extend(true, {
+      rootDirectory,
+      store: {
+        provider: 'memory'
+      },
+      extensions: {
+        'fs-store': {
+          dataDirectory: tempDataDir
+        }
+      }
+    }, defaultOpts)
+
+    if (opts) {
+      optionsToUse = extend(true, {}, optionsToUse, opts)
+    }
+
+    fs.writeFileSync(
+      path.join(tempDir, './package.json'),
+      JSON.stringify({
+        name: dir,
+        dependencies: {
+          '@jsreport/jsreport-core': '*'
+        },
+        jsreport: {
+          entryPoint: 'server.js'
+        }
+      }, null, 2)
+    )
+
+    fs.writeFileSync(
+      path.join(tempDir, './instance.js'),
+      `
+        process.env.cli_instance_lookup_fallback = process.env.cli_instance_lookup_fallback != null ? process.env.cli_instance_lookup_fallback : 'enabled'
+
+        const defaultOpts = ${optionsToUse != null ? JSON.stringify(optionsToUse) : 'undefined'}
+
+        module.exports = (initOpts) => {
+          return (
+            require('@jsreport/jsreport-core')(initOpts != null ? initOpts : defaultOpts)
+              .use(require(\`${escapePath(cliModuleName)}\`)())
+              ${defaultExtensions && defaultExtensions.length > 0 ? defaultExtensions.map((e) => `.use(require(\`${escapePath(e)}\`)())`).join('') : ''}
+              ${extensions && extensions.length > 0 ? extensions.map((e) => `.use(require(\`${escapePath(e)}\`)())`).join('') : ''}
+          )
+        }
+
+        module.exports.defaultOpts = defaultOpts
+      `
+    )
+
+    fs.writeFileSync(
+      path.join(tempDir, './server.js'),
+      `
+        const createJsreport = require('./instance')
+
+        if (process.env.JSREPORT_CLI) {
+          module.exports = createJsreport()
+        } else {
+          createJsreport().init().catch(function (e) {
+            console.error("error on jsreport init")
+            console.error(e)
+            process.exit(1)
+          })
+        }
+      `
+    )
+
+    fs.writeFileSync(
+      path.join(tempDir, './cliRunner.js'),
+      `
+      const createJsreport = require('./instance')
+
+      const commander = require(\`${escapePath(cliModuleName)}\`).commander(undefined, {
+        instance: process.env.noDefaultInstance != null ? undefined : createJsreport()
+      })
+
+      ${cliRunnerExtension != null ? cliRunnerExtension : ''}
+
+      commander.start(process.argv.slice(2))
+      `
+    )
+  }
+
+  async function init (baseDir, dir, opts) {
+    const fullDir = getTempDir(baseDir, dir)
+
+    const createJsreport = require(path.join(fullDir, 'instance.js'))
+
+    const jsreport = createJsreport(
+      extend(true, {}, createJsreport.defaultOpts, opts)
+    )
+
+    await jsreport.init()
+
+    return jsreport
+  }
+
+  function exec (baseDir, dir, cmd = '', opts) {
+    const defaultCWD = getTempDir(baseDir, dir)
+    const cliRunner = path.join(defaultCWD, 'cliRunner.js')
+
+    const file = process.execPath
+    const fullCmd = `${process.env.debugCLI ? '--inspect-brk ' : ''}${cliRunner} ${cmd}`
+
+    // this should be replaced when execa.command (v2) is released
+    const args = (
+      fullCmd
+        .trim()
+        .split(/ +/g)
+        .reduce((tokens, token, index) => {
+          if (index === 0) {
+            return [token]
+          }
+
+          const previousToken = tokens[tokens.length - 1]
+
+          if (previousToken.endsWith('\\')) {
+            return [...tokens.slice(0, -1), `${previousToken.slice(0, -1)} ${token}`]
+          }
+
+          return [...tokens, token]
+        }, [])
+    )
+
+    const execaResult = execa(file, args, {
+      env: Object.assign({ DEBUG: 'jsreport' }, opts != null ? opts.env : undefined),
+      cwd: opts && opts.cwd != null ? opts.cwd : defaultCWD,
+      windowsHide: true
+    })
+
+    return execaResult
+  }
+}
+
+function escapePath (pathStr) {
+  return pathStr.replace(/\\/g, '\\\\')
+}