Merge pull request #120 from MeasureAuthoringTool/MAT-5567

MAT-5567 get all the retrieves

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@madie/cql-antlr-parser",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Antlr Parsing of CQL in typescript",
   "publishConfig": {
     "access": "public"

src/CqlAntlr.ts

@@ -35,6 +35,7 @@ class CqlAntlr {
       identifiers: [],
       expressionDefinitions: [],
       errors: [],
+      retrieves: [],
     };
   }
 

src/CqlAntlrListener.ts

@@ -8,6 +8,7 @@ import {
   IncludeDefinitionContext,
   LibraryDefinitionContext,
   ParameterDefinitionContext,
+  RetrieveContext,
   UsingDefinitionContext,
   ValuesetDefinitionContext
 } from "../generated";
@@ -28,6 +29,8 @@ import CqlExpressionDefinitionCreator from "./CqlExpressionDefinitionCreator";
 import {CqlCode} from "./dto";
 import CqlIdentifier from "./dto/CqlIdentifier";
 import CqlIdentifierCreator from "./CqlIdentifierCreator";
+import CqlRetrieve from "./dto/CqlRetrieve";
+import CqlRetrieveCreator from "./CqlRetrieveCreator";
 
 export default class CqlAntlrListener implements cqlListener {
   constructor(private cqlResult: CqlResult) {
@@ -103,4 +106,14 @@ export default class CqlAntlrListener implements cqlListener {
       this.cqlResult.identifiers.push(identifier);
     }
   }
+
+  enterRetrieve(ctx: RetrieveContext): void {
+    if (ctx.terminology() === undefined) {
+      return;
+    }
+    const cqlRetrieve: CqlRetrieve | undefined = new CqlRetrieveCreator(ctx).buildDao();
+    if (cqlRetrieve) {
+      this.cqlResult.retrieves.push(cqlRetrieve);
+    }
+  }
 }

src/CqlRetrieveCreator.ts

@@ -0,0 +1,17 @@
+import {ParserRuleContext} from "antlr4ts/ParserRuleContext";
+import CreatorBase from "./CreatorBase";
+import {cqlLexer} from "../generated";
+import CqlRetrieve from "./dto/CqlRetrieve";
+
+export default class CqlRetrieveCreator extends CreatorBase<CqlRetrieve> {
+  constructor(ctx: ParserRuleContext) {
+    super(ctx, {} as CqlRetrieve);
+  }
+
+  protected build(): CqlRetrieve {
+    this.cqlDao.name = this.findChildText(cqlLexer.QUOTEDIDENTIFIER);
+    this.cqlDao.terminology = this.findChildText(cqlLexer.QUOTEDIDENTIFIER, 2);
+    this.cqlDao.hits = 0;
+    return this.cqlDao;
+  }
+}

src/dto/CqlResult.ts

@@ -8,6 +8,7 @@ import CqlContext from "./CqlContext";
 import CqlExpressionDefinition from "./CqlExpressionDefinition";
 import CqlError from "./CqlError";
 import CqlIdentifier from "./CqlIdentifier";
+import CqlRetrieve from "./CqlRetrieve";
 
 export default interface CqlResult {
   library?: CqlVersion;
@@ -20,6 +21,7 @@ export default interface CqlResult {
   identifiers: CqlIdentifier[];
   context?: CqlContext;
   expressionDefinitions: CqlExpressionDefinition[];
+  retrieves: CqlRetrieve[];
 
   errors: CqlError[];
 }

src/dto/CqlRetrieve.ts

@@ -0,0 +1,6 @@
+import CqlText from "./CqlText";
+
+export default interface CqlRetrieve extends CqlText {
+  terminology?: string;
+  hits: number;
+}

test/CqlAntlr.test.ts

@@ -26,7 +26,8 @@ describe("test antlr", () => {
 
     expect(cqlResult.context?.name).toEqual("Patient");
 
-    expect(cqlResult.expressionDefinitions.length).toEqual(6);
+    expect(cqlResult.expressionDefinitions.length).toEqual(7);
+    expect(cqlResult.retrieves.length).toEqual(1);
   });
 
   it("reports syntactical errors", () => {

test/testCql.ts

@@ -38,7 +38,10 @@ define "Denominator Exclusion":
     TJC."Ischemic Stroke Encounters with Discharge Disposition"
         union TJC."Comfort Measures during Hospitalization"
       
-    
+define "Encounter Performed":
+    ["Encounter, Performed"] EP
+        where EP.relevantPeriod not null
+        
 define "Antithrombotic Not Given at Discharge":
     ["MedicationRequest": medication in "Antithrombotic Therapy"] NoAntithromboticDischarge
     where NoAntithromboticDischarge.doNotPerform is true