@vnejs/plugins.vars.flags 0.1.2 → 0.1.4

package/const/const.js

@@ -1,4 +1,4 @@
 export const TYPE = "flag";
+export const EXEC_NAME = "flag";
 
-export const LINE_REG = /^(?<name>[a-zA-Z0-9_\-]+)( (?<action>set|unset))?( global)?$/;
 export const ACTIONS = { SET: "set", UNSET: "unset" };

package/const/events.js

@@ -1,3 +1,6 @@
 export const SUBSCRIBE_EVENTS = {
   SET: "vne:vars_flags:set",
+  GET: "vne:vars_flags:get",
+  EXEC_INFO: "vne:vars_flags:exec_info",
+  EXEC_CHECK: "vne:vars_flags:exec_check",
 };

package/index.js

@@ -3,6 +3,7 @@ import { regPlugin } from "@vnejs/shared";
 import * as constants from "./const/const";
 import { SUBSCRIBE_EVENTS } from "./const/events";
 
+import { FlagsExec } from "./modules/exec";
 import { Flags } from "./modules/flags";
 
-regPlugin("VARS_FLAGS", { constants, events: SUBSCRIBE_EVENTS }, [Flags]);
+regPlugin("VARS_FLAGS", { constants, events: SUBSCRIBE_EVENTS }, [FlagsExec, Flags]);

package/modules/exec.js

@@ -0,0 +1,26 @@
+import { Module } from "@vnejs/module";
+
+export class FlagsExec extends Module {
+  name = "vars.flags.exec";
+
+  init = () =>
+    Promise.all([
+      this.emit(this.EVENTS.SCENARIO.LINE_EXEC_REG, { block: this.CONST.VARS_FLAGS.EXEC_NAME, handler: this.onLineExecBlock }),
+      this.emit(this.EVENTS.SCENARIO.LINE_EXEC_REG, { module: this.CONST.VARS_FLAGS.EXEC_NAME, handler: this.onLineExecModule }),
+    ]);
+
+  onLineExecModule = async ({ line = "", keywords = [] } = {}) => {
+    const { name, isSet: value, isGlobal } = await this.emitOne(this.EVENTS.VARS_FLAGS.EXEC_INFO, { line, keywords, withValue: false });
+
+    await this.emit(this.EVENTS.VARS_FLAGS.SET, { name, value, isGlobal });
+
+    this.emit(this.EVENTS.SCENARIO.NEXT, { module: this.name });
+  };
+  onLineExecBlock = async ({ line = "", keywords = [] } = {}) => {
+    const { value, isSet } = await this.emitOne(this.EVENTS.VARS_FLAGS.EXEC_INFO, { line, keywords });
+
+    await this.emit(this.EVENTS.VARS.SCENARIO, { shouldGoInside: isSet === value });
+
+    this.emit(this.EVENTS.SCENARIO.NEXT, { module: this.name });
+  };
+}

package/modules/flags.js

@@ -3,49 +3,26 @@ import { Module } from "@vnejs/module";
 export class Flags extends Module {
   name = "vars.flags";
 
-  execName = "flag";
-
   subscribe = () => {
     this.on(this.EVENTS.VARS_FLAGS.SET, this.onFlagSet);
+    this.on(this.EVENTS.VARS_FLAGS.GET, this.onFlagGet);
+    this.on(this.EVENTS.VARS_FLAGS.EXEC_INFO, this.onFlagExecInfo);
+    this.on(this.EVENTS.VARS_FLAGS.EXEC_CHECK, this.onFlagExecCheck);
   };
 
-  init = () =>
-    Promise.all([
-      this.emit(this.EVENTS.SCENARIO.LINE_EXEC_REG, { block: this.execName, handler: this.execHandlerBlock }),
-      this.emit(this.EVENTS.SCENARIO.LINE_EXEC_REG, { module: this.execName, handler: this.execHandlerModule }),
-    ]);
-
-  execHandlerModule = async (line = "") => {
-    const defaultActions = this.CONST.VARS_FLAGS.ACTIONS.SET;
-    const { name = "", action = defaultActions } = line.match(this.CONST.VARS_FLAGS.LINE_REG).groups;
-    const isGlobal = line.endsWith(" global");
-
-    await this.emit(this.EVENTS.VARS_FLAGS.SET, { name, value: action === defaultActions, isGlobal });
+  onFlagSet = ({ name = "", isGlobal = false, value = false } = {}) =>
+    this.emit(this.EVENTS.VARS.SET, { name, type: this.CONST.VARS_FLAGS.TYPE, value, isGlobal });
+  onFlagGet = ({ name = "", isGlobal = false } = {}) => this.emitOne(this.EVENTS.VARS.GET, { name, type: this.CONST.VARS_FLAGS.TYPE, isGlobal }).then(Boolean);
+  onFlagExecInfo = async ({ line = "", keywords = [], withValue = true } = {}) => {
+    const [name = "", action = ""] = line.split(" ");
+    const [isSet, isGlobal] = [!action || action === this.CONST.VARS_FLAGS.ACTIONS.SET, keywords.includes("global")];
+    const result = { name, isSet, isGlobal };
 
-    this.emit(this.EVENTS.SCENARIO.NEXT, { module: this.name });
+    return withValue ? { ...result, value: await this.emitOne(this.EVENTS.VARS_FLAGS.GET, { name, isGlobal }) } : result;
   };
+  onFlagExecCheck = async ({ line = "", keywords = [] } = {}) => {
+    const { value = false, isSet = false } = await this.emitOne(this.EVENTS.VARS_FLAGS.EXEC_INFO, { line, keywords });
 
-  execHandlerBlock = async (line, args) => {
-    const { curLine = 0, label } = this.globalState.scenario;
-    const { name = "" } = line.match(this.CONST.VARS_FLAGS.LINE_REG).groups;
-    const isGlobal = line.endsWith(" global");
-    const varValue = (isGlobal ? this.shared : this.globalState).vars[`${this.CONST.VARS_FLAGS.TYPE}:${name}`];
-
-    if (varValue) return this.increaseCurLineAndGoNext(1);
-
-    const lines = await this.emitOne(this.EVENTS.SCENARIO.LINES_GET, { label });
-
-    let indexShift = 1;
-
-    while (lines[curLine + indexShift] && lines[curLine + indexShift].indent > lines[curLine].indent) indexShift++;
-
-    return this.increaseCurLineAndGoNext(indexShift);
+    return value === isSet;
   };
-
-  increaseCurLineAndGoNext = (indexShift) => {
-    this.globalState.scenario.curLine += indexShift;
-    this.emit(this.EVENTS.SCENARIO.NEXT, { module: this.name });
-  };
-
-  onFlagSet = ({ name, isGlobal = false, value = false }) => this.emit(this.EVENTS.VARS.SET, { name, type: this.CONST.VARS_FLAGS.TYPE, value, isGlobal });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vnejs/plugins.vars.flags",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",