xml-toolkit 1.0.6 → 1.0.7

package/lib/XMLMarshaller.js

@@ -307,9 +307,9 @@ const XMLMarshaller = class {
 
 	_bSequence (buf, _sequence, content) {
 
-		const {element, sequence, choice, all} = _sequence, group = sequence || choice || all
+		const {element, sequence, choice, all, group} = _sequence, g = sequence || choice || all
 
-		if (group) this._bSequence (buf, group, content)
+		if (g) this._bSequence (buf, g, content)
 
 		if (element) {
 
@@ -324,6 +324,18 @@ const XMLMarshaller = class {
 			}
 				
 		}
+		
+		if (group) {
+
+			for (let e of Array.isArray (group) ? group : [group]) {
+
+				const {ref} = e; if (ref) e = this.xs.getByReference (ref)
+
+				this._bSequence (buf, e, content)
+				
+			}
+				
+		}
 
 	}
 	

package/lib/XMLSchema.js

@@ -22,6 +22,7 @@ const XMLSchema = class extends Map {
 			'element',
 			'complexType',
 			'simpleType',
+			'group',
 
 		]) if (type in node) {
 
@@ -86,6 +87,7 @@ XMLSchema.adjustNode = node => {
 
 		case 'attribute':
 		case 'element':
+		case 'group':
 			splitNs ('ref')
 			splitNs ('type')
 			break

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xml-toolkit",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Collection of classes for dealing with XML",
   "main": "index.js",
   "scripts": {

package/test/test.js

@@ -273,7 +273,7 @@ async function test_005_schemata (fn) {
 async function test_006_schemata (fn) {
 
 	const xs = await XMLSchemata.fromFile ('test/snils-by-additionalData-1.0.1.xsd')
-	
+
 	const data = {
 	  "SnilsByAdditionalDataRequest": {
 		"FamilyName": "ИВАНОВ",