Merge pull request #64 from yeuai/dev-response

Dev response

Author: vunb

.mocharc.yml

@@ -1,7 +1,11 @@
 require: ts-node/register
 reporter: spec
 delay: true
-retries: 3
+retries: 1
 exit: true
 spec:
+  - test/e2e/delay.spec.ts
   - test/**/*.spec.ts
+  # - test/engine/conditions.spec.ts
+  # - test/engine/conditions.spec.ts
+  # - test/dialogue/sorted.spec.ts

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeuai/botscript",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "A text-based scripting language and bot engine for Conversational User Interfaces (CUI)",
   "main": "dist/engine",
   "scripts": {

package.json

@@ -95,29 +95,6 @@ export class BotScript extends EventEmitter {
     return vResult;
   }
 
-  /**
-   * Get struct type
-   * @param type type
-   */
-  private type(type: string): Map<string, any> {
-    switch (type) {
-      case 'definition':
-        return this.context.definitions;
-      case 'dialogue':
-        return this.context.dialogues;
-      case 'flows':
-        return this.context.flows;
-      case 'command':
-        return this.context.commands;
-      case 'plugin':
-        return this.context.plugins;
-      case 'directive':
-        return this.context.directives;
-      default:
-        throw new Error('Not found type: ' + type);
-    }
-  }
-
   /**
    * Script structure parser
    * @param content
@@ -162,8 +139,8 @@ export class BotScript extends EventEmitter {
 
     scripts.forEach(data => {
       const struct = Struct.parse(data);
-      // append bot data struct
-      this.type(struct.type).set(struct.name, struct);
+      // add bot context
+      this.context.add(struct);
     });
 
     return this;
@@ -222,6 +199,9 @@ export class BotScript extends EventEmitter {
         });
       }
     }
+
+    // sort triggers
+    this.context.sortTriggers();
     this.logger.info('Ready!');
     this.emit('ready');
     return this;

src/engine/botscript.ts

@@ -4,6 +4,7 @@ import { Request } from './request';
 import { Struct } from './struct';
 import { IActivator } from '../interfaces/activator';
 import { Logger } from '../lib/logger';
+import { Trigger } from './trigger';
 
 const logger = new Logger('Context');
 
@@ -28,6 +29,8 @@ export class Context {
    */
   idctx: string;
 
+  private _sorted_triggers: Trigger[];
+
   constructor() {
     this.definitions = new Map();
     this.dialogues = new Map();
@@ -37,6 +40,7 @@ export class Context {
     this.plugins = new Map();
     this.directives = new Map();
     this.idctx = newid();
+    this._sorted_triggers = [];
   }
 
   /**
@@ -48,6 +52,64 @@ export class Context {
       : this.idctx;
   }
 
+  /**
+   * Get all of context triggers
+   */
+  get triggers(): Trigger[] {
+    if (this._sorted_triggers?.length > 0) {
+      return this._sorted_triggers;
+    } else {
+      this.sortTriggers();
+      return this._sorted_triggers;
+    }
+  }
+
+  /**
+   * Get struct type
+   * @param type type
+   */
+  private type(type: string): Map<string, Struct> {
+    switch (type) {
+      case 'definition':
+        return this.definitions;
+      case 'dialogue':
+        return this.dialogues;
+      case 'flows':
+        return this.flows;
+      case 'command':
+        return this.commands;
+      case 'plugin':
+        return this.plugins;
+      case 'directive':
+        return this.directives;
+      default:
+        throw new Error('Not found type: ' + type);
+    }
+  }
+
+  /**
+   * Add context struct
+   * @param struct
+   */
+  add(struct: Struct) {
+    this.type(struct.type).set(struct.name, struct);
+    return this;
+  }
+
+  /**
+   * sort trigger
+   */
+  sortTriggers(): void {
+    const vTriggers: Trigger[] = [];
+    this._sorted_triggers = [];
+    Array.from(this.dialogues.values())
+      .forEach(x => {
+        vTriggers.push(...x.triggers.map(t => new Trigger(t, x.name)));
+      });
+    // sort & cache triggers.
+    this._sorted_triggers = vTriggers.sort(Trigger.sorter);
+  }
+
   /**
    * Get dialogue by name
    * Notice: a flow is a dialogue