sdc-qrf 0.3.3 → 0.3.5

package/lib/components.d.ts

@@ -1,8 +1,10 @@
+import { Expression } from 'fhir/r4b';
 import { ReactChild } from 'react';
-import { QRFContextData, QuestionItemProps, QuestionItemsProps } from './types';
+import { ItemContext, QRFContextData, QuestionItemProps, QuestionItemsProps } from './types';
 export declare function usePreviousValue<T = any>(value: T): T | undefined;
 export declare function QuestionItems(props: QuestionItemsProps): import("react/jsx-runtime").JSX.Element;
 export declare function QuestionItem(props: QuestionItemProps): import("react/jsx-runtime").JSX.Element | null;
 export declare function QuestionnaireResponseFormProvider({ children, ...props }: QRFContextData & {
     children: ReactChild;
 }): import("react/jsx-runtime").JSX.Element;
+export declare function evaluateQuestionItemExpression(linkId: string, path: string, context: ItemContext, expression?: Expression): any;

package/lib/components.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QuestionnaireResponseFormProvider = exports.QuestionItem = exports.QuestionItems = exports.usePreviousValue = void 0;
+exports.evaluateQuestionItemExpression = exports.QuestionnaireResponseFormProvider = exports.QuestionItem = exports.QuestionItems = exports.usePreviousValue = void 0;
 const tslib_1 = require("tslib");
 const jsx_runtime_1 = require("react/jsx-runtime");
 const fhirpath_1 = tslib_1.__importDefault(require("fhirpath"));
@@ -29,11 +29,14 @@ function QuestionItems(props) {
         }) }));
 }
 exports.QuestionItems = QuestionItems;
