@vnejs/plugins.vars 0.1.4 → 0.1.5

package/const/events.js

@@ -1,4 +1,10 @@
 export const SUBSCRIBE_EVENTS = {
+  GET: "vne:vars:get",
   SET: "vne:vars:set",
   INJECT: "vne:vars:inject",
+  SCENARIO: "vne:vars:scenario",
+
+  GLOBAL_SET: "vne:vars:global_set",
+  GLOBAL_GET: "vne:vars:global_get",
+  GLOBAL_CLEAR: "vne:vars:global_clear",
 };

package/index.js

@@ -1,8 +1,10 @@
 import { regPlugin } from "@vnejs/shared";
 
-import * as constants from "./const/const";
 import { SUBSCRIBE_EVENTS } from "./const/events";
 
+import { VarsGlobal } from "./modules/global";
+import { VarsInject } from "./modules/inject";
+import { VarsScenario } from "./modules/scenario";
 import { Vars } from "./modules/vars";
 
-regPlugin("VARS", { constants, events: SUBSCRIBE_EVENTS }, [Vars]);
+regPlugin("VARS", { events: SUBSCRIBE_EVENTS }, [VarsGlobal, VarsInject, Vars, VarsScenario]);

package/modules/global.js

@@ -0,0 +1,23 @@
+import { Module } from "@vnejs/module";
+
+export class VarsGlobal extends Module {
+  name = "vars.global";
+
+  subscribe = () => {
+    this.on(this.EVENTS.VARS.GLOBAL_GET, this.onVarGlobalGet);
+    this.on(this.EVENTS.VARS.GLOBAL_SET, this.onVarGlobalSet);
+    this.on(this.EVENTS.VARS.GLOBAL_CLEAR, this.onVarGlobalClear);
+  };
+
+  init = async () => {
+    this.shared.vars = await this.emitOne(this.EVENTS.STORAGE.GET_ALL, { module: this.name });
+  };
+
+  onVarGlobalGet = ({ name = "" } = {}) => this.shared.vars[name];
+  onVarGlobalSet = ({ name = "", value = "" } = {}) => {
+    this.shared.vars[name] = value;
+
+    return this.emit(this.EVENTS.STORAGE.SET, { module: this.name, key: name, value });
+  };
+  onVarGlobalClear = () => this.emit(this.EVENTS.STORAGE.RM_ALL, { module: this.name });
+}

package/modules/inject.js

@@ -0,0 +1,26 @@
+import { Module } from "@vnejs/module";
+
+const INJECT_REG = /\%vars:(?<line>.*?)\%/;
+
+export class VarsInject extends Module {
+  name = "vars.inject";
+
+  subscribe = () => {
+    this.on(this.EVENTS.VARS.INJECT, this.onVarInject);
+  };
+
+  onVarInject = ({ text = "" } = {}) => this.injectsVars(text);
+
+  injectsVars = async (text) => {
+    if (INJECT_REG.test(text)) {
+      const line = INJECT_REG.exec(text).groups.line;
+      const [type = "", name = "", keyword = ""] = line.split(":");
+
+      const varValue = await this.emitOne(this.EVENTS.VARS.GET, { type, name, isGlobal: keyword === "global" });
+
+      return this.injectsVars(text.replace(`%vars:${line}%`, String(varValue)));
+    }
+
+    return text;
+  };
+}

package/modules/scenario.js

@@ -0,0 +1,27 @@
+import { Module } from "@vnejs/module";
+
+export class VarsScenario extends Module {
+  name = "vars.scenario";
+
+  subscribe = () => {
+    this.on(this.EVENTS.VARS.SCENARIO, this.onVarScenario);
+  };
+
+  onVarScenario = async ({ shouldGoInside = false } = {}) => {
+    if (shouldGoInside) return this.increaseCurLine(1);
+
+    const { curLine = 0, label } = this.globalState.scenario;
+
+    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.increaseCurLine(indexShift);
+  };
+
+  increaseCurLine = (indexShift) => {
+    this.globalState.scenario.curLine += indexShift;
+  };
+}

package/modules/vars.js

@@ -4,40 +4,28 @@ export class Vars extends Module {
   name = "vars";
 
   subscribe = () => {
+    this.on(this.EVENTS.VARS.GET, this.onVarGet);
     this.on(this.EVENTS.VARS.SET, this.onVarSet);
-    this.on(this.EVENTS.VARS.INJECT, this.onVarInject);
 
     this.on(this.EVENTS.STATE.SET, this.onStateSet);
     this.on(this.EVENTS.STATE.CLEAR, this.setDefaultState);
   };
 
-  init = async () => {
-    this.shared.vars = await this.emitOne(this.EVENTS.STORAGE.GET_ALL, { module: this.name });
-  };
-
-  onVarSet = async ({ name, type, value, isGlobal = false }) => {
-    const varName = `${type}:${name}`;
-
-    if (isGlobal) {
-      this.shared.vars[varName] = value;
-
-      return this.emit(this.EVENTS.STORAGE.SET, { module: this.name, key: varName, value });
-    }
+  onVarSet = ({ name = "", type = "", value = "", isGlobal = false } = {}) => {
+    const varName = this.getInnerVarName(name, type);
 
-    this.state[varName] = value;
+    return isGlobal ? this.emit(this.EVENTS.VARS.GLOBAL_SET, { name: varName, value }) : this.setLocalVar(varName, value);
   };
+  onVarGet = ({ name = "", type = "", isGlobal = false } = {}) => {
+    const varName = this.getInnerVarName(name, type);
 
-  onVarInject = async ({ text = "" } = {}) => this.injectsVars(this.injectsVars(text.slice(), this.shared.vars, "%%"), this.state, "%");
-
-  injectsVars = (text, vars, symbol) => {
-    let newText = text.slice();
-    Object.keys(vars).forEach((key) => {
-      const varKey = `${symbol}${key}${symbol}`;
-      while (newText.includes(varKey)) newText = newText.replace(varKey, vars[key]);
-    });
-
-    return newText;
+    return isGlobal ? this.emitOne(this.EVENTS.VARS.GLOBAL_GET, { name: varName }) : this.state[varName];
   };
 
   onStateSet = async ({ [this.name]: state } = {}) => this.setState(await this.emitOne(this.EVENTS.VENDORS.CLONE, state));
+
+  getInnerVarName = (name = "", type = "") => `${type}:${name}`;
+  setLocalVar = (name = "", value = "") => {
+    this.state[name] = value;
+  };
 }

package/package.json

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

package/const/const.js

@@ -1,10 +0,0 @@
-export const TYPES = { FLAG: "flag", COUNTER: "counter" };
-
-export const FLAG_LINE_REG = /^(?<name>[a-zA-Z0-9_\-]+)( (?<action>set|unset))?( global)?$/;
-export const FLAG_ACTIONS = { SET: "set", UNSET: "unset" };
-
-export const COUNTER_MODULE_LINE_REG =
-  /^(?<name>[a-zA-Z0-9_\-]+) (?<action>add|dec|\+\+)( (?<value>[\-]?[0-9]+))?( global)?$/;
-export const COUNTER_BLOCK_LINE_REG = /^(?<name>[a-zA-Z0-9_\-]+) (?<action>\>|===|\<) (?<value>[\-]?[0-9]+)( global)?$/;
-export const COUNTER_ACTIONS = { ADD: "add", DEC: "dec", PLUS: "++" };
-export const COUNTER_COMPARE_ACTIONS = { MORE: ">", EQ: "===", LESS: "<" };