@colyseus/schema 3.0.18 → 3.0.20

package/build/cjs/index.js

@@ -1358,9 +1358,8 @@ class ChangeTree {
         }
         key += `-${parentIndex}`;
         this.isFiltered = parent[$changes].isFiltered // in case parent is already filtered
-            || this.root.types.parentFiltered[key];
-        // const parentMetadata = parentConstructor?.[Symbol.metadata];
-        // this.isFiltered = parentMetadata?.[$viewFieldIndexes]?.includes(parentIndex) || this.root.types.parentFiltered[key];
+            || this.root.types.parentFiltered[key]
+            || parentConstructor?.[Symbol.metadata]?.[$viewFieldIndexes]?.includes(parentIndex);
         //
         // TODO: refactor this!
         //
@@ -1575,7 +1574,6 @@ function decodeValue(decoder, operation, ref, index, type, bytes, it, allChanges
                 while ((iter = entries.next()) && !iter.done) {
                     const [key, value] = iter.value;
                     // if value is a schema, remove its reference
-                    // FIXME: not sure if this is necessary, add more tests to confirm
                     if (typeof (value) === "object") {
                         previousRefId = $root.refIds.get(value);
                         $root.removeRef(previousRefId);
@@ -3315,7 +3313,7 @@ class CollectionSchema {
     static [(_a$1 = $encoder, _b$1 = $decoder, $filter)](ref, index, view) {
         return (!view ||
             typeof (ref[$childType]) === "string" ||
-            view.items.has(ref[$getByIndex](index)[$changes]));
+            view.items.has((ref[$getByIndex](index) ?? ref.deletedItems[index])[$changes]));
     }
     static is(type) {
         return type['collection'] !== undefined;
@@ -3323,6 +3321,7 @@ class CollectionSchema {
     constructor(initialValues) {
         this.$items = new Map();
         this.$indexes = new Map();
+        this.deletedItems = {};
         this.$refId = 0;
         this[$changes] = new ChangeTree(this);
         this[$changes].indexes = {};
@@ -3372,7 +3371,7 @@ class CollectionSchema {
         if (index === undefined) {
             return false;
         }
-        this[$changes].delete(index);
+        this.deletedItems[index] = this[$changes].delete(index);
         this.$indexes.delete(index);
         return this.$items.delete(index);
     }
@@ -3417,6 +3416,9 @@ class CollectionSchema {
         this.$items.delete(key);
         this.$indexes.delete(index);
     }
+    [$onEncodeEnd]() {
+        this.deletedItems = {};
+    }
     toArray() {
         return Array.from(this.$items.values());
     }
@@ -3471,7 +3473,7 @@ class SetSchema {
     static [(_a = $encoder, _b = $decoder, $filter)](ref, index, view) {
         return (!view ||
             typeof (ref[$childType]) === "string" ||
-            view.items.has(ref[$getByIndex](index)[$changes]));
+            view.items.has((ref[$getByIndex](index) ?? ref.deletedItems[index])[$changes]));
     }
     static is(type) {
         return type['set'] !== undefined;
@@ -3479,6 +3481,7 @@ class SetSchema {
     constructor(initialValues) {
         this.$items = new Map();
         this.$indexes = new Map();
+        this.deletedItems = {};
         this.$refId = 0;
         this[$changes] = new ChangeTree(this);
         this[$changes].indexes = {};
@@ -3528,7 +3531,7 @@ class SetSchema {
         if (index === undefined) {
             return false;
         }
-        this[$changes].delete(index);
+        this.deletedItems[index] = this[$changes].delete(index);
         this.$indexes.delete(index);
         return this.$items.delete(index);
     }
@@ -3585,6 +3588,9 @@ class SetSchema {
         this.$items.delete(key);
         this.$indexes.delete(index);
     }
+    [$onEncodeEnd]() {
+        this.deletedItems = {};
+    }
     toArray() {
         return Array.from(this.$items.values());
     }
@@ -3789,7 +3795,7 @@ class Encoder {
                     view.invisible.add(changeTree);
                     continue; // skip this change tree
                 }
-                else if (view.invisible.has(changeTree)) {
+                else {
                     view.invisible.delete(changeTree); // remove from invisible list
                 }
             }
@@ -4745,10 +4751,11 @@ class StateView {
                 } // skip "undefined" indexes
                 const op = changeTree.indexedOperations[index] ?? exports.OPERATION.ADD;
                 const tagAtIndex = metadata?.[index].tag;
-                if ((isInvisible || // if "invisible", include all
-                    tagAtIndex === undefined || // "all change" with no tag
-                    tagAtIndex === tag // tagged property
-                ) &&
+                if (!changeTree.isNew && // new structures will be added as part of .encode() call, no need to force it to .encodeView()
+                    (isInvisible || // if "invisible", include all
+                        tagAtIndex === undefined || // "all change" with no tag
+                        tagAtIndex === tag // tagged property
+                    ) &&
                     op !== exports.OPERATION.DELETE) {
                     changes[index] = op;
                 }
@@ -4777,10 +4784,8 @@ class StateView {
             if (parentChangeTree && (parentChangeTree.filteredChanges !== undefined)) {
                 this.addParentOf(changeTree, tag);
             }
-            // parent is already available, no need to add it!
-            if (!this.invisible.has(changeTree)) {
-                return;
-            }
+            // // parent is already available, no need to add it!
+            // if (!this.invisible.has(changeTree)) { return; }
         }
         // add parent's tag properties
         if (changeTree.getChange(parentIndex) !== exports.OPERATION.DELETE) {