add 🔸 to tracked dependencies that caused the last invalidation (#2546)

emberjs · Feb 6, 2024 · ea7c146 · ea7c146
1 parent 7e837ab
commit ea7c146
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 19 deletions.
diff --git a/ember_debug/object-inspector.js b/ember_debug/object-inspector.js
@@ -217,27 +217,22 @@ function getTagTrackedProps(tag, ownTag, level = 0) {
   }
   const subtags = tag.subtags || (Array.isArray(tag.subtag) ? tag.subtag : []);
   if (tag.subtag && !Array.isArray(tag.subtag)) {
-    if (tag.subtag._propertyKey)
-      props.push(
-        (tag.subtag._object ? getObjectName(tag.subtag._object) + '.' : '') +
-          tag.subtag._propertyKey
-      );
+    if (tag.subtag._propertyKey) props.push(tag.subtag);
+
     props.push(...getTagTrackedProps(tag.subtag, ownTag, level + 1));
   }
   if (subtags) {
     subtags.forEach((t) => {
       if (t === ownTag) return;
-      if (t._propertyKey)
-        props.push(
-          (t._object ? getObjectName(t._object) + '.' : '') + t._propertyKey
-        );
+      if (t._propertyKey) props.push(t);
       props.push(...getTagTrackedProps(t, ownTag, level + 1));
     });
   }
   return props;
 }
 
-function getTrackedDependencies(object, property, tag) {
+function getTrackedDependencies(object, property, tagInfo) {
+  const tag = tagInfo.tag;
   const proto = Object.getPrototypeOf(object);
   if (!proto) return [];
   const cpDesc = emberMeta(object).peekDescriptors(property);
@@ -249,21 +244,32 @@ function getTrackedDependencies(object, property, tag) {
     const ownTag = tagForProperty(object, property);
     const props = getTagTrackedProps(tag, ownTag);
     const mapping = {};
-    props.forEach((p) => {
+    let maxRevision = tagInfo.revision ?? 0;
+    let minRevision = Infinity;
+    props.forEach((t) => {
+      const p =
+        (t._object ? getObjectName(t._object) + '.' : '') + t._propertyKey;
       const [objName, ...props] = p.split('.');
       mapping[objName] = mapping[objName] || new Set();
-      props.forEach((p) => mapping[objName].add(p));
+      maxRevision = Math.max(maxRevision, t.revision);
+      minRevision = Math.min(minRevision, t.revision);
+      props.forEach((p) => mapping[objName].add([p, t.revision]));
     });
 
+    const hasChange = maxRevision !== minRevision;
+
     Object.entries(mapping).forEach(([objName, props]) => {
       if (props.size > 1) {
         dependentKeys.push(objName);
         props.forEach((p) => {
-          dependentKeys.push('  •  --  ' + p);
+          const changed = hasChange && p[1] >= maxRevision ? ' 🔸' : '';
+          dependentKeys.push('  •  --  ' + p[0] + changed);
         });
       }
       if (props.size === 1) {
-        dependentKeys.push(objName + '.' + [...props][0]);
+        const p = [...props][0];
+        const changed = hasChange && p[1] >= maxRevision ? ' 🔸' : '';
+        dependentKeys.push(objName + '.' + p[0] + changed);
       }
       if (props.size === 0) {
         dependentKeys.push(objName);
@@ -325,7 +331,6 @@ export default class extends DebugPort {
                 tagInfo.tag = track(() => {
                   value = object.get?.(item.name) || object[item.name];
                 });
-                tagInfo.revision = tagValue(tagInfo.tag);
               }
               tracked[item.name] = tagInfo;
             } else {
@@ -344,8 +349,9 @@ export default class extends DebugPort {
                 dependentKeys = getTrackedDependencies(
                   object,
                   item.name,
-                  tracked[item.name].tag
+                  tracked[item.name]
                 );
+                tracked[item.name].revision = tagValue(tracked[item.name].tag);
               }
               this.sendMessage('updateProperty', {
                 objectId,
@@ -1121,12 +1127,12 @@ function calculateCPs(
                 item.isTracked = true;
               }
             }
-            tagInfo.revision = tagValue(tagInfo.tag);
             item.dependentKeys = getTrackedDependencies(
               object,
               item.name,
-              tagInfo.tag
+              tagInfo
             );
+            tagInfo.revision = tagValue(tagInfo.tag);
           } else {
             value = calculateCP(object, item, errorsForObject);
           }

diff --git a/tests/ember_debug/object-inspector-test.js b/tests/ember_debug/object-inspector-test.js
@@ -278,7 +278,7 @@ module('Ember Debug - Object Inspector', function (hooks) {
     assert.strictEqual(prop.name, 'getterWithTracked');
     assert.strictEqual(prop.value.type, 'type-string');
     assert.strictEqual(prop.value.inspect, '"item1item2tracked"');
-    const dependentKeys =
+    let dependentKeys =
       compareVersion(VERSION, '3.16.10') === 0
         ? 'item1,item2,trackedProperty'
         : 'ObjectWithTracked,  •  --  item1,  •  --  item2,Object:My Object.trackedProperty';
@@ -292,6 +292,22 @@ module('Ember Debug - Object Inspector', function (hooks) {
     assert.strictEqual(prop.name, 'aCP');
     assert.strictEqual(prop.value.type, 'type-boolean');
     assert.strictEqual(prop.dependentKeys.toString(), '');
+
+    inspected.objectWithTracked.item1 = 'item1-changed';
+    message = await captureMessage('objectInspector:updateObject', () => {
+      objectInspector.sendObject(inspected);
+    });
+
+    secondDetail = message.details[1];
+    prop = secondDetail.properties[1];
+    assert.strictEqual(prop.name, 'getterWithTracked');
+    assert.strictEqual(prop.value.type, 'type-string');
+    assert.strictEqual(prop.value.inspect, '"item1-changeditem2tracked"');
+    dependentKeys =
+      compareVersion(VERSION, '3.16.10') === 0
+        ? 'item1,item2,trackedProperty'
+        : 'ObjectWithTracked,  •  --  item1 🔸,  •  --  item2,Object:My Object.trackedProperty';
+    assert.strictEqual(prop.dependentKeys.toString(), dependentKeys);
   });
 
   skip('Correct mixin order with es6 class', async function (assert) {