Nigao/moneyschema (#435)

* age schema * dimension schema * geography schema * geography schema * fix bug, temperature schema * change schema name * rename several properties * delete test2.schema
microsoft · Dec 18, 2019 · 6665b4a · 6665b4a
1 parent 24f8123
commit 6665b4a
Show file tree

Hide file tree

Showing 27 changed files with 198 additions and 95 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -110,9 +110,9 @@
             ],
             "args": [
                 "dialog:generate",
-                "${workspaceFolder}/packages/dialog/test/commands/dialog/forms/test2.schema",
+                "${workspaceFolder}/packages/dialog/test/commands/dialog/forms/unittests.schema",
                 "-o",
-                "${env:TEMP}/test.out",
+                "${env:TEMP}/unittests.out",
                 "--force",
                 "--verbose"
             ],

diff --git a/packages/dialog/templates/age.schema b/packages/dialog/templates/age.schema
@@ -0,0 +1,17 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema",
+    "age": {
+        "type": "object",
+        "$mappings": ["@{concat('age:', property)}", "age"],
+        "properties": {
+            "number": {
+                "type": "number"
+            },
+            "units": {
+                "type": "string"
+            }
+        },
+        "required": ["number", "units"],
+        "$templates": ["age.lu","objectProperty.lg", "stringAsk.dialog","ageSet.dialog"]
+    }
+}
diff --git a/packages/dialog/templates/ageSet.dialog.lg b/packages/dialog/templates/ageSet.dialog.lg
@@ -0,0 +1,25 @@
+
+# filename
+- @{schemaName}-@{property}Setage.dialog
+
+# template
+- ```
+{
+    "$schema": "@{appSchema}",
+    "$kind": "Microsoft.OnSetProperty",
+    "property": "@{property}",
+    "entity": "age",
+    "actions": [
+        {
+            "$kind": "Microsoft.SetProperty",
+            "property": "$@{property}.number",
+            "value": "@age['number']"          
+        },
+        {
+            "$kind": "Microsoft.SetProperty",
+            "property": "$@{property}.units",
+            "value": "@age['units']"          
+        }
+    ]               
+}
+```
diff --git a/packages/dialog/templates/currency.schema b/packages/dialog/templates/currency.schema
diff --git a/packages/dialog/templates/dimension.schema b/packages/dialog/templates/dimension.schema
@@ -0,0 +1,17 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema",
+    "dimension": {
+        "type": "object",
+        "$mappings": ["@{concat('dimension:', property)}", "dimension"],
+        "properties": {
+            "number": {
+                "type": "number"
+            },
+            "units": {
+                "type": "string"
+            }
+        },
+        "required": ["number", "units"],
+        "$templates": ["dimension.lu","objectProperty.lg", "stringAsk.dialog","dimensionSet.dialog"]
+    }
+}
diff --git a/packages/dialog/templates/dimensionSet.dialog.lg b/packages/dialog/templates/dimensionSet.dialog.lg
@@ -0,0 +1,25 @@
+
+# filename
+- @{schemaName}-@{property}Setdimension.dialog
+
+# template
+- ```
+{
+    "$schema": "@{appSchema}",
+    "$kind": "Microsoft.OnSetProperty",
+    "property": "@{property}",
+    "entity": "dimension",
+    "actions": [
+        {
+            "$kind": "Microsoft.SetProperty",
+            "property": "$@{property}.number",
+            "value": "@dimension['number']"          
+        },
+        {
+            "$kind": "Microsoft.SetProperty",
+            "property": "$@{property}.units",
+            "value": "@dimension['units']"          
+        }
+    ]               
+}
+```
diff --git a/packages/dialog/templates/en-us/age.lu.lg b/packages/dialog/templates/en-us/age.lu.lg
@@ -1,5 +1,5 @@
 # filename
-- @{entityFilename()}
+- @{schemaName}-age.@{locale}.lu
 
 # template
 - $PREBUILT:age @{roles()}

