@vnejs/plugins.text 0.1.3 → 0.1.4

package/modules/speaker.js

@@ -9,15 +9,6 @@ export class TextSpeaker extends Module {
     this.on(this.EVENTS.STATE.CLEAR, this.onStateClear);
     this.on(this.EVENTS.STATE.SET, this.onStateSet);
   };
-  init = () => this.emit(this.EVENTS.SCENARIO.LINE_EXEC_REG, { module: "text", handler: this.onLineTextHandler });
-  onLineTextHandler = async (line, args) => {
-    const { speaker: lineSpeaker } = line.match(this.CONST.TEXT.LINE_REG).groups;
-
-    const speaker = lineSpeaker || this.PARAMS.TEXT.DEFAULT_SPEAKER_NAME;
-    const meet = this.globalState["text.meet"][speaker] ?? 0;
-
-    return this.emit(this.EVENTS.TEXT.SPEAKER, { speaker, meet, args });
-  };
 
   onTextSpeaker = ({ speaker, meet, ...args }) => {
     this.setState({ speaker, meet, args });

package/modules/text.js

@@ -22,10 +22,14 @@ export class Text extends Module {
     return this.emit(this.EVENTS.SCENARIO.LINE_EXEC_REG, { module: this.name, handler: this.onLineHandler });
   };
   onLineHandler = async (line, args) => {
-    const { text } = line.match(this.CONST.TEXT.LINE_REG).groups;
+    const { text, speaker: lineSpeaker } = line.match(this.CONST.TEXT.LINE_REG).groups;
+
+    const speaker = lineSpeaker || this.PARAMS.TEXT.DEFAULT_SPEAKER_NAME;
+    const meet = this.globalState["text.meet"][speaker] ?? 0;
 
     await this.emit(this.EVENTS.TEXT.EMIT_BEFORE);
-    await this.emit(this.EVENTS.TEXT.EMIT, { text, ...args });
+
+    return Promise.all([this.emit(this.EVENTS.TEXT.SPEAKER, { speaker, meet, args }), this.emit(this.EVENTS.TEXT.EMIT, { text, ...args })]);
   };
 
   onTextEmit = async ({ text, ...args }) => {

package/modules/utils.js

@@ -29,7 +29,7 @@ export const textToTokens = (str) => {
       i += j + 1;
     } else {
       i++;
-      tokens.push({ char: curChar, marks: { ...marks } });
+      tokens.push({ token: curChar, marks: { ...marks } });
     }
   }
 

package/modules/wall.js

@@ -6,7 +6,7 @@ export class TextWall extends Module {
   name = "text.wall";
 
   subscribe = () => {
-    this.on(this.EVENTS.TEXT.INTERACT, this.onTextInteract);
+    this.on(this.EVENTS.TEXT.EMIT_BEFORE, this.onTextEmitBefore);
 
     this.on(this.EVENTS.TEXT.RECALC, this.onTextRecalc);
 
@@ -15,15 +15,15 @@ export class TextWall extends Module {
   };
   init = () => this.emit(this.EVENTS.SCENARIO.LINE_EXEC_REG, { module: this.name, handler: this.onLineHandler });
   onLineHandler = (line) => {
-    if (line === "clear") this.updateState({ wall: [] });
-    if (line === "start") this.updateState({ wall: [], isWallStarted: true });
-    if (line === "end") this.updateState({ wall: [], isWallStarted: false });
+    if (line === "clear") this.updateState({ wall: [], shouldSkip: false });
+    if (line === "start") this.updateState({ wall: [], isStarted: true, shouldSkip: true });
+    if (line === "end") this.updateState({ wall: [], isStarted: false, shouldSkip: true });
 
     this.emit(this.EVENTS.SCENARIO.NEXT, { module: this.name });
   };
 
-  onTextInteract = ({ state } = {}) => {
-    if (state !== this.CONST.TEXT.INTERACT_STATES.NEXT || !this.state.isWallStarted) return;
+  onTextEmitBefore = () => {
+    if (this.state.shouldSkip) return this.updateState({ shouldSkip: false });
 
     const { text, tokens, uid, args } = this.globalState.text;
     const { speaker, meet } = this.globalState["text.speaker"];
@@ -31,14 +31,13 @@ export class TextWall extends Module {
     this.updateState({ wall: [...this.state.wall, { text, tokens, uid, args, speaker, meet }] });
   };
   onTextRecalc = async () => {
-    this.updateState({
-      wall: await Promise.all(this.state.wall.map(async (wallObj) => ({ ...wallObj, tokens: textToTokens(await this.getRealText(wallObj.text)) }))),
-    });
+    this.updateState({ wall: await Promise.all(this.state.wall.map(this.recalcWallObjToken)) });
 
     return this.emit(this.EVENTS.TEXT.CHANGED, { ...this.globalState.text, wall: this.state.wall });
   };
 
   getRealText = (text) => this.emitOne(this.EVENTS.TEXT.REPLACE, { text, label: this.globalState.scenario.label, state: this.globalState });
+  recalcWallObjToken = async (wallObj) => ({ ...wallObj, tokens: textToTokens(await this.getRealText(wallObj.text)) });
 
-  getDefaultState = () => ({ wall: [], isWallStarted: false });
+  getDefaultState = () => ({ wall: [], isStarted: false, shouldSkip: false });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vnejs/plugins.text",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "main": "index.js",
   "types": "index.d.ts",
   "scripts": {