fixes array_schema:each() and related method. fixes #47

Author: endel

colyseus/serialization/schema/types/array_schema.lua

@@ -8,7 +8,7 @@ local array_schema = {}
 function array_schema:new(obj)
   obj = obj or {
     items = {},
-    keys = {},
+    dynamic_indexes = {},
     indexes = {},
     props = {},
   }
@@ -27,7 +27,7 @@ end
 
 -- length
 function array_schema:length()
-  return #self.items
+  return #self.dynamic_indexes
 end
 
 -- getter
@@ -60,7 +60,7 @@ function array_schema:set_by_index(index, dynamic_index, value)
 
   -- insert key
   if self.items[dynamic_index] == nil then
-      table.insert(self.keys, dynamic_index)
+      table.insert(self.dynamic_indexes, dynamic_index)
   end
 
   self.items[dynamic_index] = value
@@ -71,16 +71,16 @@ function array_schema:get_index(index)
 end
 
 function array_schema:get_by_index(index)
-  return self.items[self.keys[index]]
+  return self.items[self.dynamic_indexes[index]]
 end
 
 function array_schema:delete_by_index(index)
   local dynamic_index = self.indexes[index]
 
   -- delete key
-  for i, k in pairs(self.keys) do
+  for i, k in pairs(self.dynamic_indexes) do
     if k == dynamic_index then
-      table.remove(self.keys, i)
+      table.remove(self.dynamic_indexes, i)
       break
     end
   end
@@ -93,6 +93,7 @@ function array_schema:clear(changes, refs)
   callback_helpers.remove_child_refs(self, changes, refs)
   self.indexes = {}
   self.items = {}
+  self.dynamic_indexes = {}
 end
 
 function array_schema:on_add(callback, trigger_all)
@@ -112,15 +113,15 @@ function array_schema:on_change(callback)
 end
 
 function array_schema:each(cb)
-  for _, dynamic_index in ipairs(self.indexes) do
+  for _, dynamic_index in ipairs(self.dynamic_indexes) do
     cb(self.items[dynamic_index], dynamic_index)
   end
 end
 
 function array_schema:clone()
   return array_schema:new({
     items = table.clone(self.items),
-    keys = table.clone(self.keys),
+    dynamic_indexes = table.clone(self.dynamic_indexes),
     indexes = table.clone(self.indexes),
     props = self.props,
   })