From 4aa71458bcf3864653d401a2505d78c90e25b5c4 Mon Sep 17 00:00:00 2001
From: Ahmed Zamil <ahmed@esiur.com>
Date: Sun, 11 Sep 2022 13:43:55 +0300
Subject: [PATCH] fix

---
 src/Data/DataSerializer.js           | 10 ++++------
 src/Net/IIP/DistributedConnection.js |  2 +-
 src/Proxy/TemplateGenerator.js       |  2 +-
 src/esiur.js                         |  2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/Data/DataSerializer.js b/src/Data/DataSerializer.js
index e418fd0..4a55835 100644
--- a/src/Data/DataSerializer.js
+++ b/src/Data/DataSerializer.js
@@ -352,10 +352,10 @@ export default class DataSerializer {
 
   static recordComposer(
       value, connection) {
-    var rt = BinaryList();
+    let rt = new BinaryList();
     
 
-    var template = Warehouse.getTemplateByType(value.constructor);
+    let template = Warehouse.getTemplateByType(value.constructor);
 
     if (template == null)
       return new DataSerializerComposeResults(
@@ -363,10 +363,8 @@ export default class DataSerializer {
 
     rt.addDC(DC.guidToBytes(template.classId));
 
-    var recordData = value.serialize();
-
-    for (var pt in template.properties) {
-      var propValue = recordData[pt.name];
+    for (let pt of template.properties) {
+      let propValue = value[pt.name];
       rt.addDC(Codec.compose(propValue, connection));
     }
 
diff --git a/src/Net/IIP/DistributedConnection.js b/src/Net/IIP/DistributedConnection.js
index f0de57e..f70fc5d 100644
--- a/src/Net/IIP/DistributedConnection.js
+++ b/src/Net/IIP/DistributedConnection.js
@@ -3117,7 +3117,7 @@ export default class DistributedConnection extends IStore {
 
 
         this._sendParams()
-            .addUint8(0x40 | IIPPacket.IIPPacketAction.StaticCall)
+            .addUint8(0x40 | IIPPacketAction.StaticCall)
             .addUint32(c)
             .addGuid(classId)
             .addUint8(index)
diff --git a/src/Proxy/TemplateGenerator.js b/src/Proxy/TemplateGenerator.js
index ebaf792..01b94c8 100644
--- a/src/Proxy/TemplateGenerator.js
+++ b/src/Proxy/TemplateGenerator.js
@@ -442,7 +442,7 @@ export default class TemplateGenerator {
       //rt += `var rt = new AsyncReply<${rtTypeName}>();\r\n`;
       rt += `\t\tvar rt = new Esiur.Core.AsyncReply();\r\n`;
       if (f.isStatic) {
-        rt += `\t\tconnection.staticCall(Guid.parse('${template.classId.toString()}'), ${f.index}, args)\r\n`;
+        rt += `\t\tconnection.staticCall(Esiur.Data.Guid.parse('${template.classId.toString()}'), ${f.index}, args)\r\n`;
       } else {
         rt += `\t\tthis._invoke(${f.index}, args)\r\n`;
       }
diff --git a/src/esiur.js b/src/esiur.js
index 26d0b8c..dc48251 100644
--- a/src/esiur.js
+++ b/src/esiur.js
@@ -129,7 +129,7 @@ const namespace = {
     define: function(target, type, className) {
         let sc = className.split('.');
     
-        for(let i = 0; i < sc.length; i++) {
+        for(let i = 0; i < sc.length - 1; i++) {
             if (target[sc[i]] == undefined)
                 target[sc[i]] = {};
             target = target[sc[i]];