@wyw-in-js/transform 0.2.1 → 0.2.3

package/types/utils/collectExportsAndImports.js

@@ -546,6 +546,13 @@ function addExport(path, exported, state) {
         state.exports[exported] = path;
     }
 }
+const saveRef = (state, exportName, memberExpression) => {
+    // Save all export.____ usages for later
+    if (!state.exportRefs.has(exportName)) {
+        state.exportRefs.set(exportName, []);
+    }
+    state.exportRefs.get(exportName).push(memberExpression);
+};
 function collectFromExports(path, state) {
     if (!(0, isExports_1.isExports)(path))
         return;
@@ -557,19 +564,12 @@ function collectFromExports(path, state) {
             return;
         }
         const exportName = property.node.name;
-        const saveRef = () => {
-            // Save all export.____ usages for later
-            if (!state.exportRefs.has(exportName)) {
-                state.exportRefs.set(exportName, []);
-            }
-            state.exportRefs.get(exportName).push(memberExpression);
-        };
         const assignmentExpression = memberExpression.parentPath;
         if (!assignmentExpression.isAssignmentExpression({
             left: memberExpression.node,
         })) {
             // If it's not `exports.prop = …`. Just save it.
-            saveRef();
+            saveRef(state, exportName, memberExpression);
             return;
         }
         const right = assignmentExpression.get('right');
@@ -582,7 +582,7 @@ function collectFromExports(path, state) {
             state.isEsModule = true;
             return;
         }
-        saveRef();
+        saveRef(state, exportName, memberExpression);
         // eslint-disable-next-line no-param-reassign
         state.exports[property.node.name] = right;
         return;
@@ -838,7 +838,8 @@ function collectFromAssignmentExpression(path, state) {
     const left = path.get('left');
     const right = path.get('right');
     let exported;
-    if (left.isMemberExpression() && (0, isExports_1.isExports)(left.get('object'))) {
+    const isExportRef = left.isMemberExpression() && (0, isExports_1.isExports)(left.get('object'));
+    if (isExportRef) {
         const property = left.get('property');
         if (!left.node.computed && property.isIdentifier()) {
             exported = property.node.name;
@@ -872,6 +873,9 @@ function collectFromAssignmentExpression(path, state) {
             // eslint-disable-next-line no-param-reassign
             state.exports[exported] = right;
         }
+        if (isExportRef) {
+            saveRef(state, exported, left);
+        }
         path.skip();
         return;
     }

package/types/utils/scopeHelpers.js

@@ -258,6 +258,10 @@ function findActionForNode(path) {
         ];
     }
     if (parent.isAssignmentExpression()) {
+        if (path.isAssignmentExpression()) {
+            // `foo = bar = 42` should be replaced with `foo = 42`
+            return ['replace', path, path.node.right];
+        }
         return findActionForNode(parent);
     }
     if (parent.isCallExpression()) {
@@ -295,6 +299,15 @@ function findActionForNode(path) {
         }
     }
     if (parent.isVariableDeclarator()) {
+        if (path.key === 'init' && path.isAssignmentExpression()) {
+            // We are removing `bar` in `var foo = bar = 42`. Path should be replaced with `var foo = 42`
+            return ['replace', path, path.node.right];
+        }
+        const init = parent.get('init');
+        if (path.key === 'id' && init.isAssignmentExpression()) {
+            // We are removing `foo` in `var foo = bar = 42`. Ignore it.
+            return null;
+        }
         return findActionForNode(parent);
     }
     if (parent.isExportNamedDeclaration() &&