babel-plugin-vasille 5.0.1 → 5.0.2

package/lib/expression.js

@@ -33,6 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.nodeIsMeshed = nodeIsMeshed;
 exports.idIsIValue = idIsIValue;
 exports.memberIsIValue = memberIsIValue;
 exports.memberIsIValueInExpr = memberIsIValueInExpr;
@@ -83,9 +84,13 @@ function addExpression(path, search) {
         path.replaceWith(found.paramName);
     }
 }
+function nodeIsMeshed(path) {
+    const parent = path.parent;
+    return (t.isMemberExpression(parent) || t.isOptionalMemberExpression(parent)) && parent.property === internal_js_1.V;
+}
 function meshIdentifier(path) {
-    if (idIsIValue(path)) {
-        path.replaceWith(t.memberExpression(path.node, t.identifier("V")));
+    if (idIsIValue(path) && !nodeIsMeshed(path)) {
+        path.replaceWith(t.memberExpression(path.node, internal_js_1.V));
     }
 }
 function idIsIValue(path) {
@@ -131,8 +136,8 @@ function exprIsSure(path, internal) {
     return (reactivityData && reactivityData[propPath]) || t.isMemberExpression(path.parent);
 }
 function meshMember(path) {
-    if (memberIsIValue(path.node)) {
-        path.replaceWith(t.memberExpression(path.node, t.identifier("V"), false, true));
+    if (memberIsIValue(path.node) && !nodeIsMeshed(path)) {
+        path.replaceWith(t.memberExpression(path.node, internal_js_1.V, false, true));
     }
 }
 function meshLValue(path, internal) {

package/lib/internal.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.inspector = exports.runner = exports.ctx = exports.StackedStates = void 0;
+exports.V = exports.inspector = exports.runner = exports.ctx = exports.StackedStates = void 0;
 const t = __importStar(require("@babel/types"));
 class StackedStates {
     maps = [];
@@ -66,3 +66,4 @@ exports.StackedStates = StackedStates;
 exports.ctx = t.identifier("Vasille");
 exports.runner = t.memberExpression(exports.ctx, t.identifier("runner"));
 exports.inspector = t.memberExpression(exports.runner, t.identifier("inspector"));
+exports.V = t.identifier("V");

package/lib/mesh.js

@@ -125,8 +125,8 @@ function meshExpression(nodePath, internal) {
             break;
         }
         case "Identifier": {
-            if ((0, expression_js_1.idIsIValue)(nodePath)) {
-                nodePath.replaceWith(t.memberExpression(expr, t.identifier("V")));
+            if ((0, expression_js_1.idIsIValue)(nodePath) && !(0, expression_js_1.nodeIsMeshed)(nodePath)) {
+                nodePath.replaceWith(t.memberExpression(expr, internal_js_1.V));
             }
             break;
         }
@@ -265,12 +265,12 @@ function meshExpression(nodePath, internal) {
             if (t.isExpression(property) && !t.isIdentifier(property)) {
                 meshOrIgnoreExpression(path.get("property"), internal);
             }
-            if ((0, expression_js_1.memberIsIValue)(node)) {
+            if ((0, expression_js_1.memberIsIValue)(node) && !(0, expression_js_1.nodeIsMeshed)(path)) {
                 if ((0, expression_js_1.exprIsSure)(path, internal)) {
-                    path.replaceWith(t.memberExpression(path.node, t.identifier("V")));
+                    path.replaceWith(t.memberExpression(path.node, internal_js_1.V));
                 }
                 else {
-                    path.replaceWith(t.optionalMemberExpression(path.node, t.identifier("V"), false, true));
+                    path.replaceWith(t.optionalMemberExpression(path.node, internal_js_1.V, false, true));
                 }
             }
             break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-vasille",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "Convert Vasille Meta Language code to pure JavaScript",
   "main": "lib/index.js",
   "type": "commonjs",