wingbot 3.40.1 → 3.41.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.40.1",
+  "version": "3.41.0",
   "description": "Enterprise Messaging Bot Conversation Engine",
   "main": "index.js",
   "scripts": {

package/plugins/ai.wingbot.slotsContinue/plugin.js

@@ -1,3 +1,5 @@
+
+const { compileWithState } = require('../../src/utils');
 const { StepState, getNextStep } = require('../../src/utils/slots');
 
 /** @typedef {import('../../src/Router').Resolver} Resolver */
@@ -7,9 +9,13 @@ const { StepState, getNextStep } = require('../../src/utils/slots');
 /** @typedef {import('../../src/utils/slots').SlotsRequest} SlotsRequest */
 
 /**
+ * @param {object} params
+ * @param {string} [params.skip]
  * @returns {SlotsResolver}
  */
-function slotContinue () {
+function slotsContinue ({
+    skip
+}) {
 
     /**
      * @param {SlotsRequest} req
@@ -17,7 +23,7 @@ function slotContinue () {
      * @param {Function} postBack
      * @returns {Promise}
      */
-    async function slotContinuePlugin (req, res, postBack) {
+    async function slotsContinuePlugin (req, res, postBack) {
         const state = { ...req.state, ...res.newState };
 
         const { _slotStep: step } = state;
@@ -28,16 +34,27 @@ function slotContinue () {
             res.text(msg);
             throw new Error(msg);
         }
-        slotState = slotState.map((s) => (s.e === step.entity
-            ? { ...s, s: StepState.FILLED }
-            : s));
+
+        const skipEntities = compileWithState(req, res, skip)
+            .split(',')
+            .map((e) => e.trim());
+
+        slotState = slotState.map((s) => {
+            if (skipEntities.includes(s.e)) {
+                return { ...s, s: StepState.INITIALIZED }
+            }
+
+            return s.e === step.entity
+                ? { ...s, s: StepState.FILLED }
+                : s;
+        });
 
         res.setState({ _slotState: slotState });
 
         return getNextStep(req, res, postBack);
     }
 
-    return slotContinuePlugin;
+    return slotsContinuePlugin;
 }
 
-module.exports = slotContinue;
+module.exports = slotsContinue;

package/plugins/plugins.json

@@ -442,11 +442,19 @@
         {
             "id": "ai.wingbot.slotsContinue",
             "name": "Slot filling: continue",
-            "description": "move the slot filling to the next step",
+            "description": "Move the slot filling to the next step",
             "availableSince": 3.39,
             "editable": false,
             "isFactory": true,
             "inputs": [
+                {
+                    "name": "skip",
+                    "label": "Skip to entity (reset entities)",
+                    "type": "text",
+                    "validations": [
+                        { "type": "regexp", "value": "^\\s*@[a-zA-Z0-9-]+\\s*(,\\s*@[a-zA-Z0-9-]+\\s*)*$", "message": "the entity for the slot filling should be valid" }
+                    ]
+                }
             ],
             "items": [
             ]

package/src/Plugins.js

@@ -42,7 +42,7 @@ const wrapPluginFunction = require('./utils/wrapPluginFunction');
  * Custom code plugins for BuildRouter and wingbot.ai
  *
  * @template {object} [S=object]
- * @template {object} C=Object
+ * @template {object} [C=Object]
  * @class Plugins
  */
 class Plugins {
@@ -72,7 +72,7 @@ class Plugins {
      *
      * @param {string} name
      * @param {object} [paramsData]
-     * @param {Map<string,Function[]>|Object<string,Function>} [items]
+     * @param {Map<string,Function[]>|Object<string,Middleware<S>>} [items]
      * @param {object} [context]
      * @param {boolean} [context.isLastIndex]
      * @param {Router} [context.router]
@@ -104,6 +104,7 @@ class Plugins {
         let useItems = items;
 
         if (!(items instanceof Map)) {
+            // @ts-ignore
             useItems = new Map(
                 Object.keys(items)
                     .map((key) => [

package/src/Responder.js

@@ -25,7 +25,8 @@ const EXCEPTION_HOPCOUNT_THRESHOLD = 5;
 /** @typedef {import('./Request')} Request */
 
 /**
- * @enum {string}
+ * @enum {string} ExpectedInput
+ * @readonly
  */
 const ExpectedInput = {
     TYPE_PASSWORD: 'password'
@@ -95,7 +96,7 @@ class Responder {
         };
 
         /**
-         * @type {Object<string,ExpectedInput>}
+         * @prop {Object<keyof ExpectedInput,ExpectedInput>}
          */
         this.ExpectedInputTypes = ExpectedInput;
 

package/src/Tester.js

@@ -230,6 +230,8 @@ class Tester {
             && !(res.status === 204 && this._pluginBlocksCollector.length > 0)
             && !(res.status === 204 && this.allowEmptyResponse)) {
 
+            this.debug();
+
             if (res.status === 204) {
                 throw Object.assign(new Error(`Bot did not respond (status ${res.status})`), { code: res.status });
             }

package/src/utils/compileWithState.js

@@ -21,6 +21,7 @@ const stateData = require('./stateData');
  * @param {Request} req
  * @param {Responder} res
  * @param {string} template
+ * @returns {string}
  * @example
  *
  * const { compileWithState } = require('wingbot');

package/src/utils/slots.js

@@ -69,13 +69,19 @@ const StepState = {
 async function getNextStep (req, res, postBack) {
     let invalid = null;
     const {
-        _slotState: slotState, _slotSteps: steps, _slotDone: doneAction
+        _slotState: slotState, _slotSteps: steps, _slotDone: doneAction, ...rest
     } = { ...req.state, ...res.newState };
 
     for (const slot of slotState) {
         const step = steps.find((s) => s.entity === slot.e);
+        if (step && slot.s === StepState.INITIALIZED && (
+            (step.type !== StepType.MULTI && rest[slot.e])
+            || (step.type === StepType.MULTI && rest[slot.e.replace(/^@/, '+')] && rest[slot.e.replace(/^@/, '+')].length))) {
+
+            slot.s = StepState.FILLED;
+        }
+
         if (slot.s === StepState.FILLED && step && step.validateAction) {
-            // eslint-disable-next-line
             await postBack(step.validateAction, {}, true);
             if (res.finalMessageSent) {
                 invalid = step;