Merge 20a2136 into fe4cb27

src/parser/xmlHandler.js

@@ -381,7 +381,7 @@ class XMLHandler {
     prefix = prefix || 'soap';
     var doc = xmlBuilder.create(prefix + ':Envelope',
       {version: '1.0', encoding: 'UTF-8', standalone: true});
-    nsURI = nsURI || 'http://schemas.xmlsoap.org/soap/envelope/'
+    nsURI = nsURI || 'http://schemas.xmlsoap.org/soap/envelope/';
     doc.attribute('xmlns:' + prefix,
       nsURI);
     let header = doc.element(prefix + ':Header');
@@ -395,7 +395,7 @@ class XMLHandler {
 
   static createSOAPEnvelopeDescriptor(prefix, nsURI, parameterDescriptor) {
     prefix = prefix || 'soap';
-    nsURI = nsURI || 'http://schemas.xmlsoap.org/soap/envelope/'
+    nsURI = nsURI || 'http://schemas.xmlsoap.org/soap/envelope/';
     var descriptor = new TypeDescriptor();
 
     var envelopeDescriptor = new ElementDescriptor(
@@ -648,7 +648,20 @@ class XMLHandler {
         top.object = {};
       }
       if (top.object !== null) {
-        if (typeof top.object === 'object' && elementName in top.object) {
+        if (current.descriptor && current.descriptor.isMany) {
+          // Schema enforces array
+          let val = top.object[elementName];
+          if (Array.isArray(val)) {
+            // Add to the existing array
+            val.push(current.object);
+          } else if (!val) {
+            // Not present, create a new array
+            top.object[elementName] = [current.object];
+          } else {
+            // Convert the element value to an array
+            top.object[elementName] = [val, current.object];
+          }
+        } else if (typeof top.object === 'object' && elementName in top.object) {
           // The element exist already, let's create an array
           let val = top.object[elementName];
           if (Array.isArray(val)) {
@@ -766,7 +779,7 @@ function getSoap11FaultErrorMessage(faultBody) {
       if (typeof detail == 'string') { //plain text
         errorMessage = errorMessage + ' detail: ' + detail;
       } else { //XML type defined in wsdl
-        errorMessage = errorMessage + ' detail: ' + JSON.stringify(detail)
+        errorMessage = errorMessage + ' detail: ' + JSON.stringify(detail);
       }
     }
   }
@@ -812,7 +825,7 @@ function getSoap12FaultErrorMessage(faultBody) {
       if (typeof detail == 'string') { //plain text
         errorMessage = errorMessage + ' Detail: ' + detail;
       } else { //XML type defined in wsdl
-        errorMessage = errorMessage + ' Detail: ' + JSON.stringify(detail)
+        errorMessage = errorMessage + ' Detail: ' + JSON.stringify(detail);
       }
     }
   }

test/request-response-samples/Dummy__should_add_prefix_for_unqualified_global_elements/response.json

@@ -1,7 +1,9 @@
 {
   "DummyResult": {
     "DummyList": {
-      "DummyElement": "Dummy Element Entry"
+        "DummyElement": [
+          "Dummy Element Entry"
+        ]
     }
   }
 }

test/request-response-samples/Dummy__should_extract_envelope_from_response/response.json

@@ -1,12 +1,14 @@
 {
   "DummyResult": {
     "DummyList": {
-      "DummyElement": {
-        "$attributes": {
-          "language": "en-US"
-        },
-        "$value": "Dummy Element Entry"
-      }
+      "DummyElement": [
+        {
+          "$attributes": {
+            "language": "en-US"
+          },
+          "$value": "Dummy Element Entry"
+        }
+      ]
     }
   }
 }

test/request-response-samples/Dummy__should_handle_attributes_in_request/response.json

@@ -1,12 +1,14 @@
 {
   "DummyResult": {
     "DummyList": {
-      "DummyElement": {
-        "$attributes": {
-          "language": "en-US"
-        },
-        "$value": "Dummy Element Entry"
-      }
+      "DummyElement": [
+        {
+          "$attributes": {
+            "language": "en-US"
+          },
+          "$value": "Dummy Element Entry"
+        }
+      ]
     }
   }
 }

test/request-response-samples/Dummy__should_handle_attributes_in_response/response.json

@@ -1,12 +1,14 @@
 {
   "DummyResult": {
     "DummyList": {
-      "DummyElement": {
-        "$attributes": {
-          "language": "en-US"
-        },
-        "$value": "Dummy Element Entry"
-      }
+      "DummyElement": [
+        {
+          "$attributes": {
+            "language": "en-US"
+          },
+          "$value": "Dummy Element Entry"
+        }
+      ]
     }
   }
 }

test/request-response-samples/Dummy__should_handle_cdata_xml_in_response/response.json

@@ -1,25 +1,27 @@
 {
   "DummyResult": {
     "DummyList": {
-      "DummyElement": {
-        "$attributes": {
-          "language": "en-US"
-        },
-        "$value": {
-		  "response":  {
-		    "forms": {
-			  "form": {
-			    "$attributes": {
-				  "ObjectId":  "1234",
-				  "Form_Name": "Dummy Form"
-				},
-				"First_Name": "Humpty",
-				"Last_Name": "Dumpty"
-			  }
-			}
-		  }
+			"DummyElement": [
+				{
+					"$attributes": {
+						"language": "en-US"
+					},
+					"$value": {
+						"response":  {
+							"forms": {
+								"form": {
+									"$attributes": {
+									"ObjectId":  "1234",
+									"Form_Name": "Dummy Form"
+								},
+								"First_Name": "Humpty",
+								"Last_Name": "Dumpty"
+								}
+							}
+						}
+					}
+				}
+			]
 		}
-	  }
-    }
   }
 }

test/request-response-samples/Dummy__should_handle_null_args/response.json

@@ -1,7 +1,9 @@
 {
   "DummyResult": {
     "DummyList": {
-      "DummyElement": "Dummy Element Entry"
+      "DummyElement": [
+        "Dummy Element Entry"
+      ]
     }
   }
 }

test/request-response-samples/Dummy__should_handle_xml_date_time_dateTime/response.json

@@ -1,7 +1,9 @@
 {
   "DummyResult": {
     "DummyList": {
-      "DummyElement": null
+      "DummyElement": [
+        null
+      ]
     }
   }
 }

test/request-response-samples/Dummy__should_ignore_custom_defined_namespaces/response.json

@@ -1,12 +1,14 @@
 {
   "DummyResult": {
     "DummyList": {
-      "DummyElement": {
-        "$attributes": {
-          "language": "en-US"
-        },
-        "$value": "Dummy Element Entry"
-      }
+      "DummyElement": [
+        {
+          "$attributes": {
+            "language": "en-US"
+          },
+          "$value": "Dummy Element Entry"
+        }
+      ]
     }
   }
 }

test/request-response-samples/Dummy__should_ignore_defined_namespaces/response.json

@@ -1,12 +1,14 @@
 {
   "DummyResult": {
     "DummyList": {
-      "DummyElement": {
-        "$attributes": {
-          "language": "en-US"
-        },
-        "$value": "Dummy Element Entry"
-      }
+      "DummyElement": [
+        {
+          "$attributes": {
+            "language": "en-US"
+          },
+          "$value": "Dummy Element Entry"
+        }
+      ]
     }
   }
 }

test/request-response-samples/Dummy__should_parse_nil/response.json

@@ -1,7 +1,9 @@
 {
   "DummyResult": {
     "DummyList": {
-      "DummyElement": null
+      "DummyElement": [
+        null
+      ]
     }
   }
 }

test/request-response-samples/Dummy__should_use_defined_value_key/response.json

@@ -1,12 +1,14 @@
 {
   "DummyResult": {
     "DummyList": {
-      "DummyElement": {
-        "$attributes": {
-          "language": "en-US"
-        },
-        "$value": "Dummy Element Entry"
-      }
+      "DummyElement": [
+        {
+          "$attributes": {
+            "language": "en-US"
+          },
+          "$value": "Dummy Element Entry"
+        }
+      ]
     }
   }
 }

test/request-response-samples/Dummy__should_use_defined_xml_key/response.json

@@ -1,12 +1,14 @@
 {
   "DummyResult": {
     "DummyList": {
-      "DummyElement": {
-        "$attributes": {
-          "language": "en-US"
-        },
-        "$value": "Dummy Element Entry"
-      }
+      "DummyElement": [
+        {
+          "$attributes": {
+            "language": "en-US"
+          },
+          "$value": "Dummy Element Entry"
+        }
+      ]
     }
   }
 }

test/request-response-samples/UpdateProfile__correct_namespaces_for_elements_with_base/response.json

@@ -1,16 +1,17 @@
 {
-  "Result":{
+  "Result": {
     "$attributes": {
       "resultStatusFlag": "SUCCESS"
     },
     "IDs": {
-      "UniqueID":
+      "UniqueID": [
         {
           "$attributes": {
             "source": "TESTSOURCE"
           },
           "$value": "100"
         }
+      ]
     }
   }
 }

test/request-response-samples/UpdateProfile__correct_namespaces_for_elements_with_base_ignorednamespaces/response.json

@@ -1,16 +1,17 @@
 {
-  "Result":{
+  "Result": {
     "$attributes": {
       "resultStatusFlag": "SUCCESS"
     },
     "IDs": {
-      "UniqueID":
+      "UniqueID": [
         {
           "$attributes": {
             "source": "TESTSOURCE"
           },
           "$value": "100"
         }
-     }
+      ]
+    }
   }
 }

test/request-response-samples/UpdateProfile__correct_namespaces_in_sequence_with_imports/response.json

@@ -1,16 +1,17 @@
 {
-  "Result":{
+  "Result": {
     "$attributes": {
       "resultStatusFlag": "SUCCESS"
     },
     "IDs": {
-      "UniqueID":
+      "UniqueID": [
         {
           "$attributes": {
             "source": "TESTSOURCE"
           },
           "$value": "100"
         }
-     }
+      ]
+    }
   }
 }

test/request-response-samples/addList__xsi_type/response.json

@@ -1,9 +1,11 @@
 {
-  "record": {
-    "$attributes": {
-      "$xsiType": { "type": "UserRecord", "xmlns": "urn:example" }
-    },
-    "id": "2",
-    "name": "Mary"
-  }
+  "record": [
+    {
+      "$attributes": {
+        "$xsiType": { "type": "UserRecord", "xmlns": "urn:example" }
+      },
+      "id": "2",
+      "name": "Mary"
+    }
+  ]
 }