Merge pull request #491 from tlaplus/feature/fix-deleted-value-handling

Correct deleted value handling

Author: younes-io

src/model/check.ts

@@ -167,7 +167,7 @@ export class Value {
     }
 
     setDeleted(): Value {
-        this.changeType = Change.MODIFIED;
+        this.changeType = Change.DELETED;
         return this;
     }
 
@@ -237,6 +237,13 @@ export abstract class CollectionValue extends Value {
                 }
             }
         }
+        if (this.deletedItems) {
+            for (const item of this.deletedItems) {
+                if (item.id === id) {
+                    return item;
+                }
+            }
+        }
         return undefined;
     }
 

tests/suite/model/check.test.ts

@@ -160,6 +160,11 @@ suite('Check Model Test Suite', () => {
         );
     });
 
+    test('Marks deleted values as deleted', () => {
+        const value = v(1, 'one').setDeleted();
+        assert.equal(value.changeType, Change.DELETED);
+    });
+
     test('Finds subitem by ID', () => {
         Value.switchIdsOn();
         const varOne = v(1, 'one');
@@ -187,6 +192,21 @@ suite('Check Model Test Suite', () => {
         const found = root.findItem(varOne.id);
         assert.equal(typeof found, 'undefined');
     });
+
+    test('Finds deleted items from deletedItems list', () => {
+        Value.switchIdsOn();
+        const seqValue = seq('foo', v(1, 'one'));
+        seqValue.addDeletedItems([v(2, 'two')]);
+        const root = struct(ROOT,
+            v('bar', 'BAR'),
+            seqValue);
+        const deleted = seqValue.deletedItems ? seqValue.deletedItems[0] : undefined;
+        assert.ok(deleted);
+        const found = root.findItem(deleted!.id);
+        assert.ok(found);
+        assert.equal(found?.id, deleted!.id);
+        assert.equal(found?.changeType, Change.DELETED);
+    });
 });
 
 function assertChanges(prev: CollectionValue, state: CollectionValue, expect: CollectionValue) {