Fix updateContext signature

It doesn't take ContextDelta
Full Context is required.
Also imported Context from assistant/v1 instead of redefining it

Author: Naktibalda

lib/index.d.ts

@@ -15,6 +15,7 @@
  */
 import Botkit = require('botkit');
 import AssistantV1 = require('ibm-watson/assistant/v1');
+import { Context } from 'ibm-watson/assistant/v1';
 import { BotkitMessage } from 'botkit';
 export interface WatsonMiddlewareConfig {
     version: string;
@@ -34,11 +35,6 @@ export interface WatsonMiddlewareConfig {
 export interface Payload extends AssistantV1.MessageRequest {
     workspace_id: string;
 }
-export interface Context {
-    conversation_id: string;
-    system: any;
-    [index: string]: any;
-}
 export declare type BotkitWatsonMessage = BotkitMessage & {
     watsonData?: Payload;
     watsonError?: string;
@@ -60,7 +56,7 @@ export declare class WatsonMiddleware {
     receive(bot: Botkit.BotWorker, message: Botkit.BotkitMessage): Promise<void>;
     interpret(bot: Botkit.BotWorker, message: Botkit.BotkitMessage): Promise<void>;
     readContext(user: string): Promise<Context>;
-    updateContext(user: string, contextDelta: ContextDelta): Promise<{
-        context: Context | ContextDelta;
+    updateContext(user: string, context: Context): Promise<{
+        context: Context;
     }>;
 }

lib/index.js

@@ -15,11 +15,12 @@
  */
 import { Storage } from 'botbuilder';
 import AssistantV1 = require('ibm-watson/assistant/v1');
-import { Payload, Context, ContextDelta } from './index';
+import { Context } from 'ibm-watson/assistant/v1';
+import { Payload } from './index';
 export declare function readContext(userId: string, storage: Storage): Promise<Context | null>;
 export declare function updateContext(userId: string, storage: Storage, watsonResponse: {
-    context: Context | ContextDelta;
+    context: Context;
 }): Promise<{
-    context: Context | ContextDelta;
+    context: Context;
 }>;
 export declare function postMessage(conversation: AssistantV1, payload: Payload): Promise<AssistantV1.MessageResponse>;

lib/index.js.map

@@ -18,6 +18,7 @@
 const debug = require('debug')('watson-middleware:index');
 import Botkit = require('botkit');
 import AssistantV1 = require('ibm-watson/assistant/v1');
+import { Context } from 'ibm-watson/assistant/v1';
 import { Storage } from 'botbuilder';
 import { readContext, updateContext, postMessage } from './utils';
 import deepMerge = require('deepmerge');
@@ -43,12 +44,6 @@ export interface Payload extends AssistantV1.MessageRequest {
   workspace_id: string;
 }
 
-export interface Context {
-  conversation_id: string;
-  system: any;
-  [index: string]: any;
-}
-
 export type BotkitWatsonMessage = BotkitMessage & {
   watsonData?: Payload;
   watsonError?: string;
@@ -204,15 +199,15 @@ export class WatsonMiddleware {
 
   public async updateContext(
     user: string,
-    contextDelta: ContextDelta,
-  ): Promise<{ context: Context | ContextDelta }> {
+    context: Context,
+  ): Promise<{ context: Context }> {
     if (!this.storage) {
       throw new Error(
         'updateContext is called before the first this.receive call',
       );
     }
     return updateContext(user, this.storage, {
-      context: contextDelta,
+      context: context,
     });
   }
 }

lib/utils.d.ts

@@ -18,7 +18,8 @@
 const debug = require('debug')('watson-middleware:utils');
 import { Storage } from 'botbuilder';
 import AssistantV1 = require('ibm-watson/assistant/v1');
-import { Payload, Context, ContextDelta } from './index';
+import { Context } from 'ibm-watson/assistant/v1';
+import { Payload } from './index';
 
 const storagePrefix = 'user.';
 
@@ -47,8 +48,8 @@ export async function readContext(
 export async function updateContext(
   userId: string,
   storage: Storage,
-  watsonResponse: { context: Context | ContextDelta },
-): Promise<{ context: Context | ContextDelta }> {
+  watsonResponse: { context: Context },
+): Promise<{ context: Context }> {
   const itemId = storagePrefix + userId;
 
   let userData: any = {};

lib/utils.js.map

@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-import { Botkit, BotkitMessage } from 'botkit';
+import { Botkit } from 'botkit';
 import { updateContext } from '../lib/utils';
 import { clonePrototype } from 'clone';
 import { MemoryStorage } from 'botbuilder';
 import { WebAdapter } from 'botbuilder-adapter-web';
-import { WatsonMiddleware, BotkitWatsonMessage, Context } from '../lib/index';
+import { WatsonMiddleware, BotkitWatsonMessage } from '../lib/index';
+import { Context } from 'ibm-watson/assistant/v1';
 import nock = require('nock');
 
 //Watson Assistant params