inline functions (#600)

microsoft · Feb 25, 2020 · 99b33fa · 99b33fa
1 parent b28cf40
commit 99b33fa
Show file tree

Hide file tree

Showing 38 changed files with 46 additions and 172 deletions.
diff --git a/packages/dialog/templates/ChangePropertyConfirmation-assign-boolean.dialog.lg b/packages/dialog/templates/ChangePropertyConfirmation-assign-boolean.dialog.lg
@@ -17,7 +17,7 @@
             "actions": [
                 {
                     "$kind": "Microsoft.Ask",
-                    "activity": "@{callAsk()}",
+                    "activity": "@\{template(concat('Ask',$PropertyToRemember))}",
                     "expectedProperties": 
                         "createArray($PropertyToRemember)"
 
@@ -26,7 +26,4 @@
         }
     ]
 }
-```
-
-# callAsk()
-- @\{template(concat('Ask',$PropertyToRemember))}
+```
diff --git a/packages/dialog/templates/CompleteConfirmation-assign-PROPERTYName.dialog.lg b/packages/dialog/templates/CompleteConfirmation-assign-PROPERTYName.dialog.lg
@@ -13,6 +13,3 @@
     ]
 }
 ```
-
-# callChooseProperty
-- @\{chooseProperty()}
diff --git a/packages/dialog/templates/CompleteConfirmation-assign-boolean.dialog.lg b/packages/dialog/templates/CompleteConfirmation-assign-boolean.dialog.lg
@@ -22,7 +22,7 @@
             "elseActions":[
                 {
                     "$kind": "Microsoft.Ask",
-                    "activity": "@{callChooseProperty()}",
+                    "activity": "@\{chooseProperty()}",
                     "expectedProperties": [
                         "PropertyToChange"
                     ]
@@ -32,6 +32,3 @@
     ]
 }
 ```
-
-# callChooseProperty
-- @\{chooseProperty()}
diff --git a/packages/dialog/templates/assign-ageEntity.dialog.lg b/packages/dialog/templates/assign-ageEntity.dialog.lg
@@ -12,7 +12,7 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callSetMessage()}"
+            "activity": "@\{setObjectPropertyMessage('@{property}', concat(string(@age.number), ' ', @age.units))}"
         }, 
         {
             "$kind": "Microsoft.SetProperty",
@@ -28,7 +28,4 @@
 }
 ```
 
-# callSetMessage()
-- @\{setObjectPropertyMessage('@{property}', concat(string(@age.number), ' ', @age.units))}
-
 [generator.lg](generator.lg)
diff --git a/packages/dialog/templates/assign-datetimeEntity.dialog.lg b/packages/dialog/templates/assign-datetimeEntity.dialog.lg
@@ -12,7 +12,7 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callSetMessage()}"
+            "activity": "@\{setObjectPropertyMessage('@{property}', concat(@datetime.type, ' ', string(@datetime.timex)))}"
         }, 
         {
             "$kind": "Microsoft.SetProperty",
@@ -28,7 +28,4 @@
 }
 ```
 
-# callSetMessage
-- @\{setObjectPropertyMessage('@{property}', concat(@datetime.type, ' ', string(@datetime.timex)))}
-
 [generator.lg](generator.lg)
diff --git a/packages/dialog/templates/assign-dimensionEntity.dialog.lg b/packages/dialog/templates/assign-dimensionEntity.dialog.lg
@@ -12,7 +12,7 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callSetMessage()}"
+            "activity": "@\{setObjectPropertyMessage('@{property}',concat(string(@dimension.number), ' ', @dimension.units))}"
         }, 
         {
             "$kind": "Microsoft.SetProperty",
@@ -28,7 +28,4 @@
 }
 ```
 
-# callSetMessage
-- @\{setObjectPropertyMessage('@{property}',concat(string(@dimension.number), ' ', @dimension.units))}
-
 [generator.lg](generator.lg)
diff --git a/packages/dialog/templates/assign-geographyV2Entity.dialog.lg b/packages/dialog/templates/assign-geographyV2Entity.dialog.lg
@@ -12,7 +12,8 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callSetMessage()}"
+            "activity": "@\{setObjectPropertyMessage('@{property}', concat(@geographyV2.type, ' ', @geographyV2.location))}
+"
         }, 
         {
             "$kind": "Microsoft.SetProperty",
@@ -28,7 +29,4 @@
 }
 ```
 
