@aehrc/smart-forms-renderer 1.0.0-alpha.98 → 1.0.0

package/lib/utils/fhirpath.d.ts

@@ -1,32 +1,20 @@
 import type { Expression, QuestionnaireResponse, QuestionnaireResponseItem } from 'fhir/r4';
-import type { CalculatedExpression } from '../interfaces/calculatedExpression.interface';
 import type { EnableWhenExpressions } from '../interfaces/enableWhen.interface';
 import type { TargetConstraint } from '../interfaces/targetConstraint.interface';
 import type { Variables, VariableXFhirQuery } from '../interfaces';
 import type { ComputedQRItemUpdates } from '../interfaces/computedUpdates.interface';
 import type { AnswerOptionsToggleExpression } from '../interfaces/answerOptionsToggleExpression.interface';
-interface EvaluateUpdatedExpressionsParams {
-    updatedResponse: QuestionnaireResponse;
-    updatedResponseItemMap: Record<string, QuestionnaireResponseItem[]>;
-    targetConstraints: Record<string, TargetConstraint>;
-    answerOptionsToggleExpressions: Record<string, AnswerOptionsToggleExpression[]>;
-    calculatedExpressions: Record<string, CalculatedExpression[]>;
-    enableWhenExpressions: EnableWhenExpressions;
-    variables: Variables;
-    processedValueSets: Record<string, any>;
-    existingFhirPathContext: Record<string, any>;
-    fhirPathTerminologyCache: Record<string, any>;
-    terminologyServerUrl: string;
-}
-export declare function evaluateUpdatedExpressions(params: EvaluateUpdatedExpressionsParams): Promise<{
+interface ExpressionUpdate<T> {
     isUpdated: boolean;
-    updatedTargetConstraints: Record<string, TargetConstraint>;
-    updatedAnswerOptionsToggleExpressions: Record<string, AnswerOptionsToggleExpression[]>;
-    updatedEnableWhenExpressions: EnableWhenExpressions;
-    updatedCalculatedExpressions: Record<string, CalculatedExpression[]>;
-    updatedProcessedValueSets: Record<string, any>;
+    value: T;
+}
+export declare function evaluateOtherExpressions(updatedResponse: QuestionnaireResponse, updatedResponseItemMap: Record<string, QuestionnaireResponseItem[]>, variables: Variables, existingFhirPathContext: Record<string, any>, existingFhirPathTerminologyCache: Record<string, any>, targetConstraints: Record<string, TargetConstraint>, enableWhenExpressions: EnableWhenExpressions, answerOptionsToggleExpressions: Record<string, AnswerOptionsToggleExpression[]>, processedValueSets: Record<string, any>, terminologyServerUrl: string): Promise<{
     updatedFhirPathContext: Record<string, any>;
-    fhirPathTerminologyCache: Record<string, any>;
+    updatedFhirPathTerminologyCache: Record<string, any>;
+    targetConstraintsUpdate: ExpressionUpdate<Record<string, TargetConstraint>>;
+    enableWhenExpressionsUpdate: ExpressionUpdate<EnableWhenExpressions>;
+    answerOptionsToggleExpressionsUpdate: ExpressionUpdate<Record<string, AnswerOptionsToggleExpression[]>>;
+    processedValueSetsUpdate: ExpressionUpdate<Record<string, any>>;
     computedQRItemUpdates: ComputedQRItemUpdates;
 }>;
 export declare function createFhirPathContext(questionnaireResponse: QuestionnaireResponse, questionnaireResponseItemMap: Record<string, QuestionnaireResponseItem[]>, variables: Variables, existingFhirPathContext: Record<string, any>, fhirPathTerminologyCache: Record<string, any>, terminologyServerUrl: string): Promise<{
@@ -43,4 +31,22 @@ export declare function evaluateQuestionnaireLevelVariables(resource: Questionna
     fhirPathTerminologyCache: Record<string, any>;
 }>;
 export declare function handleFhirPathResult(result: any[] | Promise<any[]>): Promise<any[]>;
+/**
+ * Determines whether a FHIRPath expression result is cached.
+ *
+ * Expressions containing variables (e.g. `%something`) are never considered cached, because we can never know what a variable resolves to at runtime.
+ *
+ * @param {string} expression - The FHIRPath expression to check.
+ * @param {Record<string, any>} fhirPathTerminologyCache - Object storing cached expression results.
+ * @returns {boolean} `true` if the expression is cached and contains no variables; otherwise `false`.
+ */
+export declare function isExpressionCached(expression: string, fhirPathTerminologyCache: Record<string, any>): boolean;
+/**
+ * Caches the result of a FHIRPath evaluation if it was an asynchronous terminology call and the expression contains no variables (e.g. `%something`).
+ *
+ * @param {string} expression - The FHIRPath expression that was evaluated.
+ * @param {any} result - The evaluated result of the expression with async resolved.
+ * @param {Record<string, any>} fhirPathTerminologyCache - The cache object to store results.
+ */
+export declare function cacheTerminologyResult(expression: string, result: any, fhirPathTerminologyCache: Record<string, any>): void;
 export {};

package/lib/utils/fhirpath.js

@@ -14,115 +14,110 @@
  * 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 { evaluateEnableWhenExpressions } from './enableWhenExpression';
-import { evaluateCalculatedExpressions } from './calculatedExpression';
 import { evaluateTargetConstraints } from './targetConstraint';
 import { evaluateDynamicValueSets } from './parameterisedValueSets';
 import { evaluateAnswerOptionsToggleExpressions } from './answerOptionsToggleExpressions';
-export function evaluateUpdatedExpressions(params) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { updatedResponse, updatedResponseItemMap, targetConstraints, answerOptionsToggleExpressions, enableWhenExpressions, calculatedExpressions, processedValueSets, variables, existingFhirPathContext, terminologyServerUrl } = params;
-        let { fhirPathTerminologyCache } = params;
-        const noExpressionsToBeUpdated = Object.keys(enableWhenExpressions).length === 0 &&
-            Object.keys(calculatedExpressions).length === 0;
-        if (noExpressionsToBeUpdated) {
-            return {
-                isUpdated: false,
-                updatedTargetConstraints: targetConstraints,
-                updatedAnswerOptionsToggleExpressions: answerOptionsToggleExpressions,
-                updatedEnableWhenExpressions: enableWhenExpressions,
-                updatedCalculatedExpressions: calculatedExpressions,
-                updatedProcessedValueSets: processedValueSets,
-                updatedFhirPathContext: existingFhirPathContext,
-                fhirPathTerminologyCache,
-                computedQRItemUpdates: {}
-            };
-        }
-        const computedQRItemUpdates = {};
-        const fhirPathEvalResult = yield createFhirPathContext(updatedResponse, updatedResponseItemMap, variables, existingFhirPathContext, fhirPathTerminologyCache, terminologyServerUrl);
-        const updatedFhirPathContext = fhirPathEvalResult.fhirPathContext;
-        fhirPathTerminologyCache = fhirPathEvalResult.fhirPathTerminologyCache;
-        // Update targetConstraints
-        const { targetConstraintsIsUpdated, updatedTargetConstraints } = yield evaluateTargetConstraints(updatedFhirPathContext, fhirPathTerminologyCache, targetConstraints, terminologyServerUrl);
-        // Update answerOptionsToggleExpressions
-        const { answerOptionsToggleExpressionsIsUpdated, updatedAnswerOptionsToggleExpressions, computedNewAnswers: computedNewAnswersAnswerOptionsToggleExpressions } = yield evaluateAnswerOptionsToggleExpressions(updatedFhirPathContext, fhirPathTerminologyCache, answerOptionsToggleExpressions, terminologyServerUrl);
-        // Update enableWhenExpressions
-        const { enableWhenExpsIsUpdated, updatedEnableWhenExpressions } = yield evaluateEnableWhenExpressions(updatedFhirPathContext, fhirPathTerminologyCache, enableWhenExpressions, terminologyServerUrl);
-        // Update calculatedExpressions
-        const { calculatedExpsIsUpdated, updatedCalculatedExpressions, computedNewAnswers: computedNewAnswersCalculatedExpressions } = yield evaluateCalculatedExpressions(updatedFhirPathContext, fhirPathTerminologyCache, calculatedExpressions, terminologyServerUrl);
-        // Update dynamic value sets
-        const { processedValueSetsIsUpdated, updatedProcessedValueSets, computedNewAnswers: computedNewAnswersDynamicValueSets } = yield evaluateDynamicValueSets(updatedFhirPathContext, fhirPathTerminologyCache, processedValueSets, terminologyServerUrl);
-        // Have a process here to find their QRItems and assign updates based on the computedNewAnswers
-        // In the case of dynamic value sets, just clear the existing answers
-        // Eventually we want to expand this to calculatedExpressions
-        for (const linkId in computedNewAnswersCalculatedExpressions) {
-            // FIXME - this implementation is designed to only work on null for now, if we want to actually apply new answer updates, need to have Questionnaire input param
-            if (computedNewAnswersCalculatedExpressions[linkId] === null) {
-                computedQRItemUpdates[linkId] = null;
-            }
-        }
-        for (const linkId in computedNewAnswersDynamicValueSets) {
-            computedQRItemUpdates[linkId] = null;
-        }
-        for (const linkId in computedNewAnswersAnswerOptionsToggleExpressions) {
-            computedQRItemUpdates[linkId] = null;
-        }
-        const isUpdated = enableWhenExpsIsUpdated ||
-            calculatedExpsIsUpdated ||
-            targetConstraintsIsUpdated ||
-            answerOptionsToggleExpressionsIsUpdated ||
-            processedValueSetsIsUpdated;
+export async function evaluateOtherExpressions(updatedResponse, updatedResponseItemMap, variables, existingFhirPathContext, existingFhirPathTerminologyCache, targetConstraints, enableWhenExpressions, answerOptionsToggleExpressions, processedValueSets, terminologyServerUrl) {
+    // Performance check: Check if there are any expressions to be updated before proceeding with eval logic
+    const noExpressionsToBeUpdated = Object.keys(targetConstraints).length === 0 &&
+        Object.keys(enableWhenExpressions).length === 0 &&
+        Object.keys(answerOptionsToggleExpressions).length === 0 &&
+        Object.keys(processedValueSets).length === 0;
+    if (noExpressionsToBeUpdated) {
         return {
-            isUpdated,
-            updatedTargetConstraints,
-            updatedAnswerOptionsToggleExpressions,
-            updatedEnableWhenExpressions,
-            updatedCalculatedExpressions,
-            updatedProcessedValueSets,
-            updatedFhirPathContext,
-            fhirPathTerminologyCache,
-            computedQRItemUpdates
+            updatedFhirPathContext: existingFhirPathContext,
+            updatedFhirPathTerminologyCache: existingFhirPathTerminologyCache,
+            targetConstraintsUpdate: {
+                isUpdated: false,
+                value: targetConstraints
+            },
+            enableWhenExpressionsUpdate: {
+                isUpdated: false,
+                value: enableWhenExpressions
+            },
+            answerOptionsToggleExpressionsUpdate: {
+                isUpdated: false,
+                value: answerOptionsToggleExpressions
+            },
+            processedValueSetsUpdate: {
+                isUpdated: false,
+                value: processedValueSets
+            },
+            computedQRItemUpdates: {}
         };
-    });
+    }
+    // Create a new fhirPathContext based on the updated response and variables
+    const computedQRItemUpdates = {};
+    const { fhirPathContext: updatedFhirPathContext, fhirPathTerminologyCache: updatedFhirPathTerminologyCache } = await createFhirPathContext(updatedResponse, updatedResponseItemMap, variables, existingFhirPathContext, existingFhirPathTerminologyCache, terminologyServerUrl);
+    // Update targetConstraints
+    const { isUpdated: targetConstraintsUpdated, updatedTargetConstraints } = await evaluateTargetConstraints(updatedFhirPathContext, updatedFhirPathTerminologyCache, targetConstraints, terminologyServerUrl);
+    // Update enableWhenExpressions
+    const { isUpdated: enableWhenExpressionsUpdated, updatedEnableWhenExpressions } = await evaluateEnableWhenExpressions(updatedFhirPathContext, updatedFhirPathTerminologyCache, enableWhenExpressions, terminologyServerUrl);
+    // Update answerOptionsToggleExpressions
+    // Add generated computed answers to computedQRItemUpdates - clear the item because the previous answers may no longer be valid
+    const { isUpdated: answerOptionsToggleExpressionsUpdated, updatedAnswerOptionsToggleExpressions, computedNewAnswers: computedNewAnswersAnswerOptionsToggleExpressions } = await evaluateAnswerOptionsToggleExpressions(updatedFhirPathContext, updatedFhirPathTerminologyCache, answerOptionsToggleExpressions, terminologyServerUrl);
+    for (const linkId in computedNewAnswersAnswerOptionsToggleExpressions) {
+        computedQRItemUpdates[linkId] = null;
+    }
+    // Update dynamic value sets
+    // Add generated computed answers to computedQRItemUpdates - clear the item because the previous answers may no longer be valid
+    const { isUpdated: processedValueSetsUpdated, updatedProcessedValueSets, computedNewAnswers: computedNewAnswersDynamicValueSets } = await evaluateDynamicValueSets(updatedFhirPathContext, updatedFhirPathTerminologyCache, processedValueSets, terminologyServerUrl);
+    for (const linkId in computedNewAnswersDynamicValueSets) {
+        computedQRItemUpdates[linkId] = null;
+    }
+    return {
+        updatedFhirPathContext,
+        updatedFhirPathTerminologyCache,
+        targetConstraintsUpdate: {
+            isUpdated: targetConstraintsUpdated,
+            value: updatedTargetConstraints
+        },
+        enableWhenExpressionsUpdate: {
+            isUpdated: enableWhenExpressionsUpdated,
+            value: updatedEnableWhenExpressions
+        },
+        answerOptionsToggleExpressionsUpdate: {
+            isUpdated: answerOptionsToggleExpressionsUpdated,
+            value: updatedAnswerOptionsToggleExpressions
+        },
+        processedValueSetsUpdate: {
+            isUpdated: processedValueSetsUpdated,
+            value: updatedProcessedValueSets
+        },
+        computedQRItemUpdates
+    };
 }
