Merge branch 'main' of github.com:steelcheetah/node-xml-toolkit into _type

Author: MatveevRS

__tests__/XMLMarshaller.js

@@ -272,7 +272,7 @@ test ('20319', async () => {
 			MessageData: {
 				AppData: {
 					data: {
-						[Symbol.for ('type')]: 'getOrganizationsByEasRequest',
+						[Symbol.for ('type')]: 'GetOrganizationsByEasRequest',
 						eas:         123456,
 						countRecord: 1,
 						page:        1
@@ -282,6 +282,8 @@ test ('20319', async () => {
 		}
 	}
 
+	expect (xs.stringify (data)).toMatch (/xsi:type="ns\d*:GetOrganizationsByEasRequest"/)
+
 	expect (xs.stringify (data)).toMatch ('eas>123456<')
 
 })

__tests__/XMLSchemata.js

@@ -0,0 +1,15 @@
+const path = require('path')
+const { XMLSchemata } = require('../')
+
+test('cyclic import', async () => {
+    const xsdPath = path.join(__dirname, '..', '__data__', '30213','RequestEGRN_v026.xsd')
+
+    const schemata = await new Promise((resolve, reject) => {
+        XMLSchemata.fromFile(xsdPath)
+            .then(s => resolve(s))
+            .catch(e => reject(e))
+    })
+
+    expect(schemata).toBeDefined()
+    expect(schemata.size).toBeGreaterThan(0)
+})

lib/XMLMarshaller.js

@@ -111,7 +111,7 @@ const XMLMarshaller = class {
 
 		if (data && data [XSI_TYPE]) {
 			let d = {}; for (let k in data) d [k] = data [k]
-			this.appendElementBody (this.schema.get (data [XSI_TYPE]), d)
+			this.appendContent (this.schema.getType (data [XSI_TYPE]), d)
 		}
 
 		if (type) return this.appendContent (this.xs.getType (type), data)
@@ -145,7 +145,8 @@ const XMLMarshaller = class {
 					this.xs.getAttributeSimpleType (node).stringify (v)
 				)
 
-			case 'extension':		
+			case 'extension':
+			case 'restriction':
 				this.appendAttributes (this.xs.getType (attributes.base), data)
 
 			default:

lib/XMLSchemata.js

@@ -27,6 +27,8 @@ const XMLSchemata = class extends Map {
 		new XMLSchemaXml (this)
 		new XMLSchemaBuiltIn (this)
 
+		this.loadedFiles = new Set()
+
 		this.addFile (fn)
 
 	}
@@ -159,6 +161,10 @@ const XMLSchemata = class extends Map {
 
 	addFile (fn, options = {}) {
 
+		if (this.loadedFiles.has (fn)) return
+
+		this.loadedFiles.add (fn)
+
 		options.dirname = path.dirname (fn)
 
 		const document = this.parser.process (fs.readFileSync (fn, 'utf-8'))

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "xml-toolkit",
-  "version": "1.0.55",
+  "version": "1.0.58",
   "description": "XML parser, marshaller, SOAP adapter",
   "main": "index.js",
   "files": [