stringify cson with no indent

src/stringify.coffee

@@ -60,8 +60,6 @@ module.exports = (data, visitor, indent) ->
 
     else 0
 
-  return JSON.stringify data, visitor, indent unless indent
-
   indentLine = (line) -> indent + line
 
   indentLines = (str) ->
@@ -72,7 +70,7 @@ module.exports = (data, visitor, indent) ->
   normalized = JSON.parse JSON.stringify data, visitor
 
   visitString = (str) ->
-    if str.indexOf('\n') == -1
+    if str.indexOf('\n') == -1 or !indent
       JSON.stringify str
     else
       string = str
@@ -81,45 +79,56 @@ module.exports = (data, visitor, indent) ->
       "'''#{ newlineWrap indentLines string }'''"
 
   visitArray = (arr) ->
-    items = arr.map (value) ->
-      serializedValue = visitNode value
-      if isObject value
-        "{#{ newlineWrap indentLines serializedValue }}"
+    items = arr.map (value) -> visitNode value, bracesRequired: true
+
+    serializedItems =
+      if indent
+        newlineWrap indentLines items.join '\n'
       else
-        serializedValue
+        items.join ','
 
-    array = items.join '\n'
-    "[#{ newlineWrap indentLines array }]"
+    "[#{ serializedItems }]"
 
-  visitObject = (obj) ->
+  visitObject = (obj, {bracesRequired}) ->
     keypairs = for key, value of obj
       key = JSON.stringify key unless key.match jsIdentifierRE
-      serializedValue = visitNode value
-      if isObject value
-        if serializedValue == ''
-          "#{ key }: {}"
-        else
-          "#{ key }:\n#{ indentLines serializedValue }"
+      serializedValue = visitNode value, bracesRequired: !indent
+      if indent
+        serializedValue =
+          if isObject value
+            "\n#{ indentLines serializedValue }"
+          else
+            " #{ serializedValue }"
+      "#{ key }:#{ serializedValue }"
+
+    if keypairs.length is 0
+      '{}'
+    else if indent
+      serializedKeyPairs = keypairs.join '\n'
+      if bracesRequired
+        "{#{ newlineWrap indentLines serializedKeyPairs }}"
       else
-        "#{ key }: #{ serializedValue }"
-
-    keypairs.join '\n'
+        serializedKeyPairs
+    else
+      serializedKeyPairs = keypairs.join ','
+      if bracesRequired
+        "{#{ serializedKeyPairs }}"
+      else
+        serializedKeyPairs
 
-  visitNode = (node) ->
+  visitNode = (node, options = {}) ->
     switch typeof node
       when 'boolean' then "#{node}"
 
       when 'number'
         if isFinite node then "#{node}"
         else 'null' # NaN, Infinity and -Infinity
 
-      when 'string' then visitString node
+      when 'string' then visitString node, options
 
       when 'object'
         if node == null then 'null'
-        else if Array.isArray(node) then visitArray(node)
-        else visitObject(node)
+        else if Array.isArray(node) then visitArray node, options
+        else visitObject node, options
 
-  out = visitNode normalized
-  if out == '' then '{}' # the only thing that serializes to '' is an empty object
-  else out
+  visitNode normalized

test/stringify.coffee

@@ -37,6 +37,14 @@ describe 'CSON.stringify', ->
       and I have a sneaky ''' in here, too
     """
 
+  it 'handles multi-line strings (with 0 indentation)', ->
+    equal """
+    "I am your average multi-line string,\\nand I have a sneaky ''' in here, too"
+    """, cson """
+      I am your average multi-line string,
+      and I have a sneaky ''' in here, too
+    """, null, 0
+
   it 'handles multi-line strings w/ backslash', ->
     test = '\\\n\\'
     expected = "'''\n  \\\\\n  \\\\\n'''"
@@ -58,6 +66,11 @@ describe 'CSON.stringify', ->
       ]
     ''', cson [ [1], null, [], a: 'str', {} ]
 
+  it 'handles arrays (with 0 indentation)', ->
+    equal '''
+    [[1],null,[],{a:"str"},{}]
+    ''', cson [ [1], null, [], a: 'str', {} ], null, 0
+
   it 'handles objects', ->
     equal '''
       "": "empty"
@@ -82,6 +95,22 @@ describe 'CSON.stringify', ->
       ]
     }
 
+  it 'handles objects (with 0 indentation)', ->
+    equal '''
+    "":"empty","non\\nidentifier":true,default:false,nested:{string:"too"},array:[{},[]]
+    ''', cson {
+      '': 'empty'
+      "non\nidentifier": true
+      default: false
+      nested: {
+        string: 'too'
+      }
+      array: [
+        {}
+        []
+      ]
+    }, null, 0
+
   it 'handles NaN and +/-Infinity like JSON.stringify does', ->
     equal 'null', cson NaN
     equal 'null', cson +Infinity
@@ -93,10 +122,6 @@ describe 'CSON.stringify', ->
   it 'handles functions like JSON.stringify does', ->
     equal undefined, cson ->
 
-  it 'works just like JSON.stringify when asking for no indentation', ->
-    equal '{"zeroed":0}', cson zeroed: 0, null, 0
-    equal '{"empty":""}', cson empty: '', null, ''
-
   it 'accepts no more than ten indentation steps, just like JSON.stringify', ->
     equal '''
       x: