rooibos-roku 5.5.3 → 5.6.0

package/dist/lib/framework/{unused/CodeCoverage.brs → CodeCoverage.brs}

@@ -6,11 +6,11 @@ function init()
 end function
 
 function setExpectedMap()
-  m.top.expectedMap = "#EXPECTED_MAP#"
+  m.top.expectedMap = #EXPECTED_MAP#
 end function
 
 function setFilePathMap()
-  m.top.filePathMap = "#FILE_PATH_MAP#"
+  m.top.filePathMap = #FILE_PATH_MAP#
 end function
 
 function onEntryChange()

package/dist/lib/framework/Coverage.bs

@@ -1,51 +1,105 @@
 namespace rooibos.Coverage
+  function reportCodeCoverage() as void
 
-'   function createLCovOutput()
-'     ? "Generating lcov.info file..."
-
-'     cc = m.global._rbs_ccn
-'     expectedMap = cc.expectedMap
-'     filePathMap = cc.filePathMap
-'     resolvedMap = cc.resolvedMap
-
-'     buffer = ""
-
-'     for each module in filePathMap.items()
-'       moduleNumber = module.key
-'       filePath = module.value
-'       packageName = "."
-
-'       relativePath = filePath.replace("pkg:", packageName)
-'       sanitizedPath = relativePath.replace("\\", "/")
-
-'       buffer = buffer + "TN:" + chr(10)
-'       buffer = buffer + "SF:" + sanitizedPath + chr(10)
-
-'       for each expected in expectedMap[moduleNumber]
-'         lineNumber = expected[0]
-'         SHIFT = 1
-
-'         if resolvedMap[moduleNumber] <> invalid and resolvedMap[moduleNumber].doesExist(str(lineNumber)) then
-'           buffer = buffer + "DA:" + str(lineNumber + SHIFT) + ",1" + chr(10)
-'         else
-'           buffer = buffer + "DA:" + str(lineNumber + SHIFT) + ",0" + chr(10)
-'         end if
-'       end for
-
-'       buffer = buffer + "end_of_record" + chr(10)
-'     end for
-'     return buffer
-'   end function
-
-'   function printLCovInfo()
-'     ?
-'     ? "+++++++++++++++++++++++++++++++++++++++++++"
-'     ? "LCOV.INFO FILE"
-'     ? "+++++++++++++++++++++++++++++++++++++++++++"
-'     ?
-'     ? "+-=-coverage:start"
-'     ? Coverage.createLCovOutput()
-'     ? "+-=-coverage:end"
-'   end function
+    if m.global._rbs_ccn = invalid
+      ? "There was no rooibos code coverage component - not generating coverage report"
+      return
+    end if
+    ? ""
+    ? "...Generating code coverage report"
+    ? ""
+    m.global._rbs_ccn.save = true
+    cc = m.global._rbs_ccn
+    hitFiles = []
+    missFiles = []
+    allLinesCount = 0
+    allLinesHit = 0
+    for each key in cc.expectedMap
+      filename = cc.filePathMap[key]
+      expectedCount = cc.expectedMap[key].count()
+      allLinesCount += expectedCount
+      if expectedCount > 0
+        if cc.resolvedMap[key] <> invalid
+          resolvedCount = cc.resolvedMap[key].count()
+          allLinesHit += resolvedCount
+          resolvedPercent = (resolvedCount / expectedCount) * 100
+          hitFiles.push({ percent: resolvedPercent, text: filename + ": " + str(resolvedPercent).trim() + "% (" + stri(resolvedCount).trim() + "/" + stri(expectedCount).trim() + ")" })
+        else
+          missFiles.push(filename + ": MISS!")
+        end if
+      end if
+    end for
+    allLinesPercent = (allLinesHit / allLinesCount) * 100
+    ? ""
+    ? ""
+    ? "+++++++++++++++++++++++++++++++++++++++++++"
+    ? "Code Coverage Report"
+    ? "+++++++++++++++++++++++++++++++++++++++++++"
+    ? ""
+    ? "Total Coverage: " ; str(allLinesPercent).trim() ; "% (" ; stri(allLinesHit).trim() ; "/" + stri(allLinesCount).trim() ; ")"
+    ? "Files: " ; cc.resolvedMap.count(); "/" ; cc.expectedMap.count()
+    ? ""
+    ? "HIT FILES"
+    ? "---------"
+    hitFiles.SortBy("percent")
+    for i = 0 to hitFiles.count() - 1
+      ? hitFiles[i].text
+    end for
+    ? ""
+    ? "MISSED FILES"
+    ? "------------"
+    for i = 0 to missFiles.count() - 1
+      ? missFiles[i]
+    end for
+
+  end function
+
+  function createLCovOutput()
+    ? "Generating lcov.info file..."
+
+    cc = m.global._rbs_ccn
+    expectedMap = cc.expectedMap
+    filePathMap = cc.filePathMap
+    resolvedMap = cc.resolvedMap
+
+    buffer = ""
+
+    for each module in filePathMap.items()
+      moduleNumber = module.key
+      filePath = module.value
+      packageName = "."
+
+      relativePath = filePath.replace("pkg:", packageName)
+      sanitizedPath = relativePath.replace("\\", "/")
+
+      buffer = buffer + "TN:" + chr(10)
+      buffer = buffer + "SF:" + sanitizedPath + chr(10)
+
+      for each expected in expectedMap[moduleNumber]
+        lineNumber = expected[0]
+        SHIFT = 1
+
+        if resolvedMap[moduleNumber] <> invalid and resolvedMap[moduleNumber].doesExist(str(lineNumber))
+          buffer = buffer + "DA:" + str(lineNumber + SHIFT) + ",1" + chr(10)
+        else
+          buffer = buffer + "DA:" + str(lineNumber + SHIFT) + ",0" + chr(10)
+        end if
+      end for
+
+      buffer = buffer + "end_of_record" + chr(10)
+    end for
+    return buffer
+  end function
+
+  function printLCovInfo()
+    ?
+    ? "+++++++++++++++++++++++++++++++++++++++++++"
+    ? "LCOV.INFO FILE"
+    ? "+++++++++++++++++++++++++++++++++++++++++++"
+    ?
+    ? "+-=-coverage:start"
+    ? rooibos.coverage.createLCovOutput()
+    ? "+-=-coverage:end"
+  end function
 
 end namespace

