xml-toolkit 1.0.8 → 1.0.9

package/lib/NamespacePrefixesMap.js

@@ -2,40 +2,38 @@ const assert = require ('assert')
 
 const NamespacePrefixesMap = class extends Map {
 
-	constructor (schemata, o) {
+	constructor (schemata, node) {
 	
-		assert.strictEqual (typeof o, 'object')
-
 		super ()
 		
 		this.schemata = schemata
 		
-		this.add (o)
-		
+		this.checkNode (node)
+
 	}
 	
-	add (o) {
-
-		if (this.isAddedAsNamespaceReference (o)) return
+	checkNode ({targetNamespace, attributes, children}) {
+	
+		this.checkURI (targetNamespace)
+	
+		for (const a of Object.values (attributes))
 		
-		for (let v of Object.values (o)) if (typeof v === 'object') this.add (v)
+			if (Array.isArray (a) && a.length === 2)
+
+				this.checkURI (a [1])
+
+		for (const i of children) this.checkNode (i)
 	
 	}
 	
-	isAddedAsNamespaceReference (a) {
+	checkURI (uri) {
 
-		if (!Array.isArray (a)) return false
-		
-		if (a.length !== 2) return false
-		
-		const uri = a [1]
-		
-		if (!this.schemata.has (uri)) return false
+		if (this.has (uri)) return
+
+		if (!this.schemata.has (uri)) return
 
-		if (this.has (uri)) return true
-		
 		this.set (uri, 'ns' + this.size)
-		
+
 	}
 	
 	QName (localName, namespaceURI) {

package/lib/XMLMarshaller.js

@@ -109,10 +109,6 @@ const XMLMarshaller = class {
 	
 		switch (localName) {
 
-			case 'simpleType':
-
-				return this.appendScalar (node, data)
-
 			case 'attribute':
 
 				if (!(name in data)) return
@@ -135,6 +131,7 @@ const XMLMarshaller = class {
 			case 'sequence':
 			case 'choice':
 			case 'group':
+			case 'simpleType':
 			
 				return
 

package/lib/XMLSchemata.js

@@ -114,7 +114,7 @@ const XMLSchemata = class extends Map {
 			
 		}
 
-		const {targetNamespace} = options, mapper = n => n.detach ({nsMap: true})
+		const {targetNamespace} = options, mapper = n => n.detach ()
 
 		for await (const node of 
 

package/package.json

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

package/test/test.js

@@ -114,13 +114,13 @@ async function test_004_schemata (fn) {
 	const o = s.get (localName)
 	
 	const nspm = xs.getNamespacePrefixesMap (o)
-*/
 
 	console.log (xs.stringify ({
   		"ExportDebtRequestsRequest": {Id: 1}	
 	}))
+*/
 	
-	if (0) console.log (xs.stringify ({
+	console.log (xs.stringify ({
   "ExportDebtRequestsResponse": {	
     "request-data": {
       "request-id": "bac4c940-6ad3-11eb-9439-0242ac130002",
@@ -216,6 +216,10 @@ async function test_004_schemata (fn) {
 	console.log (xs.get ('urn:dom.gosuslugi.ru/debt-requests/1.0.0').get ('ActionType').restriction)
 */
  
+	console.log (xs.stringify ({
+  		"ExportDebtRequestsRequest": {Id: 1}	
+	})) 
+ 
 }
 
 async function test_005_schemata (fn) {
@@ -325,8 +329,8 @@ async function main () {
 //	await test_003_emitter_sync ('not-sa01.xml')
 // 	await test_003_emitter_sync ('ent.xml')
 //	await test_003_emitter_sync ('soap.xml')
-//	await test_004_schemata ()
-	await test_005_schemata ()
+	await test_004_schemata ()
+//	await test_005_schemata ()
 //	await test_006_schemata ()
 
 }