@vnejs/plugins.scenario.point_and_click 0.2.4 → 0.2.5

package/dist/modules/scenario.js

@@ -1,3 +1,4 @@
+import { getBlockOptions } from "@vnejs/helpers";
 import { ModuleCore } from "@vnejs/module.core";
 export class PointAndClickScenario extends ModuleCore {
     name = "point_and_click.scenario";
@@ -6,17 +7,7 @@ export class PointAndClickScenario extends ModuleCore {
     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] }));
+        const options = getBlockOptions(lines, curLine, `% ${this.execName}.option`);
         return this.emit(this.EVENTS.POINT_AND_CLICK.EMIT, { args, options });
     };
 }

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.4",
+  "version": "0.2.5",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/modules/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";
@@ -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();
   };