Merge pull request #222 from MeasureAuthoringTool/MAT-7995_updateErro…

…rMsgWhenDefineLacksName

Mat 7995 update error msg when define lacks name

package.json

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

src/CustomErrorListener.ts

@@ -3,6 +3,7 @@ import { Recognizer } from "antlr4ts/Recognizer";
 import { Token } from "antlr4ts/Token";
 import { ParserATNSimulator } from "antlr4ts/atn/ParserATNSimulator";
 import CqlResult from "./dto/CqlResult";
+import convertCustomError from "./util/CustomeErrorConverter";
 
 /**
  * Fires on grammar errors.
@@ -32,7 +33,7 @@ export default class CustomErrorListener implements ANTLRErrorListener<Token> {
             1, // plus 1 to ensure full text is included in Ace Editor highlight
         },
         name: offendingSymbol.text,
-        message: msg,
+        message: convertCustomError(msg),
       });
     }
   }

src/util/CustomeErrorConverter.ts

@@ -0,0 +1,15 @@
+const convertCustomError = (errorMessage: string): string => {
+  let convertedMsg: string = errorMessage;
+  switch (errorMessage) {
+    case "no viable alternative at input 'define :'": {
+      convertedMsg = "Definition is missing a name.";
+      break;
+    }
+    default: {
+      break;
+    }
+  }
+  return convertedMsg;
+};
+
+export default convertCustomError;

test/CqlAntlr.test.ts

@@ -10,6 +10,7 @@ import {
   cqlFluentFunctions,
   relatedContextRetrieve,
   aggregateQuery,
+  cqlDefineWithNoName,
 } from "./testCql";
 import { CqlAntlr } from "../src";
 import CqlResult from "../src/dto/CqlResult";
@@ -177,4 +178,13 @@ describe("test antlr", () => {
     const cqlResult: CqlResult = cqlAntlr.parse();
     expect(cqlResult.errors.length).toEqual(0);
   });
+
+  it("test define with no name", (): void => {
+    const cqlAntlr = new CqlAntlr(cqlDefineWithNoName);
+    const cqlResult: CqlResult = cqlAntlr.parse();
+    expect(cqlResult.errors.length).toEqual(1);
+    expect(cqlResult.errors[0].message).toEqual(
+      "Definition is missing a name."
+    );
+  });
 });

test/testCql.ts

@@ -220,6 +220,10 @@ define FactorialOfFive:
     aggregate Result starting 1: Result * Num
 `;
 
+const cqlDefineWithNoName = `
+define :
+  true
+`;
 export {
   simpleDefinitionCql,
   fhirTestCql,
@@ -232,4 +236,5 @@ export {
   cqlFluentFunctions,
   relatedContextRetrieve,
   aggregateQuery,
+  cqlDefineWithNoName,
 };