Stevenic/merge master

lerna.json

@@ -10,8 +10,8 @@
     "libraries/botbuilder-dialogs",
     "libraries/botbuilder-dialogs-adaptive",
     "libraries/botbuilder-dialogs-declarative",
-    "libraries/botbuilder-lg",
     "libraries/botbuilder-testing",
+    "libraries/botbuilder-lg",
     "libraries/botframework-config",
     "libraries/botframework-connector",
     "libraries/botframework-expressions",

libraries/botbuilder-dialogs-adaptive/package.json

@@ -30,7 +30,7 @@
     "@types/node": "^10.12.18",
     "botbuilder-core": "~4.1.6",
     "botbuilder-dialogs": "~4.1.6",
-    "botframework-expressions": "~4.5.0",
+    "botframework-expressions": "~4.1.6",
     "botframework-connector": "~4.1.6",
     "botframework-schema": "~4.1.6",
     "jsonpath": "^1.0.0"

libraries/botbuilder-dialogs-adaptive/src/actions/logAction.ts

@@ -62,7 +62,7 @@ export class LogAction extends DialogCommand {
         const data = Object.assign({
             utterance: dc.context.activity.text || ''
         }, dc.state, options);
-        const msg = format(this.template, data);
+        const msg = format(this.template, dc);
 
         // Log to console and send trace if needed
         console.log(msg);

libraries/botbuilder-dialogs-adaptive/src/activityProperty.ts

@@ -11,9 +11,9 @@ import * as stringTemplate from './stringTemplate';
 
 export class ActivityProperty {
     private _value: Partial<Activity>|string;
-    private _textTemplate: (data: object) => string;
+    private _textTemplate: (dc: DialogContext) => string;
     private _speak: string;
-    private _speakTemplate: (data: object) => string;
+    private _speakTemplate: (dc: DialogContext) => string;
 
     public get displayLabel(): string {
         if (typeof this._value === 'object') {
@@ -65,19 +65,18 @@ export class ActivityProperty {
 
     public format(dc: DialogContext, extraData?: object, override?: Partial<Activity>|string): Partial<Activity> {
         // Format basic activity
-        const data = Object.assign({}, dc.state, extraData);
         let activity: Partial<Activity>;
         if (override) {
-            activity = this.formatOverride(override, data);
+            activity = this.formatOverride(override, dc);
         } else if (typeof this._value === 'string') {
             activity = {
                 type: ActivityTypes.Message,
-                text: this._textTemplate(data)
+                text: this._textTemplate(dc)
             }
         } else if (typeof this._value === 'object') {
             if (this._value.type === ActivityTypes.Message && this._textTemplate) {
                 activity = Object.assign({}, this._value, {
-                    text: this._textTemplate(data)
+                    text: this._textTemplate(dc)
                 });
             } else {
                 activity = this._value;
@@ -89,9 +88,9 @@ export class ActivityProperty {
         // Apply speak and inputHints
         if (activity.type === ActivityTypes.Message) {
             if (activity.speak) {
-                activity.speak = stringTemplate.format(activity.speak, data);
+                activity.speak = stringTemplate.format(activity.speak, dc);
             } else if (this._speakTemplate) {
-                activity.speak = this._speakTemplate(data);
+                activity.speak = this._speakTemplate(dc);
             }
             if (this.inputHint && !activity.inputHint) {
                 activity.inputHint = this.inputHint;
@@ -101,15 +100,15 @@ export class ActivityProperty {
         return activity;
     }
 
-    private formatOverride(override: Partial<Activity>|string, data: object): Partial<Activity> {
+    private formatOverride(override: Partial<Activity>|string, dc: DialogContext): Partial<Activity> {
         if (typeof override === 'string') {
             return {
                 type: ActivityTypes.Message,
-                text: stringTemplate.format(override, data)
+                text: stringTemplate.format(override, dc)
             };
         } else if (override.type === ActivityTypes.Message && override.text) {
             return Object.assign({}, override, {
-                text: stringTemplate.format(override.text, data)
+                text: stringTemplate.format(override.text, dc)
             });
         } else {
             return override;

libraries/botbuilder-dialogs-adaptive/src/conditions/onIntent.ts

@@ -5,10 +5,9 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-import { RecognizerResult } from 'botbuilder-core';
 import { OnDialogEvent } from './onDialogEvent';
 import { AdaptiveEventNames, SequenceContext } from '../sequenceContext';
-import { DialogEvent, Dialog, DialogContextState } from 'botbuilder-dialogs';
+import { DialogEvent, Dialog  } from 'botbuilder-dialogs';
 
 /**
  * This rule is triggered when a message is received and the recognized intents & entities match a
@@ -36,7 +35,7 @@ export class OnIntent extends OnDialogEvent {
         // Ensure all intents, entities, and properties exist.
         const memory = sequence.state;
         for(let i = 0; i < this.matches.length; i++) {
-            const value = DialogContextState.queryMemory(memory, this.matches[i], 1);
+            const value = sequence.state.getValue(this.matches[i]);
             if (!Array.isArray(value) || value.length == 0 || value[0] == undefined) {
                 return false;
             }

libraries/botbuilder-dialogs-adaptive/src/expressionProperty.ts

@@ -6,10 +6,10 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-import { DialogContextVisibleState, DialogStateManager } from "botbuilder-dialogs";
+import { DialogStateManager } from "botbuilder-dialogs";
 import { ExpressionEngine, Expression } from 'botframework-expressions';
 
-export type ExpressionDelegate<T> = (state: DialogContextVisibleState) => T;
+export type ExpressionDelegate<T> = (state: object) => T;
 export type ExpressionPropertyValue<T> = string|Expression|ExpressionDelegate<T>;
 
 export class ExpressionProperty<T> {
@@ -40,7 +40,7 @@ export class ExpressionProperty<T> {
                         this._expression = engine.parse(this._value);
                         break; 
                     case 'function':
-                        this._expression = Expression.Lambda(this._value);
+                        //this._expression = Expression.Lambda(this._value);
                         break;
                     default:
                         this._expression = this._value;

libraries/botbuilder-dialogs-adaptive/src/stringTemplate.ts

@@ -5,8 +5,7 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-import * as jsonpath from 'jsonpath';
-import { DialogContextState } from 'botbuilder-dialogs';
+import { DialogContext } from 'botbuilder-dialogs';
 
 /**
  * @private
@@ -17,9 +16,9 @@ import { DialogContextState } from 'botbuilder-dialogs';
  * any valid JSONPath expression.
  * @param template String template to compile.
  */
-export function compile(template: string): (data: object) => string {
+export function compile(template: string): (dc: DialogContext) => string {
     // Break template into chunks.
-    const chunks: ((data: object) => string)[] = [];
+    const chunks: ((dc: DialogContext) => string)[] = [];
     let buffer = '';
     let inSlot = false;
     for (let i = 0; i < template.length; i++) {
@@ -57,9 +56,9 @@ export function compile(template: string): (data: object) => string {
     }
 
     // Return stitching function
-    return (data: object) => {
+    return (dc: DialogContext) => {
         let output = '';
-        chunks.forEach((fn) => output += fn(data));
+        chunks.forEach((fn) => output += fn(dc));
         return output; 
     };
 }
@@ -74,18 +73,17 @@ export function compile(template: string): (data: object) => string {
  * @param template String template to compile.
  * @param data The data used to fill the template slots.
  */
-export function format(template: string, data: object): string {
-    return compile(template)(data);
+export function format(template: string, dc: DialogContext): string {
+    return compile(template)(dc);
 }
 
-function textLiteral(buffer: string): (data: object) => string {
-    return (data) => buffer;
+function textLiteral(buffer: string): (dc: DialogContext) => string {
+    return (dc) => buffer;
 }
 
-function textSlot(path: string): (data: object) => string {
-    path = DialogContextState.resolvePath(path);
-    return (data) => {
-        const value = jsonpath.value(data, path);
+function textSlot(path: string): (dc: DialogContext) => string {
+    return (dc) => {
+        const value = dc.state.getValue(path);
         switch (typeof value) {
             case 'object':
                 return JSON.stringify(value);