Improve error messages when compiling app_settings.json

medic · May 30, 2017 · c0f9c3d · c0f9c3d
1 parent 094f2f1
commit c0f9c3d
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 17 deletions.
diff --git a/src/fn/compile-app-settings.js b/src/fn/compile-app-settings.js
@@ -1,33 +1,48 @@
 const fs = require('../lib/sync-fs');
 
+const FILES = {
+  app_settings: 'json',
+  'contact-summary': 'js',
+  nools: 'js',
+  tasks: 'json',
+  targets: 'json',
+};
+
 module.exports = (project /*, couchUrl */) => {
   return Promise.resolve()
     .then(() => {
-      const readProjectFile = f => fs.read(`${project}/${f}`);
+      const files = filesFor(project);
 
-      const files = {};
-      [
-        'app_settings.json',
-        'contact-summary.js',
-        'nools.js',
-        'tasks.json',
-        'targets.json',
-      ].forEach(f => files[simple(f)] = readProjectFile(f));
+      const app_settings = files.app_settings;
 
-      const app_settings = JSON.parse(files.app_settings);
-
-      app_settings.contact_summary = cleanJs(files.contact_summary);
+      app_settings.contact_summary = files.contact_summary;
 
       app_settings.tasks = {
-        rules: cleanJs(files.nools),
-        schedules: JSON.parse(files.tasks),
-        targets: JSON.parse(files.targets),
+        rules: files.nools,
+        schedules: files.tasks,
+        targets: files.targets,
       };
 
       fs.writeJson(`${project}/app_settings.json`, app_settings);
     });
 };
 
+const filesFor = project => {
+  const files = {};
+  for(const name in FILES) {
+    const type = FILES[name];
+    const path = `${project}/${name}.${type}`;
+
+    files[simple(name)] = readerFor[type](path);
+  }
+  return files;
+};
+
+const readerFor = {
+  js: path => cleanJs(fs.read(path)),
+  json: fs.readJson,
+};
+
 const simple = s => s.replace(/\..*/, '').replace('-', '_');
 const cleanJs = js =>
   js.split('\n')

diff --git a/src/lib/sync-fs.js b/src/lib/sync-fs.js
@@ -1,10 +1,25 @@
 const fs = require('fs');
+const warn = require('../lib/log').warn;
 
 module.exports = {
   exists: fs.existsSync,
   mkdir: path => { try { fs.mkdirSync(path); } catch(e) { /* yum yum */ } },
-  read: path => fs.readFileSync(path, { encoding:'utf8' }),
-  readJson: path => JSON.parse(module.exports.read(path)),
+  read: path => {
+    try {
+      return fs.readFileSync(path, { encoding:'utf8' });
+    } catch(e) {
+      warn(`Error reading file: ${path}`);
+      throw e;
+    }
+  },
+  readJson: path => {
+    try {
+      return JSON.parse(module.exports.read(path));
+    } catch(e) {
+      warn(`Error parsing JSON in: ${path}`);
+      throw e;
+    }
+  },
   readBinary: path => fs.readFileSync(path),
   readdir: fs.readdirSync,
   write: (path, content) => fs.writeFileSync(path, content, 'utf8'),