Handling of system.long addressed

conf/development.json

@@ -36,6 +36,132 @@
         "groupName": "Uncertainty tests",
         "testName": "TimeDurationBetweenHourDiffPrecision",
         "reason": "CQLtoELM - Syntax error at Z"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "Abs",
+			"testName": "AbsLong",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "Add",
+			"testName": "Add1L2L",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "Add",
+			"testName": "Add1L1L",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "MinValue",
+			"testName": "LongMinValue",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "MaxValue",
+			"testName": "LongMaxValue",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "Modulo",
+			"testName": "Modulo4LBy2L",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "Multiply",
+			"testName": "Multiply2LBy3L",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "Multiply",
+			"testName": "Multiply1By1L",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "Negate",
+			"testName": "Negate1L",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "Negate",
+			"testName": "NegateMaxLong",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "Negate",
+			"testName": "NegateNeg1L",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "Predecessor",
+			"testName": "PredecessorOf1L",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "Power",
+			"testName": "Power2LTo2L",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "Power",
+			"testName": "Power2LTo3L",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "Subtract",
+			"testName": "Subtract1LAnd1L",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "Successor",
+			"testName": "SuccessorOf1L",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "Truncated Divide",
+			"testName": "TruncatedDivide10LBy3L",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlAggregateFunctionsTest",
+			"groupName": "Product",
+			"testName": "ProductLong",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlAggregateFunctionsTest",
+			"groupName": "Max",
+			"testName": "MaxTestLong",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlAggregateFunctionsTest",
+			"groupName": "Min",
+			"testName": "MinTestLong",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlAggregateFunctionsTest",
+			"groupName": "Sum",
+			"testName": "SumTestLong",
+			"reason": "FHIR R4 does not support Long/Integer64"
       }
     ]
   }

conf/localhost.json

@@ -19,24 +19,150 @@
   "Tests": {
     "ResultsPath": "./results",
     "SkipList": [
-      {
-        "testsName": "CqlAggregateTest",
-        "groupName": "AggregateTests",
-        "testName": "RolledOutIntervals",
-        "reason": "CQLtoELM - Could not resolve identifier MedicationRequestIntervals in the current library"
-      },
-      {
-        "testsName": "CqlDateTimeOperatorsTest",
-        "groupName": "DateTimeComponentFrom",
-        "testName": "DateTimeComponentFromTimezone",
-        "reason": "CQLtoElm - Timezone keyword is only valid in 1.3 or lower"
-      },
-      {
-        "testsName": "CqlDateTimeOperatorsTest",
-        "groupName": "Uncertainty tests",
-        "testName": "TimeDurationBetweenHourDiffPrecision",
-        "reason": "CQLtoELM - Syntax error at Z"
-      }
-    ]
+		{
+			"testsName": "CqlAggregateTest",
+			"groupName": "AggregateTests",
+			"testName": "RolledOutIntervals",
+			"reason": "CQLtoELM - Could not resolve identifier MedicationRequestIntervals in the current library"
+		},
+		{
+			"testsName": "CqlDateTimeOperatorsTest",
+			"groupName": "DateTimeComponentFrom",
+			"testName": "DateTimeComponentFromTimezone",
+			"reason": "CQLtoElm - Timezone keyword is only valid in 1.3 or lower"
+		},
+		{
+			"testsName": "CqlDateTimeOperatorsTest",
+			"groupName": "Uncertainty tests",
+			"testName": "TimeDurationBetweenHourDiffPrecision",
+			"reason": "CQLtoELM - Syntax error at Z"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "Abs",
+			"testName": "AbsLong",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "Add",
+			"testName": "Add1L2L",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "Add",
+			"testName": "Add1L1L",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "MinValue",
+			"testName": "LongMinValue",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "MaxValue",
+			"testName": "LongMaxValue",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "Modulo",
+			"testName": "Modulo4LBy2L",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "Multiply",
+			"testName": "Multiply2LBy3L",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "Multiply",
+			"testName": "Multiply1By1L",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "Negate",
+			"testName": "Negate1L",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "Negate",
+			"testName": "NegateMaxLong",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "Negate",
+			"testName": "NegateNeg1L",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "Predecessor",
+			"testName": "PredecessorOf1L",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "Power",
+			"testName": "Power2LTo2L",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "Power",
+			"testName": "Power2LTo3L",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "Subtract",
+			"testName": "Subtract1LAnd1L",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "Successor",
+			"testName": "SuccessorOf1L",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlArithmeticFunctionsTest",
+			"groupName": "Truncated Divide",
+			"testName": "TruncatedDivide10LBy3L",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlAggregateFunctionsTest",
+			"groupName": "Product",
+			"testName": "ProductLong",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlAggregateFunctionsTest",
+			"groupName": "Max",
+			"testName": "MaxTestLong",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlAggregateFunctionsTest",
+			"groupName": "Min",
+			"testName": "MinTestLong",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		},
+		{
+			"testsName": "CqlAggregateFunctionsTest",
+			"groupName": "Sum",
+			"testName": "SumTestLong",
+			"reason": "FHIR R4 does not support Long/Integer64"
+		}
+	]
   }
 }

