Don't store the IntlShape in CharacterMessageBuilder

Author: sbates-idrc

src/ActionsHandler.js

@@ -19,12 +19,14 @@ export default class ActionsHandler {
     audioManager: AudioManager;
     sceneDimensions: SceneDimensions;
     characterMessageBuilder: CharacterMessageBuilder;
+    intl: IntlShape;
 
     constructor(app: App, audioManager: AudioManager, sceneDimensions: SceneDimensions, intl: IntlShape) {
         this.app = app;
         this.audioManager = audioManager;
         this.sceneDimensions = sceneDimensions;
-        this.characterMessageBuilder = new CharacterMessageBuilder(sceneDimensions, intl);
+        this.characterMessageBuilder = new CharacterMessageBuilder(sceneDimensions);
+        this.intl = intl;
     }
 
     doAction(action: MovementBlockName, stepTimeMs: number): Promise<ActionResult> {
@@ -138,7 +140,7 @@ export default class ActionsHandler {
         };
 
         if (characterUpdate.event != null) {
-            const message = this.characterMessageBuilder.buildMessage(characterUpdate.event);
+            const message = this.characterMessageBuilder.buildMessage(characterUpdate.event, this.intl);
             if (message != null) {
                 stateUpdate.message = message;
             }

src/CharacterMessageBuilder.js

@@ -6,36 +6,34 @@ import SceneDimensions from './SceneDimensions';
 
 export default class CharacterMessageBuilder {
     dimensions: SceneDimensions;
-    intl: IntlShape;
 
-    constructor(dimensions: SceneDimensions, intl: IntlShape) {
+    constructor(dimensions: SceneDimensions) {
         this.dimensions = dimensions;
-        this.intl = intl;
     }
 
-    buildMessage(event: CharacterEvent): ?string {
+    buildMessage(event: CharacterEvent, intl: IntlShape): ?string {
         switch(event.type) {
             case 'endOfScene':
-                return this.buildEndOfSceneMessage();
+                return this.buildEndOfSceneMessage(intl);
             case 'hitWall':
-                return this.buildHitWallMessage(event.x, event.y);
+                return this.buildHitWallMessage(event.x, event.y, intl);
             default:
                 return null;
         }
     }
 
-    buildEndOfSceneMessage(): string {
-        return this.intl.formatMessage(
+    buildEndOfSceneMessage(intl: IntlShape): string {
+        return intl.formatMessage(
             {
                 id:'CharacterMessageBuilder.endOfScene'
             }
         );
     }
 
-    buildHitWallMessage(x: number, y: number): string {
+    buildHitWallMessage(x: number, y: number, intl: IntlShape): string {
         const columnLabel = this.dimensions.getColumnLabel(x);
         const rowLabel = this.dimensions.getRowLabel(y);
-        return this.intl.formatMessage(
+        return intl.formatMessage(
             {
                 id:'CharacterMessageBuilder.hitWall'
             },

src/CharacterMessageBuilder.test.js

@@ -14,21 +14,21 @@ const intl = createIntl({
 const sceneDimensions = new SceneDimensions(1, 12, 1, 8);
 
 test('End of scene', () => {
-    const builder = new CharacterMessageBuilder(sceneDimensions, intl);
+    const builder = new CharacterMessageBuilder(sceneDimensions);
     const message = builder.buildMessage({
         type: 'endOfScene',
         x: 1,
         y: 1
-    });
+    }, intl);
     expect(message).toBe('Your character has reached the end of the scene');
 });
 
 test('Hit wall', () => {
-    const builder = new CharacterMessageBuilder(sceneDimensions, intl);
+    const builder = new CharacterMessageBuilder(sceneDimensions);
     const message = builder.buildMessage({
         type: 'hitWall',
         x: 3,
         y: 2
-    });
+    }, intl);
     expect(message).toBe('Your character hit a wall on C2');
 });