babel-plugin-vasille 4.3.0 → 4.3.2

package/lib/expression.js

@@ -377,16 +377,20 @@ function checkExpression(nodePath, search) {
         case "ObjectExpression": {
             const path = nodePath;
             for (const propPath of path.get("properties")) {
-                const prop = propPath.node;
-                if (t.isObjectProperty(prop)) {
-                    const path = propPath;
-                    const valuePath = path.get("value");
-                    if (path.node.computed) {
-                        checkOrIgnoreExpression(path.get("key"), search);
+                if (propPath.isObjectProperty()) {
+                    const keyPath = propPath.get("key");
+                    const valuePath = propPath.get("value");
+                    if (propPath.node.computed ||
+                        !(keyPath.isIdentifier() &&
+                            valuePath.isIdentifier() &&
+                            keyPath.node.name.startsWith("$") === valuePath.node.name.startsWith("$"))) {
+                        if (propPath.node.computed) {
+                            checkOrIgnoreExpression(propPath.get("key"), search);
+                        }
+                        checkOrIgnoreExpression(valuePath, search);
                     }
-                    checkOrIgnoreExpression(valuePath, search);
                 }
-                else if (t.isObjectMethod(prop)) {
+                else if (propPath.isObjectMethod()) {
                     checkFunction(propPath, search);
                 }
                 else {

package/lib/mesh.js

@@ -1040,13 +1040,12 @@ function composeStatement(path, internal) {
                         (0, lib_js_1.checkNonReactiveName)(idPath, internal);
                     }
                     // const s = new Set(), const m = new Map()
-                    else if (initPath.isNewExpression() && t.isIdentifier(initPath.node.callee)) {
-                        const name = initPath.node.callee.name;
-                        if (name === "Map" || name === "Set") {
-                            (0, lib_js_1.processModelCall)(initPath, name, kind === "const", internal, idName());
-                            meshInit = false;
-                            (0, lib_js_1.checkNonReactiveName)(idPath, internal);
-                        }
+                    else if (initPath.isNewExpression() &&
+                        t.isIdentifier(initPath.node.callee) &&
+                        ["Set", "Map"].includes(initPath.node.callee.name)) {
+                        (0, lib_js_1.processModelCall)(initPath, initPath.node.callee.name, kind === "const", internal, idName());
+                        meshInit = false;
+                        (0, lib_js_1.checkNonReactiveName)(idPath, internal);
                     }
                     else if (kind === "let") {
                         meshExpression(declaration.get("init"), internal);

package/package.json

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