Cleanup

jgranstrom · Jan 24, 2017 · 36205c0 · 36205c0
1 parent 90c5797
commit 36205c0
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/lib/extract.js b/lib/extract.js
@@ -12,20 +12,23 @@ function compileResult(extractionMap) {
 
    Object.keys(extractionMap).map(filename => {
     Object.keys(extractionMap[filename].variableResults).map(variableContext => {
-      Object.keys(extractionMap[filename].variableResults[variableContext]).map(variableKey => {
+      const contextVariables = extractionMap[filename].variableResults[variableContext];
+
+      Object.keys(contextVariables).map(variableKey => {
         if(!extractedVariables[variableContext]) {
           extractedVariables[variableContext] = {};
         }
 
-        if(!extractedVariables[variableContext][variableKey]) {
-          extractedVariables[variableContext][variableKey] = Object.assign({}, extractionMap[filename].variableResults[variableContext][variableKey].value);
+        let variable = extractedVariables[variableContext][variableKey];
+        if(!variable) {
+          variable = extractedVariables[variableContext][variableKey] = Object.assign({}, contextVariables[variableKey].value);
 
-          extractedVariables[variableContext][variableKey].sources = [];
-          extractedVariables[variableContext][variableKey].expressions = [];
+          variable.sources = [];
+          variable.expressions = [];
         }
 
-        extractedVariables[variableContext][variableKey].sources.push(filename);
-        extractedVariables[variableContext][variableKey].expressions.push(extractionMap[filename].variableResults[variableContext][variableKey].expression);
+        variable.sources.push(filename);
+        variable.expressions.push(contextVariables[variableKey].expression);
       });
     });
   });