Merge pull request #217 from microsoft/emimunoz/luis

Change telemetry message and fix to stdin reading

Author: munozemilio

packages/cli/scripts/postinstall.js

@@ -38,7 +38,7 @@ const getUserConfig = async () => {
     const userConfig = await getUserConfig()
     userConfig.lastVersionCheck = new Date()
     if (userConfig.telemetry === null) {
-      const disableTelemetry = await cli.prompt(chalk.red('Telemetry is disabled. Would you like to opt in? Only command and flags usage will be sent. (Y/N)'))
+      const disableTelemetry = await cli.prompt(chalk.red('Help us improve products by allowing Microsoft to collect anonymous command and flags usage: (Y/N)'))
       if (disableTelemetry === 'Y' || disableTelemetry === 'y') {
         userConfig.telemetry = true
         console.log(chalk.blue('Telemetry has been enabled.'))

packages/cli/src/hooks/init/inithook.ts

@@ -66,7 +66,7 @@ const hook: Hook<'init'> = async function (opts) {
   // Ensure telemetry is set
   try {
     if (userConfig.telemetry === null) {
-      const disableTelemetry = await cli.prompt(chalk.red('Telemetry is disabled. Would you like to opt in?. Only command and flags usage will be sent. (Y/N)'))
+      const disableTelemetry = await cli.prompt(chalk.red('Help us improve products by allowing Microsoft to collect anonymous command and flags usage: (Y/N)'))
       if (disableTelemetry === 'Y' || disableTelemetry === 'y') {
         userConfig.telemetry = true
         this.log(chalk.blue('Telemetry has been enabled.'))

packages/command/src/readpipeddata.ts

@@ -16,6 +16,7 @@ const ReadPipedStdin = {
       }, 1000)
 
       stdin.on('data', chunk => {
+        clearTimeout(timer)
         input += chunk
       })
 

packages/command/test/command.test.ts

@@ -95,20 +95,6 @@ describe('command', () => {
   .do(output => expect(output.stderr).to.equal(''))
   .it('Command should return empty string if no stdin')
 
-  fancy
-  .stdin('test reading of piped data')
-  .stdout()
-  .do(async () => {
-    try {
-      const resp: any = await ReadPipedStdin.read()
-      if (resp) console.log(resp)
-    } catch (error) {
-      if (error) console.log(`Error: ${error}`)
-    }
-  })
-  .do(output => expect(output.stdout).to.equal('test reading of piped data\n'))
-  .it('should read and echo the stdin input')
-
   fancy
   .stdin('')
   .stdout()

packages/lu/package.json

@@ -63,5 +63,10 @@
     "prepack": "rm -rf lib && tsc -b && oclif-dev manifest && oclif-dev readme",
     "test": "nyc --extension .ts mocha --forbid-only \"test/**/*.test.**\"",
     "version": "oclif-dev readme && git add README.md"
+  },
+  "nyc": {
+    "exclude": [
+      "**/lufile/generated/**"
+    ]
   }
 }

packages/lu/src/commands/luis/convert.ts

@@ -77,7 +77,6 @@ export default class LuisConvert extends Command {
     // write out the final file
     try {
       await fs.writeFile(filePath, convertedObject, 'utf-8')
-
     } catch (err) {
       throw new CLIError('Unable to write file - ' + filePath + ' Error: ' + err.message)
     }

packages/lu/src/commands/luis/translate.ts

@@ -28,14 +28,9 @@ export default class LuisTranslate extends Command {
       const {flags} = this.parse(LuisTranslate)
       // Check if data piped in stdin
       let stdin = await this.readStdin()
-      let outputStat = flags.out ? await fs.stat(flags.out) : null
-
-      if (outputStat && outputStat.isFile()) {
-        throw new CLIError('Output can only be writen to a folder')
-      }
-
       let isLu = await fileHelper.detectLuContent(stdin, flags.in)
       let result: any
+
       if (isLu) {
         let luFiles = await fileHelper.getLuObjects(stdin, flags.in, flags.recurse, fileExtEnum.LUFile)
         result = await luTranslator.translateLuList(luFiles, flags.translatekey, flags.tgtlang, flags.srclang, flags.translate_comments, flags.translate_link_text)

packages/lu/src/commands/qnamaker/translate.ts

@@ -28,11 +28,6 @@ export default class QnamakerTranslate extends Command {
       const {flags} = this.parse(QnamakerTranslate)
       // Check if data piped in stdin
       let stdin = await this.readStdin()
-      let outputStat = flags.out ? await fs.stat(flags.out) : null
-
-      if (outputStat && outputStat.isFile()) {
-        throw new CLIError('Output can only be writen to a folder')
-      }
 
       let isLu = await fileHelper.detectLuContent(stdin, flags.in)
       let result: any

packages/lu/src/utils/filehelper.ts

@@ -60,11 +60,14 @@ export async function getContentFromFile(file: string) {
 
 export async function generateNewFilePath(outFileName: string, inputfile: string, isLu: boolean, prefix = '', extType: string = helpers.FileExtTypeEnum.LUFile): Promise<string> {
   let base = path.resolve(outFileName)
+  let root = path.dirname(base)
+  if (!fs.existsSync(root)) {
+    throw new CLIError('Path not found: ' + root)
+  }
+
   let extension = path.extname(base)
   if (extension) {
-    let root = path.dirname(base)
-    let file = path.basename(base)
-    return path.join(root, prefix + file)
+    return path.join(root, prefix + path.basename(base))
   }
 
   let name = ''
@@ -79,6 +82,16 @@ export async function generateNewFilePath(outFileName: string, inputfile: string
 
 export async function generateNewTranslatedFilePath(fileName: string, translatedLanguage: string, output: string): Promise<string> {
   let newPath = path.resolve(output)
+
+  let extension = path.extname(newPath)
+  if (extension) {
+    throw new CLIError('Output can only be writen to a folder')
+  }
+
+  if (!fs.existsSync(newPath)) {
+    throw new CLIError('Path not found: ' + newPath)
+  }
+
   newPath = path.join(output, translatedLanguage)
   await fs.mkdirp(newPath)
   return path.join(newPath, fileName)

packages/lu/test/commands/luis/convert.test.ts

@@ -470,3 +470,12 @@ describe('luis:convert new entity format', () => {
   })
 })
 
+describe('luis:convert file creation', () => {
+  test
+  .stderr()
+  .command(['luis:convert', '--in', `${path.join(__dirname, './../../fixtures/testcases/newEntity1.json')}`, '--out', './newfolder/newEntity.lu'])
+  .it('luis:convert throws error if path to write doesnt exist', async (ctx) => {
+    expect(ctx.stderr).to.contain('Path not found:')
+  })
+})
+