src/extractors/value-type-extractors/long-extractor.ts

@@ -0,0 +1,37 @@
+import { BaseExtractor } from '../base-extractor.js';
+
+const CQL_TYPE_EXTENSION_URL = 'http://hl7.org/fhir/StructureDefinition/cqf-cqlType';
+
+function hasCqlLongType(parameter: any): boolean {
+	const extensions = Array.isArray(parameter?.extension) ? parameter.extension : [];
+	return extensions.some(
+		(extension: any) =>
+			extension?.url === CQL_TYPE_EXTENSION_URL &&
+			String(extension?.valueString ?? '').toLowerCase() === 'system.long'
+	);
+}
+
+function parseLong(value: unknown): bigint | undefined {
+	if (value === undefined || value === null) return undefined;
+
+	const text = String(value).trim();
+	const normalized = text.endsWith('L') || text.endsWith('l') ? text.slice(0, -1) : text;
+
+	if (!/^[+-]?\d+$/.test(normalized)) return undefined;
+
+	return BigInt(normalized);
+}
+
+export class LongExtractor extends BaseExtractor {
+	protected _process(parameter: any): any {
+		if (parameter.hasOwnProperty('valueInteger64')) {
+			return parseLong(parameter.valueInteger64);
+		}
+
+		if (parameter.hasOwnProperty('valueString') && hasCqlLongType(parameter)) {
+			return parseLong(parameter.valueString);
+		}
+
+		return undefined;
+	}
+}

src/server/extractor-builder.ts

@@ -2,6 +2,7 @@ import { EvaluationErrorExtractor } from '../extractors/evaluation-error-extract
 import { NullEmptyExtractor } from '../extractors/null-empty-extractor.js';
 import { UndefinedExtractor } from '../extractors/undefined-extractor.js';
 import { StringExtractor } from '../extractors/value-type-extractors/string-extractor.js';
+import { LongExtractor } from '../extractors/value-type-extractors/long-extractor.js';
 import { BooleanExtractor } from '../extractors/value-type-extractors/boolean-extractor.js';
 import { IntegerExtractor } from '../extractors/value-type-extractors/integer-extractor.js';
 import { DecimalExtractor } from '../extractors/value-type-extractors/decimal-extractor.js';
@@ -24,6 +25,7 @@ export function buildExtractor(): ResultExtractor {
   extractors
     .setNextExtractor(new NullEmptyExtractor())
     .setNextExtractor(new UndefinedExtractor())
+    .setNextExtractor(new LongExtractor())
     .setNextExtractor(new StringExtractor())
     .setNextExtractor(new BooleanExtractor())
     .setNextExtractor(new IntegerExtractor())