-# callSetMessage
-- @\{setObjectPropertyMessage('@{property}', concat(@geographyV2.type, ' ', @geographyV2.location))}
-
 [generator.lg](generator.lg)
diff --git a/packages/dialog/templates/assign-moneyEntity.dialog.lg b/packages/dialog/templates/assign-moneyEntity.dialog.lg
@@ -12,7 +12,7 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callSetMessage()}"
+            "activity": "@\{setObjectPropertyMessage('@{property}', concat(string(@money.number), ' ', @money.units))}"
         }, 
         {
             "$kind": "Microsoft.SetProperty",
@@ -28,7 +28,4 @@
 }
 ```
 
-# callSetMessage
-- @\{setObjectPropertyMessage('@{property}', concat(string(@money.number), ' ', @money.units))}
-
 [generator.lg](generator.lg)
diff --git a/packages/dialog/templates/assign-ordinalV2Entity.dialog.lg b/packages/dialog/templates/assign-ordinalV2Entity.dialog.lg
@@ -12,7 +12,7 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callSetMessage()}"
+            "activity": "@\{setObjectPropertyMessage('@{property}', concat(string(@ordinalV2.offset), ' ', @ordinalV2.relativeTo))}"
         }, 
         {
             "$kind": "Microsoft.SetProperty",
@@ -28,7 +28,4 @@
 }
 ```
 
-# callSetMessage
-- @\{setObjectPropertyMessage('@{property}', concat(string(@ordinalV2.offset), ' ', @ordinalV2.relativeTo))}
-
 [generator.lg](generator.lg)
diff --git a/packages/dialog/templates/assign-temperatureEntity.dialog.lg b/packages/dialog/templates/assign-temperatureEntity.dialog.lg
@@ -12,7 +12,7 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callSetMessage()}"
+            "activity": "@\{setObjectPropertyMessage('@{property}', concat(string(@temperature.number), ' ', @temperature.units))}"
         },
         {
             "$kind": "Microsoft.SetProperty",
@@ -28,7 +28,4 @@
 }
 ```
 
-# callSetMessage
-- @\{setObjectPropertyMessage('@{property}', concat(string(@temperature.number), ' ', @temperature.units))}
-
 [generator.lg](generator.lg)
diff --git a/packages/dialog/templates/boolean-assign-boolean.dialog.lg b/packages/dialog/templates/boolean-assign-boolean.dialog.lg
@@ -12,7 +12,7 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callSetMessage()}"
+            "activity": "@\{setPropertyMessage('@{property}', @boolean)}"
         },
         {
             "$kind": "Microsoft.SetProperty",
@@ -23,7 +23,4 @@
 }
 ```
 
-# callSetMessage
-- @\{setPropertyMessage('@{property}', @boolean)}
-
 [generator.lg](generator.lg)
diff --git a/packages/dialog/templates/boolean-missing.dialog.lg b/packages/dialog/templates/boolean-missing.dialog.lg
@@ -11,7 +11,7 @@
     "actions": [       
         {
             "$kind": "Microsoft.Ask",
-            "activity": "@{callAsk()}",
+            "activity": "@\{Ask@{property}()}",
             "expectedProperties": [
                 "@{property}"
             ]
@@ -20,7 +20,4 @@
 }
 ```
 
-# callAsk
-- @\{Ask@{property}()}
-
 [generator.lg](generator.lg)
diff --git a/packages/dialog/templates/enum-assign-enumEntity.dialog.lg b/packages/dialog/templates/enum-assign-enumEntity.dialog.lg
@@ -11,7 +11,7 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callSetMessage()}"
+            "activity": "@\{setPropertyMessage('@{property}', @@{property}Entity)}"
         },    
         {
             "$kind": "Microsoft.SetProperty",
@@ -22,7 +22,4 @@
 }
 ```
 
-# callSetMessage
-- @\{setPropertyMessage('@{property}', @@{property}Entity)}
-
 [generator.lg](generator.lg)
diff --git a/packages/dialog/templates/enum-missing.dialog.lg b/packages/dialog/templates/enum-missing.dialog.lg
@@ -11,7 +11,7 @@
     "actions": [       
         {
             "$kind": "Microsoft.Ask",
-            "activity": "@{callAsk()}",
+            "activity": "@\{Ask@{property}()}",
             "expectedProperties": [
                 "@{property}"
             ]
@@ -20,7 +20,4 @@
 }
 ```
 
-# callAsk
-- @\{Ask@{property}()}
-
 [generator.lg](generator.lg)
diff --git a/packages/dialog/templates/enumEntity-choose.dialog.lg b/packages/dialog/templates/enumEntity-choose.dialog.lg
@@ -10,12 +10,9 @@
     "actions": [
         {
             "$kind": "Microsoft.Ask",
-            "activity": "@{callChoose()}",
+            "activity": "@\{choose@{property}Entity()}",
             "expectedProperties": ["@{property}"]
         }
     ]
 }
 ```
-
-# callChoose
-- @\{choose@{property}Entity()}
diff --git a/packages/dialog/templates/library-BeginDialog.dialog.lg b/packages/dialog/templates/library-BeginDialog.dialog.lg
@@ -7,11 +7,9 @@
     "actions":  [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callWelcome()}"           
+            "activity": "@\{welcome()}"           
         }
     ]
 }
 ```
 
-# callWelcome
-- @\{welcome()}
diff --git a/packages/dialog/templates/library-CancelIntent.dialog.lg b/packages/dialog/templates/library-CancelIntent.dialog.lg
@@ -8,14 +8,11 @@
     "actions": [
         {
             "$kind": "Microsoft.Ask",
-            "activity": "@{callCancel()}",
+            "activity": "@\{cancel()}",
             "expectedProperties": [
                 "CancelConfirmation"                    
             ]           
         }
     ]
 }
 ```
