@vnejs/plugins.views.achievement 0.2.3 → 0.2.5

package/dist/modules/achievement.d.ts

@@ -1,10 +1,10 @@
 import { ModuleCore } from "@vnejs/module.core";
 import type { AchievementPluginConstants, AchievementPluginEvents, AchievementPluginParams, AchievementPluginSettings } from "../types.js";
-import type { AchievementLockPayload, AchievementUnlockPayload } from "../utils/achievement.js";
+import type { AchievementLockPayload, AchievementUnlockPayload } from "@vnejs/contracts.views.achievement";
 export declare class Achievement extends ModuleCore<AchievementPluginEvents, AchievementPluginConstants, AchievementPluginSettings, AchievementPluginParams> {
     name: string;
     subscribe: () => void;
-    onAchievementClear: () => Promise<unknown> | undefined;
+    onAchievementClear: () => Promise<void | undefined> | undefined;
     onAchievementLock: ({ id }?: AchievementLockPayload) => Promise<void>;
-    onAchievementUnlock: ({ id, isSkipIfPossible }?: AchievementUnlockPayload) => Promise<unknown[] | undefined>;
+    onAchievementUnlock: ({ id, isSkipIfPossible }?: AchievementUnlockPayload) => Promise<import("@vnejs/shared").EmitResults<"vne:achievement:append"> | undefined>;
 }

package/dist/modules/controller.d.ts

@@ -1,6 +1,7 @@
 import { ModuleController } from "@vnejs/module.components";
 import type { AchievementPluginConstants, AchievementPluginEvents, AchievementPluginParams, AchievementPluginSettings } from "../types.js";
