Merge pull request #42 from raoulmillais/master

Add support for merging attributes and child elements (instead of keying them off a child property)

README.md

@@ -123,6 +123,9 @@ value})``. Possible options are:
     true; otherwise an array is created only if there is more than one.
   * `ignoreAttrs` (default: `false`): Ignore all XML attributes and only create
     text nodes.
+  * `mergeAttrs` (default: `false`): Merge attributes and child elements as
+    properties of the parent, instead of keying attributes off a child
+    attribute object. This option is ignored if `ignoreAttrs` is `false`.
 
 These default settings are for backward-compatibility (and might change in the
 future). For the most 'clean' parsing, you should disable `normalize` and

src/xml2js.coffee

@@ -22,6 +22,9 @@ class exports.Parser extends events.EventEmitter
       explicitArray: false
       # ignore all attributes regardless
       ignoreAttrs: false
+      # merge attributes and child elements onto parent object.  this may
+      # cause collisions.
+      mergeAttrs: false
     # overwrite them with the specified options, if any
     @options[key] = value for own key, value of opts
 
@@ -61,9 +64,12 @@ class exports.Parser extends events.EventEmitter
       obj[charkey] = ""
       unless @options.ignoreAttrs
         for own key of node.attributes
-          if attrkey not of obj
+          if attrkey not of obj and not @options.mergeAttrs
             obj[attrkey] = {}
-          obj[attrkey][key] = node.attributes[key]
+          if @options.mergeAttrs
+            obj[key] = node.attributes[key]
+          else
+            obj[attrkey][key] = node.attributes[key]
 
       # need a place to store the node name
       obj["#name"] = node.name

test/xml2js.test.coffee

@@ -55,6 +55,22 @@ module.exports =
     assert.equal r['listtest']['item'][1]['#'], 'Qux.'
     assert.equal r['listtest']['item'][2]['#'], 'Quux.')
 
+  'test parse with mergeAttrs': skeleton(mergeAttrs: true, (r) ->
+    console.log 'Result object: ' + util.inspect(r, false, 10)
+    assert.equal r['chartest']['desc'], 'Test for CHARs'
+    assert.equal r['chartest']['#'], 'Character data here!'
+    assert.equal r['cdatatest']['desc'], 'Test for CDATA'
+    assert.equal r['cdatatest']['misc'], 'true'
+    assert.equal r['cdatatest']['#'], 'CDATA here!'
+    assert.equal r['nochartest']['desc'], 'No data'
+    assert.equal r['nochartest']['misc'], 'false'
+    assert.equal r['listtest']['item'][0]['#'], 'This is character data!'
+    assert.equal r['listtest']['item'][0]['subitem'][0], 'Foo(1)'
+    assert.equal r['listtest']['item'][0]['subitem'][1], 'Foo(2)'
+    assert.equal r['listtest']['item'][0]['subitem'][2], 'Foo(3)'
+    assert.equal r['listtest']['item'][0]['subitem'][3], 'Foo(4)'
+    assert.equal r['listtest']['item'][1], 'Qux.'
+    assert.equal r['listtest']['item'][2], 'Quux.')
   'test default text handling': skeleton(undefined, (r) ->
     assert.equal r['whitespacetest']['#'], 'Line One Line Two')