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

package/lib/utils/questionnaireStoreUtils/addDisplayToCodings.js

@@ -14,90 +14,13 @@
  * 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 { client } from 'fhirclient';
 // Use this for QuestionnaireStore.cachedValueSetCodings
-export function addDisplayToCacheCodings(cachedValueSetCodings, terminologyServerUrl) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        // Store code system lookup promises for codings without displays
-        const codeSystemLookupPromises = {};
-        for (const key in cachedValueSetCodings) {
-            const codings = cachedValueSetCodings[key];
-            for (const coding of codings) {
-                if (!coding.display) {
-                    const query = `system=${coding.system}&code=${coding.code}`;
-                    codeSystemLookupPromises[query] = {
-                        promise: getCodeSystemLookupPromise(query, terminologyServerUrl),
-                        oldCoding: coding
-                    };
-                }
-            }
-        }
-        // Resolves lookup promises in one go and assign newCodings to processedCodings
-        const resolvedCodeSystemLookupPromises = yield resolveLookupPromises(codeSystemLookupPromises);
-        for (const key in cachedValueSetCodings) {
-            const codings = cachedValueSetCodings[key];
-            for (const coding of codings) {
-                const lookUpKey = `system=${coding.system}&code=${coding.code}`;
-                const resolvedLookup = resolvedCodeSystemLookupPromises[lookUpKey];
-                if ((_a = resolvedLookup === null || resolvedLookup === void 0 ? void 0 : resolvedLookup.newCoding) === null || _a === void 0 ? void 0 : _a.display) {
-                    coding.display = resolvedLookup.newCoding.display;
-                }
-            }
-        }
-        return cachedValueSetCodings;
-    });
-}
-// Use this for a Record<linkId, answerOption[]>
-export function addDisplayToAnswerOptions(answerOptions, terminologyServerUrl) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        // Store code system lookup promises for codings without displays
-        const codeSystemLookupPromises = {};
-        for (const key in answerOptions) {
-            const options = answerOptions[key];
-            for (const option of options) {
-                if (option.valueCoding && !option.valueCoding.display) {
-                    const query = `system=${option.valueCoding.system}&code=${option.valueCoding.code}`;
-                    codeSystemLookupPromises[query] = {
-                        promise: getCodeSystemLookupPromise(query, terminologyServerUrl),
-                        oldCoding: option.valueCoding
-                    };
-                }
-            }
-        }
-        // Resolves lookup promises in one go and assign newCodings to processedCodings
-        const resolvedCodeSystemLookupPromises = yield resolveLookupPromises(codeSystemLookupPromises);
-        for (const key in answerOptions) {
-            const options = answerOptions[key];
-            for (const option of options) {
-                if (option.valueCoding) {
-                    const lookUpKey = `system=${option.valueCoding.system}&code=${option.valueCoding.code}`;
-                    const resolvedLookup = resolvedCodeSystemLookupPromises[lookUpKey];
-                    if ((_a = resolvedLookup === null || resolvedLookup === void 0 ? void 0 : resolvedLookup.newCoding) === null || _a === void 0 ? void 0 : _a.display) {
-                        option.valueCoding.display = resolvedLookup.newCoding.display;
-                    }
-                }
-            }
-        }
-        return answerOptions;
-    });
-}
-// Use this for an array of codings
-export function addDisplayToCodingArray(codings, terminologyServerUrl) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        // Store code system lookup promises for codings without displays
-        const codeSystemLookupPromises = {};
+export async function addDisplayToCacheCodings(cachedValueSetCodings, terminologyServerUrl) {
+    // Store code system lookup promises for codings without displays
+    const codeSystemLookupPromises = {};
+    for (const key in cachedValueSetCodings) {
+        const codings = cachedValueSetCodings[key];
         for (const coding of codings) {
             if (!coding.display) {
                 const query = `system=${coding.system}&code=${coding.code}`;
@@ -107,48 +30,107 @@ export function addDisplayToCodingArray(codings, terminologyServerUrl) {
                 };
             }
         }
-        // Resolves lookup promises in one go and assign newCodings to processedCodings
-        const resolvedCodeSystemLookupPromises = yield resolveLookupPromises(codeSystemLookupPromises);
+    }
+    // Resolves lookup promises in one go and assign newCodings to processedCodings
+    const resolvedCodeSystemLookupPromises = await resolveLookupPromises(codeSystemLookupPromises);
+    for (const key in cachedValueSetCodings) {
+        const codings = cachedValueSetCodings[key];
         for (const coding of codings) {
             const lookUpKey = `system=${coding.system}&code=${coding.code}`;
             const resolvedLookup = resolvedCodeSystemLookupPromises[lookUpKey];
-            if ((_a = resolvedLookup === null || resolvedLookup === void 0 ? void 0 : resolvedLookup.newCoding) === null || _a === void 0 ? void 0 : _a.display) {
+            if (resolvedLookup?.newCoding?.display) {
                 coding.display = resolvedLookup.newCoding.display;
             }
         }
-        return codings;
-    });
+    }
+    return cachedValueSetCodings;
+}
+// Use this for a Record<linkId, answerOption[]>
+export async function addDisplayToAnswerOptions(answerOptions, terminologyServerUrl) {
+    // Store code system lookup promises for codings without displays
+    const codeSystemLookupPromises = {};
+    for (const key in answerOptions) {
+        const options = answerOptions[key];
+        for (const option of options) {
+            if (option.valueCoding && !option.valueCoding.display) {
+                const query = `system=${option.valueCoding.system}&code=${option.valueCoding.code}`;
+                codeSystemLookupPromises[query] = {
+                    promise: getCodeSystemLookupPromise(query, terminologyServerUrl),
+                    oldCoding: option.valueCoding
+                };
+            }
+        }
+    }
+    // Resolves lookup promises in one go and assign newCodings to processedCodings
+    const resolvedCodeSystemLookupPromises = await resolveLookupPromises(codeSystemLookupPromises);
+    for (const key in answerOptions) {
+        const options = answerOptions[key];
+        for (const option of options) {
+            if (option.valueCoding) {
+                const lookUpKey = `system=${option.valueCoding.system}&code=${option.valueCoding.code}`;
+                const resolvedLookup = resolvedCodeSystemLookupPromises[lookUpKey];
+                if (resolvedLookup?.newCoding?.display) {
+                    option.valueCoding.display = resolvedLookup.newCoding.display;
+                }
+            }
+        }
+    }
+    return answerOptions;
+}
+// Use this for an array of codings
+export async function addDisplayToCodingArray(codings, terminologyServerUrl) {
+    // Store code system lookup promises for codings without displays
+    const codeSystemLookupPromises = {};
+    for (const coding of codings) {
+        if (!coding.display) {
+            const query = `system=${coding.system}&code=${coding.code}`;
+            codeSystemLookupPromises[query] = {
+                promise: getCodeSystemLookupPromise(query, terminologyServerUrl),
+                oldCoding: coding
+            };
+        }
+    }
+    // Resolves lookup promises in one go and assign newCodings to processedCodings
+    const resolvedCodeSystemLookupPromises = await resolveLookupPromises(codeSystemLookupPromises);
+    for (const coding of codings) {
+        const lookUpKey = `system=${coding.system}&code=${coding.code}`;
+        const resolvedLookup = resolvedCodeSystemLookupPromises[lookUpKey];
+        if (resolvedLookup?.newCoding?.display) {
+            coding.display = resolvedLookup.newCoding.display;
+        }
+    }
+    return codings;
 }
 export function getCodeSystemLookupPromise(query, terminologyServerUrl) {
     return client({ serverUrl: terminologyServerUrl }).request({
         url: `CodeSystem/$lookup?${query}`
     });
 }
