@vnejs/plugins.scenario.point_and_click 0.2.3 → 0.2.5

package/dist/index.js

@@ -5,13 +5,13 @@ import { PointAndClickEmit } from "./modules/emit.js";
 import { PointAndClickExec } from "./modules/exec.js";
 import { PointAndClickLogs } from "./modules/logs.js";
 import { PointAndClickOption } from "./modules/option.js";
-import { PointAndClickState } from "./modules/point_and_click.js";
-import { PointAndClickScenario } from "./modules/scenario.block.js";
+import { PointAndClick } from "./modules/point_and_click.js";
+import { PointAndClickScenario } from "./modules/scenario.js";
 import { PointAndClickScenarioModule } from "./modules/scenario.module.js";
 import { PointAndClickScenarioOption } from "./modules/scenario.option.js";
 import { PointAndClickSkip } from "./modules/skip.js";
 regPlugin(PLUGIN_NAME, { constants: CONSTANTS, events: SUBSCRIBE_EVENTS, params: PARAMS }, [
-    PointAndClickState,
+    PointAndClick,
     PointAndClickEmit,
     PointAndClickOption,
     PointAndClickSkip,

package/dist/modules/exec.js

@@ -1,6 +1,6 @@
 import { ModuleReplaceExec } from "@vnejs/module.replace.exec";
 export class PointAndClickExec extends ModuleReplaceExec {
-    name = "point-and-click.exec";
+    name = "point_and_click.exec";
     EXEC_REG_EVENT = this.EVENTS.POINT_AND_CLICK.EXEC_REG;
     EXEC_GET_EVENT = this.EVENTS.POINT_AND_CLICK.EXEC_GET;
 }

package/dist/modules/point_and_click.d.ts

@@ -1,7 +1,7 @@
 import { ModuleCore, type ModuleGlobalStateRegistry } from "@vnejs/module.core";
 import type { PointAndClickPluginConstants, PointAndClickPluginEvents, PointAndClickPluginParams, PointAndClickPluginSettings } from "../types.js";
 import type { PointAndClickPluginModelState } from "../utils/point-and-click.js";
-export declare class PointAndClickState extends ModuleCore<PointAndClickPluginEvents, PointAndClickPluginConstants, PointAndClickPluginSettings, PointAndClickPluginParams, PointAndClickPluginModelState> {
+export declare class PointAndClick extends ModuleCore<PointAndClickPluginEvents, PointAndClickPluginConstants, PointAndClickPluginSettings, PointAndClickPluginParams, PointAndClickPluginModelState> {
     name: string;
     subscribe: () => void;
     onStateUpdate: (state?: Partial<PointAndClickPluginModelState>) => void;

package/dist/modules/point_and_click.js

@@ -1,5 +1,5 @@
 import { ModuleCore } from "@vnejs/module.core";
-export class PointAndClickState extends ModuleCore {
+export class PointAndClick extends ModuleCore {
     name = "point_and_click";
     subscribe = () => {
         this.on(this.EVENTS.POINT_AND_CLICK.STATE_UPDATE, this.onStateUpdate);

package/dist/modules/scenario.js

@@ -0,0 +1,13 @@
+import { getBlockOptions } from "@vnejs/helpers";
+import { ModuleCore } from "@vnejs/module.core";
+export class PointAndClickScenario extends ModuleCore {
+    name = "point_and_click.scenario";
+    execName = "point-and-click";
+    init = () => this.emit(this.EVENTS.SCENARIO.LINE_EXEC_REG, { block: this.execName, handler: this.onLineExec });
+    onLineExec = async ({ args = {} } = {}) => {
+        const { curLine = 0, label } = this.globalState.scenario;
+        const lines = (await this.emitOne(this.EVENTS.SCENARIO.LINES_GET, { label }));
+        const options = getBlockOptions(lines, curLine, `% ${this.execName}.option`);
+        return this.emit(this.EVENTS.POINT_AND_CLICK.EMIT, { args, options });
+    };
+}

package/dist/modules/scenario.module.js

@@ -1,7 +1,7 @@
 import { tokenizeExecLine } from "@vnejs/helpers";
 import { ModuleCore } from "@vnejs/module.core";
 export class PointAndClickScenarioModule extends ModuleCore {
-    name = "point-and-click.scenario.module";
+    name = "point_and_click.scenario.module";
     execName = "point-and-click";
     init = () => this.emit(this.EVENTS.SCENARIO.LINE_EXEC_REG, { module: this.execName, handler: this.onLineExec });
     onLineExec = async ({ line = "" } = {}) => {

package/dist/modules/scenario.option.js

@@ -1,7 +1,7 @@
 import { getOptionExecShift } from "@vnejs/helpers";
 import { ModuleCore } from "@vnejs/module.core";
 export class PointAndClickScenarioOption extends ModuleCore {
-    name = "point-and-click.scenario.option";
+    name = "point_and_click.scenario.option";
     execName = "point-and-click";
     init = () => this.emit(this.EVENTS.SCENARIO.LINE_EXEC_REG, { block: `${this.execName}.option`, handler: this.onLineExec });
     onLineExec = async () => {

package/dist/modules/skip.js

@@ -1,3 +1,4 @@
+import { getBlockSkipShift } from "@vnejs/helpers";
 import { ModuleCore } from "@vnejs/module.core";
 export class PointAndClickSkip extends ModuleCore {
     name = "point_and_click.skip";
@@ -7,14 +8,7 @@ export class PointAndClickSkip extends ModuleCore {
     onSkip = async () => {
         const { curLine = 0, label } = this.globalState.scenario;
         const lines = (await this.emitOne(this.EVENTS.SCENARIO.LINES_GET, { label }));
-        const parentIndent = lines[curLine]?.indent ?? 0;
-        let indexShift = 1;
-        let curLineObj = lines[curLine + indexShift];
-        while (curLineObj && (curLineObj.indent ?? 0) > parentIndent) {
-            indexShift++;
-            curLineObj = lines[curLine + indexShift];
-        }
-        this.globalState.scenario.curLine = curLine + indexShift;
+        this.globalState.scenario.curLine = curLine + getBlockSkipShift(lines, curLine);
         return this.emitNext();
     };
 }

package/package.json

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

package/src/index.ts

@@ -7,14 +7,14 @@ import { PointAndClickEmit } from "./modules/emit.js";
 import { PointAndClickExec } from "./modules/exec.js";
 import { PointAndClickLogs } from "./modules/logs.js";
 import { PointAndClickOption } from "./modules/option.js";
-import { PointAndClickState } from "./modules/point_and_click.js";
-import { PointAndClickScenario } from "./modules/scenario.block.js";
+import { PointAndClick } from "./modules/point_and_click.js";
+import { PointAndClickScenario } from "./modules/scenario.js";
 import { PointAndClickScenarioModule } from "./modules/scenario.module.js";
 import { PointAndClickScenarioOption } from "./modules/scenario.option.js";
 import { PointAndClickSkip } from "./modules/skip.js";
 
 regPlugin(PLUGIN_NAME, { constants: CONSTANTS, events: SUBSCRIBE_EVENTS, params: PARAMS }, [
-  PointAndClickState,
+  PointAndClick,
   PointAndClickEmit,
   PointAndClickOption,
   PointAndClickSkip,

package/src/modules/exec.ts

@@ -10,7 +10,7 @@ export class PointAndClickExec extends ModuleReplaceExec<
   PointAndClickPluginParams,
   PointAndClickExecGetPayload
 > {
-  name = "point-and-click.exec";
+  name = "point_and_click.exec";
 
   EXEC_REG_EVENT = this.EVENTS.POINT_AND_CLICK.EXEC_REG;
   EXEC_GET_EVENT = this.EVENTS.POINT_AND_CLICK.EXEC_GET;

package/src/modules/point_and_click.ts

@@ -3,7 +3,7 @@ import { ModuleCore, type ModuleGlobalStateRegistry } from "@vnejs/module.core";
 import type { PointAndClickPluginConstants, PointAndClickPluginEvents, PointAndClickPluginParams, PointAndClickPluginSettings } from "../types.js";
 import type { PointAndClickPluginModelState, PointAndClickVisibilityPayload } from "../utils/point-and-click.js";
 
-export class PointAndClickState extends ModuleCore<
+export class PointAndClick extends ModuleCore<
   PointAndClickPluginEvents,
   PointAndClickPluginConstants,
   PointAndClickPluginSettings,

package/src/modules/scenario.module.ts

@@ -10,7 +10,7 @@ export class PointAndClickScenarioModule extends ModuleCore<
   PointAndClickPluginSettings,
   PointAndClickPluginParams
 > {
-  name = "point-and-click.scenario.module";
+  name = "point_and_click.scenario.module";
 
   execName = "point-and-click";
 

package/src/modules/scenario.option.ts

@@ -10,7 +10,7 @@ export class PointAndClickScenarioOption extends ModuleCore<
   PointAndClickPluginSettings,
   PointAndClickPluginParams
 > {
-  name = "point-and-click.scenario.option";
+  name = "point_and_click.scenario.option";
 
   execName = "point-and-click";
 

package/src/modules/{scenario.block.ts → scenario.ts}

@@ -1,3 +1,4 @@
+import { getBlockOptions } from "@vnejs/helpers";
 import { ModuleCore, type LineExecHandlerArg } from "@vnejs/module.core";
 
 import type { PointAndClickPluginConstants, PointAndClickPluginEvents, PointAndClickPluginParams, PointAndClickPluginSettings } from "../types.js";
@@ -9,7 +10,7 @@ export class PointAndClickScenario extends ModuleCore<
   PointAndClickPluginSettings,
   PointAndClickPluginParams
 > {
-  name = "point-and-click.scenario";
+  name = "point_and_click.scenario";
 
   execName = "point-and-click";
 
@@ -18,20 +19,7 @@ export class PointAndClickScenario extends ModuleCore<
   onLineExec = async ({ args = {} }: LineExecHandlerArg = {}) => {
     const { curLine = 0, label } = this.globalState.scenario;
     const lines = (await this.emitOne(this.EVENTS.SCENARIO.LINES_GET, { label })) as PointAndClickOptionLine[];
-    const optionsArr: number[] = [];
-
-    let indexShift = 1;
-    let curLineObj = lines[curLine + indexShift];
-
-    while (curLineObj && (curLineObj.indent ?? 0) > (lines[curLine]?.indent ?? 0)) {
-      curLineObj.line.startsWith(`% ${this.execName}.option`) &&
-        curLineObj.indent === (lines[curLine]?.indent ?? 0) + 2 &&
-        optionsArr.push(curLine + indexShift);
-      indexShift++;
-      curLineObj = lines[curLine + indexShift];
-    }
-
-    const options = optionsArr.map((index) => ({ index, optionLine: lines[index] }));
+    const options = getBlockOptions(lines, curLine, `% ${this.execName}.option`);
 
     return this.emit(this.EVENTS.POINT_AND_CLICK.EMIT, { args, options } satisfies PointAndClickEmitPayload);
   };

package/src/modules/skip.ts

@@ -1,3 +1,4 @@
+import { getBlockSkipShift } from "@vnejs/helpers";
 import { ModuleCore } from "@vnejs/module.core";
 
 import type { PointAndClickPluginConstants, PointAndClickPluginEvents, PointAndClickPluginParams, PointAndClickPluginSettings } from "../types.js";
@@ -18,17 +19,8 @@ export class PointAndClickSkip extends ModuleCore<
   onSkip = async () => {
     const { curLine = 0, label } = this.globalState.scenario;
     const lines = (await this.emitOne(this.EVENTS.SCENARIO.LINES_GET, { label })) as PointAndClickOptionLine[];
-    const parentIndent = lines[curLine]?.indent ?? 0;
 
-    let indexShift = 1;
-    let curLineObj = lines[curLine + indexShift];
-
-    while (curLineObj && (curLineObj.indent ?? 0) > parentIndent) {
-      indexShift++;
-      curLineObj = lines[curLine + indexShift];
-    }
-
-    this.globalState.scenario.curLine = curLine + indexShift;
+    this.globalState.scenario.curLine = curLine + getBlockSkipShift(lines, curLine);
 
     return this.emitNext();
   };

package/src/tests/point_and_click.test.ts

@@ -2,20 +2,20 @@ import { beforeEach, describe, expect, it } from "vitest";
 
 import { spyEvent } from "@vnejs/test-utils";
 
-import { PointAndClickState } from "../modules/point_and_click.js";
+import { PointAndClick } from "../modules/point_and_click.js";
 import { createPointAndClickFlowModules, createPointAndClickTestModule, registerPointAndClickPluginVne, SCENARIO_EVENTS, SUBSCRIBE_EVENTS } from "./setup.js";
 
-describe("PointAndClickState", () => {
+describe("PointAndClick", () => {
   beforeEach(() => {
     registerPointAndClickPluginVne();
   });
 
   it("STATE_UPDATE merges partial point_and_click state", async () => {
-    const { module, observer } = createPointAndClickTestModule(PointAndClickState);
+    const { module, observer } = createPointAndClickTestModule(PointAndClick);
 
     await observer.emit(SUBSCRIBE_EVENTS.STATE_UPDATE, { isShow: true });
 
-    expect((module as PointAndClickState).state.isShow).toBe(true);
+    expect((module as PointAndClick).state.isShow).toBe(true);
   });
 });
 

package/src/tests/scenario.test.ts

@@ -2,7 +2,7 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
 
 import { spyEvent } from "@vnejs/test-utils";
 
-import { PointAndClickScenario } from "../modules/scenario.block.js";
+import { PointAndClickScenario } from "../modules/scenario.js";
 import { PointAndClickScenarioModule } from "../modules/scenario.module.js";
 import { PointAndClickScenarioOption } from "../modules/scenario.option.js";
 import { createPointAndClickTestModule, registerPointAndClickPluginVne, SCENARIO_EVENTS, SUBSCRIBE_EVENTS } from "./setup.js";

package/src/tests/setup.ts

@@ -5,7 +5,7 @@ import { createTestModule as baseCreateTestModule, registerCoreVne, registerVneP
 
 import { PointAndClickEmit } from "../modules/emit.js";
 import { PointAndClickOption } from "../modules/option.js";
-import { PointAndClickState } from "../modules/point_and_click.js";
+import { PointAndClick } from "../modules/point_and_click.js";
 import { PointAndClickSkip } from "../modules/skip.js";
 
 export const registerPointAndClickPluginVne = () => {
@@ -37,7 +37,7 @@ export const createPointAndClickTestModule = <T extends Parameters<typeof baseCr
 };
 
 export const createPointAndClickFlowModules = (options: Parameters<typeof baseCreateTestModule>[1] = {}) => {
-  const { module: stateModule, observer, state, shared } = createPointAndClickTestModule(PointAndClickState, options);
+  const { module: stateModule, observer, state, shared } = createPointAndClickTestModule(PointAndClick, options);
 
   const attach = <T extends new () => InstanceType<T>>(ModuleClass: T) => {
     const module = new ModuleClass();
@@ -47,7 +47,7 @@ export const createPointAndClickFlowModules = (options: Parameters<typeof baseCr
   };
 
   return {
-    stateModule: stateModule as PointAndClickState,
+    stateModule: stateModule as PointAndClick,
     emitModule: attach(PointAndClickEmit),
     optionModule: attach(PointAndClickOption),
     skipModule: attach(PointAndClickSkip),

package/dist/modules/scenario.block.js

@@ -1,22 +0,0 @@
-import { ModuleCore } from "@vnejs/module.core";
-export class PointAndClickScenario extends ModuleCore {
-    name = "point-and-click.scenario";
-    execName = "point-and-click";
-    init = () => this.emit(this.EVENTS.SCENARIO.LINE_EXEC_REG, { block: this.execName, handler: this.onLineExec });
-    onLineExec = async ({ args = {} } = {}) => {
-        const { curLine = 0, label } = this.globalState.scenario;
-        const lines = (await this.emitOne(this.EVENTS.SCENARIO.LINES_GET, { label }));
-        const optionsArr = [];
-        let indexShift = 1;
-        let curLineObj = lines[curLine + indexShift];
-        while (curLineObj && (curLineObj.indent ?? 0) > (lines[curLine]?.indent ?? 0)) {
-            curLineObj.line.startsWith(`% ${this.execName}.option`) &&
-                curLineObj.indent === (lines[curLine]?.indent ?? 0) + 2 &&
-                optionsArr.push(curLine + indexShift);
-            indexShift++;
-            curLineObj = lines[curLine + indexShift];
-        }
-        const options = optionsArr.map((index) => ({ index, optionLine: lines[index] }));
-        return this.emit(this.EVENTS.POINT_AND_CLICK.EMIT, { args, options });
-    };
-}