wingbot 3.68.0-alpha.2 → 3.68.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.68.0-alpha.2",
+  "version": "3.68.1",
   "description": "Enterprise Messaging Bot Conversation Engine",
   "main": "index.js",
   "type": "commonjs",

package/src/BuildRouter.js

@@ -21,6 +21,12 @@ const { shouldExecuteResolver } = require('./resolvers/resolverTags');
 const MESSAGE_RESOLVER_NAME = 'botbuild.message';
 
 /** @typedef {import('./Router').BaseConfiguration} BaseConfiguration */
+/**
+ * @typedef {object} BuildInfo
+ * @prop {boolean} [expectedToAddResolver]
+ * @prop {boolean} [attachedRouter]
+ * @prop {boolean} [notLastMessage]
+ */
 
 /**
  *
@@ -869,8 +875,8 @@ class BuildRouter extends Router {
     /**
      *
      * @param {Resolver[]} resolvers
-     * @param {TransformedRoute} route
-     * @param {*} buildInfo
+     * @param {TransformedRoute} [route]
+     * @param {BuildInfo} [buildInfo]
      * @returns {Middleware<S,C>[]}
      */
     buildResolvers (resolvers, route = DUMMY_ROUTE, buildInfo = {}) {
@@ -891,7 +897,7 @@ class BuildRouter extends Router {
             const context = {
                 ...this._resolvedContext,
                 isLastIndex: lastIndex === i && !buildInfo.expectedToAddResolver,
-                isLastMessage: lastMessageIndex === i,
+                isLastMessage: lastMessageIndex === i && !buildInfo.notLastMessage,
                 router: this,
                 linksMap: this._linksMap,
                 path: ctxPath,
@@ -918,7 +924,7 @@ class BuildRouter extends Router {
      *
      * @param {Resolver} resolver
      * @param {BotContext<C>} context
-     * @param {*} buildInfo
+     * @param {BuildInfo} buildInfo
      * @returns {Middleware<S,C>}
      */
     _resolverFactory (resolver, context, buildInfo) {

package/src/Plugins.js

@@ -40,6 +40,11 @@ const wrapPluginFunction = require('./utils/wrapPluginFunction');
  * @returns {Router<S,C>|Middleware<S,C>}
  */
 
+/**
+ * @typedef {object} PluginFactoryOptions
+ * @prop {string[]} [notLastMessageItems]
+ */
+
 /**
  * Custom code plugins for BuildRouter and wingbot.ai
  *
@@ -53,7 +58,22 @@ class Plugins {
         this._plugins = new Map();
     }
 
-    getPluginFactory (name, paramsData = {}, configuration = {}, defaultPlugin = null) {
+    /**
+     *
+     * @param {string} name
+     * @returns {PluginFactoryOptions}
+     */
+    getPluginOptions (name) {
+        const plugin = this._getPlug(name, {});
+
+        if (plugin && plugin.options) {
+            return plugin.options;
+        }
+
+        return {};
+    }
+
+    _getPlug (name, defaultPlugin) {
         let plugin;
         if (plugins.has(name)) {
             plugin = plugins.get(name);
@@ -64,6 +84,11 @@ class Plugins {
         } else {
             throw new Error(`Unknown Plugin: ${name}. Ensure its registration.`);
         }
+        return plugin;
+    }
+
+    getPluginFactory (name, paramsData = {}, configuration = {}, defaultPlugin = null) {
+        const plugin = this._getPlug(name, defaultPlugin);
         if (plugin && plugin.pluginFactory) {
             return plugin.pluginFactory(paramsData, configuration);
         }
@@ -174,13 +199,14 @@ class Plugins {
      *
      * @param {string} name - plugin name or plugins object to include
      * @param {PluginFactory<S,C>} pluginFactory - function, which returns a plugin
+     * @param {PluginFactoryOptions} [options]
      */
-    registerFactory (name, pluginFactory) {
+    registerFactory (name, pluginFactory, options = {}) {
         if (typeof pluginFactory !== 'function') {
             // eslint-disable-next-line no-console
             console.warn(`Plugin factory expected, ${typeof pluginFactory} given (plugin: ${name})`);
         }
-        this._plugins.set(name, { pluginFactory });
+        this._plugins.set(name, { pluginFactory, options });
     }
 
 }

package/src/resolvers/plugin.js

@@ -29,10 +29,15 @@ function plugin (params, context, plugins) {
     } = params;
     const { router, allowForbiddenSnippetWords } = context;
 
+    const options = plugins.getPluginOptions(codeBlockId);
+
     const itemsMap = Object.keys(items)
         .reduce((map, itemName) => {
             const item = items[itemName];
-            const builtResolvers = router.buildResolvers(item.resolvers);
+            const builtResolvers = router.buildResolvers(item.resolvers, undefined, {
+                notLastMessage: Array.isArray(options.notLastMessageItems)
+                    && options.notLastMessageItems.includes(itemName)
+            });
 
             map.set(itemName, builtResolvers);
 

package/src/templates/ButtonTemplate.js

@@ -58,7 +58,7 @@ class ButtonTemplate extends BaseTemplate {
     }
 
     _makeExtensionUrl (url, hasExtension) {
-        if (hasExtension) {
+        if (hasExtension && !`${url}`.match(/#.+/)) {
             const hash = [
                 `token=${encodeURIComponent(this.context.token)}`,
                 `senderId=${encodeURIComponent(this.context.senderId)}`