wingbot 3.31.2 → 3.31.5-alpha.1

package/package.json

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

package/src/BuildRouter.js

@@ -497,15 +497,21 @@ class BuildRouter extends Router {
                 nextRouteIsSameResponder = nextRoute.respondsToRouteId === route.respondsToRouteId;
             }
 
+            const buildInfo = {
+                expectedToAddResolver: !!route.expectedPath,
+                attachedRouter: false
+            };
+
             const resolvers = [
                 ...this._buildRouteHead(route, nextRouteIsSameResponder),
-                ...this.buildResolvers(route.resolvers, route, route.expectedPath)
+                ...this.buildResolvers(route.resolvers, route, buildInfo)
             ];
 
             if (route.expectedPath) {
                 // attach expected before last message, if there is
                 resolvers.push(expected({
-                    path: route.expectedPath
+                    path: route.expectedPath,
+                    attachedRouter: buildInfo.attachedRouter
                 }, {
                     isLastIndex: true
                 }));
@@ -524,7 +530,7 @@ class BuildRouter extends Router {
         return -1;
     }
 
-    buildResolvers (resolvers, route = {}, expectedToAddResolver = false) {
+    buildResolvers (resolvers, route = {}, buildInfo = {}) {
         const {
             path: ctxPath, isFallback, isResponder, expectedPath, id
         } = route;
@@ -535,7 +541,7 @@ class BuildRouter extends Router {
         return resolvers.map((resolver, i) => {
             const context = {
                 ...this._context,
-                isLastIndex: lastIndex === i && !expectedToAddResolver,
+                isLastIndex: lastIndex === i && !buildInfo.expectedToAddResolver,
                 isLastMessage: lastMessageIndex === i,
                 router: this,
                 linksMap: this._linksMap,
@@ -546,11 +552,11 @@ class BuildRouter extends Router {
                 routeId: id
             };
 
-            return this._resolverFactory(resolver, context);
+            return this._resolverFactory(resolver, context, buildInfo);
         });
     }
 
-    _resolverFactory (resolver, context) {
+    _resolverFactory (resolver, context, buildInfo) {
         const { type } = resolver;
 
         if (!this.resources.has(type)) {
@@ -561,12 +567,17 @@ class BuildRouter extends Router {
 
         const fn = factoryFn(resolver.params, context, this._plugins);
 
+        if (fn.reduce) {
+            Object.assign(buildInfo, { attachedRouter: true });
+        }
+
         if ([
             'botbuild.include',
             'botbuild.path',
             'botbuild.customCode',
             'botbuild.inlineCode',
-            'botbuild.plugin'
+            'botbuild.plugin',
+            'botbuild.postback'
         ].includes(type)) {
             return fn;
         }

package/src/Request.js

@@ -834,7 +834,9 @@ class Request {
      * });
      */
     expectedContext (justOnce = false, includeKeywords = false) {
-        const { _expected: expected, _expectedConfidentInput: confident } = this.state;
+        const ad = this.actionData();
+        const expected = ad._useExpected || this.state._expected;
+        const confident = this.state._expectedConfidentInput;
 
         const ret = {};
 

package/src/Router.js

@@ -260,7 +260,7 @@ class Router extends ReducerWrapper {
     }
 
     // used as protected method
-    async processReducers (reducers, req, res, postBack, path, action, doNotTrack = false) {
+    async processReducers (reducers, req, res, postBack, action, doNotTrack = false) {
         const routeToReduce = {
             reducers,
             path: res.routePath

package/src/RouterWrap.js

@@ -48,8 +48,6 @@ class RouterWrap extends EventEmitter {
 
         const { items, router, params } = this;
 
-        const { path, routePath } = res;
-
         // attach params
         req.params = params;
 
@@ -62,15 +60,9 @@ class RouterWrap extends EventEmitter {
                     return true;
                 }
 
-                const { path: runPath, routePath: runRoutePath } = res;
-
-                res.setPath(path, routePath);
-
                 const reducers = items.get(codeBlockName);
                 const result = await router
-                    .processReducers(reducers, req, res, postBack, path, useAction, true);
-
-                res.setPath(runPath, runRoutePath);
+                    .processReducers(reducers, req, res, postBack, useAction, true);
 
                 return result;
             }

package/src/resolvers/expected.js

@@ -5,7 +5,16 @@
 
 const Router = require('../Router');
 
-function expected ({ path }, { isLastIndex }) {
+function expected ({ path, attachedRouter }, { isLastIndex }) {
+
+    if (attachedRouter) {
+        return (req, res, postBack) => postBack(path, {
+            _useExpected: {
+                action: res.toAbsoluteAction(path),
+                data: {}
+            }
+        }, true);
+    }
 
     return (req, res) => {
         res.expected(path);

package/src/utils/wrapPluginFunction.js

@@ -41,7 +41,7 @@ function wrapPluginFunction (
                     return true;
                 }
                 const reducers = preprocessedItems.get(codeBlockName);
-                return router.processReducers(reducers, req, res, postBack, path, action, true);
+                return router.processReducers(reducers, req, res, postBack, action, true);
             }
         });