Merge pull request #91 from cqframework/equal-lists-of-strings

Fixes for empty list handling

Author: brynrhodes

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "cql-tests-runner",
-    "version": "1.7.0",
+    "version": "1.7.1",
     "description": "Server API and command line tools for running CQL tests",
     "type": "module",
     "main": "dist/bin/cql-tests.js",

package.json

@@ -1,9 +1,19 @@
 import { BaseExtractor } from './base-extractor.js';
 
+function operationOutcomeMessage(resource: any): string {
+	const issue = resource?.issue?.[0];
+	const fromIssue =
+		issue?.details?.text ?? issue?.diagnostics ?? (issue != null ? JSON.stringify(issue) : undefined);
+	if (fromIssue != null) {
+		return fromIssue;
+	}
+	return resource != null ? JSON.stringify(resource) : 'unknown';
+}
+
 export class EvaluationErrorExtractor extends BaseExtractor {
 	protected _process(parameter: any): any {
 		if (parameter.name === 'evaluation error') {
-			return `EvaluationError:${parameter.resource.issue[0].details.text}`;
+			return `EvaluationError:${operationOutcomeMessage(parameter.resource)}`;
 		}
 
 		return undefined;

src/extractors/evaluation-error-extractor.ts

@@ -12,6 +12,12 @@ export class ValueMap {
 		if (!Array.isArray(parsed)) {
 			return keys;
 		}
+		// Empty list `{}` parses to `[]`. Do not mark `return` as singleton-list: the
+		// extractor already yields `[]` for FHIR empty-list encoding; wrapping would
+		// produce `[[]]` vs expected `[]` (see cqframework/cql-tests-runner#90).
+		if (parsed.length === 0) {
+			return keys;
+		}
 		keys.add('return');
 		for (const item of parsed) {
 			if (Array.isArray(item)) {

src/extractors/value-map.ts

@@ -1,6 +1,7 @@
 import { beforeAll, expect, test } from 'vitest';
 
 import { ResultExtractor } from '../src/extractors/result-extractor.js';
+import { ValueMap } from '../src/extractors/value-map.js';
 import { buildExtractor } from '../src/server/extractor-builder.js';
 
 let extractor: ResultExtractor | null = null;
@@ -124,6 +125,36 @@ test('singleton list-typed return stays array when singletonListKeys includes re
 	).toEqual(['a']);
 });
 
+test('FHIR empty list stays [] when expected is empty list (issue #90)', () => {
+	const emptyListParameters = {
+		resourceType: 'Parameters',
+		parameter: [
+			{
+				name: 'return',
+				extension: [
+					{
+						url: 'http://hl7.org/fhir/StructureDefinition/cqf-cqlType',
+						valueString: 'List<System.Any>',
+					},
+				],
+				_valueBoolean: {
+					extension: [
+						{
+							url: 'http://hl7.org/fhir/StructureDefinition/cqf-isEmptyList',
+							valueBoolean: true,
+						},
+					],
+				},
+			},
+		],
+	};
+	expect(
+		extractor!.extract(emptyListParameters, {
+			singletonListKeys: ValueMap.singletonListKeysFromExpected([]),
+		})
+	).toEqual([]);
+});
+
 test('date response check', () => {
 	expect(
 		extractor!.extract({
@@ -286,6 +317,32 @@ test('error response check', () => {
 	);
 });
 
+test('evaluation error uses diagnostics when details.text is absent', () => {
+	expect(
+		extractor!.extract({
+			resourceType: 'Parameters',
+			parameter: [
+				{
+					name: 'evaluation error',
+					resource: {
+						resourceType: 'OperationOutcome',
+						issue: [{ severity: 'error', diagnostics: 'CQL engine message' }],
+					},
+				},
+			],
+		})
+	).toBe('EvaluationError:CQL engine message');
+});
+
+test('evaluation error does not throw when resource shape is minimal', () => {
+	expect(
+		extractor!.extract({
+			resourceType: 'Parameters',
+			parameter: [{ name: 'evaluation error', resource: { resourceType: 'OperationOutcome', issue: [] } }],
+		})
+	).toBe('EvaluationError:{"resourceType":"OperationOutcome","issue":[]}');
+});
+
 test('period datetime response check', () => {
 	expect(
 		extractor!.extract({

test/extractResults-cql_operations.test.ts

@@ -28,6 +28,10 @@ test('singletonListKeysFromExpected: non-array yields empty key set', () => {
 	expect([...ValueMap.singletonListKeysFromExpected({ a: 1 })]).toEqual([]);
 });
 
+test('singletonListKeysFromExpected: empty array adds no keys (issue #90)', () => {
+	expect([...ValueMap.singletonListKeysFromExpected([])]).toEqual([]);
+});
+
 test('singletonListKeysFromExpected: array adds return', () => {
 	expect([...ValueMap.singletonListKeysFromExpected(['a'])]).toEqual(['return']);
 	expect([...ValueMap.singletonListKeysFromExpected([1, 2])]).toEqual(['return']);