@colyseus/schema 3.0.21 → 3.0.23

package/build/cjs/index.js

@@ -1831,7 +1831,7 @@ class ArraySchema {
         return (!view ||
             typeof (ref[$childType]) === "string" ||
             // view.items.has(ref[$getByIndex](index)[$changes])
-            view.items.has(ref['tmpItems'][index]?.[$changes]));
+            view.visible.has(ref['tmpItems'][index]?.[$changes]));
     }
     static is(type) {
         return (
@@ -2487,7 +2487,7 @@ class MapSchema {
     static [(_a$3 = $encoder, _b$3 = $decoder, $filter)](ref, index, view) {
         return (!view ||
             typeof (ref[$childType]) === "string" ||
-            view.items.has((ref[$getByIndex](index) ?? ref.deletedItems[index])[$changes]));
+            view.visible.has((ref[$getByIndex](index) ?? ref.deletedItems[index])[$changes]));
     }
     static is(type) {
         return type['map'] !== undefined;
@@ -3104,7 +3104,7 @@ class Schema {
         }
         else if (tag === DEFAULT_VIEW_TAG) {
             // view pass: default tag
-            return view.items.has(ref[$changes]);
+            return view.visible.has(ref[$changes]);
         }
         else {
             // view pass: custom tag
@@ -3317,7 +3317,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) ?? ref.deletedItems[index])[$changes]));
+            view.visible.has((ref[$getByIndex](index) ?? ref.deletedItems[index])[$changes]));
     }
     static is(type) {
         return type['collection'] !== undefined;
@@ -3477,7 +3477,7 @@ class SetSchema {
     static [(_a = $encoder, _b = $decoder, $filter)](ref, index, view) {
         return (!view ||
             typeof (ref[$childType]) === "string" ||
-            view.items.has((ref[$getByIndex](index) ?? ref.deletedItems[index])[$changes]));
+            view.visible.has((ref[$getByIndex](index) ?? ref.deletedItems[index])[$changes]));
     }
     static is(type) {
         return type['set'] !== undefined;
@@ -3797,7 +3797,7 @@ class Encoder {
         for (let i = 0, numChangeTrees = changeTrees.length; i < numChangeTrees; i++) {
             const changeTree = changeTrees[i];
             if (hasView) {
-                if (!view.items.has(changeTree)) {
+                if (!view.visible.has(changeTree)) {
                     view.invisible.add(changeTree);
                     continue; // skip this change tree
                 }
@@ -3923,13 +3923,14 @@ class Encoder {
             const changeTree = this.root.changeTrees[refId];
             if (changeTree === undefined) {
                 // detached instance, remove from view and skip.
+                // console.log("detached instance, remove from view and skip.", refId);
                 view.changes.delete(refId);
                 continue;
             }
             const keys = Object.keys(changes);
             if (keys.length === 0) {
                 // FIXME: avoid having empty changes if no changes were made
-                // console.log("changes.size === 0, skip", changeTree.ref.constructor.name);
+                // console.log("changes.size === 0, skip", refId, changeTree.ref.constructor.name);
                 continue;
             }
             const ref = changeTree.ref;
@@ -4075,7 +4076,7 @@ class ReferenceTracker {
             //
             // Ensure child schema instances have their references removed as well.
             //
-            if (Metadata.isValidInstance(ref)) {
+            if (ref.constructor[Symbol.metadata] !== undefined) {
                 const metadata = ref.constructor[Symbol.metadata];
                 for (const index in metadata) {
                     const field = metadata[index].name;
@@ -4086,7 +4087,7 @@ class ReferenceTracker {
                 }
             }
             else {
-                if (typeof (Object.values(ref[$childType])[0]) === "function") {
+                if (typeof (ref[$childType]) === "function") {
                     Array.from(ref.values())
                         .forEach((child) => {
                         const childRefId = this.refIds.get(child);
@@ -4712,11 +4713,12 @@ function getRawChangesCallback(decoder, callback) {
 }
 
 class StateView {
-    constructor() {
+    constructor(iterable = false) {
+        this.iterable = iterable;
         /**
          * List of ChangeTree's that are visible to this view
          */
-        this.items = new WeakSet();
+        this.visible = new WeakSet();
         /**
          * List of ChangeTree's that are invisible to this view
          */
@@ -4726,17 +4728,24 @@ class StateView {
          * (This is used to force encoding a property, even if it was not changed)
          */
         this.changes = new Map();
+        if (iterable) {
+            this.items = [];
+        }
     }
     // TODO: allow to set multiple tags at once
     add(obj, tag = DEFAULT_VIEW_TAG, checkIncludeParent = true) {
-        if (!obj[$changes]) {
+        if (!obj?.[$changes]) {
             console.warn("StateView#add(), invalid object:", obj);
             return this;
         }
         // FIXME: ArraySchema/MapSchema do not have metadata
         const metadata = obj.constructor[Symbol.metadata];
         const changeTree = obj[$changes];
-        this.items.add(changeTree);
+        this.visible.add(changeTree);
+        // add to iterable list (only the explicitly added items)
+        if (this.iterable && checkIncludeParent) {
+            this.items.push(obj);
+        }
         // add parent ChangeTree's
         // - if it was invisible to this view
         // - if it were previously filtered out
@@ -4810,9 +4819,9 @@ class StateView {
     addParentOf(childChangeTree, tag) {
         const changeTree = childChangeTree.parent[$changes];
         const parentIndex = childChangeTree.parentIndex;
-        if (!this.items.has(changeTree)) {
+        if (!this.visible.has(changeTree)) {
             // view must have all "changeTree" parent tree
-            this.items.add(changeTree);
+            this.visible.add(changeTree);
             // add parent's parent
             const parentChangeTree = changeTree.parent?.[$changes];
             if (parentChangeTree && (parentChangeTree.filteredChanges !== undefined)) {
@@ -4843,15 +4852,21 @@ class StateView {
             changes[parentIndex] = exports.OPERATION.ADD;
         }
     }
-    remove(obj, tag = DEFAULT_VIEW_TAG) {
+    remove(obj, tag = DEFAULT_VIEW_TAG, _isClear = false) {
         const changeTree = obj[$changes];
         if (!changeTree) {
             console.warn("StateView#remove(), invalid object:", obj);
             return this;
         }
-        this.items.delete(changeTree);
+        this.visible.delete(changeTree);
+        // remove from iterable list
+        if (this.iterable &&
+            !_isClear // no need to remove during clear(), as it will be cleared entirely
+        ) {
+            spliceOne(this.items, this.items.indexOf(obj));
+        }
         const ref = changeTree.ref;
-        const metadata = ref.constructor[Symbol.metadata];
+        const metadata = ref.constructor[Symbol.metadata]; // ArraySchema/MapSchema do not have metadata
         let changes = this.changes.get(changeTree.refId);
         if (changes === undefined) {
             changes = {};
@@ -4872,12 +4887,12 @@ class StateView {
             }
             else {
                 // delete all "tagged" properties.
-                metadata[$viewFieldIndexes].forEach((index) => changes[index] = exports.OPERATION.DELETE);
+                metadata?.[$viewFieldIndexes].forEach((index) => changes[index] = exports.OPERATION.DELETE);
             }
         }
         else {
             // delete only tagged properties
-            metadata[$fieldIndexesByViewTag][tag].forEach((index) => changes[index] = exports.OPERATION.DELETE);
+            metadata?.[$fieldIndexesByViewTag][tag].forEach((index) => changes[index] = exports.OPERATION.DELETE);
         }
         // remove tag
         if (this.tags && this.tags.has(changeTree)) {
@@ -4898,12 +4913,22 @@ class StateView {
         return this;
     }
     has(obj) {
-        return this.items.has(obj[$changes]);
+        return this.visible.has(obj[$changes]);
     }
     hasTag(ob, tag = DEFAULT_VIEW_TAG) {
         const tags = this.tags?.get(ob[$changes]);
         return tags?.has(tag) ?? false;
     }
+    clear() {
+        if (!this.iterable) {
+            throw new Error("StateView#clear() is only available for iterable StateView's. Use StateView(iterable: true) constructor.");
+        }
+        for (let i = 0, l = this.items.length; i < l; i++) {
+            this.remove(this.items[i], DEFAULT_VIEW_TAG, true);
+        }
+        // clear items array
+        this.items.length = 0;
+    }
 }
 
 registerType("map", { constructor: MapSchema });