Restrict Long matching to valueString and valueInteger64

A Long result is only allowed to be returned as valueString or
valueInteger64, never valueInteger. Drop the numeric match from the
Long comparison and add an Integer64Extractor to the extraction chain
(FHIR integer64 is serialized as a JSON string).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01M6fK2KhnNsn28SJfe83Htw

Author: claude

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

@@ -0,0 +1,13 @@
+import { BaseExtractor } from '../base-extractor.js';
+
+export class Integer64Extractor extends BaseExtractor {
+	protected _process(parameter: any): any {
+		if (parameter.hasOwnProperty('valueInteger64')) {
+			// FHIR integer64 is serialized as a JSON string; normalize in case a
+			// server sends a JSON number instead.
+			return String(parameter.valueInteger64);
+		}
+
+		return undefined;
+	}
+}

src/server/extractor-builder.ts

@@ -4,6 +4,7 @@ import { UndefinedExtractor } from '../extractors/undefined-extractor.js';
 import { StringExtractor } from '../extractors/value-type-extractors/string-extractor.js';
 import { BooleanExtractor } from '../extractors/value-type-extractors/boolean-extractor.js';
 import { IntegerExtractor } from '../extractors/value-type-extractors/integer-extractor.js';
+import { Integer64Extractor } from '../extractors/value-type-extractors/integer64-extractor.js';
 import { DecimalExtractor } from '../extractors/value-type-extractors/decimal-extractor.js';
 import { DateExtractor } from '../extractors/value-type-extractors/date-extractor.js';
 import { DateTimeExtractor } from '../extractors/value-type-extractors/datetime-extractor.js';
@@ -27,6 +28,7 @@ export function buildExtractor(): ResultExtractor {
     .setNextExtractor(new StringExtractor())
     .setNextExtractor(new BooleanExtractor())
     .setNextExtractor(new IntegerExtractor())
+    .setNextExtractor(new Integer64Extractor())
     .setNextExtractor(new DecimalExtractor())
     .setNextExtractor(new DateExtractor())
     .setNextExtractor(new DateTimeExtractor())

src/shared/results-utils.ts

@@ -1,7 +1,7 @@
 /**
  * Compares an expected CQL Long (parsed to a BigInt by cvl) against the actual value.
- * FHIR R4 has no integer64 type, so servers return Long results as valueString
- * (or valueInteger when the value fits), and the extracted actual is a string or number.
+ * A Long result must be returned as valueString (FHIR R4 has no integer64 type) or
+ * as valueInteger64 (serialized as a JSON string), so the actual is a string either way.
  */
 function longEquals(expected: bigint, actual: any): boolean {
 	if (typeof actual === 'bigint') {
@@ -14,9 +14,6 @@ function longEquals(expected: bigint, actual: any): boolean {
 		}
 		return BigInt(actual) === expected;
 	}
-	if (typeof actual === 'number' && Number.isInteger(actual)) {
-		return BigInt(actual) === expected;
-	}
 	return false;
 }
 

test/extractResults-cql_operations.test.ts

@@ -38,6 +38,20 @@ test('integer response check', () => {
 	).toBe(1);
 });
 
+test('integer64 response check', () => {
+	expect(
+		extractor!.extract({
+			resourceType: 'Parameters',
+			parameter: [
+				{
+					name: 'return',
+					valueInteger64: '9223372036854775807',
+				},
+			],
+		})
+	).toBe('9223372036854775807');
+});
+
 test('decimal(0.1) response check', () => {
 	expect(
 		extractor!.extract({

test/results-utils.test.ts

@@ -26,10 +26,10 @@ test('expected Long matches FHIR R4 valueString encoding', () => {
 	expect(resultsEqual(1n, '2')).toBe(false);
 });
 
-test('expected Long matches integer and bigint actuals', () => {
-	expect(resultsEqual(1n, 1)).toBe(true);
+test('expected Long matches bigint actuals but not numbers (valueInteger is not allowed)', () => {
 	expect(resultsEqual(1n, 1n)).toBe(true);
-	expect(resultsEqual(1n, 2)).toBe(false);
+	expect(resultsEqual(1n, 2n)).toBe(false);
+	expect(resultsEqual(1n, 1)).toBe(false);
 	expect(resultsEqual(1n, 1.5)).toBe(false);
 });