cjsx comments are stripped out

Author: jsdf

README.md

@@ -13,6 +13,7 @@ Car = React.createClass
       <Parts.FrontSeat />
       <Parts.BackSeat />
       <p className="seat">Which seat can I take? {@props?.seat or 'none'}</p>
+      {# also, this is a comment }
     </Vehicle>
 ```
 

src/parser.coffee

@@ -209,7 +209,7 @@ module.exports = class Parser
         first_line: @chunkLine, first_column: @chunkColumn
 
   cjsxComment: ->
-    match = @chunk.match(/^\{#(.*)\}/)
+    match = @chunk.match(CJSX_ESC_COMMENT)
 
     return 0 unless match
     @addLeafNodeToActiveBranch ParseTreeLeafNode($.CJSX_COMMENT, match[1])
@@ -423,6 +423,8 @@ TAG_ATTRIBUTES = ///
 
 PRAGMA = /^\s*#\s*@cjsx\s+(\S*)/i
 
+CJSX_ESC_COMMENT = /^\{#(.*)\}/
+
 # from coffeescript lexer
 
 # The character code of the nasty Microsoft madness otherwise known as the BOM.

src/serialiser.coffee

@@ -83,7 +83,6 @@ class Serialiser
     # to ensure line number parity
 
     # sort children into whitespace and semantic (non whitespace) groups
-    # this seems wrong :\
     [whitespaceChildren, semanticChildren] = children.reduce((partitionedChildren, child) ->
       if child.type is $.CJSX_WHITESPACE
         partitionedChildren[0].push child
@@ -141,7 +140,7 @@ nodeSerialisers =
     for child in node.children
       serialisedChild = @serialiseNode child
       if child? # filter empty text nodes
-        if WHITESPACE_ONLY.test serialisedChild
+        if serialisedChild.length is 0 or WHITESPACE_ONLY.test serialisedChild
           accumulatedWhitespace += serialisedChild
         else
           serialisedChildren.push(accumulatedWhitespace + serialisedChild)
@@ -160,7 +159,7 @@ nodeSerialisers =
     "#{@reactObject}.createElement(#{element}, #{joinList(serialisedChildren)})"
 
   CJSX_COMMENT: (node) ->
-    ""
+    'null'
 
   CJSX_ESC: (node) ->
     childrenSerialised = node.children

test/output-testcases.txt

@@ -510,7 +510,7 @@ cjsx comment is passed through
 {# i am a comment}
 </Person>
 ##expected
-React.createElement(Person, null,
+React.createElement(Person, null
 
 )
 ##end
@@ -520,7 +520,7 @@ comment syntax can be used inline
 ##input
 <Person>{#comment inline}</Person>
 ##expected
-React.createElement(Person, null, )
+React.createElement(Person, null)
 ##end
 
 ##desc