change to inline parse loaders

ShMcK · ShMcK · commit 3e3d29aa1d0b · 2016-04-01T14:15:52.000-07:00
diff --git a/lib/reducers/run-tests/parse-loaders.js b/lib/reducers/run-tests/parse-loaders.js
@@ -14,27 +14,23 @@ function parseLoaders(data, fileType) {
         console.log("File type \"" + fileType + "\" not supported.");
         return '';
     }
-    var imports = '';
     var i = -1;
     var lines = data.split('\n');
+    var filesLoaded = [];
     while (i < lines.length - 1) {
         i += 1;
         var loader = lines[i].match(loaderMatch[fileType]);
         if (loader) {
             var fileToLoad = loader[1];
+            if (filesLoaded.indexOf(fileToLoad) > -1) {
+                console.log("\"" + fileToLoad + "\" already loaded.");
+                continue;
+            }
             var pathToFile = path.normalize(path.join(window.coderoad.dir, fileToLoad));
-            var file = fs.readFileSync(pathToFile, 'utf8');
-            imports += file;
+            lines[i] = fs.readFileSync(pathToFile, 'utf8');
         }
     }
-    var output = null;
-    if (imports.length > 0) {
-        output = imports + '\n'.concat(data);
-    }
-    else {
-        output = data;
-    }
-    return output;
+    return lines.join('\n');
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = parseLoaders;
diff --git a/lib/services/write.js b/lib/services/write.js
@@ -0,0 +1,28 @@
+"use strict";
+var fs = require('fs');
+var path = require('path');
+function getPath(filePath) {
+    return path.normalize(path.join(window.coderoad.dir, filePath));
+}
+function write(filePath, text) {
+    try {
+        fs.writeFileSync(getPath(filePath), text, 'utf8');
+    }
+    catch (e) {
+        if (e) {
+            console.log('Error writing to filePath', filePath);
+        }
+    }
+}
+exports.write = write;
+function readWrite(writePath, readPath) {
+    try {
+        write(writePath, fs.readFileSync(getPath(readPath)));
+    }
+    catch (e) {
+        if (e) {
+            console.log('Error reading from filePath', readPath);
+        }
+    }
+}
+exports.readWrite = readWrite;
diff --git a/src/reducers/run-tests/parse-loaders.ts b/src/reducers/run-tests/parse-loaders.ts
@@ -2,9 +2,9 @@ import * as path from 'path';
 import * as fs from 'fs';
 
 const supportedFileTypes = ['js', 'jsx', 'ts', 'py'];
-const js = /^\/\/\s?load\(['"`](.+)['"`]\)$/m;
+const js = /^\/\/\s?load\(['"`](.+)['"`]\)$/m; // // load('file'),
 const loaderMatch = {
-  js,  // // load('file'),
+  js,
   ts: js,
   jsx: js,
   py: /^#\s?load\(['"`](.+)['"`]\)$/m      // # load('file')
@@ -17,29 +17,28 @@ export default function parseLoaders(data: string, fileType: string) {
     return '';
   }
 
-  let imports = '';
   // loop over lines and add editor files
   let i = -1;
   let lines = data.split('\n');
 
+  let filesLoaded = [];
+
   while (i < lines.length - 1) {
     i += 1;
     let loader: string[] = lines[i].match(loaderMatch[fileType]);
 
     if (loader) {
       // loader found
       let fileToLoad: string = loader[1];
+
+      if (filesLoaded.indexOf(fileToLoad) > -1) {
+        console.log(`"${fileToLoad}" already loaded.`);
+        continue;
+      }
+
       let pathToFile: string = path.normalize(path.join(window.coderoad.dir, fileToLoad));
-      let file: string = fs.readFileSync(pathToFile, 'utf8');
-      imports += file;
+      lines[i] = fs.readFileSync(pathToFile, 'utf8');
     }
   }
-
-  let output: string = null;
-  if (imports.length > 0) {
-    output = imports + '\n'.concat(data);
-  } else {
-    output = data;
-  }
-  return output;
+  return lines.join('\n');
 }
