@jsreport/jsreport-cli 3.0.0-beta.2 → 3.1.1

package/lib/commands/repair.js

@@ -1,56 +1,55 @@
-'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'
-
-exports.command = command
-exports.description = description
-
-exports.builder = (yargs) => {
-  const examples = getExamples(`jsreport ${command}`)
-
-  examples.forEach((examp) => {
-    yargs.example(examp[0], examp[1])
-  })
-
-  return (
-    yargs
-      .usage([
-        `${description}\n`,
-        `Usage:\n\njsreport ${command} [versionToInstall]\n`,
-        'If no jsreport installation was found we will try to install the version of',
-        'jsreport specified in `versionToInstall` and if it is not specified we will try to install the latest version'
-      ].join('\n'))
-      .positional('versionToInstall', {
-        type: 'string',
-        description: 'Specific jsreport version to install'
-      })
-  )
-}
-
-exports.handler = (argv) => {
-  const logger = argv.context.logger
-  const cwd = argv.context.cwd
-  let versionToInstall
-
-  if (argv._ && argv._[1]) {
-    versionToInstall = argv._[1]
-  }
-
-  return initializeApp(
-    cwd,
-    logger,
-    true,
-    versionToInstall,
-    typeof argv.context.customInstall === 'function' ? argv.context.customInstall : undefined
-  )
-}
-
-function getExamples (command) {
-  return [
-    [`${command}`, 'Repairs and install the latest jsreport if not found'],
-    [`${command} 2.5.0`, 'Repairs and install jsreport version 2.5.0 if not found']
-  ]
-}
+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} ${positionalArgs}`
+exports.description = description
+
+exports.builder = (yargs) => {
+  const examples = getExamples(`jsreport ${command}`)
+
+  examples.forEach((examp) => {
+    yargs.example(examp[0], examp[1])
+  })
+
+  return (
+    yargs
+      .usage([
+        `${description}\n`,
+        `Usage:\n\njsreport ${command} [versionToInstall]\n`,
+        'If no jsreport installation was found we will try to install the version of',
+        'jsreport specified in `versionToInstall` and if it is not specified we will try to install the latest version'
+      ].join('\n'))
+      .positional('versionToInstall', {
+        type: 'string',
+        description: 'Specific jsreport version to install'
+      })
+  )
+}
+
+exports.handler = (argv) => {
+  const logger = argv.context.logger
+  const cwd = argv.context.cwd
+  let versionToInstall
+
+  if (argv && argv.versionToInstall != null) {
+    versionToInstall = argv.versionToInstall
+  }
+
+  return initializeApp(
+    cwd,
+    logger,
+    true,
+    versionToInstall,
+    typeof argv.context.customInstall === 'function' ? argv.context.customInstall : undefined
+  )
+}
+
+function getExamples (command) {
+  return [
+    [`${command}`, 'Repairs and install the latest jsreport if not found'],
+    [`${command} 2.5.0`, 'Repairs and install jsreport version 2.5.0 if not found']
+  ]
+}

package/lib/commands/start.js

@@ -1,74 +1,72 @@
-'use strict'
-
-const description = 'Starts a jsreport process in current working directory'
-const command = 'start'
-
-exports.command = command
-exports.description = description
-
-exports.configuration = {
-  disableStrictOptions: true,
-  disableProcessExit: true
-}
-
-exports.builder = (yargs) => {
-  return (
-    yargs.usage([
-      `${description}\n`,
-      `Usage:\n\njsreport ${command}\n`,
-      'You can set any jsreport configuration option using arguments or env vars',
-      'For example, to set httpPort option using arguments:\n',
-      'simple option:',
-      '   jsreport start --httpPort=9000\n',
-      'nested option:',
-      '   jsreport start --store:provider=fs\n',
-      'Or using env vars:\n',
-      '    Linux/macOS:',
-      '       simple option:',
-      '           $> env httpPort=9000 jsreport start\n',
-      '       nested option:',
-      '           $> env store:provider=fs jsreport start\n',
-      '    Windows:',
-      '       simple option:',
-      '           $> set httpPort=9000',
-      '           $> jsreport start\n',
-      '       nested option:',
-      '           $> set store:provider=fs',
-      '           $> jsreport start\n\n',
-      'Also, you can put configuration in jsreport.config.json,',
-      'You can learn more about jsreport configuration, conditional config files and available options here: https://jsreport.net/learn/configuration'
-    ].join('\n'))
-  )
-}
-
-exports.handler = (argv) => {
-  const context = argv.context
-  const logger = context.logger
-  const cwd = context.cwd
-  const getInstance = context.getInstance
-  const initInstance = context.initInstance
-
-  logger.debug('resolving jsreport location..')
-
-  return (
-    getInstance(cwd)
-      .then((_instance) => {
-        let jsreportInstance
-
-        logger.debug('starting jsreport..')
-
-        if (typeof _instance === 'function') {
-          jsreportInstance = _instance()
-        } else {
-          jsreportInstance = _instance
-        }
-
-        // init and resolving the promise with the instance
-        return initInstance(jsreportInstance, true)
-      }).then((result) => {
-        logger.debug('jsreport successfully started')
-
-        return result
-      })
-  )
-}
+const description = 'Starts a jsreport process in current working directory'
+const command = 'start'
+
+exports.command = command
+exports.description = description
+
+exports.configuration = {
+  disableStrictOptions: true,
+  disableProcessExit: true
+}
+
+exports.builder = (yargs) => {
+  return (
+    yargs.usage([
+      `${description}\n`,
+      `Usage:\n\njsreport ${command}\n`,
+      'You can set any jsreport configuration option using arguments or env vars',
+      'For example, to set httpPort option using arguments:\n',
+      'simple option:',
+      '   jsreport start --httpPort=9000\n',
+      'nested option:',
+      '   jsreport start --store:provider=fs\n',
+      'Or using env vars:\n',
+      '    Linux/macOS:',
+      '       simple option:',
+      '           $> env httpPort=9000 jsreport start\n',
+      '       nested option:',
+      '           $> env store:provider=fs jsreport start\n',
+      '    Windows:',
+      '       simple option:',
+      '           $> set httpPort=9000',
+      '           $> jsreport start\n',
+      '       nested option:',
+      '           $> set store:provider=fs',
+      '           $> jsreport start\n\n',
+      'Also, you can put configuration in jsreport.config.json,',
+      'You can learn more about jsreport configuration, conditional config files and available options here: https://jsreport.net/learn/configuration'
+    ].join('\n'))
+  )
+}
+
+exports.handler = (argv) => {
+  const context = argv.context
+  const logger = context.logger
+  const cwd = context.cwd
+  const getInstance = context.getInstance
+  const initInstance = context.initInstance
+
+  logger.debug('resolving jsreport location..')
+
+  return (
+    getInstance(cwd)
+      .then((_instance) => {
+        let jsreportInstance
+
+        logger.debug('starting jsreport..')
+
+        if (typeof _instance === 'function') {
+          jsreportInstance = _instance()
+        } else {
+          jsreportInstance = _instance
+        }
+
+        // init and resolving the promise with the instance
+        return initInstance(jsreportInstance, true)
+      }).then((result) => {
+        logger.debug('jsreport successfully started')
+
+        return result
+      })
+  )
+}

package/lib/commands/win-install.js

@@ -1,126 +1,124 @@
-'use strict'
-
-const path = require('path')
-const fs = require('fs')
-const platform = require('os').platform()
-const Winser = require('winser-with-api').Winser
-
-const description = 'WINDOWS ONLY - install app as windows service, For other platforms see http://jsreport.net/on-prem/downloads'
-const command = 'win-install'
-
-exports.command = command
-exports.description = description
-
-exports.handler = (argv) => {
-  return new Promise((resolve, reject) => {
-    const verbose = argv.verbose
-    const context = argv.context
-    const logger = context.logger
-    const cwd = context.cwd
-    const staticPaths = context.staticPaths || {}
-    const appInfo = context.appInfo
-    const existsPackageJson = fs.existsSync(path.join(cwd, './package.json'))
-    let hasEntry = false
-    let pathToApp
-    let serviceName
-    let customError
-
-    logger.info('Platform is ' + platform)
-
-    if (platform !== 'win32') {
-      logger.info('Installing app as windows service only works on windows platforms..')
-      logger.info('Installing jsreport as startup service for your platform should be described at http://jsreport.net/downloads')
-
-      return resolve({
-        installed: false,
-        serviceName: null
-      })
-    }
-
-    if (!existsPackageJson && !appInfo) {
-      customError = new Error('To install app as windows service you need a package.json file')
-      customError.cleanState = true
-      return reject(customError)
-    }
-
-    if (appInfo) {
-      if (!appInfo.path) {
-        customError = new Error('To install app as windows service you need to pass "path" in appInfo')
-        customError.cleanState = true
-        return reject(customError)
-      }
-
-      pathToApp = appInfo.path
-
-      if (!appInfo.name) {
-        customError = new Error('To install app as windows service you need to pass "name" in appInfo')
-        customError.cleanState = true
-        return reject(customError)
-      }
-
-      serviceName = appInfo.name
-
-      if (appInfo.startcmd) {
-        hasEntry = true
-      }
-
-      if (!hasEntry) {
-        customError = new Error('To install app as windows service you need to pass "startcmd" in appInfo')
-        customError.cleanState = true
-        return reject(customError)
-      }
-    } else {
-      pathToApp = cwd
-
-      const userPkg = require(path.join(pathToApp, './package.json'))
-
-      if (!userPkg.name) {
-        customError = new Error('To install app as windows service you need a "name" field in package.json file')
-        customError.cleanState = true
-        return reject(customError)
-      }
-
-      serviceName = userPkg.name
-
-      if (userPkg.scripts && userPkg.scripts.start) {
-        hasEntry = true
-      } else if (userPkg.main) {
-        hasEntry = true
-      }
-
-      if (!hasEntry) {
-        customError = new Error('To install app as windows service you need to have a "start" script or a "main" field in package.json file')
-        customError.cleanState = true
-        return reject(customError)
-      }
-    }
-
-    logger.info('Installing windows service "' + serviceName + '" for app..')
-
-    let winser
-
-    if (appInfo) {
-      winser = Winser({ silent: !verbose, nssmPath: staticPaths.nssm, app: appInfo })
-    } else {
-      winser = Winser({ silent: !verbose, nssmPath: staticPaths.nssm })
-    }
-
-    winser.install({
-      path: pathToApp,
-      autostart: true
-    }, (err) => {
-      if (err) {
-        const error = new Error('Error while trying to install windows service')
-        error.originalError = err
-        return reject(error)
-      }
-
-      logger.info('Service "' + serviceName + '" is running.')
-
-      resolve({
-        installed: true,
-        serviceName: serviceName
-      })
-    })
-  })
-}
+const path = require('path')
+const fs = require('fs')
+const platform = require('os').platform()
+const Winser = require('winser-with-api').Winser
+
+const description = 'WINDOWS ONLY - install app as windows service, For other platforms see http://jsreport.net/on-prem/downloads'
+const command = 'win-install'
+
+exports.command = command
+exports.description = description
+
+exports.handler = (argv) => {
+  return new Promise((resolve, reject) => {
+    const verbose = argv.verbose
+    const context = argv.context
+    const logger = context.logger
+    const cwd = context.cwd
+    const staticPaths = context.staticPaths || {}
+    const appInfo = context.appInfo
+    const existsPackageJson = fs.existsSync(path.join(cwd, './package.json'))
+    let hasEntry = false
+    let pathToApp
+    let serviceName
+    let customError
+
+    logger.info('Platform is ' + platform)
+
+    if (platform !== 'win32') {
+      logger.info('Installing app as windows service only works on windows platforms..')
+      logger.info('Installing jsreport as startup service for your platform should be described at http://jsreport.net/downloads')
+
+      return resolve({
+        installed: false,
+        serviceName: null
+      })
+    }
+
+    if (!existsPackageJson && !appInfo) {
+      customError = new Error('To install app as windows service you need a package.json file')
+      customError.cleanState = true
+      return reject(customError)
+    }
+
+    if (appInfo) {
+      if (!appInfo.path) {
+        customError = new Error('To install app as windows service you need to pass "path" in appInfo')
+        customError.cleanState = true
+        return reject(customError)
+      }
+
+      pathToApp = appInfo.path
+
+      if (!appInfo.name) {
+        customError = new Error('To install app as windows service you need to pass "name" in appInfo')
+        customError.cleanState = true
+        return reject(customError)
+      }
+
+      serviceName = appInfo.name
+
+      if (appInfo.startcmd) {
+        hasEntry = true
+      }
+
+      if (!hasEntry) {
+        customError = new Error('To install app as windows service you need to pass "startcmd" in appInfo')
+        customError.cleanState = true
+        return reject(customError)
+      }
+    } else {
+      pathToApp = cwd
+
+      const userPkg = require(path.join(pathToApp, './package.json'))
+
+      if (!userPkg.name) {
+        customError = new Error('To install app as windows service you need a "name" field in package.json file')
+        customError.cleanState = true
+        return reject(customError)
+      }
+
+      serviceName = userPkg.name
+
+      if (userPkg.scripts && userPkg.scripts.start) {
+        hasEntry = true
+      } else if (userPkg.main) {
+        hasEntry = true
+      }
+
+      if (!hasEntry) {
+        customError = new Error('To install app as windows service you need to have a "start" script or a "main" field in package.json file')
+        customError.cleanState = true
+        return reject(customError)
+      }
+    }
+
+    logger.info('Installing windows service "' + serviceName + '" for app..')
+
+    let winser
+
+    if (appInfo) {
+      winser = Winser({ silent: !verbose, nssmPath: staticPaths.nssm, app: appInfo })
+    } else {
+      winser = Winser({ silent: !verbose, nssmPath: staticPaths.nssm })
+    }
+
+    winser.install({
+      path: pathToApp,
+      autostart: true
+    }, (err) => {
+      if (err) {
+        const error = new Error('Error while trying to install windows service')
+        error.originalError = err
+        return reject(error)
+      }
+
+      logger.info('Service "' + serviceName + '" is running.')
+
+      resolve({
+        installed: true,
+        serviceName: serviceName
+      })
+    })
+  })
+}