botium-core 1.13.3 → 1.13.4

package/dist/botium-es.js

@@ -37,7 +37,7 @@ import express from 'express';
 import bodyParser from 'body-parser';
 
 var name = "botium-core";
-var version$1 = "1.13.3";
+var version$1 = "1.13.4";
 var description = "The Selenium for Chatbots";
 var main = "index.js";
 var module = "dist/botium-es.js";
@@ -307,6 +307,8 @@ var Capabilities = {
   SCRIPTING_UTTEXPANSION_MODE: 'SCRIPTING_UTTEXPANSION_MODE',
   SCRIPTING_UTTEXPANSION_RANDOM_COUNT: 'SCRIPTING_UTTEXPANSION_RANDOM_COUNT',
   SCRIPTING_UTTEXPANSION_INCOMPREHENSION: 'SCRIPTING_UTTEXPANSION_INCOMPREHENSION',
+  SCRIPTING_UTTEXPANSION_INCOMPREHENSIONINTENTS: 'SCRIPTING_UTTEXPANSION_INCOMPREHENSIONINTENTS',
+  SCRIPTING_UTTEXPANSION_INCOMPREHENSIONUTTS: 'SCRIPTING_UTTEXPANSION_INCOMPREHENSIONUTTS',
   SCRIPTING_UTTEXPANSION_USENAMEASINTENT: 'SCRIPTING_UTTEXPANSION_USENAMEASINTENT',
   // justLineTag, utterance
   SCRIPTING_UTTEXPANSION_NAMING_MODE: 'SCRIPTING_UTTEXPANSION_NAMING_MODE',
@@ -460,6 +462,8 @@ Capabilities.SCRIPTING_MATCHING_MODE_ARGS;
 Capabilities.SCRIPTING_UTTEXPANSION_MODE;
 Capabilities.SCRIPTING_UTTEXPANSION_RANDOM_COUNT;
 Capabilities.SCRIPTING_UTTEXPANSION_INCOMPREHENSION;
+Capabilities.SCRIPTING_UTTEXPANSION_INCOMPREHENSIONINTENTS;
+Capabilities.SCRIPTING_UTTEXPANSION_INCOMPREHENSIONUTTS;
 Capabilities.SCRIPTING_UTTEXPANSION_USENAMEASINTENT;
 Capabilities.SCRIPTING_UTTEXPANSION_NAMING_MODE;
 Capabilities.SCRIPTING_UTTEXPANSION_NAMING_UTTERANCE_MAX;
@@ -544,6 +548,10 @@ var Defaults$1 = {
     [Capabilities.SCRIPTING_UTTEXPANSION_RANDOM_COUNT]: 1,
     [Capabilities.SCRIPTING_UTTEXPANSION_NAMING_MODE]: 'justLineTag',
     [Capabilities.SCRIPTING_UTTEXPANSION_NAMING_UTTERANCE_MAX]: '16',
+    [Capabilities.SCRIPTING_UTTEXPANSION_INCOMPREHENSION]: null,
+    [Capabilities.SCRIPTING_UTTEXPANSION_INCOMPREHENSIONINTENTS]: [],
+    [Capabilities.SCRIPTING_UTTEXPANSION_INCOMPREHENSIONUTTS]: [],
+    [Capabilities.SCRIPTING_UTTEXPANSION_USENAMEASINTENT]: false,
     [Capabilities.SCRIPTING_MEMORYEXPANSION_KEEP_ORIG]: false,
     [Capabilities.SCRIPTING_ENABLE_SKIP_ASSERT_ERRORS]: false,
     [Capabilities.SCRIPTING_FORCE_BOT_CONSUMED]: false,
@@ -1681,6 +1689,7 @@ class BotiumMockAsserter$1 {
   constructor(fromJson = {}) {
     this.name = fromJson.name;
     this.args = lodash.cloneDeep(fromJson.args);
+    this.not = fromJson.not;
   }
 
 }
@@ -6888,6 +6897,8 @@ var ScriptingProvider_1 = class ScriptingProvider {
 
   ExpandUtterancesToConvos({
     useNameAsIntent,
+    incomprehensionIntents,
+    incomprehensionUtts,
     incomprehensionUtt
   } = {}) {
     const expandedConvos = [];
@@ -6896,26 +6907,81 @@ var ScriptingProvider_1 = class ScriptingProvider {
       useNameAsIntent = !!this.caps[Capabilities.SCRIPTING_UTTEXPANSION_USENAMEASINTENT];
     }
 
+    if (lodash.isUndefined(incomprehensionIntents)) {
+      incomprehensionIntents = this.caps[Capabilities.SCRIPTING_UTTEXPANSION_INCOMPREHENSIONINTENTS];
+    }
+
+    if (lodash.isUndefined(incomprehensionUtts)) {
+      incomprehensionUtts = this.caps[Capabilities.SCRIPTING_UTTEXPANSION_INCOMPREHENSIONUTTS];
+    }
+
     if (lodash.isUndefined(incomprehensionUtt)) {
       incomprehensionUtt = this.caps[Capabilities.SCRIPTING_UTTEXPANSION_INCOMPREHENSION];
     }
 
-    if (useNameAsIntent && incomprehensionUtt) {
-      throw new Error('ExpandUtterancesToConvos - SCRIPTING_UTTEXPANSION_USENAMEASINTENT and SCRIPTING_UTTEXPANSION_INCOMPREHENSION are incompatible');
+    if (incomprehensionUtt && (!incomprehensionUtts || incomprehensionUtts.length === 0) && !this.utterances[incomprehensionUtt]) {
+      throw new Error(`ExpandUtterancesToConvos - incomprehension utterance '${incomprehensionUtt}' undefined (and no user examples given)`);
     }
 
-    if (incomprehensionUtt && !this.utterances[incomprehensionUtt]) {
-      throw new Error(`ExpandUtterancesToConvos - incomprehension utterance '${incomprehensionUtt}' undefined`);
+    if (incomprehensionUtts && incomprehensionUtts.length > 0) {
+      if (!incomprehensionUtt) {
+        incomprehensionUtt = 'UTT_INCOMPREHENSION';
+      }
+
+      if (this.utterances[incomprehensionUtt]) {
+        this.utterances[incomprehensionUtt].utterances.push(...incomprehensionUtts);
+      } else {
+        this.utterances[incomprehensionUtt] = {
+          name: incomprehensionUtt,
+          utterances: [...incomprehensionUtts]
+        };
+      }
     }
 
     if (useNameAsIntent) {
       debug$9('ExpandUtterancesToConvos - Using utterance name as NLU intent');
-    } else if (incomprehensionUtt) {
-      debug$9(`ExpandUtterancesToConvos - Using incomprehension utterance expansion mode: ${incomprehensionUtt}`);
+    }
+
+    if (incomprehensionIntents && incomprehensionIntents.length > 0) {
+      debug$9(`ExpandUtterancesToConvos - Using ${incomprehensionIntents.length} incomprehension NLU intent(s)`);
+    }
+
+    if (incomprehensionUtt) {
+      debug$9(`ExpandUtterancesToConvos - Using incomprehension utterance expansion mode: ${incomprehensionUtt}, ${this.utterances[incomprehensionUtt].utterances.length} user example(s)`);
     }
 
     lodash.keys(this.utterances).filter(u => u !== incomprehensionUtt).forEach(uttName => {
       const utt = this.utterances[uttName];
+      const responseStep = {
+        sender: 'bot',
+        messageText: '',
+        asserters: [],
+        stepTag: 'Step 2 - check bot response',
+        not: false
+      };
+
+      if (useNameAsIntent) {
+        responseStep.asserters.push({
+          name: 'INTENT',
+          args: [utt.name]
+        });
+      }
+
+      if (incomprehensionIntents && incomprehensionIntents.length > 0) {
+        incomprehensionIntents.forEach(ii => {
+          responseStep.asserters.push({
+            name: 'INTENT',
+            args: [ii],
+            not: true
+          });
+        });
+      }
+
+      if (incomprehensionUtt) {
+        responseStep.messageText = incomprehensionUtt;
+        responseStep.not = true;
+      }
+
       expandedConvos.push(new Convo(this._buildScriptContext(), {
         header: {
           name: utt.name,
@@ -6928,25 +6994,7 @@ var ScriptingProvider_1 = class ScriptingProvider {
           }],
           messageText: utt.name,
           stepTag: 'Step 1 - tell utterance'
-        }, useNameAsIntent ? {
-          sender: 'bot',
-          asserters: [{
-            name: 'INTENT',
-            args: [utt.name]
-          }],
-          stepTag: 'Step 2 - check intent',
-          not: false
-        } : incomprehensionUtt ? {
-          sender: 'bot',
-          messageText: incomprehensionUtt,
-          stepTag: 'Step 2 - check incomprehension',
-          not: true
-        } : {
-          sender: 'bot',
-          messageText: '',
-          stepTag: 'Step 2 - check bot response',
-          not: false
-        }],
+        }, responseStep],
         sourceTag: Object.assign({}, utt.sourceTag, {
           origUttName: utt.name
         })