Refactor luis build interface to decouple dialog gen from build (#990)

* refactor luis build interface to decouple dialog gen with build

* refactor qnamaker to decouple dialig gen from build

* adjust qna build code

* fix typo

* fix a test case

* adjust cli interface

* refactor crosstrainer interface

* fix log

* fix tslint

Author: feich-ms

packages/cli/README.md

@@ -751,7 +751,7 @@ OPTIONS
 
   --deleteOldVersion               Deletes old version of LUIS application after building new one.
 
-  --dialog=dialog                  [default: multiLanguage] Dialog recognizer type [multiLanguage|crosstrained]
+  --dialog=dialog                  Dialog recognizer type [multiLanguage|crosstrained]. No dialog recognizers will be generated if not specified. Only valid if --out is set
 
   --fallbackLocale=fallbackLocale  Locale to be used at the fallback if no locale specific recognizer is found. Only
                                    valid if --out is set
@@ -1353,7 +1353,7 @@ OPTIONS
   --defaultCulture=defaultCulture        Culture code for the content. Infer from .qna if available. Defaults to en-us
                                          if not set
 
-  --dialog=dialog                        [default: multiLanguage] Dialog recognizer type [multiLanguage|crosstrained]
+  --dialog=dialog                        Dialog recognizer type [multiLanguage|crosstrained]. No dialog recognizers will be generated if not specified. Only valid if --out is set
 
   --fallbackLocale=fallbackLocale        Locale to be used at the fallback if no locale specific recognizer is found.
                                          Only valid if --out is set
@@ -1371,7 +1371,7 @@ OPTIONS
   --endpoint=endpoint                    Qnamaker authoring endpoint for publishing
 
   --schema=schema                        Defines $schema for generated .dialog files
-  
+
 EXAMPLE
 
        $ bf qnamaker:build --in {INPUT_FILE_OR_FOLDER} --subscriptionKey {SUBSCRIPTION_KEY} --botName {BOT_NAME}

packages/lu/src/parser/cross-train/cross-train.js

@@ -27,7 +27,7 @@ module.exports = {
    * Cross train lu and qna files.
    * @param {string} input full path of input lu and qna files folder.
    * @param {string} intentName interruption intent name. Default value is _Interruption.
-   * @param {string} config path to config of mapping rules or mapping rules json content itself. If undefined, it will read config.json from input folder.
+   * @param {string} config path to config of mapping rules or mapping rules json content itself.
    * @param {boolean} verbose verbose to indicate whether log warnings and errors or not when parsing cross-train files.
    * @returns {luResult: any, qnaResult: any} trainedResult of luResult and qnaResult or undefined if no results.
    */
@@ -37,10 +37,15 @@ module.exports = {
     const qnaContents = await file.getFilesContent(input, fileExtEnum.QnAFile)
     const configContent = config && !fs.existsSync(config) ? {id: path.join(input, 'config.json'), content: config} : await file.getConfigContent(config)
 
-    const configObject = file.getConfigObject(configContent, intentName, verbose)
+    const trainedResult = await crossTrainer.crossTrain(
+      luContents,
+      qnaContents,
+      JSON.parse(configContent.content), {
+      configId: configContent.id,
+      intentName,
+      verbose
+    })
 
-    const trainedResult = await crossTrainer.crossTrain(luContents, qnaContents, configObject)
-    
     return trainedResult
   }
 }

packages/lu/src/parser/cross-train/crossTrainer.js

@@ -27,13 +27,21 @@ module.exports = {
    * Do cross training among lu files
    * @param {any[]} luContents the lu content array whose element includes path and content
    * @param {any[]} qnaContents the qna content array whose element includes path and content
-   * @param {any} crossTrainConfig cross train json config
-   * @param {any} importResolver import Resolver when resolving import files
+   * @param {any} configObject cross train config json object
+   * @param {any} options some optional parameters including configId, intentName, verbose, importResolver
    * @returns {Map<string, LUResource>} map of file id and luResource
    * @throws {exception} throws errors
    */
-  crossTrain: async function (luContents, qnaContents, crossTrainConfig, importResolver) {
+  crossTrain: async function (luContents, qnaContents, configObject, options = {}) {
     try {
+      const importResolver = options.importResolver
+
+      const crossTrainConfig = fileHelper.getConfigObject(
+        configObject,
+        options.configId,
+        options.intentName || '_Interruption',
+        options.verbose || true)
+
       let {luObjectArray, qnaObjectArray} = pretreatment(luContents, qnaContents)
       const {rootIds, triggerRules, intentName, verbose} = crossTrainConfig