@aehrc/smart-forms-renderer 0.20.0 → 0.21.1

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

@@ -1,8 +1,16 @@
 import type { QuestionnaireItem, QuestionnaireItemEnableWhen, QuestionnaireResponseItemAnswer } from 'fhir/r4';
-export interface EnableWhenExpression {
+export interface EnableWhenExpressions {
+    singleExpressions: Record<string, EnableWhenSingleExpression>;
+    repeatExpressions: Record<string, EnableWhenRepeatExpression>;
+}
+export interface EnableWhenSingleExpression {
+    expression: string;
+    isEnabled?: boolean;
+}
+export interface EnableWhenRepeatExpression {
     expression: string;
-    isEnabledSingle?: boolean;
-    isEnabledMultiple?: boolean[];
+    parentLinkId: string;
+    enabledIndexes: boolean[];
 }
 export interface EnableWhenItems {
     singleItems: Record<string, EnableWhenSingleItemProperties>;

package/lib/interfaces/index.d.ts

@@ -1 +1 @@
-export { EnableWhenExpression, EnableWhenItems, EnableWhenSingleItemProperties, EnableWhenRepeatItemProperties, EnableWhenSingleLinkedItem, EnableWhenRepeatLinkedItem } from './enableWhen.interface';
+export { EnableWhenItems, EnableWhenSingleItemProperties, EnableWhenRepeatItemProperties, EnableWhenSingleLinkedItem, EnableWhenRepeatLinkedItem, EnableWhenExpressions, EnableWhenSingleExpression, EnableWhenRepeatExpression } from './enableWhen.interface';

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

@@ -1,7 +1,7 @@
 import type { Tabs } from './tab.interface';
 import type { Variables } from './variables.interface';
 import type { LaunchContext } from './populate.interface';
-import type { EnableWhenExpression, EnableWhenItems } from './enableWhen.interface';
+import type { EnableWhenExpressions, EnableWhenItems } from './enableWhen.interface';
 import type { CalculatedExpression } from './calculatedExpression.interface';
 import type { AnswerExpression } from './answerExpression.interface';
 import type { Coding } from 'fhir/r4';
@@ -11,7 +11,7 @@ export interface QuestionnaireModel {
     variables: Variables;
     launchContexts: Record<string, LaunchContext>;
     enableWhenItems: EnableWhenItems;
-    enableWhenExpressions: Record<string, EnableWhenExpression>;
+    enableWhenExpressions: EnableWhenExpressions;
     calculatedExpressions: Record<string, CalculatedExpression>;
     answerExpressions: Record<string, AnswerExpression>;
     processedValueSetCodings: Record<string, Coding[]>;

package/lib/setup-jest.js

@@ -0,0 +1 @@
+import '@testing-library/jest-dom';

package/lib/stores/questionnaireStore.d.ts

@@ -2,7 +2,7 @@ import type { Coding, Questionnaire, QuestionnaireResponse, QuestionnaireRespons
 import type { Variables } from '../interfaces/variables.interface';
 import type { LaunchContext } from '../interfaces/populate.interface';
 import type { CalculatedExpression } from '../interfaces/calculatedExpression.interface';
-import type { EnableWhenExpression, EnableWhenItems } from '../interfaces';
+import type { EnableWhenExpressions, EnableWhenItems } from '../interfaces';
 import type { AnswerExpression } from '../interfaces/answerExpression.interface';
 import type { Tabs } from '../interfaces/tab.interface';
 interface QuestionnaireStoreType {
@@ -15,7 +15,7 @@ interface QuestionnaireStoreType {
     enableWhenItems: EnableWhenItems;
     enableWhenLinkedQuestions: Record<string, string[]>;
     enableWhenIsActivated: boolean;
-    enableWhenExpressions: Record<string, EnableWhenExpression>;
+    enableWhenExpressions: EnableWhenExpressions;
     calculatedExpressions: Record<string, CalculatedExpression>;
     answerExpressions: Record<string, AnswerExpression>;
     processedValueSetCodings: Record<string, Coding[]>;
@@ -48,7 +48,7 @@ export declare const useQuestionnaireStore: import("zustand/vanilla").StoreApi<Q
         enableWhenItems: () => EnableWhenItems;
         enableWhenLinkedQuestions: () => Record<string, string[]>;
         enableWhenIsActivated: () => boolean;
-        enableWhenExpressions: () => Record<string, EnableWhenExpression>;
+        enableWhenExpressions: () => EnableWhenExpressions;
         calculatedExpressions: () => Record<string, CalculatedExpression>;
         answerExpressions: () => Record<string, AnswerExpression>;
         processedValueSetCodings: () => Record<string, Coding[]>;

package/lib/stores/questionnaireStore.js

@@ -33,6 +33,8 @@ import { emptyQuestionnaire, emptyResponse } from '../utils/emptyResource';
 import cloneDeep from 'lodash.clonedeep';
 import { terminologyServerStore } from './terminologyServerStore';
 import { createSelectors } from './selector';
+import { mutateRepeatEnableWhenExpressionInstances } from '../utils/enableWhenExpression';
+import { questionnaireResponseStore } from './questionnaireResponseStore';
 export const questionnaireStore = createStore()((set, get) => ({
     sourceQuestionnaire: cloneDeep(emptyQuestionnaire),
     itemTypes: {},
@@ -41,7 +43,7 @@ export const questionnaireStore = createStore()((set, get) => ({
     variables: { fhirPathVariables: {}, xFhirQueryVariables: {} },
     launchContexts: {},
     calculatedExpressions: {},
-    enableWhenExpressions: {},
+    enableWhenExpressions: { singleExpressions: {}, repeatExpressions: {} },
     answerExpressions: {},
     enableWhenItems: { singleItems: {}, repeatItems: {} },
     enableWhenLinkedQuestions: {},
@@ -90,7 +92,7 @@ export const questionnaireStore = createStore()((set, get) => ({
         launchContexts: {},
         enableWhenItems: { singleItems: {}, repeatItems: {} },
         enableWhenLinkedQuestions: {},
-        enableWhenExpressions: {},
+        enableWhenExpressions: { singleExpressions: {}, repeatExpressions: {} },
         calculatedExpressions: {},
         answerExpressions: {},
         processedValueSetCodings: {},
@@ -118,10 +120,23 @@ export const questionnaireStore = createStore()((set, get) => ({
     },
     mutateRepeatEnableWhenItems: (parentRepeatGroupLinkId, parentRepeatGroupIndex, actionType) => {
         const enableWhenItems = get().enableWhenItems;
+        const enableWhenExpressions = get().enableWhenExpressions;
         const updatedEnableWhenItems = mutateRepeatEnableWhenItemInstances(Object.assign({}, enableWhenItems), parentRepeatGroupLinkId, parentRepeatGroupIndex, actionType);
-        set(() => ({
-            enableWhenItems: updatedEnableWhenItems
-        }));
+        const { updatedEnableWhenExpressions, isUpdated } = mutateRepeatEnableWhenExpressionInstances({
+            questionnaireResponse: questionnaireResponseStore.getState().updatableResponse,
+            variablesFhirPath: get().variables.fhirPathVariables,
+            existingFhirPathContext: get().fhirPathContext,
+            enableWhenExpressions: enableWhenExpressions,
+            parentRepeatGroupLinkId,
+            parentRepeatGroupIndex,
+            actionType
+        });
+        if (isUpdated) {
+            set(() => ({
+                enableWhenItems: updatedEnableWhenItems,
+                enableWhenExpressions: updatedEnableWhenExpressions
+            }));
+        }
     },
     toggleEnableWhenActivation: (isActivated) => set(() => ({ enableWhenIsActivated: isActivated })),
     updateExpressions: (updatedResponse) => {

package/lib/stores/questionnaireStore.js.map

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

package/lib/stories/MedicalHistoryTable.stories.js

@@ -0,0 +1,45 @@
+/*
+ * 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 ThemeProvider from '../theme/Theme';
+import { GroupTable } from '../components';
+import GTableMedicalHistoryItemJson from './assets/QItems-and-QRItems/Q_GTableMedicalHistory.json';
+import GTableMedicalHistoryAnswersJson from './assets/QItems-and-QRItems/QR_GTableMedicalHistory.json';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+// More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
+const meta = {
+    title: 'Component/GroupTable',
+    component: GroupTable,
+    // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/react/writing-docs/autodocs
+    tags: [],
+    decorators: [
+        (Story)=>/*#__PURE__*/ React.createElement(ThemeProvider, null, /*#__PURE__*/ React.createElement(QueryClientProvider, {
+                client: new QueryClient()
+            }, Story()))
+    ]
+};
+const GTableMedicalHistoryItem = GTableMedicalHistoryItemJson;
+const GTableMedicalHistoryAnswers = GTableMedicalHistoryAnswersJson;
+export default meta;
+// More on writing stories with args: https://storybook.js.org/docs/react/writing-stories/args
+export const MedicalHistoryTable = {
+    args: {
+        qItem: GTableMedicalHistoryItem,
+        qrItems: GTableMedicalHistoryAnswers,
+        groupCardElevation: 1,
+        parentIsReadOnly: false,
+        onQrRepeatGroupChange: ()=>{}
+    }
+};

package/lib/stories/SmartFormsRenderer.stories.js

@@ -0,0 +1,117 @@
+/*
+ * 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 { SmartFormsRenderer } from '../components';
+import Q715Json from './assets/Qs-and-QRs/Q715.json';
+import R715Json from './assets/Qs-and-QRs/R715.json';
+import QTestGridJson from './assets/Qs-and-QRs/QTestGrid.json';
+import RTestGridJson from './assets/Qs-and-QRs/RTestGrid.json';
+import QDev715Json from './assets/Qs-and-QRs/QDev715.json';
+// More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
+const meta = {
+    title: 'Component/SmartFormsRenderer',
+    component: SmartFormsRenderer,
+    // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/react/writing-docs/autodocs
+    tags: []
+};
+const Q715 = Q715Json;
+const R715 = R715Json;
+const QTestGrid = QTestGridJson;
+const RTestGrid = RTestGridJson;
+const QDev715 = QDev715Json;
+export default meta;
+// More on writing stories with args: https://storybook.js.org/docs/react/writing-stories/args
+export const Form715 = {
+    args: {
+        questionnaire: Q715
+    }
+};
+export const Form715WithResponse = {
+    args: {
+        questionnaire: Q715,
+        questionnaireResponse: R715
+    }
+};
+export const FormDev715 = {
+    args: {
+        questionnaire: QDev715
+    }
+};
+export const FormTestGrid = {
+    args: {
+        questionnaire: QTestGrid
+    }
+};
+export const FormTestGridWithResponse = {
+    args: {
+        questionnaire: QTestGrid,
+        questionnaireResponse: RTestGrid,
+        additionalVariables: {}
+    }
+};
+export const QTestGridWithResponseAddFhirPath = {
+    args: {
+        questionnaire: QTestGrid,
+        questionnaireResponse: RTestGrid,
+        additionalVariables: {
+            addVar1: {
+                url: 'http://hl7.org/fhir/StructureDefinition/variable',
+                valueExpression: {
+                    name: 'addVar1',
+                    language: 'text/fhirpath',
+                    expression: "%resource.item.where(linkId='grid').item.where(linkId='1').item.where(linkId='1.1').item.where(linkId='1.1.1').answer.value"
+                }
+            }
+        }
+    }
+};
+export const QTestGridWithResponseAddXFhirQuery = {
+    args: {
+        questionnaire: QTestGrid,
+        questionnaireResponse: RTestGrid,
+        additionalVariables: {
+            addVar1: {
+                url: 'http://hl7.org/fhir/StructureDefinition/variable',
+                valueExpression: {
+                    name: 'addVar1',
+                    language: 'text/fhirpath',
+                    expression: "%resource.item.where(linkId='grid').item.where(linkId='1').item.where(linkId='1.1').item.where(linkId='1.1.1').answer.value"
+                }
+            },
+            addVar2: {
+                url: 'http://hl7.org/fhir/StructureDefinition/variable',
+                valueExpression: {
+                    name: 'addVar2',
+                    language: 'application/x-fhir-query',
+                    expression: 'Condition?patient={{%patient.id}}'
+                }
+            }
+        }
+    }
+};
+export const QTestGridWithResponseReadOnly = {
+    args: {
+        questionnaire: QTestGrid,
+        questionnaireResponse: RTestGrid,
+        readOnly: true
+    }
+};
+export const Form715WithResponseReadOnly = {
+    args: {
+        questionnaire: Q715,
+        questionnaireResponse: R715,
+        readOnly: true
+    }
+};

package/lib/utils/enableWhenExpression.d.ts

@@ -1,17 +1,34 @@
-import type { EnableWhenExpression } from '../interfaces';
 import type { Expression, QuestionnaireResponse } from 'fhir/r4';
+import type { EnableWhenExpressions, EnableWhenRepeatExpression } from '../interfaces';
 interface EvaluateInitialEnableWhenExpressionsParams {
     initialResponse: QuestionnaireResponse;
-    enableWhenExpressions: Record<string, EnableWhenExpression>;
+    enableWhenExpressions: EnableWhenExpressions;
     variablesFhirPath: Record<string, Expression[]>;
     existingFhirPathContext: Record<string, any>;
 }
 export declare function evaluateInitialEnableWhenExpressions(params: EvaluateInitialEnableWhenExpressionsParams): {
-    initialEnableWhenExpressions: Record<string, EnableWhenExpression>;
+    initialEnableWhenExpressions: EnableWhenExpressions;
     updatedFhirPathContext: Record<string, any>;
 };
-export declare function evaluateEnableWhenExpressions(fhirPathContext: Record<string, any>, enableWhenExpressions: Record<string, EnableWhenExpression>): {
+export declare function evaluateEnableWhenRepeatExpressionInstance(linkId: string, fhirPathContext: Record<string, any>, enableWhenRepeatExpression: EnableWhenRepeatExpression, lastLinkIdIndex: number, instanceIndex: number): {
+    isEnabled: boolean | null;
+    isUpdated: boolean;
+};
+export declare function evaluateEnableWhenExpressions(fhirPathContext: Record<string, any>, enableWhenExpressions: EnableWhenExpressions): {
     enableWhenExpsIsUpdated: boolean;
-    updatedEnableWhenExpressions: Record<string, EnableWhenExpression>;
+    updatedEnableWhenExpressions: EnableWhenExpressions;
+};
+interface MutateRepeatEnableWhenExpressionInstancesParams {
+    questionnaireResponse: QuestionnaireResponse;
+    variablesFhirPath: Record<string, Expression[]>;
+    existingFhirPathContext: Record<string, any>;
+    enableWhenExpressions: EnableWhenExpressions;
+    parentRepeatGroupLinkId: string;
+    parentRepeatGroupIndex: number;
+    actionType: 'add' | 'remove';
+}
+export declare function mutateRepeatEnableWhenExpressionInstances(params: MutateRepeatEnableWhenExpressionInstancesParams): {
+    updatedEnableWhenExpressions: EnableWhenExpressions;
+    isUpdated: boolean;
 };
 export {};

package/lib/utils/enableWhenExpression.js

@@ -17,84 +17,135 @@
 import { createFhirPathContext } from './fhirpath';
 import fhirpath from 'fhirpath';
 import fhirpath_r4_model from 'fhirpath/fhir-context/r4';
-import _isEqual from 'lodash/isEqual';
-import { emptyResponse } from './emptyResource';
-import cloneDeep from 'lodash.clonedeep';
 export function evaluateInitialEnableWhenExpressions(params) {
     const { initialResponse, enableWhenExpressions, variablesFhirPath, existingFhirPathContext } = params;
-    // Return early if initialResponse is empty or there are no enableWhen expressions to evaluate
-    if (_isEqual(initialResponse, cloneDeep(emptyResponse)) ||
-        Object.keys(enableWhenExpressions).length === 0) {
-        return {
-            initialEnableWhenExpressions: enableWhenExpressions,
-            updatedFhirPathContext: existingFhirPathContext
-        };
-    }
     const initialEnableWhenExpressions = Object.assign({}, enableWhenExpressions);
     const updatedFhirPathContext = createFhirPathContext(initialResponse, variablesFhirPath, existingFhirPathContext);
-    for (const linkId in initialEnableWhenExpressions) {
-        try {
-            const result = fhirpath.evaluate(initialResponse, enableWhenExpressions[linkId].expression, updatedFhirPathContext, fhirpath_r4_model);
-            // Update enableWhenExpressions if length of result array > 0
-            if (result.length > 0) {
-                updateEnableWhenExpressionStatus(initialEnableWhenExpressions, linkId, result);
-            }
-            // handle intersect edge case - evaluate() returns empty array if result is false
-            if (enableWhenExpressions[linkId].expression.includes('intersect') && result.length === 0) {
-                initialEnableWhenExpressions[linkId].isEnabledSingle = false;
-            }
-        }
-        catch (e) {
-            console.warn(e.message, `LinkId: ${linkId}\nExpression: ${enableWhenExpressions[linkId].expression}`);
-        }
-    }
+    const initialEnableWhenSingleExpressions = evaluateEnableWhenSingleExpressions(initialEnableWhenExpressions.singleExpressions, updatedFhirPathContext);
+    const initialEnableWhenRepeatExpressions = evaluateEnableWhenRepeatExpressions(initialEnableWhenExpressions.repeatExpressions, updatedFhirPathContext);
     return {
-        initialEnableWhenExpressions,
+        initialEnableWhenExpressions: {
+            singleExpressions: initialEnableWhenSingleExpressions.updatedExpressions,
+            repeatExpressions: initialEnableWhenRepeatExpressions.updatedExpressions
+        },
         updatedFhirPathContext
     };
 }
-export function evaluateEnableWhenExpressions(fhirPathContext, enableWhenExpressions) {
-    const updatedEnableWhenExpressions = Object.assign({}, enableWhenExpressions);
+function evaluateEnableWhenSingleExpressions(enableWhenSingleExpressions, updatedFhirPathContext) {
     let isUpdated = false;
-    for (const linkId in updatedEnableWhenExpressions) {
+    for (const linkId in enableWhenSingleExpressions) {
+        const initialValue = enableWhenSingleExpressions[linkId].isEnabled;
+        const expression = enableWhenSingleExpressions[linkId].expression;
         try {
-            const result = fhirpath.evaluate('', enableWhenExpressions[linkId].expression, fhirPathContext, fhirpath_r4_model);
+            const result = fhirpath.evaluate('', expression, updatedFhirPathContext, fhirpath_r4_model);
             // Update enableWhenExpressions if length of result array > 0
-            if (result.length > 0) {
-                isUpdated = updateEnableWhenExpressionStatus(updatedEnableWhenExpressions, linkId, result);
+            // Only update when current isEnabled value is different from the result, otherwise it will result in am infinite loop as per #733
+            if (result.length > 0 && initialValue !== result[0] && typeof result[0] === 'boolean') {
+                enableWhenSingleExpressions[linkId].isEnabled = result[0];
+                isUpdated = true;
             }
             // handle intersect edge case - evaluate() returns empty array if result is false
-            if (enableWhenExpressions[linkId].expression.includes('intersect') && result.length === 0) {
-                updatedEnableWhenExpressions[linkId].isEnabledSingle = false;
+            if (enableWhenSingleExpressions[linkId].expression.includes('intersect') &&
+                result.length === 0 &&
+                initialValue !== false) {
+                enableWhenSingleExpressions[linkId].isEnabled = false;
+                isUpdated = true;
             }
         }
         catch (e) {
-            console.warn(e.message, `LinkId: ${linkId}\nExpression: ${enableWhenExpressions[linkId].expression}`);
+            console.warn(e.message, `LinkId: ${linkId}\nExpression: ${enableWhenSingleExpressions[linkId].expression}`);
         }
     }
+    return { updatedExpressions: enableWhenSingleExpressions, isUpdated };
+}
+function getNumOfEnableWhenExpressionItemInstances(enableWhenExpression, fhirPathContext) {
+    const result = fhirpath.evaluate('', `%resource.descendants().where(linkId = '${enableWhenExpression.parentLinkId}').count()`, fhirPathContext, fhirpath_r4_model);
+    return typeof result[0] === 'number' ? result[0] : null;
+}
+function evaluateEnableWhenRepeatExpressions(enableWhenRepeatExpressions, fhirPathContext) {
+    let aggregatedUpdated = false;
+    for (const linkId in enableWhenRepeatExpressions) {
+        // Get number of repeat group instances in the QR
+        const enableWhenExpression = enableWhenRepeatExpressions[linkId];
+        const numOfInstances = getNumOfEnableWhenExpressionItemInstances(enableWhenExpression, fhirPathContext);
+        if (!numOfInstances) {
+            continue;
+        }
+        const lastLinkIdIndex = enableWhenExpression.expression.lastIndexOf('.where(linkId');
+        if (lastLinkIdIndex === -1) {
+            continue;
+        }
+        for (let i = 0; i < numOfInstances; i++) {
+            const { isEnabled, isUpdated } = evaluateEnableWhenRepeatExpressionInstance(linkId, fhirPathContext, enableWhenExpression, lastLinkIdIndex, i);
+            if (typeof isEnabled === 'boolean') {
+                enableWhenRepeatExpressions[linkId].enabledIndexes[i] = isEnabled;
+            }
+            aggregatedUpdated = aggregatedUpdated || isUpdated;
+        }
+    }
+    return { updatedExpressions: enableWhenRepeatExpressions, isUpdated: aggregatedUpdated };
+}
+export function evaluateEnableWhenRepeatExpressionInstance(linkId, fhirPathContext, enableWhenRepeatExpression, lastLinkIdIndex, instanceIndex) {
+    const expression = enableWhenRepeatExpression.expression;
+    const parentLinkId = enableWhenRepeatExpression.parentLinkId;
+    const initialValue = enableWhenRepeatExpression.enabledIndexes[instanceIndex];
+    const modifiedExpression = expression.slice(0, lastLinkIdIndex) +
+        `.where(linkId='${parentLinkId}').item[${instanceIndex}]` +
+        expression.slice(lastLinkIdIndex);
+    let isEnabled = null;
+    let isUpdated = false;
+    try {
+        const result = fhirpath.evaluate('', modifiedExpression, fhirPathContext, fhirpath_r4_model);
+        // Update enableWhenExpressions if length of result array > 0
+        // Only update when current isEnabled value is different from the result, otherwise it will result in am infinite loop as per #733
+        if (result.length > 0 && initialValue !== result[0] && typeof result[0] === 'boolean') {
+            isEnabled = result[0];
+            isUpdated = true;
+        }
+        // handle intersect edge case - evaluate() returns empty array if result is false
+        if (expression.includes('intersect') && result.length === 0 && initialValue !== result[0]) {
+            isEnabled = false;
+            isUpdated = true;
+        }
+    }
+    catch (e) {
+        console.warn(e.message, `LinkId: ${linkId}\nExpression: ${expression}`);
+    }
+    return { isEnabled, isUpdated };
+}
+export function evaluateEnableWhenExpressions(fhirPathContext, enableWhenExpressions) {
+    const updatedEnableWhenExpressions = Object.assign({}, enableWhenExpressions);
+    const updatedEnableWhenSingleExpressions = evaluateEnableWhenSingleExpressions(updatedEnableWhenExpressions.singleExpressions, fhirPathContext);
+    const updatedEnableWhenRepeatExpressions = evaluateEnableWhenRepeatExpressions(updatedEnableWhenExpressions.repeatExpressions, fhirPathContext);
+    const isUpdated = updatedEnableWhenSingleExpressions.isUpdated || updatedEnableWhenRepeatExpressions.isUpdated;
     return {
         enableWhenExpsIsUpdated: isUpdated,
-        updatedEnableWhenExpressions: updatedEnableWhenExpressions
+        updatedEnableWhenExpressions: {
+            singleExpressions: updatedEnableWhenSingleExpressions.updatedExpressions,
+            repeatExpressions: updatedEnableWhenRepeatExpressions.updatedExpressions
+        }
     };
 }
-function updateEnableWhenExpressionStatus(enableWhenExpressions, linkId, result) {
-    // Values are not fully boolean, expression is invalid
-    const everyResultIsBoolean = result.every((r) => typeof r === 'boolean');
-    if (!everyResultIsBoolean) {
-        return false;
-    }
-    // If result has multiple values
-    if (result.length > 1) {
-        if (enableWhenExpressions[linkId].isEnabledMultiple !== result) {
-            enableWhenExpressions[linkId].isEnabledMultiple = result;
-            return true;
+export function mutateRepeatEnableWhenExpressionInstances(params) {
+    const { questionnaireResponse, variablesFhirPath, existingFhirPathContext, enableWhenExpressions, parentRepeatGroupLinkId, parentRepeatGroupIndex, actionType } = params;
+    const { repeatExpressions } = enableWhenExpressions;
+    const updatedFhirPathContext = createFhirPathContext(questionnaireResponse, variablesFhirPath, existingFhirPathContext);
+    let isUpdated = false;
+    for (const linkId in repeatExpressions) {
+        if (repeatExpressions[linkId].parentLinkId !== parentRepeatGroupLinkId) {
+            continue;
         }
+        if (actionType === 'add') {
+            const { isEnabled } = evaluateEnableWhenRepeatExpressionInstance(linkId, updatedFhirPathContext, repeatExpressions[linkId], repeatExpressions[linkId].expression.lastIndexOf('.where(linkId'), parentRepeatGroupIndex);
+            if (typeof isEnabled === 'boolean') {
+                repeatExpressions[linkId].enabledIndexes[parentRepeatGroupIndex] = isEnabled;
+            }
+        }
+        else if (actionType === 'remove') {
+            repeatExpressions[linkId].enabledIndexes.splice(parentRepeatGroupIndex, 1);
+        }
+        isUpdated = true;
     }
-    // If result has only one value
-    if (enableWhenExpressions[linkId].isEnabledSingle !== result[0]) {
-        enableWhenExpressions[linkId].isEnabledSingle = result[0];
-        return true;
-    }
-    return false;
+    return { updatedEnableWhenExpressions: enableWhenExpressions, isUpdated };
 }
 //# sourceMappingURL=enableWhenExpression.js.map

package/lib/utils/enableWhenExpression.js.map

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

package/lib/utils/fhirpath.d.ts

@@ -1,16 +1,16 @@
 import type { Expression, QuestionnaireResponse, QuestionnaireResponseItem } from 'fhir/r4';
 import type { CalculatedExpression } from '../interfaces/calculatedExpression.interface';
-import type { EnableWhenExpression } from '../interfaces/enableWhen.interface';
+import type { EnableWhenExpressions } from '../interfaces';
 interface EvaluateUpdatedExpressionsParams {
     updatedResponse: QuestionnaireResponse;
     calculatedExpressions: Record<string, CalculatedExpression>;
-    enableWhenExpressions: Record<string, EnableWhenExpression>;
+    enableWhenExpressions: EnableWhenExpressions;
     variablesFhirPath: Record<string, Expression[]>;
     existingFhirPathContext: Record<string, any>;
 }
 export declare function evaluateUpdatedExpressions(params: EvaluateUpdatedExpressionsParams): {
     isUpdated: boolean;
-    updatedEnableWhenExpressions: Record<string, EnableWhenExpression>;
+    updatedEnableWhenExpressions: EnableWhenExpressions;
     updatedCalculatedExpressions: Record<string, CalculatedExpression>;
     updatedFhirPathContext: Record<string, any>;
 };

package/lib/utils/initialise.d.ts

@@ -1,5 +1,5 @@
 import type { Expression, Questionnaire, QuestionnaireResponse } from 'fhir/r4';
-import type { EnableWhenExpression, EnableWhenItems } from '../interfaces/enableWhen.interface';
+import type { EnableWhenExpressions, EnableWhenItems } from '../interfaces';
 import type { Tabs } from '../interfaces/tab.interface';
 import type { CalculatedExpression } from '../interfaces/calculatedExpression.interface';
 /**
@@ -12,7 +12,7 @@ export declare function initialiseQuestionnaireResponse(questionnaire: Questionn
 export interface initialFormFromResponseParams {
     questionnaireResponse: QuestionnaireResponse;
     enableWhenItems: EnableWhenItems;
-    enableWhenExpressions: Record<string, EnableWhenExpression>;
+    enableWhenExpressions: EnableWhenExpressions;
     calculatedExpressions: Record<string, CalculatedExpression>;
     variablesFhirPath: Record<string, Expression[]>;
     tabs: Tabs;
@@ -21,7 +21,7 @@ export interface initialFormFromResponseParams {
 export declare function initialiseFormFromResponse(params: initialFormFromResponseParams): {
     initialEnableWhenItems: EnableWhenItems;
     initialEnableWhenLinkedQuestions: Record<string, string[]>;
-    initialEnableWhenExpressions: Record<string, EnableWhenExpression>;
+    initialEnableWhenExpressions: EnableWhenExpressions;
     initialCalculatedExpressions: Record<string, CalculatedExpression>;
     firstVisibleTab: number;
     updatedFhirPathContext: Record<string, any>;