diff --git a/packages/dialog/templates/en-us/currency.lu.lg b/packages/dialog/templates/en-us/currency.lu.lg
diff --git a/packages/dialog/templates/en-us/dimension.lu.lg b/packages/dialog/templates/en-us/dimension.lu.lg
@@ -1,5 +1,5 @@
 # filename
-- @{entityFilename()}
+- @{schemaName}-dimension.@{locale}.lu
 
 # template
 - $PREBUILT:dimension @{roles()}

diff --git a/packages/dialog/templates/en-us/email.lu.lg b/packages/dialog/templates/en-us/email.lu.lg
@@ -1,5 +1,5 @@
 # filename
-- @{entityFilename()}
+- @{schemaName}-email.@{locale}.lu
 
 # template
 - $PREBUILT:email @{roles()}

diff --git a/packages/dialog/templates/en-us/geographyV2.lu.lg b/packages/dialog/templates/en-us/geographyV2.lu.lg
@@ -1,5 +1,5 @@
 # filename
-- @{entityFilename()}
+- @{schemaName}-geographyV2.@{locale}.lu
 
 # template
 - $PREBUILT:geographyV2 @{roles()}

diff --git a/packages/dialog/templates/en-us/keyPhrase.lu.lg b/packages/dialog/templates/en-us/keyPhrase.lu.lg
@@ -1,5 +1,5 @@
 # filename
-- @{entityFilename()}
+- @{schemaName}-keyPhrase.@{locale}.lu
 
 # template
 - $PREBUILT:keyPhrase @{roles()}

diff --git a/packages/dialog/templates/en-us/number.lu.lg b/packages/dialog/templates/en-us/number.lu.lg
@@ -1,5 +1,5 @@
 # filename
-- @{entityFilename()}
+- @{schemaName}-number.@{locale}.lu
 
 # template
 - $PREBUILT:number @{roles()}

diff --git a/packages/dialog/templates/en-us/money.lg.lg → ...alog/templates/en-us/objectProperty.lg.lg b/packages/dialog/templates/en-us/money.lg.lg → ...alog/templates/en-us/objectProperty.lg.lg
@@ -8,4 +8,4 @@
 - # Ask@{property}\n- @\{askString('@{property}')\}\n
 
 # NameTemplate
-- # @{property}Name\n- @{phrase(property, locale)}\n
+- # @{property}Name\n- @{phrase(property, locale)}\n
diff --git a/packages/dialog/templates/en-us/ordinal.lu.lg b/packages/dialog/templates/en-us/ordinal.lu.lg
@@ -1,5 +1,5 @@
 # filename
-- @{entityFilename()}
+- @{schemaName}-ordinal.@{locale}.lu
 
 # template
 - $PREBUILT:ordinal @{roles()}

diff --git a/packages/dialog/templates/en-us/percentage.lu.lg b/packages/dialog/templates/en-us/percentage.lu.lg
@@ -1,5 +1,5 @@
 # filename
-- @{entityFilename()}
+- @{schemaName}-percentage.@{locale}.lu
 
 # template
 - $PREBUILT:percentage @{roles()}

diff --git a/packages/dialog/templates/en-us/personName.lu.lg b/packages/dialog/templates/en-us/personName.lu.lg
@@ -1,5 +1,5 @@
 # filename
-- @{entityFilename()}
+- @{schemaName}-personName.@{locale}.lu
 
 # template
 - $PREBUILT:personName @{roles()}

diff --git a/packages/dialog/templates/en-us/temperature.lu.lg b/packages/dialog/templates/en-us/temperature.lu.lg
@@ -1,5 +1,5 @@
 # filename
-- @{entityFilename()}
+- @{schemaName}-temperature.@{locale}.lu
 
 # template
 - $PREBUILT:temperature @{roles()}

diff --git a/packages/dialog/templates/en-us/url.lu.lg b/packages/dialog/templates/en-us/url.lu.lg
@@ -1,5 +1,5 @@
 # filename