-export function createFhirPathContext(questionnaireResponse, questionnaireResponseItemMap, variables, existingFhirPathContext, fhirPathTerminologyCache, terminologyServerUrl) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const { fhirPathVariables: variablesFhirPath, xFhirQueryVariables: variablesXFhirQuery } = variables;
-        // Add latest resource to fhirPathContext
-        let fhirPathContext = Object.assign(Object.assign({}, existingFhirPathContext), { resource: questionnaireResponse, rootResource: questionnaireResponse });
-        // Add empty x-fhir-query variables to fhirPathContext to prevent false-positive warnings
-        fhirPathContext = addEmptyXFhirQueryVariablesToFhirPathContext(fhirPathContext, variablesXFhirQuery);
-        // Evaluate resource-level variables
-        const fhirPathEvalResult = yield evaluateQuestionnaireLevelVariables(questionnaireResponse, variablesFhirPath, fhirPathContext, fhirPathTerminologyCache, terminologyServerUrl);
-        fhirPathContext = fhirPathEvalResult.fhirPathContext;
-        fhirPathTerminologyCache = fhirPathEvalResult.fhirPathTerminologyCache;
-        // Add variables of items that exist in questionnaireResponseItemMap into fhirPathContext
-        for (const linkId in questionnaireResponseItemMap) {
-            const qrItems = (_a = questionnaireResponseItemMap[linkId]) !== null && _a !== void 0 ? _a : [];
-            // Ensure at least one iteration even if qrItems is empty
-            const qrItemsToProcess = qrItems.length > 0 ? qrItems : [undefined];
-            // For non-repeat groups, the same linkId will have only one item
-            // For repeat groups, the same linkId will have multiple items
-            for (const qrItem of qrItemsToProcess) {
-                const fhirPathEvalResult = yield evaluateLinkIdVariables(linkId, variablesFhirPath, fhirPathContext, fhirPathTerminologyCache, terminologyServerUrl, qrItem);
-                fhirPathContext = fhirPathEvalResult.fhirPathContext;
-                fhirPathTerminologyCache = fhirPathEvalResult.fhirPathTerminologyCache;
-            }
+export async function createFhirPathContext(questionnaireResponse, questionnaireResponseItemMap, variables, existingFhirPathContext, fhirPathTerminologyCache, terminologyServerUrl) {
+    const { fhirPathVariables: variablesFhirPath, xFhirQueryVariables: variablesXFhirQuery } = variables;
+    // Add latest resource to fhirPathContext
+    let fhirPathContext = {
+        ...existingFhirPathContext,
+        resource: questionnaireResponse,
+        rootResource: questionnaireResponse
+    };
+    // Add empty x-fhir-query variables to fhirPathContext to prevent false-positive warnings
+    fhirPathContext = addEmptyXFhirQueryVariablesToFhirPathContext(fhirPathContext, variablesXFhirQuery);
+    // Evaluate resource-level variables
+    const fhirPathEvalResult = await evaluateQuestionnaireLevelVariables(questionnaireResponse, variablesFhirPath, fhirPathContext, fhirPathTerminologyCache, terminologyServerUrl);
+    fhirPathContext = fhirPathEvalResult.fhirPathContext;
+    fhirPathTerminologyCache = fhirPathEvalResult.fhirPathTerminologyCache;
+    // Add variables of items that exist in questionnaireResponseItemMap into fhirPathContext
+    for (const linkId in questionnaireResponseItemMap) {
+        const qrItems = questionnaireResponseItemMap[linkId] ?? [];
+        // Ensure at least one iteration even if qrItems is empty
+        const qrItemsToProcess = qrItems.length > 0 ? qrItems : [undefined];
+        // For non-repeat groups, the same linkId will have only one item
+        // For repeat groups, the same linkId will have multiple items
+        for (const qrItem of qrItemsToProcess) {
+            const fhirPathEvalResult = await evaluateLinkIdVariables(linkId, variablesFhirPath, fhirPathContext, fhirPathTerminologyCache, terminologyServerUrl, qrItem);
+            fhirPathContext = fhirPathEvalResult.fhirPathContext;
+            fhirPathTerminologyCache = fhirPathEvalResult.fhirPathTerminologyCache;
         }
-        return { fhirPathContext, fhirPathTerminologyCache };
-    });
+    }
+    return { fhirPathContext, fhirPathTerminologyCache };
 }
 export function addEmptyXFhirQueryVariablesToFhirPathContext(fhirPathContext, variablesXFhirQuery) {
     for (const variableName in variablesXFhirQuery) {
@@ -132,86 +127,111 @@ export function addEmptyXFhirQueryVariablesToFhirPathContext(fhirPathContext, va
     }
     return fhirPathContext;
 }
-export function evaluateLinkIdVariables(linkId, variablesFhirPath, fhirPathContext, fhirPathTerminologyCache, terminologyServerUrl, qrItem) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const linkIdVariables = variablesFhirPath[linkId];
-        if (!linkIdVariables || linkIdVariables.length === 0) {
-            return { fhirPathContext, fhirPathTerminologyCache };
-        }
-        for (const variable of linkIdVariables) {
-            if (variable.expression && variable.name) {
-                const cacheKey = JSON.stringify(variable.expression); // Use expression as cache key
-                if (fhirPathTerminologyCache[cacheKey]) {
-                    continue;
-                }
-                try {
-                    const fhirPathResult = fhirpath.evaluate(qrItem !== null && qrItem !== void 0 ? qrItem : {}, {
-                        base: 'QuestionnaireResponse.item',
-                        expression: variable.expression
-                    }, fhirPathContext, fhirpath_r4_model, {
-                        async: true,
-                        terminologyUrl: terminologyServerUrl
-                    });
-                    fhirPathContext[`${variable.name}`] = yield handleFhirPathResult(fhirPathResult);
-                    // If fhirPathResult is an async terminology call, cache the result
-                    if (fhirPathResult instanceof Promise) {
-                        fhirPathTerminologyCache[cacheKey] = fhirPathContext[`${variable.name}`];
-                    }
-                }
-                catch (e) {
-                    console.warn(e.message, `LinkId: ${linkId}\nExpression: ${variable.expression}`);
-                }
-            }
-        }
+export async function evaluateLinkIdVariables(linkId, variablesFhirPath, fhirPathContext, fhirPathTerminologyCache, terminologyServerUrl, qrItem) {
+    const linkIdVariables = variablesFhirPath[linkId];
+    if (!linkIdVariables || linkIdVariables.length === 0) {
         return { fhirPathContext, fhirPathTerminologyCache };
-    });
-}
-export function evaluateQuestionnaireLevelVariables(resource, variablesFhirPath, fhirPathContext, fhirPathTerminologyCache, terminologyServerUrl) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const questionnaireLevelVariables = variablesFhirPath['QuestionnaireLevel'];
-        if (!questionnaireLevelVariables || questionnaireLevelVariables.length === 0) {
-            return {
-                fhirPathContext,
-                fhirPathTerminologyCache
-            };
-        }
-        for (const variable of questionnaireLevelVariables) {
-            if (variable.expression) {
-                const cacheKey = JSON.stringify(variable.expression); // Use expression as cache key
-                if (fhirPathTerminologyCache[cacheKey]) {
-                    continue;
-                }
-                try {
-                    const fhirPathResult = fhirpath.evaluate(resource, {
-                        base: 'QuestionnaireResponse',
-                        expression: variable.expression
-                    }, fhirPathContext, fhirpath_r4_model, {
-                        async: true,
-                        terminologyUrl: terminologyServerUrl
-                    });
-                    fhirPathContext[`${variable.name}`] = yield handleFhirPathResult(fhirPathResult);
-                    // If fhirPathResult is an async terminology call, cache the result
-                    if (fhirPathResult instanceof Promise) {
-                        fhirPathTerminologyCache[cacheKey] = fhirPathContext[`${variable.name}`];
-                    }
-                }
-                catch (e) {
-                    console.warn(e.message, `Questionnaire-level\nExpression: ${variable.expression}`);
+    }
+    for (const variable of linkIdVariables) {
+        if (variable.expression && variable.name) {
+            if (isExpressionCached(variable.expression, fhirPathTerminologyCache)) {
+                continue;
+            }
+            try {
+                const fhirPathResult = fhirpath.evaluate(qrItem ?? {}, {
+                    base: 'QuestionnaireResponse.item',
+                    expression: variable.expression
+                }, fhirPathContext, fhirpath_r4_model, {
+                    async: true,
+                    terminologyUrl: terminologyServerUrl
+                });
+                const result = await handleFhirPathResult(fhirPathResult);
+                fhirPathContext[`${variable.name}`] = result;
+                // If fhirPathResult is an async terminology call, cache the result
+                if (fhirPathResult instanceof Promise) {
+                    cacheTerminologyResult(variable.expression, result, fhirPathTerminologyCache);
                 }
             }
+            catch (e) {
+                console.warn(e.message, `LinkId: ${linkId}\nExpression: ${variable.expression}`);
+            }
         }
+    }
+    return { fhirPathContext, fhirPathTerminologyCache };
+}
+export async function evaluateQuestionnaireLevelVariables(resource, variablesFhirPath, fhirPathContext, fhirPathTerminologyCache, terminologyServerUrl) {
+    const questionnaireLevelVariables = variablesFhirPath['QuestionnaireLevel'];
+    if (!questionnaireLevelVariables || questionnaireLevelVariables.length === 0) {
         return {
             fhirPathContext,
             fhirPathTerminologyCache
         };
-    });
-}
-export function handleFhirPathResult(result) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (result instanceof Promise) {
-            return yield result;
+    }
+    for (const variable of questionnaireLevelVariables) {
+        if (variable.expression) {
+            if (isExpressionCached(variable.expression, fhirPathTerminologyCache)) {
+                continue;
+            }
+            try {
+                const fhirPathResult = fhirpath.evaluate(resource, {
+                    base: 'QuestionnaireResponse',
+                    expression: variable.expression
+                }, fhirPathContext, fhirpath_r4_model, {
+                    async: true,
+                    terminologyUrl: terminologyServerUrl
+                });
+                const result = await handleFhirPathResult(fhirPathResult);
+                fhirPathContext[`${variable.name}`] = result;
+                // If fhirPathResult is an async terminology call, cache the result
+                if (fhirPathResult instanceof Promise) {
+                    cacheTerminologyResult(variable.expression, result, fhirPathTerminologyCache);
+                }
+            }
+            catch (e) {
+                console.warn(e.message, `Questionnaire-level\nExpression: ${variable.expression}`);
+            }
         }
-        return result;
-    });
+    }
+    return {
+        fhirPathContext,
+        fhirPathTerminologyCache
+    };
+}
+export async function handleFhirPathResult(result) {
+    if (result instanceof Promise) {
+        return await result;
+    }
+    return result;
+}
+/**
+ * Determines whether a FHIRPath expression result is cached.
+ *
+ * Expressions containing variables (e.g. `%something`) are never considered cached, because we can never know what a variable resolves to at runtime.
+ *
+ * @param {string} expression - The FHIRPath expression to check.
+ * @param {Record<string, any>} fhirPathTerminologyCache - Object storing cached expression results.
+ * @returns {boolean} `true` if the expression is cached and contains no variables; otherwise `false`.
+ */
+export function isExpressionCached(expression, fhirPathTerminologyCache) {
+    // Expressions with variables are never cached
+    if (expression.includes('%')) {
+        return false;
+    }
+    // Check if expression exists in cache
+    return Object.prototype.hasOwnProperty.call(fhirPathTerminologyCache, expression);
+}
+/**
+ * Caches the result of a FHIRPath evaluation if it was an asynchronous terminology call and the expression contains no variables (e.g. `%something`).
+ *
+ * @param {string} expression - The FHIRPath expression that was evaluated.
+ * @param {any} result - The evaluated result of the expression with async resolved.
+ * @param {Record<string, any>} fhirPathTerminologyCache - The cache object to store results.
+ */
+export function cacheTerminologyResult(expression, result, fhirPathTerminologyCache) {
+    // Skip caching for expressions with variables
+    if (expression.includes('%')) {
+        return;
+    }
+    fhirPathTerminologyCache[expression] = result;
 }
 //# sourceMappingURL=fhirpath.js.map