package/dist/lib/framework/TestRunner.bs

@@ -106,15 +106,17 @@ namespace rooibos
       }
       m.nodeContext.global.testsScene.rooibosTestResult = rooibosResult
 
-      'code coverage is not enabled in rooibos 4.0.0 - will get added again in future
-      ' if Rooibos.Common.isFunction(RBS_reportCodeCoverage)
-      '   'bs:disable-next-line
-      '   RBS_reportCodeCoverage()
-
-      '   if m.config.printLcov = true
-      '     Coverage.printLCovInfo()
-      '   end if
-      ' end if
+      'bs:disable-next-line
+      if Rooibos.Common.isFunction(rooibos.Coverage.reportCodeCoverage)
+        'bs:disable-next-line
+        rooibos.Coverage.reportCodeCoverage()
+
+        if m.config.printLcov = true
+          rooibos.Coverage.printLCovInfo()
+        end if
+      else
+        ? "rooibos.Coverage.reportCodeCoverage is not a function"
+      end if
       if m.config.sendHomeOnFinish <> false
         m.sendHomeKeypress()
       end if

package/dist/lib/rooibos/Annotation.js

@@ -92,7 +92,7 @@ class RooibosAnnotation {
             let describeAnnotations = statement.annotations.filter((a) => getAnnotationType(a.name) === AnnotationType.Describe);
             if (describeAnnotations.length > 1) {
                 for (let a of describeAnnotations) {
-                    Diagnostics_1.diagnosticMultipleDescribeAnnotations(file, a);
+                    (0, Diagnostics_1.diagnosticMultipleDescribeAnnotations)(file, a);
                 }
             }
             for (let annotation of statement.annotations) {
@@ -142,13 +142,13 @@ class RooibosAnnotation {
                     case AnnotationType.It:
                         const testName = annotation.getArguments()[0];
                         if (!testName || testName.trim() === '') {
-                            Diagnostics_1.diagnosticNoTestNameDefined(file, annotation);
+                            (0, Diagnostics_1.diagnosticNoTestNameDefined)(file, annotation);
                         }
                         let newAnnotation = new RooibosAnnotation(file, annotation, annotationType, annotation.name, testName, isIgnore, isSolo, undefined, undefined, tags, noCatch);
                         newAnnotation.isAsync = async;
                         newAnnotation.asyncTimeout = asyncTimeout === -1 ? 2000 : asyncTimeout;
                         if (testAnnotation) {
-                            Diagnostics_1.diagnosticMultipleTestOnFunctionDefined(file, newAnnotation.annotation);
+                            (0, Diagnostics_1.diagnosticMultipleTestOnFunctionDefined)(file, newAnnotation.annotation);
                         }
                         else {
                             testAnnotation = newAnnotation;
@@ -188,11 +188,11 @@ class RooibosAnnotation {
                 this.params.push(new AnnotationParams(annotation, rawParams, annotation.range.start.line, annotation.getArguments(), isIgnore, isSolo, noCatch));
             }
             else {
-                Diagnostics_1.diagnosticIllegalParams(file, annotation);
+                (0, Diagnostics_1.diagnosticIllegalParams)(file, annotation);
             }
         }
         catch (e) {
-            Diagnostics_1.diagnosticIllegalParams(file, annotation);
+            (0, Diagnostics_1.diagnosticIllegalParams)(file, annotation);
         }
     }
 }

package/dist/lib/rooibos/Annotation.js.map

@@ -1 +1 @@
-{"version":3,"file":"Annotation.js","sourceRoot":"","sources":["../../../src/lib/rooibos/Annotation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Annotation.js","sourceRoot":"","sources":["../../../src/lib/rooibos/Annotation.ts"],"names":[],"mappings":"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"}

package/dist/lib/rooibos/CodeCoverageProcessor.js

@@ -1,114 +1,162 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CodeCoverageProcessor = void 0;
+exports.CodeCoverageProcessor = exports.CodeCoverageLineType = void 0;
+const brighterscript_1 = require("brighterscript");
+const brighterscript = require("brighterscript");
+const RawCodeStatement_1 = require("./RawCodeStatement");
+const BrsTranspileState_1 = require("brighterscript/dist/parser/BrsTranspileState");
+const vscode_languageserver_types_1 = require("vscode-languageserver-types");
+const RawCodeExpression_1 = require("./RawCodeExpression");
+var CodeCoverageLineType;
+(function (CodeCoverageLineType) {
+    CodeCoverageLineType[CodeCoverageLineType["noCode"] = 0] = "noCode";
+    CodeCoverageLineType[CodeCoverageLineType["code"] = 1] = "code";
+    CodeCoverageLineType[CodeCoverageLineType["condition"] = 2] = "condition";
+    CodeCoverageLineType[CodeCoverageLineType["branch"] = 3] = "branch";
+})(CodeCoverageLineType = exports.CodeCoverageLineType || (exports.CodeCoverageLineType = {}));
 class CodeCoverageProcessor {
-    constructor(builder) {
-        this._config = builder.options.rooibos || {};
-        this._fileId = 0;
+    constructor(builder, fileFactory) {
+        this.coverageBrsTemplate = `
+    function RBS_CC_#ID#_reportLine(lineNumber, reportType = 1)
+  if m.global = invalid
+    '? "global is not available in this scope!! it is not possible to record coverage: #FILE_PATH#(lineNumber)"
+    return true
+  else
+    if m._rbs_ccn = invalid
+     '? "Coverage maps are not created - creating now"
+      if m.global._rbs_ccn = invalid
+        '? "Coverage maps are not created - creating now"
+          m.global.addFields({
+            "_rbs_ccn": createObject("roSGNode", "CodeCoverage")
+          })
+      end if
+      m._rbs_ccn = m.global._rbs_ccn
+     end if
+  end if
+
+  m._rbs_ccn.entry = {"f":"#ID#", "l":stri(lineNumber), "r":reportType}
+  return true
+end function
+`;
+        this.config = builder.options.rooibos || {};
+        this.expectedCoverageMap = {};
+        this.filePathMap = {};
+        this.fileId = 0;
+        this.fileFactory = fileFactory;
         try {
-            // this._coverageBrsTemplate = fs.readFileSync(path.join(__dirname, './CodeCoverageTemplate.brs'), 'utf8');
-            // this._coverageComponentBrsTemplate = fs.readFileSync(path.join(__dirname, './CodeCoverage.brs'), 'utf8');
-            // this._coverageComponentXmlTemplate = fs.readFileSync(path.join(__dirname, './CodeCoverage.xml'), 'utf8');
-            // this._coverageSupportTemplate = fs.readFileSync(path.join(__dirname, './CodeCoverageSupport.brs'), 'utf8');
         }
         catch (e) {
-            // console.log('Error:', e.stack);
+            console.log('Error:', e.stack);
         }
     }
-    generateMetadata() {
-        //DO when everythin is ran
-        this.createCoverageComponent();
-        this.createCoverageSupport();
+    generateMetadata(isUsingCoverage, program) {
+        if (isUsingCoverage) {
+            this.fileFactory.createCoverageComponent(program, this.expectedCoverageMap, this.filePathMap);
+        }
     }
-    addCodeCoverage(file) {
-        //not yet supported
-        // eslint-disable-next-line no-constant-binary-expression
-        if (false && this._config.isRecordingCodeCoverage) {
-            this._processFile();
+    addCodeCoverage(file, astEditor) {
+        if (this.config.isRecordingCodeCoverage) {
+            this.transpileState = new BrsTranspileState_1.BrsTranspileState(file);
+            this._processFile(file, astEditor);
         }
-        //if matches glob
-        // this._processFile(file);
-        //
     }
-    _processFile() {
-        // this._fileId++;
-        // let fileContents = '';
-        // let lines = file.getFileContents().split(/\r?\n/);
-        // let coverageMap: Map<number, number> = new Map<number, number>();
-        // this.visitableLines = new Map<number, Statement>();
-        // this.getVisitableLinesForStatements(file.ast);
-        // //TODO - walks the ast
-        // for (let lineNumber = 0; lineNumber < lines.length; lineNumber++) {
-        //   let line = lines[lineNumber];
-        //   let statement = this.visitableLines.get(lineNumber);
-        //   let coverageType = CodeCoverageLineType.noCode;
-        //   if (statement) {
-        //     if (statement instanceof IfStatement) {
-        //       let conditionStartPos = statement.condition.range.start.character;
-        //       let conditionEndPos = statement.condition.range.end.character;
-        //       let funcCall = this.getFuncCallText(lineNumber, CodeCoverageLineType.condition);
-        //       let conditionText = line.substr(conditionStartPos, conditionEndPos - conditionStartPos);
-        //       let restofLineText = line.substring(conditionEndPos);
-        //       line = `${line.substr(0, conditionStartPos)} ${funcCall} and (${conditionText}) ${restofLineText}`;
-        //       coverageType = CodeCoverageLineType.condition;
-        //     } else if (statement instanceof IfStatement) {
-        //       // let conditionStartPos = statement.condition.location.start.column;
-        //       // let conditionEndPos = statement.condition.location.end.column;
-        //       // let funcCall = this.getFuncCallText(lineNumber, CodeCoverageLineType.condition);
-        //       // let conditionText = line.substr(conditionStartPos, conditionEndPos - conditionStartPos);
-        //       // let restofLineText = line.substring(conditionEndPos);
-        //       // line = `${line.substr(0, conditionStartPos)} ${funcCall} and (${conditionText}) ${restofLineText}`;
-        //       // coverageType = CodeCoverageLineType.condition;
-        //     } else {
-        //       //all types that can be prefixed with the funcall and a colon (i.e for, while, return foreach, assign)
-        //       let funcCall = this.getFuncCallText(lineNumber, CodeCoverageLineType.code);
-        //       line = `${funcCall}: ${line}`;
-        //       coverageType = CodeCoverageLineType.code;
-        //     }
-        //   } else {
-        //    `could not ascertain symbol type for line "${line} - ignoring`);
-        //   }
-        //   if (!line.endsWith('\n')) {
-        //     line += '\n';
-        //   }
-        //   fileContents += line;
-        //   if (coverageType > CodeCoverageLineType.noCode) {
-        //     coverageMap.set(lineNumber, coverageType);
-        //   }
-        // }
-        // this._expectedCoverageMap[this._fileId.toString().trim()] = Array.from(coverageMap);
-        // this._filePathMap[this._fileId] = file.pkgUri;
-        // fileContents += this.getBrsAPIText();
-        // file.setFileContents(fileContents);
-        //`Writing to ${file.fullPath}`);
-        // file.saveFileContents();
+    _processFile(file, astEditor) {
+        this.fileId++;
+        this.coverageMap = new Map();
+        this.executableLines = new Map();
+        this.processedStatements = new Set();
+        this.astEditor = astEditor;
+        file.ast.walk((0, brighterscript_1.createVisitor)({
+            ForStatement: (ds, parent, owner, key) => {
+                this.addStatement(ds);
+                ds.forToken.text = `${this.getFuncCallText(ds.range.start.line, CodeCoverageLineType.code)}: for`;
+            },
+            IfStatement: (ds, parent, owner, key) => {
+                var _a;
+                let ifStatement = ds;
+                while ((0, brighterscript_1.isIfStatement)(ifStatement)) {
+                    this.addStatement(ds);
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+                    ifStatement.condition = new brighterscript.BinaryExpression(new RawCodeExpression_1.RawCodeExpression(this.getFuncCallText(ds.condition.range.start.line, CodeCoverageLineType.branch)), brighterscript.createToken(brighterscript.TokenKind.And), ifStatement.condition);
+                    ifStatement = ifStatement.elseBranch;
+                }
+                let blockStatements = (_a = ifStatement === null || ifStatement === void 0 ? void 0 : ifStatement.statements) !== null && _a !== void 0 ? _a : [];
+                if ((blockStatements === null || blockStatements === void 0 ? void 0 : blockStatements.length) > 0) {
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+                    let coverageStatement = new RawCodeStatement_1.RawCodeStatement(this.getFuncCallText(ifStatement.range.start.line - 1, CodeCoverageLineType.branch));
+                    blockStatements.splice(0, 0, coverageStatement);
+                }
+            },
+            GotoStatement: (ds, parent, owner, key) => {
+                this.addStatement(ds);
+                this.convertStatementToCoverageStatement(ds, CodeCoverageLineType.code, owner, key);
+            },
+            WhileStatement: (ds, parent, owner, key) => {
+                ds.tokens.while.text = `${this.getFuncCallText(ds.range.start.line, CodeCoverageLineType.code)}: while`;
+            },
+            ReturnStatement: (ds, parent, owner, key) => {
+                this.addStatement(ds);
+                this.convertStatementToCoverageStatement(ds, CodeCoverageLineType.code, owner, key);
+            },
+            ForEachStatement: (ds, parent, owner, key) => {
+                this.addStatement(ds);
+                ds.tokens.forEach.text = `${this.getFuncCallText(ds.range.start.line, CodeCoverageLineType.code)}: for each`;
+            },
+            ExitWhileStatement: (ds, parent, owner, key) => {
+            },
+            PrintStatement: (ds, parent, owner, key) => {
+                this.addStatement(ds);
+                this.convertStatementToCoverageStatement(ds, CodeCoverageLineType.code, owner, key);
+            },
+            DottedSetStatement: (ds, parent, owner, key) => {
+                this.addStatement(ds);
+                this.convertStatementToCoverageStatement(ds, CodeCoverageLineType.code, owner, key);
+            },
+            IndexedSetStatement: (ds, parent, owner, key) => {
+                this.addStatement(ds);
+                this.convertStatementToCoverageStatement(ds, CodeCoverageLineType.code, owner, key);
+            },
+            IncrementStatement: (ds, parent, owner, key) => {
+                this.addStatement(ds);
+                this.convertStatementToCoverageStatement(ds, CodeCoverageLineType.code, owner, key);
+            },
+            AssignmentStatement: (ds, parent, owner, key) => {
+                if (!brighterscript.isForStatement(parent)) {
+                    this.addStatement(ds);
+                    this.convertStatementToCoverageStatement(ds, CodeCoverageLineType.code, owner, key);
+                }
+            },
+            ExpressionStatement: (ds, parent, owner, key) => {
+                this.addStatement(ds);
+                this.convertStatementToCoverageStatement(ds, CodeCoverageLineType.code, owner, key);
+            }
+        }), { walkMode: brighterscript_1.WalkMode.visitAllRecursive });
+        this.expectedCoverageMap[this.fileId.toString().trim()] = Array.from(this.coverageMap);
+        this.filePathMap[this.fileId] = file.pkgPath;
+        this.addBrsAPIText(file);
+    }
+    convertStatementToCoverageStatement(statement, coverageType, owner, key) {
+        if (this.processedStatements.has(statement)) {
+            return;
+        }
+        const lineNumber = statement.range.start.line;
+        this.coverageMap.set(lineNumber, coverageType);
+        const parsed = brighterscript_1.Parser.parse(this.getFuncCallText(lineNumber, coverageType)).ast.statements[0];
+        this.astEditor.arraySplice(owner, key, 0, parsed);
+        // store the statement in a set to avoid handling again after inserting statement above
+        this.processedStatements.add(statement);
     }
-    getBrsAPIText() {
-        let template = this._coverageBrsTemplate.replace(/\#ID\#/g, this._fileId.toString().trim());
-        return template;
+    addBrsAPIText(file) {
+        const func = new RawCodeStatement_1.RawCodeStatement(this.coverageBrsTemplate.replace(/\#ID\#/g, this.fileId.toString().trim()), file, vscode_languageserver_types_1.Range.create(brighterscript_1.Position.create(1, 1), brighterscript_1.Position.create(1, 1)));
+        file.ast.statements.push(func);
     }
-    createCoverageComponent() {
-        // //Write this out via program
-        // let targetPath = path.resolve(this._program.options.rootDir);
-        // let file = new File(path.resolve(path.join(targetPath), 'components'), 'components', 'CodeCoverage.xml', '.xml');
-        // file.setFileContents(this._coverageComponentXmlTemplate);
-        //`Writing to ${file.fullPath}`);
-        // file.saveFileContents();
-        // file = new File(path.resolve(path.join(targetPath, 'components')), 'components', 'CodeCoverage.brs', '.brs');
-        // let template = this._coverageComponentBrsTemplate;
-        // template = template.replace(/\#EXPECTED_MAP\#/g, JSON.stringify(this._expectedCoverageMap));
-        // template = template.replace(/\#FILE_PATH_MAP\#/g, JSON.stringify(this._filePathMap));
-        // file.setFileContents(template);
-        //`Writing to ${file.fullPath}`);
-        // file.saveFileContents();
+    addStatement(statement, lineNumber) {
+        if (!this.executableLines.has(lineNumber)) {
+            this.executableLines.set(lineNumber, statement);
+        }
     }
-    createCoverageSupport() {
-        // //write this out via program
-        // let targetPath = path.resolve(this._program.options.rootDir);
-        // let file = new File(path.resolve(path.join(targetPath), 'source'), 'source', 'CodeCoverageSupport.brs', '.brs');
-        // file.setFileContents(this._coverageSupportTemplate);
-        //`Writing to ${file.fullPath}`);
-        // file.saveFileContents();
+    getFuncCallText(lineNumber, lineType) {
+        return `RBS_CC_${this.fileId}_reportLine(${lineNumber.toString().trim()}, ${lineType.toString().trim()})`;
     }
 }
 exports.CodeCoverageProcessor = CodeCoverageProcessor;

package/dist/lib/rooibos/CodeCoverageProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"CodeCoverageProcessor.js","sourceRoot":"","sources":["../../../src/lib/rooibos/CodeCoverageProcessor.ts"],"names":[],"mappings":";;;AAKA,MAAa,qBAAqB;IAE9B,YAAY,OAAuB;QAC/B,IAAI,CAAC,OAAO,GAAI,OAAO,CAAC,OAAe,CAAC,OAAwB,IAAI,EAAE,CAAC;QACvE,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;QACjB,IAAI;YACA,2GAA2G;YAC3G,4GAA4G;YAC5G,4GAA4G;YAC5G,8GAA8G;SACjH;QAAC,OAAO,CAAC,EAAE;YACR,kCAAkC;SACrC;IACL,CAAC;IAMM,gBAAgB;QACnB,0BAA0B;QAC1B,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC/B,IAAI,CAAC,qBAAqB,EAAE,CAAC;IACjC,CAAC;IAEM,eAAe,CAAC,IAAa;QAChC,mBAAmB;QACnB,yDAAyD;QACzD,IAAI,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,uBAAuB,EAAE;YAC/C,IAAI,CAAC,YAAY,EAAE,CAAC;SACvB;QACD,iBAAiB;QACjB,2BAA2B;QAC3B,EAAE;IACN,CAAC;IAEM,YAAY;QACf,kBAAkB;QAClB,yBAAyB;QACzB,qDAAqD;QACrD,oEAAoE;QACpE,sDAAsD;QACtD,iDAAiD;QACjD,yBAAyB;QACzB,sEAAsE;QACtE,kCAAkC;QAClC,yDAAyD;QACzD,oDAAoD;QACpD,qBAAqB;QACrB,8CAA8C;QAC9C,2EAA2E;QAC3E,uEAAuE;QACvE,yFAAyF;QACzF,iGAAiG;QACjG,8DAA8D;QAC9D,4GAA4G;QAC5G,uDAAuD;QACvD,qDAAqD;QACrD,8EAA8E;QAC9E,0EAA0E;QAC1E,4FAA4F;QAC5F,oGAAoG;QACpG,iEAAiE;QACjE,+GAA+G;QAC/G,0DAA0D;QAC1D,eAAe;QACf,+GAA+G;QAC/G,oFAAoF;QACpF,uCAAuC;QACvC,kDAAkD;QAClD,QAAQ;QACR,aAAa;QACb,sEAAsE;QACtE,MAAM;QAEN,gCAAgC;QAChC,oBAAoB;QACpB,MAAM;QACN,0BAA0B;QAC1B,sDAAsD;QACtD,iDAAiD;QACjD,MAAM;QACN,IAAI;QACJ,uFAAuF;QACvF,iDAAiD;QACjD,wCAAwC;QACxC,sCAAsC;QACtC,iCAAiC;QACjC,2BAA2B;IAC/B,CAAC;IAEM,aAAa;QAChB,IAAI,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;QAC5F,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEM,uBAAuB;QAC1B,+BAA+B;QAC/B,gEAAgE;QAChE,oHAAoH;QACpH,4DAA4D;QAC5D,iCAAiC;QACjC,2BAA2B;QAE3B,gHAAgH;QAChH,qDAAqD;QACrD,+FAA+F;QAC/F,wFAAwF;QACxF,kCAAkC;QAClC,iCAAiC;QACjC,2BAA2B;IAC/B,CAAC;IAEM,qBAAqB;QACxB,+BAA+B;QAC/B,gEAAgE;QAChE,mHAAmH;QACnH,uDAAuD;QACvD,iCAAiC;QACjC,2BAA2B;IAC/B,CAAC;CAGJ;AA3HD,sDA2HC"}
+{"version":3,"file":"CodeCoverageProcessor.js","sourceRoot":"","sources":["../../../src/lib/rooibos/CodeCoverageProcessor.ts"],"names":[],"mappings":"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"}