babel-plugin-vasille 4.3.1 → 4.3.3

package/lib/expression.js

@@ -42,6 +42,7 @@ exports.checkOrIgnoreAllExpressions = checkOrIgnoreAllExpressions;
 exports.checkAllExpressions = checkAllExpressions;
 exports.checkAllUnknown = checkAllUnknown;
 exports.checkOrIgnoreExpression = checkOrIgnoreExpression;
+exports.assignToSetCall = assignToSetCall;
 exports.checkExpression = checkExpression;
 exports.checkStatements = checkStatements;
 exports.checkStatement = checkStatement;
@@ -215,6 +216,12 @@ function checkOrIgnoreExpression(path, search) {
         checkExpression(path, search);
     }
 }
+function assignToSetCall(path, internal, left, right) {
+    const property = left.property;
+    path.replaceWith(internal.set(left.object, !left.computed && t.isIdentifier(property) ? t.stringLiteral(property.name) : property, path.node.operator === "="
+        ? right
+        : t.binaryExpression(path.node.operator.slice(0, path.node.operator.length - 1), internal.extract(left), right)));
+}
 function checkExpression(nodePath, search) {
     const expr = nodePath.node;
     switch (expr && expr.type) {
@@ -278,7 +285,7 @@ function checkExpression(nodePath, search) {
                 checkExpression(right, search);
                 /* istanbul ignore else */
                 if (!t.isPrivateName(property)) {
-                    path.replaceWith(search.external.set(left.node.object, !left.node.computed && t.isIdentifier(property) ? t.stringLiteral(property.name) : property, right.node));
+                    assignToSetCall(path, search.external, left.node, right.node);
                 }
             }
             else {
@@ -377,16 +384,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

@@ -222,7 +222,7 @@ function meshExpression(nodePath, internal) {
                     meshExpression(right, internal);
                     /* istanbul ignore else */
                     if (!t.isPrivateName(property)) {
-                        path.replaceWith(internal.set(left.node.object, !left.node.computed && t.isIdentifier(property) ? t.stringLiteral(property.name) : property, right.node));
+                        (0, expression_js_1.assignToSetCall)(path, internal, left.node, right.node);
                     }
                 }
             }

package/lib/transformer.js

@@ -146,6 +146,7 @@ function transformProgram(path, filename, opts) {
         set: "VasilleSet",
         Switch: "VasilleSwitch",
         safe: "VasilleSafe",
+        extract: "VasilleExtract",
     };
     function call(key, args) {
         used.add(key);
@@ -179,6 +180,7 @@ function transformProgram(path, filename, opts) {
         set: (obj, field, value) => call("set", [obj, field, value]),
         Switch: arg => call("Switch", [arg, internal_js_1.ctx]),
         safe: (arg) => call("safe", [arg]),
+        extract: (arg) => call("extract", [arg]),
     };
     function getCtx() {
         if (internal.isComposing)

package/package.json

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