fixed some bugs relating to self closing tags with spread, added more test cases

Author: jsdf

src/serialiser.coffee

@@ -39,42 +39,68 @@ class Serialiser
     serialised
 
   serialiseSpreadAndPairAttributes: (children) ->
-    assigns = []
-    pairAttrsBuffer = []
+    assigns = [] # nodes
+    pairAttrsBuffer = [] # nodes
 
     flushPairs = =>
       if pairAttrsBuffer.length
         serialisedChild = @serialiseAttributePairs(pairAttrsBuffer)
         if serialisedChild
-          assigns.push(serialisedChild)
+          assigns.push(type: $.CS, value: serialisedChild)
         else
-          assigns.push(type: $.CJSX_WHITESPACE, value: pairAttrsBuffer.map(@serialiseNode.bind(this)).join('').replace('\n', '\\\n'))
+          serialisedPairs = pairAttrsBuffer
+            .map((p) => @serialiseNode(p))
+            .join('')
+            # escaping newlines might create a syntax error if the newline is
+            # after the last arg in a list, so we'll fix it below
+            .replace('\n', '\\\n')
+          assigns.push(type: $.CJSX_WHITESPACE, value: serialisedPairs)
         pairAttrsBuffer = [] # reset buffer
 
+    # okay this is pretty gross. once source maps are up and running all of the
+    # whitespace related bs can be nuked as there will no longer be a need to 
+    # torture the CS syntax to maintain whitespace and output the same number 
+    # of lines while also transforming syntax. however in the mean time, this is 
+    # what we're doing.
+
+    # this code rewrites attr pair, spread, etc nodes into CS (code fragment) 
+    # and whitespace nodes. then they are serialised and joined with whitespace 
+    # maintained, and newlines escaped (except at the end of an args list)
+    
+    # initial object assign arg
     if firstNonWhitespaceChild(children)?.type is $.CJSX_ATTR_SPREAD
-      assigns.push('{}')
+      assigns.push(type: $.CS, value: '{}')
 
+    # group sets of attr pairs between spreads
     for child, childIndex in children
       if child.type is $.CJSX_ATTR_SPREAD
         flushPairs()
-        assigns.push(child.value)
+        assigns.push(type: $.CS, value: child.value)
       else
         pairAttrsBuffer.push(child)
 
+    # finally group any remaining pairs
     flushPairs()
 
+    # serialising the rewritten nodes with whitespace maintained
     accumulatedWhitespace = ''
-    assignsWithWhitespace = []
+    assignsWithWhitespace = [] # serialised nodes texts
     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 assignItem?
+        if assignItem.type is $.CJSX_WHITESPACE
+          accumulatedWhitespace += @serialiseNode(assignItem)
+        else
+          assignsWithWhitespace.push(accumulatedWhitespace + @serialiseNode(assignItem))
+          accumulatedWhitespace = ''
 
     if assignsWithWhitespace.length
       lastAssignWithWhitespace = assignsWithWhitespace.pop()
-      assignsWithWhitespace.push lastAssignWithWhitespace+accumulatedWhitespace
+      # hack to fix potential syntax error when newlines are escaped after last arg
+      # TODO: kill this with fire once sourcemaps are available
+      trailingWhiteplace = accumulatedWhitespace.replace('\\\n', '\n')
+      assignsWithWhitespace.push(lastAssignWithWhitespace + trailingWhiteplace)
+
+    joinedAssigns = joinList(assignsWithWhitespace)
 
     "React.__spread(#{joinList(assignsWithWhitespace)})"
 

test/output-testcases.txt

@@ -656,6 +656,62 @@ React.createElement(Component, React.__spread({}, \
 )
 ##end
 
+##desc
+self closing spread attribute on single line
+##input
+<Component a="b" c="d" {...@props} />
+##expected
+React.createElement(Component, React.__spread({"a": "b", "c": "d"}, @props ))
+##end
+
+##desc
+self closing spread attribute on new line
+##input
+<Component
+  a="b"
+  c="d"
+  {...@props}
+/>
+##expected
+React.createElement(Component, React.__spread({ \
+  "a": "b",  \
+  "c": "d"
+  }, @props
+))
+##end
+
+##desc
+self closing spread attribute on same line
+##input
+<Component
+  a="b"
+  c="d"
+  {...@props} />
+##expected
+React.createElement(Component, React.__spread({ \
+  "a": "b",  \
+  "c": "d"
+  }, @props ))
+##end
+
+##desc
+self closing spread attribute on next line
+##input
+<Component
+  a="b"
+  c="d"
+  {...@props}
+
+/>
+##expected
+React.createElement(Component, React.__spread({ \
+  "a": "b",  \
+  "c": "d"
+  }, @props
+
+))
+##end
+
 ##desc
 Empty strings are not converted to true
 ##input