botium-core 1.14.4 → 1.14.6

package/dist/botium-cjs.js

@@ -77,7 +77,7 @@ var express__default = /*#__PURE__*/_interopDefaultLegacy(express);
 var bodyParser__default = /*#__PURE__*/_interopDefaultLegacy(bodyParser);
 
 var name = "botium-core";
-var version$1 = "1.14.4";
+var version$1 = "1.14.6";
 var description = "The Selenium for Chatbots";
 var main = "index.js";
 var module$1 = "dist/botium-es.js";
@@ -95,7 +95,7 @@ var scripts = {
 	link: "npm link botium-connector-dialogflow botium-connector-webdriverio botium-connector-directline3 botium-connector-watson botium-connector-alexa-smapi botium-connector-echo",
 	test: "cross-env NODE_PATH=\"./test/plugins/plugindir/fromfolder:./test/plugins/plugindir/fromfile:./test/security/resources\" mocha \"./test/**/*.spec.js\"",
 	"coverage:report": "nyc report --reporter=lcov npm test",
-	"update-dependencies": "npm-check-updates --reject globby,rollup -u --timeout 120000"
+	"update-dependencies": "npm-check-updates --reject chai,globby,rollup -u --timeout 120000"
 };
 var repository = {
 	type: "git",
@@ -108,7 +108,7 @@ var bugs = {
 };
 var homepage = "https://www.botium.ai";
 var dependencies = {
-	"@babel/runtime": "^7.23.5",
+	"@babel/runtime": "^7.23.9",
 	async: "^3.2.5",
 	"body-parser": "^1.20.2",
 	boolean: "^3.2.0",
@@ -125,8 +125,8 @@ var dependencies = {
 	"markdown-it": "^14.0.0",
 	"mime-types": "^2.1.35",
 	mkdirp: "^3.0.1",
-	moment: "^2.29.4",
-	"moment-timezone": "^0.5.43",
+	moment: "^2.30.1",
+	"moment-timezone": "^0.5.45",
 	mustache: "^4.2.0",
 	"promise-retry": "^2.0.1",
 	"promise.allsettled": "^1.0.7",
@@ -135,8 +135,8 @@ var dependencies = {
 	rimraf: "^5.0.5",
 	"sanitize-filename": "^1.6.3",
 	slugify: "^1.6.6",
-	"socket.io": "^4.7.2",
-	"socket.io-client": "^4.7.2",
+	"socket.io": "^4.7.4",
+	"socket.io-client": "^4.7.4",
 	"socketio-auth": "^0.1.1",
 	"swagger-jsdoc": "^6.2.8",
 	"swagger-ui-express": "^5.0.0",
@@ -148,23 +148,23 @@ var dependencies = {
 	yaml: "^2.3.4"
 };
 var devDependencies = {
-	"@babel/core": "^7.23.5",
-	"@babel/node": "^7.22.19",
-	"@babel/plugin-transform-runtime": "^7.23.4",
-	"@babel/preset-env": "^7.23.5",
-	chai: "^4.3.10",
+	"@babel/core": "^7.23.9",
+	"@babel/node": "^7.23.9",
+	"@babel/plugin-transform-runtime": "^7.23.9",
+	"@babel/preset-env": "^7.23.9",
+	chai: "4.3.10",
 	"chai-as-promised": "^7.1.1",
 	"cross-env": "^7.0.3",
-	eslint: "^8.55.0",
+	eslint: "^8.56.0",
 	"eslint-config-standard": "^17.1.0",
-	"eslint-plugin-import": "^2.29.0",
+	"eslint-plugin-import": "^2.29.1",
 	"eslint-plugin-mocha": "^10.2.0",
-	"eslint-plugin-n": "^16.4.0",
+	"eslint-plugin-n": "^16.6.2",
 	"eslint-plugin-promise": "^6.1.1",
 	"eslint-plugin-standard": "^4.1.0",
-	mocha: "^10.2.0",
-	nock: "^13.4.0",
-	"npm-check-updates": "^16.14.11",
+	mocha: "^10.3.0",
+	nock: "^13.5.1",
+	"npm-check-updates": "^16.14.15",
 	nyc: "^15.1.0",
 	rollup: "2.79.1",
 	"rollup-plugin-babel": "^4.4.0",
@@ -594,7 +594,6 @@ var Defaults$1 = {
     [Capabilities.SIMPLEREST_INBOUND_UPDATE_CONTEXT]: true,
     [Capabilities.SIMPLEREST_CONTEXT_MERGE_OR_REPLACE]: 'MERGE',
     [Capabilities.SIMPLEREST_COOKIE_REPLICATION]: true,
-    [Capabilities.SCRIPTING_TXT_EOL]: '\n',
     [Capabilities.SCRIPTING_XLSX_EOL_WRITE]: '\r\n',
     [Capabilities.SCRIPTING_XLSX_HASHEADERS]: true,
     [Capabilities.SCRIPTING_CSV_SKIP_HEADER]: true,
@@ -1647,7 +1646,7 @@ const _formatAppendArgs = args => {
 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) => {
+const linesToConvoStep$5 = (lines, sender, context, eol = '\n', singleLineMode = false) => {
   if (!validateSender$1(sender)) throw new Error(`Failed to parse conversation. Section "${sender}" unknown.`);
   const convoStep = {
     asserters: [],
@@ -1821,7 +1820,7 @@ const linesToConvoStep$5 = (lines, sender, context, eol, singleLineMode = false)
         if (eol === null) {
           throw new Error('eol cant be null');
         }
-        convoStep.messageText = textLines.join(eol).replace(WHITE_SPACES_EXCEPT_SPACE_CHAR_AT_THE_END, '');
+        convoStep.messageText = trimExceptSpaceEnd$1(textLines.join(eol));
       }
     }
   } else {
@@ -1842,6 +1841,9 @@ const linesToConvoStep$5 = (lines, sender, context, eol, singleLineMode = false)
   }
   return convoStep;
 };
+const trimExceptSpaceEnd$1 = string => {
+  return string?.replace(WHITE_SPACES_EXCEPT_SPACE_CHAR_AT_THE_END, '');
+};
 const convoStepToObject$1 = step => {
   const result = [];
   if (step.sender === 'me') {
@@ -2171,7 +2173,8 @@ var helper = {
   validateConvo: validateConvo$2,
   linesToScriptingMemories: linesToScriptingMemories$2,
   calculateWer: calculateWer$2,
-  toPercent: toPercent$1
+  toPercent: toPercent$1,
+  trimExceptSpaceEnd: trimExceptSpaceEnd$1
 };
 
 const BotiumError$4 = class BotiumError extends Error {
@@ -4867,21 +4870,22 @@ const {
   convoStepToLines,
   validateConvo,
   validSenders: validSenders$2,
-  linesToScriptingMemories: linesToScriptingMemories$1
+  linesToScriptingMemories: linesToScriptingMemories$1,
+  trimExceptSpaceEnd
 } = helper;
 var CompilerTxt_1 = class CompilerTxt extends CompilerBase_1 {
   constructor(context, caps = {}) {
     super(context, caps);
-    this.eol = caps[Capabilities.SCRIPTING_TXT_EOL];
+    this.eolRead = caps[Capabilities.SCRIPTING_TXT_EOL] || /\r\n|\r|\n/;
+    this.eolWrite = caps[Capabilities.SCRIPTING_TXT_EOL] && !lodash__default["default"].isRegExp(caps[Capabilities.SCRIPTING_TXT_EOL]) ? caps[Capabilities.SCRIPTING_TXT_EOL] : '\n';
   }
   Validate() {
     super.Validate();
-    this._AssertCapabilityExists(Capabilities.SCRIPTING_TXT_EOL);
   }
   GetHeaders(scriptBuffer) {
     let scriptData = scriptBuffer;
     if (Buffer.isBuffer(scriptBuffer)) scriptData = scriptData.toString();
-    const lines = scriptData.split(this.eol);
+    const lines = scriptData.split(this.eolRead);
     const header = {};
     if (lines && !lines[0].startsWith('#')) {
       header.name = lines[0];
@@ -4891,7 +4895,7 @@ var CompilerTxt_1 = class CompilerTxt extends CompilerBase_1 {
   Compile(scriptBuffer, scriptType = Constants.SCRIPTING_TYPE_CONVO) {
     let scriptData = scriptBuffer;
     if (Buffer.isBuffer(scriptBuffer)) scriptData = scriptData.toString();
-    const lines = scriptData.split(this.eol);
+    const lines = scriptData.split(this.eolRead);
     if (scriptType === Constants.SCRIPTING_TYPE_CONVO) {
       return this._compileConvo(lines, false);
     } else if (scriptType === Constants.SCRIPTING_TYPE_PCONVO) {
@@ -4916,7 +4920,7 @@ var CompilerTxt_1 = class CompilerTxt extends CompilerBase_1 {
     let convoStepLineIndex = null;
     const parseMsg = lines => {
       lines = lines || [];
-      return linesToConvoStep$3(lines, convoStepSender, this.context, this.eol);
+      return linesToConvoStep$3(lines, convoStepSender, this.context);
     };
     const pushPrev = () => {
       if (convoStepSender && currentLines) {
@@ -4930,7 +4934,7 @@ var CompilerTxt_1 = class CompilerTxt extends CompilerBase_1 {
       } else if (!convoStepSender && currentLines) {
         convo.header.name = currentLines[0];
         if (currentLines.length > 1) {
-          convo.header.description = currentLines.slice(1).join(this.eol);
+          convo.header.description = currentLines.slice(1).join(this.eolWrite);
         }
       }
     };
@@ -4967,8 +4971,8 @@ var CompilerTxt_1 = class CompilerTxt extends CompilerBase_1 {
   _compileUtterances(lines) {
     if (lines && lines.length > 0) {
       const result = [new Utterance_1({
-        name: lines[0],
-        utterances: lines.length > 1 ? lines.slice(1) : []
+        name: lines[0].trim(),
+        utterances: lines.length > 1 ? lines.slice(1).map(line => trimExceptSpaceEnd(line)) : []
       })];
       this.context.AddUtterances(result);
       return result;
@@ -4994,20 +4998,20 @@ var CompilerTxt_1 = class CompilerTxt extends CompilerBase_1 {
     }
     let script = '';
     if (convo.header.name) {
-      script += convo.header.name + this.eol;
+      script += convo.header.name + this.eolWrite;
     }
     if (convo.header.description) {
-      script += convo.header.description + this.eol;
+      script += convo.header.description + this.eolWrite;
     }
     convo.conversation.forEach(step => {
-      script += this.eol;
+      script += this.eolWrite;
       script += '#' + step.sender;
       if (step.channel && step.channel !== 'default') {
         script += ' ' + step.channel;
       }
-      script += this.eol;
+      script += this.eolWrite;
       const stepLines = convoStepToLines(step);
-      if (stepLines && stepLines.length > 0) script += stepLines.join(this.eol) + this.eol;
+      if (stepLines && stepLines.length > 0) script += stepLines.join(this.eolWrite) + this.eolWrite;
     });
     return script;
   }
@@ -5239,11 +5243,9 @@ const {
 var CompilerObjectBase_1 = class CompilerObjectBase extends CompilerBase_1 {
   constructor(context, caps = {}) {
     super(context, caps);
-    this.eol = caps[Capabilities.SCRIPTING_TXT_EOL];
   }
   Validate() {
     super.Validate();
-    this._AssertCapabilityExists(Capabilities.SCRIPTING_TXT_EOL);
   }
   GetHeaders(scriptBuffer) {
     debug$b('GetHeaders is not implemented!');
@@ -5284,7 +5286,7 @@ var CompilerObjectBase_1 = class CompilerObjectBase extends CompilerBase_1 {
         conversation.push(Object.assign({
           sender: convoStepSender,
           stepTag: 'Line ' + lineTag
-        }, linesToConvoStep$1(convoStepObject, convoStepSender, this.context, this.eol)));
+        }, linesToConvoStep$1(convoStepObject, convoStepSender, this.context)));
       }
       const convo = {
         header: {
@@ -5386,11 +5388,9 @@ const {
 var CompilerMarkdown_1 = class CompilerMarkdown extends CompilerBase_1 {
   constructor(context, caps = {}) {
     super(context, caps);
-    this.eol = caps[Capabilities.SCRIPTING_TXT_EOL];
   }
   Validate() {
     super.Validate();
-    this._AssertCapabilityExists(Capabilities.SCRIPTING_TXT_EOL);
   }
   Compile(scriptBuffer, scriptType = Constants.SCRIPTING_TYPE_CONVO) {
     if (Buffer.isBuffer(scriptBuffer)) scriptBuffer = scriptBuffer.toString();
@@ -5452,7 +5452,7 @@ var CompilerMarkdown_1 = class CompilerMarkdown extends CompilerBase_1 {
               conversation.push(Object.assign({
                 sender,
                 stepTag: 'Line ' + (step.map[0] + 1)
-              }, linesToConvoStep(step.children.map(child => child.content + (child.children && child.children.length > 0 ? ' ' + child.children.map(child => child.content).join('|') : '')), sender, this.context, this.eol)));
+              }, linesToConvoStep(step.children.map(child => child.content + (child.children && child.children.length > 0 ? ' ' + child.children.map(child => child.content).join('|') : '')), sender, this.context)));
             } else {
               debug$a(`Expected sender ${validSenders.map(s => `'${s}'`).join(' or ')} but found ${sender}`);
             }
@@ -6939,18 +6939,19 @@ var ScriptingProvider_1 = class ScriptingProvider {
     }
     if (utterances) {
       lodash__default["default"].forEach(utterances, utt => {
-        const eu = this.utterances[utt.name];
+        const uttName = utt.name?.trim();
+        const eu = this.utterances[uttName];
         if (eu) {
           eu.utterances = lodash__default["default"].uniq(lodash__default["default"].concat(eu.utterances, utt.utterances));
         } else {
-          this.utterances[utt.name] = utt;
+          this.utterances[uttName] = utt;
         }
         const {
           ambiguous,
           expected
-        } = findAmbiguous(this.utterances[utt.name].utterances);
+        } = findAmbiguous(this.utterances[uttName].utterances);
         if (ambiguous && ambiguous.length > 0) {
-          debug$9(`Ambigous utterance "${utt.name}", expecting exact ${expected.length ? '"' + expected.join(', ') + '"' : '<none>'} scripting memory variables in following user examples: ${ambiguous.map(d => `"${d}"`).join(', ')}`);
+          debug$9(`Ambigous utterance "${uttName}", expecting exact ${expected.length ? '"' + expected.join(', ') + '"' : '<none>'} scripting memory variables in following user examples: ${ambiguous.map(d => `"${d}"`).join(', ')}`);
         }
       });
     }