Clean up empty answers key from qr item

Author: ruscoder

package.json

@@ -1,7 +1,7 @@
 {
   "name": "sdc-qrf",
   "license": "MIT",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.3",
   "scripts": {
     "test": "vitest --watch=false",
     "test:watch": "vitest --watch",

src/utils.ts

@@ -249,25 +249,27 @@ function mapFormToResponseRecursive(
             }, acc);
         }
 
+        const qrItemAnswers = answers
+            .filter((answer) => !isAnswerValueEmpty(answer.value))
+            .reduce((answersAcc, answer) => {
+                const items = hasSubAnswerItems(answer.items)
+                    ? mapFormToResponseRecursive(answer.items, question.item ?? [])
+                    : [];
+
+                return [
+                    ...answersAcc,
+                    {
+                        ...toFHIRAnswerValue(answer.value!, 'value'),
+                        ...(items.length ? { item: items } : {}),
+                    },
+                ];
+            }, [] as QuestionnaireResponseItemAnswer[]);
+
         return [
             ...acc,
             {
                 linkId,
-                answer: answers
-                    .filter((answer) => !isAnswerValueEmpty(answer.value))
-                    .reduce((answersAcc, answer) => {
-                        const items = hasSubAnswerItems(answer.items)
-                            ? mapFormToResponseRecursive(answer.items, question.item ?? [])
-                            : [];
-
-                        return [
-                            ...answersAcc,
-                            {
-                                ...toFHIRAnswerValue(answer.value!, 'value'),
-                                ...(items.length ? { item: items } : {}),
-                            },
-                        ];
-                    }, [] as QuestionnaireResponseItemAnswer[]),
+                ...(qrItemAnswers.length ? { answer: qrItemAnswers } : {}),
             },
         ];
     }, [] as QuestionnaireResponseItem[]);

tests/utils.test.ts

@@ -713,27 +713,20 @@ test('Transform removes missing answers', () => {
             items: {
                 'question-1': [
                     {
-                        items: {},
                         value: {
                             string: undefined,
                         },
                     },
                 ],
                 'question-2': [
                     {
-                        items: {},
                         value: undefined,
                     },
                 ],
-                'question-3': [
-                    {
-                        items: {},
-                    },
-                ],
+                'question-3': [{}],
                 'question-4': [],
                 'question-5': [
                     {
-                        items: {},
                         value: {
                             string: 'ok',
                         },
@@ -752,19 +745,15 @@ test('Transform removes missing answers', () => {
                 linkId: 'root-group',
                 item: [
                     {
-                        answer: [],
                         linkId: 'question-1',
                     },
                     {
-                        answer: [],
                         linkId: 'question-2',
                     },
                     {
-                        answer: [],
                         linkId: 'question-3',
                     },
                     {
-                        answer: [],
                         linkId: 'question-4',
                     },
                     {