Merge branch 'master' into emimunoz/config

Author: munozemilio

.gitattributes

@@ -0,0 +1,5 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+

packages/chatdown/src/commands/chatdown.ts

@@ -18,7 +18,7 @@ export default class Chatdown extends Command {
 
   static flags = {
     in: flags.string({char: 'i', description: 'The path of the chat file or directory to be parsed. A glob expression may be passed containing chat files to be processed all at once, ex. ./**/*.chat. If flag is omitted, stdin will be used. If an output directory is not present (-o), it will default the output to the current working directory.'}),
-    out: flags.string({char: 'o', description: 'Path to the directory where the output of the multiple chat file processing (-f) will be placed.'}),
+    out: flags.string({char: 'o', description: 'Path to the directory where the output of the multiple chat file processing (-o) will be placed.'}),
     static: flags.boolean({char: 's', description: 'Use static timestamps when generating timestamps on activities.'}),
     prefix: flags.boolean({char: 'p', description: 'Prefix stdout with package name.'}),
     help: flags.help({char: 'h', description: 'Chatdown command help'})

packages/cli/README.md

@@ -12,7 +12,6 @@
     "@oclif/plugin-help": "~2.1.6",
     "@microsoft/bf-chatdown": "1.0.0",
     "@microsoft/bf-cli-config": "1.0.0",
-    "@microsoft/bf-dialog": "1.0.0",
     "@microsoft/bf-qnamaker": "1.0.0",
     "chalk": "2.4.1",
     "cli-ux": "^5.3.0",
@@ -61,7 +60,6 @@
       "@oclif/plugin-help",
       "@microsoft/bf-chatdown",
       "@microsoft/bf-cli-config",
-      "@microsoft/bf-dialog",
       "@microsoft/bf-qnamaker"
     ],
     "hooks": {

packages/cli/package.json

@@ -33,7 +33,7 @@ USAGE
 * [`bf config:set:qnamaker`](#bf-configsetqnamaker)
 * [`bf config:set:telemetry`](#bf-configsettelemetry)
 * [`bf config:show`](#bf-configshow)
-* [`bf config:show:qnamaker [FILE]`](#bf-configshowqnamaker-file)
+* [`bf config:show:qnamaker`](#bf-configshowqnamaker)
 * [`bf config:show:telemetry`](#bf-configshowtelemetry)
 
 ## `bf `
@@ -73,8 +73,10 @@ USAGE
   $ bf config:set:qnamaker
 
 OPTIONS
-  --kbid=kbid                        QnAMaker kbid to be set
-  --subscriptionkey=subscriptionkey  QnAMaker subscriptionkey to be set
+  --endpointKey=endpointKey          QnAMaker endpointKey to be set
+  --hostname=hostname                QnAMaker hostname to be set
+  --kbId=kbId                        QnAMaker kbId to be set
+  --subscriptionKey=subscriptionKey  QnAMaker subscriptionkey to be set
 ```
 
 _See code: [src/commands/config/set/qnamaker.ts](https://github.com/microsoft/botframework-cli/blob/v1.0.0/src/commands/config/set/qnamaker.ts)_
@@ -108,18 +110,16 @@ OPTIONS
 
 _See code: [src/commands/config/show.ts](https://github.com/microsoft/botframework-cli/blob/v1.0.0/src/commands/config/show.ts)_
 
-## `bf config:show:qnamaker [FILE]`
+## `bf config:show:qnamaker`
 
-describe the command here
+Display QnAMaker settings
 
 ```
 USAGE
-  $ bf config:show:qnamaker [FILE]
+  $ bf config:show:qnamaker
 
 OPTIONS
-  -f, --force
-  -h, --help       show CLI help
-  -n, --name=name  name to print
+  -h, --help  show CLI help
 ```
 
 _See code: [src/commands/config/show/qnamaker.ts](https://github.com/microsoft/botframework-cli/blob/v1.0.0/src/commands/config/show/qnamaker.ts)_

packages/config/README.md

@@ -5,38 +5,47 @@ export default class ConfigSetQnamaker extends Command {
   static description = 'Set the QnAMaker config data'
 
   static flags = {
-    kbid: flags.string({description: 'QnAMaker kbid to be set'}),
-    subscriptionkey: flags.string({description: 'QnAMaker subscriptionkey to be set'}),
+    kbId: flags.string({description: 'QnAMaker kbId to be set'}),
+    subscriptionKey: flags.string({description: 'QnAMaker subscriptionkey to be set'}),
+    hostname: flags.string({description: 'QnAMaker hostname to be set'}),
+    endpointKey: flags.string({description: 'QnAMaker endpointKey to be set'}),
   }
 
   async run() {
     const {flags} = this.parse(ConfigSetQnamaker)
     let userConfig: Config = await getConfigFile(this.config.configDir)
-    let qnamaker = userConfig.qnamaker
 
-    if (flags.subscriptionkey) {
-      if (qnamaker) {
-        qnamaker.subscriptionKey = flags.subscriptionkey
-      } else {
-        userConfig.qnamaker = {subscriptionKey: flags.subscriptionkey}
-      }
-      this.log('Subscriptionkey set to ' + flags.subscriptionkey)
+    if (flags.subscriptionKey) {
+      this.setValue('subscriptionKey', flags.subscriptionKey, userConfig)
+    }
+
+    if (flags.kbId) {
+      this.setValue('kbId', flags.kbId, userConfig)
+    }
+
+    if (flags.hostname) {
+      this.setValue('hostname', flags.hostname, userConfig)
     }
 
-    if (flags.kbid) {
-      if (qnamaker) {
-        qnamaker.kbId = flags.kbid
-      } else {
-        userConfig.qnamaker = {kbId: flags.kbid}
-      }
-      this.log('Kbid set to ' + flags.kbid)
+    if (flags.endpointKey) {
+      this.setValue('endpointKey', flags.endpointKey, userConfig)
     }
 
-    if (flags.kbid || flags.subscriptionkey) {
+    if (flags.kbId || flags.subscriptionKey || flags.hostname || flags.endpointKey) {
       await writeConfigFile(this.config.configDir, userConfig)
     } else {
       this.log('Plase specify flag')
       this._help()
     }
   }
+
+  setValue(key: string, value: string, userConfig: Config) {
+    let qnamaker = userConfig.qnamaker
+    if (!qnamaker) {
+      userConfig.qnamaker = {}
+    }
+
+    userConfig.qnamaker[key] = value
+    this.log(`${key} set to ${value}`)
+  }
 }

packages/config/src/commands/config/set/qnamaker.ts

@@ -13,24 +13,56 @@ describe('config:set:qnamaker', () => {
 
     test
       .stdout()
-      .command(['config:set:qnamaker', '--kbid', 'aaaaaaaa'])
+      .command(['config:set:qnamaker', '--kbId', 'aaaaaaaa'])
       .it('Sets kbid in config file', async ctx => {
         let config = await fs.readJSON(getConfigFile())
         expect(config.qnamaker.kbId).to.contain('aaaaaaaa')
     })
 
     test
       .stdout()
-      .command(['config:set:qnamaker', '--subscriptionkey', 'aaaaaaaa'])
+      .command(['config:set:qnamaker', '--subscriptionKey', 'aaaaaaaa'])
       .it('Sets subscriptionkey in config file', async ctx => {
         let config = await fs.readJSON(getConfigFile())
         expect(config.qnamaker.subscriptionKey).to.contain('aaaaaaaa')
     })
 
+    test
+    .stdout()
+    .command(['config:set:qnamaker', '--endpointKey', 'aaaaaaaa'])
+    .it('Sets endpointKey in config file', async ctx => {
+      let config = await fs.readJSON(getConfigFile())
+      expect(config.qnamaker.subscriptionKey).to.contain('aaaaaaaa')
+    })
+
+    test
+    .stdout()
+    .command(['config:set:qnamaker', '--hostname', 'aaaaaaaa'])
+    .it('Sets hostname in config file', async ctx => {
+      let config = await fs.readJSON(getConfigFile())
+      expect(config.qnamaker.subscriptionKey).to.contain('aaaaaaaa')
+    })
+
     test
       .stdout()
       .command(['config:set:qnamaker'])
       .it('Asks for a flag', ctx => {
         expect(ctx.stdout).to.contain('Plase specify flag')
     })
 })
+
+describe('config:set:qnamaker empty config file', () => {
+
+  after(async function() {
+    await deleteTestConfigFile()
+  });
+
+  test
+    .stdout()
+    .command(['config:set:qnamaker', '--kbId', 'aaaaaaaa'])
+    .it('Sets kbid in config file', async ctx => {
+      let config = await fs.readJSON(getConfigFile())
+      expect(config.qnamaker.kbId).to.contain('aaaaaaaa')
+  })
+})
+

packages/config/test/commands/config/set/qnamaker.test.ts

@@ -3,6 +3,7 @@
   "version": "1.0.0",
   "author": "Microsoft",
   "bugs": "https://github.com/microsoft/botframework-cli/issues",
+  "main": "parser/index.js",
   "dependencies": {
     "@microsoft/bf-cli-command": "1.0.0",
     "@oclif/config": "~1.13.3",

packages/luis/package.json

@@ -161,11 +161,9 @@ const resolveReferencesInUtterances = async function(allParsedContent) {
         let newPatternsToAdd = [];
         let spliceList = [];
         (luisModel.LUISJsonStructure.utterances || []).forEach((utterance,idx) => {
-            // Deep references must have [link name](link-value) notation
-            if (utterance.text.indexOf('[') !== 0) return;
-            // does this utterance have a deep link uri? 
-            let linkExp = (utterance.text || '').trim().match(new RegExp(/\(.*?\)/g));
-            if (linkExp && linkExp.length !== 0) {
+            // Fix for BF-CLI #122. 
+            // Ensure only links are detected and passed on to be parsed.
+            if (helpers.isUtteranceLinkRef(utterance.text || '')) {
                 // we have stuff to parse and resolve
                 let parsedUtterance = helpers.parseLinkURI(utterance.text);
                 if (!path.isAbsolute(parsedUtterance.luFile)) parsedUtterance.luFile = path.resolve(path.dirname(luisModel.srcFile), parsedUtterance.luFile);