chore: update message logic

Author: russellwheatley

packages/app/lib/common/index.js

@@ -132,27 +132,24 @@ export function deprecationConsoleWarning(moduleName, methodName, isModularMetho
       const replacementMethodName = moduleMap[methodName];
       // only warn if it is mapped and purposefully deprecated
       if (replacementMethodName) {
-        let message;
-        if (replacementMethodName !== NO_REPLACEMENT) {
-          message = v8deprecationMessage + ` Please use \`${replacementMethodName}\` instead.`;
-        }
+        const message = createMessage(moduleName, methodName);
+
         // eslint-disable-next-line no-console
         console.warn(message);
       }
     }
   }
 }
 
-export function createConsoleWarningMessageTest(moduleName, methodName, uniqueMessage = '') {
+export function createMessage(moduleName, methodName, uniqueMessage = '') {
   if (uniqueMessage.length > 0) {
-    // Unique deprecation message
+    // Unique deprecation message used for testing
     return uniqueMessage;
   }
-  // use this to generate message for unit tests
+
   const moduleMap = mapOfDeprecationReplacements[moduleName];
   if (moduleMap) {
     const replacementMethodName = moduleMap[methodName];
-    // only warn if it is mapped and purposefully deprecated
     if (replacementMethodName) {
       let message;
       if (replacementMethodName !== NO_REPLACEMENT) {

packages/app/lib/common/unitTestUtils.ts

@@ -1,6 +1,6 @@
 // @ts-nocheck
 import { expect, jest } from '@jest/globals';
-import { createConsoleWarningMessageTest } from './index';
+import { createMessage } from './index';
 
 export const checkV9Deprecation = (modularFunction: () => void, nonModularFunction: () => void) => {
   const consoleWarnSpy = jest.spyOn(console, 'warn').mockImplementation(() => {});
@@ -35,7 +35,7 @@ export const createCheckV9Deprecation = (moduleName: string): CheckV9Deprecation
     expect(consoleWarnSpy).not.toHaveBeenCalled();
     consoleWarnSpy.mockReset();
     const consoleWarnSpy2 = jest.spyOn(console, 'warn').mockImplementation(warnMessage => {
-      const message = createConsoleWarningMessageTest(moduleName, methodName, uniqueMessage);
+      const message = createMessage(moduleName, methodName, uniqueMessage);
       expect(message).toMatch(warnMessage);
     });
     nonModularFunction();