-import type { AchievementAppendPayload, AchievementPluginState, AchievementLoadPayload } from "../utils/achievement.js";
+import type { AchievementPluginState } from "../types.js";
+import type { AchievementAppendPayload, AchievementLoadPayload } from "@vnejs/contracts.views.achievement";
 export declare class AchievementController extends ModuleController<AchievementPluginEvents, AchievementPluginConstants, AchievementPluginSettings, AchievementPluginParams, AchievementPluginState> {
     name: string;
     EVENT_UPDATE_VIEW: "vne:achievement:update";

package/dist/modules/exec.d.ts

@@ -3,12 +3,12 @@ import type { LineExecHandlerArg, LineLoadHandlerArg } from "@vnejs/module.core"
 import type { AchievementPluginConstants, AchievementPluginEvents, AchievementPluginParams, AchievementPluginSettings } from "../types.js";
 export declare class AchievementExec extends ModuleCore<AchievementPluginEvents, AchievementPluginConstants, AchievementPluginSettings, AchievementPluginParams> {
     name: string;
-    init: () => Promise<[unknown[] | undefined, unknown[] | undefined]>;
+    init: () => Promise<[import("@vnejs/shared").EmitResults<"vne:scenario:line_exec_reg"> | undefined, import("@vnejs/shared").EmitResults<"vne:scenario:line_load_reg"> | undefined]>;
     onLineExec: ({ keywords, line }?: LineExecHandlerArg) => Promise<void>;
-    onLineLoad: ({ line, priority }?: LineLoadHandlerArg) => Promise<unknown> | undefined;
-    emitActionExec: (action?: string, tokens?: string[], keywords?: string[]) => Promise<unknown> | undefined;
-    emitLockExec: (id?: string, isSkipIfPossible?: boolean) => Promise<unknown> | undefined;
-    emitUnlockExec: (id?: string, isSkipIfPossible?: boolean) => Promise<unknown> | undefined;
-    emitActionLoad: (action?: string, tokens?: string[], priority?: number) => Promise<unknown> | undefined;
-    emitUnlockLoad: (id?: string, priority?: number) => Promise<unknown> | undefined;
+    onLineLoad: ({ line, priority }?: LineLoadHandlerArg) => Promise<void | undefined> | undefined;
+    emitActionExec: (action?: string, tokens?: string[], keywords?: string[]) => Promise<void | undefined> | undefined;
+    emitLockExec: (id?: string, isSkipIfPossible?: boolean) => Promise<void | undefined> | undefined;
+    emitUnlockExec: (id?: string, isSkipIfPossible?: boolean) => Promise<void | undefined> | undefined;
+    emitActionLoad: (action?: string, tokens?: string[], priority?: number) => Promise<void | undefined> | undefined;
+    emitUnlockLoad: (id?: string, priority?: number) => Promise<void | undefined> | undefined;
 }

package/dist/modules/exec.js

@@ -9,7 +9,7 @@ export class AchievementExec extends ModuleCore {
     onLineExec = async ({ keywords = [], line = "" } = {}) => {
         const [action = "", ...tokens] = tokenizeExecLine(line).map(String);
         await this.emitActionExec(action, tokens, keywords);
-        this.emitNext();
+        this.emit(this.EVENTS.SCENARIO.NEXT);
     };
     onLineLoad = ({ line = "", priority = this.CONST.MEDIA.PRIORITIES.BACKGROUND } = {}) => {
         const [action = "", ...tokens] = tokenizeExecLine(line).map(String);

package/dist/modules/logs.d.ts

@@ -1,6 +1,6 @@
 import { ModuleCore } from "@vnejs/module.core";
 import type { AchievementPluginConstants, AchievementPluginEvents, AchievementPluginParams, AchievementPluginSettings } from "../types.js";
-import type { AchievementLockedPayload, AchievementUnlockedPayload } from "../utils/achievement.js";
+import type { AchievementLockedPayload, AchievementUnlockedPayload } from "@vnejs/contracts.views.achievement";
 export declare class AchievementLogs extends ModuleCore<AchievementPluginEvents, AchievementPluginConstants, AchievementPluginSettings, AchievementPluginParams> {
     name: string;
     subscribe: () => void;

package/dist/modules/view.d.ts

@@ -1,6 +1,6 @@
 import { ModuleView } from "@vnejs/module.components";
 import type { AchievementPluginConstants, AchievementPluginEvents, AchievementPluginParams, AchievementPluginSettings } from "../types.js";
-import type { AchievementPluginState } from "../utils/achievement.js";
+import type { AchievementPluginState } from "../types.js";
 export declare class AchievementView extends ModuleView<AchievementPluginEvents, AchievementPluginConstants, AchievementPluginSettings, AchievementPluginParams, AchievementPluginState> {
     name: string;
     EVENT_UPDATE_VIEW: "vne:achievement:update";

package/dist/types.d.ts

@@ -3,7 +3,14 @@ import type { Constants as LogsConstants, PluginName as LogsPluginName, Subscrib
 import type { Constants as ScenarioConstants, PluginName as ScenarioPluginName, SubscribeEvents as ScenarioSubscribeEvents } from "@vnejs/contracts.core.scenario";
 import type { PluginName as StoragePluginName, SubscribeEvents as StorageSubscribeEvents } from "@vnejs/contracts.core.storage";
 import type { Constants, Params, PluginName, SubscribeEvents } from "@vnejs/contracts.views.achievement";
+import type { AchievementItem } from "./utils/achievement.js";
 export type AchievementPluginEvents = ModuleComponentsEvents & Record<PluginName, SubscribeEvents> & Record<StoragePluginName, StorageSubscribeEvents> & Record<ScenarioPluginName, ScenarioSubscribeEvents> & Record<LogsPluginName, LogsSubscribeEvents>;
 export type AchievementPluginConstants = ModuleComponentsConstants & Record<PluginName, Constants> & Record<ScenarioPluginName, ScenarioConstants> & Record<LogsPluginName, LogsConstants>;
 export type AchievementPluginSettings = ModuleComponentsSettings;
 export type AchievementPluginParams = ModuleComponentsParams & Record<PluginName, Params>;
+export type AchievementPluginState = {
+    isShow: boolean;
+    isForce: boolean;
+    array?: AchievementItem[];
+    locs?: Record<string, string>;
+};

package/dist/utils/achievement.d.ts

@@ -4,30 +4,3 @@ export type AchievementItem = {
     isNotShowed: boolean;
     icon?: string;
 };
-export type AchievementPluginState = {
-    isShow: boolean;
-    isForce: boolean;
-    array?: AchievementItem[];
-    locs?: Record<string, string>;
-};
-export type AchievementLockPayload = {
-    id?: string;
-    isSkipIfPossible?: boolean;
-};
-export type AchievementUnlockPayload = {
-    id?: string;
-    isSkipIfPossible?: boolean;
-};
-export type AchievementAppendPayload = {
-    id?: string;
-};
-export type AchievementLoadPayload = {
-    id?: string;
-    priority?: number;
-};
-export type AchievementLockedPayload = {
-    id?: string;
-};
-export type AchievementUnlockedPayload = {
-    id?: string;
-};

package/dist/view/index.d.ts

@@ -1,3 +1,3 @@
 import type { ViewRenderFunc } from "@vnejs/module.components";
-import type { AchievementPluginState } from "../utils/achievement.js";
+import type { AchievementPluginState } from "../types.js";
 export declare const render: ViewRenderFunc<AchievementPluginState>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vnejs/plugins.views.achievement",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/modules/achievement.ts

@@ -1,7 +1,7 @@
 import { ModuleCore } from "@vnejs/module.core";
 
 import type { AchievementPluginConstants, AchievementPluginEvents, AchievementPluginParams, AchievementPluginSettings } from "../types.js";
-import type { AchievementLockPayload, AchievementUnlockPayload } from "../utils/achievement.js";
+import type { AchievementLockPayload, AchievementUnlockPayload } from "@vnejs/contracts.views.achievement";
 
 const STORAGE_VALUE = 1;
 

package/src/modules/controller.ts

@@ -1,7 +1,9 @@
 import { ModuleController } from "@vnejs/module.components";
 
 import type { AchievementPluginConstants, AchievementPluginEvents, AchievementPluginParams, AchievementPluginSettings } from "../types.js";
-import type { AchievementAppendPayload, AchievementPluginState, AchievementItem, AchievementLoadPayload } from "../utils/achievement.js";
+import type { AchievementPluginState } from "../types.js";
+import type { AchievementItem } from "../utils/achievement.js";
+import type { AchievementAppendPayload, AchievementLoadPayload } from "@vnejs/contracts.views.achievement";
 
 export class AchievementController extends ModuleController<
   AchievementPluginEvents,

package/src/modules/exec.ts

@@ -19,7 +19,7 @@ export class AchievementExec extends ModuleCore<AchievementPluginEvents, Achieve
 
     await this.emitActionExec(action, tokens, keywords);
 
-    this.emitNext();
+    this.emit(this.EVENTS.SCENARIO.NEXT);
   };
 
   onLineLoad = ({ line = "", priority = this.CONST.MEDIA.PRIORITIES.BACKGROUND }: LineLoadHandlerArg = {}) => {

package/src/modules/logs.ts

@@ -1,7 +1,7 @@
 import { ModuleCore } from "@vnejs/module.core";
 
 import type { AchievementPluginConstants, AchievementPluginEvents, AchievementPluginParams, AchievementPluginSettings } from "../types.js";
-import type { AchievementLockedPayload, AchievementUnlockedPayload } from "../utils/achievement.js";
+import type { AchievementLockedPayload, AchievementUnlockedPayload } from "@vnejs/contracts.views.achievement";
 
 export class AchievementLogs extends ModuleCore<AchievementPluginEvents, AchievementPluginConstants, AchievementPluginSettings, AchievementPluginParams> {
   name = "achievement.logs";

package/src/modules/view.ts

@@ -2,8 +2,7 @@ import { ModuleView } from "@vnejs/module.components";
 
 import { render } from "../view/index.js";
 import type { AchievementPluginConstants, AchievementPluginEvents, AchievementPluginParams, AchievementPluginSettings } from "../types.js";
-import type { AchievementPluginState } from "../utils/achievement.js";
-
+import type { AchievementPluginState } from "../types.js";
 export class AchievementView extends ModuleView<
   AchievementPluginEvents,
   AchievementPluginConstants,

package/src/tests/exec.test.ts

@@ -42,7 +42,7 @@ describe("AchievementExec", () => {
     expect(load).toHaveBeenCalledOnce();
   });
 
-  it("line exec calls emitNext", async () => {
+  it("line exec emits SCENARIO.NEXT", async () => {
     const { module, observer } = createAchievementTestModule(AchievementExec, { subscribe: false });
     const next = vi.fn();
 

package/src/types.ts

@@ -8,6 +8,8 @@ import type {
 import type { PluginName as StoragePluginName, SubscribeEvents as StorageSubscribeEvents } from "@vnejs/contracts.core.storage";
 import type { Constants, Params, PluginName, SubscribeEvents } from "@vnejs/contracts.views.achievement";
 
+import type { AchievementItem } from "./utils/achievement.js";
+
 export type AchievementPluginEvents = ModuleComponentsEvents &
   Record<PluginName, SubscribeEvents> &
   Record<StoragePluginName, StorageSubscribeEvents> &
@@ -22,3 +24,10 @@ export type AchievementPluginConstants = ModuleComponentsConstants &
 export type AchievementPluginSettings = ModuleComponentsSettings;
 
 export type AchievementPluginParams = ModuleComponentsParams & Record<PluginName, Params>;
+
+export type AchievementPluginState = {
+  isShow: boolean;
+  isForce: boolean;
+  array?: AchievementItem[];
+  locs?: Record<string, string>;
+};

package/src/utils/achievement.ts

@@ -4,37 +4,3 @@ export type AchievementItem = {
   isNotShowed: boolean;
   icon?: string;
 };
-
-export type AchievementPluginState = {
-  isShow: boolean;
-  isForce: boolean;
-  array?: AchievementItem[];
-  locs?: Record<string, string>;
-};
-
-export type AchievementLockPayload = {
-  id?: string;
-  isSkipIfPossible?: boolean;
-};
-
-export type AchievementUnlockPayload = {
-  id?: string;
-  isSkipIfPossible?: boolean;
-};
-
-export type AchievementAppendPayload = {
-  id?: string;
-};
-
-export type AchievementLoadPayload = {
-  id?: string;
-  priority?: number;
-};
-
-export type AchievementLockedPayload = {
-  id?: string;
-};
-
-export type AchievementUnlockedPayload = {
-  id?: string;
-};

package/src/view/index.tsx

@@ -4,8 +4,8 @@ import { Flex, Icon, Text, View, Wrap, createRenderFunc, useMemo, useStoreState
 import { getVneLength } from "@vnejs/uis.utils";
 
 import type { AchievementPluginConstants, AchievementPluginEvents, AchievementPluginParams, AchievementPluginSettings } from "../types.js";
-import type { AchievementPluginState, AchievementItem } from "../utils/achievement.js";
-
+import type { AchievementPluginState } from "../types.js";
+import type { AchievementItem } from "../utils/achievement.js";
 type AchievementComponentProps = ReactComponentProps<
   AchievementPluginEvents,
   AchievementPluginConstants,