botium-core 1.12.4 → 1.13.0

package/src/scripting/CompilerCsv.js

@@ -47,6 +47,7 @@ module.exports = class CompilerCsv extends CompilerBase {
     if (scriptData.length === 0) {
       return []
     }
+    const legacyModeOn = !this._GetOptionalCapability(Capabilities.SCRIPTING_CSV_LEGACY_MODE_OFF, false)
 
     let delimiter = this._GetOptionalCapability(Capabilities.SCRIPTING_CSV_DELIMITER)
     if (!delimiter) {
@@ -71,7 +72,8 @@ module.exports = class CompilerCsv extends CompilerBase {
         delimiter,
         escape: this.caps[Capabilities.SCRIPTING_CSV_ESCAPE],
         quote: this.caps[Capabilities.SCRIPTING_CSV_QUOTE],
-        columns: false
+        columns: false,
+        relax_column_count: true
       })
     } catch (err) {
       throw new Error(`Invalid CSV: ${err.message || err}`)
@@ -79,123 +81,169 @@ module.exports = class CompilerCsv extends CompilerBase {
     if (rows.length === 0) {
       return []
     }
-    if (rows[0].length === 1) {
-      debug('Found 1-column CSV file, treating it as utterance file')
-      if (scriptType === Constants.SCRIPTING_TYPE_UTTERANCES) {
-        const result = [{ name: rows[0][0], utterances: rows.slice(1).map(r => r[0]) }]
-        this.context.AddUtterances(result)
-        return result
-      } else {
+    const columnCount = rows[0].length
+    debug(`Legacy mode ${legacyModeOn ? 'on' : 'off'} rows ${rows.length} columns ${columnCount}`)
+
+    if ((scriptType === Constants.SCRIPTING_TYPE_CONVO || scriptType === Constants.SCRIPTING_TYPE_PCONVO)) {
+      if (columnCount === 1 || (!legacyModeOn && columnCount > 3)) {
+        debug(`Invalid column count '${columnCount}' in convo mode`)
+        return []
+      }
+      let header = null
+      if (rows.length > 0 && this.caps[Capabilities.SCRIPTING_CSV_SKIP_HEADER]) {
+        header = rows[0]
+        rows = rows.slice(1)
+      }
+      if (rows.length === 0) {
+        debug('Datarows not found in convo mode')
         return []
       }
-    }
-
-    if (scriptType !== Constants.SCRIPTING_TYPE_CONVO && scriptType !== Constants.SCRIPTING_TYPE_PCONVO) {
-      return []
-    }
-    let header = null
-    if (rows.length > 0 && this.caps[Capabilities.SCRIPTING_CSV_SKIP_HEADER]) {
-      header = rows[0]
-      rows = rows.slice(1)
-    }
-    if (rows.length === 0) {
-      return []
-    }
-
-    const lineNumberBase = this.caps[Capabilities.SCRIPTING_CSV_SKIP_HEADER] ? 2 : 1
-    if (rows[0].length === 2) {
-      debug('Found 2-column CSV file, treating it as question/answer file')
 
-      let colQuestion = DEFAULT_QA_COLUMN_QUESTION
-      let colAnswer = DEFAULT_QA_COLUMN_ANSWER
+      const lineNumberBase = this.caps[Capabilities.SCRIPTING_CSV_SKIP_HEADER] ? 2 : 1
+      if (columnCount === 2) {
+        let colQuestion = DEFAULT_QA_COLUMN_QUESTION
+        let colAnswer = DEFAULT_QA_COLUMN_ANSWER
 
-      if (header) {
-        if (this.caps[Capabilities.SCRIPTING_CSV_QA_COLUMN_QUESTION] !== undefined) {
-          colQuestion = _findColIndex(header, this.caps[Capabilities.SCRIPTING_CSV_QA_COLUMN_QUESTION])
+        if (header) {
+          if (this.caps[Capabilities.SCRIPTING_CSV_QA_COLUMN_QUESTION] !== undefined) {
+            colQuestion = _findColIndex(header, this.caps[Capabilities.SCRIPTING_CSV_QA_COLUMN_QUESTION])
+          }
+          if (this.caps[Capabilities.SCRIPTING_CSV_QA_COLUMN_ANSWER] !== undefined) {
+            colAnswer = _findColIndex(header, this.caps[Capabilities.SCRIPTING_CSV_QA_COLUMN_ANSWER])
+          }
         }
-        if (this.caps[Capabilities.SCRIPTING_CSV_QA_COLUMN_ANSWER] !== undefined) {
-          colAnswer = _findColIndex(header, this.caps[Capabilities.SCRIPTING_CSV_QA_COLUMN_ANSWER])
+
+        const convos = rows.map((row, i) => new Convo(this.context, {
+          header: {
+            name: `L${i + lineNumberBase}`
+          },
+          conversation: [
+            Object.assign({},
+              linesToConvoStep(
+                [row[colQuestion]],
+                'me',
+                this.context,
+                undefined,
+                true
+              ), { stepTag: `L${i + lineNumberBase}-Question` }),
+            Object.assign({},
+              linesToConvoStep(
+                [row[colAnswer]],
+                'bot',
+                this.context,
+                undefined,
+                true
+              ), { stepTag: `L${i + lineNumberBase}-Answer` })
+          ]
+        }))
+        if (scriptType === Constants.SCRIPTING_TYPE_CONVO) {
+          this.context.AddConvos(convos)
+        } else if (scriptType === Constants.SCRIPTING_TYPE_PCONVO) {
+          this.context.AddPartialConvos(convos)
         }
+        debug(`Found 2-column CSV file, treating it as question/answer file, extracted ${convos.length} convos`)
+        return convos
       }
 
-      const convos = rows.map((row, i) => new Convo(this.context, {
-        header: {
-          name: `L${i + lineNumberBase}`
-        },
-        conversation: [
-          Object.assign({},
-            linesToConvoStep(
-              [row[colQuestion]],
-              'me',
-              this.context,
-              undefined,
-              true
-            ), { stepTag: `L${i + lineNumberBase}-Question` }),
-          Object.assign({},
-            linesToConvoStep(
-              [row[colAnswer]],
-              'bot',
-              this.context,
-              undefined,
-              true
-            ), { stepTag: `L${i + lineNumberBase}-Answer` })
-        ]
-      }))
-      if (scriptType === Constants.SCRIPTING_TYPE_CONVO) {
-        this.context.AddConvos(convos)
-      } else if (scriptType === Constants.SCRIPTING_TYPE_PCONVO) {
-        this.context.AddPartialConvos(convos)
-      }
-      return convos
-    }
+      if (columnCount >= 3) {
+        let colConversationId = DEFAULT_MULTIROW_COLUMN_CONVERSATION
+        let colSender = DEFAULT_MULTIROW_COLUMN_SENDER
+        let colText = DEFAULT_MULTIROW_COLUMN_TEXT
 
-    if (rows[0].length >= 3) {
-      debug('Found 3-column CSV file, treating it as multi-row conversation file')
+        if (header) {
+          if (this.caps[Capabilities.SCRIPTING_CSV_MULTIROW_COLUMN_CONVERSATION_ID] !== undefined) {
+            colConversationId = _findColIndex(header, this.caps[Capabilities.SCRIPTING_CSV_MULTIROW_COLUMN_CONVERSATION_ID])
+          }
+          if (this.caps[Capabilities.SCRIPTING_CSV_MULTIROW_COLUMN_SENDER] !== undefined) {
+            colSender = _findColIndex(header, this.caps[Capabilities.SCRIPTING_CSV_MULTIROW_COLUMN_SENDER])
+          }
+          if (this.caps[Capabilities.SCRIPTING_CSV_MULTIROW_COLUMN_TEXT] !== undefined) {
+            colText = _findColIndex(header, this.caps[Capabilities.SCRIPTING_CSV_MULTIROW_COLUMN_TEXT])
+          }
+        }
 
-      let colConversationId = DEFAULT_MULTIROW_COLUMN_CONVERSATION
-      let colSender = DEFAULT_MULTIROW_COLUMN_SENDER
-      let colText = DEFAULT_MULTIROW_COLUMN_TEXT
+        const conversationIds = _.uniq(rows.map(r => r[colConversationId]))
+        const convos = conversationIds.map(conversationId => {
+          const convoRows = rows.map((row, i) => {
+            if (row[colConversationId] === conversationId) {
+              return Object.assign({},
+                linesToConvoStep(
+                  [row[colText]],
+                  row[colSender],
+                  this.context,
+                  undefined,
+                  true
+                ), { stepTag: `L${i + lineNumberBase}` })
+            }
+            return null
+          }).filter(c => c)
+          return new Convo(this.context, {
+            header: {
+              name: conversationId
+            },
+            conversation: convoRows
+          })
+        })
+        if (scriptType === Constants.SCRIPTING_TYPE_CONVO) {
+          this.context.AddConvos(convos)
+        } else if (scriptType === Constants.SCRIPTING_TYPE_PCONVO) {
+          this.context.AddPartialConvos(convos)
+        }
+        debug(`Found 3-column CSV file, treating it as multi-row conversation file, extracted ${convos.length} convos`)
+        return convos
+      }
+    } else if (scriptType === Constants.SCRIPTING_TYPE_UTTERANCES) {
+      if (columnCount === 2 || columnCount === 3 || (legacyModeOn && columnCount > 4)) {
+        debug(`Invalid column count '${columnCount}' in utterances mode`)
+        return []
+      }
+      const result = []
+      const startRow = this._GetOptionalCapability(Capabilities.SCRIPTING_CSV_UTTERANCE_STARTROW, 2) - 1
+      const startRowHeader = this._GetOptionalCapability(Capabilities.SCRIPTING_CSV_UTTERANCE_STARTROW_HEADER)
+      const stopOnEmpty = this._GetOptionalCapability(Capabilities.SCRIPTING_CSV_UTTERANCE_STOP_ON_EMPTY)
+
+      for (let col = 0; col < columnCount; col++) {
+        const name = rows[0][col]
+        if (!name || name.trim().length === 0) {
+          debug(`Column ${col + 1} has no header, skipping`)
+          continue
+        }
 
-      if (header) {
-        if (this.caps[Capabilities.SCRIPTING_CSV_MULTIROW_COLUMN_CONVERSATION_ID] !== undefined) {
-          colConversationId = _findColIndex(header, this.caps[Capabilities.SCRIPTING_CSV_MULTIROW_COLUMN_CONVERSATION_ID])
+        const uttStruct = {
+          name,
+          utterances: []
+        }
+        let skip = !!startRowHeader
+        const getData = (row) => {
+          return rows[row][col] ? rows[row][col].trim() : false
         }
-        if (this.caps[Capabilities.SCRIPTING_CSV_MULTIROW_COLUMN_SENDER] !== undefined) {
-          colSender = _findColIndex(header, this.caps[Capabilities.SCRIPTING_CSV_MULTIROW_COLUMN_SENDER])
+        //
+        for (let row = startRow; row < rows.length && (skip || !stopOnEmpty || !!getData(row)); row++) { // eslint-disable-line no-unmodified-loop-condition
+          const data = getData(row)
+          if (!data) {
+            continue
+          }
+          if (!skip) {
+            uttStruct.utterances.push(data)
+          } else {
+            if (startRowHeader === rows[row][col]) {
+              skip = false
+            }
+          }
         }
-        if (this.caps[Capabilities.SCRIPTING_CSV_MULTIROW_COLUMN_TEXT] !== undefined) {
-          colText = _findColIndex(header, this.caps[Capabilities.SCRIPTING_CSV_MULTIROW_COLUMN_TEXT])
+        if (uttStruct.utterances.length === 0) {
+          // liveperson, skipping meta intents
+          debug(`Column ${col + 1} has no utterances, skipping`)
+          continue
         }
+        result.push(uttStruct)
       }
 
-      const conversationIds = _.uniq(rows.map(r => r[colConversationId]))
-      const convos = conversationIds.map(conversationId => {
-        const convoRows = rows.map((row, i) => {
-          if (row[colConversationId] === conversationId) {
-            return Object.assign({},
-              linesToConvoStep(
-                [row[colText]],
-                row[colSender],
-                this.context,
-                undefined,
-                true
-              ), { stepTag: `L${i + lineNumberBase}` })
-          }
-          return null
-        }).filter(c => c)
-        return new Convo(this.context, {
-          header: {
-            name: conversationId
-          },
-          conversation: convoRows
-        })
-      })
-      if (scriptType === Constants.SCRIPTING_TYPE_CONVO) {
-        this.context.AddConvos(convos)
-      } else if (scriptType === Constants.SCRIPTING_TYPE_PCONVO) {
-        this.context.AddPartialConvos(convos)
-      }
-      return convos
+      debug(`Multi-column utterance file, extracted ${result.length} utterances`)
+      this.context.AddUtterances(result)
+      return result
+    } else {
+      return []
     }
   }
 }

package/src/scripting/CompilerXlsx.js

@@ -339,7 +339,7 @@ module.exports = class CompilerXlsx extends CompilerBase {
               agg[varName] = varValues[varIndex][caseIndex] || null
               return agg
             }, {})
-            scriptResults.push({ header: { name: caseName }, values: values })
+            scriptResults.push({ header: { name: caseName }, values })
           }
         } else {
           const variableNames = []
@@ -370,7 +370,7 @@ module.exports = class CompilerXlsx extends CompilerBase {
               }
               rowindex += 1
 
-              scriptResults.push({ header: { name: caseName }, values: values })
+              scriptResults.push({ header: { name: caseName }, values })
             } else {
               break
             }

package/src/scripting/Convo.js

@@ -235,14 +235,14 @@ class Convo {
       await this.runConversation(container, scriptingMemory, transcript)
       await this._checkBotRepliesConsumed(container)
       try {
-        await this.scriptingEvents.onConvoEnd({ convo: this, convoStep: { stepTag: '#end' }, container, transcript, scriptingMemory: scriptingMemory })
+        await this.scriptingEvents.onConvoEnd({ convo: this, convoStep: { stepTag: '#end' }, container, transcript, scriptingMemory })
       } catch (err) {
         throw new TranscriptError(botiumErrorFromErr(`${this.header.name}: ${err.message}`, err), transcript)
       }
       if (transcript.err && container.caps[Capabilities.SCRIPTING_ENABLE_MULTIPLE_ASSERT_ERRORS]) {
         let assertConvoEndErr = null
         try {
-          await this.scriptingEvents.assertConvoEnd({ convo: this, convoStep: { stepTag: '#end' }, container, transcript, scriptingMemory: scriptingMemory })
+          await this.scriptingEvents.assertConvoEnd({ convo: this, convoStep: { stepTag: '#end' }, container, transcript, scriptingMemory })
         } catch (err) {
           assertConvoEndErr = botiumErrorFromErr(`${this.header.name}: ${err.message}`, err)
         }
@@ -257,7 +257,7 @@ class Convo {
         throw new TranscriptError(transcript.err, transcript)
       }
       try {
-        await this.scriptingEvents.assertConvoEnd({ convo: this, convoStep: { stepTag: '#end' }, container, transcript, scriptingMemory: scriptingMemory })
+        await this.scriptingEvents.assertConvoEnd({ convo: this, convoStep: { stepTag: '#end' }, container, transcript, scriptingMemory })
       } catch (err) {
         transcript.err = botiumErrorFromErr(`${this.header.name}: ${err.message}`, err)
         throw new TranscriptError(transcript.err, transcript)
@@ -535,7 +535,7 @@ class Convo {
       if (container.caps[Capabilities.SCRIPTING_ENABLE_SKIP_ASSERT_ERRORS]) {
         const transcriptStepErrs = transcript.steps.filter(s => s.err).map(s => s.err)
         if (transcriptStepErrs && transcriptStepErrs.length > 0) {
-          transcript.err = botiumErrorFromList([transcriptStepErrs, transcript.err].filter(e => e), {})
+          transcript.err = botiumErrorFromList([...transcriptStepErrs.filter(err => err !== transcript.err), transcript.err].filter(e => e), {})
         }
       }
     }

package/src/scripting/ScriptingProvider.js

@@ -20,7 +20,7 @@ const RetryHelper = require('../helpers/RetryHelper')
 const { getMatchFunction } = require('./MatchFunctions')
 const precompilers = require('./precompilers')
 
-const globPattern = '**/+(*.convo.txt|*.utterances.txt|*.pconvo.txt|*.scriptingmemory.txt|*.xlsx|*.xlsm|*.convo.csv|*.pconvo.csv|*.yaml|*.yml|*.json|*.md|*.markdown)'
+const globPattern = '**/+(*.convo.txt|*.utterances.txt|*.pconvo.txt|*.scriptingmemory.txt|*.xlsx|*.xlsm|*.convo.csv|*.pconvo.csv|*.utterances.csv|*.yaml|*.yml|*.json|*.md|*.markdown)'
 const skipPattern = /^skip[.\-_]/i
 
 const p = (retryHelper, fn) => {
@@ -522,6 +522,10 @@ module.exports = class ScriptingProvider {
         result = this.ReadScriptFromBuffer(scriptBuffer, Constants.SCRIPTING_FORMAT_CSV, Constants.SCRIPTING_TYPE_CONVO)
       } else if (filename.endsWith('.pconvo.csv')) {
         result = this.ReadScriptFromBuffer(scriptBuffer, Constants.SCRIPTING_FORMAT_CSV, Constants.SCRIPTING_TYPE_PCONVO)
+      } else if (filename.endsWith('.pconvo.csv')) {
+        result = this.ReadScriptFromBuffer(scriptBuffer, Constants.SCRIPTING_FORMAT_CSV, Constants.SCRIPTING_TYPE_PCONVO)
+      } else if (filename.endsWith('.utterance.csv')) {
+        result = this.ReadScriptFromBuffer(scriptBuffer, Constants.SCRIPTING_FORMAT_CSV, Constants.SCRIPTING_TYPE_UTTERANCES)
       } else if (filename.endsWith('.yaml') || filename.endsWith('.yml')) {
         result = this.ReadScriptFromBuffer(scriptBuffer, Constants.SCRIPTING_FORMAT_YAML, [Constants.SCRIPTING_TYPE_UTTERANCES, Constants.SCRIPTING_TYPE_PCONVO, Constants.SCRIPTING_TYPE_CONVO, Constants.SCRIPTING_TYPE_SCRIPTING_MEMORY])
       } else if (filename.endsWith('.json')) {
@@ -1192,7 +1196,7 @@ module.exports = class ScriptingProvider {
         const node = {
           sender: convoNode.sender,
           key: randomize('0', 20),
-          hash: hash,
+          hash,
           convoNodes: convoNodeValues,
           convos: [_.cloneDeep(convoNodeHeader)],
           childNodes: []

package/src/scripting/helper.js

@@ -77,6 +77,13 @@ const flatString = (str) => {
   return str ? str.split('\n').map(s => s.trim()).join(' ') : ''
 }
 
+const _formatAppendArgs = (args) => {
+  return args ? ` ${args.map(a => _.isString(a) ? a.replace(/\|/g, '\\|') : `${a}`).join('|')}` : ''
+}
+const _parseArgs = (str) => {
+  return (str && str.length > 0 && str.replace(/\\\|/g, '###ESCAPESPLIT###').split('|').map(s => s.replace(/###ESCAPESPLIT###/g, '|').trim())) || []
+}
+
 const linesToConvoStep = (lines, sender, context, eol, singleLineMode = false) => {
   if (!validateSender(sender)) throw new Error(`Failed to parse conversation. Section "${sender}" unknown.`)
 
@@ -106,14 +113,14 @@ const linesToConvoStep = (lines, sender, context, eol, singleLineMode = false) =
       }
       const name = logicLine.split(' ')[0]
       if (sender !== 'me' && context.IsAsserterValid(name)) {
-        const args = (logicLine.length > name.length ? logicLine.substr(name.length + 1).split('|').map(a => a.trim()) : [])
+        const args = (logicLine.length > name.length ? _parseArgs(logicLine.substr(name.length + 1)) : [])
         convoStep.asserters.push({ name, args, not, optional })
       } else if (sender === 'me' && context.IsUserInputValid(name)) {
-        const args = (logicLine.length > name.length ? logicLine.substr(name.length + 1).split('|').map(a => a.trim()) : [])
+        const args = (logicLine.length > name.length ? _parseArgs(logicLine.substr(name.length + 1)) : [])
         convoStep.userInputs.push({ name, args })
         textLinesAccepted = false
       } else if (context.IsLogicHookValid(name)) {
-        const args = (logicLine.length > name.length ? logicLine.substr(name.length + 1).split('|').map(a => a.trim()) : [])
+        const args = (logicLine.length > name.length ? _parseArgs(logicLine.substr(name.length + 1)) : [])
         convoStep.logicHooks.push({ name, args })
         textLinesAccepted = false
       } else {
@@ -422,7 +429,7 @@ const convoStepToLines = (step) => {
   const lines = []
   if (step.sender === 'me') {
     step.forms && step.forms.filter(form => form.value).forEach((form) => {
-      lines.push(`FORM ${form.name}|${form.value}`)
+      lines.push(`FORM${_formatAppendArgs([form.name, form.value])}`)
     })
     if (step.buttons && step.buttons.length > 0) {
       lines.push('BUTTON ' + _decompileButton(step.buttons[0]))
@@ -432,34 +439,34 @@ const convoStepToLines = (step) => {
       lines.push(step.messageText)
     }
     step.userInputs && step.userInputs.forEach((userInput) => {
-      lines.push(userInput.name + (userInput.args ? ' ' + userInput.args.join('|') : ''))
+      lines.push(userInput.name + _formatAppendArgs(userInput.args))
     })
     step.logicHooks && step.logicHooks.forEach((logicHook) => {
-      lines.push(logicHook.name + (logicHook.args ? ' ' + logicHook.args.join('|') : ''))
+      lines.push(logicHook.name + _formatAppendArgs(logicHook.args))
     })
   } else {
     if (step.messageText) {
       lines.push((step.optional ? '?' : '') + (step.not ? '!' : '') + step.messageText)
     }
-    if (step.buttons && step.buttons.length > 0) lines.push('BUTTONS ' + step.buttons.filter(b => b.text).map(b => flatString(b.text)).join('|'))
-    if (step.media && step.media.length > 0) lines.push('MEDIA ' + step.media.filter(m => !m.buffer && m.mediaUri).map(m => m.mediaUri).join('|'))
+    if (step.buttons && step.buttons.length > 0) lines.push('BUTTONS' + _formatAppendArgs(step.buttons.filter(b => b.text).map(b => flatString(b.text))))
+    if (step.media && step.media.length > 0) lines.push('MEDIA' + _formatAppendArgs(step.media.filter(m => !m.buffer && m.mediaUri).map(m => m.mediaUri)))
     if (step.cards && step.cards.length > 0) {
       step.cards.forEach(c => {
         let cardTexts = []
         if (c.text) cardTexts = cardTexts.concat(_.isArray(c.text) ? c.text : [c.text])
         if (c.subtext) cardTexts = cardTexts.concat(_.isArray(c.subtext) ? c.subtext : [c.subtext])
         if (c.content) cardTexts = cardTexts.concat(_.isArray(c.content) ? c.content : [c.content])
-        if (cardTexts.length > 0) lines.push('CARDS ' + cardTexts.map(c => flatString(c)).join('|'))
+        if (cardTexts.length > 0) lines.push('CARDS' + _formatAppendArgs(cardTexts.map(c => flatString(c))))
 
-        if (c.buttons && c.buttons.length > 0) lines.push('BUTTONS ' + c.buttons.filter(b => b.text).map(b => flatString(b.text)).join('|'))
+        if (c.buttons && c.buttons.length > 0) lines.push('BUTTONS' + _formatAppendArgs(c.buttons.filter(b => b.text).map(b => flatString(b.text))))
         if (c.image && !c.image.buffer && c.image.mediaUri) lines.push('MEDIA ' + c.image.mediaUri)
       })
     }
     step.asserters && step.asserters.forEach((asserter) => {
-      lines.push((asserter.optional ? '?' : '') + (asserter.not ? '!' : '') + asserter.name + (asserter.args ? ' ' + asserter.args.join('|') : ''))
+      lines.push((asserter.optional ? '?' : '') + (asserter.not ? '!' : '') + asserter.name + _formatAppendArgs(asserter.args))
     })
     step.logicHooks && step.logicHooks.forEach((logicHook) => {
-      lines.push(logicHook.name + (logicHook.args ? ' ' + logicHook.args.join('|') : ''))
+      lines.push(logicHook.name + _formatAppendArgs(logicHook.args))
     })
   }
   return lines.map(l => l.trim())
@@ -494,7 +501,7 @@ const linesToScriptingMemories = (lines, columnMode = null) => {
         agg[varName] = varValues[varIndex][caseIndex] || null
         return agg
       }, {})
-      const scriptingMemory = { header: { name: caseName }, values: values }
+      const scriptingMemory = { header: { name: caseName }, values }
       scriptingMemories.push(scriptingMemory)
     }
   } else {

package/src/scripting/logichook/asserter/BaseCountAsserter.js

@@ -28,7 +28,7 @@ module.exports = class BaseCountAsserter {
         args
       },
       cause: {
-        not: not,
+        not,
         expected: check,
         actual: count
       }

package/src/scripting/logichook/asserter/ButtonsAsserter.js

@@ -1,5 +1,7 @@
+const { SCRIPTING_NORMALIZE_TEXT } = require('../../../Capabilities')
 const { BotiumError } = require('../../BotiumError')
 const { buttonsFromMsg } = require('../helpers')
+const { normalizeText } = require('../../helper')
 
 module.exports = class ButtonsAsserter {
   constructor (context, caps = {}) {
@@ -9,14 +11,14 @@ module.exports = class ButtonsAsserter {
   }
 
   _evalButtons (args, botMsg) {
-    const allButtons = buttonsFromMsg(botMsg, true).map(b => b.text)
+    const allButtons = buttonsFromMsg(botMsg, true).map(b => b.text).filter(b => b).map(b => normalizeText(b, !!this.caps[SCRIPTING_NORMALIZE_TEXT]))
     if (!args || args.length === 0) {
       return { allButtons, buttonsNotFound: [], buttonsFound: allButtons }
     }
     const buttonsNotFound = []
     const buttonsFound = []
     for (let i = 0; i < (args || []).length; i++) {
-      if (allButtons.findIndex(b => this.context.Match(b, args[i])) < 0) {
+      if (allButtons.findIndex(b => this.context.Match(b, normalizeText(args[i], !!this.caps[SCRIPTING_NORMALIZE_TEXT]))) < 0) {
         buttonsNotFound.push(args[i])
       } else {
         buttonsFound.push(args[i])

package/src/scripting/logichook/asserter/CardsAsserter.js

@@ -1,5 +1,7 @@
+const { SCRIPTING_NORMALIZE_TEXT } = require('../../../Capabilities')
 const { BotiumError } = require('../../BotiumError')
 const { cardsFromMsg } = require('../helpers')
+const { normalizeText } = require('../../helper')
 
 module.exports = class CardsAsserter {
   constructor (context, caps = {}) {
@@ -9,14 +11,14 @@ module.exports = class CardsAsserter {
   }
 
   _evalCards (args, botMsg) {
-    const allCards = cardsFromMsg(botMsg, true).reduce((acc, mc) => acc.concat([mc.text, mc.subtext, mc.content].filter(t => t)), [])
+    const allCards = cardsFromMsg(botMsg, true).reduce((acc, mc) => acc.concat([mc.text, mc.subtext, mc.content].filter(t => t).map(t => normalizeText(t, !!this.caps[SCRIPTING_NORMALIZE_TEXT]))), [])
     if (!args || args.length === 0) {
       return { allCards, cardsNotFound: [], cardsFound: allCards }
     }
     const cardsNotFound = []
     const cardsFound = []
     for (let i = 0; i < (args || []).length; i++) {
-      if (allCards.findIndex(c => this.context.Match(c, args[i])) < 0) {
+      if (allCards.findIndex(c => this.context.Match(c, normalizeText(args[i], !!this.caps[SCRIPTING_NORMALIZE_TEXT]))) < 0) {
         cardsNotFound.push(args[i])
       } else {
         cardsFound.push(args[i])