add pattern named captures

src/engine/botscript.ts

@@ -2,7 +2,7 @@ import { Context } from './context';
 import { Request } from './request';
 import { Struct, TYPES } from './struct';
 import { Logger } from '../lib/logger';
-import { transform } from './pattern';
+import { transform, execPattern } from './pattern';
 
 /**
  * BotScript dialogue engine
@@ -91,9 +91,17 @@ export class BotScript {
    * @param req
    */
   buildResponse(dialog: Struct, trigger: string, req: Request) {
-    const result = this.getActivators(dialog).filter(() => true).some(pattern => {
-      this.logger.info('Pattern: ', pattern);
-    });
+    const result = this.getActivators(dialog)
+      .filter((x) => RegExp(x.source, x.flags).test(req.text))
+      .some(pattern => {
+        this.logger.info('Found: ', dialog.name, pattern);
+
+        const captures = execPattern(req.text, pattern);
+        req.parameters.$ = captures.$1;
+        Object.keys(captures).forEach(varName => {
+          req.parameters[varName] = captures[varName];
+        });
+      });
 
     if (result) {
       this.logger.info('Handle request ok!', 123);

src/engine/pattern.ts

@@ -38,3 +38,15 @@ export function transform(pattern: string, definitions: Map<string, Struct>, not
     ? XRegExp(`^((?!^${pattern}$).)+(?!\\w)`, 'ig')
     : XRegExp(`(?:^|[\\s,;—])${pattern}(?!\\w)`, 'ig');
 }
+
+/**
+ * Extract and captures named variables
+ * @param input
+ * @param pattern
+ */
+export function execPattern(input: string, pattern: RegExp | any) {
+  let captures = !pattern.label ? XRegExp.exec(input, pattern) : pattern.exec(input);
+  const keys = Object.keys(captures).filter(key => !['index', 'input', 'groups'].includes(key));
+  captures = keys.map(key => ({ [key.match(/^\d+$/) ? `$${parseInt(key)}` : key]: captures[key] })).splice(1);
+  return captures.length > 0 ? captures.reduce((a: any, b: any) => Object.assign(a, b)) : [];
+}

src/engine/request.ts

@@ -8,9 +8,11 @@ export class Request {
   public text: string;
   public contexts: string[];
   public complete: boolean;
+  public parameters: any;
 
   constructor(text?: string) {
     this.contexts = [];
+    this.parameters = {};
 
     if (text) {
       this.text = text.toLowerCase();

tslint.json

@@ -33,7 +33,8 @@
     "object-literal-sort-keys": false,
     "one-variable-per-declaration": false,
     "variable-name": false,
-    "max-classes-per-file": false
+    "max-classes-per-file": false,
+    "radix": false
   },
   "rulesDirectory": []
 }