@vnejs/plugins.text.wall 0.2.2 → 0.2.4

package/dist/modules/emit.before.d.ts

@@ -4,6 +4,6 @@ import type { ModuleGlobalStateTextWall } from "@vnejs/contracts.text.wall";
 import type { TextWallPluginConstants, TextWallPluginEvents, TextWallPluginParams, TextWallPluginSettings } from "../types.js";
 export declare class TextWallEmitBefore extends ModuleCore<TextWallPluginEvents, TextWallPluginConstants, TextWallPluginSettings, TextWallPluginParams, ModuleGlobalStateTextWall> {
     name: string;
-    init: () => Promise<unknown[]> | undefined;
-    onTextEmitBefore: ({ isExtend }?: TextEmitBeforePayload) => Promise<unknown[] | undefined>;
+    subscribe: () => void;
+    onTextEmitBefore: ({ isExtend }?: TextEmitBeforePayload) => Promise<import("@vnejs/shared").EmitResults<"vne:text_wall:state_update"> | undefined>;
 }

package/dist/modules/emit.before.js

@@ -2,7 +2,9 @@ import { ModuleCore } from "@vnejs/module.core";
 import { getTextSpeakerInfo } from "@vnejs/contracts.text";
 export class TextWallEmitBefore extends ModuleCore {
     name = "text.wall.emit.before";
-    init = () => this.emit(this.EVENTS.TEXT.EMIT_BEFORE_REG, { handler: this.onTextEmitBefore });
+    subscribe = () => {
+        this.on(this.EVENTS.TEXT.EMIT_BEFORE, this.onTextEmitBefore);
+    };
     onTextEmitBefore = async ({ isExtend = false } = {}) => {
         const state = this.globalState["text.wall"];
         if (isExtend || !state.isStarted || this.shared.isTextWallSetStateInProcess)

package/dist/modules/exec.d.ts

@@ -4,7 +4,7 @@ import type { LineExecHandlerArg } from "@vnejs/module.core";
 import type { TextWallPluginConstants, TextWallPluginEvents, TextWallPluginParams, TextWallPluginSettings } from "../types.js";
 export declare class TextWallExec extends ModuleCore<TextWallPluginEvents, TextWallPluginConstants, TextWallPluginSettings, TextWallPluginParams, ModuleGlobalStateTextWall> {
     name: string;
-    init: () => Promise<unknown[]> | undefined;
+    init: () => Promise<import("@vnejs/shared").EmitResults<"vne:scenario:line_exec_reg">> | undefined;
     onLineExec: ({ line }?: LineExecHandlerArg) => Promise<void>;
-    emitAction: (action: string) => Promise<unknown[]> | undefined;
+    emitAction: (action: string) => Promise<import("@vnejs/shared").EmitResults<"vne:text_wall:state_update">> | undefined;
 }

package/dist/modules/recalc.js

@@ -18,5 +18,5 @@ export class TextWallRecalc extends ModuleCore {
             tokens.push(...tokenizeText(await this.getRealText(wallObj.texts[i].text, wallObj.texts[i].args)));
         return { ...wallObj, tokens };
     };
-    getRealText = (text, args) => this.emitOne(this.EVENTS.TEXT.REPLACE, { text, args, label: this.globalState.scenario.label, state: this.globalState });
+    getRealText = async (text, args) => (await this.emitOne(this.EVENTS.TEXT.REPLACE, { text, args, label: this.globalState.scenario.label, state: this.globalState })) ?? "";
 }

package/dist/modules/wall.d.ts

@@ -1,13 +1,13 @@
 import { ModuleCore } from "@vnejs/module.core";
 import type { ModuleGlobalStateRegistry } from "@vnejs/module.core";
-import type { ModuleGlobalStateTextWall } from "@vnejs/contracts.text.wall";
+import type { ModuleGlobalStateTextWall, TextWallStateUpdatePayload } from "@vnejs/contracts.text.wall";
 import type { TextWallPluginConstants, TextWallPluginEvents, TextWallPluginParams, TextWallPluginSettings } from "../types.js";
 export declare class TextWall extends ModuleCore<TextWallPluginEvents, TextWallPluginConstants, TextWallPluginSettings, TextWallPluginParams, ModuleGlobalStateTextWall> {
     name: string;
     subscribe: () => void;
     postinject: () => void;
-    onStateUpdate: (payload: Partial<ModuleGlobalStateTextWall>) => void;
+    onStateUpdate: (payload?: TextWallStateUpdatePayload) => void;
     onStateSet: (payload: ModuleGlobalStateRegistry) => Promise<void>;
-    onStateClear: () => Promise<unknown[] | undefined>;
+    onStateClear: () => Promise<import("@vnejs/shared").EmitResults<"vne:text_wall:changed"> | undefined>;
     getDefaultState: () => ModuleGlobalStateTextWall;
 }

package/dist/modules/wall.js

@@ -9,7 +9,7 @@ export class TextWall extends ModuleCore {
     postinject = () => {
         this.shared.isTextWallSetStateInProcess = false;
     };
-    onStateUpdate = (payload) => this.updateState(payload);
+    onStateUpdate = (payload = {}) => this.updateState(payload);
     onStateSet = async (payload) => {
         this.shared.isTextWallSetStateInProcess = true;
         await this.onSetStateClone(payload);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vnejs/plugins.text.wall",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/modules/emit.before.ts

@@ -15,7 +15,9 @@ export class TextWallEmitBefore extends ModuleCore<
 > {
   name = "text.wall.emit.before";
 
-  init = () => this.emit(this.EVENTS.TEXT.EMIT_BEFORE_REG, { handler: this.onTextEmitBefore });
+  subscribe = () => {
+    this.on(this.EVENTS.TEXT.EMIT_BEFORE, this.onTextEmitBefore);
+  };
 
   onTextEmitBefore = async ({ isExtend = false }: TextEmitBeforePayload = {}) => {
     const state = this.globalState["text.wall"];

package/src/modules/recalc.ts

@@ -35,6 +35,6 @@ export class TextWallRecalc extends ModuleCore<
 
     return { ...wallObj, tokens };
   };
-  getRealText = (text: string, args: Record<string, unknown>) =>
-    this.emitOne(this.EVENTS.TEXT.REPLACE, { text, args, label: this.globalState.scenario.label, state: this.globalState }) as Promise<string>;
+  getRealText = async (text: string, args: Record<string, unknown>) =>
+    (await this.emitOne(this.EVENTS.TEXT.REPLACE, { text, args, label: this.globalState.scenario.label, state: this.globalState })) ?? "";
 }

package/src/modules/wall.ts

@@ -1,7 +1,7 @@
 import { ModuleCore } from "@vnejs/module.core";
 import type { ModuleGlobalStateRegistry } from "@vnejs/module.core";
 
-import type { ModuleGlobalStateTextWall } from "@vnejs/contracts.text.wall";
+import type { ModuleGlobalStateTextWall, TextWallStateUpdatePayload } from "@vnejs/contracts.text.wall";
 
 import type { TextWallPluginConstants, TextWallPluginEvents, TextWallPluginParams, TextWallPluginSettings } from "../types.js";
 
@@ -25,7 +25,7 @@ export class TextWall extends ModuleCore<
     this.shared.isTextWallSetStateInProcess = false;
   };
 
-  onStateUpdate = (payload: Partial<ModuleGlobalStateTextWall>) => this.updateState(payload);
+  onStateUpdate = (payload: TextWallStateUpdatePayload = {}) => this.updateState(payload);
 
   onStateSet = async (payload: ModuleGlobalStateRegistry) => {
     this.shared.isTextWallSetStateInProcess = true;

package/src/tests/emit.before.test.ts

@@ -10,13 +10,14 @@ describe("TextWallEmitBefore", () => {
     registerTextWallPluginVne();
   });
 
-  it("init registers emit before handler", async () => {
+  it("subscribe registers emit before handler", () => {
     const { module, observer } = createTextWallTestModule(TextWallEmitBefore, { subscribe: false });
-    const emitBeforeReg = spyEvent(observer, TEXT_EVENTS.EMIT_BEFORE_REG);
 
-    await (module as TextWallEmitBefore).init();
+    (module as TextWallEmitBefore).subscribe();
 
-    expect(emitBeforeReg).toHaveBeenCalledExactlyOnceWith({ handler: (module as TextWallEmitBefore).onTextEmitBefore });
+    expect(observer.subscribers[TEXT_EVENTS.EMIT_BEFORE]?.flatMap((group) => group.subscribers)).toEqual(
+      expect.arrayContaining([expect.objectContaining({ func: (module as TextWallEmitBefore).onTextEmitBefore })]),
+    );
   });
 
   it("skips when wall is not started", async () => {