schedule watchTypeIfUnseen to prevent loop (#8008)

* schedule watchTypeIfUnseen to prevent loop fixes #8006 * Update debug-adapter-test.js * Update index.js * Update index.js * fix test * Update debug-adapter-test.js * keep Watching Model Types with store.push * add comment * fix test
emberjs · Sep 12, 2022 · 2878466 · 2878466
1 parent 0956c49
commit 2878466
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/packages/-ember-data/tests/integration/debug-adapter-test.js b/packages/-ember-data/tests/integration/debug-adapter-test.js
@@ -39,14 +39,14 @@ if (has('@ember-data/debug')) {
     });
 
     test('Watching Model Types', async function (assert) {
-      assert.expect(5);
+      assert.expect(4);
       let { owner } = this;
       let debugAdapter = owner.lookup('data-adapter:main');
 
       function added(types) {
-        assert.equal(types.length, 1, 'added one type');
-        assert.equal(types[0].name, 'post', 'the type is post');
-        assert.equal(types[0].count, 0, 'we added zero posts');
+        assert.strictEqual(types.length, 1, 'added one type');
+        assert.strictEqual(types[0].name, 'post', 'the type is post');
+        assert.strictEqual(types[0].count, 1, 'we added one post');
         assert.strictEqual(types[0].object, store.modelFor('post'), 'we received the ModelClass for post');
       }
 
@@ -67,6 +67,25 @@ if (has('@ember-data/debug')) {
       });
     });
 
+    test('Watching Model Types On first-create', async function (assert) {
+      assert.expect(4);
+      let { owner } = this;
+      let debugAdapter = owner.lookup('data-adapter:main');
+
+      function added(types) {
+        assert.strictEqual(types.length, 1, 'added one type');
+        assert.strictEqual(types[0].name, 'post', 'the type is post');
+        assert.strictEqual(types[0].count, 1, 'we added one posts');
+        assert.strictEqual(types[0].object, store.modelFor('post'), 'we received the ModelClass for post');
+      }
+
+      debugAdapter.watchModelTypes(added, () => null);
+
+      store.createRecord('post', {
+        title: 'Post Title',
+      });
+    });
+
     test('Watching Records', async function (assert) {
       let { owner } = this;
       let debugAdapter = owner.lookup('data-adapter:main');

diff --git a/packages/debug/addon/index.js b/packages/debug/addon/index.js
@@ -30,6 +30,7 @@ import { get } from '@ember/object';
 import { addObserver, removeObserver } from '@ember/object/observers';
 import { inject as service } from '@ember/service';
 import { capitalize, underscore } from '@ember/string';
+import { next } from '@ember/runloop';
 
 import { typesMapFor } from './setup';
 
@@ -91,7 +92,8 @@ export default DataAdapter.extend({
 
     // Overwrite _createRecordData so newly added models will get added to the list
     store._createRecordData = (identifier) => {
-      this.watchTypeIfUnseen(store, discoveredTypes, identifier.type, typesAdded, typesUpdated, _releaseMethods);
+      // defer to ensure first-create does not result in an infinite loop, see https://github.com/emberjs/data/issues/8006
+      next(() => this.watchTypeIfUnseen(store, discoveredTypes, identifier.type, typesAdded, typesUpdated, _releaseMethods));
       return __createRecordData.call(store, identifier);
     };