@vnejs/plugins.feature.history 0.1.0 → 0.1.2

package/modules/history.js

@@ -3,12 +3,13 @@ import { Module } from "@vnejs/module";
 export class History extends Module {
   name = "history";
 
+  isLoadInProcess = false;
+
   subscribe = () => {
     this.on(this.EVENTS.HISTORY.LOAD, this.onHistoryLoad);
     this.on(this.EVENTS.HISTORY.BACK, this.onHistoryBack);
 
-    this.on(this.EVENTS.TEXT.EMIT, this.onTextEmit);
-    this.on(this.EVENTS.TEXT.EMIT_END, this.onTextEmitEnd);
+    this.on(this.EVENTS.TEXT.INTERACT, this.onTextInteract);
 
     this.on(this.EVENTS.STATE.CLEAR, this.setDefaultState);
     this.on(this.EVENTS.STATE.SET, this.onSetState);
@@ -18,61 +19,47 @@ export class History extends Module {
     this.shared.history = { storage: {}, storageKeys: [] };
   };
 
-  onTextEmitEnd = async () => {
-    this.presavedHistory = await this.emitOne(this.EVENTS.VENDORS.CLONE, this.globalState);
-    this.presavedHistory.scenario.curLine++;
-  };
-
-  onTextEmit = async () => {
-    if (!this.presavedHistory) return;
-
-    const lastHistory = this.state.history[this.state.history.length - 1];
-    if (lastHistory && this.presavedHistory.text.originalText === lastHistory.text) return;
+  onTextInteract = async ({ state: textInteractState } = {}) => {
+    if (this.isLoadInProcess || textInteractState !== this.CONST.TEXT.INTERACT_STATES.EMPTY) return;
 
+    const state = await this.emitOne(this.EVENTS.STATE.GET);
     const uid = (await this.emitOne(this.EVENTS.VENDORS.UID)).split("-").slice(0, 3).join("");
 
     this.emit(this.EVENTS.LOGS.EMIT, { module: this.name, value: { action: "add", uid } });
 
-    const speaker = this.presavedHistory?.text?.text.speaker;
+    const [speaker, label, text] = [state?.text?.text?.speaker, state?.scenario.label, state?.text?.originalText];
 
-    this.shared.history.storage[uid] = this.presavedHistory;
+    this.shared.history.storage[uid] = state;
     this.shared.history.storageKeys.push(uid);
-    this.state.history.push({
-      uid,
-      label: this.presavedHistory?.scenario.label,
-      text: this.presavedHistory?.text?.originalText,
-      speaker,
-      meet: this.presavedHistory?.["text.meet"][speaker] || 0,
-    });
+    this.state.history.push({ uid, label, text, speaker, meet: state?.["text.meet"]?.[speaker] || 0 });
 
     while (this.state.history.length > 50) this.state.history.shift();
-    this.maxCurrentItem = this.state.history.length - 1;
     while (this.shared.history.storageKeys.length > 100) delete this.shared.history.storage[this.shared.history.storageKeys.shift()];
   };
 
   onHistoryLoad = async ({ uid } = {}) => {
+    this.isLoadInProcess = true;
+
     const state = this.shared.history.storage[uid];
 
-    if (state) {
-      while (this.shared.history.storageKeys.length) {
-        const uidToDelete = this.shared.history.storageKeys.pop();
-        delete this.shared.history.storage[uidToDelete];
-        if (uidToDelete === uid) break;
-      }
-      await this.emit(this.EVENTS.SAVE.LOAD_STATE, { state: await this.emitOne(this.EVENTS.VENDORS.CLONE, state) });
-      this.emit(this.EVENTS.SCENARIO.LABEL_GET, { label: state.scenario.label });
-    } else {
-      this.emit(this.EVENTS.LOGS.EMIT, { module: this.name, value: { action: "deleted" } });
+    if (!state) return this.emit(this.EVENTS.LOGS.EMIT, { module: this.name, value: { action: "deleted" } });
+
+    while (this.shared.history.storageKeys.length) {
+      const uidToDelete = this.shared.history.storageKeys.pop();
+      delete this.shared.history.storage[uidToDelete];
+      if (uidToDelete === uid) break;
     }
+    const clonedState = await this.emitOne(this.EVENTS.VENDORS.CLONE, state);
+    await this.emit(this.EVENTS.STATE.LOAD, clonedState);
+    this.emit(this.EVENTS.SCENARIO.LABEL_GET, { label: state.scenario.label });
 
-    this.currentItem = null;
+    this.isLoadInProcess = false;
   };
 
-  onHistoryBack = () => this.state.history.length && this.emit(this.EVENTS.HISTORY.LOAD, { uid: this.state.history[this.state.history.length - 1].uid });
+  onHistoryBack = () => this.state.history.length && void this.emit(this.EVENTS.HISTORY.LOAD, { uid: this.state.history[this.state.history.length - 1].uid });
 
-  onSetState = async (globalState = {}) => {
-    this.state.history = globalState[this.name].history;
-    this.presavedHistory = await this.emitOne(this.EVENTS.VENDORS.CLONE, globalState);
+  onSetState = ({ [this.name]: state } = {}) => {
+    this.state.history = state.history;
   };
 
   getDefaultState = () => ({ history: [] });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vnejs/plugins.feature.history",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",