Adding stdin readin to convert commands

Author: munozemilio

packages/luis/package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "author": "Microsoft",
   "bugs": "https://github.com/microsoft/botframework-cli/issues",
-  "main": "parser/index.js",
+  "main": "src/parser/index.js",
   "dependencies": {
     "@microsoft/bf-cli-command": "1.0.0",
     "@oclif/config": "~1.13.3",
@@ -41,7 +41,7 @@
   },
   "files": [
     "/lib",
-    "/parser",
+    "/src/parser",
     "/npm-shrinkwrap.json",
     "/oclif.manifest.json"
   ],

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

@@ -1,7 +1,6 @@
 import {CLIError, Command, flags} from '@microsoft/bf-cli-command'
 const exception = require('./../../parser/lufile/classes/exception')
 const fs = require('fs-extra')
-const path = require('path')
 const file = require('./../../utils/filehelper')
 const luConverter = require('./../../parser/converters/lutoluisconverter')
 const luisConverter = require('./../../parser/converters/luistoluconverter')
@@ -10,7 +9,7 @@ export default class LuisConvert extends Command {
   static description = 'Convert .lu file(s) to a LUIS application JSON model or vice versa'
 
   static flags: flags.Input<any> = {
-    in: flags.string({description: 'Source .lu file(s) or LUIS application JSON model', required: true}),
+    in: flags.string({description: 'Source .lu file(s) or LUIS application JSON model'}),
     recurse: flags.boolean({description: 'Indicates if sub-folders need to be considered to file .lu file(s)', default: false}),
     log: flags.boolean({description: 'Enables log messages', default: false}),
     sort: flags.boolean({description: 'When set, intent, utterances, entities are alphabetically sorted in .lu files', default: false}),
@@ -25,18 +24,21 @@ export default class LuisConvert extends Command {
   async run() {
     try {
       const {flags} = this.parse(LuisConvert)
+      // Check if data piped in stdin
+      let stdin = await this.readStdin()
+
       //Check if file or folder
       //if folder, only lu to luis is supported
-      let inputStat = await fs.stat(flags.in)
-      let isLu = !inputStat.isFile() ? true : path.extname(flags.in) === '.lu'
+      let isLu = await file.detectLuContent(stdin, flags.in)
 
       // Parse the object depending on the input
       let result: any
       if (isLu) {
-        const luFiles = await file.getLuObjects(flags.in, flags.recurse)
+        const luFiles = await file.getLuObjects(stdin, flags.in, flags.recurse)
         result = await luConverter.parseLuToLuis(luFiles, flags.log, flags.culture)
       } else {
-        result = await luisConverter.parseLuisFileToLu(flags.in, flags.sort)
+        const luisFile = stdin ? stdin : await file.getContentFromFile(flags.in)
+        result = await luisConverter.parseLuisObjectToLu(luisFile, flags.sort, flags.in)
       }
 
       // If result is null or undefined return

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

@@ -1,7 +1,6 @@
 import {CLIError, Command, flags} from '@microsoft/bf-cli-command'
 const exception = require('./../../parser/lufile/classes/exception')
 const fs = require('fs-extra')
-const path = require('path')
 const file = require('./../../utils/filehelper')
 const luConverter = require('./../../parser/converters/qnatoqnajsonconverter')
 const qnaConverter = require('./../../parser/converters/qnajsontoqnaconverter')
@@ -23,18 +22,21 @@ export default class QnamakerConvert extends Command {
     try {
       const {flags} = this.parse(QnamakerConvert)
 
-      // Check if file or folder
-      // If folder, only lu to luis is supported
-      let inputStat = await fs.stat(flags.in)
-      let isQnA = !inputStat.isFile() ? true : path.extname(flags.in) === '.lu'
+      // Check if data piped in stdin
+      let stdin = await this.readStdin()
+
+      //Check if file or folder
+      //if folder, only lu to luis is supported
+      let isQnA = await file.detectLuContent(stdin, flags.in)
 
       // Parse the object depending on the input
       let result: any
       if (isQnA) {
-        const luFiles = await file.getLuObjects(flags.in, flags.recurse)
+        const luFiles = await file.getLuObjects(stdin, flags.in, flags.recurse)
         result = await luConverter.parseQnaToJson(luFiles, false, flags.luis_culture)
       } else {
-        result = await qnaConverter.parseQnAFileToLu(flags.in, flags.sort, flags.alterations)
+        const qnAFile = stdin ? stdin : await file.getContentFromFile(flags.in)
+        result = await qnaConverter.parseQnAObjectToLu(qnAFile, flags.sort, flags.alterations)
       }
 
       // If result is null or undefined return

packages/luis/src/parser/converters/luistoluconverter.js

@@ -10,9 +10,9 @@ const retCode = require('./../lufile/enums/CLI-errors')
 module.exports = {
     parseLuisFileToLu: async function(file, sort) {
         let LUISFileContent = await openFileAndReadContent(file)
-        return await this.parseLuisObjectToLu(LUISFileContent, file, sort)
+        return await this.parseLuisObjectToLu(LUISFileContent, sort, file)
     },
-    parseLuisObjectToLu: async function(luisObjectString, src, sort) {
+    parseLuisObjectToLu: async function(luisObjectString, sort, src = '', ) {
         let LUISJSON = await parseLuis(luisObjectString, src, sort)
         return await this.constructMdFromLUISJSON(LUISJSON.model)
     },

packages/luis/src/parser/converters/lumerger.js

@@ -16,13 +16,13 @@ const luisJSON = require('./../luisfile/parseLuisFile');
 
 module.exports = {
     mergeAndResolveReferences: async function (luObjArray, verbose, luis_culture, luSearchFn){
-        let allParsedContent = await buildLuObject(luObjArray, verbose, luis_culture, luSearchFn)
+        let allParsedContent = await buildJsonObject(luObjArray, verbose, luis_culture, luSearchFn)
         await resolveReferencesInUtterances(allParsedContent)
         return allParsedContent
     }
 }
 
-const buildLuObject = async function(luObjArray, log, luis_culture, luSearchFn = findLuFilesInDir){
+const buildJsonObject = async function(luObjArray, log, luis_culture, luSearchFn = findLuFilesInDir){
     let allParsedLUISContent = []
     let allParsedQnAContent = []
     let allParsedAlterationsContent = []

packages/luis/src/parser/lufile/helpers.js

@@ -3,7 +3,6 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-require('./utils');
 const fs = require('fs');
 const path = require('path');
 const retCode = require('./enums/CLI-errors');

packages/luis/src/parser/lufile/parseFileContents.js

@@ -3,7 +3,6 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-require('./utils');
 const LUISObjNameEnum = require('./enums/luisobjenum');
 const PARSERCONSTS = require('./enums/parserconsts');
 const builtInTypes = require('./enums/luisbuiltintypes');