Switch to $kind for schemas (#391)

* Change from $type to $kind.
Change unionType to union.
Add documentation.

* Move from $type to $kind.

* Enable schema tests.

Author: Chris McConnell

.vscode/launch.json

@@ -8,6 +8,7 @@
             "type": "node",
             "request": "launch",
             "name": "Dialog Merge Tests",
+            "preLaunchTask": "${defaultBuildTask}",
             "program": "${workspaceFolder}/packages/dialog/node_modules/mocha/bin/_mocha",
             "cwd": "${workspaceFolder}/packages/dialog",
             "args": [
@@ -18,7 +19,6 @@
                 ".*Test schema merge.*"
             ],
             "internalConsoleOptions": "openOnSessionStart",
-            "sourceMaps": true,
             "outFiles": [
                 "./package/dialog/lib/**"
             ]
@@ -27,6 +27,7 @@
             "type": "node",
             "request": "launch",
             "name": "Dialog Verify Tests",
+            "preLaunchTask": "${defaultBuildTask}",
             "program": "${workspaceFolder}/packages/dialog/node_modules/mocha/bin/_mocha",
             "cwd": "${workspaceFolder}/packages/dialog",
             "args": [
@@ -37,7 +38,6 @@
                 ".*dialog:verify.*"
             ],
             "internalConsoleOptions": "openOnSessionStart",
-            "sourceMaps": true,
             "outFiles": [
                 "./package/dialog/lib/**"
             ]
@@ -46,68 +46,67 @@
             "type": "node",
             "request": "launch",
             "name": "Dialog Generator Tests",
+            "preLaunchTask": "${defaultBuildTask}",
             "program": "${workspaceFolder}/packages/dialog/node_modules/mocha/bin/_mocha",
+            "cwd": "${workspaceFolder}/packages/dialog",
             "args": [
                 "--timeout",
                 "999999",
                 "--colors",
-                "${workspaceFolder}/test/commands/dialog/generator.test.ts"
+                "-g",
+                ".*dialog:generate.*"
             ],
             "internalConsoleOptions": "openOnSessionStart",
-            "sourceMaps": true,
             "outFiles": [
                 "./package/dialog/lib/**"
             ]
         },
-
-        // TODO: (chrande) Keeping these but they should probably be rewritten to work on more
-        //       just chrismc's dev machine.
         {
             "type": "node",
             "request": "launch",
             "name": "BotBuilder schema",
+            "preLaunchTask": "${defaultBuildTask}",
             "program": "${workspaceFolder}/packages/dialog/bin/run",
             "outFiles": [
-                "${workspaceFolder}/packages/dialog/lib/**/*.js"
+                "./packages/dialog/lib/**"
             ],
             "args": [
                 "dialog:merge",
                 "libraries/**/*.schema",
-                "-u",
-                "-b", "master",
-                "-o", "schemas/sdk.schema",
+                "-o",
+                "${env:TEMP}/sdk.schema",
                 "--verbose"
             ],
             "internalConsoleOptions": "openOnSessionStart",
-            "cwd": "c:/users/chrimc/source/repos/botbuilder-dotnet"
+            "cwd": "${workspaceFolder}/../botbuilder-dotnet"
         },
         {
             "type": "node",
             "request": "launch",
             "name": "Generate Sandwich Form",
+            "preLaunchTask": "${defaultBuildTask}",
             "program": "${workspaceFolder}/packages/dialog/bin/run",
-            "sourceMaps": true,
             "outFiles": [
-                "${workspaceFolder}/packages/dialog/lib/**/*.js"
+                "./packages/dialog/lib/**"
             ],
             "args": [
                 "dialog:generate",
                 "${workspaceFolder}/packages/dialog/test/commands/dialog/forms/sandwich.form.dialog",
                 "-o",
                 "${env:TEMP}/sandwich.out",
                 "--force",
-                "--verbose",
+                "--verbose"
             ],
             "internalConsoleOptions": "openOnSessionStart"
         },
         {
             "type": "node",
             "request": "launch",
             "name": "Generate Activity Form",
+            "preLaunchTask": "${defaultBuildTask}",
             "program": "${workspaceFolder}/packages/dialog/bin/run",
-            "preLaunchTask": "tsc: build - tsconfig.json",
             "outFiles": [
-                "${workspaceFolder}/packages/dialog/lib/**/*.js"
+                "./packages/dialog/lib/**"
             ],
             "args": [
                 "dialog:generate",
@@ -125,9 +124,10 @@
             "type": "node",
             "request": "launch",
             "name": "Generate Contact Form",
+            "preLaunchTask": "${defaultBuildTask}",
             "program": "${workspaceFolder}/packages/dialog/bin/run",
             "outFiles": [
-                "${workspaceFolder}/packages/dialog/lib/**/*.js"
+                "./packages/dialog/lib/**"
             ],
             "args": [
                 "dialog:generate",
@@ -145,9 +145,10 @@
             "type": "node",
             "request": "launch",
             "name": "Generate Opportunity Form",
+            "preLaunchTask": "${defaultBuildTask}",
             "program": "${workspaceFolder}/packages/dialog/bin/run",
             "outFiles": [
-                "${workspaceFolder}/packages/dialog/lib/**/*.js"
+                "./packages/dialog/lib/**"
             ],
             "args": [
                 "dialog:generate",

.vscode/tasks.json

@@ -0,0 +1,17 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "type": "shell",
+            "label": "rush build",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "command": "rush build",
+            "windows": {
+                "command": "rush.cmd build"
+            }
+        }
+    ]
+}

packages/dialog/README.md

@@ -35,7 +35,7 @@ USAGE
   $ bf dialog:merge GLOB1 [GLOB2] [GLOB3] [GLOB4] [GLOB5] [GLOB6] [GLOB7] [GLOB8] [GLOB9]
 
 OPTIONS
-  -b, --branch=branch  [default: 4.Future] The branch to use for the meta-schema component.schema.
+  -b, --branch=branch  [default: master] The branch to use for the meta-schema component.schema.
   -h, --help           show CLI help
   -o, --output=output  [default: app.schema] Output path and filename for merged schema. [default: app.schema]
 
@@ -78,7 +78,7 @@ USAGE
   $ bf dialog:merge GLOB1 [GLOB2] [GLOB3] [GLOB4] [GLOB5] [GLOB6] [GLOB7] [GLOB8] [GLOB9]
 
 OPTIONS
-  -b, --branch=branch  The branch to use for the meta-schema component.schema. [default: 4.Future] 
+  -b, --branch=branch  The branch to use for the meta-schema component.schema. [default: master] 
   -h, --help              show CLI help
   -o, --output=output  Output path and filename for merged schema. [default: app.schema]
   -u, --update         Update .schema files to point the <branch> component.schema and regenerate component.schema if baseComponent.schema is present.

packages/dialog/package.json

@@ -37,6 +37,8 @@
     "version": "npm run doc:readme && git add README.md"
   },
   "dependencies": {
+    "@oclif/command": "~1.5.13",
+    "@oclif/errors": "~1.2.2",
     "@microsoft/bf-cli-command": "~1.0.0",
     "@types/lru-cache": "^5.1.0",
     "@types/semver": "^6.0.1",