-- @{entityFilename()}
+- @{schemaName}-url.@{locale}.lu
 
 # template
 - $PREBUILT:url @{roles()}

diff --git a/packages/dialog/templates/geography.schema b/packages/dialog/templates/geography.schema
@@ -0,0 +1,17 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema",
+    "geographyV2": {
+        "type": "object",
+        "$mappings": ["@{concat('geographyV2:', property)}", "geographyV2"],
+        "properties": {
+            "type": {
+                "type": "type"
+            },
+            "location": {
+                "type": "location"
+            }
+        },
+        "required": ["type", "location"],
+        "$templates": ["geographyV2.lu","objectProperty.lg", "stringAsk.dialog","geographyV2Set.dialog"]
+    }
+}
diff --git a/packages/dialog/templates/geographyV2Set.dialog.lg b/packages/dialog/templates/geographyV2Set.dialog.lg
@@ -0,0 +1,25 @@
+
+# filename
+- @{schemaName}-@{property}SetgeographyV2.dialog
+
+# template
+- ```
+{
+    "$schema": "@{appSchema}",
+    "$kind": "Microsoft.OnSetProperty",
+    "property": "@{property}",
+    "entity": "geographyV2",
+    "actions": [
+        {
+            "$kind": "Microsoft.SetProperty",
+            "property": "$@{property}.type",
+            "value": "@geographyV2['type']"          
+        },
+        {
+            "$kind": "Microsoft.SetProperty",
+            "property": "$@{property}.location",
+            "value": "@geographyV2['location']"          
+        }
+    ]               
+}
+```
diff --git a/packages/dialog/templates/money.schema b/packages/dialog/templates/money.schema
@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema",
     "money": {
         "type": "object",
-        "$mappings": ["money"],
+        "$mappings": ["@{concat('money:', property)}", "money"],
         "properties": {
             "number": {
                 "type": "number"
@@ -12,6 +12,6 @@
             }
         },
         "required": ["number", "units"],
-        "$templates": ["money.lu","money.lg", "moneyAsk.dialog","moneySet.dialog"]
+        "$templates": ["money.lu","objectProperty.lg", "stringAsk.dialog","moneySet.dialog"]
     }
 }
diff --git a/packages/dialog/templates/moneyAsk.dialog.lg b/packages/dialog/templates/moneyAsk.dialog.lg
diff --git a/packages/dialog/templates/standard.schema b/packages/dialog/templates/standard.schema
@@ -53,6 +53,6 @@
         "TriggerIntent.dialog",
         "luconfig.json",
         "lu.dialog",
-        "Main.dialog"        
+        "Main.dialog"     
     ]
 }
diff --git a/packages/dialog/templates/temperature.schema b/packages/dialog/templates/temperature.schema
@@ -0,0 +1,17 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema",
+    "temperature": {
+        "type": "object",
+        "$mappings": ["@{concat('temperature:', property)}", "temperature"],
+        "properties": {
+            "number": {
+                "type": "number"
+            },
+            "units": {
+                "type": "string"
+            }
+        },
+        "required": ["number", "units"],
+        "$templates": ["temperature.lu","objectProperty.lg", "stringAsk.dialog","temperatureSet.dialog"]
+    }
+}
diff --git a/packages/dialog/templates/temperatureSet.dialog.lg b/packages/dialog/templates/temperatureSet.dialog.lg
@@ -0,0 +1,25 @@
+
+# filename
+- @{schemaName}-@{property}Setmoney.dialog
+
+# template
+- ```
+{
+    "$schema": "@{appSchema}",
+    "$kind": "Microsoft.OnSetProperty",
+    "property": "@{property}",
+    "entity": "temperature",
+    "actions": [
+        {
+            "$kind": "Microsoft.SetProperty",
+            "property": "$@{property}.number",
+            "value": "@temperature['number']"          
+        },
+        {
+            "$kind": "Microsoft.SetProperty",
+            "property": "$@{property}.units",
+            "value": "@temperature['units']"          
+        }
+    ]               
+}
+```