@colyseus/schema 4.0.23 → 4.0.25

package/build/index.cjs

@@ -1231,12 +1231,26 @@ class ChangeTree {
             }
             return;
         }
-        const changeSet = (this.filteredChanges !== undefined)
+        // Mirror `change()`: a field's add/delete must target the same
+        // changeset family (filtered vs non-filtered). Otherwise
+        // `deleteOperationAtIndex` falls through to its "find last
+        // operation" branch and evicts an unrelated sibling field —
+        // surfaced as encodeAll() dropping a non-@view field after a
+        // sibling @view field is set to undefined on a Schema with
+        // mixed @view / non-@view fields (filteredChanges defined,
+        // isFiltered false).
+        const isFiltered = this.isFiltered || (this.metadata?.[index]?.tag !== undefined);
+        const changeSet = (isFiltered)
             ? this.filteredChanges
             : this.changes;
         this.indexedOperations[index] = operation ?? exports.OPERATION.DELETE;
         setOperationAtIndex(changeSet, index);
-        deleteOperationAtIndex(this.allChanges, allChangesIndex);
+        if (isFiltered) {
+            deleteOperationAtIndex(this.allFilteredChanges, allChangesIndex);
+        }
+        else {
+            deleteOperationAtIndex(this.allChanges, allChangesIndex);
+        }
         const previousValue = this.getValue(index);
         // remove `root` reference
         if (previousValue && previousValue[$changes]) {
@@ -1252,11 +1266,7 @@ class ChangeTree {
             //
             this.root?.remove(previousValue[$changes]);
         }
-        //
-        // FIXME: this is looking a ugly and repeated
-        //
-        if (this.filteredChanges !== undefined) {
-            deleteOperationAtIndex(this.allFilteredChanges, allChangesIndex);
+        if (isFiltered) {
             this.root?.enqueueChangeTree(this, 'filteredChanges');
         }
         else {
@@ -1361,7 +1371,8 @@ class ChangeTree {
             key += `-${this.root.types.schemas.get(parentConstructor)}`;
         }
         key += `-${parentIndex}`;
-        const fieldHasViewTag = Metadata.hasViewTagAtIndex(parentConstructor?.[Symbol.metadata], parentIndex);
+        const parentMetadata = parentConstructor?.[Symbol.metadata];
+        const fieldHasViewTag = Metadata.hasViewTagAtIndex(parentMetadata, parentIndex);
         this.isFiltered = parent[$changes].isFiltered // in case parent is already filtered
             || this.root.types.parentFiltered[key]
             || fieldHasViewTag;
@@ -1370,9 +1381,22 @@ class ChangeTree {
         // when it's available, we need to enqueue the "changes" changeset into the "filteredChanges" changeset.
         //
         if (this.isFiltered) {
+            //
+            // Children of a `@view(N)` collection (non-default tag) inherit
+            // visibility from their parent, so items pushed/set after the
+            // initial `view.add(state, N)` show up automatically.
+            //
+            // Default-tag `@view()` collections deliberately keep per-item
+            // gating — `view.add(item)` is required to opt each one in.
+            //
+            // The `parentMetadata[parentIndex].tag` access is safe inside
+            // this branch: the OR's short-circuit means we only reach it
+            // when `fieldHasViewTag` is true, which guarantees the metadata
+            // entry and its `tag` property exist.
+            //
             this.isVisibilitySharedWithParent = (parentChangeTree.isFiltered &&
                 typeof (refType) !== "string" &&
-                !fieldHasViewTag);
+                (!fieldHasViewTag || (parentIsCollection && parentMetadata[parentIndex].tag !== DEFAULT_VIEW_TAG)));
             if (!this.filteredChanges) {
                 this.filteredChanges = createChangeSet();
                 this.allFilteredChanges = createChangeSet();