@vnejs/compatibility.text-with-scenario.history 0.2.1 → 0.2.3

package/dist/index.d.ts

@@ -4,6 +4,6 @@ import { ModuleCore } from "@vnejs/module.core";
 import type { PluginConstants, PluginEvents, PluginParams, PluginSettings } from "./types.js";
 export declare class CompatibilityTextWithScenarioHistory extends ModuleCore<PluginEvents, PluginConstants, PluginSettings, PluginParams> {
     name: string;
-    init: () => Promise<unknown[]> | undefined;
-    onTextEmitNext: () => Promise<unknown[] | undefined>;
+    subscribe: () => void;
+    onTextEmitNext: () => Promise<import("@vnejs/shared").EmitResults<"vne:history:add"> | undefined>;
 }

package/dist/index.js

@@ -6,7 +6,9 @@ import { getTextSpeakerInfo } from "@vnejs/contracts.text";
 const MARK_REG = /\{.*?\}/g;
 export class CompatibilityTextWithScenarioHistory extends ModuleCore {
     name = "compatibility.text-with-scenario.history";
-    init = () => this.emit(this.EVENTS.TEXT.EMIT_NEXT_REG, { handler: this.onTextEmitNext });
+    subscribe = () => {
+        this.on(this.EVENTS.TEXT.EMIT_NEXT, this.onTextEmitNext);
+    };
     onTextEmitNext = async () => {
         const texts = this.globalState.text.texts;
         if (!texts.length)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vnejs/compatibility.text-with-scenario.history",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/index.ts

@@ -4,7 +4,7 @@ import "@vnejs/contracts.text";
 import { ModuleCore } from "@vnejs/module.core";
 import { regModule } from "@vnejs/shared";
 
-import { getTextSpeakerInfo } from "@vnejs/contracts.text";
+import { getTextSpeakerInfo, type TextSpeakerEntry } from "@vnejs/contracts.text";
 
 import type { PluginConstants, PluginEvents, PluginParams, PluginSettings } from "./types.js";
 
@@ -13,7 +13,9 @@ const MARK_REG = /\{.*?\}/g;
 export class CompatibilityTextWithScenarioHistory extends ModuleCore<PluginEvents, PluginConstants, PluginSettings, PluginParams> {
   name = "compatibility.text-with-scenario.history";
 
-  init = () => this.emit(this.EVENTS.TEXT.EMIT_NEXT_REG, { handler: this.onTextEmitNext });
+  subscribe = () => {
+    this.on(this.EVENTS.TEXT.EMIT_NEXT, this.onTextEmitNext);
+  };
 
   onTextEmitNext = async () => {
     const texts = this.globalState.text.texts;
@@ -25,7 +27,7 @@ export class CompatibilityTextWithScenarioHistory extends ModuleCore<PluginEvent
     const args = texts[texts.length - 1].args;
     const speakerState = this.globalState["text.speaker"];
     const speaker = speakerState.speaker;
-    const speakerInfo = await this.emitClone(getTextSpeakerInfo(speakerState, speaker));
+    const speakerInfo = await this.emitClone<TextSpeakerEntry | undefined>(getTextSpeakerInfo(speakerState, speaker));
 
     return this.emit(this.EVENTS.HISTORY.ADD, { label, text, args, speaker, speakerInfo });
   };

package/src/tests/history.test.ts

@@ -8,32 +8,27 @@ import { createCompatibilityTestModule, HISTORY_EVENTS, registerCompatibilityVne
 describe("CompatibilityTextWithScenarioHistory", () => {
   beforeEach(() => registerCompatibilityVne());
 
-  it("init registers TEXT.EMIT_NEXT handler", async () => {
+  it("subscribe registers TEXT.EMIT_NEXT handler", () => {
     const { module, observer } = createCompatibilityTestModule(CompatibilityTextWithScenarioHistory, { subscribe: false });
-    const reg = spyEvent(observer, TEXT_EVENTS.EMIT_NEXT_REG);
 
-    await (module as CompatibilityTextWithScenarioHistory).init();
+    (module as CompatibilityTextWithScenarioHistory).subscribe();
 
-    expect(reg).toHaveBeenCalledOnce();
-    expect(reg.mock.calls[0]?.[0]?.handler).toEqual(expect.any(Function));
+    expect(observer.subscribers[TEXT_EVENTS.EMIT_NEXT]?.flatMap((group) => group.subscribers)).toEqual(
+      expect.arrayContaining([expect.objectContaining({ func: (module as CompatibilityTextWithScenarioHistory).onTextEmitNext })]),
+    );
   });
 
   it("handler emits HISTORY.ADD with stripped text", async () => {
-    const { module, observer } = createCompatibilityTestModule(CompatibilityTextWithScenarioHistory, {
-      subscribe: false,
+    const { observer } = createCompatibilityTestModule(CompatibilityTextWithScenarioHistory, {
       state: {
         "text": { uid: "u1", texts: [{ text: "Hello {mark}", args: { a: 1 } }], tokens: [], speaker: "hero" },
         "text.speaker": { speaker: "hero", args: {}, speakersInfo: {} },
         "scenario": { curLine: 1, label: "scene" },
       },
     });
-    const reg = spyEvent(observer, TEXT_EVENTS.EMIT_NEXT_REG);
     const add = spyEvent(observer, HISTORY_EVENTS.ADD);
 
-    await (module as CompatibilityTextWithScenarioHistory).init();
-
-    const handler = reg.mock.calls[0]?.[0]?.handler as () => Promise<unknown>;
-    await handler();
+    await observer.emit(TEXT_EVENTS.EMIT_NEXT);
 
     expect(add).toHaveBeenCalledOnce();
     expect(add.mock.calls[0]?.[0]).toMatchObject({ label: "scene", text: "Hello ", speaker: "hero", args: { a: 1 } });