@vnejs/plugins.feature.choose 0.0.1 → 0.0.2

package/const/events.js

@@ -4,4 +4,6 @@ export const SUBSCRIBE_EVENTS = {
   SHOW: "vne:choose:show",
   HIDE: "vne:choose:hide",
   UPDATE: "vne:choose:update",
+  EXEC_REG: "vne:choose:exec_reg",
+  EXEC_GET: "vne:choose:exec_get",
 };

package/index.js

@@ -3,5 +3,7 @@ import { regPlugin } from "@vnejs/shared";
 import { SUBSCRIBE_EVENTS } from "./const/events";
 
 import { Choose } from "./modules/choose";
+import { ChooseExec } from "./modules/exec";
+import { ChooseScenario } from "./modules/scenario";
 
-regPlugin("CHOOSE", { events: SUBSCRIBE_EVENTS }, [Choose]);
+regPlugin("CHOOSE", { events: SUBSCRIBE_EVENTS }, [Choose, ChooseExec, ChooseScenario]);

package/modules/choose.js

@@ -11,29 +11,6 @@ export class Choose extends Module {
     this.on(this.EVENTS.STATE.CLEAR, this.onStateClear);
   };
 
-  init = () => this.emit(this.EVENTS.SCENARIO.EXEC_REG, { block: this.name, handler: this.execHandler });
-
-  execHandler = async (line, args) => {
-    const { curLine = 0, label } = this.globalState.scenario;
-    const [lines] = await this.emit(this.EVENTS.SCENARIO.LINES_GET, { label });
-    const optionsArr = [];
-
-    let indexShift = 1;
-    let curLineObj = lines[curLine + indexShift];
-
-    while (curLineObj && curLineObj.indent >= lines[curLine].indent) {
-      curLineObj.line.startsWith("% option") &&
-        curLineObj.indent === lines[curLine].indent + 2 &&
-        optionsArr.push(curLine + indexShift);
-      indexShift++;
-      curLineObj = lines[curLine + indexShift];
-    }
-
-    const options = optionsArr.map((index) => ({ index, optionLine: lines[index] }));
-
-    await this.emit(this.EVENTS.CHOOSE.EMIT, { args, options });
-  };
-
   onChooseEmit = async ({ options, args } = {}) => {
     this.log({ action: "emit", options, args });
     this.updateState({ isShow: true, options: await this.getRealOptions(options), args });
@@ -57,16 +34,30 @@ export class Choose extends Module {
   onStateClear = () => this.emit(this.EVENTS.CHOOSE.HIDE, { force: true });
 
   getRealOptions = async (options = []) => Promise.all(options.map(this.mapOptions));
-  mapOptions = async ({ optionLine, index } = {}) => ({
-    index,
-    text: await this.getOptionText(optionLine.line),
-    ...optionLine.args,
-  });
+  mapOptions = async ({ optionLine, index } = {}) => {
+    const text = await this.getOptionText(optionLine.line);
+    const result = { index, text, coords: this.getOptionCoords(optionLine.line), ...optionLine.args };
+
+    await Promise.all(
+      Object.keys(optionLine.args).map(async (key) => {
+        if (typeof optionLine.args[key] !== "string" || !optionLine.args[key].startsWith("$")) return;
+        const [dollar, module, ...other] = optionLine.args[key].split(" ");
+        result[key] = await this.emitOne(this.EVENTS.CHOOSE.EXEC_GET, { module, line: other.join(" ") });
+      })
+    );
+
+    return result;
+  };
   getOptionText = async (line) => {
-    const quotedText = line.slice("% option ".length);
-    const text = quotedText.slice(1, quotedText.length - 1);
+    const quotedText = line.slice(line.indexOf('"'), line.lastIndexOf('"') + 1);
+
+    return this.getLocTextByKey(this.globalState.scenario.label, quotedText.slice(1, quotedText.length - 1));
+  };
+  getOptionCoords = (line) => {
+    const lineText = line.slice("% option ".length);
+    const numbers = lineText.slice(lineText.lastIndexOf('"') + 2);
 
-    return this.getLocTextByKey(this.globalState.scenario.label, text);
+    return numbers.split(" ").map(Number);
   };
 
   getDefaultState = () => ({ options: [], args: {}, isShow: false });

package/modules/exec.js

@@ -0,0 +1,19 @@
+import { Module } from "@vnejs/module";
+
+export class ChooseExec extends Module {
+  name = "choose.exec";
+
+  handlers = {};
+
+  subscribe = () => {
+    this.on(this.EVENTS.CHOOSE.EXEC_REG, this.onChooseExecReg);
+    this.on(this.EVENTS.CHOOSE.EXEC_GET, this.onChooseExecGet);
+  };
+
+  onChooseExecReg = ({ handler, module } = {}) => {
+    this.handlers[module] = handler;
+  };
+
+  onChooseExecGet = ({ module, line } = {}) =>
+    typeof this.handlers[module] === "function" ? this.handlers[module](line) : "";
+}

package/modules/scenario.js

@@ -0,0 +1,30 @@
+import { Module } from "@vnejs/module";
+
+export class ChooseScenario extends Module {
+  name = "choose.scenario";
+
+  execName = "choose";
+
+  init = () => this.emit(this.EVENTS.SCENARIO.EXEC_REG, { block: this.execName, handler: this.execHandler });
+
+  execHandler = async (line, args) => {
+    const { curLine = 0, label } = this.globalState.scenario;
+    const [lines] = await this.emit(this.EVENTS.SCENARIO.LINES_GET, { label });
+    const optionsArr = [];
+
+    let indexShift = 1;
+    let curLineObj = lines[curLine + indexShift];
+
+    while (curLineObj && curLineObj.indent >= lines[curLine].indent) {
+      curLineObj.line.startsWith("% option") &&
+        curLineObj.indent === lines[curLine].indent + 2 &&
+        optionsArr.push(curLine + indexShift);
+      indexShift++;
+      curLineObj = lines[curLine + indexShift];
+    }
+
+    const options = optionsArr.map((index) => ({ index, optionLine: lines[index] }));
+
+    await this.emit(this.EVENTS.CHOOSE.EMIT, { args, options });
+  };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vnejs/plugins.feature.choose",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",