refactoring

Author: ShMcK

cr.json renamed to dist/cr.json

@@ -1,14 +1,14 @@
 {
   "name": "coderoad-builder",
-  "version": "1.0.0",
-  "description": "creates tutorial project files for the coderoad-viewer",
-  "main": "index.js",
+  "version": "0.1.0",
+  "description": "Generates tutorial project files for the coderoad-viewer",
+  "main": "build.js",
   "directories": {
     "test": "tests"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "start": "node src/build.js src/README.md"
+    "start": "node src/build.js src/README.md dist/cr.json"
   },
   "author": "Shawn McKay <shawn.j.mckay@gmail.com>",
   "license": "ISC",

package.json

@@ -162,13 +162,31 @@ function task(result, lines, index) {
     }
     return result;
 }
-if (process.argv[2]) {
-    fs.writeFile('cr.json', JSON.stringify(build(process.argv[2])), 'utf8', function (err) {
-        if (err)
-            return console.log(err);
-        console.log(process.argv[2] + ' > cr.json');
-    });
+function isValidJSON(text) {
+    if (/^[\],:{}\s]*$/.test(text.replace(/\\["\\\/bfnrtu]/g, '@').
+        replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']').
+        replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+        return true;
+    }
+    else {
+        return false;
+    }
+}
+var input = process.argv[2];
+if (!input) {
+    throw ('Pass in path to .md file');
 }
-else {
-    console.log('Pass in path to .md file');
+var output = process.argv[3];
+if (!output) {
+    throw ('Pass in path to output cr.json file');
 }
+var result = JSON.stringify(build(input));
+if (!isValidJSON(result)) {
+    throw ('Invalid JSON output');
+}
+fs.writeFile(output, result), 'utf8', function (err) {
+    if (err)
+        return console.log(err);
+    console.log(input + ' > ' + output);
+};
+;

src/build.js

@@ -211,15 +211,31 @@ function task(result: Result, lines: string[], index: Index) {
   return result;
 }
 
-// RUN
-// argv[2] = path to .md file
-if (process.argv[2]) {
-  fs.writeFile('cr.json', JSON.stringify(build(process.argv[2])), 'utf8', function(err) {
-    if (err)
-      return console.log(err);
-    console.log(process.argv[2] + ' > cr.json');
-  });
+function isValidJSON(text: string) {
+  if (/^[\],:{}\s]*$/.test(text.replace(/\\["\\\/bfnrtu]/g, '@').
+    replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']').
+    replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+    return true;
+  } else {
+    return false
+  }
 }
-else {
-  console.log('Pass in path to .md file');
+
+var input = process.argv[2];
+if (!input) {
+  throw ('Pass in path to .md file');
 }
+var output = process.argv[3];
+if (!output) {
+  throw ('Pass in path to output cr.json file');
+}
+var result = JSON.stringify(build(input);
+if (!isValidJSON(result)) {
+  throw ('Invalid JSON output');
+}
+
+fs.writeFile(output, result), 'utf8', function(err) {
+  if (err)
+    return console.log(err);
+  console.log(input + ' > ' + output);
+});