monocart-coverage-reports 2.5.9 → 2.6.1

package/lib/converter/ignore.js

@@ -1,163 +1,163 @@
-const Util = require('../utils/util.js');
-
-const getNextN = (content, currentLine, item, locator) => {
-
-    // v-8 ignore next N
-    if (content) {
-        const n = parseInt(content);
-        if (n && n > 0) {
-            return n;
-        }
-        return 1;
-    }
-
-    // block comment not end of line, same line
-    if (item.block) {
-        // has code between comment and line end
-        const text = locator.getSlice(item.end, currentLine.end).trim();
-        if (text) {
-            return 0;
-        }
-    }
-
-    // v-8 ignore next
-    return 1;
-};
-
-const extendStart = (start, source) => {
-    // extend left, include
-    while (start > 0 && Util.isBlank(source[start - 1])) {
-        start -= 1;
-    }
-    return start;
-};
-
-const extendEnd = (end, source, maxLength) => {
-    // extend right, exclude
-    while (end < maxLength && Util.isBlank(source[end])) {
-        end += 1;
-    }
-    return end;
-};
-
-const addNextIgnore = (list, content, item, locator) => {
-
-    const { lineParser, source } = locator;
-    const maxLength = source.length;
-
-    const start = extendStart(item.start, source);
-
-    // findLine 0-base
-    const currentLine = lineParser.findLine(item.end);
-    const n = getNextN(content, currentLine, item, locator);
-
-    // console.log('current line', currentLine.line, 'lines', lines);
-
-    // getLine 1-base
-    const line = currentLine.line + 1;
-    const endLine = locator.getLine(line + n);
-    const end = extendEnd(endLine ? endLine.end : maxLength, source, maxLength);
-
-    const nextItem = {
-        type: 'next',
-        n,
-        start,
-        end
-    };
-
-    list.push(nextItem);
-};
-
-// both v8 or c8
-const hasIgnoreKey = (content) => {
-    const v8Key = 'v8 ignore';
-    if (content.startsWith(v8Key)) {
-        return v8Key.length;
-    }
-    const c8Key = 'c8 ignore';
-    if (content.startsWith(c8Key)) {
-        return c8Key.length;
-    }
-    // istanbul ignore has different rules, can not support it
-};
-
-const getIgnoredRanges = (locator, options) => {
-    if (!options.v8Ignore) {
-        return;
-    }
-
-    const { lineParser, source } = locator;
-    const maxLength = source.length;
-
-    const comments = lineParser.comments;
-    if (!Util.isList(comments)) {
-        return;
-    }
-
-    const list = [];
-    let ignoreStart = null;
-
-    comments.forEach((item) => {
-        const {
-            block, start, end, text
-        } = item;
-        let content = block ? text.slice(2, -2) : text.slice(2);
-        content = content.trim();
-
-        const ignoreKey = hasIgnoreKey(content);
-        if (!ignoreKey) {
-            return;
-        }
-
-        content = content.slice(ignoreKey).trim();
-
-        if (ignoreStart) {
-            // v-8 ignore stop
-            if (content === 'stop') {
-                ignoreStart.end = extendEnd(end, source, maxLength);
-                ignoreStart = null;
-            }
-            return;
-        }
-
-        // v-8 ignore start
-        if (content === 'start') {
-            // add first for sort by start
-            ignoreStart = {
-                type: 'start-stop',
-                start: extendStart(start, source),
-                end: start
-            };
-            list.push(ignoreStart);
-            return;
-        }
-
-        // v-8 ignore next N
-        const nextKey = 'next';
-        if (content.startsWith(nextKey)) {
-            content = content.slice(nextKey.length).trim();
-            addNextIgnore(list, content, item, locator);
-        }
-
-    });
-
-    // ignore not stop
-    if (ignoreStart) {
-        ignoreStart.end = locator.source.length;
-        ignoreStart = null;
-    }
-
-    if (!list.length) {
-        return;
-    }
-
-    // console.log('=============================================');
-    // console.log(list);
-
-    return list;
-};
-
-
-module.exports = {
-    getIgnoredRanges
-};
+const Util = require('../utils/util.js');
+
+const getNextN = (content, currentLine, item, locator) => {
+
+    // v-8 ignore next N
+    if (content) {
+        const n = parseInt(content);
+        if (n && n > 0) {
+            return n;
+        }
+        return 1;
+    }
+
+    // block comment not end of line, same line
+    if (item.block) {
+        // has code between comment and line end
+        const text = locator.getSlice(item.end, currentLine.end).trim();
+        if (text) {
+            return 0;
+        }
+    }
+
+    // v-8 ignore next
+    return 1;
+};
+
+const extendStart = (start, source) => {
+    // extend left, include
+    while (start > 0 && Util.isBlank(source[start - 1])) {
+        start -= 1;
+    }
+    return start;
+};
+
+const extendEnd = (end, source, maxLength) => {
+    // extend right, exclude
+    while (end < maxLength && Util.isBlank(source[end])) {
+        end += 1;
+    }
+    return end;
+};
+
+const addNextIgnore = (list, content, item, locator) => {
+
+    const { lineParser, source } = locator;
+    const maxLength = source.length;
+
+    const start = extendStart(item.start, source);
+
+    // findLine 0-base
+    const currentLine = lineParser.findLine(item.end);
+    const n = getNextN(content, currentLine, item, locator);
+
+    // console.log('current line', currentLine.line, 'lines', lines);
+
+    // getLine 1-base
+    const line = currentLine.line + 1;
+    const endLine = locator.getLine(line + n);
+    const end = extendEnd(endLine ? endLine.end : maxLength, source, maxLength);
+
+    const nextItem = {
+        type: 'next',
+        n,
+        start,
+        end
+    };
+
+    list.push(nextItem);
+};
+
+// both v8 or c8
+const hasIgnoreKey = (content) => {
+    const v8Key = 'v8 ignore';
+    if (content.startsWith(v8Key)) {
+        return v8Key.length;
+    }
+    const c8Key = 'c8 ignore';
+    if (content.startsWith(c8Key)) {
+        return c8Key.length;
+    }
+    // istanbul ignore has different rules, can not support it
+};
+
+const getIgnoredRanges = (locator, options) => {
+    if (!options.v8Ignore) {
+        return;
+    }
+
+    const { lineParser, source } = locator;
+    const maxLength = source.length;
+
+    const comments = lineParser.comments;
+    if (!Util.isList(comments)) {
+        return;
+    }
+
+    const list = [];
+    let ignoreStart = null;
+
+    comments.forEach((item) => {
+        const {
+            block, start, end, text
+        } = item;
+        let content = block ? text.slice(2, -2) : text.slice(2);
+        content = content.trim();
+
+        const ignoreKey = hasIgnoreKey(content);
+        if (!ignoreKey) {
+            return;
+        }
+
+        content = content.slice(ignoreKey).trim();
+
+        if (ignoreStart) {
+            // v-8 ignore stop
+            if (content === 'stop') {
+                ignoreStart.end = extendEnd(end, source, maxLength);
+                ignoreStart = null;
+            }
+            return;
+        }
+
+        // v-8 ignore start
+        if (content === 'start') {
+            // add first for sort by start
+            ignoreStart = {
+                type: 'start-stop',
+                start: extendStart(start, source),
+                end: start
+            };
+            list.push(ignoreStart);
+            return;
+        }
+
+        // v-8 ignore next N
+        const nextKey = 'next';
+        if (content.startsWith(nextKey)) {
+            content = content.slice(nextKey.length).trim();
+            addNextIgnore(list, content, item, locator);
+        }
+
+    });
+
+    // ignore not stop
+    if (ignoreStart) {
+        ignoreStart.end = locator.source.length;
+        ignoreStart = null;
+    }
+
+    if (!list.length) {
+        return;
+    }
+
+    // console.log('=============================================');
+    // console.log(list);
+
+    return list;
+};
+
+
+module.exports = {
+    getIgnoredRanges
+};

