monocart-coverage-reports 2.3.2 → 2.3.4

package/lib/platform/share.js

@@ -241,8 +241,46 @@ const Util = {
     },
 
     isBlank: (codeStr) => {
-        const blankBlock = /\S/;
-        return !blankBlock.test(codeStr);
+        if (typeof codeStr === 'string') {
+            const blankBlock = /\S/;
+            return !blankBlock.test(codeStr);
+        }
+        return false;
+    },
+
+    findInRanges: (startPos, endPos, rangeList, startKey = 'start', endKey = 'end') => {
+        if (!Util.isList(rangeList)) {
+            return;
+        }
+
+        const quickFindRange = (position, ranges) => {
+            let start = 0;
+            let end = ranges.length - 1;
+            while (end - start > 1) {
+                const i = Math.floor((start + end) * 0.5);
+                const item = ranges[i];
+                if (position < item[startKey]) {
+                    end = i;
+                    continue;
+                }
+                if (position > item[endKey]) {
+                    start = i;
+                    continue;
+                }
+                return ranges[i];
+            }
+            // last two items, less is start
+            const endItem = ranges[end];
+            if (position < endItem[startKey]) {
+                return ranges[start];
+            }
+            return ranges[end];
+        };
+
+        const range = quickFindRange(startPos, rangeList);
+        if (startPos >= range[startKey] && endPos <= range[endKey]) {
+            return range;
+        }
     },
 
     getRangeLines: (sLoc, eLoc) => {
@@ -270,7 +308,7 @@ const Util = {
             lines.push({
                 line: sLoc.line,
                 entire,
-                range: {
+                pieces: {
                     start: sLoc.column,
                     end: sLoc.length
                 }
@@ -286,7 +324,7 @@ const Util = {
             lines.push({
                 line: sLoc.line,
                 entire,
-                range: {
+                pieces: {
                     start: sLoc.column,
                     end: eLoc.column
                 }
@@ -304,7 +342,7 @@ const Util = {
             lines.push({
                 line: eLoc.line,
                 entire,
-                range: {
+                pieces: {
                     start: eLoc.indent,
                     end: eLoc.column
                 }
@@ -329,7 +367,7 @@ const Util = {
                     lines.push({
                         line: i,
                         entire: true
-                        // no range for entire line
+                        // no pieces for entire line
                     });
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "monocart-coverage-reports",
-    "version": "2.3.2",
+    "version": "2.3.4",
     "description": "Monocart coverage reports",
     "main": "./lib/index.js",
     "bin": {

package/lib/converter/find-in-ranges.js

@@ -1,39 +0,0 @@
-const Util = require('../utils/util.js');
-
-const quickFindRange = (position, ranges) => {
-    let start = 0;
-    let end = ranges.length - 1;
-    while (end - start > 1) {
-        const i = Math.floor((start + end) * 0.5);
-        const item = ranges[i];
-        if (position < item.startOffset) {
-            end = i;
-            continue;
-        }
-        if (position > item.endOffset) {
-            start = i;
-            continue;
-        }
-        return ranges[i];
-    }
-    // last two items, less is start
-    const endItem = ranges[end];
-    if (position < endItem.startOffset) {
-        return ranges[start];
-    }
-    return ranges[end];
-};
-
-
-const findInRanges = (start, end, ranges) => {
-    if (!Util.isList(ranges)) {
-        return;
-    }
-    const range = quickFindRange(start, ranges);
-    if (start >= range.startOffset && end <= range.endOffset) {
-        return range;
-    }
-};
-
-
-module.exports = findInRanges;