@botonic/plugin-hubtype-analytics 0.27.0-alpha.4 → 0.27.0-alpha.6

package/lib/esm/types.d.ts

@@ -1,5 +1,4 @@
 export declare enum EventType {
-    Feedback = "feedback",
     BotEvent = "botevent",
     WebEvent = "webevent"
 }
@@ -26,9 +25,6 @@ export interface HtBaseEventProps {
 }
 export interface EventFeedback extends HtBaseEventProps {
     action: EventAction.FeedbackCase | EventAction.FeedbackConversation | EventAction.FeedbackMessage | EventAction.FeedbackWebview;
-    data: EventPropsFeedback;
-}
-export interface EventPropsFeedback {
     messageGeneratedBy?: string;
     feedbackTargetId?: string;
     feedbackGroupId?: string;
@@ -36,12 +32,10 @@ export interface EventPropsFeedback {
     possibleValues: number[];
     option: string;
     value: number;
+    comment?: string;
 }
 export interface EventFlow extends HtBaseEventProps {
     action: EventAction.FlowNode;
-    data: EventPropsFlow;
-}
-export interface EventPropsFlow {
     flowThreadId: string;
     flowId: string;
     flowName: string;
@@ -50,10 +44,7 @@ export interface EventPropsFlow {
     flowNodeIsMeaningful?: boolean;
 }
 export interface EventHandoff extends HtBaseEventProps {
-    action: EventAction.HandoffOption | EventAction.HandoffSuccess | EventAction.HandoffFail;
-    data: EventPropsHandoff;
-}
-export interface EventPropsHandoff {
+    action: EventAction.HandoffSuccess | EventAction.HandoffFail;
     queueId: string;
     queueName: string;
     caseId?: string;
@@ -61,11 +52,13 @@ export interface EventPropsHandoff {
     isAvailableAgent?: boolean;
     isThresholdReached?: boolean;
 }
+export interface EventHandoffOption extends HtBaseEventProps {
+    action: EventAction.HandoffOption;
+    queueId: string;
+    queueName: string;
+}
 export interface EventIntent extends HtBaseEventProps {
     action: EventAction.Intent;
-    data: EventPropsIntent;
-}
-export interface EventPropsIntent {
     nluIntentLabel: string;
     nluIntentConfidence: number;
     nluIntentThreshold: number;
@@ -73,9 +66,6 @@ export interface EventPropsIntent {
 }
 export interface EventKeyword extends HtBaseEventProps {
     action: EventAction.Keyword;
-    data: EventPropsKeyword;
-}
-export interface EventPropsKeyword {
     nluKeywordId: string;
     nluKeywordName: string;
     nluKeywordIsRegex?: boolean;
@@ -83,18 +73,12 @@ export interface EventPropsKeyword {
 }
 export interface EventIntentSmart extends HtBaseEventProps {
     action: EventAction.IntentSmart;
-    data: EventPropsIntentSmart;
-}
-export interface EventPropsIntentSmart {
     nluIntentSmartTitle: string;
     nluIntentSmartNumUsed: number;
     nluIntentSmartMessageId: string;
 }
 export interface EventKnowledgeBase extends HtBaseEventProps {
     action: EventAction.Knowledgebase;
-    data: EventPropsKnowledgeBase;
-}
-export interface EventPropsKnowledgeBase {
     knowledgebaseInferenceId: string;
     knowledgebaseFailReason?: KnowledgebaseFailReason;
     knowledgebaseSourcesIds: string[];
@@ -107,17 +91,11 @@ export declare enum KnowledgebaseFailReason {
 }
 export interface EventFallback extends HtBaseEventProps {
     action: EventAction.Fallback;
-    data: EventPropsFallbackBase;
-}
-export interface EventPropsFallbackBase {
     fallbackOut: number;
     fallbackMessageId: string;
 }
 export interface EventWebview extends HtBaseEventProps {
     action: EventAction.WebviewStep | EventAction.WebviewEnd;
-    data: EventPropsWebview;
-}
-export interface EventPropsWebview {
     webviewThreadId: string;
     webviewName: string;
     webviewStepName?: string;
@@ -126,12 +104,9 @@ export interface EventPropsWebview {
 }
 export interface EventCustom extends HtBaseEventProps {
     action: EventAction.Custom;
-    data: EventPropsCustom;
-}
-export interface EventPropsCustom {
     customFields: Record<string, any>;
 }
-export type HtEventProps = EventFeedback | EventFlow | EventHandoff | EventIntent | EventKeyword | EventIntentSmart | EventKnowledgeBase | EventFallback | EventWebview | EventCustom;
+export type HtEventProps = EventFeedback | EventFlow | EventHandoff | EventHandoffOption | EventIntent | EventKeyword | EventIntentSmart | EventKnowledgeBase | EventFallback | EventWebview | EventCustom;
 export interface RequestData {
     language: string;
     country: string;

package/lib/esm/types.js

@@ -1,6 +1,5 @@
 export var EventType;
 (function (EventType) {
-    EventType["Feedback"] = "feedback";
     EventType["BotEvent"] = "botevent";
     EventType["WebEvent"] = "webevent";
 })(EventType || (EventType = {}));

package/lib/esm/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,SAIX;AAJD,WAAY,SAAS;IACnB,kCAAqB,CAAA;IACrB,kCAAqB,CAAA;IACrB,kCAAqB,CAAA;AACvB,CAAC,EAJW,SAAS,KAAT,SAAS,QAIpB;AAED,MAAM,CAAN,IAAY,WAiBX;AAjBD,WAAY,WAAW;IACrB,6CAA8B,CAAA;IAC9B,mDAAoC,CAAA;IACpC,6DAA8C,CAAA;IAC9C,mDAAoC,CAAA;IACpC,qCAAsB,CAAA;IACtB,+CAAgC,CAAA;IAChC,iDAAkC,CAAA;IAClC,2CAA4B,CAAA;IAC5B,sCAAuB,CAAA;IACvB,oCAAqB,CAAA;IACrB,+CAAgC,CAAA;IAChC,8CAA+B,CAAA;IAC/B,oCAAqB,CAAA;IACrB,2CAA4B,CAAA;IAC5B,yCAA0B,CAAA;IAC1B,gCAAiB,CAAA;AACnB,CAAC,EAjBW,WAAW,KAAX,WAAW,QAiBtB;AAwGD,MAAM,CAAN,IAAY,uBAGX;AAHD,WAAY,uBAAuB;IACjC,uDAA4B,CAAA;IAC5B,0DAA+B,CAAA;AACjC,CAAC,EAHW,uBAAuB,KAAvB,uBAAuB,QAGlC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,SAGX;AAHD,WAAY,SAAS;IACnB,kCAAqB,CAAA;IACrB,kCAAqB,CAAA;AACvB,CAAC,EAHW,SAAS,KAAT,SAAS,QAGpB;AAED,MAAM,CAAN,IAAY,WAiBX;AAjBD,WAAY,WAAW;IACrB,6CAA8B,CAAA;IAC9B,mDAAoC,CAAA;IACpC,6DAA8C,CAAA;IAC9C,mDAAoC,CAAA;IACpC,qCAAsB,CAAA;IACtB,+CAAgC,CAAA;IAChC,iDAAkC,CAAA;IAClC,2CAA4B,CAAA;IAC5B,sCAAuB,CAAA;IACvB,oCAAqB,CAAA;IACrB,+CAAgC,CAAA;IAChC,8CAA+B,CAAA;IAC/B,oCAAqB,CAAA;IACrB,2CAA4B,CAAA;IAC5B,yCAA0B,CAAA;IAC1B,gCAAiB,CAAA;AACnB,CAAC,EAjBW,WAAW,KAAX,WAAW,QAiBtB;AAgFD,MAAM,CAAN,IAAY,uBAGX;AAHD,WAAY,uBAAuB;IACjC,uDAA4B,CAAA;IAC5B,0DAA+B,CAAA;AACjC,CAAC,EAHW,uBAAuB,KAAvB,uBAAuB,QAGlC"}

package/lib/esm/utils.js

@@ -1,4 +1,4 @@
-import { HtEvent, HtEventCustom, HtEventFallback, HtEventFeedback, HtEventFlow, HtEventHandoff, HtEventIntent, HtEventIntentSmart, HtEventKeyword, HtEventKnowledgeBase, HtEventWebview, } from './event-models';
+import { HtEvent, HtEventCustom, HtEventFallback, HtEventFeedback, HtEventFlow, HtEventHandoff, HtEventHandoffOption, HtEventIntent, HtEventIntentSmart, HtEventKeyword, HtEventKnowledgeBase, HtEventWebview, } from './event-models';
 import { EventAction } from './types';
 export function createHtEvent(requestData, htEventProps) {
     switch (htEventProps.action) {
@@ -10,6 +10,7 @@ export function createHtEvent(requestData, htEventProps) {
         case EventAction.FlowNode:
             return new HtEventFlow(htEventProps, requestData);
         case EventAction.HandoffOption:
+            return new HtEventHandoffOption(htEventProps, requestData);
         case EventAction.HandoffSuccess:
         case EventAction.HandoffFail:
             return new HtEventHandoff(htEventProps, requestData);

package/lib/esm/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,aAAa,EACb,eAAe,EACf,eAAe,EACf,WAAW,EACX,cAAc,EACd,aAAa,EACb,kBAAkB,EAClB,cAAc,EACd,oBAAoB,EACpB,cAAc,GACf,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,WAAW,EAA6B,MAAM,SAAS,CAAA;AAEhE,MAAM,UAAU,aAAa,CAC3B,WAAwB,EACxB,YAA0B;IAE1B,QAAQ,YAAY,CAAC,MAAM,EAAE;QAC3B,KAAK,WAAW,CAAC,YAAY,CAAC;QAC9B,KAAK,WAAW,CAAC,oBAAoB,CAAC;QACtC,KAAK,WAAW,CAAC,eAAe,CAAC;QACjC,KAAK,WAAW,CAAC,eAAe;YAC9B,OAAO,IAAI,eAAe,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;QAEvD,KAAK,WAAW,CAAC,QAAQ;YACvB,OAAO,IAAI,WAAW,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;QAEnD,KAAK,WAAW,CAAC,aAAa,CAAC;QAC/B,KAAK,WAAW,CAAC,cAAc,CAAC;QAChC,KAAK,WAAW,CAAC,WAAW;YAC1B,OAAO,IAAI,cAAc,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;QAEtD,KAAK,WAAW,CAAC,MAAM;YACrB,OAAO,IAAI,aAAa,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;QAErD,KAAK,WAAW,CAAC,OAAO;YACtB,OAAO,IAAI,cAAc,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;QAEtD,KAAK,WAAW,CAAC,WAAW;YAC1B,OAAO,IAAI,kBAAkB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;QAE1D,KAAK,WAAW,CAAC,aAAa;YAC5B,OAAO,IAAI,oBAAoB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;QAE5D,KAAK,WAAW,CAAC,QAAQ;YACvB,OAAO,IAAI,eAAe,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;QAEvD,KAAK,WAAW,CAAC,WAAW,CAAC;QAC7B,KAAK,WAAW,CAAC,UAAU;YACzB,OAAO,IAAI,cAAc,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;QAEtD,KAAK,WAAW,CAAC,MAAM;YACrB,OAAO,IAAI,aAAa,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;QAErD;YACE,OAAO,IAAI,OAAO,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;KAChD;AACH,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,aAAa,EACb,eAAe,EACf,eAAe,EACf,WAAW,EACX,cAAc,EACd,oBAAoB,EACpB,aAAa,EACb,kBAAkB,EAClB,cAAc,EACd,oBAAoB,EACpB,cAAc,GACf,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,WAAW,EAA6B,MAAM,SAAS,CAAA;AAEhE,MAAM,UAAU,aAAa,CAC3B,WAAwB,EACxB,YAA0B;IAE1B,QAAQ,YAAY,CAAC,MAAM,EAAE;QAC3B,KAAK,WAAW,CAAC,YAAY,CAAC;QAC9B,KAAK,WAAW,CAAC,oBAAoB,CAAC;QACtC,KAAK,WAAW,CAAC,eAAe,CAAC;QACjC,KAAK,WAAW,CAAC,eAAe;YAC9B,OAAO,IAAI,eAAe,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;QAEvD,KAAK,WAAW,CAAC,QAAQ;YACvB,OAAO,IAAI,WAAW,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;QAEnD,KAAK,WAAW,CAAC,aAAa;YAC5B,OAAO,IAAI,oBAAoB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;QAE5D,KAAK,WAAW,CAAC,cAAc,CAAC;QAChC,KAAK,WAAW,CAAC,WAAW;YAC1B,OAAO,IAAI,cAAc,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;QAEtD,KAAK,WAAW,CAAC,MAAM;YACrB,OAAO,IAAI,aAAa,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;QAErD,KAAK,WAAW,CAAC,OAAO;YACtB,OAAO,IAAI,cAAc,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;QAEtD,KAAK,WAAW,CAAC,WAAW;YAC1B,OAAO,IAAI,kBAAkB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;QAE1D,KAAK,WAAW,CAAC,aAAa;YAC5B,OAAO,IAAI,oBAAoB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;QAE5D,KAAK,WAAW,CAAC,QAAQ;YACvB,OAAO,IAAI,eAAe,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;QAEvD,KAAK,WAAW,CAAC,WAAW,CAAC;QAC7B,KAAK,WAAW,CAAC,UAAU;YACzB,OAAO,IAAI,cAAc,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;QAEtD,KAAK,WAAW,CAAC,MAAM;YACrB,OAAO,IAAI,aAAa,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;QAErD;YACE,OAAO,IAAI,OAAO,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;KAChD;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botonic/plugin-hubtype-analytics",
-  "version": "0.27.0-alpha.4",
+  "version": "0.27.0-alpha.6",
   "description": "Plugin for tracking in the Hubtype backend to see the results in the Hubtype Dashbord",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",

package/src/event-models/ht-event-custom.ts

@@ -1,17 +1,13 @@
 import { EventAction, EventCustom, EventType, RequestData } from '../types'
 import { HtEvent } from './ht-event'
 
-interface EventDataCustom {
-  action: EventAction.Custom
-  custom_fields: Record<string, any>
-}
-
 export class HtEventCustom extends HtEvent {
-  data: EventDataCustom
+  custom_fields: Record<string, any>
 
   constructor(event: EventCustom, requestData: RequestData) {
     super(event, requestData)
     this.type = EventType.WebEvent
-    this.data.custom_fields = event.data.customFields
+    this.action = EventAction.Custom
+    this.custom_fields = event.customFields
   }
 }

package/src/event-models/ht-event-fallback.ts

@@ -1,19 +1,15 @@
 import { EventAction, EventFallback, EventType, RequestData } from '../types'
 import { HtEvent } from './ht-event'
 
-interface EventDataFallback {
-  action: EventAction.Fallback
+export class HtEventFallback extends HtEvent {
   fallback_out: number
   fallback_message_id: string
-}
-
-export class HtEventFallback extends HtEvent {
-  data: EventDataFallback
 
   constructor(event: EventFallback, requestData: RequestData) {
     super(event, requestData)
     this.type = EventType.BotEvent
-    this.data.fallback_out = event.data.fallbackOut
-    this.data.fallback_message_id = event.data.fallbackMessageId
+    this.action = EventAction.Fallback
+    this.fallback_out = event.fallbackOut
+    this.fallback_message_id = event.fallbackMessageId
   }
 }

package/src/event-models/ht-event-feedback.ts

@@ -1,7 +1,7 @@
 import { EventAction, EventFeedback, EventType, RequestData } from '../types'
 import { HtEvent } from './ht-event'
 
-interface EventDataFeedback {
+export class HtEventFeedback extends HtEvent {
   action:
     | EventAction.FeedbackCase
     | EventAction.FeedbackConversation
@@ -13,19 +13,18 @@ interface EventDataFeedback {
   possible_values: number[]
   option: string
   value: number
-}
-
-export class HtEventFeedback extends HtEvent {
-  data: EventDataFeedback
+  comment?: string
 
   constructor(event: EventFeedback, requestData: RequestData) {
     super(event, requestData)
-    this.type = EventType.Feedback
-    this.data.feedback_target_id = event.data.feedbackTargetId // ?? case_id, message_id, conversation_id ???, webview_name
-    this.data.feedback_group_id = event.data.feedbackGroupId // ??
-    this.data.possible_options = event.data.possibleOptions
-    this.data.possible_values = event.data.possibleValues
-    this.data.option = event.data.option
-    this.data.value = event.data.value
+    this.type = EventType.WebEvent
+    this.action = event.action
+    this.feedback_target_id = event.feedbackTargetId // ?? case_id, message_id, conversation_id ???, webview_name
+    this.feedback_group_id = event.feedbackGroupId // ??
+    this.possible_options = event.possibleOptions
+    this.possible_values = event.possibleValues
+    this.option = event.option
+    this.value = event.value
+    this.comment = event.comment
   }
 }

package/src/event-models/ht-event-flow.ts

@@ -1,27 +1,23 @@
 import { EventAction, EventFlow, EventType, RequestData } from '../types'
 import { HtEvent } from './ht-event'
 
-interface EventDataFlow {
-  action: EventAction.FlowNode
+export class HtEventFlow extends HtEvent {
   flow_thread_id: string
   flow_id: string
   flow_name: string
   flow_node_id: string
   flow_node_content_id: string
   flow_node_is_meaningful: boolean
-}
-
-export class HtEventFlow extends HtEvent {
-  data: EventDataFlow
 
   constructor(event: EventFlow, requestData: RequestData) {
     super(event, requestData)
     this.type = EventType.BotEvent
-    this.data.flow_thread_id = event.data.flowThreadId // This value is managed by the flow builder plugin, stored in the session and updated every time the content connected to the conversation start is displayed
-    this.data.flow_id = event.data.flowId
-    this.data.flow_name = event.data.flowName
-    this.data.flow_node_id = event.data.flowNodeId
-    this.data.flow_node_content_id = event.data.flowNodeContentId
-    this.data.flow_node_is_meaningful = event.data.flowNodeIsMeaningful || false
+    this.action = EventAction.FlowNode
+    this.flow_thread_id = event.flowThreadId // This value is managed by the flow builder plugin, stored in the session and updated every time the content connected to the conversation start is displayed
+    this.flow_id = event.flowId
+    this.flow_name = event.flowName
+    this.flow_node_id = event.flowNodeId
+    this.flow_node_content_id = event.flowNodeContentId
+    this.flow_node_is_meaningful = event.flowNodeIsMeaningful || false
   }
 }

package/src/event-models/ht-event-handoff-option.ts

@@ -0,0 +1,20 @@
+import {
+  EventAction,
+  EventHandoffOption,
+  EventType,
+  RequestData,
+} from '../types'
+import { HtEvent } from './ht-event'
+
+export class HtEventHandoffOption extends HtEvent {
+  action: EventAction.HandoffOption
+  handoff_queue_id: string
+  handoff_queue_name: string
+
+  constructor(event: EventHandoffOption, requestData: RequestData) {
+    super(event, requestData)
+    this.type = EventType.BotEvent
+    this.handoff_queue_id = event.queueId
+    this.handoff_queue_name = event.queueName
+  }
+}

package/src/event-models/ht-event-handoff.ts

@@ -1,31 +1,24 @@
 import { EventAction, EventHandoff, EventType, RequestData } from '../types'
 import { HtEvent } from './ht-event'
 
-interface EventDataHandoff {
-  action:
-    | EventAction.HandoffOption
-    | EventAction.HandoffSuccess
-    | EventAction.HandoffFail
+export class HtEventHandoff extends HtEvent {
+  action: EventAction.HandoffSuccess | EventAction.HandoffFail
   handoff_queue_id: string
   handoff_queue_name: string
   handoff_case_id?: string
-  is_queue_open: boolean
+  handoff_is_queue_open: boolean
   handoff_is_available_agent: boolean
   handoff_is_threshold_reached: boolean
-}
-
-export class HtEventHandoff extends HtEvent {
-  data: EventDataHandoff
 
   constructor(event: EventHandoff, requestData: RequestData) {
     super(event, requestData)
     this.type = EventType.BotEvent
-    this.data.handoff_queue_id = event.data.queueId
-    this.data.handoff_queue_name = event.data.queueName
-    this.data.handoff_case_id = event.data.caseId
-    this.data.is_queue_open = event.data.isQueueOpen || false
-    this.data.handoff_is_available_agent = event.data.isAvailableAgent || false
-    this.data.handoff_is_threshold_reached =
-      event.data.isThresholdReached || false
+    this.action = event.action
+    this.handoff_queue_id = event.queueId
+    this.handoff_queue_name = event.queueName
+    this.handoff_case_id = event.caseId
+    this.handoff_is_queue_open = event.isQueueOpen || false
+    this.handoff_is_available_agent = event.isAvailableAgent || false
+    this.handoff_is_threshold_reached = event.isThresholdReached || false
   }
 }

package/src/event-models/ht-event-intent-smart.ts

@@ -1,21 +1,17 @@
 import { EventAction, EventIntentSmart, EventType, RequestData } from '../types'
 import { HtEvent } from './ht-event'
 
-interface EventDataIntentSmart {
-  action: EventAction.IntentSmart
+export class HtEventIntentSmart extends HtEvent {
   nlu_intent_smart_title: string
   nlu_intent_smart_num_used: number
   nlu_intent_smart_message_id: string
-}
-
-export class HtEventIntentSmart extends HtEvent {
-  data: EventDataIntentSmart
 
   constructor(event: EventIntentSmart, requestData: RequestData) {
     super(event, requestData)
     this.type = EventType.BotEvent
-    this.data.nlu_intent_smart_title = event.data.nluIntentSmartTitle
-    this.data.nlu_intent_smart_num_used = event.data.nluIntentSmartNumUsed
-    this.data.nlu_intent_smart_message_id = event.data.nluIntentSmartMessageId
+    this.action = EventAction.IntentSmart
+    this.nlu_intent_smart_title = event.nluIntentSmartTitle
+    this.nlu_intent_smart_num_used = event.nluIntentSmartNumUsed
+    this.nlu_intent_smart_message_id = event.nluIntentSmartMessageId
   }
 }

package/src/event-models/ht-event-intent.ts

@@ -1,23 +1,19 @@
 import { EventAction, EventIntent, EventType, RequestData } from '../types'
 import { HtEvent } from './ht-event'
 
-interface EventDataIntent {
-  action: EventAction.Intent
+export class HtEventIntent extends HtEvent {
   nlu_intent_label: string
   nlu_intent_confidence: number
   nlu_intent_threshold: number
   nlu_intent_message_id: string
-}
-
-export class HtEventIntent extends HtEvent {
-  data: EventDataIntent
 
   constructor(event: EventIntent, requestData: RequestData) {
     super(event, requestData)
     this.type = EventType.BotEvent
-    this.data.nlu_intent_label = event.data.nluIntentLabel
-    this.data.nlu_intent_confidence = event.data.nluIntentConfidence
-    this.data.nlu_intent_threshold = event.data.nluIntentThreshold
-    this.data.nlu_intent_message_id = event.data.nluIntentMessageId
+    this.action = EventAction.Intent
+    this.nlu_intent_label = event.nluIntentLabel
+    this.nlu_intent_confidence = event.nluIntentConfidence
+    this.nlu_intent_threshold = event.nluIntentThreshold
+    this.nlu_intent_message_id = event.nluIntentMessageId
   }
 }

package/src/event-models/ht-event-keyword.ts

@@ -1,23 +1,19 @@
 import { EventAction, EventKeyword, EventType, RequestData } from '../types'
 import { HtEvent } from './ht-event'
 
-interface EventDataKeyword {
-  action: EventAction.Keyword
+export class HtEventKeyword extends HtEvent {
   nlu_keyword_id: string
   nlu_keyword_name: string
   nlu_keyword_is_regex: boolean
   nlu_keyword_message_id: string
-}
-
-export class HtEventKeyword extends HtEvent {
-  data: EventDataKeyword
 
   constructor(event: EventKeyword, requestData: RequestData) {
     super(event, requestData)
     this.type = EventType.BotEvent
-    this.data.nlu_keyword_id = event.data.nluKeywordId
-    this.data.nlu_keyword_name = event.data.nluKeywordName
-    this.data.nlu_keyword_is_regex = event.data.nluKeywordIsRegex || false
-    this.data.nlu_keyword_message_id = event.data.nluKeywordMessageId
+    this.action = EventAction.Keyword
+    this.nlu_keyword_id = event.nluKeywordId
+    this.nlu_keyword_name = event.nluKeywordName
+    this.nlu_keyword_is_regex = event.nluKeywordIsRegex || false
+    this.nlu_keyword_message_id = event.nluKeywordMessageId
   }
 }

package/src/event-models/ht-event-knowledge-base.ts

@@ -6,25 +6,21 @@ import {
 } from '../types'
 import { HtEvent } from './ht-event'
 
-interface EventDataKnowledgeBase {
-  action: EventAction.Knowledgebase
+export class HtEventKnowledgeBase extends HtEvent {
   knowledgebase_inference_id: string
   knowledgebase_fail_reason?: string
   knowledgebase_sources_ids: string[]
   knowledgebase_chunks_ids: string[]
   knowledgebase_message_id: string
-}
-
-export class HtEventKnowledgeBase extends HtEvent {
-  data: EventDataKnowledgeBase
 
   constructor(event: EventKnowledgeBase, requestData: RequestData) {
     super(event, requestData)
     this.type = EventType.BotEvent
-    this.data.knowledgebase_inference_id = event.data.knowledgebaseInferenceId
-    this.data.knowledgebase_fail_reason = event.data.knowledgebaseFailReason
-    this.data.knowledgebase_sources_ids = event.data.knowledgebaseSourcesIds
-    this.data.knowledgebase_chunks_ids = event.data.knowledgebaseChunksIds
-    this.data.knowledgebase_message_id = event.data.knowledgebaseMessageId
+    this.action = EventAction.Knowledgebase
+    this.knowledgebase_inference_id = event.knowledgebaseInferenceId
+    this.knowledgebase_fail_reason = event.knowledgebaseFailReason
+    this.knowledgebase_sources_ids = event.knowledgebaseSourcesIds
+    this.knowledgebase_chunks_ids = event.knowledgebaseChunksIds
+    this.knowledgebase_message_id = event.knowledgebaseMessageId
   }
 }

package/src/event-models/ht-event-webview.ts

@@ -1,25 +1,22 @@
 import { EventAction, EventType, EventWebview, RequestData } from '../types'
 import { HtEvent } from './ht-event'
 
-interface EventDataWebview {
+export class HtEventWebview extends HtEvent {
   action: EventAction.WebviewStep | EventAction.WebviewEnd
   webview_thread_id: string
   webview_name: string
   webview_step_name?: string
   webview_end_fail_type?: string
   webview_end_fail_message?: string
-}
-
-export class HtEventWebview extends HtEvent {
-  data: EventDataWebview
 
   constructor(event: EventWebview, requestData: RequestData) {
     super(event, requestData)
     this.type = EventType.WebEvent
-    this.data.webview_thread_id = event.data.webviewThreadId
-    this.data.webview_name = event.data.webviewName
-    this.data.webview_step_name = event.data.webviewStepName
-    this.data.webview_end_fail_type = event.data.webviewEndFailType
-    this.data.webview_end_fail_message = event.data.webviewEndFailMessage
+    this.action = event.action
+    this.webview_thread_id = event.webviewThreadId
+    this.webview_name = event.webviewName
+    this.webview_step_name = event.webviewStepName
+    this.webview_end_fail_type = event.webviewEndFailType
+    this.webview_end_fail_message = event.webviewEndFailMessage
   }
 }

package/src/event-models/ht-event.ts

@@ -1,4 +1,4 @@
-import { EventType, HtEventProps, RequestData } from '../types'
+import { EventAction, EventType, HtEventProps, RequestData } from '../types'
 
 export class HtEvent {
   chat_id: string
@@ -8,14 +8,13 @@ export class HtEvent {
   format_version?: number
   bot_version?: string
   flow_version?: string
-  data: any
+  action: EventAction
 
   constructor(event: HtEventProps, requestData: RequestData) {
     this.chat_id = requestData.userId
     this.chat_language = requestData.language
     this.chat_country = requestData.country
     this.format_version = 2
-    this.data = {}
-    this.data.action = event.action
+    this.action = event.action
   }
 }

package/src/event-models/index.ts

@@ -4,6 +4,7 @@ export { HtEventFallback } from './ht-event-fallback'
 export { HtEventFeedback } from './ht-event-feedback'
 export { HtEventFlow } from './ht-event-flow'
 export { HtEventHandoff } from './ht-event-handoff'
+export { HtEventHandoffOption } from './ht-event-handoff-option'
 export { HtEventIntent } from './ht-event-intent'
 export { HtEventIntentSmart } from './ht-event-intent-smart'
 export { HtEventKeyword } from './ht-event-keyword'