Fix spread bug #898 (#936)

hazzard993 · web-flow · commit 0d61965aa8a0 · 2020-12-13T12:28:59.000+01:00
diff --git a/src/transformation/visitors/variable-declaration.ts b/src/transformation/visitors/variable-declaration.ts
@@ -36,14 +36,13 @@ export function transformBindingPattern(
     propertyAccessStack: ts.PropertyName[] = []
 ): lua.Statement[] {
     const result: lua.Statement[] = [];
-    const isObjectBindingPattern = ts.isObjectBindingPattern(pattern);
 
     for (const [index, element] of pattern.elements.entries()) {
         if (ts.isOmittedExpression(element)) continue;
 
         if (ts.isArrayBindingPattern(element.name) || ts.isObjectBindingPattern(element.name)) {
             // nested binding pattern
-            const propertyName = isObjectBindingPattern
+            const propertyName = ts.isObjectBindingPattern(pattern)
                 ? element.propertyName
                 : ts.createNumericLiteral(String(index + 1));
 
@@ -73,24 +72,37 @@ export function transformBindingPattern(
                 continue;
             }
 
-            if (isObjectBindingPattern) {
-                const elements = pattern.elements as ts.NodeArray<ts.BindingElement>;
-                const usedProperties = elements.map(e =>
-                    lua.createTableFieldExpression(
-                        lua.createBooleanLiteral(true),
-                        lua.createStringLiteral(
-                            ((e.propertyName ?? e.name) as ts.Identifier).text,
-                            e.propertyName ?? e.name
-                        )
-                    )
+            if (ts.isObjectBindingPattern(pattern)) {
+                const excludedProperties: ts.Identifier[] = [];
+
+                for (const element of pattern.elements) {
+                    // const { ...x } = ...;
+                    //         ~~~~
+                    if (element.dotDotDotToken) continue;
+
+                    // const { x } = ...;
+                    //         ~
+                    if (ts.isIdentifier(element.name) && !element.propertyName) {
+                        excludedProperties.push(element.name);
+                    }
+
+                    // const { x: ... } = ...;
+                    //         ~~~~~~
+                    if (element.propertyName && element.name && ts.isIdentifier(element.propertyName)) {
+                        excludedProperties.push(element.propertyName);
+                    }
+                }
+
+                const excludedPropertiesTable = excludedProperties.map(e =>
+                    lua.createTableFieldExpression(lua.createBooleanLiteral(true), lua.createStringLiteral(e.text, e))
                 );
 
                 expression = transformLuaLibFunction(
                     context,
                     LuaLibFeature.ObjectRest,
                     undefined,
                     tableExpression,
-                    lua.createTableExpression(usedProperties)
+                    lua.createTableExpression(excludedPropertiesTable)
                 );
             } else {
                 expression = transformLuaLibFunction(
@@ -104,7 +116,7 @@ export function transformBindingPattern(
         } else {
             expression = lua.createTableIndexExpression(
                 tableExpression,
-                isObjectBindingPattern ? propertyName : lua.createNumericLiteral(index + 1)
+                ts.isObjectBindingPattern(pattern) ? propertyName : lua.createNumericLiteral(index + 1)
             );
         }
 
diff --git a/test/unit/destructuring.spec.ts b/test/unit/destructuring.spec.ts
@@ -12,6 +12,8 @@ const testCases = [
     { binding: "{ ...rest }", value: {} },
     { binding: "{ x, ...rest }", value: { x: "x" } },
     { binding: "{ x, ...rest }", value: { x: "x", y: "y", z: "z" } },
+    { binding: "{ x, ...y }", value: { x: "x", y: "y", z: "z" } },
+    { binding: "{ x: y, ...z }", value: { x: "x", y: "y", z: "z" } },
 
     { binding: "[]", value: [] },
     { binding: "[x, y]", value: ["x", "y"] },
