CLI consistency of dialog:verify with dialog:merge, luis:build with config

.vscode/launch.json

@@ -16,7 +16,7 @@
                 "999999",
                 "--colors",
                 "-g",
-                ".*dialog:merge.*"
+                "dialog:merge.*"
             ],
             "internalConsoleOptions": "openOnSessionStart",
             "outputCapture": "std",
@@ -36,7 +36,7 @@
                 "999999",
                 "--colors",
                 "-g",
-                ".*dialog:verify.*"
+                "dialog:verify.*"
             ],
             "internalConsoleOptions": "openOnSessionStart",
             "outputCapture": "std",
@@ -144,6 +144,24 @@
             "internalConsoleOptions": "openOnSessionStart",
             "cwd": "${workspaceFolder}/../botbuilder-dotnet"
         },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "BotBuilder verify",
+            "preLaunchTask": "${defaultBuildTask}",
+            "program": "${workspaceFolder}/packages/dialog/bin/run",
+            "outputCapture": "std",
+            "outFiles": [
+                "./packages/dialog/lib/**"
+            ],
+            "args": [
+                "dialog:verify",
+                "tests/**/*.dialog",
+                "--verbose"
+            ],
+            "internalConsoleOptions": "openOnSessionStart",
+            "cwd": "${workspaceFolder}/../botbuilder-dotnet"
+        },
         {
             "type": "node",
             "request": "launch",
@@ -179,18 +197,13 @@
                 "luis:build",
                 "--in",
                 ".",
+                "--luConfig",
+                "luconfig.json",
                 "--authoringKey",
-                "${env:LUIS_AUTHORING_KEY}",
-                "--botName",
-                "sandwich",
-                "--dialog",
-                "--suffix",
-                "${env:USERNAME}",
-                "--out",
-                "."
+                "${env:LUIS_AUTHORING_KEY}"
             ],
             "internalConsoleOptions": "openOnSessionStart",
