feat(react): Allow user input preprocess in blockInputs (#2219)

* feat(react): allow user input preprocessing before checking the regexp in blockInputs * style(react): remove BotOptions interface and use core.CoreBotConfig instead
hubtype · Feb 23, 2022 · 42c9085 · 42c9085
1 parent 5070e99
commit 42c9085
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/packages/botonic-core/src/core-bot.ts b/packages/botonic-core/src/core-bot.ts
@@ -17,7 +17,7 @@ import { BotonicOutputParser } from './output-parser'
 import { loadPlugins, runPlugins } from './plugins'
 import { getComputedRoutes, Router } from './routing'
 
-interface CoreBotConfig {
+export interface CoreBotConfig {
   appId?: string
   defaultDelay?: number
   defaultRoutes?: Route[]

diff --git a/packages/botonic-react/src/components/index.d.ts b/packages/botonic-react/src/components/index.d.ts
@@ -102,7 +102,11 @@ export interface PersistentMenuProps {
   options: any
 }
 
-export type BlockInputOption = { match: RegExp[]; message: string }
+export type BlockInputOption = {
+  preprocess?: (message: string) => string
+  match: RegExp[]
+  message: string
+}
 
 export interface BlobProps {
   blobTick?: boolean

diff --git a/packages/botonic-react/src/index.d.ts b/packages/botonic-react/src/index.d.ts
@@ -25,10 +25,6 @@ export interface Route extends core.Route {
 }
 type Routes = core.Routes<Route>
 
-export interface BotOptions extends core.BotOptions {
-  routes: Routes
-}
-
 export class ReactBot extends core.CoreBot {
   renderReactActions({
     actions,
@@ -37,7 +33,7 @@ export class ReactBot extends core.CoreBot {
 }
 
 export class NodeApp {
-  constructor(options: Omit<BotOptions, 'renderer'>)
+  constructor(options: Omit<core.CoreBotConfig, 'renderer'>)
   bot: ReactBot
   input(request: core.BotRequest): Promise<BotResponse>
   renderNode(args): string

diff --git a/packages/botonic-react/src/webchat/webchat.jsx b/packages/botonic-react/src/webchat/webchat.jsx
@@ -405,9 +405,13 @@ export const Webchat = forwardRef((props, ref) => {
   )
 
   const getBlockInputs = (rule, inputData) => {
+    const processedInput = rule.preprocess
+      ? rule.preprocess(inputData)
+      : inputData
+
     return rule.match.some(regex => {
       if (typeof regex === 'string') regex = deserializeRegex(regex)
-      return regex.test(inputData)
+      return regex.test(processedInput)
     })
   }