@vnejs/plugins.core.text 0.0.2 → 0.1.1

package/const/const.js

@@ -1,6 +1 @@
-export const DEFAULT_SPEAKER = { names: { default: [""] }, color: "#ffffff" };
-export const DEFAULT_SPEAKER_NAME = "default";
-export const LINE_REG = /^((?<speaker>[a-zA-z_0-9]+) )?["](?<text>.+)["]( (?<hash>.*))?$/;
-export const INTERFACE_VIEWS = { ADV: "adv", NVL: "nvl" };
-export const SIZES = { XS: "xs", S: "s", M: "m", L: "l", XL: "xl" };
 export const INTERACT_STATES = { EMPTY: "empty", RENDERING: "rendering", SHOWED: "showed" };

package/const/events.js

@@ -7,4 +7,5 @@ export const SUBSCRIBE_EVENTS = {
   SPEAKER_REG: "vne:text:speaker_reg",
   VISIT: "vne:text:visit",
   MEET: "vne:text:meet",
+  CHANGED: "vne:text:changed",
 };

package/const/params.js

@@ -0,0 +1,10 @@
+export const DEFAULT_CHAR_SHOW_SPEED = 1;
+
+export const TOKEN_RENDER_DELAY = 16;
+
+export const DEFAULT_SPEAKER = { names: { default: [""] }, color: "#ffffff", opacity: 1 };
+export const DEFAULT_SPEAKER_NAME = "default";
+
+export const SPEAKERS_INFO = {
+  [DEFAULT_SPEAKER_NAME]: DEFAULT_SPEAKER,
+};

package/const/settings.js

@@ -1,3 +1,3 @@
 export const SETTINGS_KEYS = {
-  SPEED: "vne:text:speed",
+  TOKEN_RENDER_SPEED: "vne:text:token_render_speed",
 };

package/index.d.ts

@@ -0,0 +1,26 @@
+import * as constants from "./const/const";
+import { SUBSCRIBE_EVENTS } from "./const/events";
+import * as params from "./const/params";
+import { SETTINGS_KEYS } from "./const/settings";
+
+type ConstantsType = typeof constants;
+type SubscribeEventsType = typeof SUBSCRIBE_EVENTS;
+type ParamsType = typeof params;
+type SettingsKeysType = typeof SETTINGS_KEYS;
+
+const PLUGIN_NAME = "TEXT";
+
+declare global {
+  interface CONST {
+    [PLUGIN_NAME]: ConstantsType;
+  }
+  interface EVENTS {
+    [PLUGIN_NAME]: SubscribeEventsType;
+  }
+  interface PARAMS {
+    [PLUGIN_NAME]: ParamsType;
+  }
+  interface SETTINGS {
+    [PLUGIN_NAME]: SettingsKeysType;
+  }
+}

package/index.js

@@ -2,6 +2,7 @@ import { regPlugin } from "@vnejs/shared";
 
 import * as constants from "./const/const";
 import { SUBSCRIBE_EVENTS } from "./const/events";
+import * as params from "./const/params";
 import { SETTINGS_KEYS } from "./const/settings";
 
 import { TextCycle } from "./modules/cycle";
@@ -10,10 +11,4 @@ import { TextMeet } from "./modules/meet";
 import { TextSpeaker } from "./modules/speaker";
 import { Text } from "./modules/text";
 
-regPlugin("TEXT", { constants, events: SUBSCRIBE_EVENTS, settings: SETTINGS_KEYS }, [
-  TextCycle,
-  TextInteract,
-  TextMeet,
-  TextSpeaker,
-  Text,
-]);
+regPlugin("TEXT", { constants, events: SUBSCRIBE_EVENTS, settings: SETTINGS_KEYS, params }, [TextCycle, TextInteract, TextMeet, TextSpeaker, Text]);

package/modules/cycle.js

@@ -10,11 +10,14 @@ export class TextCycle extends Module {
     this.on(this.EVENTS.TEXT.CICLE, this.onCicle);
     this.on(this.EVENTS.TEXT.EMIT_END, this.onTextEmitEnd);
   };