-
-# callCancel
-- @\{cancel()}
diff --git a/packages/dialog/templates/library-ChooseProperty.dialog.lg b/packages/dialog/templates/library-ChooseProperty.dialog.lg
@@ -6,12 +6,9 @@
     "actions": [
         {
             "$kind": "Microsoft.Ask",
-            "activity": "@{callChooseProperties()}",
+            "activity": "@\{chooseProperties()}",
             "expectedProperties": ["PropertyToChange"]
         }
     ]
 }
 ```
-
-# callChooseProperties
-- @\{chooseProperties()}
diff --git a/packages/dialog/templates/library-CompleteConfirmation.dialog.lg b/packages/dialog/templates/library-CompleteConfirmation.dialog.lg
@@ -7,21 +7,15 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callReadForm()}"
+            "activity": "@\{readForm('@{schemaName}')}"
         },
         {
             "$kind": "Microsoft.Ask",
-            "activity": "@{callConfirmChange()}",
+            "activity": "@\{confirmChange()}",
             "expectedProperties": [
                 "CompleteConfirmation"
             ]
         }
     ]
 }
 ```
-
-# callReadForm
-- @\{readForm('@{schemaName}')}
-
-# callConfirmChange
-- @\{confirmChange()}
diff --git a/packages/dialog/templates/library-HelpIntent.dialog.lg b/packages/dialog/templates/library-HelpIntent.dialog.lg
@@ -7,11 +7,8 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callHelp()}"           
+            "activity": "@\{help(@PropertyName)}"           
         }
     ]
 }
 ```
-
-# callHelp
-- @\{help(@PropertyName)}
diff --git a/packages/dialog/templates/library-NotUnderstood.dialog.lg b/packages/dialog/templates/library-NotUnderstood.dialog.lg
@@ -8,11 +8,8 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callNotUnderstood()}"           
+            "activity": "@\{notUnderstood()}"           
         }
     ]
 }
 ```
-
-# callNotUnderstood
-- @\{notUnderstood()}
diff --git a/packages/dialog/templates/library-ReadPropertyIntent.dialog.lg b/packages/dialog/templates/library-ReadPropertyIntent.dialog.lg
@@ -7,7 +7,7 @@
     "actions": [
         {
             "$kind": "Microsoft.SendActivity",
-            "activity": "@{callTextProperty()}"           
+            "activity": "@\{textProperty(@PropertyName)}"           
         },
         {
             "$kind": "Microsoft.SetProperty",
@@ -16,17 +16,11 @@
         },
         {
             "$kind": "Microsoft.Ask",
-            "activity": "@{callConfirmChangeProperty()}",
+            "activity": "@\{confirmChangeProperty(@PropertyName)}",
             "expectedProperties": [
                 "ChangePropertyConfirmation"
             ]
         }
     ]
 }
 ```
-
-# callTextProperty
-- @\{textProperty(@PropertyName)}
-
-# callConfirmChangeProperty
-- @\{confirmChangeProperty(@PropertyName)}
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,3 @@ @@
         ]
     }
     ```
-    # callChooseProperty
-    - @\{chooseProperty()}