@vnejs/plugins.text 0.1.8 → 0.1.9

package/const/const.js

@@ -1,3 +1 @@
 export const INTERACT_STATES = { EMPTY: "empty", RENDERING: "rendering", SHOWED: "showed", NEXT: "next" };
-
-export const LINE_REG = /^((?<speaker>[a-zA-z_0-9]+) )?["](?<text>.+)["]$/;

package/modules/meet.js

@@ -1,6 +1,5 @@
 import { Module } from "@vnejs/module";
-
-const MEET_REG = /^(?<char>[a-zA-Z0-9_\-]+)( (?<value>-?\d+))?$/;
+import { tokenizeExecLine } from "@vnejs/helpers";
 
 export class TextMeet extends Module {
   name = "text.meet";
@@ -15,14 +14,14 @@ export class TextMeet extends Module {
   init = () => this.emit(this.EVENTS.SCENARIO.LINE_EXEC_REG, { module: "meet", handler: this.onLineExec });
 
   onLineExec = async ({ line = "", args = {} } = {}) => {
-    const { char, value } = line.match(MEET_REG).groups;
+    const [char = "", value = 1] = tokenizeExecLine(line);
 
     await this.emit(this.EVENTS.TEXT.MEET, { char, value, ...args });
 
     this.emit(this.EVENTS.SCENARIO.NEXT, { module: this.name });
   };
 
-  onMeet = ({ char, value = 1 } = {}) => {
+  onMeet = ({ char = "", value = 1 } = {}) => {
     this.emit(this.EVENTS.LOGS.EMIT, { module: this.name, value: { char, value } });
 
     this.state[char] = this.state[char] ? this.state[char] + Number(value) : Number(value);

package/modules/text.js

@@ -1,6 +1,6 @@
 import { Module } from "@vnejs/module";
 
-import { textToTokens } from "./utils";
+import { tokenizeExecLine, tokenizeText } from "@vnejs/helpers";
 
 const BIG_VALUE = 99999999;
 
@@ -22,9 +22,15 @@ export class Text extends Module {
     return this.emit(this.EVENTS.SCENARIO.LINE_EXEC_REG, { module: this.CONST.SCENARIO.OTHER_MODULE, handler: this.onLineExec });
   };
   onLineExec = async ({ line = "", args = {} } = {}) => {
-    const { text, speaker: lineSpeaker } = line.match(this.CONST.TEXT.LINE_REG).groups;
+    const tokens = tokenizeExecLine(line);
+
+    let [text, speaker] = [tokens[0], this.PARAMS.TEXT.DEFAULT_SPEAKER_NAME];
+
+    if (tokens.length === 2) {
+      speaker = tokens[0];
+      text = tokens[1];
+    }
 
-    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);
@@ -33,7 +39,7 @@ export class Text extends Module {
   };
 
   onTextEmit = async ({ text, ...args } = {}) => {
-    const [uid, tokens] = [await this.emitOne(this.EVENTS.VENDORS.UID), textToTokens(await this.getRealText(text))];
+    const [uid, tokens] = [await this.emitOne(this.EVENTS.VENDORS.UID), tokenizeText(await this.getRealText(text))];
     const tokensVisible = this.shared.textNoAnimationSources.length ? BIG_VALUE : 0;
 
     this.updateState({ text, tokensVisible, uid, tokens, args });
@@ -57,7 +63,7 @@ export class Text extends Module {
     this.shared.isTextAnimationInProcess = false;
   };
   onTextRecalc = async () => {
-    const [uid, tokens] = [await this.emitOne(this.EVENTS.VENDORS.UID), textToTokens(await this.getRealText(this.state.text))];
+    const [uid, tokens] = [await this.emitOne(this.EVENTS.VENDORS.UID), tokenizeText(await this.getRealText(this.state.text))];
 
     this.updateState({ tokens, tokensVisible: tokens.length, uid });
 

package/modules/wall.js

@@ -1,6 +1,6 @@
 import { Module } from "@vnejs/module";
 
-import { textToTokens } from "./utils";
+import { tokenizeExecLine, tokenizeText } from "@vnejs/helpers";
 
 export class TextWall extends Module {
   name = "text.wall";
@@ -15,9 +15,11 @@ export class TextWall extends Module {
   };
   init = () => this.emit(this.EVENTS.SCENARIO.LINE_EXEC_REG, { module: this.name, handler: this.onLineExec });
   onLineExec = ({ line = "" } = {}) => {
-    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 });
+    const [action = ""] = tokenizeExecLine(line);
+
+    if (action === "clear") this.updateState({ wall: [], shouldSkip: false });
+    if (action === "start") this.updateState({ wall: [], isStarted: true, shouldSkip: true });
+    if (action === "end") this.updateState({ wall: [], isStarted: false, shouldSkip: true });
 
     this.emit(this.EVENTS.SCENARIO.NEXT, { module: this.name });
   };
@@ -45,7 +47,7 @@ export class TextWall extends Module {
   onStateSet = async ({ [this.name]: state } = {}) => this.setState(await this.emitOne(this.EVENTS.VENDORS.CLONE, state));
 
   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)) });
+  recalcWallObjToken = async (wallObj) => ({ ...wallObj, tokens: tokenizeText(await this.getRealText(wallObj.text)) });
 
   getDefaultState = () => ({ wall: [], isStarted: false, shouldSkip: false });
 }

package/package.json

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

package/modules/utils.js

@@ -1,37 +0,0 @@
-export const textToTokens = (str) => {
-  const marks = {};
-  const tokens = [];
-
-  for (let i = 0; i < str.length; ) {
-    const curChar = str[i];
-
-    if (curChar === "{") {
-      let j = 0;
-      while (true) {
-        j++;
-        if (str[i + j] === "}") {
-          if (str[i + 1] === "/") {
-            let mark = str.slice(i + 2, i + j);
-            if (mark.includes(":")) {
-              mark = mark.split(":")[0];
-            }
-            delete marks[mark];
-          } else {
-            let [mark, value] = [str.slice(i + 1, i + j), true];
-            if (mark.includes(":")) {
-              [mark, value] = mark.split(":");
-            }
-            marks[mark] = value;
-          }
-          break;
-        }
-      }
-      i += j + 1;
-    } else {
-      i++;
-      tokens.push({ token: curChar, marks: { ...marks } });
-    }
-  }
-
-  return tokens;
-};