@vnejs/plugins.vars.counters 0.1.2 → 0.1.4

package/const/const.js

@@ -1,6 +1,5 @@
 export const TYPE = "counter";
-export const MODULE_LINE_REG = /^(?<name>[a-zA-Z0-9_\-]+) (?<action>add|dec|\+\+)( (?<value>[\-]?[0-9]+))?( global)?$/;
-export const BLOCK_LINE_REG = /^(?<name>[a-zA-Z0-9_\-]+) (?<action>\>|===|\<) (?<value>[\-]?[0-9]+)( global)?$/;
-export const CHOOSE_LINE_REG = /^(?<name>[a-zA-Z0-9_\-]+)( global)?$/;
-export const ACTIONS = { ADD: "add", DEC: "dec", PLUS: "++" };
-export const COMPARE_ACTIONS = { MORE: ">", EQ: "===", LESS: "<" };
+export const EXEC_NAME = "counter";
+
+export const CHANGE_ACTIONS = { ADD: "+=", SUB: "-=", INC: "++", DEC: "--", SET: "=" };
+export const COMPARE_ACTIONS = { MORE: ">", MORE_EQ: ">=", EQ: "===", EQ_NOT: "!==", LESS: "<", LESS_EQ: "<=" };

package/const/events.js

@@ -1,3 +1,8 @@
 export const SUBSCRIBE_EVENTS = {
-  EMIT: "vne:vars_counter:emit",
+  SET: "vne:vars_counter:set",
+  GET: "vne:vars_counter:get",
+  CHANGE: "vne:vars_counter:change",
+  COMPARE: "vne:vars_counter:compare",
+  EXEC_INFO: "vne:vars_counter:exec_info",
+  EXEC_CHECK: "vne:vars_counter:exec_check",
 };

package/index.js

@@ -4,5 +4,6 @@ import * as constants from "./const/const";
 import { SUBSCRIBE_EVENTS } from "./const/events";
 
 import { Counters } from "./modules/counters";
+import { CountersExec } from "./modules/exec";
 
-regPlugin("VARS_COUNTERS", { constants, events: SUBSCRIBE_EVENTS }, [Counters]);
+regPlugin("VARS_COUNTERS", { constants, events: SUBSCRIBE_EVENTS }, [Counters, CountersExec]);

package/modules/counters.js

