Merge pull request #19 from fs-webdev/master

handle creating empty assembly.json
intervalia · Feb 23, 2016 · e5526b5 · e5526b5
2 parents a922d76 + eca54bd
commit e5526b5
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 19 deletions.
diff --git a/src/globArray.js b/src/globArray.js
@@ -4,6 +4,11 @@ var minimatch = require("minimatch");
 
 function globArray(patterns, options) {
   var i, list = [];
+
+  if (!patterns) {
+    return list;
+  }
+
   if (!Array.isArray(patterns)) {
     patterns = [patterns];
   }

diff --git a/src/watcher.js b/src/watcher.js
@@ -41,9 +41,15 @@ var assemblyRegex = /\/assembly.json$/;
  * @private
  * @param {string} assemblyPath - Path to the assembly file.
  * @param {object} [assembly] - Assembly to be watched.
+ * @param {function} callback - Callback function.
  */
-function getAssemblyDetails(assemblyPath, assembly) {
-  assembly = assembly || JSON.parse(fs.readFileSync(assemblyPath, 'utf-8'));
+function getAssemblyDetails(assemblyPath, assembly, callback) {
+  try {
+    assembly = assembly || JSON.parse(fs.readFileSync(assemblyPath, 'utf-8'));
+  }
+  catch (err) {
+    return callback(err);
+  }
 
   var projectPath = path.dirname(assemblyPath);
 
@@ -56,13 +62,13 @@ function getAssemblyDetails(assemblyPath, assembly) {
     localeFiles = globArray(["./" + localePathName + "/" + localeFileName + "_*.json"], {cwd: projectPath, root: process.cwd()});
   }
 
-  return {
+  return callback(null, {
     projectPath: projectPath,
     localeFileName: localeFileName,
     localePathName: localePathName,
     localeFiles: localeFiles,
     assembly: assembly
-  };
+  });
 }
 
 /**
@@ -73,16 +79,20 @@ function getAssemblyDetails(assemblyPath, assembly) {
  * @returns {object}
  */
 function getPluginParameters(assemblyPath, assembly) {
-  var details = getAssemblyDetails(assemblyPath, assembly);
-
-  return {
-    "projectPath": details.projectPath,
-    "hasTranslations": details.localeFiles.length > 0,
-    "options": {},
-    "assembly": details.assembly,
-    "assemblyName": assemblyPath,
-    "assemblyFileName": path.basename(details.projectPath),
-  };
+  return getAssemblyDetails(assemblyPath, assembly, function(err, details) {
+    if (err) {
+      return {};
+    }
+
+    return {
+      "projectPath": details.projectPath,
+      "hasTranslations": details.localeFiles.length > 0,
+      "options": {},
+      "assembly": details.assembly,
+      "assemblyName": assemblyPath,
+      "assemblyFileName": path.basename(details.projectPath),
+    };
+  });
 }
 
 /**
@@ -93,15 +103,19 @@ function getPluginParameters(assemblyPath, assembly) {
  * @returns {string[]}
  */
 function getAssemblyFiles(assemblyPath, assembly) {
-  var details = getAssemblyDetails(assemblyPath, assembly);
   var files = [];
 
-  files = files.concat(globArray(details.assembly.files, {cwd: details.projectPath, root: process.cwd()}));
-  files = files.concat(details.localeFiles);
-  files = files.concat(globArray(details.assembly.templates || ["./templates/*.html"], {cwd: details.projectPath, root: process.cwd()}));
+  return getAssemblyDetails(assemblyPath, assembly, function(err, details) {
+    if (err) {
+      return files;
+    }
 
+    files = files.concat(globArray(details.assembly.files, {cwd: details.projectPath, root: process.cwd()}));
+    files = files.concat(details.localeFiles);
+    files = files.concat(globArray(details.assembly.templates || ["./templates/*.html"], {cwd: details.projectPath, root: process.cwd()}));
 
-  return files;
+    return files;
+  });
 }
 
 /**