+
+  init = () => this.emit(this.EVENTS.SETTINGS.INIT, { name: this.SETTINGS.TEXT.TOKEN_RENDER_SPEED, value: this.PARAMS.TEXT.DEFAULT_CHAR_SHOW_SPEED });
+
   onCicle = ({ text = "" } = {}) => this.startUpdateCycle(text);
   startUpdateCycle = async (oldOriginalText) => {
     let lastTs = new Date().getTime();
 
-    const textSpeed = this.shared.settings[this.SETTINGS.TEXT.SPEED];
+    const delayForOneChar = this.PARAMS.TEXT.TOKEN_RENDER_DELAY / this.shared.settings[this.SETTINGS.TEXT.TOKEN_RENDER_SPEED];
     const updateCounterCur = ++updateCounter;
 
     while (updateCounterCur === updateCounter) {
@@ -25,9 +28,9 @@ export class TextCycle extends Module {
       }
       const ts = new Date().getTime();
       const diff = ts - lastTs;
-      if (diff > textSpeed) {
-        lastTs = ts - (diff % textSpeed);
-        this.globalState.text.charsVisible += Math.floor(diff / textSpeed);
+      if (diff > delayForOneChar) {
+        lastTs = ts - (diff % delayForOneChar);
+        this.globalState.text.charsVisible += Math.floor(diff / delayForOneChar);
       } else {
         continue;
       }
@@ -38,7 +41,7 @@ export class TextCycle extends Module {
         await this.emit(this.EVENTS.TEXT.EMIT_END, { isForced: false });
       } else {
         if (originalText === oldOriginalText) {
-          await this.emit(this.EVENTS.INTERFACE.TEXT, { text, charsVisible });
+          await this.emit(this.EVENTS.TEXT.CHANGED, { text, charsVisible });
         } else updateCounter++;
       }
 

package/modules/interact.js

@@ -6,29 +6,29 @@ export class TextInteract extends Module {
   subscribe = () => {
     this.on(this.EVENTS.TEXT.INTERACT, this.onTextInteract);
 
-    this.on(this.EVENTS.STATE.CLEAR, this.onStateClear);
     this.on(this.EVENTS.STATE.SET, this.onStateSet);
+    this.on(this.EVENTS.STATE.CLEAR, this.onStateClear);
+  };
+
+  interactHandlerRendering = () => this.emit(this.EVENTS.TEXT.EMIT_END, { isForced: true });
+  interactHandlerShowed = async () => {
+    await this.emit(this.EVENTS.TEXT.INTERACT, { state: this.CONST.TEXT.INTERACT_STATES.EMPTY });
+
+    this.emit(this.EVENTS.SCENARIO.NEXT, { module: this.name });
   };
+
+  interactArgRendering = { key: `${this.name}.rendering`, handler: this.interactHandlerRendering };
+  interactArgShowed = { key: `${this.name}.showed`, handler: this.interactHandlerShowed };
+
   onTextInteract = async ({ state = "" } = {}) => {
     this.state.state = state;
 
-    state === this.CONST.TEXT.INTERACT_STATES.RENDERING
-      ? await this.emit(this.EVENTS.INTERACT.PUSH, { key: `${this.name}.rendering`, handler: this.handlerRendering })
-      : await this.emit(this.EVENTS.INTERACT.POP, { key: `${this.name}.rendering` });
-
-    state === this.CONST.TEXT.INTERACT_STATES.SHOWED
-      ? await this.emit(this.EVENTS.INTERACT.PUSH, { key: `${this.name}.showed`, handler: this.handlerShowed })
-      : await this.emit(this.EVENTS.INTERACT.POP, { key: `${this.name}.showed` });
+    await this.emit(state === this.CONST.TEXT.INTERACT_STATES.RENDERING ? this.EVENTS.INTERACT.PUSH : this.EVENTS.INTERACT.POP, this.interactArgRendering);
+    await this.emit(state === this.CONST.TEXT.INTERACT_STATES.SHOWED ? this.EVENTS.INTERACT.PUSH : this.EVENTS.INTERACT.POP, this.interactArgShowed);
   };
 
   onStateSet = ({ [this.name]: state }) => this.emit(this.EVENTS.TEXT.INTERACT, state);
   onStateClear = () => this.emit(this.EVENTS.TEXT.INTERACT, this.getDefaultState());
 
-  handlerShowed = async () => {
-    await this.emit(this.EVENTS.TEXT.INTERACT, { state: this.CONST.TEXT.INTERACT_STATES.EMPTY });
-    this.emitNext();
-  };
-  handlerRendering = () => this.emit(this.EVENTS.TEXT.EMIT_END, { isForced: true });
-
   getDefaultState = () => ({ state: this.CONST.TEXT.INTERACT_STATES.EMPTY });
 }

package/modules/meet.js

@@ -3,29 +3,28 @@ import { Module } from "@vnejs/module";
 const MEET_REG = /^(?<char>[a-zA-Z0-9_\-]+)( (?<value>-?\d+))?$/;
 
 export class TextMeet extends Module {
-  name = "meet";
+  name = "text.meet";
 
   subscribe = () => {
     this.on(this.EVENTS.TEXT.MEET, this.onMeet);
 
-    this.on(this.EVENTS.STATE.CLEAR, this.setDefaultState);
     this.on(this.EVENTS.STATE.SET, this.setStateFromGlobalState);
+    this.on(this.EVENTS.STATE.CLEAR, this.setDefaultState);
   };
 
-  init = () => this.emit(this.EVENTS.SCENARIO.EXEC_REG, { module: this.name, handler: this.execHandler });
+  init = () => this.emit(this.EVENTS.SCENARIO.EXEC_REG, { module: "meet", handler: this.execHandler });
 
   execHandler = async (line, args) => {
     const { char, value } = line.match(MEET_REG).groups;
 
     await this.emit(this.EVENTS.TEXT.MEET, { char, value, ...args });
-    this.emitNext();
+
+    this.emit(this.EVENTS.SCENARIO.NEXT, { module: this.name });
   };
 
   onMeet = ({ char, value = 1 }) => {
-    const realValue = Number(value);
-    this.log({ char, value });
-    this.state[char] = this.state[char] ? this.state[char] + realValue : realValue;
-  };
+    this.emit(this.EVENTS.LOGS.EMIT, { module: this.name, value: { char, value } });
 
-  getDefaultState = () => ({});
+    this.state[char] = this.state[char] ? this.state[char] + Number(value) : Number(value);
+  };
 }

package/modules/speaker.js

@@ -1,28 +1,16 @@
 import { Module } from "@vnejs/module";
 
-window.VNESpeakers = {};
-
 export class TextSpeaker extends Module {
   name = "text.speaker";
 
   subscribe = () => {
     this.on(this.EVENTS.TEXT.SPEAKER_REG, this.onSpeakerReg);
   };
-  init = async () => {
-    const defaultSpeakerName = this.CONST.TEXT.DEFAULT_SPEAKER_NAME;
-    const defaultSpeaker = this.CONST.TEXT.DEFAULT_SPEAKER;
-    window.VNESpeakers = { [defaultSpeakerName]: defaultSpeaker, ...window.VNESpeakers };
-
-    this.shared.speakers = {};
-
-    await Promise.all(Object.entries(window.VNESpeakers).map(this.mapSpeakers));
-  };
+  init = () => Promise.all(Object.entries(this.PARAMS.TEXT.SPEAKERS_INFO).map(this.mapSpeakers));
 
   mapSpeakers = ([name, speaker]) => this.emit(this.EVENTS.TEXT.SPEAKER_REG, { name, speaker });
 
   onSpeakerReg = ({ name, speaker } = {}) => {
-    this.log({ action: "reg", name, speaker });
-
-    this.shared.speakers[name] = speaker;
+    this.emit(this.EVENTS.LOGS.EMIT, { module: this.name, value: { action: "reg", name, speaker } });
   };
 }

package/modules/text.js

@@ -4,6 +4,8 @@ import { prepareText } from "./utils";
 
 const BIG_VALUE = 99999999;
 
+const LINE_REG = /^((?<speaker>[a-zA-z_0-9]+) )?["](?<text>.+)["]( (?<hash>.*))?$/;
+
 export class Text extends Module {
   name = "text";
 
@@ -18,29 +20,31 @@ export class Text extends Module {
   };
   init = async () => {
     await this.emit(this.EVENTS.SCENARIO.EXEC_REG, { module: this.name, handler: this.onLineHandler });
-    await this.emit(this.EVENTS.SETTINGS.INIT, { name: this.SETTINGS.TEXT.SPEED, value: 15 });
 
     this.shared.textNoAnimationSources = [];
   };
   onLineHandler = async (line, args) => {
-    const { speaker, text, hash } = line.match(this.CONST.TEXT.LINE_REG).groups;
+    const { speaker, text, hash } = line.match(LINE_REG).groups;
 
     await this.emit(this.EVENTS.INTERFACE.SHOW);
     await this.emit(this.EVENTS.TEXT.EMIT, { speaker, text, hash, ...args });
   };
-  onTextEmit = async ({ text: originalText, speaker = this.CONST.TEXT.DEFAULT_SPEAKER_NAME, ...otherArgs }) => {
-    const [meet, textSpeed] = [this.globalState.meet[speaker], this.shared.settings[this.SETTINGS.TEXT.SPEED]];
-    const [uid, text] = [
-      await this.emitOne(this.EVENTS.VENDORS.UID),
-      prepareText(await this.getRealText(originalText)),
-    ];
-    const charsVisible = textSpeed && !this.shared.textNoAnimationSources.length ? 0 : BIG_VALUE;
-
-    this.updateState({ originalText, charsVisible, text: { ...otherArgs, uid, text, speaker, meet } });
+  onTextEmit = async ({ text: originalText, speaker = this.PARAMS.TEXT.DEFAULT_SPEAKER_NAME, ...otherArgs }) => {
+    this.updateState({
+      originalText,
+      charsVisible: !this.shared.textNoAnimationSources.length ? 0 : BIG_VALUE,
+      text: {
+        ...otherArgs,
+        uid: await this.emitOne(this.EVENTS.VENDORS.UID),
+        text: prepareText(await this.getRealText(originalText)),
+        speaker,
+        meet: this.globalState["text.meet"][speaker],
+      },
+    });
 
     await this.setInterfaceText();
 
-    if (!textSpeed || this.shared.textNoAnimationSources.length) return setImmediate(this.emitAnimationEnd);
+    if (this.shared.textNoAnimationSources.length) return setImmediate(this.emitAnimationEnd);
 
     this.shared.isTextAnimationInProcess = true;
 
@@ -65,14 +69,14 @@ export class Text extends Module {
 
     return this.changeTextLang();
   };
-  setInterfaceText = () => this.emit(this.EVENTS.INTERFACE.TEXT, this.state);
+  setInterfaceText = () => this.emit(this.EVENTS.TEXT.CHANGED, this.state);
   changeTextLang = async () => {
     this.state.text = { ...this.state.text, text: prepareText(await this.getRealText(this.state.originalText)) };
     return this.setInterfaceText();
   };
-  getRealText = (text) => this.getLocTextByKey(this.globalState.scenario.label, text);
+  getRealText = (text) => this.emitOne(this.EVENTS.LOCS.GET_TEXT, { key: text, label: this.globalState.scenario.label });
   emitAnimationEnd = () => this.emit(this.EVENTS.TEXT.EMIT_END, { isForced: true });
 
   getDefaultState = () => ({ originalText: "", charsVisible: 0, text: this.getDefaultText() });
-  getDefaultText = () => ({ text: [], speaker: this.CONST.TEXT.DEFAULT_SPEAKER_NAME, meet: 0 });
+  getDefaultText = () => ({ text: [], speaker: this.PARAMS.TEXT.DEFAULT_SPEAKER_NAME, meet: 0 });
 }

package/package.json

@@ -1,19 +1,18 @@
 {
   "name": "@vnejs/plugins.core.text",
-  "version": "0.0.2",
+  "version": "0.1.1",
   "main": "index.js",
-  "types": "module.d.ts",
+  "types": "index.d.ts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
+    "publish:major:plugin": "npm run publish:major",
+    "publish:minor:plugin": "npm run publish:minor",
+    "publish:patch:plugin": "npm run publish:patch",
     "publish:major": "npm version major && npm publish --access public",
     "publish:minor": "npm version minor && npm publish --access public",
     "publish:patch": "npm version patch && npm publish --access public"
   },
   "author": "",
   "license": "ISC",
-  "description": "",
-  "peerDependencies": {
-    "@vnejs/shared": "*",
-    "@vnejs/module": "*"
-  }
+  "description": ""
 }

package/module.d.ts

@@ -1,11 +0,0 @@
-import { SUBSCRIBE_EVENTS } from "./const/events";
-import { SETTINGS_KEYS } from "./const/settings";
-
-declare module "@vnejs/shared" {
-  interface VNE_EVENTS {
-    TEXT: typeof SUBSCRIBE_EVENTS;
-  }
-  interface VNE_SETTINGS {
-    TEXT: typeof SETTINGS_KEYS;
-  }
-}