@@ -3,65 +3,45 @@ import { Module } from "@vnejs/module";
 export class Counters extends Module {
   name = "vars.counters";
 
-  execName = "counter";
-
   varsChangeHandlers = {
-    [this.CONST.VARS_COUNTERS.ACTIONS.PLUS]: (oldValue = 0) => oldValue + 1,
-    [this.CONST.VARS_COUNTERS.ACTIONS.ADD]: (oldValue = 0, value) => oldValue + value,
-    [this.CONST.VARS_COUNTERS.ACTIONS.DEC]: (oldValue = 0, value) => oldValue - value,
+    [this.CONST.VARS_COUNTERS.CHANGE_ACTIONS.SET]: (oldValue = 0, value = 0) => value,
+    [this.CONST.VARS_COUNTERS.CHANGE_ACTIONS.INC]: (oldValue = 0) => oldValue + 1,
+    [this.CONST.VARS_COUNTERS.CHANGE_ACTIONS.DEC]: (oldValue = 0) => oldValue - 1,
+    [this.CONST.VARS_COUNTERS.CHANGE_ACTIONS.ADD]: (oldValue = 0, value = 0) => oldValue + value,
+    [this.CONST.VARS_COUNTERS.CHANGE_ACTIONS.SUB]: (oldValue = 0, value = 0) => oldValue - value,
   };
   varsCompareHandlers = {
     [this.CONST.VARS_COUNTERS.COMPARE_ACTIONS.MORE]: (oldValue = 0, value) => oldValue > value,
+    [this.CONST.VARS_COUNTERS.COMPARE_ACTIONS.MORE_EQ]: (oldValue = 0, value) => oldValue >= value,
     [this.CONST.VARS_COUNTERS.COMPARE_ACTIONS.EQ]: (oldValue = 0, value) => oldValue === value,
+    [this.CONST.VARS_COUNTERS.COMPARE_ACTIONS.EQ_NOT]: (oldValue = 0, value) => oldValue !== value,
     [this.CONST.VARS_COUNTERS.COMPARE_ACTIONS.LESS]: (oldValue = 0, value) => oldValue < value,
+    [this.CONST.VARS_COUNTERS.COMPARE_ACTIONS.LESS_EQ]: (oldValue = 0, value) => oldValue <= value,
   };
 
   subscribe = () => {
-    this.on(this.EVENTS.VARS_COUNTERS.SET, this.onCounter);
+    this.on(this.EVENTS.VARS_COUNTERS.SET, this.onCounterSet);
+    this.on(this.EVENTS.VARS_COUNTERS.GET, this.onCounterGet);
+    this.on(this.EVENTS.VARS_COUNTERS.CHANGE, this.onCounterChange);
+    this.on(this.EVENTS.VARS_COUNTERS.COMPARE, this.onCounterCompare);
+    this.on(this.EVENTS.VARS_COUNTERS.EXEC_INFO, this.onCounterExecInfo);
+    this.on(this.EVENTS.VARS_COUNTERS.EXEC_CHECK, this.onCounterExecCheck);
   };
 
-  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_COUNTERS.ACTIONS.PLUS;
-    const { name = "", action = defaultActions, value = 0 } = line.match(this.CONST.VARS_COUNTERS.MODULE_LINE_REG).groups;
-    const isGlobal = line.endsWith(" global");
-
-    const oldValue = this.getValue(name, isGlobal);
-    const newValue = this.varsChangeHandlers[action](oldValue, Number(value));
-
-    await this.emit(this.EVENTS.VARS_COUNTERS.SET, { name, value: newValue, isGlobal });
+  onCounterSet = ({ name, isGlobal = false, value = 0 }) => this.emit(this.EVENTS.VARS.SET, { name, type: this.CONST.VARS_COUNTERS.TYPE, value, isGlobal });
+  onCounterGet = ({ name = "", isGlobal = false } = {}) => this.emitOne(this.EVENTS.VARS.GET, { name, type: this.CONST.VARS_COUNTERS.TYPE, isGlobal });
+  onCounterChange = ({ value = 0, execValue = 0, action = "" } = {}) => this.varsChangeHandlers[action](value, execValue);
+  onCounterCompare = ({ value = 0, execValue = 0, action = "" } = {}) => this.varsCompareHandlers[action](value, execValue);
+  onCounterExecInfo = async ({ line = "", keywords = [], withValue = true } = {}) => {
+    const [name = "", action = "", execValue = "0"] = line.split(" ");
+    const isGlobal = keywords.includes("global");
+    const result = { name, action, isGlobal, execValue: Number(execValue) };
 
-    this.emit(this.EVENTS.SCENARIO.NEXT, { module: this.name });
+    return withValue ? { ...result, value: await this.emitOne(this.EVENTS.VARS_COUNTERS.GET, { name, isGlobal }) } : result;
   };
+  onCounterExecCheck = async ({ line = "", keywords = [] } = {}) => {
+    const { action = "", execValue = 0, value = 0 } = await this.emitOne(this.EVENTS.VARS_COUNTERS.EXEC_INFO, { line, keywords });
 
-  execHandlerBlock = async (line, args) => {
-    const { curLine = 0, label } = this.globalState.scenario;
-    const defaultActions = this.CONST.VARS_COUNTERS.ACTIONS.PLUS;
-    const { name = "", action = defaultActions, value = 0 } = line.match(this.CONST.VARS_COUNTERS.BLOCK_LINE_REG).groups;
-    const oldValue = this.getValue(name, line.endsWith(" global"));
-
-    if (this.varsCompareHandlers[action](oldValue, Number(value))) 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);
-  };
-
-  increaseCurLineAndGoNext = (indexShift) => {
-    this.globalState.scenario.curLine += indexShift;
-    this.emit(this.EVENTS.SCENARIO.NEXT, { module: this.name });
+    return this.emitOne(this.EVENTS.VARS_COUNTERS.COMPARE, { value, execValue, action });
   };
-
-  onCounter = ({ name, isGlobal = false, value = 0 }) => this.emit(this.EVENTS.VARS.SET, { name, type: this.CONST.VARS.TYPES.COUNTER, value, isGlobal });
-
-  getValue = (name, isGlobal) => (isGlobal ? this.shared : this.globalState).vars[`${this.CONST.VARS.TYPES.COUNTER}:${name}`];
 }

package/modules/exec.js

@@ -0,0 +1,30 @@
+import { Module } from "@vnejs/module";
+
+export class CountersExec extends Module {
+  name = "vars.counters.exec";
+
+  init = () =>
+    Promise.all([
+      this.emit(this.EVENTS.SCENARIO.LINE_EXEC_REG, { block: this.CONST.VARS_COUNTERS.EXEC_NAME, handler: this.onLineExecBlock }),
+      this.emit(this.EVENTS.SCENARIO.LINE_EXEC_REG, { module: this.CONST.VARS_COUNTERS.EXEC_NAME, handler: this.onLineExecModule }),
+    ]);
+
+  onLineExecModule = async ({ line = "", keywords = [] } = {}) => {
+    const { name = "", action = "", execValue = 0, value = 0, isGlobal = false } = await this.emitOne(this.EVENTS.VARS_COUNTERS.EXEC_INFO, { line, keywords });
+
+    const newValue = await this.emitOne(this.EVENTS.VARS_COUNTERS.CHANGE, { value, execValue, action });
+
+    await this.emit(this.EVENTS.VARS_COUNTERS.SET, { name, isGlobal, value: newValue });
+
+    this.emit(this.EVENTS.SCENARIO.NEXT, { module: this.name });
+  };
+  onLineExecBlock = async ({ line = "", keywords = [] } = {}) => {
+    const { action = "", execValue = 0, value = 0 } = await this.emitOne(this.EVENTS.VARS_COUNTERS.EXEC_INFO, { line, keywords });
+
+    const shouldGoInside = await this.emitOne(this.EVENTS.VARS_COUNTERS.COMPARE, { value, execValue, action });
+
+    await this.emit(this.EVENTS.VARS.SCENARIO, { shouldGoInside });
+
+    this.emit(this.EVENTS.SCENARIO.NEXT, { module: this.name });
+  };
+}

package/package.json

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