@aehrc/smart-forms-renderer 0.30.1 → 0.30.2

package/lib/components/FormComponents/ItemParts/ItemLabelText.js

@@ -20,11 +20,11 @@ import parse from 'html-react-parser';
 import Box from '@mui/material/Box';
 import ReactMarkdown from 'react-markdown';
 import Typography from '@mui/material/Typography';
-import useDisplayCalculatedExpression from '../../../hooks/useDisplayCalculatedExpression';
+import useDisplayCqfAndCalculatedExpression from '../../../hooks/useDisplayCqfAndCalculatedExpression';
 const ItemLabelText = memo(function ItemLabelText(props) {
     const { qItem, readOnly } = props;
     // Use calculatedExpressionString if available
-    const calculatedExpressionString = useDisplayCalculatedExpression(qItem);
+    const calculatedExpressionString = useDisplayCqfAndCalculatedExpression(qItem);
     if (calculatedExpressionString) {
         return (React.createElement(Typography, { color: readOnly ? 'text.disabled' : 'text.primary', sx: { mt: 0.25 } }, calculatedExpressionString));
     }

package/lib/components/FormComponents/ItemParts/ItemLabelText.js.map

@@ -1 +1 @@
-{"version":3,"file":"ItemLabelText.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ItemParts/ItemLabelText.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAEpC,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC/E,OAAO,KAAK,MAAM,mBAAmB,CAAC;AACtC,OAAO,GAAG,MAAM,mBAAmB,CAAC;AACpC,OAAO,aAAa,MAAM,gBAAgB,CAAC;AAC3C,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,8BAA8B,MAAM,+CAA+C,CAAC;AAO3F,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,aAAa,CAAC,KAAyB;IACzE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IAElC,8CAA8C;IAC9C,MAAM,0BAA0B,GAAG,8BAA8B,CAAC,KAAK,CAAC,CAAC;IACzE,IAAI,0BAA0B,EAAE;QAC9B,OAAO,CACL,oBAAC,UAAU,IAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,cAAc,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,IAC7E,0BAA0B,CAChB,CACd,CAAC;KACH;IAED,uBAAuB;IACvB,MAAM,WAAW,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IAE1C,IAAI,WAAW,EAAE;QACf,OAAO,oBAAC,GAAG,QAAE,KAAK,CAAC,WAAW,CAAC,CAAO,CAAC;KACxC;IAED,0BAA0B;IAC1B,MAAM,cAAc,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;IAChD,IAAI,cAAc,EAAE;QAClB,OAAO,CACL,oBAAC,GAAG;YACF,oBAAC,aAAa,QAAE,cAAc,CAAiB,CAC3C,CACP,CAAC;KACH;IAED,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE;QAC1B,OAAO,0CAAG,KAAK,CAAC,IAAI,CAAI,CAAC;KAC1B;IAED,qBAAqB;IACrB,OAAO,CACL,oBAAC,UAAU,IAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,cAAc,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,IAC7E,KAAK,CAAC,IAAI,CACA,CACd,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,eAAe,aAAa,CAAC"}
+{"version":3,"file":"ItemLabelText.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ItemParts/ItemLabelText.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAEpC,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC/E,OAAO,KAAK,MAAM,mBAAmB,CAAC;AACtC,OAAO,GAAG,MAAM,mBAAmB,CAAC;AACpC,OAAO,aAAa,MAAM,gBAAgB,CAAC;AAC3C,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,oCAAoC,MAAM,qDAAqD,CAAC;AAOvG,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,aAAa,CAAC,KAAyB;IACzE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IAElC,8CAA8C;IAC9C,MAAM,0BAA0B,GAAG,oCAAoC,CAAC,KAAK,CAAC,CAAC;IAC/E,IAAI,0BAA0B,EAAE;QAC9B,OAAO,CACL,oBAAC,UAAU,IAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,cAAc,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,IAC7E,0BAA0B,CAChB,CACd,CAAC;KACH;IAED,uBAAuB;IACvB,MAAM,WAAW,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IAE1C,IAAI,WAAW,EAAE;QACf,OAAO,oBAAC,GAAG,QAAE,KAAK,CAAC,WAAW,CAAC,CAAO,CAAC;KACxC;IAED,0BAA0B;IAC1B,MAAM,cAAc,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;IAChD,IAAI,cAAc,EAAE;QAClB,OAAO,CACL,oBAAC,GAAG;YACF,oBAAC,aAAa,QAAE,cAAc,CAAiB,CAC3C,CACP,CAAC;KACH;IAED,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE;QAC1B,OAAO,0CAAG,KAAK,CAAC,IAAI,CAAI,CAAC;KAC1B;IAED,qBAAqB;IACrB,OAAO,CACL,oBAAC,UAAU,IAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,cAAc,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,IAC7E,KAAK,CAAC,IAAI,CACA,CACd,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,eAAe,aAAa,CAAC"}

package/lib/hooks/useDisplayCqfAndCalculatedExpression.d.ts

@@ -0,0 +1,3 @@
+import type { QuestionnaireItem } from 'fhir/r4';
+declare function useDisplayCqfAndCalculatedExpression(qItem: QuestionnaireItem): string | null;
+export default useDisplayCqfAndCalculatedExpression;

package/lib/hooks/useDisplayCqfAndCalculatedExpression.js

@@ -0,0 +1,40 @@
+/*
+ * 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 { useQuestionnaireStore } from '../stores';
+function useDisplayCqfAndCalculatedExpression(qItem) {
+    var _a;
+    const calculatedExpressions = useQuestionnaireStore.use.calculatedExpressions();
+    const cqfOrCalcExpression = (_a = calculatedExpressions[qItem.linkId]) === null || _a === void 0 ? void 0 : _a.find((exp) => exp.from === 'item._text');
+    if (!cqfOrCalcExpression) {
+        return null;
+    }
+    if (typeof cqfOrCalcExpression.value === 'string' ||
+        typeof cqfOrCalcExpression.value === 'number' ||
+        cqfOrCalcExpression.value === null) {
+        // calculatedExpression value is null
+        if (cqfOrCalcExpression.value === null) {
+            return '';
+        }
+        // calculatedExpression value is string or number
+        return typeof cqfOrCalcExpression.value === 'string'
+            ? cqfOrCalcExpression.value
+            : cqfOrCalcExpression.value.toString();
+    }
+    return null;
+}
+export default useDisplayCqfAndCalculatedExpression;
+//# sourceMappingURL=useDisplayCqfAndCalculatedExpression.js.map

package/lib/hooks/useDisplayCqfAndCalculatedExpression.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useDisplayCqfAndCalculatedExpression.js","sourceRoot":"","sources":["../../src/hooks/useDisplayCqfAndCalculatedExpression.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAGlD,SAAS,oCAAoC,CAAC,KAAwB;;IACpE,MAAM,qBAAqB,GAAG,qBAAqB,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC;IAEhF,MAAM,mBAAmB,GAAG,MAAA,qBAAqB,CAAC,KAAK,CAAC,MAAM,CAAC,0CAAE,IAAI,CACnE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,YAAY,CACnC,CAAC;IAEF,IAAI,CAAC,mBAAmB,EAAE;QACxB,OAAO,IAAI,CAAC;KACb;IAED,IACE,OAAO,mBAAmB,CAAC,KAAK,KAAK,QAAQ;QAC7C,OAAO,mBAAmB,CAAC,KAAK,KAAK,QAAQ;QAC7C,mBAAmB,CAAC,KAAK,KAAK,IAAI,EAClC;QACA,qCAAqC;QACrC,IAAI,mBAAmB,CAAC,KAAK,KAAK,IAAI,EAAE;YACtC,OAAO,EAAE,CAAC;SACX;QAED,iDAAiD;QACjD,OAAO,OAAO,mBAAmB,CAAC,KAAK,KAAK,QAAQ;YAClD,CAAC,CAAC,mBAAmB,CAAC,KAAK;YAC3B,CAAC,CAAC,mBAAmB,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;KAC1C;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,eAAe,oCAAoC,CAAC"}

package/lib/utils/debounce.d.ts

@@ -1,2 +1,2 @@
-export declare const DEBOUNCE_DURATION = 250;
+export declare const DEBOUNCE_DURATION = 300;
 export declare const AUTOCOMPLETE_DEBOUNCE_DURATION = 300;

package/lib/utils/debounce.js

@@ -14,6 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export const DEBOUNCE_DURATION = 250;
+export const DEBOUNCE_DURATION = 300;
 export const AUTOCOMPLETE_DEBOUNCE_DURATION = 300;
 //# sourceMappingURL=debounce.js.map

package/lib/utils/getExpressionsFromItem.js

@@ -38,7 +38,8 @@ export function getEnableWhenExpression(qItem) {
  * @author Sean Fong
  */
 export function getCalculatedExpressions(qItem) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
+    // For questions - calculatedExpressions
     const calculatedExpressionsInItem = findCalculatedExpressionsInExtensions((_a = qItem.extension) !== null && _a !== void 0 ? _a : [])
         .map((calculatedExpression) => {
         var _a, _b;
@@ -48,7 +49,12 @@ export function getCalculatedExpressions(qItem) {
         });
     })
         .filter((calculatedExpression) => calculatedExpression.expression !== '');
-    const calculatedExpressionsInText = findCalculatedExpressionsInExtensions((_c = (_b = qItem._text) === null || _b === void 0 ? void 0 : _b.extension) !== null && _c !== void 0 ? _c : [])
+    // For item._text - calculatedExpressions and cqfExpressions
+    // FIXME this is a band aid addition, eventually we want to fully support cqfExpressions
+    const calculatedAndCqfExpressionsInText = [
+        ...findCqfExpressionsInExtensions((_c = (_b = qItem._text) === null || _b === void 0 ? void 0 : _b.extension) !== null && _c !== void 0 ? _c : []),
+        ...findCalculatedExpressionsInExtensions((_e = (_d = qItem._text) === null || _d === void 0 ? void 0 : _d.extension) !== null && _e !== void 0 ? _e : [])
+    ]
         .map((calculatedExpression) => {
         var _a, _b;
         return ({
@@ -57,7 +63,7 @@ export function getCalculatedExpressions(qItem) {
         });
     })
         .filter((calculatedExpression) => calculatedExpression.expression !== '');
-    return [...calculatedExpressionsInItem, ...calculatedExpressionsInText];
+    return [...calculatedExpressionsInItem, ...calculatedAndCqfExpressionsInText];
 }
 function findCalculatedExpressionsInExtensions(extensions) {
     return extensions.filter((extension) => {
@@ -67,6 +73,13 @@ function findCalculatedExpressionsInExtensions(extensions) {
             ((_a = extension.valueExpression) === null || _a === void 0 ? void 0 : _a.language) === 'text/fhirpath';
     });
 }
+function findCqfExpressionsInExtensions(extensions) {
+    return extensions.filter((extension) => {
+        var _a;
+        return extension.url === 'http://hl7.org/fhir/StructureDefinition/cqf-expression' &&
+            ((_a = extension.valueExpression) === null || _a === void 0 ? void 0 : _a.language) === 'text/fhirpath';
+    });
+}
 /**
  * Get answerExpression.valueExpression if its present in item
  *

package/lib/utils/getExpressionsFromItem.js.map

@@ -1 +1 @@
-{"version":3,"file":"getExpressionsFromItem.js","sourceRoot":"","sources":["../../src/utils/getExpressionsFromItem.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAKH;;;;GAIG;AACH,MAAM,UAAU,uBAAuB,CAAC,KAAwB;;IAC9D,MAAM,oBAAoB,GAAG,MAAA,KAAK,CAAC,SAAS,0CAAE,IAAI,CAChD,CAAC,SAAoB,EAAE,EAAE;;QACvB,OAAA,SAAS,CAAC,GAAG;YACX,uFAAuF;YACzF,CAAA,MAAA,SAAS,CAAC,eAAe,0CAAE,QAAQ,MAAK,eAAe,CAAA;KAAA,CAC1D,CAAC;IAEF,IAAI,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,eAAe,EAAE;QACzC,OAAO,oBAAoB,CAAC,eAAe,CAAC;KAC7C;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,wBAAwB,CAAC,KAAwB;;IAC/D,MAAM,2BAA2B,GAAG,qCAAqC,CAAC,MAAA,KAAK,CAAC,SAAS,mCAAI,EAAE,CAAC;SAC7F,GAAG,CACF,CAAC,oBAAoB,EAAwB,EAAE;;QAAC,OAAA,CAAC;YAC/C,UAAU,EAAE,MAAA,MAAA,oBAAoB,CAAC,eAAe,0CAAE,UAAU,mCAAI,EAAE;YAClE,IAAI,EAAE,MAAM;SACb,CAAC,CAAA;KAAA,CACH;SACA,MAAM,CAAC,CAAC,oBAAoB,EAAE,EAAE,CAAC,oBAAoB,CAAC,UAAU,KAAK,EAAE,CAAC,CAAC;IAE5E,MAAM,2BAA2B,GAAG,qCAAqC,CACvE,MAAA,MAAA,KAAK,CAAC,KAAK,0CAAE,SAAS,mCAAI,EAAE,CAC7B;SACE,GAAG,CACF,CAAC,oBAAoB,EAAwB,EAAE;;QAAC,OAAA,CAAC;YAC/C,UAAU,EAAE,MAAA,MAAA,oBAAoB,CAAC,eAAe,0CAAE,UAAU,mCAAI,EAAE;YAClE,IAAI,EAAE,YAAY;SACnB,CAAC,CAAA;KAAA,CACH;SACA,MAAM,CAAC,CAAC,oBAAoB,EAAE,EAAE,CAAC,oBAAoB,CAAC,UAAU,KAAK,EAAE,CAAC,CAAC;IAE5E,OAAO,CAAC,GAAG,2BAA2B,EAAE,GAAG,2BAA2B,CAAC,CAAC;AAC1E,CAAC;AAED,SAAS,qCAAqC,CAAC,UAAuB;IACpE,OAAO,UAAU,CAAC,MAAM,CACtB,CAAC,SAAS,EAAE,EAAE;;QACZ,OAAA,SAAS,CAAC,GAAG;YACX,uFAAuF;YACzF,CAAA,MAAA,SAAS,CAAC,eAAe,0CAAE,QAAQ,MAAK,eAAe,CAAA;KAAA,CAC1D,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CAAC,KAAwB;;IAC1D,MAAM,WAAW,GAAG,MAAA,KAAK,CAAC,SAAS,0CAAE,IAAI,CACvC,CAAC,SAAoB,EAAE,EAAE;;QACvB,OAAA,SAAS,CAAC,GAAG;YACX,mFAAmF;YACrF,CAAA,MAAA,SAAS,CAAC,eAAe,0CAAE,QAAQ,MAAK,eAAe,CAAA;KAAA,CAC1D,CAAC;IACF,IAAI,WAAW,EAAE;QACf,IAAI,WAAW,CAAC,eAAe,EAAE;YAC/B,OAAO,WAAW,CAAC,eAAe,CAAC;SACpC;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"getExpressionsFromItem.js","sourceRoot":"","sources":["../../src/utils/getExpressionsFromItem.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aehrc/smart-forms-renderer",
-  "version": "0.30.1",
+  "version": "0.30.2",
   "description": "FHIR Structured Data Captured (SDC) rendering engine for Smart Forms",
   "main": "lib/index.js",
   "scripts": {

package/src/components/FormComponents/ItemParts/ItemLabelText.tsx

@@ -22,7 +22,7 @@ import parse from 'html-react-parser';
 import Box from '@mui/material/Box';
 import ReactMarkdown from 'react-markdown';
 import Typography from '@mui/material/Typography';
-import useDisplayCalculatedExpression from '../../../hooks/useDisplayCalculatedExpression';
+import useDisplayCqfAndCalculatedExpression from '../../../hooks/useDisplayCqfAndCalculatedExpression';
 
 interface ItemLabelTextProps {
   qItem: QuestionnaireItem;
@@ -33,7 +33,7 @@ const ItemLabelText = memo(function ItemLabelText(props: ItemLabelTextProps) {
   const { qItem, readOnly } = props;
 
   // Use calculatedExpressionString if available
-  const calculatedExpressionString = useDisplayCalculatedExpression(qItem);
+  const calculatedExpressionString = useDisplayCqfAndCalculatedExpression(qItem);
   if (calculatedExpressionString) {
     return (
       <Typography color={readOnly ? 'text.disabled' : 'text.primary'} sx={{ mt: 0.25 }}>

package/src/hooks/{useDisplayCalculatedExpression.ts → useDisplayCqfAndCalculatedExpression.ts}

@@ -18,34 +18,34 @@
 import { useQuestionnaireStore } from '../stores';
 import type { QuestionnaireItem } from 'fhir/r4';
 
-function useDisplayCalculatedExpression(qItem: QuestionnaireItem): string | null {
+function useDisplayCqfAndCalculatedExpression(qItem: QuestionnaireItem): string | null {
   const calculatedExpressions = useQuestionnaireStore.use.calculatedExpressions();
 
-  const calcExpression = calculatedExpressions[qItem.linkId]?.find(
+  const cqfOrCalcExpression = calculatedExpressions[qItem.linkId]?.find(
     (exp) => exp.from === 'item._text'
   );
 
-  if (!calcExpression) {
+  if (!cqfOrCalcExpression) {
     return null;
   }
 
   if (
-    typeof calcExpression.value === 'string' ||
-    typeof calcExpression.value === 'number' ||
-    calcExpression.value === null
+    typeof cqfOrCalcExpression.value === 'string' ||
+    typeof cqfOrCalcExpression.value === 'number' ||
+    cqfOrCalcExpression.value === null
   ) {
     // calculatedExpression value is null
-    if (calcExpression.value === null) {
+    if (cqfOrCalcExpression.value === null) {
       return '';
     }
 
     // calculatedExpression value is string or number
-    return typeof calcExpression.value === 'string'
-      ? calcExpression.value
-      : calcExpression.value.toString();
+    return typeof cqfOrCalcExpression.value === 'string'
+      ? cqfOrCalcExpression.value
+      : cqfOrCalcExpression.value.toString();
   }
 
   return null;
 }
 
-export default useDisplayCalculatedExpression;
+export default useDisplayCqfAndCalculatedExpression;

package/src/stories/assets/questionnaires/QDisplay.ts

@@ -36,3 +36,80 @@ export const qDisplayBasic: Questionnaire = {
     }
   ]
 };
+
+export const qDisplayCalculation: Questionnaire = {
+  resourceType: 'Questionnaire',
+  id: 'DisplayCalculation',
+  name: 'DisplayCalculation',
+  title: 'Display Calculation',
+  version: '0.1.0',
+  status: 'draft',
+  publisher: 'AEHRC CSIRO',
+  date: '2024-05-01',
+  url: 'https://smartforms.csiro.au/docs/components/display/calculation',
+  extension: [
+    {
+      url: 'http://hl7.org/fhir/StructureDefinition/variable',
+      valueExpression: {
+        name: 'gender',
+        language: 'text/fhirpath',
+        expression: "item.where(linkId = 'gender-controller').answer.valueCoding.code"
+      }
+    }
+  ],
+  item: [
+    {
+      linkId: 'gender-controller',
+      text: 'Gender',
+      type: 'choice',
+      repeats: false,
+      answerOption: [
+        {
+          valueCoding: {
+            system: 'http://hl7.org/fhir/administrative-gender',
+            code: 'female',
+            display: 'Female'
+          }
+        },
+        {
+          valueCoding: {
+            system: 'http://hl7.org/fhir/administrative-gender',
+            code: 'male',
+            display: 'Male'
+          }
+        },
+        {
+          valueCoding: {
+            system: 'http://hl7.org/fhir/administrative-gender',
+            code: 'other',
+            display: 'Other'
+          }
+        },
+        {
+          valueCoding: {
+            system: 'http://hl7.org/fhir/administrative-gender',
+            code: 'unknown',
+            display: 'Unknown'
+          }
+        }
+      ]
+    },
+    {
+      linkId: 'gender-display',
+      type: 'display',
+      repeats: false,
+      _text: {
+        extension: [
+          {
+            url: 'http://hl7.org/fhir/StructureDefinition/cqf-expression',
+            valueExpression: {
+              language: 'text/fhirpath',
+              expression: "'Gender: '+ %gender"
+            }
+          }
+        ]
+      },
+      text: ''
+    }
+  ]
+};

package/src/stories/assets/questionnaires/index.ts

@@ -40,5 +40,3 @@ export * from './QBehaviorValueConstraints';
 export * from './QItemControlDisplay';
 export * from './QItemControlGroup';
 export * from './QItemControlQuestion';
-// export * from './QSingleItems';
-// export * from './QSingleItems';

package/src/stories/itemTypes/Display.stories.tsx

@@ -17,7 +17,7 @@
 
 import type { Meta, StoryObj } from '@storybook/react';
 import BuildFormWrapper from '../BuildFormWrapper';
-import { qDisplayBasic } from '../assets/questionnaires/QDisplay';
+import { qDisplayBasic, qDisplayCalculation } from '../assets/questionnaires/QDisplay';
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
 const meta = {
@@ -37,3 +37,9 @@ export const DisplayBasic: Story = {
     questionnaire: qDisplayBasic
   }
 };
+
+export const DisplayCalculation: Story = {
+  args: {
+    questionnaire: qDisplayCalculation
+  }
+};

package/src/utils/debounce.ts

@@ -15,6 +15,6 @@
  * limitations under the License.
  */
 
-export const DEBOUNCE_DURATION = 250;
+export const DEBOUNCE_DURATION = 300;
 
 export const AUTOCOMPLETE_DEBOUNCE_DURATION = 300;

package/src/utils/getExpressionsFromItem.ts

@@ -43,6 +43,7 @@ export function getEnableWhenExpression(qItem: QuestionnaireItem): Expression |
  * @author Sean Fong
  */
 export function getCalculatedExpressions(qItem: QuestionnaireItem): CalculatedExpression[] {
+  // For questions - calculatedExpressions
   const calculatedExpressionsInItem = findCalculatedExpressionsInExtensions(qItem.extension ?? [])
     .map(
       (calculatedExpression): CalculatedExpression => ({
@@ -52,9 +53,12 @@ export function getCalculatedExpressions(qItem: QuestionnaireItem): CalculatedEx
     )
     .filter((calculatedExpression) => calculatedExpression.expression !== '');
 
-  const calculatedExpressionsInText = findCalculatedExpressionsInExtensions(
-    qItem._text?.extension ?? []
-  )
+  // For item._text - calculatedExpressions and cqfExpressions
+  // FIXME this is a band aid addition, eventually we want to fully support cqfExpressions
+  const calculatedAndCqfExpressionsInText = [
+    ...findCqfExpressionsInExtensions(qItem._text?.extension ?? []),
+    ...findCalculatedExpressionsInExtensions(qItem._text?.extension ?? [])
+  ]
     .map(
       (calculatedExpression): CalculatedExpression => ({
         expression: calculatedExpression.valueExpression?.expression ?? '',
@@ -63,7 +67,7 @@ export function getCalculatedExpressions(qItem: QuestionnaireItem): CalculatedEx
     )
     .filter((calculatedExpression) => calculatedExpression.expression !== '');
 
-  return [...calculatedExpressionsInItem, ...calculatedExpressionsInText];
+  return [...calculatedExpressionsInItem, ...calculatedAndCqfExpressionsInText];
 }
 
 function findCalculatedExpressionsInExtensions(extensions: Extension[]): Extension[] {
@@ -75,6 +79,14 @@ function findCalculatedExpressionsInExtensions(extensions: Extension[]): Extensi
   );
 }
 
+function findCqfExpressionsInExtensions(extensions: Extension[]): Extension[] {
+  return extensions.filter(
+    (extension) =>
+      extension.url === 'http://hl7.org/fhir/StructureDefinition/cqf-expression' &&
+      extension.valueExpression?.language === 'text/fhirpath'
+  );
+}
+
 /**
  * Get answerExpression.valueExpression if its present in item
  *

package/storybook.log

@@ -1,6 +0,0 @@
-npm ERR! code ETARGET
-npm ERR! notarget No matching version found for @storybook/addon-queryparams@^8.0.10.
-npm ERR! notarget In most cases you or one of your dependencies are requesting
-npm ERR! notarget a package version that doesn't exist.
-
-npm ERR! A complete log of this run can be found in: /Users/fon026/.npm/_logs/2024-05-17T03_53_47_310Z-debug-0.log