@aehrc/smart-forms-renderer 0.40.0 → 0.40.2

package/src/stories/storybookWrappers/IdRemoverDebuggerWrapperForStorybook.tsx

@@ -0,0 +1,84 @@
+/*
+ * Copyright 2024 Commonwealth Scientific and Industrial Research
+ * Organisation (CSIRO) ABN 41 687 119 230.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// @ts-ignore
+import React from 'react';
+import type { Questionnaire, QuestionnaireResponse } from 'fhir/r4';
+import { BaseRenderer } from '../../components';
+import { QueryClientProvider } from '@tanstack/react-query';
+import { RendererThemeProvider } from '../../theme';
+import { useBuildForm, useRendererQueryClient } from '../../hooks';
+import { STORYBOOK_TERMINOLOGY_SERVER_URL } from './globals';
+import IdRemoverButtonForStorybook from './IdRemoverButtonForStorybook';
+import { Grid } from '@mui/material';
+import { useQuestionnaireResponseStore, useQuestionnaireStore } from '../../stores';
+
+interface IdRemoverDebuggerWrapperForStorybookProps {
+  questionnaire: Questionnaire;
+  questionnaireResponse?: QuestionnaireResponse;
+}
+
+/**
+ * This is a wrapper which for debugging answer/item IDs in repeating items and groups.
+ * It features a button to remove answer/item IDs from the QuestionnaireResponse.
+ *
+ * @author Sean Fong
+ */
+function IdRemoverDebuggerWrapperForStorybook(props: IdRemoverDebuggerWrapperForStorybookProps) {
+  const { questionnaire, questionnaireResponse } = props;
+
+  const queryClient = useRendererQueryClient();
+
+  const focusedLinkId = useQuestionnaireStore.use.focusedLinkId();
+  const updatableResponse = useQuestionnaireResponseStore.use.updatableResponse();
+
+  const isBuilding = useBuildForm(
+    questionnaire,
+    questionnaireResponse,
+    undefined,
+    STORYBOOK_TERMINOLOGY_SERVER_URL
+  );
+
+  if (isBuilding) {
+    return <div>Loading...</div>;
+  }
+
+  return (
+    <RendererThemeProvider>
+      <QueryClientProvider client={queryClient}>
+        <div>
+          <Grid container>
+            <Grid item xs={6}>
+              <IdRemoverButtonForStorybook
+                questionnaire={questionnaire}
+                questionnaireResponse={updatableResponse}
+              />
+              <BaseRenderer />
+            </Grid>
+            <Grid item xs={6}>
+              <pre>{JSON.stringify(focusedLinkId, null, 2)}</pre>
+              ----
+              <pre style={{ fontSize: 10 }}>{JSON.stringify(updatableResponse, null, 2)}</pre>
+            </Grid>
+          </Grid>
+        </div>
+      </QueryClientProvider>
+    </RendererThemeProvider>
+  );
+}
+
+export default IdRemoverDebuggerWrapperForStorybook;

package/src/stories/testing/IdRemoverDebuggerWrapper.stories.tsx

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2024 Commonwealth Scientific and Industrial Research
+ * Organisation (CSIRO) ABN 41 687 119 230.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { Meta, StoryObj } from '@storybook/react';
+import IdRemoverDebuggerWrapperForStorybook from '../storybookWrappers/IdRemoverDebuggerWrapperForStorybook';
+import { qMyPatient } from '../assets/questionnaires/QIdRemoverDebugger';
+
+// More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
+const meta = {
+  title: 'Component/Testing/ID Remover Debugger',
+  component: IdRemoverDebuggerWrapperForStorybook,
+  // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/react/writing-docs/autodocs
+  tags: []
+} satisfies Meta<typeof IdRemoverDebuggerWrapperForStorybook>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+// More on writing stories with args: https://storybook.js.org/docs/react/writing-stories/args
+
+export const MyPatient: Story = {
+  args: {
+    questionnaire: qMyPatient
+  }
+};

package/src/tests/extractObservation.test.ts