-            "cwd": "${env:TEMP}/sandwich.out/luis"
+            "cwd": "${env:TEMP}/sandwich.out"
         },
         {
             "type": "node",

packages/config/README.md

@@ -8,15 +8,17 @@ This package is intended for Microsoft use only and should be consumed through @
 
 # Commands
 <!-- commands -->
-* [`bf config`](#bf-config)
-* [`bf config:set`](#bf-configset)
-* [`bf config:set:luis`](#bf-configsetluis)
-* [`bf config:set:qnamaker`](#bf-configsetqnamaker)
-* [`bf config:set:telemetry`](#bf-configsettelemetry)
-* [`bf config:show`](#bf-configshow)
-* [`bf config:show:luis`](#bf-configshowluis)
-* [`bf config:show:qnamaker`](#bf-configshowqnamaker)
-* [`bf config:show:telemetry`](#bf-configshowtelemetry)
+- [@microsoft/bf-cli-config](#microsoftbf-cli-config)
+- [Commands](#commands)
+  - [`bf config`](#bf-config)
+  - [`bf config:set`](#bf-configset)
+  - [`bf config:set:luis`](#bf-configsetluis)
+  - [`bf config:set:qnamaker`](#bf-configsetqnamaker)
+  - [`bf config:set:telemetry`](#bf-configsettelemetry)
+  - [`bf config:show`](#bf-configshow)
+  - [`bf config:show:luis`](#bf-configshowluis)
+  - [`bf config:show:qnamaker`](#bf-configshowqnamaker)
+  - [`bf config:show:telemetry`](#bf-configshowtelemetry)
 
 ## `bf config`
 
@@ -59,13 +61,14 @@ USAGE
 OPTIONS
   -h, --help                         show CLI help
   --appId=appId                      LUIS application Id
+  --authoringKey=authoringKey        LUIS cognitive services authoring key (aka Ocp-Apim-Subscription-Key).
   --endpoint=endpoint                LUIS application endpoint hostname, ex: <region>.api.cognitive.microsoft.com
   --subscriptionKey=subscriptionKey  LUIS cognitive services subscription key (aka Ocp-Apim-Subscription-Key)
   --versionId=versionId              LUIS version Id
 
 EXAMPLE
 
-       $ bf config:set:luis --appId {APPLICATION_ID} --subscriptionKey {SUBSCRIPTION_KEY} --versionId {VERSION_ID} 
+       $ bf config:set:luis --appId {APPLICATION_ID} --authoringKey {AUTHORING_KEY} --subscriptionKey {SUBSCRIPTION_KEY} --versionId {VERSION_ID} 
   --endpoint {ENDPOINT}
 ```
 

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

@@ -10,13 +10,14 @@ export default class ConfigSetLuis extends Command {
   static description = 'Stores default LUIS application values in global config.'
 
   static examples = [`
-    $ bf config:set:luis --appId {APPLICATION_ID} --subscriptionKey {SUBSCRIPTION_KEY} --versionId {VERSION_ID} --endpoint {ENDPOINT}
+    $ bf config:set:luis --appId {APPLICATION_ID} --authoringKey {AUTHORING_KEY} --subscriptionKey {SUBSCRIPTION_KEY} --versionId {VERSION_ID} --endpoint {ENDPOINT}
   `]
 
   static flags: flags.Input<any> = {
     help: flags.help({char: 'h'}),
-    subscriptionKey: flags.string({description: 'LUIS cognitive services subscription key (aka Ocp-Apim-Subscription-Key)'}),
     appId: flags.string({description: 'LUIS application Id'}),
+    authoringKey: flags.string({description: 'LUIS cognitive services authoring key (aka Ocp-Apim-Subscription-Key).'}),
+    subscriptionKey: flags.string({description: 'LUIS cognitive services subscription key (aka Ocp-Apim-Subscription-Key)'}),
     versionId: flags.string({description: 'LUIS version Id'}),
     endpoint: flags.string({description: 'LUIS application endpoint hostname, ex: <region>.api.cognitive.microsoft.com'}),
   }

packages/dialog/README.md

@@ -10,10 +10,12 @@ This package is intended for Microsoft use only and should be consumed through @
 
 # Commands
 <!-- commands -->
-* [`bf `](#bf-)
-* [`bf dialog`](#bf-dialog)
-* [`bf dialog:merge PATTERNS`](#bf-dialogmerge-patterns)
-* [`bf dialog:verify PATTERNS`](#bf-dialogverify-patterns)
+- [@microsoft/bf-dialog](#microsoftbf-dialog)
+- [Commands](#commands)
+  - [`bf `](#bf)
+  - [`bf dialog`](#bf-dialog)
+  - [`bf dialog:merge PATTERNS`](#bf-dialogmerge-patterns)
+  - [`bf dialog:verify PATTERNS`](#bf-dialogverify-patterns)
 
 ## `bf `
 
@@ -27,7 +29,7 @@ OPTIONS
   -h, --help  show CLI help
 ```
 
-_See code: [src\commands\index.ts](https://github.com/microsoft/botframework-cli/tree/master/packages/dialog/blob/v1.0.0/src\commands\index.ts)_
+_See code: [src/commands/index.ts](https://github.com/microsoft/botframework-cli/tree/master/packages/dialog/src/commands/index.ts)_
 
 ## `bf dialog`
 
@@ -41,7 +43,7 @@ OPTIONS
   -h, --help  Dialog command help
 ```
 
-_See code: [src\commands\dialog\index.ts](https://github.com/microsoft/botframework-cli/tree/master/packages/dialog/blob/v1.0.0/src\commands\dialog\index.ts)_
+_See code: [src/commands/dialog/index.ts](https://github.com/microsoft/botframework-cli/tree/master/packages/dialog/src/commands/dialog/index.ts)_
 
 ## `bf dialog:merge PATTERNS`
 
@@ -64,7 +66,7 @@ EXAMPLES
   $ bf dialog:merge libraries/**/*.schema **/*.csproj -o app.schema
 ```
 
-_See code: [src\commands\dialog\merge.ts](https://github.com/microsoft/botframework-cli/tree/master/packages/dialog/blob/v1.0.0/src\commands\dialog\merge.ts)_
+_See code: [src/commands/dialog/merge.ts](https://github.com/microsoft/botframework-cli/tree/master/packages/dialog/src/commands/dialog/merge.ts)_
 
 ## `bf dialog:verify PATTERNS`
 
@@ -82,5 +84,5 @@ OPTIONS
   --verbose   Show verbose output
 ```
 
-_See code: [src\commands\dialog\verify.ts](https://github.com/microsoft/botframework-cli/tree/master/packages/dialog/blob/v1.0.0/src\commands\dialog\verify.ts)_
+_See code: [src/commands/dialog/verify.ts](https://github.com/microsoft/botframework-cli/tree/master/packages/dialog/src/commands/dialog/verify.ts)_
 <!-- commandsstop -->

packages/dialog/package.json

@@ -45,12 +45,12 @@
     "@types/lru-cache": "^5.1.0",
     "@types/semver": "^6.0.1",
     "@types/xml2js": "^0.4.4",
-    "ajv": "^6.9.1",
+    "ajv": "^6.12.2",
     "chalk": "^2.4.2",
     "clone": "^2.1.2",
     "fs-extra": "^8.1.0",
     "get-uri": "~3.0.2",
-    "globby": "^9.2.0",
+    "globby": "^11.0.0",
     "@apidevtools/json-schema-ref-parser": "^9.0.1",
     "os": "~0.1.1",
     "path": "^0.12.7",

packages/dialog/src/commands/dialog/verify.ts

@@ -14,9 +14,11 @@ export default class DialogVerify extends Command {
         { name: 'patterns', required: true, description: 'Any number of glob regex patterns to match .dialog files.' },
     ]
 
+    static strict = false
+
     static flags: flags.Input<any> = {
         help: flags.help({ char: 'h' }),
-        verbose: flags.boolean({ description: 'Show verbose output', default: false }),
+        verbose: flags.boolean({ char: 'v', description: 'Show verbose output', default: false }),
     }
 
     private currentFile = ''
@@ -106,5 +108,4 @@ export default class DialogVerify extends Command {
         this.errors++
         this.error(`${this.currentFile} - error ${code || ''}: ${msg}`)
     }
-
 }