package/lib/converter/info-branch.js

@@ -1,93 +1,93 @@
-const Util = require('../utils/util.js');
-module.exports = class InfoBranch {
-    constructor(data, original) {
-        const {
-            start, end, locations, type
-        } = data;
-
-        this.start = start;
-        this.end = end;
-        this.locations = locations;
-        this.type = type;
-        this.data = data;
-        this.original = original;
-    }
-
-    getRanges() {
-        return this.locations.map((item) => {
-            const range = {
-                start: item.start,
-                end: item.end,
-                count: item.count
-            };
-            if (item.none) {
-                range.none = true;
-            }
-            if (item.ignored) {
-                range.ignored = true;
-            }
-            // for debug
-            if (Util.isDebug() && this.original) {
-                range.generatedStart = item.generatedStart;
-                range.generatedEnd = item.generatedEnd;
-            }
-            return range;
-        });
-    }
-
-    generate(locator) {
-        const groupLoc = {
-            start: this.start,
-            end: this.end
-        };
-        Util.updateOffsetToLocation(locator, groupLoc);
-        const line = groupLoc.start.line;
-
-        // remove ignored
-        // do NOT change previous number type to object, need used for sourcemap
-        const newLocations = this.locations.filter((it) => !it.ignored).map((it) => {
-            const item = {
-                start: it.start,
-                end: it.end,
-                none: it.none,
-                count: it.count
-            };
-
-            // [ { start:{line,column}, end:{line,column}, count }, ...]
-            Util.updateOffsetToLocation(locator, item);
-
-            return item;
-        });
-
-        const map = {
-            loc: groupLoc,
-            type: this.type,
-            locations: newLocations.map((item) => {
-                const {
-                    start, end, none
-                } = item;
-                if (none) {
-                    // none with group start/end, should be empty for istanbul
-                    return {
-                        start: {},
-                        end: {}
-                    };
-                }
-                return {
-                    start,
-                    end
-                };
-
-            }),
-            line: line
-        };
-
-        const counts = newLocations.map((item) => item.count);
-
-        return {
-            map,
-            counts
-        };
-    }
-
-};
+const Util = require('../utils/util.js');
+module.exports = class InfoBranch {
+    constructor(data, original) {
+        const {
+            start, end, locations, type
+        } = data;
+
+        this.start = start;
+        this.end = end;
+        this.locations = locations;
+        this.type = type;
+        this.data = data;
+        this.original = original;
+    }
+
+    getRanges() {
+        return this.locations.map((item) => {
+            const range = {
+                start: item.start,
+                end: item.end,
+                count: item.count
+            };
+            if (item.none) {
+                range.none = true;
+            }
+            if (item.ignored) {
+                range.ignored = true;
+            }
+            // for debug
+            if (Util.isDebug() && this.original) {
+                range.generatedStart = item.generatedStart;
+                range.generatedEnd = item.generatedEnd;
+            }
+            return range;
+        });
+    }
+
+    generate(locator) {
+        const groupLoc = {
+            start: this.start,
+            end: this.end
+        };
+        Util.updateOffsetToLocation(locator, groupLoc);
+        const line = groupLoc.start.line;
+
+        // remove ignored
+        // do NOT change previous number type to object, need used for sourcemap
+        const newLocations = this.locations.filter((it) => !it.ignored).map((it) => {
+            const item = {
+                start: it.start,
+                end: it.end,
+                none: it.none,
+                count: it.count
+            };
+
+            // [ { start:{line,column}, end:{line,column}, count }, ...]
+            Util.updateOffsetToLocation(locator, item);
+
+            return item;
+        });
+
+        const map = {
+            loc: groupLoc,
+            type: this.type,
+            locations: newLocations.map((item) => {
+                const {
+                    start, end, none
+                } = item;
+                if (none) {
+                    // none with group start/end, should be empty for istanbul
+                    return {
+                        start: {},
+                        end: {}
+                    };
+                }
+                return {
+                    start,
+                    end
+                };
+
+            }),
+            line: line
+        };
+
+        const counts = newLocations.map((item) => item.count);
+
+        return {
+            map,
+            counts
+        };
+    }
+
+};