@@ -1,10 +1,7 @@
 import type { Questionnaire, QuestionnaireResponse } from 'fhir/r4';
 
-import {
-  Extractable,
-  extractObservationBased,
-  mapQItemsExtractable
-} from '../utils/extractObservation';
+import type { Extractable } from '../utils/extractObservation';
+import { extractObservationBased, mapQItemsExtractable } from '../utils/extractObservation';
 import {
   observationResults,
   qExtractSample,

package/src/theme/palette.ts

@@ -77,10 +77,6 @@ const palette: PaletteOptions = {
     secondary: grey['600'],
     disabled: grey['500']
   },
-  background: {
-    paper: '#fff',
-    default: grey['50']
-  },
   customBackground: {
     neutral: '#F4F6F8'
   },

package/src/utils/groupTable.ts

@@ -32,6 +32,6 @@ export function reorderRows(
 
 export function getGroupTableItemsToUpdate(tableRows: GroupTableRowModel[], selectedIds: string[]) {
   return tableRows
-    .filter((row) => selectedIds.includes(row.nanoId))
+    .filter((row) => selectedIds.includes(row.id))
     .flatMap((singleRow) => (singleRow.qrItem ? [cloneDeep(singleRow.qrItem)] : []));
 }

package/src/utils/index.ts

@@ -15,7 +15,13 @@
  * limitations under the License.
  */
 
-export { buildForm, destroyForm, getResponse, removeEmptyAnswersFromResponse } from './manageForm';
+export {
+  buildForm,
+  destroyForm,
+  getResponse,
+  removeEmptyAnswersFromResponse,
+  removeInternalIdsFromResponse
+} from './manageForm';
 export { initialiseQuestionnaireResponse } from './initialise';
 export { isSpecificItemControl } from './itemControl';
 export { isRepeatItemAndNotCheckbox } from './qItem';

package/src/utils/manageForm.ts

@@ -9,6 +9,9 @@ import { initialiseQuestionnaireResponse } from './initialise';
 import { removeEmptyAnswers } from './removeEmptyAnswers';
 import { readEncounter, readPatient, readUser } from '../api/smartClient';
 import type Client from 'fhirclient/lib/Client';
+import cloneDeep from 'lodash.clonedeep';
+import { updateQuestionnaireResponse } from './genericRecursive';
+import { removeInternalRepeatIdsRecursive } from './repeatId';
 
 /**
  * Build the form with an initial Questionnaire and an optional filled QuestionnaireResponse.
@@ -95,7 +98,11 @@ export async function initialiseFhirClient(fhirClient: Client): Promise<void> {
  * @author Sean Fong
  */
 export function getResponse(): QuestionnaireResponse {
-  return questionnaireResponseStore.getState().updatableResponse;
+  const cleanResponse = removeInternalIdsFromResponse(
+    questionnaireStore.getState().sourceQuestionnaire,
+    questionnaireResponseStore.getState().updatableResponse
+  );
+  return cloneDeep(cleanResponse);
 }
 
 /**
@@ -122,6 +129,26 @@ export function removeEmptyAnswersFromResponse(
   });
 }
 
+/**
+ * Remove all instances of item.answer.id from the filled QuestionnaireResponse.
+ * These IDs are used internally for rendering repeating items, and can be safely left out of the final response.
+ *
+ * @author Sean Fong
+ */
+export function removeInternalIdsFromResponse(
+  questionnaire: Questionnaire,
+  questionnaireResponse: QuestionnaireResponse
+): QuestionnaireResponse {
+  const questionnaireResponseToUpdate = cloneDeep(questionnaireResponse);
+
+  return updateQuestionnaireResponse(
+    questionnaire,
+    questionnaireResponseToUpdate,
+    removeInternalRepeatIdsRecursive,
+    undefined
+  );
+}
+
 /**
  * Check if a QuestionnaireResponseItem has either an item or an answer property.
  *

package/src/utils/repeatId.ts

@@ -0,0 +1,123 @@
+/*
+ * Copyright 2024 Commonwealth Scientific and Industrial Research
+ * Organisation (CSIRO) ABN 41 687 119 230.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { nanoid } from 'nanoid';
+import type {
+  QuestionnaireItem,
+  QuestionnaireResponseItem,
+  QuestionnaireResponseItemAnswer
+} from 'fhir/r4';
+import { getQrItemsIndex, mapQItemsIndex } from './mapItem';
+
+export function generateNewRepeatId(linkId: string): string {
+  return `${linkId}-repeat-${nanoid()}`;
+}
+
+export function generateExistingRepeatId(linkId: string, index: number): string {
+  const paddedIndex = index.toString().padStart(6, '0');
+  return `${linkId}-repeat-${paddedIndex}`;
+}
+
+export function removeInternalRepeatIdsRecursive(
+  qItem: QuestionnaireItem,
+  qrItemOrItems: QuestionnaireResponseItem | QuestionnaireResponseItem[] | null
+): QuestionnaireResponseItem | QuestionnaireResponseItem[] | null {
+  // Process repeating group items separately
+  const hasMultipleAnswers = Array.isArray(qrItemOrItems);
+  if (hasMultipleAnswers) {
+    return removeInternalRepeatIdsFromRepeatGroup(qItem, qrItemOrItems);
+  }
+
+  // At this point qrItemOrItems is a single QuestionnaireResponseItem
+  const qrItem = qrItemOrItems;
+
+  // Process items with child items
+  const childQItems = qItem.item ?? [];
+  const childQrItems = qrItem?.item ?? [];
+  const updatedChildQrItems: QuestionnaireResponseItem[] = [];
+  if (childQItems.length > 0) {
+    const indexMap = mapQItemsIndex(qItem);
+    const qrItemsByIndex = getQrItemsIndex(childQItems, childQrItems, indexMap);
+
+    // Iterate child items
+    for (const [index, childQItem] of childQItems.entries()) {
+      const childQRItemOrItems = qrItemsByIndex[index];
+
+      const updatedChildQRItemOrItems = removeInternalRepeatIdsRecursive(
+        childQItem,
+        childQRItemOrItems ?? null
+      );
+
+      if (Array.isArray(updatedChildQRItemOrItems)) {
+        if (updatedChildQRItemOrItems.length > 0) {
+          updatedChildQrItems.push(...updatedChildQRItemOrItems);
+        }
+        continue;
+      }
+
+      if (updatedChildQRItemOrItems) {
+        updatedChildQrItems.push(updatedChildQRItemOrItems);
+      }
+    }
+  }
+
+  // Construct updated qrItem
+  return removeInternalRepeatIdsFromItem(qItem, qrItem, updatedChildQrItems);
+}
+
+function removeInternalRepeatIdsFromRepeatGroup(
+  qItem: QuestionnaireItem,
+  qrItems: QuestionnaireResponseItem[]
+) {
+  if (!qItem.item) {
+    return [];
+  }
+
+  return qrItems
+    .flatMap((childQrItem) => removeInternalRepeatIdsRecursive(qItem, childQrItem))
+    .filter((childQRItem): childQRItem is QuestionnaireResponseItem => !!childQRItem);
+}
+
+function removeInternalRepeatIdsFromItem(
+  qItem: QuestionnaireItem,
+  qrItem: QuestionnaireResponseItem | null,
+  childQrItems: QuestionnaireResponseItem[]
+): QuestionnaireResponseItem | null {
+  if (!qrItem) {
+    return null;
+  }
+
+  // Remove internal repeatId from all answers
+  const updatedAnswers: QuestionnaireResponseItemAnswer[] =
+    qrItem.answer
+      ?.map(
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        ({ id, ...rest }) => {
+          return {
+            ...rest
+          };
+        }
+      )
+      .filter((answer) => !!answer && Object.keys(answer).length > 0) ?? [];
+
+  return {
+    linkId: qItem.linkId,
+    ...(qItem.text && { text: qItem.text }),
+    ...(childQrItems.length > 0 && { item: childQrItems }),
+    ...(updatedAnswers.length > 0 && { answer: updatedAnswers })
+  };
+}

package/CHANGELOG.md

@@ -1,43 +0,0 @@
-# Change log
-
-This log documents significant changes for the [@aehrc/smart-forms-renderer](https://www.npmjs.com/package/@aehrc/smart-forms-renderer). This project follows
-[Semantic Versioning](http://semver.org/).
-
-Changelog only includes changes from version 0.36.0 onwards.
-
-## [0.39.0] - 2024-09-06
-### Changed
-- Refactored `repeat` items so that it tracks item instances using the QuestionnaireResponse, instead of using React's `useState`.
-
-Note: This is a huge change for performance improvements, and was able to pass all the end-to-end and Chromatic tests - but please proceed carefully and test thoroughly before using this version in production. 
-
-### Fixed
-- Fixed an issue where `string` and `text` items were automatically removing inputted trailing whitespaces.
-
-## [0.38.4] - 2024-08-29
-### Fixed
-- Fixed support for item.initial and item.answerOption.initialSelected for repeating groups.
-
-## [0.38.3] - 2024-08-23
-### Added
-- Added support for non-repeating group table (`gtable`) items.
-
-## [0.38.2] - 2024-08-21
-### Added
-- Added support for `Quantity` items. See documentation and Storybook for more details.
-
-## [0.37.2] - 2024-08-19
-### Fixed
-- Fixed a @aehrc/sdc-populate library dependency issue.
-
-## [0.37.1] - 2024-08-05
-### Added
-- Added support for `page` UI Control code from https://hl7.org/fhir/extensions/ValueSet-questionnaire-item-control.html.
-
-## [0.36.1] - 2024-07-23
-### Added
-- Add support for `Coding` type in calculatedExpressions for choice and open-choice items.
-
-## [0.36.0] - 2024-07-22
-### Added
-- Add Save-Extract-Write functionality (StructureMap-based) in the "Save as Final" button in the Smart Forms app.

package/lib/hooks/useRepeatAnswers.d.ts

@@ -1,4 +0,0 @@
-import type { Dispatch, SetStateAction } from 'react';
-import type { RepeatAnswer } from '../interfaces/repeatItem.interface';
-declare function useRepeatAnswers(valueFromProps: RepeatAnswer[]): [RepeatAnswer[], Dispatch<SetStateAction<RepeatAnswer[]>>];
-export default useRepeatAnswers;

package/lib/hooks/useRepeatAnswers.js

@@ -1,34 +0,0 @@
-/*
- * Copyright 2024 Commonwealth Scientific and Industrial Research
- * Organisation (CSIRO) ABN 41 687 119 230.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { useEffect, useState } from 'react';
-import _isEqual from 'lodash/isEqual';
-function useRepeatAnswers(valueFromProps) {
-    const [repeatAnswers, setRepeatAnswers] = useState(valueFromProps);
-    useEffect(() => {
-        const valueFromPropsQRItemAnswers = valueFromProps.map((answer) => answer.answer);
-        const repeatAnswersQRItemAnswers = repeatAnswers.map((answer) => answer.answer);
-        if (!_isEqual(valueFromPropsQRItemAnswers, repeatAnswersQRItemAnswers)) {
-            setRepeatAnswers(valueFromProps);
-        }
-    }, 
-    // Only trigger this effect if prop value changes
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [valueFromProps]);
-    return [repeatAnswers, setRepeatAnswers];
-}
-export default useRepeatAnswers;
-//# sourceMappingURL=useRepeatAnswers.js.map

package/lib/hooks/useRepeatAnswers.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useRepeatAnswers.js","sourceRoot":"","sources":["../../src/hooks/useRepeatAnswers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAE5C,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AAEtC,SAAS,gBAAgB,CACvB,cAA8B;IAE9B,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAAC,cAAc,CAAC,CAAC;IAEnE,SAAS,CACP,GAAG,EAAE;QACH,MAAM,2BAA2B,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAClF,MAAM,0BAA0B,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAEhF,IAAI,CAAC,QAAQ,CAAC,2BAA2B,EAAE,0BAA0B,CAAC,EAAE;YACtE,gBAAgB,CAAC,cAAc,CAAC,CAAC;SAClC;IACH,CAAC;IACD,iDAAiD;IACjD,uDAAuD;IACvD,CAAC,cAAc,CAAC,CACjB,CAAC;IAEF,OAAO,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;AAC3C,CAAC;AAED,eAAe,gBAAgB,CAAC"}

package/lib/interfaces/repeatItem.interface.d.ts

@@ -1,5 +0,0 @@
-import type { QuestionnaireResponseItemAnswer } from 'fhir/r4';
-export interface RepeatAnswer {
-    nanoId: string;
-    answer: QuestionnaireResponseItemAnswer | null;
-}

package/lib/interfaces/repeatItem.interface.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=repeatItem.interface.js.map

package/lib/interfaces/repeatItem.interface.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"repeatItem.interface.js","sourceRoot":"","sources":["../../src/interfaces/repeatItem.interface.ts"],"names":[],"mappings":""}

package/lib/utils/answerExpression.d.ts

@@ -1,18 +0,0 @@
-import type { AnswerExpression } from '../interfaces/answerExpression.interface';
-import { type Expression, type QuestionnaireResponse, type QuestionnaireResponseItem } from 'fhir/r4';
-interface EvaluateInitialAnswerExpressionsParams {
-    initialResponse: QuestionnaireResponse;
-    initialResponseItemMap: Record<string, QuestionnaireResponseItem[]>;
-    answerExpressions: Record<string, AnswerExpression>;
-    variablesFhirPath: Record<string, Expression[]>;
-    existingFhirPathContext: Record<string, any>;
-}
-export declare function evaluateInitialAnswerExpressions(params: EvaluateInitialAnswerExpressionsParams): Promise<{
-    initialAnswerExpressions: Record<string, AnswerExpression>;
-    updatedFhirPathContext: Record<string, any>;
-}>;
-export declare function evaluateAnswerExpressions(fhirPathContext: Record<string, any>, answerExpressions: Record<string, AnswerExpression>): {
-    answerExpsIsUpdated: boolean;
-    updatedAnswerExpressions: Record<string, AnswerExpression>;
-};
-export {};

package/lib/utils/answerExpression.js

@@ -1,133 +0,0 @@
-/*
- * Copyright 2024 Commonwealth Scientific and Industrial Research
- * Organisation (CSIRO) ABN 41 687 119 230.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import fhirpath from 'fhirpath';
-import fhirpath_r4_model from 'fhirpath/fhir-context/r4';
-import _isEqual from 'lodash/isEqual';
-import cloneDeep from 'lodash.clonedeep';
-import { emptyResponse } from './emptyResource';
-import { createFhirPathContext, evaluateTerminologyLinkIdVariables } from './fhirpath';
-export function evaluateInitialAnswerExpressions(params) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { initialResponse, initialResponseItemMap, answerExpressions, variablesFhirPath, existingFhirPathContext } = params;
-        // Return early if initialResponse is empty or there are no answer expressions to evaluate
-        if (_isEqual(initialResponse, cloneDeep(emptyResponse)) ||
-            Object.keys(answerExpressions).length === 0) {
-            return {
-                initialAnswerExpressions: answerExpressions,
-                updatedFhirPathContext: existingFhirPathContext
-            };
-        }
-        const initialAnswerExpressions = Object.assign({}, answerExpressions);
-        let updatedFhirPathContext = yield createFhirPathContext(initialResponse, initialResponseItemMap, variablesFhirPath, existingFhirPathContext);
-        // Perform initial evaluation of terminology variables
-        for (const linkId in variablesFhirPath) {
-            updatedFhirPathContext = yield evaluateTerminologyLinkIdVariables(linkId, variablesFhirPath, updatedFhirPathContext);
-        }
-        for (const linkId in initialAnswerExpressions) {
-            const answerExpression = initialAnswerExpressions[linkId];
-            try {
-                const result = fhirpath.evaluate({}, answerExpression.expression, updatedFhirPathContext, fhirpath_r4_model);
-                // Update calculatedExpressions if length of result array > 0
-                // Only update when current calcExpression value is different from the result, otherwise it will result in an infinite loop as per issue #733
-                if (result.length > 0 && !_isEqual(answerExpression.options, result)) {
-                    answerExpression.options = getAnswerOptionsFromResults(result);
-                    answerExpression.version = answerExpression.version + 1;
-                }
-                // Update calculatedExpression value to null if no result is returned
-                if (result.length === 0 && !!answerExpression.options) {
-                    // Only update if current options is not empty
-                    if (answerExpression.options.length > 0) {
-                        answerExpression.options = [];
-                        answerExpression.version = answerExpression.version + 1;
-                    }
-                }
-            }
-            catch (e) {
-                console.warn(e.message, `LinkId: ${linkId}\nExpression: ${answerExpression.options}`);
-            }
-            initialAnswerExpressions[linkId] = answerExpression;
-        }
-        return {
-            initialAnswerExpressions,
-            updatedFhirPathContext
-        };
-    });
-}
-export function evaluateAnswerExpressions(fhirPathContext, answerExpressions) {
-    const updatedAnswerExpressions = Object.assign({}, answerExpressions);
-    let isUpdated = false;
-    for (const linkId in answerExpressions) {
-        const answerExpression = answerExpressions[linkId];
-        try {
-            const result = fhirpath.evaluate({}, answerExpression.expression, fhirPathContext, fhirpath_r4_model);
-            // Update calculatedExpressions if length of result array > 0
-            // Only update when current calcExpression value is different from the result, otherwise it will result in an infinite loop as per issue #733
-            if (result.length > 0 && !_isEqual(answerExpression.options, result)) {
-                isUpdated = true;
-                answerExpression.options = getAnswerOptionsFromResults(result);
-                answerExpression.version = answerExpression.version + 1;
-            }
-            // Update calculatedExpression value to null if no result is returned
-            if (result.length === 0 && !!answerExpression.options) {
-                // Only update if current options is not empty
-                if (answerExpression.options.length > 0) {
-                    isUpdated = true;
-                    answerExpression.options = [];
-                    answerExpression.version = answerExpression.version + 1;
-                }
-            }
-        }
-        catch (e) {
-            console.warn(e.message, `LinkId: ${linkId}\nExpression: ${answerExpression.options}`);
-        }
-        updatedAnswerExpressions[linkId] = answerExpression;
-    }
-    return {
-        answerExpsIsUpdated: isUpdated,
-        updatedAnswerExpressions: updatedAnswerExpressions
-    };
-}
-function getAnswerOptionsFromResults(result) {
-    if (!Array.isArray(result)) {
-        return [];
-    }
-    return result
-        .map((item) => {
-        var _a;
-        if (item.system && item.code) {
-            return {
-                valueCoding: {
-                    system: item.system,
-                    code: item.code,
-                    display: (_a = item.display) !== null && _a !== void 0 ? _a : undefined
-                }
-            };
-        }
-        return item;
-    })
-        .filter((item) => typeof item === 'object');
-}
-//# sourceMappingURL=answerExpression.js.map

package/lib/utils/answerExpression.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"answerExpression.js","sourceRoot":"","sources":["../../src/utils/answerExpression.ts"],"names":[],"mappings":"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"}

package/lib/utils/dynamicValueSet.d.ts

@@ -1,5 +0,0 @@
-import type { DynamicValueSet } from '../interfaces/valueSet.interface';
-export declare function evaluateDynamicValueSets(fhirPathContext: Record<string, any>, dynamicValueSets: Record<string, DynamicValueSet>): {
-    dynamicValueSetsIsUpdated: boolean;
-    updatedDynamicValueSets: Record<string, DynamicValueSet>;
-};