@aehrc/smart-forms-renderer 1.0.0-alpha.99 → 1.1.0

package/lib/utils/answerOptionsToggleExpressions.js

@@ -14,131 +14,114 @@
  * 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 { createFhirPathContext, handleFhirPathResult } from './fhirpath';
+import { cacheTerminologyResult, createFhirPathContext, handleFhirPathResult, isExpressionCached } from './fhirpath';
 import fhirpath from 'fhirpath';
 import fhirpath_r4_model from 'fhirpath/fhir-context/r4';
-export function evaluateInitialAnswerOptionsToggleExpressions(params) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const { initialResponse, initialResponseItemMap, answerOptionsToggleExpressions, variables, existingFhirPathContext, terminologyServerUrl } = params;
-        let { fhirPathTerminologyCache } = params;
-        const fhirPathEvalResult = yield createFhirPathContext(initialResponse, initialResponseItemMap, variables, existingFhirPathContext, fhirPathTerminologyCache, terminologyServerUrl);
-        const updatedFhirPathContext = fhirPathEvalResult.fhirPathContext;
-        fhirPathTerminologyCache = fhirPathEvalResult.fhirPathTerminologyCache;
-        for (const linkId in answerOptionsToggleExpressions) {
-            const itemAnswerOptionsToggleExpressions = answerOptionsToggleExpressions[linkId];
-            for (const itemAnswerOptionsToggleExpression of itemAnswerOptionsToggleExpressions) {
-                const initialValue = itemAnswerOptionsToggleExpression.isEnabled;
-                const expression = (_a = itemAnswerOptionsToggleExpression.valueExpression) === null || _a === void 0 ? void 0 : _a.expression;
-                if (!expression) {
-                    continue;
+export async function evaluateInitialAnswerOptionsToggleExpressions(params) {
+    const { initialResponse, initialResponseItemMap, answerOptionsToggleExpressions, variables, existingFhirPathContext, terminologyServerUrl } = params;
+    let { fhirPathTerminologyCache } = params;
+    const fhirPathEvalResult = await createFhirPathContext(initialResponse, initialResponseItemMap, variables, existingFhirPathContext, fhirPathTerminologyCache, terminologyServerUrl);
+    const updatedFhirPathContext = fhirPathEvalResult.fhirPathContext;
+    fhirPathTerminologyCache = fhirPathEvalResult.fhirPathTerminologyCache;
+    for (const linkId in answerOptionsToggleExpressions) {
+        const itemAnswerOptionsToggleExpressions = answerOptionsToggleExpressions[linkId];
+        for (const itemAnswerOptionsToggleExpression of itemAnswerOptionsToggleExpressions) {
+            const initialValue = itemAnswerOptionsToggleExpression.isEnabled;
+            const expression = itemAnswerOptionsToggleExpression.valueExpression?.expression;
+            if (!expression) {
+                continue;
+            }
+            if (isExpressionCached(expression, fhirPathTerminologyCache)) {
+                continue;
+            }
+            try {
+                const fhirPathResult = fhirpath.evaluate({}, expression, updatedFhirPathContext, fhirpath_r4_model, {
+                    async: true,
+                    terminologyUrl: terminologyServerUrl
+                });
+                const result = await handleFhirPathResult(fhirPathResult);
+                // Update answerOptionsToggleExpression 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') {
+                    itemAnswerOptionsToggleExpression.isEnabled = result[0];
                 }
-                const cacheKey = JSON.stringify(expression); // Use expression as cache key
-                if (fhirPathTerminologyCache[cacheKey]) {
-                    continue;
+                // Update isEnabled value to false if no result is returned
+                if (result.length === 0 && initialValue !== false) {
+                    itemAnswerOptionsToggleExpression.isEnabled = false;
                 }
-                try {
-                    const fhirPathResult = fhirpath.evaluate({}, expression, updatedFhirPathContext, fhirpath_r4_model, {
-                        async: true,
-                        terminologyUrl: terminologyServerUrl
-                    });
-                    const result = yield handleFhirPathResult(fhirPathResult);
-                    // Update answerOptionsToggleExpression 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') {
-                        itemAnswerOptionsToggleExpression.isEnabled = result[0];
-                    }
-                    // Update isEnabled value to false if no result is returned
-                    if (result.length === 0 && initialValue !== false) {
-                        itemAnswerOptionsToggleExpression.isEnabled = false;
-                    }
-                    // handle intersect edge case - evaluate() returns empty array if result is false
-                    if (expression.includes('intersect') && result.length === 0 && initialValue !== false) {
-                        itemAnswerOptionsToggleExpression.isEnabled = false;
-                    }
-                    // If fhirPathResult is an async terminology call, cache the result
-                    if (fhirPathResult instanceof Promise) {
-                        fhirPathTerminologyCache[cacheKey] = result;
-                    }
+                // handle intersect edge case - evaluate() returns empty array if result is false
+                if (expression.includes('intersect') && result.length === 0 && initialValue !== false) {
+                    itemAnswerOptionsToggleExpression.isEnabled = false;
                 }
-                catch (e) {
-                    console.warn(e.message, `AnswerOptionsToggleExpression LinkId: ${linkId}\nExpression: ${expression}`);
+                // If fhirPathResult is an async terminology call, cache the result
+                if (fhirPathResult instanceof Promise) {
+                    cacheTerminologyResult(expression, result, fhirPathTerminologyCache);
                 }
             }
+            catch (e) {
+                console.warn(e.message, `AnswerOptionsToggleExpression LinkId: ${linkId}\nExpression: ${expression}`);
+            }
         }
-        return {
-            initialAnswerOptionsToggleExpressions: answerOptionsToggleExpressions,
-            updatedFhirPathContext,
-            fhirPathTerminologyCache
-        };
-    });
+    }
+    return {
+        initialAnswerOptionsToggleExpressions: answerOptionsToggleExpressions,
+        updatedFhirPathContext,
+        fhirPathTerminologyCache
+    };
 }
-export function evaluateAnswerOptionsToggleExpressions(fhirPathContext, fhirPathTerminologyCache, answerOptionsToggleExpressions, terminologyServerUrl) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        let isUpdated = false;
-        const computedNewAnswers = {};
-        for (const linkId in answerOptionsToggleExpressions) {
-            const itemAnswerOptionsToggleExpressions = answerOptionsToggleExpressions[linkId];
-            for (const itemAnswerOptionsToggleExpression of itemAnswerOptionsToggleExpressions) {
-                const initialValue = itemAnswerOptionsToggleExpression.isEnabled;
-                const expression = (_a = itemAnswerOptionsToggleExpression.valueExpression) === null || _a === void 0 ? void 0 : _a.expression;
-                if (!expression) {
-                    continue;
+export async function evaluateAnswerOptionsToggleExpressions(fhirPathContext, fhirPathTerminologyCache, answerOptionsToggleExpressions, terminologyServerUrl) {
+    let isUpdated = false;
+    const computedNewAnswers = {};
+    for (const linkId in answerOptionsToggleExpressions) {
+        const itemAnswerOptionsToggleExpressions = answerOptionsToggleExpressions[linkId];
+        for (const itemAnswerOptionsToggleExpression of itemAnswerOptionsToggleExpressions) {
+            const initialValue = itemAnswerOptionsToggleExpression.isEnabled;
+            const expression = itemAnswerOptionsToggleExpression.valueExpression?.expression;
+            if (!expression) {
+                continue;
+            }
+            if (isExpressionCached(expression, fhirPathTerminologyCache)) {
+                continue;
+            }
+            try {
+                const fhirPathResult = fhirpath.evaluate({}, expression, fhirPathContext, fhirpath_r4_model, {
+                    async: true,
+                    terminologyUrl: terminologyServerUrl
+                });
+                const result = await handleFhirPathResult(fhirPathResult);
+                // Update targetConstraints 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') {
+                    itemAnswerOptionsToggleExpression.isEnabled = result[0];
+                    isUpdated = true;
+                    computedNewAnswers[linkId] = null;
                 }
-                const cacheKey = JSON.stringify(expression); // Use expression as cache key
-                if (fhirPathTerminologyCache[cacheKey]) {
-                    continue;
+                // Update isEnabled value to false if no result is returned
+                if (result.length === 0 && initialValue !== false) {
+                    itemAnswerOptionsToggleExpression.isEnabled = false;
+                    isUpdated = true;
+                    computedNewAnswers[linkId] = null;
                 }
-                try {
-                    const fhirPathResult = fhirpath.evaluate({}, expression, fhirPathContext, fhirpath_r4_model, {
-                        async: true,
-                        terminologyUrl: terminologyServerUrl
-                    });
-                    const result = yield handleFhirPathResult(fhirPathResult);
-                    // Update targetConstraints 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') {
-                        itemAnswerOptionsToggleExpression.isEnabled = result[0];
-                        isUpdated = true;
-                        computedNewAnswers[linkId] = null;
-                    }
-                    // Update isEnabled value to false if no result is returned
-                    if (result.length === 0 && initialValue !== false) {
-                        itemAnswerOptionsToggleExpression.isEnabled = false;
-                        isUpdated = true;
-                        computedNewAnswers[linkId] = null;
-                    }
-                    // handle intersect edge case - evaluate() returns empty array if result is false
-                    if (expression.includes('intersect') && result.length === 0 && initialValue !== false) {
-                        itemAnswerOptionsToggleExpression.isEnabled = false;
-                        isUpdated = true;
-                        computedNewAnswers[linkId] = null;
-                    }
-                    // If fhirPathResult is an async terminology call, cache the result
-                    if (fhirPathResult instanceof Promise) {
-                        fhirPathTerminologyCache[cacheKey] = result;
-                    }
+                // handle intersect edge case - evaluate() returns empty array if result is false
+                if (expression.includes('intersect') && result.length === 0 && initialValue !== false) {
+                    itemAnswerOptionsToggleExpression.isEnabled = false;
+                    isUpdated = true;
+                    computedNewAnswers[linkId] = null;
                 }
-                catch (e) {
-                    console.warn(e.message, `AnswerOptionsToggleExpression LinkId: ${linkId}\nExpression: ${expression}`);
+                // If fhirPathResult is an async terminology call, cache the result
+                if (fhirPathResult instanceof Promise) {
+                    cacheTerminologyResult(expression, result, fhirPathTerminologyCache);
                 }
             }
+            catch (e) {
+                console.warn(e.message, `AnswerOptionsToggleExpression LinkId: ${linkId}\nExpression: ${expression}`);
+            }
         }
-        return {
-            answerOptionsToggleExpressionsIsUpdated: isUpdated,
-            updatedAnswerOptionsToggleExpressions: answerOptionsToggleExpressions,
-            computedNewAnswers
-        };
-    });
+    }
+    return {
+        isUpdated,
+        updatedAnswerOptionsToggleExpressions: answerOptionsToggleExpressions,
+        computedNewAnswers
+    };
 }
 //# sourceMappingURL=answerOptionsToggleExpressions.js.map

package/lib/utils/answerOptionsToggleExpressions.js.map

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

package/lib/utils/calculatedExpression.d.ts

@@ -1,5 +1,5 @@
 import type { CalculatedExpression } from '../interfaces/calculatedExpression.interface';
-import type { Questionnaire, QuestionnaireResponse, QuestionnaireResponseItem } from 'fhir/r4';
+import type { Quantity, Questionnaire, QuestionnaireItem, QuestionnaireResponse, QuestionnaireResponseItem } from 'fhir/r4';
 import type { Variables } from '../interfaces';
 import type { ComputedNewAnswers } from '../interfaces/computedUpdates.interface';
 interface EvaluateInitialCalculatedExpressionsParams {
@@ -16,12 +16,26 @@ export declare function evaluateInitialCalculatedExpressions(params: EvaluateIni
     updatedFhirPathContext: Record<string, any>;
     fhirPathTerminologyCache: Record<string, any>;
 }>;
-export declare function evaluateCalculatedExpressions(fhirPathContext: Record<string, any>, fhirPathTerminologyCache: Record<string, any>, calculatedExpressions: Record<string, CalculatedExpression[]>, terminologyServerUrl: string): Promise<{
+export declare function evaluateCalculatedExpressionsFhirPath(fhirPathContext: Record<string, any>, fhirPathTerminologyCache: Record<string, any>, calculatedExpressions: Record<string, CalculatedExpression[]>, terminologyServerUrl: string): Promise<{
     calculatedExpsIsUpdated: boolean;
     updatedCalculatedExpressions: Record<string, CalculatedExpression[]>;
     computedNewAnswers: ComputedNewAnswers;
 }>;
-export declare function initialiseCalculatedExpressionValues(questionnaire: Questionnaire, populatedResponse: QuestionnaireResponse, calculatedExpressions: Record<string, CalculatedExpression[]>): QuestionnaireResponse;
+/**
+ * Applies evaluated calculated expression values into a QuestionnaireResponse.
+ * Filters out calculated expressions that has value=undefined because in our prior processing step, items without values are set to null.
+ * Uses the generic updateQuestionnaireResponse function to recursively apply the values.
+ *
+ * @param questionnaire - The Questionnaire definition object.
+ * @param initialResponse - The target QuestionnaireResponse to be updated.
+ * @param questionnaireItemMap - A mapping from linkId to QuestionnaireItem (without 'item' children) for easy lookup.
+ * @param previousCalculatedExpressions - A mapping from linkId to array of CalculatedExpression objects that were previously applied.
+ * @param updatedCalculatedExpressions - A mapping from linkId to array of CalculatedExpression objects to be applied.
+ * @param itemPreferredTerminologyServers - A mapping of `linkId` to preferred terminology server URLs for that item.
+ * @param defaultTerminologyServerUrl - The fallback terminology server URL to use if none is specified for an item.
+ * @returns The updated QuestionnaireResponse with calculated expression values applied.
+ */
+export declare function applyCalculatedExpressionValuesToResponse(questionnaire: Questionnaire, initialResponse: QuestionnaireResponse, questionnaireItemMap: Record<string, Omit<QuestionnaireItem, 'item'>>, previousCalculatedExpressions: Record<string, CalculatedExpression[]>, updatedCalculatedExpressions: Record<string, CalculatedExpression[]>, itemPreferredTerminologyServers: Record<string, string>, defaultTerminologyServerUrl: string): Promise<QuestionnaireResponse>;
 /**
  * Check if an answer is a datetime in the format YYYY, YYYY-MM, YYYY-MM-DD, YYYY-MM-DDThh:mm:ss+zz:zz
  *
@@ -34,4 +48,26 @@ export declare function checkIsDateTime(value: string): boolean;
  * @author Sean Fong
  */
 export declare function checkIsTime(value: string): boolean;
+/**
+ * Check if an object is a FHIR Quantity. For our use case, `value` must be present (number). `unit`, `system`, and `code` are optional.
+ * If a code for the unit is present, the system SHALL also be present. See https://www.hl7.org/fhir/R4/datatypes.html#Quantity constraints.
+ *
+ * @author Sean Fong
+ */
+export declare function checkIsQuantity(obj: unknown): obj is Quantity;
+/**
+ * Evaluate calculated expressions with chaining support.
+ * Iteratively evaluates calculated expressions until no more changes occur, ensuring that chained expressions are properly resolved.
+ */
+export declare function processCalculatedExpressions(questionnaire: Questionnaire, questionnaireResponse: QuestionnaireResponse, questionnaireItemMap: Record<string, Omit<QuestionnaireItem, 'item'>>, calculatedExpressions: Record<string, CalculatedExpression[]>, variables: Variables, existingFhirPathContext: Record<string, any>, existingFhirPathTerminologyCache: Record<string, any>, itemPreferredTerminologyServers: Record<string, string>, defaultTerminologyServerUrl: string): Promise<{
+    updatedResponse: QuestionnaireResponse;
+    updatedCalculatedExpressions: Record<string, CalculatedExpression[]>;
+}>;
+/**
+ * Generates a unique repeat ID for a calculated expression answer.
+ *
+ * @param linkId - The item's linkId.
+ * @returns A unique calculatedExpression ID.
+ */
+export declare function generateCalculatedExpressionsAnswerKey(linkId: string): string;
 export {};