fix some super edge-casey edge cases

Author: jsdf

src/serialiser.coffee

@@ -47,7 +47,10 @@ class Serialiser
     flushPairs = =>
       if pairAttrsBuffer.length
         serialisedChild = @serialiseAttributePairs(pairAttrsBuffer)
-        assigns.push(serialisedChild) if serialisedChild # skip null
+        if serialisedChild
+          assigns.push(serialisedChild)
+        else
+          assigns.push(type: $.CJSX_WHITESPACE, value: pairAttrsBuffer.map(@serialiseNode.bind(this)).join('').replace('\n', '\\\n'))
         pairAttrsBuffer = [] # reset buffer
 
     if firstNonWhitespaceChild(children)?.type is $.CJSX_ATTR_SPREAD
@@ -62,7 +65,20 @@ class Serialiser
 
     flushPairs()
 
-    "React.__spread(#{joinList(assigns)})"
+    accumulatedWhitespace = ''
+    assignsWithWhitespace = []
+    for assignItem, assignIndex in assigns
+      if typeof assignItem is 'object' and assignItem?.type is $.CJSX_WHITESPACE
+        accumulatedWhitespace += assignItem.value
+      if typeof assignItem is 'string'
+        assignsWithWhitespace.push accumulatedWhitespace+assignItem
+        accumulatedWhitespace = ''
+
+    if assignsWithWhitespace.length
+      lastAssignWithWhitespace = assignsWithWhitespace.pop()
+      assignsWithWhitespace.push lastAssignWithWhitespace+accumulatedWhitespace
+
+    "React.__spread(#{joinList(assignsWithWhitespace)})"
 
   serialiseAttributePairs: (children) ->
     # whitespace (particularly newlines) must be maintained

test/output-testcases.txt

@@ -538,18 +538,17 @@ complex spread attribute
 ##input
 <Component {...x} a={b} {... x } b="c" {...$my_xtraCoolVar123 } />
 ##expected
-React.createElement(Component, React.__spread({}, x, {"a": (b)},  x , {"b": "c"}, $my_xtraCoolVar123 ))
+React.createElement(Component, React.__spread({},  x, {"a": (b)},  x , {"b": "c"}, $my_xtraCoolVar123  ))
 ##end
 
 ##desc
 multiline spread attribute
 ##input
-<Component
- {...
+<Component {...
   x } a={b} {... x } b="c" {...z }>
 </Component>
 ##expected
-React.createElement(Component, React.__spread({},
+React.createElement(Component, React.__spread({},  
   x , {"a": (b)},  x , {"b": "c"}, z )
 )
 ##end
@@ -573,16 +572,39 @@ React.createElement(Component, React.__spread({ \
 })
 )
 ##end
+##desc
+multiline tag with spread attribute first
+##input
+<Component
+  {...
+  x}
+  z="1"
+  a={b}
+  b="c"
+>
+</Component>
+##expected
+React.createElement(Component, React.__spread({}, \
+  
+  x, { \
+  "z": "1",  \
+  "a": (b),  \
+  "b": "c"
+})
+)
+##end
+
 ##desc
 complex multiline spread attribute
 ##input
 <Component
- {...
+  {...
   y} a={b} {... x } b="c" {...z }>
   <div code={someFunc({a:{b:{}, C:'}'}})} />
 </Component>
 ##expected
-React.createElement(Component, React.__spread({},
+React.createElement(Component, React.__spread({}, \
+  
   y, {"a": (b)},  x , {"b": "c"}, z ),
   React.createElement("div", {"code": (someFunc({a:{b:{}, C:'}'}}))})
 )

test/test.coffee

@@ -37,6 +37,8 @@ tryCompile = (input, desc) ->
     e.message = """
     compile error in testcase: #{desc}
 
+    #{input}
+
     #{e.stack}
 
     """