Pulled coverage details into debug output. Fixed uncoverage highlight…

…ing to have it's own strategy for highlighting

src/calculation/Calculator.ts

@@ -41,6 +41,7 @@ import { clearElmInfoCache } from '../helpers/elm/ELMInfoCache';
 import _, { omit } from 'lodash';
 import { ELM } from '../types/ELMTypes';
 import { getReportBuilder } from '../helpers/ReportBuilderFactory';
+import { option } from 'commander';
 
 /**
  * Calculate measure against a set of patients. Returning detailed results for each patient and population group.
@@ -271,7 +272,7 @@ export async function calculate<T extends CalculationOptions>(
         }
       });
 
-      // pull out
+      // pull out uncoverage html
       if (options.calculateClauseUncoverage && coverage.uncoverage) {
         groupClauseUncoverageHTML = coverage.uncoverage;
         if (debugObject && options.enableDebugOutput) {
@@ -296,6 +297,11 @@ export async function calculate<T extends CalculationOptions>(
           html: overallClauseCoverageHTML
         });
       }
+
+      // grab coverage details
+      if (debugObject && options.enableDebugOutput && options.calculateCoverageDetails) {
+        debugObject.coverageDetails = coverage.details;
+      }
     }
   }
 

src/calculation/HTMLBuilder.ts

@@ -92,6 +92,18 @@ Handlebars.registerHelper('highlightCoverage', (localId, context) => {
   return '';
 });
 
+// apply highlighting style to uncovered clauses
+Handlebars.registerHelper('highlightUncoverage', (localId, context) => {
+  const libraryName: string = context.data.root.libraryName;
+  const clauseResults: ClauseResult[] = context.data.root.clauseResults;
+
+  const clauseResult = clauseResults.filter(result => result.libraryName === libraryName && result.localId === localId);
+  if (clauseResult.length > 0) {
+    return objToCSS(cqlLogicClauseFalseStyle);
+  }
+  return '';
+});
+
 /**
  * Sort statements into population, then non-functions, then functions
  */
@@ -287,13 +299,6 @@ export function generateClauseCoverageHTML<T extends CalculationOptions>(
     let uncoverageHtmlString = '';
     if (options.calculateClauseUncoverage) {
       uncoverageHtmlString = `<div><h2> ${groupId} Clause Uncoverage: ${clauseCoverage.uncoveredClauses.length} clauses</h2>`;
-      if (clauseCoverage.uncoveredClauses.length > 0 && clauseCoverage.uncoveredClauses.length <= 20) {
-        uncoverageHtmlString += `<pre><code>\n${JSON.stringify(
-          clauseCoverage.uncoveredClauses,
-          undefined,
-          2
-        )}</code></pre>`;
-      }
     }
 
     // generate HTML clauses using hbs template for each annotation
@@ -313,7 +318,7 @@ export function generateClauseCoverageHTML<T extends CalculationOptions>(
           statementName: a.statementName,
           clauseResults: clauseCoverage.uncoveredClauses,
           ...a.annotation[0].s,
-          highlightCoverage: false
+          highlightUncoverage: true
         });
       }
     });
@@ -359,7 +364,6 @@ export function calculateClauseCoverage(
   relevantStatements: StatementResult[],
   clauseResults: ClauseResult[]
 ): { percentage: string; coveredClauses: ClauseResult[]; uncoveredClauses: ClauseResult[] } {
-  const covTimer = new Date();
   // find all relevant clauses using statementName and libraryName from relevant statements
   const allRelevantClauses = clauseResults.filter(c =>
     relevantStatements.some(
@@ -376,17 +380,13 @@ export function calculateClauseCoverage(
     (c1, c2) => c1.libraryName === c2.libraryName && c1.localId === c2.localId
   );
 
-  const unCovTimer = new Date();
   const uncoveredClauses = allUniqueClauses.filter(c => {
     if (coveredClauses.find(coveredC => c.libraryName === coveredC.libraryName && c.localId === coveredC.localId)) {
       return false;
     } else {
       return true;
     }
   });
-  console.debug(`Uncoverage took ${new Date().getTime() - unCovTimer.getTime()} ms`);
-  console.debug(`Coverage took ${new Date().getTime() - covTimer.getTime()} ms`);
-  console.debug(`Found ${uncoveredClauses.length} uncovered clauses.`, uncoveredClauses);
 
   return {
     percentage: ((coveredClauses.length / allUniqueClauses.length) * 100).toPrecision(3),

src/cli.ts

@@ -115,6 +115,7 @@ async function calc(
     result = await calculateRaw(measureBundle, patientBundles, calcOptions, valueSetCache);
   } else if (program.outputType === 'detailed') {
     calcOptions.calculateClauseUncoverage = true;
+    calcOptions.calculateCoverageDetails = true;
     result = await calculate(measureBundle, patientBundles, calcOptions, valueSetCache);
   } else if (program.outputType === 'reports') {
     calcOptions.reportType = program.reportType || 'individual';
@@ -243,6 +244,10 @@ populatePatientBundles().then(async patientBundles => {
         dumpObject(debugOutput.gaps, 'gaps.json');
       }
 
+      if (debugOutput?.coverageDetails) {
+        dumpObject(debugOutput.coverageDetails, 'coverageDetails.json');
+      }
+
       // Dump ELM
       if (debugOutput?.elm) {
         dumpELMJSONs(debugOutput.elm);

src/templates/clause.ts

@@ -10,6 +10,18 @@ export default `{{~#if @root.highlightCoverage~}}
 {{~/if~}}
 </span>
 {{~else~}}
+{{~#if @root.highlightUncoverage~}}
+<span{{#if r}} data-ref-id="{{r}}" style="{{highlightUncoverage r}}"{{/if}}>
+{{~#if value ~}}
+{{ concat value }}
+{{~/if ~}}
+{{~#if s~}}
+{{~#each s~}}
+{{> clause ~}}
+{{~/each ~}}
+{{~/if~}}
+</span>
+{{~else~}}
 <span{{#if r}} data-ref-id="{{r}}" style="{{highlightClause r}}"{{/if}}>
 {{~#if value ~}}
 {{ concat value }}
@@ -20,4 +32,5 @@ export default `{{~#if @root.highlightCoverage~}}
 {{~/each ~}}
 {{~/if~}}
 </span>
+{{~/if~}}
 {{~/if~}}`;

src/types/Calculator.ts

@@ -358,6 +358,7 @@ export interface DebugOutput {
     retrieves?: DataTypeQuery[];
     bundle?: fhir4.Bundle | fhir4.Bundle[];
   };
+  coverageDetails?: Record<string, ClauseCoverageDetails>;
 }
 
 /*