-export function resolveLookupPromises(codeSystemLookupPromises) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const newCodeSystemLookupPromises = {};
-        const lookupPromiseKeys = Object.keys(codeSystemLookupPromises);
-        const lookupPromiseValues = Object.values(codeSystemLookupPromises);
-        const promises = lookupPromiseValues.map((lookupPromise) => lookupPromise.promise);
-        const settledPromises = yield Promise.allSettled(promises);
-        for (const [i, settledPromise] of settledPromises.entries()) {
-            if (settledPromise.status === 'rejected') {
-                continue;
-            }
-            const lookupResult = settledPromise.value;
-            if (!lookupResponseIsValid(lookupResult)) {
-                continue;
-            }
-            const key = lookupPromiseKeys[i];
-            const lookupPromise = lookupPromiseValues[i];
-            if (key && lookupPromise) {
-                lookupPromise.newCoding = Object.assign(Object.assign({}, lookupPromise.oldCoding), { display: (_b = (_a = lookupResult.parameter.find((p) => p.name === 'display')) === null || _a === void 0 ? void 0 : _a.valueString) !== null && _b !== void 0 ? _b : undefined });
-                newCodeSystemLookupPromises[key] = lookupPromise;
-            }
+export async function resolveLookupPromises(codeSystemLookupPromises) {
+    const newCodeSystemLookupPromises = {};
+    const lookupPromiseKeys = Object.keys(codeSystemLookupPromises);
+    const lookupPromiseValues = Object.values(codeSystemLookupPromises);
+    const promises = lookupPromiseValues.map((lookupPromise) => lookupPromise.promise);
+    const settledPromises = await Promise.allSettled(promises);
+    for (const [i, settledPromise] of settledPromises.entries()) {
+        if (settledPromise.status === 'rejected') {
+            continue;
         }
-        return newCodeSystemLookupPromises;
-    });
+        const lookupResult = settledPromise.value;
+        if (!lookupResponseIsValid(lookupResult)) {
+            continue;
+        }
+        const key = lookupPromiseKeys[i];
+        const lookupPromise = lookupPromiseValues[i];
+        if (key && lookupPromise) {
+            lookupPromise.newCoding = {
+                ...lookupPromise.oldCoding,
+                display: lookupResult.parameter.find((p) => p.name === 'display')?.valueString ?? undefined
+            };
+            newCodeSystemLookupPromises[key] = lookupPromise;
+        }
+    }
+    return newCodeSystemLookupPromises;
 }
 export function lookupResponseIsValid(response) {
     return (response &&

package/lib/utils/questionnaireStoreUtils/addDisplayToCodings.js.map

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

package/lib/utils/questionnaireStoreUtils/createQuestionnaireModel.js

@@ -14,15 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { extractLaunchContexts } from './extractLaunchContext';
 import { extractQuestionnaireLevelVariables } from './extractVariables';
 import { extractTabs } from './extractTabs';
@@ -33,61 +24,54 @@ import { resolveValueSets } from './resolveValueSets';
 import { getLinkIdPartialItemMap, getLinkIdPreferredTerminologyServerTuples } from '../qItem';
 import { addDisplayToAnswerOptions, addDisplayToCacheCodings } from './addDisplayToCodings';
 import { extractTargetConstraints } from './extractTargetConstraint';
-export function createQuestionnaireModel(questionnaire, terminologyServerUrl) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (!questionnaire.item) {
-            return createEmptyModel();
-        }
-        const itemMap = getLinkIdPartialItemMap(questionnaire);
-        const itemPreferredTerminologyServers = Object.fromEntries(getLinkIdPreferredTerminologyServerTuples(questionnaire));
-        const tabs = extractTabs(questionnaire);
-        const pages = extractPages(questionnaire);
-        const launchContexts = extractLaunchContexts(questionnaire);
-        const targetConstraints = extractTargetConstraints(questionnaire);
-        let variables = extractQuestionnaireLevelVariables(questionnaire);
-        // TODO reminder to remove/have documentation when upgrading to 1.0.0 - 05/06/2025
-        // TODO additionalVariables is defined to be <"name", "extension"> previously, which provides no real value.
-        // TODO the definition of additionalVariables is now <"name", "value">, which allows it to be injected into the renderer's fhirPathContext.
-        // TODO as an example, populatedContext from a pre-pop module can now be inserted into the renderer for further use.
-        // variables = addAdditionalVariables(variables, additionalVariables);
-        const extractContainedValueSetsResult = extractContainedValueSets(questionnaire, terminologyServerUrl);
-        let valueSetPromises = extractContainedValueSetsResult.valueSetPromises;
-        let processedValueSets = extractContainedValueSetsResult.processedValueSets;
-        let cachedValueSetCodings = extractContainedValueSetsResult.cachedValueSetCodings;
-        const extractOtherExtensionsResult = yield extractOtherExtensions(questionnaire, variables, valueSetPromises, processedValueSets, cachedValueSetCodings, itemPreferredTerminologyServers, terminologyServerUrl);
-        const { enableWhenItems, enableWhenExpressions, calculatedExpressions, initialExpressions, answerExpressions, answerOptions, answerOptionsToggleExpressions } = extractOtherExtensionsResult;
-        variables = extractOtherExtensionsResult.variables;
-        valueSetPromises = extractOtherExtensionsResult.valueSetPromises;
-        processedValueSets = extractOtherExtensionsResult.processedValueSets;
-        cachedValueSetCodings = extractOtherExtensionsResult.cachedValueSetCodings;
-        const resolveValueSetsResult = yield resolveValueSets(variables, valueSetPromises, cachedValueSetCodings, terminologyServerUrl);
-        variables = resolveValueSetsResult.variables;
-        cachedValueSetCodings = resolveValueSetsResult.cachedValueSetCodings;
-        // In processedCodings, add display values to codings lacking them
-        cachedValueSetCodings = yield addDisplayToCacheCodings(cachedValueSetCodings, terminologyServerUrl);
-        // In answerOptions, add display values to codings lacking them
-        const completeAnswerOptions = yield addDisplayToAnswerOptions(answerOptions, terminologyServerUrl);
-        return {
-            itemMap,
-            itemPreferredTerminologyServers,
-            tabs,
-            pages,
-            variables,
-            launchContexts,
-            targetConstraints,
-            enableWhenItems,
-            enableWhenExpressions,
-            calculatedExpressions,
-            initialExpressions,
-            answerExpressions,
-            answerOptions: completeAnswerOptions,
-            answerOptionsToggleExpressions: answerOptionsToggleExpressions,
-            processedValueSets,
-            cachedValueSetCodings,
-            fhirPathContext: {},
-            fhirPathTerminologyCache: {}
-        };
-    });
+export async function createQuestionnaireModel(questionnaire, terminologyServerUrl) {
+    if (!questionnaire.item) {
+        return createEmptyModel();
+    }
+    const itemMap = getLinkIdPartialItemMap(questionnaire);
+    const itemPreferredTerminologyServers = Object.fromEntries(getLinkIdPreferredTerminologyServerTuples(questionnaire));
+    const tabs = extractTabs(questionnaire);
+    const pages = extractPages(questionnaire);
+    const launchContexts = extractLaunchContexts(questionnaire);
+    const targetConstraints = extractTargetConstraints(questionnaire);
+    let variables = extractQuestionnaireLevelVariables(questionnaire);
+    const extractContainedValueSetsResult = extractContainedValueSets(questionnaire, terminologyServerUrl);
+    let valueSetPromises = extractContainedValueSetsResult.valueSetPromises;
+    let processedValueSets = extractContainedValueSetsResult.processedValueSets;
+    let cachedValueSetCodings = extractContainedValueSetsResult.cachedValueSetCodings;
+    const extractOtherExtensionsResult = await extractOtherExtensions(questionnaire, variables, valueSetPromises, processedValueSets, cachedValueSetCodings, itemPreferredTerminologyServers, terminologyServerUrl);
+    const { enableWhenItems, enableWhenExpressions, calculatedExpressions, initialExpressions, answerExpressions, answerOptions, answerOptionsToggleExpressions } = extractOtherExtensionsResult;
+    variables = extractOtherExtensionsResult.variables;
+    valueSetPromises = extractOtherExtensionsResult.valueSetPromises;
+    processedValueSets = extractOtherExtensionsResult.processedValueSets;
+    cachedValueSetCodings = extractOtherExtensionsResult.cachedValueSetCodings;
+    const resolveValueSetsResult = await resolveValueSets(variables, valueSetPromises, cachedValueSetCodings, terminologyServerUrl);
+    variables = resolveValueSetsResult.variables;
+    cachedValueSetCodings = resolveValueSetsResult.cachedValueSetCodings;
+    // In processedCodings, add display values to codings lacking them
+    cachedValueSetCodings = await addDisplayToCacheCodings(cachedValueSetCodings, terminologyServerUrl);
+    // In answerOptions, add display values to codings lacking them
+    const completeAnswerOptions = await addDisplayToAnswerOptions(answerOptions, terminologyServerUrl);
+    return {
+        itemMap,
+        itemPreferredTerminologyServers,
+        tabs,
+        pages,
+        variables,
+        launchContexts,
+        targetConstraints,
+        enableWhenItems,
+        enableWhenExpressions,
+        calculatedExpressions,
+        initialExpressions,
+        answerExpressions,
+        answerOptions: completeAnswerOptions,
+        answerOptionsToggleExpressions: answerOptionsToggleExpressions,
+        processedValueSets,
+        cachedValueSetCodings,
+        fhirPathContext: {},
+        fhirPathTerminologyCache: {}
+    };
 }
 function createEmptyModel() {
     return {

package/lib/utils/questionnaireStoreUtils/createQuestionnaireModel.js.map

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

package/lib/utils/questionnaireStoreUtils/extractContainedValueSets.js

@@ -16,7 +16,6 @@
  */
 import { getValueSetCodings, getValueSetPromise } from '../valueSet';
 export function extractContainedValueSets(questionnaire, terminologyServerUrl) {
-    var _a, _b;
     const processedValueSets = {};
     const valueSetPromises = {};
     const cachedValueSetCodings = {};
@@ -32,8 +31,8 @@ export function extractContainedValueSets(questionnaire, terminologyServerUrl) {
         if (entry.expansion) {
             // Store contained valueSet codings
             processedValueSets[entry.id] = {
-                initialValueSetUrl: (_a = entry.url) !== null && _a !== void 0 ? _a : '',
-                updatableValueSetUrl: (_b = entry.url) !== null && _b !== void 0 ? _b : '',
+                initialValueSetUrl: entry.url ?? '',
+                updatableValueSetUrl: entry.url ?? '',
                 bindingParameters: [],
                 isDynamic: false,
                 linkIds: []
@@ -67,8 +66,7 @@ export function extractContainedValueSets(questionnaire, terminologyServerUrl) {
  * @author Sean Fong
  */
 export function getValueSetUrlFromContained(valueSet) {
-    var _a, _b;
-    const urls = (_b = (_a = valueSet.compose) === null || _a === void 0 ? void 0 : _a.include) === null || _b === void 0 ? void 0 : _b.map((include) => { var _a; return ((_a = include.valueSet) === null || _a === void 0 ? void 0 : _a[0]) ? include.valueSet[0] : ''; });
+    const urls = valueSet.compose?.include?.map((include) => include.valueSet?.[0] ? include.valueSet[0] : '');
     return urls && urls.length > 0 ? urls[0] : '';
 }
 //# sourceMappingURL=extractContainedValueSets.js.map

package/lib/utils/questionnaireStoreUtils/extractContainedValueSets.js.map

@@ -1 +1 @@
-{"version":3,"file":"extractContainedValueSets.js","sourceRoot":"","sources":["../../../src/utils/questionnaireStoreUtils/extractContainedValueSets.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAGrE,MAAM,UAAU,yBAAyB,CACvC,aAA4B,EAC5B,oBAA4B;;IAM5B,MAAM,kBAAkB,GAAsC,EAAE,CAAC;IACjE,MAAM,gBAAgB,GAAoC,EAAE,CAAC;IAC7D,MAAM,qBAAqB,GAA6B,EAAE,CAAC;IAE3D,IAAI,CAAC,aAAa,CAAC,SAAS,IAAI,aAAa,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrE,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,CAAC;IACzE,CAAC;IAED,8BAA8B;IAC9B,KAAK,MAAM,KAAK,IAAI,aAAa,CAAC,SAAS,EAAE,CAAC;QAC5C,IAAI,KAAK,CAAC,YAAY,KAAK,UAAU,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;YACnD,SAAS;QACX,CAAC;QAED,uFAAuF;QACvF,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;YACpB,mCAAmC;YACnC,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG;gBAC7B,kBAAkB,EAAE,MAAA,KAAK,CAAC,GAAG,mCAAI,EAAE;gBACnC,oBAAoB,EAAE,MAAA,KAAK,CAAC,GAAG,mCAAI,EAAE;gBACrC,iBAAiB,EAAE,EAAE;gBACrB,SAAS,EAAE,KAAK;gBAChB,OAAO,EAAE,EAAE;aACZ,CAAC;YACF,qBAAqB,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;YAC5D,SAAS;QACX,CAAC;QAED,2DAA2D;QAC3D,MAAM,WAAW,GAAG,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACvD,IAAI,WAAW,EAAE,CAAC;YAChB,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG;gBAC3B,OAAO,EAAE,kBAAkB,CAAC,WAAW,EAAE,oBAAoB,CAAC;aAC/D,CAAC;YACF,SAAS;QACX,CAAC;QAED,IAAI,KAAK,CAAC,GAAG,EAAE,CAAC;YACd,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG;gBAC7B,kBAAkB,EAAE,KAAK,CAAC,GAAG;gBAC7B,oBAAoB,EAAE,KAAK,CAAC,GAAG;gBAC/B,iBAAiB,EAAE,EAAE;gBACrB,SAAS,EAAE,KAAK;gBAChB,OAAO,EAAE,EAAE;aACZ,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,CAAC;AACzE,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,2BAA2B,CAAC,QAAkB;;IAC5D,MAAM,IAAI,GAAG,MAAA,MAAA,QAAQ,CAAC,OAAO,0CAAE,OAAO,0CAAE,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,WACtD,OAAA,CAAA,MAAA,OAAO,CAAC,QAAQ,0CAAG,CAAC,CAAC,EAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA,EAAA,CACjD,CAAC;IAEF,OAAO,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAChD,CAAC"}
+{"version":3,"file":"extractContainedValueSets.js","sourceRoot":"","sources":["../../../src/utils/questionnaireStoreUtils/extractContainedValueSets.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAGrE,MAAM,UAAU,yBAAyB,CACvC,aAA4B,EAC5B,oBAA4B;IAM5B,MAAM,kBAAkB,GAAsC,EAAE,CAAC;IACjE,MAAM,gBAAgB,GAAoC,EAAE,CAAC;IAC7D,MAAM,qBAAqB,GAA6B,EAAE,CAAC;IAE3D,IAAI,CAAC,aAAa,CAAC,SAAS,IAAI,aAAa,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrE,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,CAAC;IACzE,CAAC;IAED,8BAA8B;IAC9B,KAAK,MAAM,KAAK,IAAI,aAAa,CAAC,SAAS,EAAE,CAAC;QAC5C,IAAI,KAAK,CAAC,YAAY,KAAK,UAAU,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;YACnD,SAAS;QACX,CAAC;QAED,uFAAuF;QACvF,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;YACpB,mCAAmC;YACnC,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG;gBAC7B,kBAAkB,EAAE,KAAK,CAAC,GAAG,IAAI,EAAE;gBACnC,oBAAoB,EAAE,KAAK,CAAC,GAAG,IAAI,EAAE;gBACrC,iBAAiB,EAAE,EAAE;gBACrB,SAAS,EAAE,KAAK;gBAChB,OAAO,EAAE,EAAE;aACZ,CAAC;YACF,qBAAqB,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;YAC5D,SAAS;QACX,CAAC;QAED,2DAA2D;QAC3D,MAAM,WAAW,GAAG,2BAA2B,CAAC,KAAK,CAAC,CAAC;QACvD,IAAI,WAAW,EAAE,CAAC;YAChB,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG;gBAC3B,OAAO,EAAE,kBAAkB,CAAC,WAAW,EAAE,oBAAoB,CAAC;aAC/D,CAAC;YACF,SAAS;QACX,CAAC;QAED,IAAI,KAAK,CAAC,GAAG,EAAE,CAAC;YACd,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG;gBAC7B,kBAAkB,EAAE,KAAK,CAAC,GAAG;gBAC7B,oBAAoB,EAAE,KAAK,CAAC,GAAG;gBAC/B,iBAAiB,EAAE,EAAE;gBACrB,SAAS,EAAE,KAAK;gBAChB,OAAO,EAAE,EAAE;aACZ,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,CAAC;AACzE,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,2BAA2B,CAAC,QAAkB;IAC5D,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CACtD,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CACjD,CAAC;IAEF,OAAO,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAChD,CAAC"}

package/lib/utils/questionnaireStoreUtils/extractLaunchContext.js

@@ -1,13 +1,12 @@
 import { isLaunchContext } from '../populateContexts';
 export function extractLaunchContexts(questionnaire) {
-    var _a, _b;
     if (!questionnaire.extension || questionnaire.extension.length === 0) {
         return {};
     }
     const launchContexts = {};
     for (const ext of questionnaire.extension) {
         if (isLaunchContext(ext)) {
-            const launchContextName = (_a = ext.extension[0].valueId) !== null && _a !== void 0 ? _a : (_b = ext.extension[0].valueCoding) === null || _b === void 0 ? void 0 : _b.code;
+            const launchContextName = ext.extension[0].valueId ?? ext.extension[0].valueCoding?.code;
             if (launchContextName) {
                 launchContexts[launchContextName] = ext;
             }

package/lib/utils/questionnaireStoreUtils/extractLaunchContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"extractLaunchContext.js","sourceRoot":"","sources":["../../../src/utils/questionnaireStoreUtils/extractLaunchContext.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,MAAM,UAAU,qBAAqB,CAAC,aAA4B;;IAChE,IAAI,CAAC,aAAa,CAAC,SAAS,IAAI,aAAa,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrE,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,cAAc,GAAkC,EAAE,CAAC;IACzD,KAAK,MAAM,GAAG,IAAI,aAAa,CAAC,SAAS,EAAE,CAAC;QAC1C,IAAI,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC;YACzB,MAAM,iBAAiB,GAAG,MAAA,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,mCAAI,MAAA,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW,0CAAE,IAAI,CAAC;YACzF,IAAI,iBAAiB,EAAE,CAAC;gBACtB,cAAc,CAAC,iBAAiB,CAAC,GAAG,GAAG,CAAC;YAC1C,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,cAAc,CAAC;AACxB,CAAC"}
+{"version":3,"file":"extractLaunchContext.js","sourceRoot":"","sources":["../../../src/utils/questionnaireStoreUtils/extractLaunchContext.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,MAAM,UAAU,qBAAqB,CAAC,aAA4B;IAChE,IAAI,CAAC,aAAa,CAAC,SAAS,IAAI,aAAa,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrE,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,cAAc,GAAkC,EAAE,CAAC;IACzD,KAAK,MAAM,GAAG,IAAI,aAAa,CAAC,SAAS,EAAE,CAAC;QAC1C,IAAI,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC;YACzB,MAAM,iBAAiB,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,IAAI,CAAC;YACzF,IAAI,iBAAiB,EAAE,CAAC;gBACtB,cAAc,CAAC,iBAAiB,CAAC,GAAG,GAAG,CAAC;YAC1C,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,cAAc,CAAC;AACxB,CAAC"}