Updated botbuilder-dialogs with core changes

microsoft · Apr 1, 2018 · 1c73515 · 1c73515
1 parent 411ddcc
commit 1c73515
Show file tree

Hide file tree

Showing 54 changed files with 115 additions and 139 deletions.
diff --git a/libraries/botbuilder-dialogs/lib/compositeControl.d.ts b/libraries/botbuilder-dialogs/lib/compositeControl.d.ts
@@ -5,14 +5,14 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-import { BotContext } from 'botbuilder';
+import { TurnContext } from 'botbuilder';
 import { Dialog } from './dialog';
 import { DialogContext, DialogResult } from './dialogContext';
 import { DialogSet } from './dialogSet';
 /**
  *
  */
-export declare class CompositeControl<R = any, O = {}, C extends BotContext = BotContext> implements Dialog<C> {
+export declare class CompositeControl<R = any, O = {}, C extends TurnContext = TurnContext> implements Dialog<C> {
     protected dialogs: DialogSet<C>;
     protected dialogId: string;
     protected defaultOptions: O;

diff --git a/libraries/botbuilder-dialogs/lib/compositeControl.js.map b/libraries/botbuilder-dialogs/lib/compositeControl.js.map
diff --git a/libraries/botbuilder-dialogs/lib/control.d.ts b/libraries/botbuilder-dialogs/lib/control.d.ts
@@ -5,13 +5,13 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-import { BotContext } from 'botbuilder';
+import { TurnContext } from 'botbuilder';
 import { Dialog } from './dialog';
 import { DialogContext, DialogResult } from './dialogContext';
 /**
  *
  */
-export declare abstract class Control<R = any, O = {}, C extends BotContext = BotContext> implements Dialog<C> {
+export declare abstract class Control<R = any, O = {}, C extends TurnContext = TurnContext> implements Dialog<C> {
     protected defaultOptions: O;
     /**
      * Creates a new Control instance.

diff --git a/libraries/botbuilder-dialogs/lib/dialog.d.ts b/libraries/botbuilder-dialogs/lib/dialog.d.ts
@@ -5,14 +5,14 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-import { BotContext, Promiseable } from 'botbuilder';
+import { TurnContext, Promiseable } from 'botbuilder';
 import { DialogContext } from './dialogContext';
 /**
  * Interface of Dialog objects that can be added to a `DialogSet`. The dialog should generally
  * be a singleton and added to a dialog set using `DialogSet.add()` at which point it will be
  * assigned a unique ID.
  */
-export interface Dialog<C extends BotContext> {
+export interface Dialog<C extends TurnContext> {
     /**
      * Method called when a new dialog has been pushed onto the stack and is being activated.
      * @param dc The dialog context for the current turn of conversation.

diff --git a/libraries/botbuilder-dialogs/lib/dialogContext.d.ts b/libraries/botbuilder-dialogs/lib/dialogContext.d.ts
@@ -5,7 +5,7 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-import { BotContext, BatchOutput, Activity } from 'botbuilder';
+import { TurnContext, Activity } from 'botbuilder';
 import { DialogInstance } from './dialog';
 import { DialogSet } from './dialogSet';
 import { PromptOptions } from './prompts/index';
@@ -28,16 +28,10 @@ export interface DialogResult<T = any> {
      */
     result?: T;
 }
-export declare class DialogContext<C extends BotContext> {
+export declare class DialogContext<C extends TurnContext> {
     readonly dialogs: DialogSet<C>;
     readonly context: C;
     readonly stack: DialogInstance[];
-    /**
-     * Allows for batch based responses from the bot. Optional to use but you should add `BatchOutput`
-     * to your adapters middleware stack if you do, otherwise you'll need to manually call
-     * `dc.batch.flush()` somewhere within your bots logic.
-     */
-    readonly batch: BatchOutput;
     /**
      * Creates a new DialogContext instance.
      * @param dialogs Parent dialog set.

diff --git a/libraries/botbuilder-dialogs/lib/dialogContext.js b/libraries/botbuilder-dialogs/lib/dialogContext.js
diff --git a/libraries/botbuilder-dialogs/lib/dialogContext.js.map b/libraries/botbuilder-dialogs/lib/dialogContext.js.map
diff --git a/libraries/botbuilder-dialogs/lib/dialogSet.d.ts b/libraries/botbuilder-dialogs/lib/dialogSet.d.ts
@@ -5,7 +5,7 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-import { BotContext } from 'botbuilder';
+import { TurnContext } from 'botbuilder';
 import { Dialog } from './dialog';
 import { Waterfall, WaterfallStep } from './waterfall';
 import { DialogContext } from './dialogContext';
@@ -42,7 +42,7 @@ import { DialogContext } from './dialogContext';
  *      });
  * ```
  */
-export declare class DialogSet<C extends BotContext = BotContext> {
+export declare class DialogSet<C extends TurnContext = TurnContext> {
     private readonly dialogs;
     /**
      * Adds a new dialog to the set and returns the added dialog.

diff --git a/libraries/botbuilder-dialogs/lib/dialogSet.js.map b/libraries/botbuilder-dialogs/lib/dialogSet.js.map
diff --git a/libraries/botbuilder-dialogs/lib/prompts/attachmentPrompt.d.ts b/libraries/botbuilder-dialogs/lib/prompts/attachmentPrompt.d.ts
@@ -5,7 +5,7 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-import { BotContext, Attachment } from 'botbuilder';
+import { TurnContext, Attachment } from 'botbuilder';
 import { DialogContext } from '../dialogContext';
 import { Prompt, PromptOptions, PromptValidator } from './prompt';
 /**
@@ -32,7 +32,7 @@ import { Prompt, PromptOptions, PromptValidator } from './prompt';
  * ]);
  * ```
  */
-export declare class AttachmentPrompt<C extends BotContext> extends Prompt<C, Attachment[]> {
+export declare class AttachmentPrompt<C extends TurnContext> extends Prompt<C, Attachment[]> {
     private prompt;
     /**
      * Creates a new instance of the prompt.