Stevenic/update master

libraries/botbuilder-dialogs-adaptive/src/skills/adaptiveSkillDialog.ts → libraries/botbuilder-dialogs-adaptive/src/actions/beginSkill.ts

@@ -13,7 +13,7 @@ import { Activity, ActivityTypes, BotFrameworkClient, SkillConversationIdFactory
 const SKILL_CLIENT = Symbol('skillClient');
 const CONVERSATION_ID_FACTORY = Symbol('conversationIdFactory');
 
-export class AdaptiveSkillDialog extends SkillDialog {
+export class BeginSkill extends SkillDialog {
 
     /**
      * Optional expression which if is true will disable this action.
@@ -71,7 +71,7 @@ export class AdaptiveSkillDialog extends SkillDialog {
     public connectionName: StringExpression;
 
     /**
-     * Creates a new `AdaptiveSkillDialog instance.
+     * Creates a new `BeginSkillDialog instance.
      * @param options Optional options used to configure the skill dialog.
      */
     constructor(options?: SkillDialogOptions) {

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

@@ -8,6 +8,7 @@
 export * from './actionScope';
 export * from './baseInvokeDialog';
 export * from './beginDialog';
+export * from './beginSkill';
 export * from './breakLoop';
 export * from './cancelAllDialogs';
 export * from './case';

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

@@ -10,7 +10,7 @@ import { ComponentRegistration, ResourceExplorer, TypeBuilder, BuilderRegistrati
 import { Choice, ListStyle, ChoiceFactoryOptions, FindChoicesOptions } from 'botbuilder-dialogs';
 import { AdaptiveTypeBuilder } from './adaptiveTypeBuilder';
 import { AdaptiveDialog } from './adaptiveDialog';
-import { BeginDialog, BreakLoop, CancelAllDialogs, ContinueLoop, DeleteActivity, DeleteProperties, DeleteProperty, EditActions, EditArray, EmitEvent, EndDialog, EndTurn, ForEach, ForEachPage, GetActivityMembers, GetConversationMembers, GotoAction, IfCondition, LogAction, RepeatDialog, ReplaceDialog, SendActivity, SetProperties, SetProperty, SignOutUser, SwitchCondition, TraceActivity, UpdateActivity, ArrayChangeType, PropertyAssignmentConverter } from './actions';
+import { BeginDialog, BeginSkill, BreakLoop, CancelAllDialogs, ContinueLoop, DeleteActivity, DeleteProperties, DeleteProperty, EditActions, EditArray, EmitEvent, EndDialog, EndTurn, ForEach, ForEachPage, GetActivityMembers, GetConversationMembers, GotoAction, IfCondition, LogAction, RepeatDialog, ReplaceDialog, SendActivity, SetProperties, SetProperty, SignOutUser, SwitchCondition, TraceActivity, UpdateActivity, ArrayChangeType, PropertyAssignmentConverter } from './actions';
 import { AttachmentInput, ChoiceInput, ConfirmInput, DateTimeInput, NumberInput, OAuthInput, TextInput, AttachmentOutputFormat, ChoiceOutputFormat } from './input';
 import { OnActivity, OnAssignEntity, OnBeginDialog, OnCancelDialog, OnChooseEntity, OnChooseIntent, OnChooseProperty, OnClearProperty, OnCondition, OnConversationUpdateActivity, OnCustomEvent, OnDialogEvent, OnEndOfActions, OnEndOfConversationActivity, OnError, OnEventActivity, OnHandoffActivity, OnIntent, OnInvokeActivity, OnMessageActivity, OnMessageDeleteActivity, OnMessageReactionActivity, OnMessageUpdateActivity, OnQnAMatch, OnRepromptDialog, OnTypingActivity, OnUnknownIntent } from './conditions';
 import { CrossTrainedRecognizerSet, MultiLanguageRecognizer, RecognizerSet, ValueRecognizer, RegexRecognizer, IntentPatternConverter } from './recognizers';
@@ -24,7 +24,6 @@ import { TemplateEngineLanguageGenerator, ResourceMultiLanguageGenerator } from
 import { ConditionalSelector, FirstSelector, RandomSelector, TrueSelector } from './selectors';
 import { LanguageGeneratorConverter } from './converters/languageGeneratorConverter';
 import { LuisAdaptiveRecognizer } from './luis';
-import { AdaptiveSkillDialog } from './skills/adaptiveSkillDialog';
 
 export class AdaptiveDialogComponentRegistration implements ComponentRegistration {
     private _resourceExplorer: ResourceExplorer;
@@ -36,7 +35,7 @@ export class AdaptiveDialogComponentRegistration implements ComponentRegistratio
         this.registerBuilder('Microsoft.AdaptiveDialog', new AdaptiveTypeBuilder(AdaptiveDialog, this._resourceExplorer, {
             'generator': new LanguageGeneratorConverter()
         }));
-        this.registerBuilder('Microsoft.AdaptiveSkillDialog', new AdaptiveTypeBuilder(AdaptiveSkillDialog, this._resourceExplorer, {
+        this.registerBuilder('Microsoft.BeginSkill', new AdaptiveTypeBuilder(BeginSkill, this._resourceExplorer, {
             'disabled': new BoolExpressionConverter(),
             'activityProcessed': new BoolExpressionConverter(),
             'resultProperty': new StringExpressionConverter(),

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

@@ -18,7 +18,6 @@ export * from './input';
 export * from './luis';
 export * from './recognizers';
 export * from './selectors';
-export * from './skills';
 export * from './templates';
 export * from './adaptiveDialog';
 export * from './languageGenerationMiddleware';

libraries/botbuilder-dialogs-adaptive/tests/adaptiveSkillDialog.test.js → libraries/botbuilder-dialogs-adaptive/tests/beginSkill.test.js

@@ -12,7 +12,7 @@ const {
 } = require('botbuilder-core');
 const { BoolExpression, StringExpression } = require('adaptive-expressions');
 const { DialogManager, DialogTurnStatus } = require('botbuilder-dialogs');
-const { AdaptiveSkillDialog } = require('../')
+const { BeginSkill } = require('../lib')
 
 
 class SimpleConversationIdFactory extends SkillConversationIdFactoryBase {
@@ -55,7 +55,7 @@ class SimpleConversationIdFactory extends SkillConversationIdFactoryBase {
     }
 }
 
-describe('SkillDialog', function() {
+describe('BeginSkill', function() {
     this.timeout(3000);
 
     let activitySent; // Activity
@@ -79,10 +79,10 @@ describe('SkillDialog', function() {
     const conversationState = new ConversationState(new MemoryStorage());
     const dm = new DialogManager();
     dm.conversationState = conversationState;
-    AdaptiveSkillDialog.setSkillHostOptions(dm, skillClient, new SimpleConversationIdFactory());
+    BeginSkill.setSkillHostOptions(dm, skillClient, new SimpleConversationIdFactory());
 
     // Setup skill dialog
-    const dialog = new AdaptiveSkillDialog();
+    const dialog = new BeginSkill();
     setSkillDialogOptions(dialog);
     dm.rootDialog = dialog;
 
@@ -122,7 +122,7 @@ function setSkillDialogOptions(dialog) {
  */
 function createSkillClientAndStub(captureAction, returnStatusCode = StatusCodes.OK) {
     // This require should not fail as this method should only be called after verifying that botbuilder is resolvable.
-    const { BotFrameworkHttpClient } = require('../../botbuilder');
+    const { BotFrameworkHttpClient } = require('../../botbuilder/lib');
 
     if (captureAction && typeof captureAction !== 'function') {
         throw new TypeError(`Failed test arrangement - createSkillClientAndStub() received ${typeof captureAction} instead of undefined or a function.`);