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

package/lib/utils/parameterisedValueSets.js

@@ -1,25 +1,15 @@
-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 getBindingParameter(bindingParamExtension) {
-    var _a, _b, _c, _d, _e;
-    const paramName = (_b = (_a = bindingParamExtension.extension) === null || _a === void 0 ? void 0 : _a.find((ext) => ext.url === 'name')) === null || _b === void 0 ? void 0 : _b.valueString;
-    const paramExpression = (_c = bindingParamExtension.extension) === null || _c === void 0 ? void 0 : _c.find((ext) => ext.url === 'expression');
+    const paramName = bindingParamExtension.extension?.find((ext) => ext.url === 'name')?.valueString;
+    const paramExpression = bindingParamExtension.extension?.find((ext) => ext.url === 'expression');
     if (!paramName || !paramExpression) {
         return null;
     }
     // extension:expression has a valueExpression
-    if (((_d = paramExpression.valueExpression) === null || _d === void 0 ? void 0 : _d.expression) &&
-        ((_e = paramExpression.valueExpression) === null || _e === void 0 ? void 0 : _e.language) === 'text/fhirpath') {
+    if (paramExpression.valueExpression?.expression &&
+        paramExpression.valueExpression?.language === 'text/fhirpath') {
         return {
             name: paramName,
             value: '',
@@ -36,7 +26,6 @@ export function getBindingParameter(bindingParamExtension) {
     return null;
 }
 export function getBindingParameters(qItem, initialValueSetUrl) {
-    var _a, _b;
     if (!qItem._answerValueSet) {
         return [];
     }
@@ -44,10 +33,10 @@ export function getBindingParameters(qItem, initialValueSetUrl) {
     if (initialValueSetUrl.startsWith('#')) {
         return [];
     }
-    const bindingParameterExtensions = ((_b = (_a = qItem._answerValueSet) === null || _a === void 0 ? void 0 : _a.extension) === null || _b === void 0 ? void 0 : _b.filter((ext) => ext.url === 'http://hl7.org/fhir/tools/StructureDefinition/binding-parameter')) || [];
+    const bindingParameterExtensions = qItem._answerValueSet?.extension?.filter((ext) => ext.url === 'http://hl7.org/fhir/tools/StructureDefinition/binding-parameter') || [];
     const bindingParameters = [];
     for (const bindingParameterExtension of bindingParameterExtensions) {
-        if (bindingParameterExtension === null || bindingParameterExtension === void 0 ? void 0 : bindingParameterExtension.extension) {
+        if (bindingParameterExtension?.extension) {
             const bindingParameter = getBindingParameter(bindingParameterExtension);
             if (bindingParameter) {
                 bindingParameters.push(bindingParameter);
@@ -64,124 +53,121 @@ export function addBindingParametersToValueSetUrl(valueSetUrl, bindingParameters
     }
     return valueSetUrl;
 }
-export function evaluateInitialDynamicValueSets(params) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { initialResponse, initialResponseItemMap, processedValueSets, variables, existingFhirPathContext, terminologyServerUrl } = params;
-        let { fhirPathTerminologyCache } = params;
-        const hasDynamicEntries = Object.values(processedValueSets).some((valueSet) => valueSet.isDynamic);
-        if (!hasDynamicEntries) {
-            return {
-                initialProcessedValueSets: processedValueSets,
-                updatedFhirPathContext: existingFhirPathContext,
-                fhirPathTerminologyCache
-            };
+export async function evaluateInitialDynamicValueSets(params) {
+    const { initialResponse, initialResponseItemMap, processedValueSets, variables, existingFhirPathContext, terminologyServerUrl } = params;
+    let { fhirPathTerminologyCache } = params;
+    const hasDynamicEntries = Object.values(processedValueSets).some((valueSet) => valueSet.isDynamic);
+    if (!hasDynamicEntries) {
+        return {
+            initialProcessedValueSets: processedValueSets,
+            updatedFhirPathContext: existingFhirPathContext,
+            fhirPathTerminologyCache
+        };
+    }
+    const fhirPathEvalResult = await createFhirPathContext(initialResponse, initialResponseItemMap, variables, existingFhirPathContext, fhirPathTerminologyCache, terminologyServerUrl);
+    const updatedFhirPathContext = fhirPathEvalResult.fhirPathContext;
+    fhirPathTerminologyCache = fhirPathEvalResult.fhirPathTerminologyCache;
+    for (const key in processedValueSets) {
+        const processedValueSet = processedValueSets[key];
+        if (!processedValueSet.isDynamic) {
+            continue;
         }
-        const fhirPathEvalResult = yield createFhirPathContext(initialResponse, initialResponseItemMap, variables, existingFhirPathContext, fhirPathTerminologyCache, terminologyServerUrl);
-        const updatedFhirPathContext = fhirPathEvalResult.fhirPathContext;
-        fhirPathTerminologyCache = fhirPathEvalResult.fhirPathTerminologyCache;
-        for (const key in processedValueSets) {
-            const processedValueSet = processedValueSets[key];
-            if (!processedValueSet.isDynamic) {
-                continue;
-            }
-            for (const bindingParameter of processedValueSet.bindingParameters) {
-                if (bindingParameter.fhirPathExpression) {
-                    const cacheKey = JSON.stringify(bindingParameter.fhirPathExpression); // Use expression as cache key
-                    if (fhirPathTerminologyCache[cacheKey]) {
-                        continue;
-                    }
-                    try {
-                        const fhirPathResult = fhirpath.evaluate({}, bindingParameter.fhirPathExpression, updatedFhirPathContext, fhirpath_r4_model, {
-                            async: true,
-                            terminologyUrl: terminologyServerUrl
-                        });
-                        const result = yield handleFhirPathResult(fhirPathResult);
-                        // If fhirPathResult is an async terminology call, cache the result
-                        if (fhirPathResult instanceof Promise) {
-                            fhirPathTerminologyCache[cacheKey] = result;
-                        }
-                        /*
-                         * Update processedValueSet.updatableValueSetUrl (add or remove p-param)
-                         * Only update when current processedValueSet.updatableValueSetUrl value is different from the result, otherwise it will result in an infinite loop as per issue #733
-                         */
-                        // Add p-param if result exists, is string, and is different from current value
-                        const hasNewPParam = result.length > 0 &&
-                            typeof result[0] === 'string' &&
-                            bindingParameter.value !== result[0];
-                        // Remove p-param if result is empty, and current value is not an empty string
-                        const toRemovePParam = result.length === 0 && bindingParameter.value !== '';
-                        if (hasNewPParam || toRemovePParam) {
-                            bindingParameter.value = hasNewPParam ? result[0] : '';
-                            processedValueSet.updatableValueSetUrl = addBindingParametersToValueSetUrl(processedValueSet.initialValueSetUrl, processedValueSet.bindingParameters);
-                        }
+        for (const bindingParameter of processedValueSet.bindingParameters) {
+            if (bindingParameter.fhirPathExpression) {
+                if (isExpressionCached(bindingParameter.fhirPathExpression, fhirPathTerminologyCache)) {
+                    continue;
+                }
+                try {
+                    const fhirPathResult = fhirpath.evaluate({}, bindingParameter.fhirPathExpression, updatedFhirPathContext, fhirpath_r4_model, {
+                        async: true,
+                        terminologyUrl: terminologyServerUrl
+                    });
+                    const result = await handleFhirPathResult(fhirPathResult);
+                    // If fhirPathResult is an async terminology call, cache the result
+                    if (fhirPathResult instanceof Promise) {
+                        cacheTerminologyResult(bindingParameter.fhirPathExpression, result, fhirPathTerminologyCache);
                     }
-                    catch (e) {
-                        console.warn(e.message, `Dynamic ValueSets Key: ${key}\nExpression: ${bindingParameter.fhirPathExpression}`);
+                    /*
+                     * Update processedValueSet.updatableValueSetUrl (add or remove p-param)
+                     * Only update when current processedValueSet.updatableValueSetUrl value is different from the result, otherwise it will result in an infinite loop as per issue #733
+                     */
+                    // Add p-param if result exists, is string, and is different from current value
+                    const hasNewPParam = result.length > 0 &&
+                        typeof result[0] === 'string' &&
+                        bindingParameter.value !== result[0];
+                    // Remove p-param if result is empty, and current value is not an empty string
+                    const toRemovePParam = result.length === 0 && bindingParameter.value !== '';
+                    if (hasNewPParam || toRemovePParam) {
+                        bindingParameter.value = hasNewPParam ? result[0] : '';
+                        processedValueSet.updatableValueSetUrl = addBindingParametersToValueSetUrl(processedValueSet.initialValueSetUrl, processedValueSet.bindingParameters);
                     }
                 }
+                catch (e) {
+                    console.warn(e.message, `Dynamic ValueSets Key: ${key}\nExpression: ${bindingParameter.fhirPathExpression}`);
+                }
             }
         }
-        return {
-            initialProcessedValueSets: processedValueSets,
-            updatedFhirPathContext,
-            fhirPathTerminologyCache
-        };
-    });
+    }
+    return {
+        initialProcessedValueSets: processedValueSets,
+        updatedFhirPathContext,
+        fhirPathTerminologyCache
+    };
 }
-export function evaluateDynamicValueSets(fhirPathContext, fhirPathTerminologyCache, processedValueSets, terminologyServerUrl) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let isUpdated = false;
-        let computedNewAnswers = {};
-        for (const key in processedValueSets) {
-            const processedValueSet = processedValueSets[key];
-            if (!processedValueSet.isDynamic) {
-                continue;
-            }
-            for (const bindingParameter of processedValueSet.bindingParameters) {
-                if (bindingParameter.fhirPathExpression) {
-                    const cacheKey = JSON.stringify(bindingParameter.fhirPathExpression); // Use expression as cache key
-                    if (fhirPathTerminologyCache[cacheKey]) {
-                        continue;
-                    }
-                    try {
-                        const fhirPathResult = fhirpath.evaluate({}, bindingParameter.fhirPathExpression, fhirPathContext, fhirpath_r4_model, {
-                            async: true,
-                            terminologyUrl: terminologyServerUrl
-                        });
-                        const result = yield handleFhirPathResult(fhirPathResult);
-                        // If fhirPathResult is an async terminology call, cache the result
-                        if (fhirPathResult instanceof Promise) {
-                            fhirPathTerminologyCache[cacheKey] = result;
-                        }
-                        /*
-                         * Update processedValueSet.updatableValueSetUrl (add or remove p-param)
-                         * Only update when current processedValueSet.updatableValueSetUrl value is different from the result, otherwise it will result in an infinite loop as per issue #733
-                         */
-                        // Add p-param if result exists, is string, and is different from current value
-                        const hasNewPParam = result.length > 0 &&
-                            typeof result[0] === 'string' &&
-                            bindingParameter.value !== result[0];
-                        // Remove p-param if result is empty, and current value is not an empty string
-                        const toRemovePParam = result.length === 0 && bindingParameter.value !== '';
-                        if (hasNewPParam || toRemovePParam) {
-                            isUpdated = true;
-                            bindingParameter.value = hasNewPParam ? result[0] : '';
-                            processedValueSet.updatableValueSetUrl = addBindingParametersToValueSetUrl(processedValueSet.initialValueSetUrl, processedValueSet.bindingParameters);
-                            computedNewAnswers = Object.assign(Object.assign({}, computedNewAnswers), getComputedAnswerUpdates(processedValueSet.linkIds));
-                        }
+export async function evaluateDynamicValueSets(fhirPathContext, fhirPathTerminologyCache, processedValueSets, terminologyServerUrl) {
+    let isUpdated = false;
+    let computedNewAnswers = {};
+    for (const key in processedValueSets) {
+        const processedValueSet = processedValueSets[key];
+        if (!processedValueSet.isDynamic) {
+            continue;
+        }
+        for (const bindingParameter of processedValueSet.bindingParameters) {
+            if (bindingParameter.fhirPathExpression) {
+                if (isExpressionCached(bindingParameter.fhirPathExpression, fhirPathTerminologyCache)) {
+                    continue;
+                }
+                try {
+                    const fhirPathResult = fhirpath.evaluate({}, bindingParameter.fhirPathExpression, fhirPathContext, fhirpath_r4_model, {
+                        async: true,
+                        terminologyUrl: terminologyServerUrl
+                    });
+                    const result = await handleFhirPathResult(fhirPathResult);
+                    // If fhirPathResult is an async terminology call, cache the result
+                    if (fhirPathResult instanceof Promise) {
+                        cacheTerminologyResult(bindingParameter.fhirPathExpression, result, fhirPathTerminologyCache);
                     }
-                    catch (e) {
-                        console.warn(e.message, `Dynamic ValueSets Key: ${key}\nExpression: ${bindingParameter.fhirPathExpression}`);
+                    /*
+                     * Update processedValueSet.updatableValueSetUrl (add or remove p-param)
+                     * Only update when current processedValueSet.updatableValueSetUrl value is different from the result, otherwise it will result in an infinite loop as per issue #733
+                     */
+                    // Add p-param if result exists, is string, and is different from current value
+                    const hasNewPParam = result.length > 0 &&
+                        typeof result[0] === 'string' &&
+                        bindingParameter.value !== result[0];
+                    // Remove p-param if result is empty, and current value is not an empty string
+                    const toRemovePParam = result.length === 0 && bindingParameter.value !== '';
+                    if (hasNewPParam || toRemovePParam) {
+                        isUpdated = true;
+                        bindingParameter.value = hasNewPParam ? result[0] : '';
+                        processedValueSet.updatableValueSetUrl = addBindingParametersToValueSetUrl(processedValueSet.initialValueSetUrl, processedValueSet.bindingParameters);
+                        computedNewAnswers = {
+                            ...computedNewAnswers,
+                            ...getComputedAnswerUpdates(processedValueSet.linkIds)
+                        };
                     }
                 }
+                catch (e) {
+                    console.warn(e.message, `Dynamic ValueSets Key: ${key}\nExpression: ${bindingParameter.fhirPathExpression}`);
+                }
             }
         }
-        return {
-            processedValueSetsIsUpdated: isUpdated,
-            updatedProcessedValueSets: processedValueSets,
-            computedNewAnswers
-        };
-    });
+    }
+    return {
+        isUpdated,
+        updatedProcessedValueSets: processedValueSets,
+        computedNewAnswers
+    };
 }
 // For parameterised valueSets, if the valueSet options is updated, clear the answers
 function getComputedAnswerUpdates(linkIds) {

package/lib/utils/parameterisedValueSets.js.map

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

package/lib/utils/populateContexts.js

@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 export function isLaunchContext(extension) {
-    var _a, _b;
     const hasLaunchContextName = extension.url ===
         'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext' &&
-        !!((_a = extension.extension) === null || _a === void 0 ? void 0 : _a.find((ext) => ext.url === 'name' &&
+        !!extension.extension?.find((ext) => ext.url === 'name' &&
             (ext.valueId ||
                 (ext.valueCoding &&
                     (ext.valueCoding.code === 'patient' ||
@@ -26,12 +25,12 @@ export function isLaunchContext(extension) {
                         ext.valueCoding.code === 'location' ||
                         ext.valueCoding.code === 'user' ||
                         ext.valueCoding.code === 'study' ||
-                        ext.valueCoding.code === 'sourceQueries')))));
-    const hasLaunchContextType = !!((_b = extension.extension) === null || _b === void 0 ? void 0 : _b.find((ext) => ext.url === 'type' &&
+                        ext.valueCoding.code === 'sourceQueries'))));
+    const hasLaunchContextType = !!extension.extension?.find((ext) => ext.url === 'type' &&
         ext.valueCode &&
         (ext.valueCode === 'Patient' ||
             ext.valueCode === 'Practitioner' ||
-            ext.valueCode === 'Encounter')));
+            ext.valueCode === 'Encounter'));
     return (extension.url ===
         'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext' &&
         hasLaunchContextName &&

package/lib/utils/populateContexts.js.map

@@ -1 +1 @@
-{"version":3,"file":"populateContexts.js","sourceRoot":"","sources":["../../src/utils/populateContexts.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAKH,MAAM,UAAU,eAAe,CAAC,SAAoB;;IAClD,MAAM,oBAAoB,GACxB,SAAS,CAAC,GAAG;QACX,gFAAgF;QAClF,CAAC,CAAC,CAAA,MAAA,SAAS,CAAC,SAAS,0CAAE,IAAI,CACzB,CAAC,GAAG,EAAE,EAAE,CACN,GAAG,CAAC,GAAG,KAAK,MAAM;YAClB,CAAC,GAAG,CAAC,OAAO;gBACV,CAAC,GAAG,CAAC,WAAW;oBACd,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,KAAK,SAAS;wBACjC,GAAG,CAAC,WAAW,CAAC,IAAI,KAAK,WAAW;wBACpC,GAAG,CAAC,WAAW,CAAC,IAAI,KAAK,UAAU;wBACnC,GAAG,CAAC,WAAW,CAAC,IAAI,KAAK,MAAM;wBAC/B,GAAG,CAAC,WAAW,CAAC,IAAI,KAAK,OAAO;wBAChC,GAAG,CAAC,WAAW,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC,CAAC,CACpD,CAAA,CAAC;IAEJ,MAAM,oBAAoB,GAAG,CAAC,CAAC,CAAA,MAAA,SAAS,CAAC,SAAS,0CAAE,IAAI,CACtD,CAAC,GAAG,EAAE,EAAE,CACN,GAAG,CAAC,GAAG,KAAK,MAAM;QAClB,GAAG,CAAC,SAAS;QACb,CAAC,GAAG,CAAC,SAAS,KAAK,SAAS;YAC1B,GAAG,CAAC,SAAS,KAAK,cAAc;YAChC,GAAG,CAAC,SAAS,KAAK,WAAW,CAAC,CACnC,CAAA,CAAC;IAEF,OAAO,CACL,SAAS,CAAC,GAAG;QACX,gFAAgF;QAClF,oBAAoB;QACpB,oBAAoB,CACrB,CAAC;AACJ,CAAC"}
+{"version":3,"file":"populateContexts.js","sourceRoot":"","sources":["../../src/utils/populateContexts.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAKH,MAAM,UAAU,eAAe,CAAC,SAAoB;IAClD,MAAM,oBAAoB,GACxB,SAAS,CAAC,GAAG;QACX,gFAAgF;QAClF,CAAC,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CACzB,CAAC,GAAG,EAAE,EAAE,CACN,GAAG,CAAC,GAAG,KAAK,MAAM;YAClB,CAAC,GAAG,CAAC,OAAO;gBACV,CAAC,GAAG,CAAC,WAAW;oBACd,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,KAAK,SAAS;wBACjC,GAAG,CAAC,WAAW,CAAC,IAAI,KAAK,WAAW;wBACpC,GAAG,CAAC,WAAW,CAAC,IAAI,KAAK,UAAU;wBACnC,GAAG,CAAC,WAAW,CAAC,IAAI,KAAK,MAAM;wBAC/B,GAAG,CAAC,WAAW,CAAC,IAAI,KAAK,OAAO;wBAChC,GAAG,CAAC,WAAW,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC,CAAC,CACpD,CAAC;IAEJ,MAAM,oBAAoB,GAAG,CAAC,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CACtD,CAAC,GAAG,EAAE,EAAE,CACN,GAAG,CAAC,GAAG,KAAK,MAAM;QAClB,GAAG,CAAC,SAAS;QACb,CAAC,GAAG,CAAC,SAAS,KAAK,SAAS;YAC1B,GAAG,CAAC,SAAS,KAAK,cAAc;YAChC,GAAG,CAAC,SAAS,KAAK,WAAW,CAAC,CACnC,CAAC;IAEF,OAAO,CACL,SAAS,CAAC,GAAG;QACX,gFAAgF;QAClF,oBAAoB;QACpB,oBAAoB,CACrB,CAAC;AACJ,CAAC"}

package/lib/utils/qItem.js

@@ -14,17 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 import { getChoiceControlType } from './choice';
 import { ChoiceItemControl, OpenChoiceItemControl } from '../interfaces/choice.enum';
 import { getOpenChoiceControlType } from './openChoice';
@@ -80,8 +69,7 @@ export function isCheckbox(qItem) {
     return getChoiceControlType(qItem) === ChoiceItemControl.Checkbox;
 }
 export function getXHtmlStringFromQuestionnaire(questionnaire) {
-    var _a, _b;
-    const itemControl = (_b = (_a = questionnaire._title) === null || _a === void 0 ? void 0 : _a.extension) === null || _b === void 0 ? void 0 : _b.find((extension) => extension.url === 'http://hl7.org/fhir/StructureDefinition/rendering-xhtml');
+    const itemControl = questionnaire._title?.extension?.find((extension) => extension.url === 'http://hl7.org/fhir/StructureDefinition/rendering-xhtml');
     if (itemControl) {
         if (itemControl.valueString) {
             return itemControl.valueString;
@@ -108,7 +96,7 @@ export function getLinkIdPartialItemMap(questionnaire) {
  */
 export function getLinkIdPartialTuplesFromItemRecursive(qItem) {
     const tuples = [];
-    const { item } = qItem, partial = __rest(qItem, ["item"]);
+    const { item, ...partial } = qItem;
     if (qItem.linkId) {
         tuples.push([qItem.linkId, partial]);
     }
@@ -120,11 +108,13 @@ export function getLinkIdPartialTuplesFromItemRecursive(qItem) {
     return tuples;
 }
 function getPreferredTerminologyServer(element) {
-    var _a, _b, _c, _d;
-    const preferredTerminologyServerExtension = (_a = element.extension) === null || _a === void 0 ? void 0 : _a.find((ext) => ext.url ===
+    const preferredTerminologyServerExtension = element.extension?.find((ext) => ext.url ===
         'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-preferredTerminologyServer');
     if (preferredTerminologyServerExtension) {
-        return ((_d = (_c = (_b = preferredTerminologyServerExtension.valueUrl) !== null && _b !== void 0 ? _b : preferredTerminologyServerExtension.valueUri) !== null && _c !== void 0 ? _c : preferredTerminologyServerExtension.valueString) !== null && _d !== void 0 ? _d : null);
+        return (preferredTerminologyServerExtension.valueUrl ??
+            preferredTerminologyServerExtension.valueUri ??
+            preferredTerminologyServerExtension.valueString ??
+            null);
     }
     return null;
 }
@@ -140,12 +130,11 @@ export function getLinkIdPreferredTerminologyServerTuples(questionnaire) {
     return linkIds;
 }
 function getLinkIdPreferredTerminologyServerTuplesRecursive(qItem, parentPreferredTerminologyServer) {
-    var _a, _b;
     const linkIds = [];
     let preferredTerminologyServer = null;
     if (qItem.linkId) {
         preferredTerminologyServer =
-            (_b = (_a = getPreferredTerminologyServer(qItem)) !== null && _a !== void 0 ? _a : parentPreferredTerminologyServer) !== null && _b !== void 0 ? _b : null;
+            getPreferredTerminologyServer(qItem) ?? parentPreferredTerminologyServer ?? null;
         if (preferredTerminologyServer) {
             linkIds.push([qItem.linkId, preferredTerminologyServer]);
         }
@@ -161,8 +150,7 @@ function valueCodeIsCollapsibleType(valueCode) {
     return valueCode === 'default-open' || valueCode === 'default-closed';
 }
 export function getGroupCollapsible(qItem) {
-    var _a;
-    const collapsibleExtension = (_a = qItem.extension) === null || _a === void 0 ? void 0 : _a.find((ext) => ext.url === 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-collapsible');
+    const collapsibleExtension = qItem.extension?.find((ext) => ext.url === 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-collapsible');
     if (collapsibleExtension) {
         if (collapsibleExtension.valueCode &&
             valueCodeIsCollapsibleType(collapsibleExtension.valueCode)) {

package/lib/utils/qItem.js.map

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

package/lib/utils/qrItem.js

@@ -33,7 +33,7 @@ export function removeNoAnswerQrItem(qrItem) {
                 itemsCleaned.push(QrItemCleaned);
             }
         });
-        return itemsCleaned.length > 0 ? Object.assign(Object.assign({}, qrItem), { item: itemsCleaned }) : undefined;
+        return itemsCleaned.length > 0 ? { ...qrItem, item: itemsCleaned } : undefined;
     }
     // remove starting or trailing whitespace
     if (qrItem['answer'] && qrItem['answer'][0]['valueString']) {
@@ -76,7 +76,6 @@ export function createEmptyQrItem(qItem, answerKey) {
  * @author Sean Fong
  */
 export function updateQrItemsInGroup(newQrItem, newQrRepeatGroup, questionnaireResponseOrQrItem, qItemsIndexMap) {
-    var _a, _b;
     let qrItems = questionnaireResponseOrQrItem.item;
     if (!qrItems) {
         qrItems = [];
@@ -105,7 +104,7 @@ export function updateQrItemsInGroup(newQrItem, newQrRepeatGroup, questionnaireR
             // Replace or delete qrItem at its supposed position if its index is already present within qrGroup
             if (newQrItemIndex === qrItemsRealIndexArr[i]) {
                 // newQrItem has answer value
-                if (((_a = newQrItem.item) === null || _a === void 0 ? void 0 : _a.length) || ((_b = newQrItem.answer) === null || _b === void 0 ? void 0 : _b.length)) {
+                if (newQrItem.item?.length || newQrItem.answer?.length) {
                     qrItems[i] = newQrItem;
                     break;
                 }

package/lib/utils/qrItem.js.map

@@ -1 +1 @@
-{"version":3,"file":"qrItem.js","sourceRoot":"","sources":["../../src/utils/qrItem.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"qrItem.js","sourceRoot":"","sources":["../../src/utils/qrItem.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAKH,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAEtD;;;;;;GAMG;AACH,MAAM,UAAU,oBAAoB,CAClC,MAAiC;IAEjC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC;IAC1B,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,MAAM,YAAY,GAAgC,EAAE,CAAC;QAErD,8BAA8B;QAC9B,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACrB,MAAM,aAAa,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC;YACjD,IAAI,aAAa,EAAE,CAAC;gBAClB,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YACnC,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IACjF,CAAC;IAED,yCAAyC;IACzC,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC;QAC3D,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,IAAI,EAAE,CAAC;IACjF,CAAC;IAED,gDAAgD;IAChD,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;AAC/C,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAAC,KAAwB;IACzD,OAAO;QACL,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,IAAI,EAAE,EAAE;KACT,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAC/B,KAAwB,EACxB,SAA6B;IAE7B,MAAM,MAAM,GAA8B;QACxC,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,IAAI,EAAE,KAAK,CAAC,IAAI;KACjB,CAAC;IAEF,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;IACtC,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,oBAAoB,CAClC,SAA2C,EAC3C,gBAAsC,EACtC,6BAAgF,EAChF,cAAsC;IAEtC,IAAI,OAAO,GAAG,6BAA6B,CAAC,IAAI,CAAC;IACjD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,GAAG,EAAE,CAAC;IACf,CAAC;IAED,kEAAkE;IAClE,mGAAmG;IACnG,MAAM,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;IAEnF,IAAI,SAAS,IAAI,SAAS,CAAC,MAAM,IAAI,cAAc,EAAE,CAAC;QACpD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACxB,OAAO;QACT,CAAC;QAED,qDAAqD;QACrD,MAAM,cAAc,GAAG,cAAc,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACxD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,mBAAmB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACpD,0EAA0E;YAC1E,IAAI,cAAc,GAAG,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC5C,IAAI,CAAC,KAAK,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACzC,6GAA6G;oBAC7G,IAAI,sBAAsB,CAAC,SAAS,CAAC,EAAE,CAAC;wBACtC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;oBAC1B,CAAC;gBACH,CAAC;gBACD,SAAS;YACX,CAAC;YAED,mGAAmG;YACnG,IAAI,cAAc,KAAK,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC9C,6BAA6B;gBAC7B,IAAI,SAAS,CAAC,IAAI,EAAE,MAAM,IAAI,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;oBACvD,OAAO,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;oBACvB,MAAM;gBACR,CAAC;gBAED,gCAAgC;gBAChC,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBACrB,MAAM;YACR,CAAC;YAED,iFAAiF;YACjF,IAAI,cAAc,GAAG,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC5C,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC;gBAChC,MAAM;YACR,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,gBAAgB,IAAI,gBAAgB,CAAC,MAAM,IAAI,cAAc,EAAE,CAAC;QAClE,MAAM,UAAU,GAAG,gBAAgB,CAAC,OAAO,CAAC;QAC5C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;YAC5B,OAAO;QACT,CAAC;QAED,sDAAsD;QACtD,MAAM,cAAc,GAAG,cAAc,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAC/D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,mBAAmB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACpD,0EAA0E;YAC1E,IAAI,cAAc,GAAG,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC5C,IAAI,CAAC,KAAK,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACzC,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;gBAC9B,CAAC;gBACD,SAAS;YACX,CAAC;YAED,mGAAmG;YACnG,IAAI,cAAc,KAAK,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC9C,6EAA6E;gBAC7E,IAAI,oBAAoB,GAAG,CAAC,CAAC;gBAC7B,OAAO,cAAc,KAAK,mBAAmB,CAAC,CAAC,GAAG,oBAAoB,CAAC,EAAE,CAAC;oBACxE,oBAAoB,EAAE,CAAC;gBACzB,CAAC;gBAED,+DAA+D;gBAC/D,IAAI,UAAU,CAAC,MAAM,KAAK,oBAAoB,EAAE,CAAC;oBAC/C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;wBAC3C,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;oBACjC,CAAC;oBACD,MAAM;gBACR,CAAC;gBAED,IAAI,UAAU,CAAC,MAAM,GAAG,oBAAoB,EAAE,CAAC;oBAC7C,gEAAgE;oBAChE,0EAA0E;oBAC1E,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,oBAAoB,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;wBAC1E,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;4BACV,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;wBACjC,CAAC;6BAAM,CAAC;4BACN,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;wBAC1C,CAAC;oBACH,CAAC;oBACD,MAAM;gBACR,CAAC;gBAED,IAAI,UAAU,CAAC,MAAM,GAAG,oBAAoB,EAAE,CAAC;oBAC7C,sFAAsF;oBACtF,gEAAgE;oBAChE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,oBAAoB,EAAE,CAAC,EAAE,EAAE,CAAC;wBAC9C,IAAI,CAAC,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;4BAC/B,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;wBACjC,CAAC;6BAAM,CAAC;4BACN,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;wBAC3B,CAAC;oBACH,CAAC;oBACD,MAAM;gBACR,CAAC;YACH,CAAC;YAED,iFAAiF;YACjF,IAAI,cAAc,GAAG,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC5C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;oBAC3C,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC1C,CAAC;gBACD,MAAM;YACR,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}

package/lib/utils/quantity.js

@@ -20,17 +20,16 @@ export function stringIsComparator(str) {
     return str === '<' || str === '<=' || str === '>=' || str === '>';
 }
 export function createQuantityItemAnswer(precision, parsedNewInput, comparatorInput, unitInput, answerKey) {
-    var _a, _b, _c, _d, _e, _f;
     if (precision) {
         return [
             {
                 id: answerKey,
                 valueQuantity: {
                     value: parseDecimalStringToFloat(parsedNewInput, precision),
-                    comparator: comparatorInput !== null && comparatorInput !== void 0 ? comparatorInput : undefined,
-                    unit: (_a = unitInput === null || unitInput === void 0 ? void 0 : unitInput.valueCoding) === null || _a === void 0 ? void 0 : _a.display,
-                    system: (_b = unitInput === null || unitInput === void 0 ? void 0 : unitInput.valueCoding) === null || _b === void 0 ? void 0 : _b.system,
-                    code: (_c = unitInput === null || unitInput === void 0 ? void 0 : unitInput.valueCoding) === null || _c === void 0 ? void 0 : _c.code
+                    comparator: comparatorInput ?? undefined,
+                    unit: unitInput?.valueCoding?.display,
+                    system: unitInput?.valueCoding?.system,
+                    code: unitInput?.valueCoding?.code
                 }
             }
         ];
@@ -40,10 +39,10 @@ export function createQuantityItemAnswer(precision, parsedNewInput, comparatorIn
             id: answerKey,
             valueQuantity: {
                 value: parseFloat(parsedNewInput),
-                comparator: comparatorInput !== null && comparatorInput !== void 0 ? comparatorInput : undefined,
-                unit: (_d = unitInput === null || unitInput === void 0 ? void 0 : unitInput.valueCoding) === null || _d === void 0 ? void 0 : _d.display,
-                system: (_e = unitInput === null || unitInput === void 0 ? void 0 : unitInput.valueCoding) === null || _e === void 0 ? void 0 : _e.system,
-                code: (_f = unitInput === null || unitInput === void 0 ? void 0 : unitInput.valueCoding) === null || _f === void 0 ? void 0 : _f.code
+                comparator: comparatorInput ?? undefined,
+                unit: unitInput?.valueCoding?.display,
+                system: unitInput?.valueCoding?.system,
+                code: unitInput?.valueCoding?.code
             }
         }
     ];

package/lib/utils/quantity.js.map

@@ -1 +1 @@
-{"version":3,"file":"quantity.js","sourceRoot":"","sources":["../../src/utils/quantity.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAOH,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAE1D,MAAM,CAAC,MAAM,mBAAmB,GAA6B,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;AAEpF,MAAM,UAAU,kBAAkB,CAAC,GAAuB;IACxD,OAAO,GAAG,KAAK,GAAG,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,GAAG,CAAC;AACpE,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,SAAwB,EACxB,cAAsB,EACtB,eAA8C,EAC9C,SAA+C,EAC/C,SAA6B;;IAE7B,IAAI,SAAS,EAAE,CAAC;QACd,OAAO;YACL;gBACE,EAAE,EAAE,SAAS;gBACb,aAAa,EAAE;oBACb,KAAK,EAAE,yBAAyB,CAAC,cAAc,EAAE,SAAS,CAAC;oBAC3D,UAAU,EAAE,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,SAAS;oBACxC,IAAI,EAAE,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,WAAW,0CAAE,OAAO;oBACrC,MAAM,EAAE,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,WAAW,0CAAE,MAAM;oBACtC,IAAI,EAAE,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,WAAW,0CAAE,IAAI;iBACnC;aACF;SACF,CAAC;IACJ,CAAC;IAED,OAAO;QACL;YACE,EAAE,EAAE,SAAS;YACb,aAAa,EAAE;gBACb,KAAK,EAAE,UAAU,CAAC,cAAc,CAAC;gBACjC,UAAU,EAAE,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,SAAS;gBACxC,IAAI,EAAE,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,WAAW,0CAAE,OAAO;gBACrC,MAAM,EAAE,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,WAAW,0CAAE,MAAM;gBACtC,IAAI,EAAE,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,WAAW,0CAAE,IAAI;aACnC;SACF;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"quantity.js","sourceRoot":"","sources":["../../src/utils/quantity.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAOH,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAE1D,MAAM,CAAC,MAAM,mBAAmB,GAA6B,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;AAEpF,MAAM,UAAU,kBAAkB,CAAC,GAAuB;IACxD,OAAO,GAAG,KAAK,GAAG,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,GAAG,CAAC;AACpE,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,SAAwB,EACxB,cAAsB,EACtB,eAA8C,EAC9C,SAA+C,EAC/C,SAA6B;IAE7B,IAAI,SAAS,EAAE,CAAC;QACd,OAAO;YACL;gBACE,EAAE,EAAE,SAAS;gBACb,aAAa,EAAE;oBACb,KAAK,EAAE,yBAAyB,CAAC,cAAc,EAAE,SAAS,CAAC;oBAC3D,UAAU,EAAE,eAAe,IAAI,SAAS;oBACxC,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO;oBACrC,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM;oBACtC,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI;iBACnC;aACF;SACF,CAAC;IACJ,CAAC;IAED,OAAO;QACL;YACE,EAAE,EAAE,SAAS;YACb,aAAa,EAAE;gBACb,KAAK,EAAE,UAAU,CAAC,cAAc,CAAC;gBACjC,UAAU,EAAE,eAAe,IAAI,SAAS;gBACxC,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO;gBACrC,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM;gBACtC,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI;aACnC;SACF;KACF,CAAC;AACJ,CAAC"}