Enforce group = false option on attributes even if element names are not unique and should be grouped. Fixes #192

Author: oozcitak

src/writers/ObjectWriter.ts

@@ -17,7 +17,7 @@ export class ObjectWriter extends BaseWriter<ObjectWriterOptions, XMLSerializedA
 
   /**
    * Initializes a new instance of `ObjectWriter`.
-   * 
+   *
    * @param builderOptions - XML builder options
    * @param writerOptions - serialization options
    */
@@ -33,7 +33,7 @@ export class ObjectWriter extends BaseWriter<ObjectWriterOptions, XMLSerializedA
 
   /**
    * Produces an XML serialization of the given node.
-   * 
+   *
    * @param node - node to serialize
    */
   serialize(node: Node): XMLSerializedAsObject | XMLSerializedAsObjectArray {
@@ -67,7 +67,7 @@ export class ObjectWriter extends BaseWriter<ObjectWriterOptions, XMLSerializedA
      * {
      *   root: {
      *     node: [
-     *       { 
+     *       {
      *         "@att1": "val1",
      *         "@att2": "val2",
      *         "#1": "node text",
@@ -141,10 +141,12 @@ export class ObjectWriter extends BaseWriter<ObjectWriterOptions, XMLSerializedA
         if (key === "@") {
           const attrs = (item as AttrNode)["@"]
           const attrKeys = Object.keys(attrs)
-          if (attrKeys.length === 1) {
-            obj[defAttrKey + attrKeys[0]] = attrs[attrKeys[0]]
+          if (!options.group || attrKeys.length === 1) {
+            for (const attrName in attrs) {
+              obj[defAttrKey + attrName] = attrs[attrName]
+            }
           } else {
-            obj[defAttrKey] = (item as AttrNode)["@"]
+            obj[defAttrKey] = attrs
           }
         }
       }
@@ -432,7 +434,7 @@ export class ObjectWriter extends BaseWriter<ObjectWriterOptions, XMLSerializedA
 
   /**
    * Returns an object key for the given node type.
-   * 
+   *
    * @param nodeType - node type to get a key for
    */
   private _getNodeKey(nodeType: NodeType): string {

test/issues/issue-105.test.ts

@@ -1,7 +1,7 @@
 import $$ from "../TestHelpers";
 
 describe("Replicate issue", () => {
-  // https://github.com/oozcitak/xmlbuilder2/issues/90
+  // https://github.com/oozcitak/xmlbuilder2/issues/105
   test(`#105 - Illegal character does not get sanitized.`, () => {
     const b = $$.create()
     b.ele('doc').ele('test').txt('some & text; foo')

test/issues/issue-178.test.ts

@@ -1,7 +1,7 @@
 import $$ from '../TestHelpers';
 
 describe('Replicate issue', () => {
-  // https://github.com/oozcitak/xmlbuilder2/issues/90
+  // https://github.com/oozcitak/xmlbuilder2/issues/178
   describe(`#178 - Namespace is removed when importing fragments.`, () => {
     const expectedOutput = $$.t`<?xml version="1.0"?><Root xmlns="ns1"><Parent xmlns="ns2"><Child xmlns="ns3"><GrandChild xmlns="ns4">txt</GrandChild></Child></Parent></Root>`;
     describe(`with defined namespaces on each element`, () => {

test/issues/issue-192.test.ts

@@ -0,0 +1,26 @@
+import $$ from '../TestHelpers';
+
+describe('Replicate issue', () => {
+  test(`#192 - Attributes being grouped in ObjectWriter in specific case despite group being false`, () => {
+    const expectedOutput = {
+      mode: {
+        '@attr1': "value",
+        '@attr2': "value",
+        "#": [
+          {
+            model: {}
+          },
+          {
+            blockers: {}
+          },
+          {
+            model: {}
+          }
+        ]
+      }
+    }
+    const xml = `<?xml version="1.0"?><mode attr1='value' attr2='value'><model /><blockers /><model /></mode>`;
+    const obj = $$.create(xml).end({ format: 'object', group: false });
+    expect(obj).toEqual(expectedOutput)
+  });
+});