+const cqfExpressionExtensionUrl = 'http://hl7.org/fhir/StructureDefinition/cqf-expression';
 function QuestionItem(props) {
-    const { questionItem, context: initialContext, parentPath } = props;
+    const { questionItem: initialQuestionItem, context: initialContext, parentPath } = props;
     const { questionItemComponents, customWidgets, groupItemComponent, itemControlQuestionItemComponents, itemControlGroupItemComponents, } = (0, react_1.useContext)(context_1.QRFContext);
     const { formValues, setFormValues } = (0, _1.useQuestionnaireResponseFormContext)();
-    const { type, linkId, calculatedExpression, variable, repeats, itemControl, _text } = questionItem;
+    const [questionItem, setQuestionItem] = (0, react_1.useState)(initialQuestionItem);
+    const prevQuestionItem = usePreviousValue(questionItem);
+    const { type, linkId, calculatedExpression, variable, repeats, itemControl, _text, _readOnly, _required, } = questionItem;
     const fieldPath = (0, react_1.useMemo)(() => [...parentPath, linkId], [parentPath, linkId]);
     // TODO: how to do when item is not in QR (e.g. default element of repeatable group)
     const branchItems = (0, utils_1.getBranchItems)(fieldPath, initialContext.questionnaire, initialContext.resource);
@@ -41,39 +44,21 @@ function QuestionItem(props) {
         ? branchItems.qrItems.map((curQRItem) => (0, utils_1.calcContext)(initialContext, variable, branchItems.qItem, curQRItem))
         : (0, utils_1.calcContext)(initialContext, variable, branchItems.qItem, branchItems.qrItems[0]);
     const prevAnswers = usePreviousValue(lodash_1.default.get(formValues, fieldPath));
+    const itemContext = (0, react_1.useMemo)(() => (isGroupItem(questionItem, context) ? context[0] : context), [questionItem, context]);
     (0, react_1.useEffect)(() => {
-        var _a;
-        if (!isGroupItem(questionItem, context) && calculatedExpression) {
-            // TODO: Add support for x-fhir-query
-            if (calculatedExpression.language === 'text/fhirpath') {
-                try {
-                    const newValues = fhirpath_1.default.evaluate(context.context || {}, calculatedExpression.expression, context);
-                    const newAnswers = newValues.length
-                        ? repeats
-                            ? newValues.map((answer) => ({
-                                value: (0, utils_1.wrapAnswerValue)(type, answer),
-                            }))
-                            : [{ value: (0, utils_1.wrapAnswerValue)(type, newValues[0]) }]
-                        : undefined;
-                    if (!(0, isEqual_1.default)(newAnswers === null || newAnswers === void 0 ? void 0 : newAnswers.map((answer) => answer.value), prevAnswers === null || prevAnswers === void 0 ? void 0 : prevAnswers.map((answer) => answer.value))) {
-                        const allValues = lodash_1.default.set(lodash_1.default.cloneDeep(formValues), fieldPath, newAnswers);
-                        setFormValues(allValues, fieldPath, newAnswers);
-                    }
-                }
-                catch (err) {
-                    throw Error(`FHIRPath expression evaluation failure for "calculatedExpression" in ${questionItem.linkId}: ${err}`);
-                }
-            }
-        }
-        if (!isGroupItem(questionItem, context) && _text) {
-            try {
-                const extension = (0, utils_1.findExtensionByUrl)('http://hl7.org/fhir/StructureDefinition/cqf-expression', _text.extension);
-                if (_text && ((_a = extension === null || extension === void 0 ? void 0 : extension.valueExpression) === null || _a === void 0 ? void 0 : _a.expression)) {
-                    questionItem.text = fhirpath_1.default.evaluate(context.context || {}, extension.valueExpression.expression, context)[0];
-                }
-            }
-            catch (err) {
-                throw Error(`FHIRPath expression evaluation failure for "cqfExpression" in ${questionItem.linkId}: ${err}`);
+        // TODO: think about use cases for group context
+        if (itemContext && calculatedExpression) {
+            const newValues = evaluateQuestionItemExpression(linkId, 'calculatedExpression', itemContext, calculatedExpression);
+            const newAnswers = newValues.length
+                ? repeats
+                    ? newValues.map((answer) => ({
+                        value: (0, utils_1.wrapAnswerValue)(type, answer),
+                    }))
+                    : [{ value: (0, utils_1.wrapAnswerValue)(type, newValues[0]) }]
+                : undefined;
+            if (!(0, isEqual_1.default)(newAnswers === null || newAnswers === void 0 ? void 0 : newAnswers.map((answer) => answer.value), prevAnswers === null || prevAnswers === void 0 ? void 0 : prevAnswers.map((answer) => answer.value))) {
+                const allValues = lodash_1.default.set(lodash_1.default.cloneDeep(formValues), fieldPath, newAnswers);
+                setFormValues(allValues, fieldPath, newAnswers);
             }
         }
     }, [
@@ -84,11 +69,38 @@ function QuestionItem(props) {
         parentPath,
         repeats,
         type,
-        questionItem,
+        linkId,
+        itemContext,
         prevAnswers,
         fieldPath,
-        _text,
     ]);
+    (0, react_1.useEffect)(() => {
+        var _a, _b, _c;
+        if (itemContext && _text) {
+            const extension = (0, utils_1.findExtensionByUrl)(cqfExpressionExtensionUrl, _text.extension);
+            const cqfExpression = extension === null || extension === void 0 ? void 0 : extension.valueExpression;
+            const calculatedValue = (_a = evaluateQuestionItemExpression(linkId, '_text.cqfExpression', itemContext, cqfExpression)) !== null && _a !== void 0 ? _a : initialQuestionItem.text;
+            if ((prevQuestionItem === null || prevQuestionItem === void 0 ? void 0 : prevQuestionItem.text) !== calculatedValue) {
+                setQuestionItem((qi) => (Object.assign(Object.assign({}, qi), { text: calculatedValue })));
+            }
+        }
+        if (itemContext && _readOnly) {
+            const extension = (0, utils_1.findExtensionByUrl)(cqfExpressionExtensionUrl, _readOnly.extension);
+            const cqfExpression = extension === null || extension === void 0 ? void 0 : extension.valueExpression;
+            const calculatedValue = (_b = evaluateQuestionItemExpression(linkId, '_readOnly.cqfExpression', itemContext, cqfExpression)) !== null && _b !== void 0 ? _b : initialQuestionItem.readOnly;
+            if ((prevQuestionItem === null || prevQuestionItem === void 0 ? void 0 : prevQuestionItem.readOnly) !== calculatedValue) {
+                setQuestionItem((qi) => (Object.assign(Object.assign({}, qi), { readOnly: calculatedValue })));
+            }
+        }
+        if (itemContext && _required) {
+            const extension = (0, utils_1.findExtensionByUrl)(cqfExpressionExtensionUrl, _required.extension);
+            const cqfExpression = extension === null || extension === void 0 ? void 0 : extension.valueExpression;
+            const calculatedValue = (_c = evaluateQuestionItemExpression(linkId, '_required.cqfExpression', itemContext, cqfExpression)) !== null && _c !== void 0 ? _c : initialQuestionItem.required;
+            if ((prevQuestionItem === null || prevQuestionItem === void 0 ? void 0 : prevQuestionItem.required) !== calculatedValue) {
+                setQuestionItem((qi) => (Object.assign(Object.assign({}, qi), { required: calculatedValue })));
+            }
+        }
+    }, [linkId, initialQuestionItem, prevQuestionItem, itemContext, _text, _readOnly, _required]);
     if (isGroupItem(questionItem, context)) {
         if (itemControl) {
             if (!itemControlGroupItemComponents ||
@@ -147,4 +159,21 @@ exports.QuestionnaireResponseFormProvider = QuestionnaireResponseFormProvider;
 function isGroupItem(questionItem, context) {
     return questionItem.type === 'group';
 }
+function evaluateQuestionItemExpression(linkId, path, context, expression) {
+    var _a;
+    if (!expression) {
+        return;
+    }
+    if (expression.language !== 'text/fhirpath') {
+        console.error('Only fhirpath expression is supported');
+        return;
+    }
+    try {
+        return fhirpath_1.default.evaluate((_a = context.context) !== null && _a !== void 0 ? _a : {}, expression.expression, context)[0];
+    }
+    catch (err) {
+        throw Error(`FHIRPath expression evaluation failure for ${linkId}.${path}: ${err}`);
+    }
+}
+exports.evaluateQuestionItemExpression = evaluateQuestionItemExpression;
 //# sourceMappingURL=components.js.map

package/lib/components.js.map

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

package/lib/converter/fceToFhir/questionnaireResponse/processAnswers.js

@@ -30,6 +30,7 @@ function processAnswer(answerItem) {
         date: 'valueDate',
         dateTime: 'valueDateTime',
         time: 'valueTime',
+        Quantity: 'valueQuantity',
     };
     for (const key in valueMappings) {
         if (key in value) {

package/lib/converter/fceToFhir/questionnaireResponse/processAnswers.js.map

@@ -1 +1 @@
-{"version":3,"file":"processAnswers.js","sourceRoot":"","sources":["../../../../src/converter/fceToFhir/questionnaireResponse/processAnswers.ts"],"names":[],"mappings":";;;;AACA,qEAAqC;AAOrC,kDAAqD;AAErD,SAAgB,cAAc,CAAC,KAAqC;IAChE,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACtB,IAAI,IAAI,CAAC,MAAM,EAAE;YACb,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,IAAA,iBAAO,EAAC,MAAM,CAAC,CAAC,CAAC;SACrF;QACD,IAAI,IAAI,CAAC,IAAI,EAAE;YACX,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC7B;KACJ;AACL,CAAC;AATD,wCASC;AAED,SAAS,aAAa,CAClB,UAA8C;IAE9C,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE;QACnB,OAAO,UAAU,CAAC;KACrB;IACD,MAAM,EAAE,KAAK,KAAc,UAAU,EAAnB,IAAI,kBAAK,UAAU,EAA/B,SAAkB,CAAa,CAAC;IACtC,MAAM,cAAc,GAAwC,IAAI,CAAC;IACjE,MAAM,aAAa,GAAG;QAClB,MAAM,EAAE,aAAa;QACrB,OAAO,EAAE,cAAc;QACvB,OAAO,EAAE,cAAc;QACvB,OAAO,EAAE,cAAc;QACvB,MAAM,EAAE,aAAa;QACrB,IAAI,EAAE,WAAW;QACjB,QAAQ,EAAE,eAAe;QACzB,IAAI,EAAE,WAAW;KACpB,CAAC;IACF,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE;QAC7B,IAAI,GAAG,IAAI,KAAK,EAAE;YACd,YAAY;YACZ,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;YAClC,IAAI,MAAM,EAAE;gBACR,YAAY;gBACZ,cAAc,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;aACvC;YACD,MAAM;SACT;KACJ;IACD,IAAI,KAAK,CAAC,SAAS,EAAE;QACjB,cAAc,CAAC,cAAc,GAAG,IAAA,2BAAe,EAAC,KAAK,CAAC,SAAS,CAAC,CAAC;KACpE;IACD,OAAO,cAAc,CAAC;AAC1B,CAAC"}
+{"version":3,"file":"processAnswers.js","sourceRoot":"","sources":["../../../../src/converter/fceToFhir/questionnaireResponse/processAnswers.ts"],"names":[],"mappings":";;;;AACA,qEAAqC;AAOrC,kDAAqD;AAErD,SAAgB,cAAc,CAAC,KAAqC;IAChE,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACtB,IAAI,IAAI,CAAC,MAAM,EAAE;YACb,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,IAAA,iBAAO,EAAC,MAAM,CAAC,CAAC,CAAC;SACrF;QACD,IAAI,IAAI,CAAC,IAAI,EAAE;YACX,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC7B;KACJ;AACL,CAAC;AATD,wCASC;AAED,SAAS,aAAa,CAClB,UAA8C;IAE9C,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE;QACnB,OAAO,UAAU,CAAC;KACrB;IACD,MAAM,EAAE,KAAK,KAAc,UAAU,EAAnB,IAAI,kBAAK,UAAU,EAA/B,SAAkB,CAAa,CAAC;IACtC,MAAM,cAAc,GAAwC,IAAI,CAAC;IACjE,MAAM,aAAa,GAAG;QAClB,MAAM,EAAE,aAAa;QACrB,OAAO,EAAE,cAAc;QACvB,OAAO,EAAE,cAAc;QACvB,OAAO,EAAE,cAAc;QACvB,MAAM,EAAE,aAAa;QACrB,IAAI,EAAE,WAAW;QACjB,QAAQ,EAAE,eAAe;QACzB,IAAI,EAAE,WAAW;QACjB,QAAQ,EAAE,eAAe;KAC5B,CAAC;IACF,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE;QAC7B,IAAI,GAAG,IAAI,KAAK,EAAE;YACd,YAAY;YACZ,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;YAClC,IAAI,MAAM,EAAE;gBACR,YAAY;gBACZ,cAAc,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;aACvC;YACD,MAAM;SACT;KACJ;IACD,IAAI,KAAK,CAAC,SAAS,EAAE;QACjB,cAAc,CAAC,cAAc,GAAG,IAAA,2BAAe,EAAC,KAAK,CAAC,SAAS,CAAC,CAAC;KACpE;IACD,OAAO,cAAc,CAAC;AAC1B,CAAC"}

package/lib/converter/fhirToFce/questionnaireResponse/processAnswers.js

@@ -33,6 +33,7 @@ function processAnswer(answer) {
             Reference: (0, converter_1.fromFHIRReference)(value),
         }),
         valueTime: (value) => ({ time: value }),
+        valueQuantity: (value) => ({ Quantity: value }),
     };
     for (const key in valueHandlers) {
         if (key in fceAnswer) {

package/lib/converter/fhirToFce/questionnaireResponse/processAnswers.js.map

@@ -1 +1 @@
-{"version":3,"file":"processAnswers.js","sourceRoot":"","sources":["../../../../src/converter/fhirToFce/questionnaireResponse/processAnswers.ts"],"names":[],"mappings":";;;;AAMA,qEAAqC;AAIrC,kDAAuD;AAEvD,SAAgB,cAAc,CAAC,KAAsC;IACjE,IAAI,CAAC,KAAK,EAAE;QACR,OAAO;KACV;IACD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACtB,IAAI,IAAI,CAAC,MAAM,EAAE;YACb,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,IAAA,iBAAO,EAAC,MAAM,CAAC,CAAC,CAAC;SACrF;QACD,IAAI,IAAI,CAAC,IAAI,EAAE;YACX,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC7B;KACJ;AACL,CAAC;AAZD,wCAYC;AAED,SAAS,aAAa,CAClB,MAA2C;;IAE3C,MAAM,SAAS,qBAA4C,MAAM,CAAE,CAAC;IACpE,MAAM,aAAa,GAAG;QAClB,WAAW,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;QACnD,YAAY,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QACrD,YAAY,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QACrD,YAAY,EAAE,CAAC,KAAc,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QACtD,WAAW,EAAE,CAAC,KAAiB,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;QACvD,SAAS,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QAC/C,aAAa,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QACvD,cAAc,EAAE,CAAC,KAAoB,EAAE,EAAE,CAAC,CAAC;YACvC,SAAS,EAAE,IAAA,6BAAiB,EAAC,KAAK,CAAC;SACtC,CAAC;QACF,SAAS,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;KAClD,CAAC;IAEF,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE;QAC7B,IAAI,GAAG,IAAI,SAAS,EAAE;YAClB,YAAY;YACZ,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;YAC7B,YAAY;YACZ,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC;YACtB,YAAY;YACZ,SAAS,CAAC,KAAK,GAAG,MAAA,aAAa,CAAC,GAAG,CAAC,8DAAG,KAAK,CAAC,CAAC;SACjD;KACJ;IACD,OAAO,SAAS,CAAC;AACrB,CAAC"}
+{"version":3,"file":"processAnswers.js","sourceRoot":"","sources":["../../../../src/converter/fhirToFce/questionnaireResponse/processAnswers.ts"],"names":[],"mappings":";;;;AAMA,qEAAqC;AAIrC,kDAAuD;AAEvD,SAAgB,cAAc,CAAC,KAAsC;IACjE,IAAI,CAAC,KAAK,EAAE;QACR,OAAO;KACV;IACD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACtB,IAAI,IAAI,CAAC,MAAM,EAAE;YACb,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,IAAA,iBAAO,EAAC,MAAM,CAAC,CAAC,CAAC;SACrF;QACD,IAAI,IAAI,CAAC,IAAI,EAAE;YACX,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC7B;KACJ;AACL,CAAC;AAZD,wCAYC;AAED,SAAS,aAAa,CAClB,MAA2C;;IAE3C,MAAM,SAAS,qBAA4C,MAAM,CAAE,CAAC;IACpE,MAAM,aAAa,GAAG;QAClB,WAAW,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;QACnD,YAAY,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QACrD,YAAY,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QACrD,YAAY,EAAE,CAAC,KAAc,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QACtD,WAAW,EAAE,CAAC,KAAiB,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;QACvD,SAAS,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QAC/C,aAAa,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QACvD,cAAc,EAAE,CAAC,KAAoB,EAAE,EAAE,CAAC,CAAC;YACvC,SAAS,EAAE,IAAA,6BAAiB,EAAC,KAAK,CAAC;SACtC,CAAC;QACF,SAAS,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QAC/C,aAAa,EAAE,CAAC,KAAiB,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;KAC9D,CAAC;IAEF,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE;QAC7B,IAAI,GAAG,IAAI,SAAS,EAAE;YAClB,YAAY;YACZ,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;YAC7B,YAAY;YACZ,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC;YACtB,YAAY;YACZ,SAAS,CAAC,KAAK,GAAG,MAAA,aAAa,CAAC,GAAG,CAAC,8DAAG,KAAK,CAAC,CAAC;SACjD;KACJ;IACD,OAAO,SAAS,CAAC;AACrB,CAAC"}

package/lib/utils.js

@@ -348,7 +348,7 @@ function isQuestionEnabled(args) {
             return expressionResult;
         }
         catch (err) {
-            throw Error(`FHIRPath expression evaluation failure for "enableWhenExpression" in ${args.qItem.linkId}: ${err}`);
+            throw Error(`FHIRPath expression evaluation failure for ${args.qItem.linkId}.enableWhenExpression: ${err}`);
         }
     }
     const iterFn = enableBehavior === 'any' ? lodash_1.default.some : lodash_1.default.every;

package/lib/utils.js.map

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

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "sdc-qrf",
     "license": "MIT",
-    "version": "0.3.3",
+    "version": "0.3.5",
     "scripts": {
         "build": "tsc",
         "coverage": "jest --coverage --coverageReporters=text-lcov | coveralls",

package/src/components.tsx

@@ -1,7 +1,8 @@
+import { Expression } from 'fhir/r4b';
 import fhirpath from 'fhirpath';
 import _ from 'lodash';
 import isEqual from 'lodash/isEqual';
-import React, { ReactChild, useEffect, useContext, useMemo, useRef } from 'react';
+import React, { ReactChild, useEffect, useContext, useMemo, useRef, useState } from 'react';
 
 import { QuestionnaireItem } from 'shared/src/contrib/aidbox';
 
@@ -58,8 +59,10 @@ export function QuestionItems(props: QuestionItemsProps) {
     );
 }
 
+const cqfExpressionExtensionUrl = 'http://hl7.org/fhir/StructureDefinition/cqf-expression';
+
 export function QuestionItem(props: QuestionItemProps) {
-    const { questionItem, context: initialContext, parentPath } = props;
+    const { questionItem: initialQuestionItem, context: initialContext, parentPath } = props;
     const {
         questionItemComponents,
         customWidgets,
@@ -68,9 +71,20 @@ export function QuestionItem(props: QuestionItemProps) {
         itemControlGroupItemComponents,
     } = useContext(QRFContext);
     const { formValues, setFormValues } = useQuestionnaireResponseFormContext();
+    const [questionItem, setQuestionItem] = useState(initialQuestionItem);
+    const prevQuestionItem: QuestionnaireItem | undefined = usePreviousValue(questionItem);
 
-    const { type, linkId, calculatedExpression, variable, repeats, itemControl, _text } =
-        questionItem;
+    const {
+        type,
+        linkId,
+        calculatedExpression,
+        variable,
+        repeats,
+        itemControl,
+        _text,
+        _readOnly,
+        _required,
+    } = questionItem;
     const fieldPath = useMemo(() => [...parentPath, linkId!], [parentPath, linkId]);
 
     // TODO: how to do when item is not in QR (e.g. default element of repeatable group)
@@ -89,57 +103,37 @@ export function QuestionItem(props: QuestionItemProps) {
         _.get(formValues, fieldPath),
     );
 
+    const itemContext = useMemo(
+        () => (isGroupItem(questionItem, context) ? context[0] : context),
+        [questionItem, context],
+    );
+
     useEffect(() => {
-        if (!isGroupItem(questionItem, context) && calculatedExpression) {
-            // TODO: Add support for x-fhir-query
-            if (calculatedExpression.language === 'text/fhirpath') {
-                try {
-                    const newValues = fhirpath.evaluate(
-                        context.context || {},
-                        calculatedExpression.expression!,
-                        context as ItemContext,
-                    );
-                    const newAnswers: FormAnswerItems[] | undefined = newValues.length
-                        ? repeats
-                            ? newValues.map((answer: any) => ({
-                                  value: wrapAnswerValue(type, answer),
-                              }))
-                            : [{ value: wrapAnswerValue(type, newValues[0]) }]
-                        : undefined;
-
-                    if (
-                        !isEqual(
-                            newAnswers?.map((answer) => answer.value),
-                            prevAnswers?.map((answer) => answer.value),
-                        )
-                    ) {
-                        const allValues = _.set(_.cloneDeep(formValues), fieldPath, newAnswers);
-                        setFormValues(allValues, fieldPath, newAnswers);
-                    }
-                } catch (err: unknown) {
-                    throw Error(
-                        `FHIRPath expression evaluation failure for "calculatedExpression" in ${questionItem.linkId}: ${err}`,
-                    );
-                }
-            }
-        }
-        if (!isGroupItem(questionItem, context) && _text) {
-            try {
-                const extension = findExtensionByUrl(
-                    'http://hl7.org/fhir/StructureDefinition/cqf-expression',
-                    _text.extension,
-                );
-                if (_text && extension?.valueExpression?.expression) {
-                    questionItem.text = fhirpath.evaluate(
-                        context.context || {},
-                        extension.valueExpression.expression,
-                        context as ItemContext,
-                    )[0];
-                }
-            } catch (err: unknown) {
-                throw Error(
-                    `FHIRPath expression evaluation failure for "cqfExpression" in ${questionItem.linkId}: ${err}`,
-                );
+        // TODO: think about use cases for group context
+        if (itemContext && calculatedExpression) {
+            const newValues = evaluateQuestionItemExpression(
+                linkId,
+                'calculatedExpression',
+                itemContext,
+                calculatedExpression,
+            );
+
+            const newAnswers: FormAnswerItems[] | undefined = newValues.length
+                ? repeats
+                    ? newValues.map((answer: any) => ({
+                          value: wrapAnswerValue(type, answer),
+                      }))
+                    : [{ value: wrapAnswerValue(type, newValues[0]) }]
+                : undefined;
+
+            if (
+                !isEqual(
+                    newAnswers?.map((answer) => answer.value),
+                    prevAnswers?.map((answer) => answer.value),
+                )
+            ) {
+                const allValues = _.set(_.cloneDeep(formValues), fieldPath, newAnswers);
+                setFormValues(allValues, fieldPath, newAnswers);
             }
         }
     }, [
@@ -150,12 +144,71 @@ export function QuestionItem(props: QuestionItemProps) {
         parentPath,
         repeats,
         type,
-        questionItem,
+        linkId,
+        itemContext,
         prevAnswers,
         fieldPath,
-        _text,
     ]);
 
+    useEffect(() => {
+        if (itemContext && _text) {
+            const extension = findExtensionByUrl(cqfExpressionExtensionUrl, _text.extension);
+            const cqfExpression = extension?.valueExpression;
+            const calculatedValue =
+                evaluateQuestionItemExpression(
+                    linkId,
+                    '_text.cqfExpression',
+                    itemContext,
+                    cqfExpression,
+                ) ?? initialQuestionItem.text;
+
+            if (prevQuestionItem?.text !== calculatedValue) {
+                setQuestionItem((qi) => ({
+                    ...qi,
+                    text: calculatedValue,
+                }));
+            }
+        }
+
+        if (itemContext && _readOnly) {
+            const extension = findExtensionByUrl(cqfExpressionExtensionUrl, _readOnly.extension);
+            const cqfExpression = extension?.valueExpression;
+            const calculatedValue =
+                evaluateQuestionItemExpression(
+                    linkId,
+                    '_readOnly.cqfExpression',
+                    itemContext,
+                    cqfExpression,
+                ) ?? initialQuestionItem.readOnly;
+
+            if (prevQuestionItem?.readOnly !== calculatedValue) {
+                setQuestionItem((qi) => ({
+                    ...qi,
+                    readOnly: calculatedValue,
+                }));
+            }
+        }
+
+        if (itemContext && _required) {
+            const extension = findExtensionByUrl(cqfExpressionExtensionUrl, _required.extension);
+            const cqfExpression = extension?.valueExpression;
+            const calculatedValue =
+                evaluateQuestionItemExpression(
+                    linkId,
+                    '_required.cqfExpression',
+                    itemContext,
+                    cqfExpression,
+                ) ?? initialQuestionItem.required;
+
+            if (prevQuestionItem?.required !== calculatedValue) {
+                setQuestionItem((qi) => ({
+                    ...qi,
+                    required: calculatedValue,
+                }));
+            }
+        }
+    }, [linkId, initialQuestionItem, prevQuestionItem, itemContext, _text, _readOnly, _required]);
+
     if (isGroupItem(questionItem, context)) {
         if (itemControl) {
             if (
@@ -264,3 +317,25 @@ function isGroupItem(
 ): context is ItemContext[] {
     return questionItem.type === 'group';
 }
+
+export function evaluateQuestionItemExpression(
+    linkId: string,
+    path: string,
+    context: ItemContext,
+    expression?: Expression,
+) {
+    if (!expression) {
+        return;
+    }
+
+    if (expression.language !== 'text/fhirpath') {
+        console.error('Only fhirpath expression is supported');
+        return;
+    }
+
+    try {
+        return fhirpath.evaluate(context.context ?? {}, expression.expression!, context)[0];
+    } catch (err: unknown) {
+        throw Error(`FHIRPath expression evaluation failure for ${linkId}.${path}: ${err}`);
+    }
+}

package/src/converter/fceToFhir/questionnaireResponse/processAnswers.ts

@@ -36,6 +36,7 @@ function processAnswer(
         date: 'valueDate',
         dateTime: 'valueDateTime',
         time: 'valueTime',
+        Quantity: 'valueQuantity',
     };
     for (const key in valueMappings) {
         if (key in value) {

package/src/converter/fhirToFce/questionnaireResponse/processAnswers.ts

@@ -40,6 +40,7 @@ function processAnswer(
             Reference: fromFHIRReference(value),
         }),
         valueTime: (value: string) => ({ time: value }),
+        valueQuantity: (value: FHIRCoding) => ({ Quantity: value }),
     };
 
     for (const key in valueHandlers) {

package/src/utils.ts

@@ -528,7 +528,7 @@ function isQuestionEnabled(args: IsQuestionEnabledArgs) {
             return expressionResult;
         } catch (err: unknown) {
             throw Error(
-                `FHIRPath expression evaluation failure for "enableWhenExpression" in ${args.qItem.linkId}: ${err}`,
+                `FHIRPath expression evaluation failure for ${args.qItem.linkId}.enableWhenExpression: ${err}`,
             );
         }
     }