fix build issues and add typedoc

2 files changed, 15 insertions, 1 deletions

diff --git a/node_modules/istanbul-lib-coverage/lib/coverage-map.js b/node_modules/istanbul-lib-coverage/lib/coverage-map.js
index 440779a6a..ccb3c8a4c 100644
--- a/node_modules/istanbul-lib-coverage/lib/coverage-map.js
+++ b/node_modules/istanbul-lib-coverage/lib/coverage-map.js
@@ -58,6 +58,20 @@ CoverageMap.prototype.merge = function (obj) {
     });
 };
 /**
+ * filter the coveragemap based on the callback provided
+ * @param {Function (filename)} callback - Returns true if the path
+ *  should be included in the coveragemap. False if it should be
+ *  removed.
+ */
+CoverageMap.prototype.filter = function (callback) {
+     var that = this;
+     Object.keys(that.data).forEach(function (k) {
+         if (!callback(k)) {
+             delete that.data[k];
+         }
+     });
+};
+/**
  * returns a JSON-serializable POJO for this coverage map
  * @returns {Object}
  */
diff --git a/node_modules/istanbul-lib-coverage/lib/file.js b/node_modules/istanbul-lib-coverage/lib/file.js
index 3cb0ce263..5de8599fb 100644
--- a/node_modules/istanbul-lib-coverage/lib/file.js
+++ b/node_modules/istanbul-lib-coverage/lib/file.js
@@ -204,7 +204,7 @@ FileCoverage.prototype.getBranchCoverageByLine = function () {
         branches = this.b,
         ret = {};
     Object.keys(branchMap).forEach(function (k) {
-        var line = branchMap[k].line,
+        var line = branchMap[k].line || branchMap[k].loc.start.line,
             branchData = branches[k];
         ret[line] = ret[line] || [];
         ret[line].push.apply(ret[line], branchData);