botium-core 1.12.5 → 1.12.6

package/dist/botium-es.js

@@ -36,7 +36,7 @@ import express from 'express';
 import bodyParser from 'body-parser';
 
 var name = "botium-core";
-var version$1 = "1.12.5";
+var version$1 = "1.12.6";
 var description = "The Selenium for Chatbots";
 var main = "index.js";
 var module = "dist/botium-es.js";
@@ -1820,6 +1820,14 @@ const flatString = str => {
   return str ? str.split('\n').map(s => s.trim()).join(' ') : '';
 };
 
+const _formatAppendArgs = args => {
+  return args ? ` ${args.map(a => lodash.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$5 = (lines, sender, context, eol, singleLineMode = false) => {
   if (!validateSender$1(sender)) throw new Error(`Failed to parse conversation. Section "${sender}" unknown.`);
   const convoStep = {
@@ -1861,7 +1869,7 @@ const linesToConvoStep$5 = (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,
@@ -1869,14 +1877,14 @@ const linesToConvoStep$5 = (lines, sender, context, eol, singleLineMode = false)
           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
@@ -2226,7 +2234,7 @@ const convoStepToLines$2 = step => {
 
   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) {
@@ -2238,18 +2246,18 @@ const convoStepToLines$2 = step => {
     }
 
     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 => {
@@ -2257,17 +2265,17 @@ const convoStepToLines$2 = step => {
         if (c.text) cardTexts = cardTexts.concat(lodash.isArray(c.text) ? c.text : [c.text]);
         if (c.subtext) cardTexts = cardTexts.concat(lodash.isArray(c.subtext) ? c.subtext : [c.subtext]);
         if (c.content) cardTexts = cardTexts.concat(lodash.isArray(c.content) ? c.content : [c.content]);
-        if (cardTexts.length > 0) lines.push('CARDS ' + cardTexts.map(c => flatString(c)).join('|'));
-        if (c.buttons && c.buttons.length > 0) lines.push('BUTTONS ' + c.buttons.filter(b => b.text).map(b => flatString(b.text)).join('|'));
+        if (cardTexts.length > 0) lines.push('CARDS' + _formatAppendArgs(cardTexts.map(c => flatString(c))));
+        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));
     });
   }
 
@@ -3393,7 +3401,7 @@ class Convo$6 {
         const transcriptStepErrs = transcript.steps.filter(s => s.err).map(s => s.err);
 
         if (transcriptStepErrs && transcriptStepErrs.length > 0) {
-          transcript.err = botiumErrorFromList$1([transcriptStepErrs, transcript.err].filter(e => e), {});
+          transcript.err = botiumErrorFromList$1([...transcriptStepErrs.filter(err => err !== transcript.err), transcript.err].filter(e => e), {});
         }
       }
     }