microsoft
diff --git a/‎.vscode/launch.json‎
Lines changed: 5 additions & 5 deletions b/‎.vscode/launch.json‎
Lines changed: 5 additions & 5 deletions
diff --git a/‎packages/dialog/package.json‎
Lines changed: 7 additions & 7 deletions b/‎packages/dialog/package.json‎
Lines changed: 7 additions & 7 deletions
diff --git a/‎packages/dialog/src/commands/dialog/generate.ts‎
Lines changed: 5 additions & 5 deletions b/‎packages/dialog/src/commands/dialog/generate.ts‎
Lines changed: 5 additions & 5 deletions
diff --git a/‎packages/dialog/src/commands/dialog/merge.ts‎
Lines changed: 1 addition & 1 deletion b/‎packages/dialog/src/commands/dialog/merge.ts‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎packages/dialog/src/commands/dialog/readme.md‎
Lines changed: 17 additions & 13 deletions b/‎packages/dialog/src/commands/dialog/readme.md‎
Lines changed: 17 additions & 13 deletions
@@ -83,15 +83,15 @@
         {
             "type": "node",
             "request": "launch",
-            "name": "Generate Sandwich Form",
+            "name": "Generate Sandwich",
             "preLaunchTask": "${defaultBuildTask}",
             "program": "${workspaceFolder}/packages/dialog/bin/run",
             "outFiles": [
                 "./packages/dialog/lib/**"
             ],
             "args": [
                 "dialog:generate",
-                "${workspaceFolder}/packages/dialog/test/commands/dialog/forms/sandwich.form.dialog",
+                "${workspaceFolder}/packages/dialog/test/commands/dialog/forms/sandwich.schema",
                 "-o",
                 "${env:TEMP}/sandwich.out",
                 "--force",
@@ -110,7 +110,7 @@
             ],
             "args": [
                 "dialog:generate",
-                "${workspaceFolder}/packages/dialog/test/commands/dialog/forms/activity.form.dialog",
+                "${workspaceFolder}/packages/dialog/test/commands/dialog/forms/activity.schema",
                 "-o",
                 "${env:TEMP}/activity.out",
                 "--force",
@@ -131,7 +131,7 @@
             ],
             "args": [
                 "dialog:generate",
-                "${workspaceFolder}/packages/dialog/test/commands/dialog/forms/contact.form.dialog",
+                "${workspaceFolder}/packages/dialog/test/commands/dialog/forms/contact.schema",
                 "-o",
                 "${env:TEMP}/contact.out",
                 "--force",
@@ -152,7 +152,7 @@
             ],
             "args": [
                 "dialog:generate",
-                "${workspaceFolder}/packages/dialog/test/commands/dialog/forms/opportunity.form.dialog",
+                "${workspaceFolder}/packages/dialog/test/commands/dialog/forms/opportunity.schema",
                 "-o",
                 "${env:TEMP}/opportunity.out",
                 "--force",
 
@@ -27,25 +27,25 @@
   "scripts": {
     "postpack": "rimraf oclif.manifest.json",
     "posttest": "tslint -p test -t stylish",
-    "build":"tsc -b",
-    "clean":"rimraf ./.nyc_output ./lib ./package-lock.json ./tsconfig.tsbuildinfo",
+    "build": "tsc -b",
+    "clean": "rimraf ./.nyc_output ./lib ./package-lock.json ./tsconfig.tsbuildinfo",
     "test": "mocha",
     "coverage": "nyc npm run test",
-    "report:coverage":"npm run coverage && nyc report --reporter=text-lcov | coveralls",
+    "report:coverage": "npm run coverage && nyc report --reporter=text-lcov | coveralls",
     "doc": "npm run build && npm run doc:readme && rimraf oclif.manifest.json",
-    "doc:readme":"oclif-dev manifest && oclif-dev readme",
+    "doc:readme": "oclif-dev manifest && oclif-dev readme",
     "version": "npm run doc:readme && git add README.md"
   },
   "dependencies": {
+    "@christopheranderson/botbuilder-lg": "4.7.0-a0-b6513caa",
+    "@christopheranderson/botframework-expressions": "4.7.0-a0-b6513caa",
+    "@microsoft/bf-cli-command": "~1.0.0",
     "@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",
     "@types/xml2js": "^0.4.4",
     "ajv": "^6.9.1",
-    "@christopheranderson/botframework-expressions": "4.7.0-a0-b6513caa",
-    "@christopheranderson/botbuilder-lg": "4.7.0-a0-b6513caa",
     "chalk": "^2.4.2",
     "clone": "^2.1.2",
     "fs-extra": "^8.1.0",
 
@@ -12,10 +12,10 @@ export default class GenerateDialog extends Command {
     async run() {
         const { args, flags } = this.parse(GenerateDialog)
         try {
-            let formName = ppath.basename(args.schema, '.schema.dialog')
+            let schemaName = ppath.basename(args.schema, '.schema')
             let outDir = flags.output
             if (!outDir) {
-                outDir = ppath.join(formName + '-resources')
+                outDir = ppath.join(schemaName + '-resources')
             }
             await gen.generate(args.schema, outDir, flags.schema, flags.locale, flags.templates, flags.force,
                 (type, msg) => {
@@ -46,16 +46,16 @@ export default class GenerateDialog extends Command {
     `]
 
     static args = [
-        { name: 'schema', required: true, description: 'JSON Schema file used to drive generation.' }
+        { name: 'schema', required: true, description: 'JSON Schema .schema file used to drive generation.' }
     ]
 
     static flags: flags.Input<any> = {
         force: flags.boolean({ char: 'f', description: 'Force overwriting generated files.' }),
         help: flags.help({ char: 'h' }),
         locale: flags.string({ char: 'l', description: 'Locales to generate. [default: en-us]', multiple: true }),
-        output: flags.string({ char: 'o', description: 'Output path for where to put generated .lu, .lg, .qna and .dialog files. [default: ./<form>-resources]', default: '.', required: false }),
+        output: flags.string({ char: 'o', description: 'Output path for where to put generated .lu, .lg, .qna and .dialog files. [default: .]', default: '.', required: false }),
         schema: flags.string({ char: 's', description: 'Path to your app.schema file.', required: false }),
-        templates: flags.string({ char: 't', description: 'Directory with templates to use for generating form assets.', multiple: true }),
+        templates: flags.string({ char: 't', description: 'Directory with templates to use for generating assets.', multiple: true }),
         verbose: flags.boolean({ description: 'Output verbose logging of files as they are processed', default: false }),
     }
 }
@@ -333,7 +333,7 @@ export default class DialogMerge extends Command {
         const prefix = 'union('
         if (role === 'expression' || role === 'lg' || role === 'memoryPath') {
             if (elt.kind) {
-                this.error(`${this.currentFile}:error: $role ${role} must not have a type.`)
+                this.error(`${this.currentFile}:error: $role ${role} must not have a kind.`)
             }
             for (let prop in metaSchema.definitions[role]) {
                 if (!elt[prop]) {
 
@@ -21,21 +21,23 @@ For example look at these files:
 
 # Verify
 
-# Form
+# Generate
 
-The form command generates .lu, .lg, .qna and .dialog assets from a schema defined using JSON Schema. The parameters to the command are:
+The generate command generates .lu, .lg, .qna and .dialog assets from a schema defined using JSON Schema. The parameters to the command are:
 
 - **--force, -f** Force overwriting generated files.
 - **--help, -h** Generate help.
 - **--locale, -l** Locales to generate. By default en-us.
 - **--output, -o** Output directory.
 - **--schema, -s** Path to your app.schema file. By default is the standard SDK app.schema.
-- **--templates, -t** Directories with templates to use for generating form assets.
+- **--templates, -t** Directories with templates to use for generating assets.
 - **--verbose, -v** Verbose logging of generated files.
 
 ## Schema
 
-Schemas are specified using JSON Schema. You can use the normal JSON Schema mechanisms including \$ref and allOf which will be resolved into a single schema. In addition there are a few extra keywords including:
+Schemas are specified using JSON Schema. You can use the normal JSON Schema mechanisms including \$ref and allOf which will be resolved into a single schema. 
+You can also use expression syntax, i.e. `@{<expr>}` to compute schema. 
+In addition there are a few extra keywords including:
 
 - **\$mappings** List of entity names that can map to a property. The order of the entities also defines the precedence to use when resolving entities. By default the mappings are based on the type:
   - **enum**
@@ -44,29 +46,30 @@ Schemas are specified using JSON Schema. You can use the normal JSON Schema mech
   - **enum**
   - **number**, **string**
 - **\$expectedOnly** A list of properties that are only possible if they are expected.
-- **\$requires** A list of JSON Schema to use for internal mechanisms. You can use either actual paths or just the name of the schema to use if found in one of the template directories. The standard schema is `standard.schema.dialog`. The form schema and all of the required schemas will have the top-level `properties`, `definitions`, `required`, `$expectedOnly` and `$templates` merged.
-- **\$triggerIntent** Name of the trigger intent or by default the name of the form.
+- **\$public** List of the public properties in the schema. By default these are the top-level properties in the root schema.
+- **\$requires** A list of JSON Schema to use for internal mechanisms. You can use either actual paths or just the name of the schema to use if found in one of the template directories. The standard schema is `standard.schema`. The forrootm schema and all of the required schemas will have the top-level `properties`, `definitions`, `required`, `$expectedOnly`, `$public` and `$templates` merged.
+- **\$triggerIntent** Name of the trigger intent or by default the name of the schema.
 
-`<form>.form.dialog` will be generated with the form schema in it. `<form>.schema.dialog` will have the whole schema defined.
+`<schemaName>.schema.dialog` will have the resulting schema with all references resolved.
 
 ## Templates
 
 Each entity or property can have associated .lu, .lg, .qna and .dialog files that are generated by
 copying or instantiating templates found in the template directories. If a template name matches exactly it is
-just copied. If the template ends with .lg then it is analyzed to see if it has a template named 'template' and optionally one named 'filename'. If 'filename' is specified, then the filename will be the result of generating generated file is the result of evaluating that template, otherwise it defaults to `<formName>-<templateName>[.<locale>].<extension>`. When evaluating templates there are a number of variables defined in the scope including:
+just copied. If the template ends with .lg then it is analyzed to see if it has a template named 'template' and optionally one named 'filename'. If 'filename' is specified, then the filename will be the result of generating generated file is the result of evaluating that template, otherwise it defaults to `<root>-<templateName>[.<locale>].<extension>`. When evaluating templates there are a number of variables defined in the scope including:
 
-- **formName** The name of the form being generated.
+- **schemaName** The name of the root schema used as a prefix to make files unique.
 - **appSchema** The path to the app.schema to use.
-- **form** The JSON Schema defining the form.
-- **schema** The JSON Schema of the form + internal properties.
+- **schema** The full JSON Schema including the root schema + internal properties.
 - **locales** The list of all locales being generated.
-- **properties** All of the form property names.
+- **properties** All of the $public property names.
 - **entities** All of the types of schema entities being used.
-- **triggerIntent** \$triggerIntent or the form name by default.
+- **triggerIntent** \$triggerIntent or the schema name by default.
 - **locale** The locale being generated or empty if no locale.
 - **property** For per-property templates this the property name being generated.
 - **templates** Object with generated templates per lu, lg, qna, json and dialog. The object contains:
   - **name** Base name of the template without final extension.
+  - **fallbackName** For .lg files the base filename without locale.
   - **fullName** The name of the template including the extension.
   - **relative** Path relative to the output directory of where template is.
 
@@ -81,3 +84,4 @@ Templates are generated in the following order:
   - Per-property
     - Per-template in `<property>.$templates` generate .dialog and .json files.
   - Per-template in `$templates` generate .dialog and .json files.
+- Evaluate schema expressions
Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,7 @@ export default class DialogMerge extends Command {`
`333`	`333`	`const prefix = 'union('`
`334`	`334`	`if (role === 'expression' \|\| role === 'lg' \|\| role === 'memoryPath') {`
`335`	`335`	`if (elt.kind) {`
`336`		- this.error(`${this.currentFile}:error: $role ${role} must not have a type.`)
	`336`	+ this.error(`${this.currentFile}:error: $role ${role} must not have a kind.`)
`337`	`337`	`}`
`338`	`338`	`for (let prop in metaSchema.definitions[role]) {`
`339`	`339`	`if (!elt[prop]) {`