sdc-qrf 0.3.16 → 0.3.17

package/src/components.tsx

@@ -2,23 +2,17 @@ import { Expression } from 'fhir/r4b';
 import fhirpath from 'fhirpath';
 import _ from 'lodash';
 import isEqual from 'lodash/isEqual';
-import React, { ReactChild, useEffect, useContext, useMemo, useRef, useState } from 'react';
+import React, { PropsWithChildren, useEffect, useContext, useMemo, useRef, useState } from 'react';
 
-import { QuestionnaireItem } from 'shared/src/contrib/aidbox';
+import { QuestionnaireItem } from '@beda.software/aidbox-types';
 
 import { useQuestionnaireResponseFormContext } from '.';
 import { QRFContext } from './context';
-import {
-    FormAnswerItems,
-    ItemContext,
-    QRFContextData,
-    QuestionItemProps,
-    QuestionItemsProps,
-} from './types';
-import { calcContext, getBranchItems, getEnabledQuestions, wrapAnswerValue } from './utils';
+import { FormAnswerItems, ItemContext, QRFContextData, QuestionItemProps, QuestionItemsProps } from './types';
+import { calcContext, getBranchItems, getEnabledQuestions, wrapAnswerValue } from './utils.js';
 
 export function usePreviousValue<T = any>(value: T) {
-    const prevValue = useRef<T>();
+    const prevValue = useRef<T | undefined>(value);
 
     useEffect(() => {
         prevValue.current = value;
@@ -38,14 +32,7 @@ export function QuestionItems(props: QuestionItemsProps) {
     return (
         <React.Fragment>
             {getEnabledQuestions(questionItems, parentPath, formValues, context).map((item) => {
-                return (
-                    <QuestionItem
-                        key={item.linkId}
-                        questionItem={item}
-                        context={context}
-                        parentPath={parentPath}
-                    />
-                );
+                return <QuestionItem key={item.linkId} questionItem={item} context={context} parentPath={parentPath} />;
             })}
         </React.Fragment>
     );
@@ -64,34 +51,19 @@ export function QuestionItem(props: QuestionItemProps) {
     const [questionItem, setQuestionItem] = useState(initialQuestionItem);
     const prevQuestionItem: QuestionnaireItem | undefined = usePreviousValue(questionItem);
 
-    const {
-        type,
-        linkId,
-        calculatedExpression,
-        variable,
-        repeats,
-        itemControl,
-        _text,
-        _readOnly,
-        _required,
-    } = 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)
-    const branchItems = getBranchItems(
-        fieldPath,
-        initialContext.questionnaire,
-        initialContext.resource,
-    );
+    const branchItems = getBranchItems(fieldPath, initialContext.questionnaire, initialContext.resource);
     const context =
         type === 'group'
             ? branchItems.qrItems.map((curQRItem) =>
                   calcContext(initialContext, variable, branchItems.qItem, curQRItem),
               )
             : calcContext(initialContext, variable, branchItems.qItem, branchItems.qrItems[0]!);
-    const prevAnswers: FormAnswerItems[] | undefined = usePreviousValue(
-        _.get(formValues, fieldPath),
-    );
+    const prevAnswers: FormAnswerItems[] | undefined = usePreviousValue(_.get(formValues, fieldPath));
 
     const itemContext = isGroupItem(questionItem, context) ? context[0] : context;
 
@@ -141,12 +113,8 @@ export function QuestionItem(props: QuestionItemProps) {
         if (itemContext && _text) {
             const cqfExpression = _text.cqfExpression;
             const calculatedValue =
-                evaluateQuestionItemExpression(
-                    linkId,
-                    '_text.cqfExpression',
-                    itemContext,
-                    cqfExpression,
-                )[0] ?? initialQuestionItem.text;
+                evaluateQuestionItemExpression(linkId, '_text.cqfExpression', itemContext, cqfExpression)[0] ??
+                initialQuestionItem.text;
 
             if (prevQuestionItem?.text !== calculatedValue) {
                 setQuestionItem((qi) => ({
@@ -159,12 +127,8 @@ export function QuestionItem(props: QuestionItemProps) {
         if (itemContext && _readOnly) {
             const cqfExpression = _readOnly.cqfExpression;
             const calculatedValue =
-                evaluateQuestionItemExpression(
-                    linkId,
-                    '_readOnly.cqfExpression',
-                    itemContext,
-                    cqfExpression,
-                )[0] ?? initialQuestionItem.readOnly;
+                evaluateQuestionItemExpression(linkId, '_readOnly.cqfExpression', itemContext, cqfExpression)[0] ??
+                initialQuestionItem.readOnly;
 
             if (prevQuestionItem?.readOnly !== calculatedValue) {
                 setQuestionItem((qi) => ({
@@ -177,12 +141,8 @@ export function QuestionItem(props: QuestionItemProps) {
         if (itemContext && _required) {
             const cqfExpression = _required.cqfExpression;
             const calculatedValue =
-                evaluateQuestionItemExpression(
-                    linkId,
-                    '_required.cqfExpression',
-                    itemContext,
-                    cqfExpression,
-                )[0] ?? initialQuestionItem.required;
+                evaluateQuestionItemExpression(linkId, '_required.cqfExpression', itemContext, cqfExpression)[0] ??
+                initialQuestionItem.required;
 
             if (prevQuestionItem?.required !== calculatedValue) {
                 setQuestionItem((qi) => ({
@@ -195,28 +155,18 @@ export function QuestionItem(props: QuestionItemProps) {
 
     if (isGroupItem(questionItem, context)) {
         if (itemControl) {
-            if (
-                !itemControlGroupItemComponents ||
-                !itemControlGroupItemComponents[itemControl.coding![0]!.code!]
-            ) {
-                console.warn(`QRF: Unsupported group itemControl '${itemControl.coding![0]!
-                    .code!}'. 
+            if (!itemControlGroupItemComponents || !itemControlGroupItemComponents[itemControl.coding![0]!.code!]) {
+                console.warn(`QRF: Unsupported group itemControl '${itemControl.coding![0]!.code!}'. 
                 Please define 'itemControlGroupWidgets' for '${itemControl.coding![0]!.code!}'`);
                 const DefaultComponent = groupItemComponent;
                 return DefaultComponent ? (
-                    <DefaultComponent
-                        context={context}
-                        parentPath={parentPath}
-                        questionItem={questionItem}
-                    />
+                    <DefaultComponent context={context} parentPath={parentPath} questionItem={questionItem} />
                 ) : null;
             }
 
             const Component = itemControlGroupItemComponents[itemControl.coding![0]!.code!]!;
 
-            return (
-                <Component context={context} parentPath={parentPath} questionItem={questionItem} />
-            );
+            return <Component context={context} parentPath={parentPath} questionItem={questionItem} />;
         }
         if (!groupItemComponent) {
             console.warn(`QRF: groupWidget is not specified but used in questionnaire.`);
@@ -226,20 +176,11 @@ export function QuestionItem(props: QuestionItemProps) {
 
         const GroupWidgetComponent = groupItemComponent;
 
-        return (
-            <GroupWidgetComponent
-                context={context}
-                parentPath={parentPath}
-                questionItem={questionItem}
-            />
-        );
+        return <GroupWidgetComponent context={context} parentPath={parentPath} questionItem={questionItem} />;
     }
 
     if (itemControl) {
-        if (
-            !itemControlQuestionItemComponents ||
-            !itemControlQuestionItemComponents[itemControl.coding![0]!.code!]
-        ) {
+        if (!itemControlQuestionItemComponents || !itemControlQuestionItemComponents[itemControl.coding![0]!.code!]) {
             console.warn(
                 `QRF: Unsupported itemControl '${itemControl.coding![0]!.code!}'.
 Please define 'itemControlWidgets' for '${itemControl.coding![0]!.code!}'`,
@@ -247,11 +188,7 @@ Please define 'itemControlWidgets' for '${itemControl.coding![0]!.code!}'`,
 
             const DefaultComponent = questionItemComponents[questionItem.type];
             return DefaultComponent ? (
-                <DefaultComponent
-                    context={context}
-                    parentPath={parentPath}
-                    questionItem={questionItem}
-                />
+                <DefaultComponent context={context} parentPath={parentPath} questionItem={questionItem} />
             ) : null;
         }
 
@@ -262,9 +199,7 @@ Please define 'itemControlWidgets' for '${itemControl.coding![0]!.code!}'`,
 
     // TODO: deprecate!
     if (customWidgets && linkId && linkId in customWidgets) {
-        console.warn(
-            `QRF: 'customWidgets' are deprecated, use 'Questionnaire.item.itemControl' instead`,
-        );
+        console.warn(`QRF: 'customWidgets' are deprecated, use 'Questionnaire.item.itemControl' instead`);
 
         if (type === 'group') {
             console.error(`QRF: Use 'itemControl' for group custom widgets`);
@@ -287,18 +222,12 @@ Please define 'itemControlWidgets' for '${itemControl.coding![0]!.code!}'`,
     return null;
 }
 
-export function QuestionnaireResponseFormProvider({
-    children,
-    ...props
-}: QRFContextData & { children: ReactChild }) {
+export function QuestionnaireResponseFormProvider({ children, ...props }: PropsWithChildren<QRFContextData>) {
     return <QRFContext.Provider value={props}>{children}</QRFContext.Provider>;
 }
 
 /* Helper that resolves right context type */
-function isGroupItem(
-    questionItem: QuestionnaireItem,
-    context: ItemContext | ItemContext[],
-): context is ItemContext[] {
+function isGroupItem(questionItem: QuestionnaireItem, context: ItemContext | ItemContext[]): context is ItemContext[] {
     return questionItem.type === 'group';
 }
 
@@ -318,7 +247,7 @@ export function evaluateQuestionItemExpression(
     }
 
     try {
-        return fhirpath.evaluate(context.context ?? {}, expression.expression!, context);
+        return fhirpath.evaluate(context.context ?? {}, expression.expression!, context, undefined, { async: false });
     } catch (err: unknown) {
         throw Error(`FHIRPath expression evaluation failure for ${linkId}.${path}: ${err}`);
     }

package/src/converter/__tests__/fce.test.ts

@@ -2,11 +2,12 @@ import {
     QuestionnaireResponse as FHIRQuestionnaireResponse,
     Questionnaire as FHIRQuestionnaire,
 } from 'fhir/r4b';
+import {describe, expect, test} from 'vitest'
 
 import {
     QuestionnaireResponse as FCEQuestionnaireResponse,
     Questionnaire as FCEQuestionnaire,
-} from 'shared/src/contrib/aidbox';
+} from '@beda.software/aidbox-types';
 
 // fce questionnaire
 import fce_allergies from './resources/questionnaire_fce/allergies.json';

package/src/converter/extensions.ts

@@ -1,6 +1,6 @@
 import { Extension as FHIRExtension } from 'fhir/r4b';
 
-import { QuestionnaireItem as FCEQuestionnaireItem } from 'shared/src/contrib/aidbox';
+import { QuestionnaireItem as FCEQuestionnaireItem } from '@beda.software/aidbox-types';
 
 export enum ExtensionIdentifier {
     Hidden = 'http://hl7.org/fhir/StructureDefinition/questionnaire-hidden',
@@ -50,9 +50,7 @@ export type ExtensionTransformer = {
     [key in ExtensionIdentifier]:
         | {
               transform: {
-                  fromExtensions: (
-                      extensions: FHIRExtension[],
-                  ) => Partial<FCEQuestionnaireItem> | undefined;
+                  fromExtensions: (extensions: FHIRExtension[]) => Partial<FCEQuestionnaireItem> | undefined;
                   toExtensions: (item: FCEQuestionnaireItem) => FHIRExtension[];
               };
           }
@@ -186,16 +184,11 @@ export const extensionTransformers: ExtensionTransformer = {
 
                         return {
                             key: itemConstraintExtension.find((obj) => obj.url === 'key')!.valueId!,
-                            requirements: itemConstraintExtension.find(
-                                (obj) => obj.url === 'requirements',
-                            )?.valueString,
-                            severity: itemConstraintExtension.find((obj) => obj.url === 'severity')!
-                                .valueCode!,
-                            human: itemConstraintExtension.find((obj) => obj.url === 'human')!
-                                .valueString!,
-                            expression: itemConstraintExtension.find(
-                                (obj) => obj.url === 'expression',
-                            )!.valueString!,
+                            requirements: itemConstraintExtension.find((obj) => obj.url === 'requirements')
+                                ?.valueString,
+                            severity: itemConstraintExtension.find((obj) => obj.url === 'severity')!.valueCode!,
+                            human: itemConstraintExtension.find((obj) => obj.url === 'human')!.valueString!,
+                            expression: itemConstraintExtension.find((obj) => obj.url === 'expression')!.valueString!,
                         };
                     }),
                 };
@@ -254,10 +247,8 @@ export const extensionTransformers: ExtensionTransformer = {
 
                         return {
                             forDisplay:
-                                choiceColumnExtension.find((obj) => obj.url === 'forDisplay')
-                                    ?.valueBoolean ?? false,
-                            path: choiceColumnExtension.find((obj) => obj.url === 'path')
-                                ?.valueString,
+                                choiceColumnExtension.find((obj) => obj.url === 'forDisplay')?.valueBoolean ?? false,
+                            path: choiceColumnExtension.find((obj) => obj.url === 'path')?.valueString,
                         };
                     }),
                 };
@@ -284,7 +275,7 @@ export const extensionTransformers: ExtensionTransformer = {
         },
     },
     [ExtensionIdentifier.CqfExpression]: {
-        // @ts-ignore
+        // @ts-expect-error: Type '"cqfExpression"' is not assignable to type 'keyof QuestionnaireItem'
         path: { extension: 'valueExpression', questionnaire: 'cqfExpression' },
     },
 

package/src/converter/fceToFhir/index.ts

@@ -6,7 +6,7 @@ import {
 import {
     Questionnaire as FCEQuestionnaire,
     QuestionnaireResponse as FCEQuestionnaireResponse,
-} from 'shared/src/contrib/aidbox';
+} from '@beda.software/aidbox-types';
 
 import { convertQuestionnaire } from './questionnaire';
 import { convertQuestionnaireResponse } from './questionnaireResponse';

package/src/converter/fceToFhir/questionnaire/index.ts

@@ -1,7 +1,7 @@
 import { Questionnaire as FHIRQuestionnaire } from 'fhir/r4b';
 import cloneDeep from 'lodash/cloneDeep';
 
-import { Questionnaire as FCEQuestionnaire } from 'shared/src/contrib/aidbox';
+import { Questionnaire as FCEQuestionnaire } from '@beda.software/aidbox-types';
 
 import { processExtensions } from './processExtensions';
 import { processItems } from './processItems';

package/src/converter/fceToFhir/questionnaire/processExtensions.ts

@@ -1,6 +1,6 @@
 import { Extension as FHIRExtension, Questionnaire as FHIRQuestionnaire } from 'fhir/r4b';
 
-import { Questionnaire as FCEQuestionnaire } from 'shared/src/contrib/aidbox';
+import { Questionnaire as FCEQuestionnaire } from '@beda.software/aidbox-types';
 
 export function processExtensions(questionnaire: FCEQuestionnaire): FHIRQuestionnaire {
     const { launchContext, mapping, sourceQueries, targetStructureMap, ...fhirQuestionnaire } =

package/src/converter/fceToFhir/questionnaire/processItems.ts

@@ -13,14 +13,11 @@ import {
     QuestionnaireItemEnableWhenAnswer as FCEQuestionnaireItemEnableWhenAnswer,
     QuestionnaireItemAnswerOption as FCEQuestionnaireItemAnswerOption,
     QuestionnaireItemInitial as FCEQuestionnaireItemInitial,
-} from 'shared/src/contrib/aidbox';
+} from '@beda.software/aidbox-types';
 
 import { convertFromFHIRExtension, convertToFHIRExtension, toFHIRReference } from '../..';
 
-export function processItems(
-    items: FCEQuestionnaireItem[],
-    onlyExtensions = false,
-): FHIRQuestionnaireItem[] {
+export function processItems(items: FCEQuestionnaireItem[], onlyExtensions = false): FHIRQuestionnaireItem[] {
     return items.map((item) => {
         const extensions = convertToFHIRExtension(item);
         if (extensions.length > 0) {
@@ -29,21 +26,13 @@ export function processItems(
                 .filter((ext): ext is Partial<FCEQuestionnaireItem> => ext !== undefined)
                 .flatMap(Object.keys);
             for (const field of fieldsToOmit) {
-                //@ts-ignore
+                //@ts-expect-error: Element implicitly has an 'any' type
                 delete item[field];
             }
             item.extension = extensions.sort();
         }
 
-        const {
-            enableBehavior,
-            enableWhen,
-            answerOption,
-            initial,
-            item: nestedItems,
-            type,
-            ...commonOptions
-        } = item;
+        const { enableBehavior, enableWhen, answerOption, initial, item: nestedItems, type, ...commonOptions } = item;
 
         const fhirItem: FHIRQuestionnaireItem = {
             ...commonOptions,
@@ -54,19 +43,17 @@ export function processItems(
             const element = item[property as keyof FCEQuestionnaireItem];
 
             if (property.startsWith('_') && element instanceof Object) {
-                // @ts-ignore
+                //@ts-expect-error: Element implicitly has an 'any' type
                 fhirItem[property] = {
                     // TODO: update convertToFHIRExtension to accept element type to convert
-                    // @ts-ignore
+                    //@ts-expect-error: Argument of type is not assignable to parameter of type 'QuestionnaireItem'
                     extension: convertToFHIRExtension(element),
                 };
             }
         }
 
         if (answerOption !== undefined) {
-            fhirItem.answerOption = onlyExtensions
-                ? answerOption
-                : processAnswerOption(answerOption);
+            fhirItem.answerOption = onlyExtensions ? answerOption : processAnswerOption(answerOption);
         }
 
         if (enableBehavior !== undefined) {
@@ -96,7 +83,7 @@ const convertEnableWhen = (
     answerType: string,
     result: FHIRQuestionnaireItemEnableWhen,
 ) => {
-    //@ts-ignore
+    //@ts-expect-error: Element implicitly has an 'any' type
     if (answer[answerType] !== undefined) {
         switch (answerType) {
             case 'boolean':
@@ -135,9 +122,7 @@ const convertEnableWhen = (
     }
 };
 
-function processAnswerOption(
-    options: FCEQuestionnaireItemAnswerOption[],
-): FHIRQuestionnaireItemAnswerOption[] {
+function processAnswerOption(options: FCEQuestionnaireItemAnswerOption[]): FHIRQuestionnaireItemAnswerOption[] {
     return options.map((option) => {
         const { value, ...commonOptions } = option;
 

package/src/converter/fceToFhir/questionnaire/processMeta.ts

@@ -1,6 +1,6 @@
 import { Meta as FHIRMeta } from 'fhir/r4b';
 
-import { Meta as FCEMeta } from 'shared/src/contrib/aidbox';
+import { Meta as FCEMeta } from '@beda.software/aidbox-types';
 
 export function processMeta(meta: FCEMeta): FHIRMeta {
     const { createdAt, ...fhirMeta } = meta;

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

@@ -1,7 +1,7 @@
 import { QuestionnaireResponse as FHIRQuestionnaireResponse } from 'fhir/r4b';
 import cloneDeep from 'lodash/cloneDeep';
 
-import { QuestionnaireResponse as FCEQuestionnaireResponse } from 'shared/src/contrib/aidbox';
+import { QuestionnaireResponse as FCEQuestionnaireResponse } from '@beda.software/aidbox-types';
 
 import { processAnswers } from './processAnswers';
 import { processMeta } from './processMeta';

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

@@ -4,7 +4,7 @@ import isEmpty from 'lodash/isEmpty';
 import {
     QuestionnaireResponseItem as FCEQuestionnaireResponseItem,
     QuestionnaireResponseItemAnswer as FCEQuestionnaireResponseItemAnswer,
-} from 'shared/src/contrib/aidbox';
+} from '@beda.software/aidbox-types';
 
 import { toFHIRReference } from '../../../converter';
 
@@ -19,9 +19,7 @@ export function processAnswers(items: FCEQuestionnaireResponseItem[]) {
     }
 }
 
-function processAnswer(
-    answerItem: FCEQuestionnaireResponseItemAnswer,
-): FHIRQuestionnaireResponseItemAnswer {
+function processAnswer(answerItem: FCEQuestionnaireResponseItemAnswer): FHIRQuestionnaireResponseItemAnswer {
     if (!answerItem.value) {
         return answerItem;
     }
@@ -41,10 +39,10 @@ function processAnswer(
     };
     for (const key in valueMappings) {
         if (key in value) {
-            //@ts-ignore
+            //@ts-expect-error: Element implicitly has an 'any' type
             const newKey = valueMappings[key];
             if (newKey) {
-                //@ts-ignore
+                //@ts-expect-error: Element implicitly has an 'any' type
                 fhirAnswerItem[newKey] = value[key];
             }
             break;

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

@@ -1,6 +1,6 @@
 import { Meta as FHIRMeta } from 'fhir/r4b';
 
-import { Meta as FCEMeta } from 'shared/src/contrib/aidbox';
+import { Meta as FCEMeta } from '@beda.software/aidbox-types';
 
 export function processMeta(meta: FCEMeta): FHIRMeta {
     const { createdAt, ...fhirMeta } = meta;

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

@@ -1,6 +1,6 @@
 import { QuestionnaireResponse as FHIRQuestionnaireResponse } from 'fhir/r4b';
 
-import { QuestionnaireResponse as FCEQuestionnaireResponse } from 'shared/src/contrib/aidbox';
+import { QuestionnaireResponse as FCEQuestionnaireResponse } from '@beda.software/aidbox-types';
 
 export function processReference(fceQR: FCEQuestionnaireResponse): FHIRQuestionnaireResponse {
     const { encounter, source, subject, ...commonProperties } = fceQR;

package/src/converter/fhirToFce/index.ts

@@ -6,7 +6,7 @@ import {
 import {
     Questionnaire as FCEQuestionnaire,
     QuestionnaireResponse as FCEQuestionnaireResponse,
-} from 'shared/src/contrib/aidbox';
+} from '@beda.software/aidbox-types';
 
 import { convertQuestionnaire } from './questionnaire';
 import { convertQuestionnaireResponse } from './questionnaireResponse';

package/src/converter/fhirToFce/questionnaire/index.ts

@@ -1,7 +1,7 @@
 import { Questionnaire as FHIRQuestionnaire } from 'fhir/r4b';
 import cloneDeep from 'lodash/cloneDeep';
 
-import { Questionnaire as FCEQuestionnaire } from 'shared/src/contrib/aidbox';
+import { Questionnaire as FCEQuestionnaire } from '@beda.software/aidbox-types';
 
 import { processExtensions } from './processExtensions';
 import { processItems } from './processItems';

package/src/converter/fhirToFce/questionnaire/processItems.ts

@@ -14,7 +14,7 @@ import {
     QuestionnaireItemEnableWhenAnswer as FCEQuestionnaireItemEnableWhenAnswer,
     QuestionnaireItemAnswerOption as FCEQuestionnaireItemAnswerOption,
     QuestionnaireItemInitial as FCEQuestionnaireItemInitial,
-} from 'shared/src/contrib/aidbox';
+} from '@beda.software/aidbox-types';
 
 import { convertFromFHIRExtension, filterExtensions, fromFHIRReference } from '../../../converter';
 import { ExtensionIdentifier } from '../../extensions';

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

@@ -1,7 +1,7 @@
 import { QuestionnaireResponse as FHIRQuestionnaireResponse } from 'fhir/r4b';
 import cloneDeep from 'lodash/cloneDeep';
 
-import { QuestionnaireResponse as FCEQuestionnaireResponse } from 'shared/src/contrib/aidbox';
+import { QuestionnaireResponse as FCEQuestionnaireResponse } from '@beda.software/aidbox-types';
 
 import { processAnswers } from './processAnswers';
 import { processMeta } from './processMeta';

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

@@ -7,7 +7,7 @@ import {
 } from 'fhir/r4b';
 import isEmpty from 'lodash/isEmpty';
 
-import { QuestionnaireResponseItemAnswer as FCEQuestionnaireResponseItemAnswer } from 'shared/src/contrib/aidbox';
+import { QuestionnaireResponseItemAnswer as FCEQuestionnaireResponseItemAnswer } from '@beda.software/aidbox-types';
 
 import { fromFHIRReference } from '../../../converter';
 
@@ -25,9 +25,7 @@ export function processAnswers(items: FHIRQuestionnaireResponseItem[]) {
     }
 }
 
-function processAnswer(
-    answer: FHIRQuestionnaireResponseItemAnswer,
-): FCEQuestionnaireResponseItemAnswer {
+function processAnswer(answer: FHIRQuestionnaireResponseItemAnswer): FCEQuestionnaireResponseItemAnswer {
     const fceAnswer: FCEQuestionnaireResponseItemAnswer = { ...answer };
     const valueHandlers = {
         valueString: (value: string) => ({ string: value }),
@@ -47,11 +45,11 @@ function processAnswer(
 
     for (const key in valueHandlers) {
         if (key in fceAnswer) {
-            //@ts-ignore
+            //@ts-expect-error: Element implicitly has an 'any' type
             const value = fceAnswer[key];
-            //@ts-ignore
+            //@ts-expect-error: Element implicitly has an 'any' type
             delete fceAnswer[key];
-            //@ts-ignore
+            //@ts-expect-error: Element implicitly has an 'any' type
             fceAnswer.value = valueHandlers[key]?.(value);
         }
     }

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

@@ -1,6 +1,6 @@
 import { Meta as FHIRMeta } from 'fhir/r4b';
 
-import { Meta as FCEMeta } from 'shared/src/contrib/aidbox';
+import { Meta as FCEMeta } from '@beda.software/aidbox-types';
 
 import { extractExtension } from '../../../converter';
 

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

@@ -1,6 +1,6 @@
 import { QuestionnaireResponse as FHIRQuestionnaireResponse } from 'fhir/r4b';
 
-import { QuestionnaireResponse as FCEQuestionnaireResponse } from 'shared/src/contrib/aidbox';
+import { QuestionnaireResponse as FCEQuestionnaireResponse } from '@beda.software/aidbox-types';
 
 import { fromFHIRReference } from '../../../converter';
 

package/src/converter/index.ts

@@ -8,7 +8,7 @@ import {
     Extension as FCEExtension,
     QuestionnaireItem as FCEQuestionnaireItem,
     InternalReference,
-} from 'shared/src/contrib/aidbox';
+} from '@beda.software/aidbox-types';
 
 import { ExtensionIdentifier, extensionTransformers } from './extensions';
 import { fromFirstClassExtension, fromFirstClassExtensionV2 } from './fceToFhir';

package/src/setupTests.ts

@@ -1 +1 @@
-import '@testing-library/jest-dom/extend-expect';
+// import '@testing-library/jest-dom/extend-expect';

package/src/types.ts

@@ -8,7 +8,7 @@ import {
     QuestionnaireResponse,
     QuestionnaireResponseItem,
     QuestionnaireResponseItemAnswer,
-} from 'shared/src/contrib/aidbox';
+} from '@beda.software/aidbox-types';
 
 export type GroupItemComponent = ComponentType<GroupItemProps>;
 export type QuestionItemComponent = ComponentType<QuestionItemProps>;