fix the priority of stdin and in (#796)

feich-ms · web-flow · commit dd36356efb94 · 2020-05-20T22:26:15.000+08:00
* fix the priority of stdin and in

* fix the same issue in bf luis:generate

* repalce all priority between stdin and --in

* fix logic

* remove only in luis build tests
diff --git a/packages/lu/src/utils/filehelper.ts b/packages/lu/src/utils/filehelper.ts
@@ -17,15 +17,15 @@ const globby = require('globby')
 
 export async function getLuObjects(stdin: string, input: string | undefined, recurse = false, extType: string | undefined) {
   let luObjects: any = []
-  if (stdin) {
-    luObjects.push(new luObject(stdin, new LUOptions('stdin')))
-  } else {
+  if (input) {
     let luFiles = await getLuFiles(input, recurse, extType)
     for (let i = 0; i < luFiles.length; i++) {
       let luContent = await getContentFromFile(luFiles[i])
       const opts = new LUOptions(path.resolve(luFiles[i]))
       luObjects.push(new luObject(luContent, opts))
     }
+  } else {
+    luObjects.push(new luObject(stdin, new LUOptions('stdin')))
   }
 
   return luObjects
diff --git a/packages/luis/src/commands/luis/application/import.ts b/packages/luis/src/commands/luis/application/import.ts
@@ -38,7 +38,7 @@ export default class LuisApplicationImport extends Command {
 
     inVal = inVal ? inVal.trim() : flags.in
 
-    const appJSON = stdin ? stdin : await utils.getInputFromFile(inVal)
+    const appJSON = inVal ? await utils.getInputFromFile(inVal) : stdin
     if (!appJSON) throw new CLIError('No import data found - please provide input through stdin or the --in flag')
 
     // const client = utils.getLUISClient(subscriptionKey, endpoint)
diff --git a/packages/luis/src/commands/luis/build.ts b/packages/luis/src/commands/luis/build.ts
@@ -107,16 +107,7 @@ export default class LuisBuild extends Command {
       let multiRecognizers = new Map<string, any>()
       let settings = new Map<string, any>()
 
-      if (flags.stdin && flags.stdin !== '') {
-        // load lu content from stdin and create default recognizer, multiRecognier and settings
-        if (log) this.log('Load lu content from stdin\n')
-        const content = new Content(flags.stdin, new LUOptions('stdin', true, defaultCulture, path.join(process.cwd(), 'stdin')))
-        luContents.push(content)
-        multiRecognizers.set('stdin', new MultiLanguageRecognizer(path.join(process.cwd(), 'stdin.lu.dialog'), {}))
-        settings.set('stdin', new Settings(path.join(process.cwd(), `luis.settings.${suffix}.${region}.json`), {}))
-        const recognizer = Recognizer.load(content.path, content.name, path.join(process.cwd(), `${content.name}.dialog`), settings.get('stdin'), {})
-        recognizers.set(content.name, recognizer)
-      } else {
+      if ((inVal && inVal !== '') || files.length > 0) {
         if (log) this.log('Loading files...\n')
 
         // get lu files from in.
@@ -135,6 +126,15 @@ export default class LuisBuild extends Command {
         recognizers = loadedResources.recognizers
         multiRecognizers = loadedResources.multiRecognizers
         settings = loadedResources.settings
+      } else {
+        // load lu content from stdin and create default recognizer, multiRecognier and settings
+        if (log) this.log('Load lu content from stdin\n')
+        const content = new Content(flags.stdin, new LUOptions('stdin', true, defaultCulture, path.join(process.cwd(), 'stdin')))
+        luContents.push(content)
+        multiRecognizers.set('stdin', new MultiLanguageRecognizer(path.join(process.cwd(), 'stdin.lu.dialog'), {}))
+        settings.set('stdin', new Settings(path.join(process.cwd(), `luis.settings.${suffix}.${region}.json`), {}))
+        const recognizer = Recognizer.load(content.path, content.name, path.join(process.cwd(), `${content.name}.dialog`), settings.get('stdin'), {})
+        recognizers.set(content.name, recognizer)
       }
 
       // update or create and then train and publish luis applications based on loaded resources
diff --git a/packages/luis/src/commands/luis/convert.ts b/packages/luis/src/commands/luis/convert.ts
@@ -49,7 +49,7 @@ export default class LuisConvert extends Command {
           throw new CLIError('No LU or Luis content parsed!')
         }
       } else {
-        const luisContent = stdin ? stdin : await file.getContentFromFile(flags.in)
+        const luisContent = flags.in ? await file.getContentFromFile(flags.in) : stdin
         const luisObject = new Luis(file.parseJSON(luisContent, 'Luis'))
         if (flags.sort) {
           sort(luisObject)
diff --git a/packages/luis/src/commands/luis/generate/cs.ts b/packages/luis/src/commands/luis/generate/cs.ts
@@ -42,7 +42,7 @@ export default class LuisGenerateCs extends Command {
     const pathPrefix = flags.in && path.isAbsolute(flags.in) ? '' : process.cwd()
     let app: any
     try {
-      app = stdInput ? JSON.parse(stdInput as string) : await fs.readJSON(path.join(pathPrefix, flags.in))
+      app = flags.in ? await fs.readJSON(path.join(pathPrefix, flags.in)) : JSON.parse(stdInput as string)
     } catch (err) {
       throw new CLIError(err)
     }
diff --git a/packages/luis/src/commands/luis/generate/ts.ts b/packages/luis/src/commands/luis/generate/ts.ts
@@ -40,7 +40,7 @@ export default class LuisGenerateTs extends Command {
       const pathPrefix = flags.in && path.isAbsolute(flags.in) ? '' : process.cwd()
       let app: any
       try {
-        app = stdInput ? JSON.parse(stdInput as string) : await fs.readJSON(path.join(pathPrefix, flags.in))
+        app = flags.in ? await fs.readJSON(path.join(pathPrefix, flags.in)) : JSON.parse(stdInput as string)
       } catch (error) {
         throw new CLIError(error)
       }
diff --git a/packages/luis/src/commands/luis/test.ts b/packages/luis/src/commands/luis/test.ts
@@ -51,7 +51,7 @@ export default class LuisTest extends Command {
           throw new CLIError('No LU content parsed!')
         }
       } else {
-        const luisContent = stdin ? stdin : await file.getContentFromFile(flags.in)
+        const luisContent = flags.in ? await file.getContentFromFile(flags.in) : stdin
         luisObject = new Luis(file.parseJSON(luisContent, 'Luis'))
         if (!hasContent(luisObject)) {
           throw new CLIError('No LUIS content found!')
diff --git a/packages/luis/src/commands/luis/translate.ts b/packages/luis/src/commands/luis/translate.ts
@@ -51,9 +51,9 @@ export default class LuisTranslate extends Command {
           })
         })
       } else {
-        const json = stdin ? stdin : await fileHelper.getContentFromFile(flags.in)
+        const json = flags.in ? await fileHelper.getContentFromFile(flags.in) : stdin
         const luisObject = new Luis(fileHelper.parseJSON(json, 'Luis'))
-        const key = stdin ? 'stdin' : path.basename(flags.in)
+        const key = flags.in ? path.basename(flags.in) : 'stdin'
         const translation = new Lu(luisObject.parseToLuContent(), key)
         const translatedLuis = await luTranslator.translateLu(translation, flags.translatekey, flags.tgtlang, flags.srclang, flags.translate_comments, flags.translate_link_text)
         result = {
diff --git a/packages/luis/src/commands/luis/version/import.ts b/packages/luis/src/commands/luis/version/import.ts
@@ -39,7 +39,7 @@ export default class LuisVersionImport extends Command {
 
     inVal = inVal ? inVal.trim() : flags.in
 
-    const appJSON = stdin ? stdin : await utils.getInputFromFile(inVal)
+    const appJSON = inVal ? await utils.getInputFromFile(inVal) : stdin
     if (!appJSON) throw new CLIError('No import data found - please provide input through stdin or the --in flag')
 
     if (versionId) options.versionId = versionId
diff --git a/packages/luis/test/commands/luis/build.test.ts b/packages/luis/test/commands/luis/build.test.ts
@@ -817,7 +817,7 @@ describe('luis:build create a new application successfully with locale set to it
     await fs.remove(path.join(__dirname, './../../../results/'))
   })
 
-  test.only()
+  test
     .stdout()
     .command(['luis:build', '--in', './test/fixtures/testcases/lubuild/file-with-personName/personName.en-us.lu', '--authoringKey', uuidv1(), '--botName', 'test', '--log', '--suffix', 'development', '--out', './results', '--defaultCulture', 'it-it'])
     .it('should create a new application successfully for prebuilt entity personName with locale set to it-it', ctx => {
diff --git a/packages/qnamaker/src/commands/qnamaker/build.ts b/packages/qnamaker/src/commands/qnamaker/build.ts
@@ -74,16 +74,7 @@ export default class QnamakerBuild extends Command {
       
       let files: string[] = []
 
-      if (flags.stdin && flags.stdin !== '') {
-        // load qna content from stdin and create default recognizer, multiRecognier and settings
-        if (flags.log) this.log('Load qna content from stdin\n')
-        const content = new Content(flags.stdin, new qnaOptions(flags.botName, true, flags.defaultCulture, path.join(process.cwd(), 'stdin')))
-        qnaContents.push(content)
-        multiRecognizer = new MultiLanguageRecognizer(path.join(process.cwd(), `${flags.botName}.qna.dialog`), {})
-        settings = new Settings(path.join(process.cwd(), `qnamaker.settings.${flags.suffix}.${flags.region}.json`), {})
-        const recognizer = Recognizer.load(content.path, content.name, path.join(process.cwd(), `${content.name}.dialog`), settings, {})
-        recognizers.set(content.name, recognizer)
-      } else {
+      if (flags.in && flags.in !== '') {
         if (flags.log) this.log('Loading files...\n')
 
         // get qna files from flags.in.
@@ -102,6 +93,15 @@ export default class QnamakerBuild extends Command {
         recognizers = loadedResources.recognizers
         multiRecognizer = loadedResources.multiRecognizer
         settings = loadedResources.settings
+      } else {
+        // load qna content from stdin and create default recognizer, multiRecognier and settings
+        if (flags.log) this.log('Load qna content from stdin\n')
+        const content = new Content(flags.stdin, new qnaOptions(flags.botName, true, flags.defaultCulture, path.join(process.cwd(), 'stdin')))
+        qnaContents.push(content)
+        multiRecognizer = new MultiLanguageRecognizer(path.join(process.cwd(), `${flags.botName}.qna.dialog`), {})
+        settings = new Settings(path.join(process.cwd(), `qnamaker.settings.${flags.suffix}.${flags.region}.json`), {})
+        const recognizer = Recognizer.load(content.path, content.name, path.join(process.cwd(), `${content.name}.dialog`), settings, {})
+        recognizers.set(content.name, recognizer)
       }
 
       // update or create and then publish qnamaker kb based on loaded resources
diff --git a/packages/qnamaker/src/commands/qnamaker/convert.ts b/packages/qnamaker/src/commands/qnamaker/convert.ts
@@ -46,7 +46,7 @@ export default class QnamakerConvert extends Command {
         const luFiles = await file.getLuObjects(stdin, flags.in, flags.recurse, fileExtEnum.QnAFile)
         result = await QnAMakerBuilder.build([...luFiles], false, flags.luis_culture) 
       } else {
-        const qnaContent = stdin ? stdin : await file.getContentFromFile(flags.in)
+        const qnaContent = flags.in ? await file.getContentFromFile(flags.in) : stdin
         let QnA 
         let sortFucntion
 
diff --git a/packages/qnamaker/src/commands/qnamaker/translate.ts b/packages/qnamaker/src/commands/qnamaker/translate.ts
@@ -51,11 +51,11 @@ export default class QnamakerTranslate extends Command {
           })
         })
       } else {
-        const json = stdin ? stdin : await fileHelper.getContentFromFile(flags.in)
+        const json = flags.in ? await fileHelper.getContentFromFile(flags.in) : stdin
         const qnaM = new QnaMaker(fileHelper.parseJSON(json, 'QnA'))
         const qna = new QnA(qnaM.parseToLuContent())
         const qnaTranslation = await luTranslator.translateQnA(qna, flags.translatekey, flags.tgtlang, flags.srclang, flags.translate_comments, flags.translate_link_text)
-        const key = stdin ? 'stdin' : path.basename(flags.in)
+        const key = flags.in ? path.basename(flags.in) : 'stdin'
         result = {
           [key]: {},
         }
diff --git a/packages/qnamaker/src/utils/qnamakerbase.ts b/packages/qnamaker/src/utils/qnamakerbase.ts
@@ -21,10 +21,11 @@ export async function processInputs(flags: any, payload: any, configfile: string
     ServiceBase.config = flags
     await qnaconfig.validateConfig(flags)
     const serviceManifest = srvMan.getServiceManifest(payload)
-    flags.in = stdin ? stdin : flags.in
+    const input = flags.in
+    flags.in = flags.in || stdin || undefined
     result.requestBody = await srvMan.validateArguments(serviceManifest, flags)
-    if (stdin || flags.in) {
-      result.requestBody = stdin || await file.getContentFromFile(flags.in)
+    if (flags.in) {
+      result.requestBody = input ? await file.getContentFromFile(input) : stdin
       try {
         result.requestBody = JSON.parse(result.requestBody)
       } catch(ex) {

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ export default class LuisConvert extends Command {`
`49`	`49`	`throw new CLIError('No LU or Luis content parsed!')`
`50`	`50`	`}`
`51`	`51`	`} else {`
`52`		`- const luisContent = stdin ? stdin : await file.getContentFromFile(flags.in)`
	`52`	`+ const luisContent = flags.in ? await file.getContentFromFile(flags.in) : stdin`
`53`	`53`	`const luisObject = new Luis(file.parseJSON(luisContent, 'Luis'))`
`54`	`54`	`if (flags.sort) {`
`55`	`55`	`sort(luisObject)`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ export default class LuisGenerateCs extends Command {`
`42`	`42`	`const pathPrefix = flags.in && path.isAbsolute(flags.in) ? '' : process.cwd()`
`43`	`43`	`let app: any`
`44`	`44`	`try {`
`45`		`- app = stdInput ? JSON.parse(stdInput as string) : await fs.readJSON(path.join(pathPrefix, flags.in))`
	`45`	`+ app = flags.in ? await fs.readJSON(path.join(pathPrefix, flags.in)) : JSON.parse(stdInput as string)`
`46`	`46`	`} catch (err) {`
`47`	`47`	`throw new CLIError(err)`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ export default class LuisGenerateTs extends Command {`
`40`	`40`	`const pathPrefix = flags.in && path.isAbsolute(flags.in) ? '' : process.cwd()`
`41`	`41`	`let app: any`
`42`	`42`	`try {`
`43`		`- app = stdInput ? JSON.parse(stdInput as string) : await fs.readJSON(path.join(pathPrefix, flags.in))`
	`43`	`+ app = flags.in ? await fs.readJSON(path.join(pathPrefix, flags.in)) : JSON.parse(stdInput as string)`
`44`	`44`	`} catch (error) {`
`45`	`45`	`throw new CLIError(error)`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ export default class LuisTest extends Command {`
`51`	`51`	`throw new CLIError('No LU content parsed!')`
`52`	`52`	`}`
`53`	`53`	`} else {`
`54`		`- const luisContent = stdin ? stdin : await file.getContentFromFile(flags.in)`
	`54`	`+ const luisContent = flags.in ? await file.getContentFromFile(flags.in) : stdin`
`55`	`55`	`luisObject = new Luis(file.parseJSON(luisContent, 'Luis'))`
`56`	`56`	`if (!hasContent(luisObject)) {`
`57`	`57`	`throw new CLIError('No LUIS content found!')`