package/lib/converter/info-function.js

@@ -1,63 +1,63 @@
-const Util = require('../utils/util.js');
-module.exports = class InfoFunction {
-    constructor(data, original) {
-
-        const {
-            start, end, bodyStart, bodyEnd, functionName, count
-        } = data;
-
-        this.start = start;
-        this.end = end;
-        this.bodyStart = bodyStart;
-        this.bodyEnd = bodyEnd;
-        this.count = count;
-        this.functionName = functionName;
-        this.data = data;
-        this.original = original;
-    }
-
-    getRange() {
-        const range = {
-            start: this.start,
-            end: this.end,
-            count: this.count
-        };
-        if (this.ignored) {
-            range.ignored = true;
-        }
-        // for debug
-        if (Util.isDebug() && this.original) {
-            range.generatedStart = this.data.generatedStart;
-            range.generatedEnd = this.data.generatedEnd;
-        }
-        return range;
-    }
-
-    generate(locator, index) {
-
-        const decl = {
-            start: this.start,
-            end: this.bodyStart
-        };
-
-        Util.updateOffsetToLocation(locator, decl);
-
-        const loc = {
-            start: this.bodyStart,
-            end: this.end
-        };
-
-        Util.updateOffsetToLocation(locator, loc);
-
-        const line = loc.start.line;
-
-        const functionName = this.functionName || `(anonymous_${index})`;
-
-        return {
-            name: functionName,
-            decl: decl,
-            loc: loc,
-            line: line
-        };
-    }
-};
+const Util = require('../utils/util.js');
+module.exports = class InfoFunction {
+    constructor(data, original) {
+
+        const {
+            start, end, bodyStart, bodyEnd, functionName, count
+        } = data;
+
+        this.start = start;
+        this.end = end;
+        this.bodyStart = bodyStart;
+        this.bodyEnd = bodyEnd;
+        this.count = count;
+        this.functionName = functionName;
+        this.data = data;
+        this.original = original;
+    }
+
+    getRange() {
+        const range = {
+            start: this.start,
+            end: this.end,
+            count: this.count
+        };
+        if (this.ignored) {
+            range.ignored = true;
+        }
+        // for debug
+        if (Util.isDebug() && this.original) {
+            range.generatedStart = this.data.generatedStart;
+            range.generatedEnd = this.data.generatedEnd;
+        }
+        return range;
+    }
+
+    generate(locator, index) {
+
+        const decl = {
+            start: this.start,
+            end: this.bodyStart
+        };
+
+        Util.updateOffsetToLocation(locator, decl);
+
+        const loc = {
+            start: this.bodyStart,
+            end: this.end
+        };
+
+        Util.updateOffsetToLocation(locator, loc);
+
+        const line = loc.start.line;
+
+        const functionName = this.functionName || `(anonymous_${index})`;
+
+        return {
+            name: functionName,
+            decl: decl,
+            loc: loc,
+            line: line
+        };
+    }
+};