Merge pull request #2118 from macor161/truffle-empty-artifact-error

Invalid artifacts error
trufflesuite · Jun 27, 2019 · c7aa546 · c7aa546
2 parents af801fd + e804531
commit c7aa546
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/packages/truffle-compile/profiler.js b/packages/truffle-compile/profiler.js
@@ -71,26 +71,33 @@ module.exports = {
                   "utf8",
                   (err, body) => {
                     if (err) return finished(err);
-                    finished(null, body);
+                    finished(null, { file: buildFile, body });
                   }
                 );
               },
               (err, jsonData) => {
                 if (err) return c(err);
 
-                try {
-                  for (let i = 0; i < jsonData.length; i++) {
-                    const data = JSON.parse(jsonData[i]);
+                for (let i = 0; i < jsonData.length; i++) {
+                  try {
+                    const data = JSON.parse(jsonData[i].body);
 
                     // In case there are artifacts from other source locations.
                     if (sourceFilesArtifacts[data.sourcePath] == null) {
                       sourceFilesArtifacts[data.sourcePath] = [];
                     }
 
                     sourceFilesArtifacts[data.sourcePath].push(data);
+                  } catch (e) {
+                    // JSON.parse throws SyntaxError objects
+                    return e instanceof SyntaxError
+                      ? c(
+                          new Error(
+                            "Problem parsing artifact: " + jsonData[i].file
+                          )
+                        )
+                      : c(e);
                   }
-                } catch (e) {
-                  return c(e);
                 }
 
                 c();