Merge pull request #3 from MaijaHeiskanen/fix-usage-of-multiple-sprea…

…d-operators

Fix usage of multiple spread operators

package.json

@@ -18,8 +18,8 @@
     "inferno"
   ],
   "scripts": {
-    "test": "rimraf tests/temp && ts-node tests/index.ts",
-    "debug": "rimraf tests/temp && npm run build && node --inspect-brk --require ts-node/register tests/index.ts",
+    "test": "rimraf tests/temp && rimraf tests/tempES6 && ts-node tests/index.ts",
+    "debug": "rimraf tests/temp && rimraf tests/tempES6 && npm run build && node --inspect-brk --require ts-node/register tests/index.ts",
     "build": "tsc",
     "overwrite-references": "ts-node tests/overwriteReferences.ts",
     "prepublishOnly": "rimraf dist && tsc"

src/index.ts

@@ -478,7 +478,6 @@ export default () => {
     }
 
     function getVNodeProps(astProps: ts.NodeArray<ts.JsxAttributeLike>, isComponent) {
-      let props = []
       let key = null
       let ref = null
       let className = null
@@ -492,14 +491,28 @@ export default () => {
       let childFlags = null
       let contentEditable = false
       let assignArgs = []
+      let propsPropertyAssignments = []
+      let objectLiteralExpressionAdded = false
 
       for (let i = 0; i < astProps.length; i++) {
         let astProp = astProps[i]
         let initializer;
 
         if (astProp.kind === ts.SyntaxKind.JsxSpreadAttribute) {
+          if (propsPropertyAssignments.length) {
+            assignArgs.push(factory.createObjectLiteralExpression([...propsPropertyAssignments]))
+
+            propsPropertyAssignments = []
+          }
+
           needsNormalization = true
-          assignArgs = [factory.createObjectLiteralExpression(), astProp.expression]
+
+          if (!objectLiteralExpressionAdded) {
+            assignArgs.unshift(factory.createObjectLiteralExpression())
+            objectLiteralExpressionAdded = true
+          }
+
+          assignArgs.push(astProp.expression);
         } else {
           initializer = astProp.initializer
           let propName = astProp.name.text
@@ -510,14 +523,14 @@ export default () => {
           ) {
             className = getValue(initializer, visitor)
           } else if (!isComponent && propName === 'htmlFor') {
-            props.push(
+            propsPropertyAssignments.push(
               factory.createPropertyAssignment(
                 getName('for'),
                 getValue(initializer, visitor)
               )
             )
           } else if (!isComponent && propName === 'onDoubleClick') {
-            props.push(
+            propsPropertyAssignments.push(
               factory.createPropertyAssignment(
                 getName('onDblClick'),
                 getValue(initializer, visitor)
@@ -536,7 +549,7 @@ export default () => {
             )
           } else if (!isComponent && propName in svgAttributes) {
             // React compatibility for SVG Attributes
-            props.push(
+            propsPropertyAssignments.push(
               factory.createPropertyAssignment(
                 getName(svgAttributes[propName]),
                 getValue(initializer, visitor)
@@ -592,7 +605,7 @@ export default () => {
                 if (propName.toLowerCase() === 'contenteditable') {
                   contentEditable = true
                 }
-                props.push(
+                propsPropertyAssignments.push(
                   factory.createPropertyAssignment(
                     getName(propName),
                     initializer
@@ -605,7 +618,7 @@ export default () => {
         }
       }
 
-      if (props.length) assignArgs.push(factory.createObjectLiteralExpression(props))
+      if (propsPropertyAssignments.length) assignArgs.push(factory.createObjectLiteralExpression(propsPropertyAssignments))
 
       return {
         props: assignArgs,

tests/cases/spreadAttribute7.tsx

@@ -0,0 +1 @@
+<div {...props} {...other} foo="bar" foo2="bar2" {...more} foo3="bar3" />;

tests/references/spreadAttribute5.jsx

@@ -9,4 +9,4 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
 import * as inferno from "inferno";
 var normalizeProps = inferno.normalizeProps;
 var createVNode = inferno.createVNode;
-normalizeProps(createVNode(1, "div", "test", null, 1, __assign({}, props, { "foo": "bar" })));
+normalizeProps(createVNode(1, "div", "test", null, 1, __assign({}, { "foo": "bar" }, props)));

tests/references/spreadAttribute7.jsx

@@ -0,0 +1,12 @@
+var __assign = (this && this.__assign) || Object.assign || function(t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+        s = arguments[i];
+        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+            t[p] = s[p];
+    }
+    return t;
+};
+import * as inferno from "inferno";
+var normalizeProps = inferno.normalizeProps;
+var createVNode = inferno.createVNode;
+normalizeProps(createVNode(1, "div", null, null, 1, __assign({}, props, other, { "foo": "bar", "foo2": "bar2" }, more, { "foo3": "bar3" })));

tests/referencesES6/spreadAttribute5.jsx

@@ -1,2 +1,2 @@
 import { createVNode, normalizeProps } from "inferno";
-normalizeProps(createVNode(1, "div", "test", null, 1, Object.assign({}, props, { "foo": "bar" })));
+normalizeProps(createVNode(1, "div", "test", null, 1, Object.assign({}, { "foo": "bar" }, props)));

tests/referencesES6/spreadAttribute7.jsx

@@ -0,0 +1,2 @@
+import { createVNode, normalizeProps } from "inferno";
+normalizeProps(createVNode(1, "div", null, null, 1, Object.assign({}, props, other, { "foo": "bar", "foo2": "bar2" }, more, { "foo3": "bar3" })));