Skip to content

Commit a0ae4f3

Browse files
committed
Remove valueInteger64 handling, keep valueString only for Long results
Scope the change to FHIR R4 for now: a Long result is matched only when returned as valueString. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01M6fK2KhnNsn28SJfe83Htw
1 parent fcabaa1 commit a0ae4f3

4 files changed

Lines changed: 2 additions & 31 deletions

File tree

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

Lines changed: 0 additions & 13 deletions
This file was deleted.

src/server/extractor-builder.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { UndefinedExtractor } from '../extractors/undefined-extractor.js';
44
import { StringExtractor } from '../extractors/value-type-extractors/string-extractor.js';
55
import { BooleanExtractor } from '../extractors/value-type-extractors/boolean-extractor.js';
66
import { IntegerExtractor } from '../extractors/value-type-extractors/integer-extractor.js';
7-
import { Integer64Extractor } from '../extractors/value-type-extractors/integer64-extractor.js';
87
import { DecimalExtractor } from '../extractors/value-type-extractors/decimal-extractor.js';
98
import { DateExtractor } from '../extractors/value-type-extractors/date-extractor.js';
109
import { DateTimeExtractor } from '../extractors/value-type-extractors/datetime-extractor.js';
@@ -28,7 +27,6 @@ export function buildExtractor(): ResultExtractor {
2827
.setNextExtractor(new StringExtractor())
2928
.setNextExtractor(new BooleanExtractor())
3029
.setNextExtractor(new IntegerExtractor())
31-
.setNextExtractor(new Integer64Extractor())
3230
.setNextExtractor(new DecimalExtractor())
3331
.setNextExtractor(new DateExtractor())
3432
.setNextExtractor(new DateTimeExtractor())

src/shared/results-utils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* Compares an expected CQL Long (parsed to a BigInt by cvl) against the actual value.
3-
* A Long result must be returned as valueString (FHIR R4 has no integer64 type) or
4-
* as valueInteger64 (serialized as a JSON string), so the actual is a string either way.
3+
* FHIR R4 has no integer64 type, so a Long result is returned as valueString and the
4+
* extracted actual is a string.
55
*/
66
function longEquals(expected: bigint, actual: any): boolean {
77
if (typeof actual === 'bigint') {

test/extractResults-cql_operations.test.ts

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,6 @@ test('integer response check', () => {
3838
).toBe(1);
3939
});
4040

41-
test('integer64 response check', () => {
42-
expect(
43-
extractor!.extract({
44-
resourceType: 'Parameters',
45-
parameter: [
46-
{
47-
name: 'return',
48-
valueInteger64: '9223372036854775807',
49-
},
50-
],
51-
})
52-
).toBe('9223372036854775807');
53-
});
54-
5541
test('decimal(0.1) response check', () => {
5642
expect(
5743
extractor!.extract({

0 commit comments

Comments
 (0)