package/lib/utils/fhirpath.js.map

@@ -1 +1 @@
-{"version":3,"file":"fhirpath.js","sourceRoot":"","sources":["../../src/utils/fhirpath.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fhirpath.js","sourceRoot":"","sources":["../../src/utils/fhirpath.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,iBAAiB,MAAM,0BAA0B,CAAC;AAGzD,OAAO,EAAE,6BAA6B,EAAE,MAAM,wBAAwB,CAAC;AACvE,OAAO,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAG/D,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAGpE,OAAO,EAAE,sCAAsC,EAAE,MAAM,kCAAkC,CAAC;AAO1F,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,eAAsC,EACtC,sBAAmE,EACnE,SAAoB,EACpB,uBAA4C,EAC5C,gCAAqD,EACrD,iBAAmD,EACnD,qBAA4C,EAC5C,8BAA+E,EAC/E,kBAAuC,EACvC,oBAA4B;IAY5B,wGAAwG;IACxG,MAAM,wBAAwB,GAC5B,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,MAAM,KAAK,CAAC;QAC3C,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,MAAM,KAAK,CAAC;QAC/C,MAAM,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC,MAAM,KAAK,CAAC;QACxD,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;IAE/C,IAAI,wBAAwB,EAAE,CAAC;QAC7B,OAAO;YACL,sBAAsB,EAAE,uBAAuB;YAC/C,+BAA+B,EAAE,gCAAgC;YACjE,uBAAuB,EAAE;gBACvB,SAAS,EAAE,KAAK;gBAChB,KAAK,EAAE,iBAAiB;aACzB;YACD,2BAA2B,EAAE;gBAC3B,SAAS,EAAE,KAAK;gBAChB,KAAK,EAAE,qBAAqB;aAC7B;YACD,oCAAoC,EAAE;gBACpC,SAAS,EAAE,KAAK;gBAChB,KAAK,EAAE,8BAA8B;aACtC;YACD,wBAAwB,EAAE;gBACxB,SAAS,EAAE,KAAK;gBAChB,KAAK,EAAE,kBAAkB;aAC1B;YACD,qBAAqB,EAAE,EAAE;SAC1B,CAAC;IACJ,CAAC;IAED,2EAA2E;IAC3E,MAAM,qBAAqB,GAA0B,EAAE,CAAC;IACxD,MAAM,EACJ,eAAe,EAAE,sBAAsB,EACvC,wBAAwB,EAAE,+BAA+B,EAC1D,GAAG,MAAM,qBAAqB,CAC7B,eAAe,EACf,sBAAsB,EACtB,SAAS,EACT,uBAAuB,EACvB,gCAAgC,EAChC,oBAAoB,CACrB,CAAC;IAEF,2BAA2B;IAC3B,MAAM,EAAE,SAAS,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,GACrE,MAAM,yBAAyB,CAC7B,sBAAsB,EACtB,+BAA+B,EAC/B,iBAAiB,EACjB,oBAAoB,CACrB,CAAC;IAEJ,+BAA+B;IAC/B,MAAM,EAAE,SAAS,EAAE,4BAA4B,EAAE,4BAA4B,EAAE,GAC7E,MAAM,6BAA6B,CACjC,sBAAsB,EACtB,+BAA+B,EAC/B,qBAAqB,EACrB,oBAAoB,CACrB,CAAC;IAEJ,wCAAwC;IACxC,+HAA+H;IAC/H,MAAM,EACJ,SAAS,EAAE,qCAAqC,EAChD,qCAAqC,EACrC,kBAAkB,EAAE,gDAAgD,EACrE,GAAG,MAAM,sCAAsC,CAC9C,sBAAsB,EACtB,+BAA+B,EAC/B,8BAA8B,EAC9B,oBAAoB,CACrB,CAAC;IAEF,KAAK,MAAM,MAAM,IAAI,gDAAgD,EAAE,CAAC;QACtE,qBAAqB,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IACvC,CAAC;IAED,4BAA4B;IAC5B,+HAA+H;IAC/H,MAAM,EACJ,SAAS,EAAE,yBAAyB,EACpC,yBAAyB,EACzB,kBAAkB,EAAE,kCAAkC,EACvD,GAAG,MAAM,wBAAwB,CAChC,sBAAsB,EACtB,+BAA+B,EAC/B,kBAAkB,EAClB,oBAAoB,CACrB,CAAC;IAEF,KAAK,MAAM,MAAM,IAAI,kCAAkC,EAAE,CAAC;QACxD,qBAAqB,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IACvC,CAAC;IAED,OAAO;QACL,sBAAsB;QACtB,+BAA+B;QAC/B,uBAAuB,EAAE;YACvB,SAAS,EAAE,wBAAwB;YACnC,KAAK,EAAE,wBAAwB;SAChC;QACD,2BAA2B,EAAE;YAC3B,SAAS,EAAE,4BAA4B;YACvC,KAAK,EAAE,4BAA4B;SACpC;QACD,oCAAoC,EAAE;YACpC,SAAS,EAAE,qCAAqC;YAChD,KAAK,EAAE,qCAAqC;SAC7C;QACD,wBAAwB,EAAE;YACxB,SAAS,EAAE,yBAAyB;YACpC,KAAK,EAAE,yBAAyB;SACjC;QACD,qBAAqB;KACtB,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,qBAA4C,EAC5C,4BAAyE,EACzE,SAAoB,EACpB,uBAA4C,EAC5C,wBAA6C,EAC7C,oBAA4B;IAK5B,MAAM,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,GACtF,SAAS,CAAC;IAEZ,yCAAyC;IACzC,IAAI,eAAe,GAAwB;QACzC,GAAG,uBAAuB;QAC1B,QAAQ,EAAE,qBAAqB;QAC/B,YAAY,EAAE,qBAAqB;KACpC,CAAC;IAEF,yFAAyF;IACzF,eAAe,GAAG,4CAA4C,CAC5D,eAAe,EACf,mBAAmB,CACpB,CAAC;IAEF,oCAAoC;IACpC,MAAM,kBAAkB,GAAG,MAAM,mCAAmC,CAClE,qBAAqB,EACrB,iBAAiB,EACjB,eAAe,EACf,wBAAwB,EACxB,oBAAoB,CACrB,CAAC;IACF,eAAe,GAAG,kBAAkB,CAAC,eAAe,CAAC;IACrD,wBAAwB,GAAG,kBAAkB,CAAC,wBAAwB,CAAC;IAEvE,yFAAyF;IACzF,KAAK,MAAM,MAAM,IAAI,4BAA4B,EAAE,CAAC;QAClD,MAAM,OAAO,GAAG,4BAA4B,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAE3D,yDAAyD;QACzD,MAAM,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAEpE,iEAAiE;QACjE,8DAA8D;QAC9D,KAAK,MAAM,MAAM,IAAI,gBAAgB,EAAE,CAAC;YACtC,MAAM,kBAAkB,GAAG,MAAM,uBAAuB,CACtD,MAAM,EACN,iBAAiB,EACjB,eAAe,EACf,wBAAwB,EACxB,oBAAoB,EACpB,MAAM,CACP,CAAC;YACF,eAAe,GAAG,kBAAkB,CAAC,eAAe,CAAC;YACrD,wBAAwB,GAAG,kBAAkB,CAAC,wBAAwB,CAAC;QACzE,CAAC;IACH,CAAC;IAED,OAAO,EAAE,eAAe,EAAE,wBAAwB,EAAE,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,4CAA4C,CAC1D,eAAoC,EACpC,mBAAuD;IAEvD,KAAK,MAAM,YAAY,IAAI,mBAAmB,EAAE,CAAC;QAC/C,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,eAAe,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC;QACrC,CAAC;IACH,CAAC;IAED,OAAO,eAAe,CAAC;AACzB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,MAAc,EACd,iBAA+C,EAC/C,eAAoC,EACpC,wBAA6C,EAC7C,oBAA4B,EAC5B,MAAkC;IAElC,MAAM,eAAe,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAClD,IAAI,CAAC,eAAe,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrD,OAAO,EAAE,eAAe,EAAE,wBAAwB,EAAE,CAAC;IACvD,CAAC;IAED,KAAK,MAAM,QAAQ,IAAI,eAAe,EAAE,CAAC;QACvC,IAAI,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;YACzC,IAAI,kBAAkB,CAAC,QAAQ,CAAC,UAAU,EAAE,wBAAwB,CAAC,EAAE,CAAC;gBACtE,SAAS;YACX,CAAC;YAED,IAAI,CAAC;gBACH,MAAM,cAAc,GAAG,QAAQ,CAAC,QAAQ,CACtC,MAAM,IAAI,EAAE,EACZ;oBACE,IAAI,EAAE,4BAA4B;oBAClC,UAAU,EAAE,QAAQ,CAAC,UAAU;iBAChC,EACD,eAAe,EACf,iBAAiB,EACjB;oBACE,KAAK,EAAE,IAAI;oBACX,cAAc,EAAE,oBAAoB;iBACrC,CACF,CAAC;gBACF,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC,cAAc,CAAC,CAAC;gBAC1D,eAAe,CAAC,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,GAAG,MAAM,CAAC;gBAE7C,mEAAmE;gBACnE,IAAI,cAAc,YAAY,OAAO,EAAE,CAAC;oBACtC,sBAAsB,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,wBAAwB,CAAC,CAAC;gBAChF,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,WAAW,MAAM,iBAAiB,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;YACnF,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,EAAE,eAAe,EAAE,wBAAwB,EAAE,CAAC;AACvD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mCAAmC,CACvD,QAA+B,EAC/B,iBAA+C,EAC/C,eAAoC,EACpC,wBAA6C,EAC7C,oBAA4B;IAE5B,MAAM,2BAA2B,GAAG,iBAAiB,CAAC,oBAAoB,CAAC,CAAC;IAC5E,IAAI,CAAC,2BAA2B,IAAI,2BAA2B,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7E,OAAO;YACL,eAAe;YACf,wBAAwB;SACzB,CAAC;IACJ,CAAC;IAED,KAAK,MAAM,QAAQ,IAAI,2BAA2B,EAAE,CAAC;QACnD,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC;YACxB,IAAI,kBAAkB,CAAC,QAAQ,CAAC,UAAU,EAAE,wBAAwB,CAAC,EAAE,CAAC;gBACtE,SAAS;YACX,CAAC;YAED,IAAI,CAAC;gBACH,MAAM,cAAc,GAAG,QAAQ,CAAC,QAAQ,CACtC,QAAQ,EACR;oBACE,IAAI,EAAE,uBAAuB;oBAC7B,UAAU,EAAE,QAAQ,CAAC,UAAU;iBAChC,EACD,eAAe,EACf,iBAAiB,EACjB;oBACE,KAAK,EAAE,IAAI;oBACX,cAAc,EAAE,oBAAoB;iBACrC,CACF,CAAC;gBAEF,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC,cAAc,CAAC,CAAC;gBAC1D,eAAe,CAAC,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,GAAG,MAAM,CAAC;gBAE7C,mEAAmE;gBACnE,IAAI,cAAc,YAAY,OAAO,EAAE,CAAC;oBACtC,sBAAsB,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,wBAAwB,CAAC,CAAC;gBAChF,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,oCAAoC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;YACrF,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO;QACL,eAAe;QACf,wBAAwB;KACzB,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,MAA8B;IACvE,IAAI,MAAM,YAAY,OAAO,EAAE,CAAC;QAC9B,OAAO,MAAM,MAAM,CAAC;IACtB,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,kBAAkB,CAChC,UAAkB,EAClB,wBAA6C;IAE7C,8CAA8C;IAC9C,IAAI,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC7B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,sCAAsC;IACtC,OAAO,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,wBAAwB,EAAE,UAAU,CAAC,CAAC;AACpF,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,sBAAsB,CACpC,UAAkB,EAClB,MAAW,EACX,wBAA6C;IAE7C,8CAA8C;IAC9C,IAAI,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC7B,OAAO;IACT,CAAC;IAED,wBAAwB,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC;AAChD,CAAC"}

package/lib/utils/fileUtils.js

@@ -14,15 +14,6 @@
  * 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());
-    });
-};
 export function getFileSize(fileSizeString) {
     if (fileSizeString.length < 7) {
         return `${Math.round(+fileSizeString / 1024)}kb`;
@@ -35,30 +26,28 @@ const fileToBase64 = (file) => new Promise((resolve, reject) => {
     reader.onload = () => resolve(reader.result);
     reader.onerror = reject;
 });
-export function createAttachmentAnswer(file, url, fileName) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (!file || url === '') {
-            return null;
-        }
-        try {
-            const base64Data = (yield fileToBase64(file));
-            const attachment = {
-                contentType: file.type,
-                data: base64Data,
-                size: file.size
-            };
-            if (url) {
-                attachment.url = url;
-            }
-            if (fileName) {
-                attachment.title = fileName;
-            }
-            return attachment;
+export async function createAttachmentAnswer(file, url, fileName) {
+    if (!file || url === '') {
+        return null;
+    }
+    try {
+        const base64Data = (await fileToBase64(file));
+        const attachment = {
+            contentType: file.type,
+            data: base64Data,
+            size: file.size
+        };
+        if (url) {
+            attachment.url = url;
         }
-        catch (error) {
-            console.error(error);
-            return null;
+        if (fileName) {
+            attachment.title = fileName;
         }
-    });
+        return attachment;
+    }
+    catch (error) {
+        console.error(error);
+        return null;
+    }
 }
 //# sourceMappingURL=fileUtils.js.map

package/lib/utils/fileUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"fileUtils.js","sourceRoot":"","sources":["../../src/utils/fileUtils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;;;;;;;;;;AAIH,MAAM,UAAU,WAAW,CAAC,cAAsB;IAChD,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC;IACnD,CAAC;IAED,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC;AAC1D,CAAC;AAED,MAAM,YAAY,GAAG,CAAC,IAAU,EAAE,EAAE,CAClC,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;IAC9B,MAAM,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;IAChC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAC3B,MAAM,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC7C,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC;AAC1B,CAAC,CAAC,CAAC;AAEL,MAAM,UAAgB,sBAAsB,CAC1C,IAAiB,EACjB,GAAW,EACX,QAAgB;;QAEhB,IAAI,CAAC,IAAI,IAAI,GAAG,KAAK,EAAE,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,CAAC,MAAM,YAAY,CAAC,IAAI,CAAC,CAAW,CAAC;YACxD,MAAM,UAAU,GAAe;gBAC7B,WAAW,EAAE,IAAI,CAAC,IAAI;gBACtB,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,IAAI,CAAC,IAAI;aAChB,CAAC;YAEF,IAAI,GAAG,EAAE,CAAC;gBACR,UAAU,CAAC,GAAG,GAAG,GAAG,CAAC;YACvB,CAAC;YAED,IAAI,QAAQ,EAAE,CAAC;gBACb,UAAU,CAAC,KAAK,GAAG,QAAQ,CAAC;YAC9B,CAAC;YAED,OAAO,UAAU,CAAC;QACpB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACrB,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;CAAA"}
+{"version":3,"file":"fileUtils.js","sourceRoot":"","sources":["../../src/utils/fileUtils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAIH,MAAM,UAAU,WAAW,CAAC,cAAsB;IAChD,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC;IACnD,CAAC;IAED,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC;AAC1D,CAAC;AAED,MAAM,YAAY,GAAG,CAAC,IAAU,EAAE,EAAE,CAClC,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;IAC9B,MAAM,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;IAChC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAC3B,MAAM,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC7C,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC;AAC1B,CAAC,CAAC,CAAC;AAEL,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,IAAiB,EACjB,GAAW,EACX,QAAgB;IAEhB,IAAI,CAAC,IAAI,IAAI,GAAG,KAAK,EAAE,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,CAAC,MAAM,YAAY,CAAC,IAAI,CAAC,CAAW,CAAC;QACxD,MAAM,UAAU,GAAe;YAC7B,WAAW,EAAE,IAAI,CAAC,IAAI;YACtB,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC;QAEF,IAAI,GAAG,EAAE,CAAC;YACR,UAAU,CAAC,GAAG,GAAG,GAAG,CAAC;QACvB,CAAC;QAED,IAAI,QAAQ,EAAE,CAAC;YACb,UAAU,CAAC,KAAK,GAAG,QAAQ,CAAC;QAC9B,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}

package/lib/utils/genericRecursive.js

@@ -23,7 +23,6 @@ import { qrItemHasItemsOrAnswer } from './manageForm';
  * @author Sean Fong
  */
 export function updateQuestionnaireResponse(questionnaire, questionnaireResponse, recursiveUpdateFunction, extraData) {
-    var _a;
     if (!questionnaire.item ||
         questionnaire.item.length === 0 ||
         !questionnaireResponse.item ||
@@ -34,7 +33,7 @@ export function updateQuestionnaireResponse(questionnaire, questionnaireResponse
     const topLevelQRItemsByIndex = getQrItemsIndex(questionnaire.item, questionnaireResponse.item, qItemsIndexMap);
     const topLevelQrItems = [];
     for (const [index, topLevelQItem] of questionnaire.item.entries()) {
-        const topLevelQRItemOrItems = (_a = topLevelQRItemsByIndex[index]) !== null && _a !== void 0 ? _a : {
+        const topLevelQRItemOrItems = topLevelQRItemsByIndex[index] ?? {
             linkId: topLevelQItem.linkId,
             text: topLevelQItem.text,
             item: []
@@ -50,7 +49,7 @@ export function updateQuestionnaireResponse(questionnaire, questionnaireResponse
             topLevelQrItems.push(updatedTopLevelQRItem);
         }
     }
-    return Object.assign(Object.assign({}, questionnaireResponse), { item: topLevelQrItems });
+    return { ...questionnaireResponse, item: topLevelQrItems };
 }
 /**
  * A generic (and safe) way to read an array of element(s) i.e. QuestionnaireResponseItem[], extracted Observation[] from a QuestionnaireResponse given a recursive function.
@@ -60,15 +59,14 @@ export function updateQuestionnaireResponse(questionnaire, questionnaireResponse
  * @author Sean Fong
  */
 export function readQuestionnaireResponse(questionnaire, questionnaireResponse, recursiveReadFunction, extraData) {
-    var _a, _b;
     if (!questionnaire.item || questionnaire.item.length === 0) {
         return [];
     }
     const qItemsIndexMap = mapQItemsIndex(questionnaire);
-    const topLevelQRItemsByIndex = getQrItemsIndex(questionnaire.item, (_a = questionnaireResponse.item) !== null && _a !== void 0 ? _a : [], qItemsIndexMap);
+    const topLevelQRItemsByIndex = getQrItemsIndex(questionnaire.item, questionnaireResponse.item ?? [], qItemsIndexMap);
     const readValueArray = [];
     for (const [index, topLevelQItem] of questionnaire.item.entries()) {
-        const topLevelQRItemOrItems = (_b = topLevelQRItemsByIndex[index]) !== null && _b !== void 0 ? _b : {
+        const topLevelQRItemOrItems = topLevelQRItemsByIndex[index] ?? {
             linkId: topLevelQItem.linkId,
             text: topLevelQItem.text,
             item: []