Fixes #150.

Author: highsource

dist/Jsonix-all.js

@@ -5877,11 +5877,11 @@ Jsonix.Context = Jsonix
 				}
 				for (index = 0; index < this.modules.length; index++) {
 					module = this.modules[index];
-					module.buildTypeInfos(this);
+					module.registerElementInfos(this);
 				}
 				for (index = 0; index < this.modules.length; index++) {
 					module = this.modules[index];
-					module.registerElementInfos(this);
+					module.buildTypeInfos(this);
 				}
 				for (index = 0; index < this.modules.length; index++) {
 					module = this.modules[index];

dist/Jsonix-min.js

@@ -2384,11 +2384,11 @@ c.registerTypeInfos(this)
 }for(d=0;
 d<this.modules.length;
 d++){c=this.modules[d];
-c.buildTypeInfos(this)
+c.registerElementInfos(this)
 }for(d=0;
 d<this.modules.length;
 d++){c=this.modules[d];
-c.registerElementInfos(this)
+c.buildTypeInfos(this)
 }for(d=0;
 d<this.modules.length;
 d++){c=this.modules[d];

nodejs/scripts/jsonix.js

@@ -5877,11 +5877,11 @@ Jsonix.Context = Jsonix
 				}
 				for (index = 0; index < this.modules.length; index++) {
 					module = this.modules[index];
-					module.buildTypeInfos(this);
+					module.registerElementInfos(this);
 				}
 				for (index = 0; index < this.modules.length; index++) {
 					module = this.modules[index];
-					module.registerElementInfos(this);
+					module.buildTypeInfos(this);
 				}
 				for (index = 0; index < this.modules.length; index++) {
 					module = this.modules[index];

nodejs/scripts/tests/GH150/A.js

@@ -0,0 +1,14 @@
+var A = {
+  name: 'A',
+  typeInfos: [
+    {
+      localName: 'BaseType',
+      propertyInfos: [{name: 'value', typeInfo: '.ValueType', type: 'er' }]
+    }, {
+      localName: 'ValueType',
+      propertyInfos: [{name: 'data'}]
+    }
+  ],
+  elementInfos: [{elementName: 'value', typeInfo: '.ValueType'}]
+};
+module.exports.A = A;

nodejs/scripts/tests/GH150/B.js

@@ -0,0 +1,6 @@
+var B = {
+  name: 'B',
+  dependencies: ['A'],
+  elementInfos: [{elementName: 'eulav', typeInfo: 'A.ValueType', sh: {lp:'value', ns: ''}}]
+};
+module.exports.B = B;

nodejs/scripts/tests/GH150/GH150.js

@@ -0,0 +1,20 @@
+var Jsonix = require("../../jsonix").Jsonix;
+var A = require("./A.js").A;
+var B = require("./B.js").B;
+
+module.exports = {
+	"A_B" : function(test) {
+		var context = new Jsonix.Context([A, B]);
+                var baseType = context.getTypeInfoByName('A.BaseType');
+                test.ok(baseType.structure.elements.value);
+                test.ok(baseType.structure.elements.eulav);
+		test.done();
+	},
+	"B_A" : function(test) {
+		var context = new Jsonix.Context([B, A]);
+                var baseType = context.getTypeInfoByName('A.BaseType');
+                test.ok(baseType.structure.elements.value);
+                test.ok(baseType.structure.elements.eulav);
+		test.done();
+	}
+};

nodejs/scripts/tests/issues.js

@@ -10,6 +10,7 @@ module.exports = {
 		"GH96" : require('./GH96/GH96'),
 		"GH111" : require('./GH111/GH111'),
 		"GH135" : require('./GH135/GH135'),
-		"GH141" : require('./GH141/GH141')
+		"GH141" : require('./GH141/GH141'),
+		"GH150" : require('./GH150/GH150')
 	}
 };

scripts/src/main/javascript/org/hisrc/jsonix/Jsonix/Context.js

@@ -82,11 +82,11 @@ Jsonix.Context = Jsonix
 				}
 				for (index = 0; index < this.modules.length; index++) {
 					module = this.modules[index];
-					module.buildTypeInfos(this);
+					module.registerElementInfos(this);
 				}
 				for (index = 0; index < this.modules.length; index++) {
 					module = this.modules[index];
-					module.registerElementInfos(this);
+					module.buildTypeInfos(this);
 				}
 				for (index = 0; index < this.modules.length; index++) {
 					module = this.modules[index];