chore: Refactor deprecationCollector to just collect raw data

Author: simonihmig

addon/index.js

@@ -51,8 +51,10 @@ export function flushDeprecations() {
   let messages = self.deprecationWorkflow.deprecationLog.messages;
   let logs = [];
 
-  for (let message in messages) {
-    logs.push(messages[message]);
+  for (let [deprecation, matcher] of Object.entries(messages)) {
+    logs.push(
+      `    { handler: "silence", ${matcher}: ${JSON.stringify(deprecation)} }`,
+    );
   }
 
   let deprecations = logs.join(',\n') + '\n';
@@ -107,8 +109,7 @@ export function deprecationCollector(message, options, next) {
   let key = (options && options.id) || message;
   let matchKey = options && key === options.id ? 'matchId' : 'matchMessage';
 
-  self.deprecationWorkflow.deprecationLog.messages[key] =
-    '    { handler: "silence", ' + matchKey + ': ' + JSON.stringify(key) + ' }';
+  self.deprecationWorkflow.deprecationLog.messages[key] = matchKey;
 
   next(message, options);
 }

tests/unit/deprecation-collector-test.js

@@ -51,8 +51,8 @@ module('deprecationCollector', function (hooks) {
     );
 
     assert.deepEqual(self.deprecationWorkflow.deprecationLog.messages, {
-      first: '    { handler: "silence", matchId: "first" }',
-      second: '    { handler: "silence", matchId: "second" }',
+      first: 'matchId',
+      second: 'matchId',
     });
   });
 
@@ -120,8 +120,8 @@ module('deprecationCollector', function (hooks) {
     );
 
     assert.deepEqual(self.deprecationWorkflow.deprecationLog.messages, {
-      first: '    { handler: "silence", matchId: "first" }',
-      second: '    { handler: "silence", matchId: "second" }',
+      first: 'matchId',
+      second: 'matchId',
     });
   });
 });

tests/unit/flush-deprecations-test.js

@@ -29,8 +29,8 @@ module('flushDeprecations', function (hooks) {
 
   test('calling flushDeprecations returns string of deprecations', function (assert) {
     self.deprecationWorkflow.deprecationLog.messages = {
-      first: '    { handler: "silence", matchId: "first" }',
-      second: '    { handler: "silence", matchId: "second" }',
+      first: 'matchId',
+      second: 'matchId',
     };
 
     let deprecationsPayload = flushDeprecations();