From 7ea85a9214a98ede3bb98cedff42382e7eb34585 Mon Sep 17 00:00:00 2001
From: Eddie Antonio Santos <easantos@ualberta.ca>
Date: Tue, 21 Apr 2020 15:09:37 -0600
Subject: [PATCH] refactor(common/lmlayer): cleanup word breaker compilation

---
 .../lexical-model-compiler.ts                    | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/developer/js/source/lexical-model-compiler/lexical-model-compiler.ts b/developer/js/source/lexical-model-compiler/lexical-model-compiler.ts
index d813dfde55..798f9dea93 100644
--- a/developer/js/source/lexical-model-compiler/lexical-model-compiler.ts
+++ b/developer/js/source/lexical-model-compiler/lexical-model-compiler.ts
@@ -27,18 +27,6 @@ export default class LexicalModelCompiler {
     const fileSuffix: string = `})();`;
     let func = filePrefix;
 
-    // Figure out what word breaker the model is using, if any.
-    let wordBreakerSpec = getWordBreakerSpec();
-    let wordBreakerSourceCode = compileWordBreaker(wordBreakerSpec);
-
-    function getWordBreakerSpec() {
-      if (modelSource.wordBreaker) {
-        return modelSource.wordBreaker;
-      } else {
-        return null;
-      }
-    }
-
     //
     // Emit the model as code and data
     //
@@ -62,7 +50,10 @@ export default class LexicalModelCompiler {
         func += `LMLayerWorker.loadModel(new models.TrieModel(${
           createTrieDataStructure(filenames, modelSource.searchTermToKey)
         }, {\n`;
+
+        let wordBreakerSourceCode = compileWordBreaker(modelSource.wordBreaker);
         func += `  wordBreaker: ${wordBreakerSourceCode},\n`;
+
         if (modelSource.searchTermToKey) {
           func += `  searchTermToKey: ${modelSource.searchTermToKey.toString()},\n`;
         }
@@ -104,6 +95,7 @@ export class ModelSourceError extends Error {
  * breaking function.
  */
 function compileWordBreaker(wordBreakerSpec: WordBreakerSpec) {
+  // Use the default word breaker when it's unspecified
   if (!wordBreakerSpec) {
     wordBreakerSpec = 'default';
   }