fix back assignment

hazzard993 · hazzard993 · commit bda404266a99 · 2019-12-08T12:43:08.000+10:00
diff --git a/src/transformation/utils/export.ts b/src/transformation/utils/export.ts
@@ -98,9 +98,7 @@ export function isSymbolExportedFromScope(
         return false;
     }
 
-    // ts.Iterator is not a ES6-compatible iterator, because TypeScript targets ES5
-    const it: Iterable<ts.Symbol> = { [Symbol.iterator]: () => scopeSymbol!.exports!.values() };
-    return [...it].includes(symbol);
+    return scopeSymbol.exports.has(symbol.escapedName);
 }
 
 export function addExportToIdentifier(
diff --git a/src/transformation/visitors/binary-expression/assignments.ts b/src/transformation/visitors/binary-expression/assignments.ts
@@ -1,15 +1,27 @@
 import * as ts from "typescript";
 import * as lua from "../../../LuaAST";
-import { cast, castEach } from "../../../utils";
 import { TransformationContext } from "../../context";
 import { isTupleReturnCall } from "../../utils/annotations";
 import { validateAssignment, validatePropertyAssignment } from "../../utils/assignment-validation";
+import { createExportedIdentifier, isSymbolExported } from "../../utils/export";
 import { createImmediatelyInvokedFunctionExpression, createUnpackCall, wrapInTable } from "../../utils/lua-ast";
 import { LuaLibFeature, transformLuaLibFunction } from "../../utils/lualib";
 import { isArrayType, isDestructuringAssignment } from "../../utils/typescript";
 import { transformElementAccessArgument } from "../access";
 import { isArrayLength, transformDestructuringAssignment } from "./destructuring-assignments";
 
+export function transformAssignmentLeftHandSideExpression(
+    context: TransformationContext,
+    node: ts.Expression
+): lua.AssignmentLeftHandSideExpression {
+    const symbol = context.checker.getSymbolAtLocation(node);
+    const left = context.transformExpression(node);
+
+    return lua.isIdentifier(left) && symbol && isSymbolExported(context, symbol)
+        ? createExportedIdentifier(context, left)
+        : (left as lua.AssignmentLeftHandSideExpression);
+}
+
 export function transformAssignment(
     context: TransformationContext,
     // TODO: Change type to ts.LeftHandSideExpression?
@@ -29,11 +41,7 @@ export function transformAssignment(
         );
     }
 
-    return lua.createAssignmentStatement(
-        cast(context.transformExpression(lhs), lua.isAssignmentLeftHandSideExpression),
-        right,
-        lhs.parent
-    );
+    return lua.createAssignmentStatement(transformAssignmentLeftHandSideExpression(context, lhs), right, lhs.parent);
 }
 
 export function transformAssignmentExpression(
@@ -139,10 +147,7 @@ export function transformAssignmentStatement(
                 right = createUnpackCall(context, right, expression.right);
             }
 
-            const left = castEach(
-                expression.left.elements.map(e => context.transformExpression(e)),
-                lua.isAssignmentLeftHandSideExpression
-            );
+            const left = expression.left.elements.map(e => transformAssignmentLeftHandSideExpression(context, e));
 
             return [lua.createAssignmentStatement(left, right, expression)];
         }
diff --git a/src/transformation/visitors/binary-expression/destructuring-assignments.ts b/src/transformation/visitors/binary-expression/destructuring-assignments.ts
@@ -5,9 +5,12 @@ import { TransformationContext } from "../../context";
 import { UnsupportedKind } from "../../utils/errors";
 import { LuaLibFeature, transformLuaLibFunction } from "../../utils/lualib";
 import { isArrayType, isAssignmentPattern } from "../../utils/typescript";
-import { transformIdentifier } from "../identifier";
 import { transformPropertyName } from "../literal";
-import { transformAssignment, transformAssignmentStatement } from "./assignments";
+import {
+    transformAssignment,
+    transformAssignmentLeftHandSideExpression,
+    transformAssignmentStatement,
+} from "./assignments";
 
 export function isArrayLength(
     context: TransformationContext,
@@ -170,7 +173,7 @@ function transformShorthandPropertyAssignment(
     root: lua.Expression
 ): lua.Statement[] {
     const result: lua.Statement[] = [];
-    const assignmentVariableName = transformIdentifier(context, node.name);
+    const assignmentVariableName = transformAssignmentLeftHandSideExpression(context, node.name);
     const extractionIndex = lua.createStringLiteral(node.name.text);
     const variableExtractionAssignmentStatement = lua.createAssignmentStatement(
         assignmentVariableName,
diff --git a/test/unit/modules/modules.spec.ts b/test/unit/modules/modules.spec.ts
@@ -209,3 +209,14 @@ test("Export Equals", () => {
 
     expect(result).toBe(true);
 });
+
+test.each(["x = true", "[x] = [true]", "[[x]] = [[true]]", "({ x } = { x: true })", "({ y: x } = { y: true })"])(
+    "export specifier with reassignment afterwards (%p)",
+    reassignment => {
+        util.testModule`
+        let x = false;
+        export { x };
+        ${reassignment};
+    `.expectToMatchJsResult();
+    }
+);

Original file line number	Diff line number	Diff line change
`@@ -98,9 +98,7 @@ export function isSymbolExportedFromScope(`
`98`	`98`	`return false;`
`99`	`99`	`}`
`100`	`100`
`101`		`- // ts.Iterator is not a ES6-compatible iterator, because TypeScript targets ES5`
`102`		`- const it: Iterable<ts.Symbol> = { [Symbol.iterator]: () => scopeSymbol!.exports!.values() };`
`103`		`- return [...it].includes(symbol);`
	`101`	`+ return scopeSymbol.exports.has(symbol.escapedName);`
`104`	`102`	`}`
`105`	`103`
`106`	`104`	`export function addExportToIdentifier(`