sdc-qrf 0.3.9 → 0.3.11

package/lib/converter/extensions.d.ts

@@ -26,6 +26,7 @@ export declare enum ExtensionIdentifier {
     InlineChoiceDirection = "https://beda.software/fhir-emr-questionnaire/inline-choice-direction",
     ChoiceColumns = "http://aidbox.io/fhir/StructureDefinition/questionnaire-choiceColumns",
     ItemPopulationContext = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-itemPopulationContext",
+    ItemConstraint = "http://hl7.org/fhir/StructureDefinition/questionnaire-constraint",
     InitialExpression = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
     ChoiceColumn = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-choiceColumn",
     CalculatedExpression = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-calculatedExpression",
@@ -43,13 +44,14 @@ export declare enum ExtensionIdentifier {
 export type ExtensionTransformer = {
     [key in ExtensionIdentifier]: {
         transform: {
-            fromExtension: (extension: FHIRExtension) => Partial<FCEQuestionnaireItem> | undefined;
-            toExtension: (item: FCEQuestionnaireItem) => FHIRExtension | undefined;
+            fromExtensions: (extensions: FHIRExtension[]) => Partial<FCEQuestionnaireItem> | undefined;
+            toExtensions: (item: FCEQuestionnaireItem) => FHIRExtension[];
         };
     } | {
         path: {
             extension: keyof FHIRExtension;
             questionnaire: keyof FCEQuestionnaireItem;
+            isCollection?: boolean;
         };
     };
 };

package/lib/converter/extensions.js

@@ -28,6 +28,7 @@ var ExtensionIdentifier;
     ExtensionIdentifier["InlineChoiceDirection"] = "https://beda.software/fhir-emr-questionnaire/inline-choice-direction";
     ExtensionIdentifier["ChoiceColumns"] = "http://aidbox.io/fhir/StructureDefinition/questionnaire-choiceColumns";
     ExtensionIdentifier["ItemPopulationContext"] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-itemPopulationContext";
+    ExtensionIdentifier["ItemConstraint"] = "http://hl7.org/fhir/StructureDefinition/questionnaire-constraint";
     ExtensionIdentifier["InitialExpression"] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression";
     ExtensionIdentifier["ChoiceColumn"] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-choiceColumn";
     ExtensionIdentifier["CalculatedExpression"] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-calculatedExpression";
@@ -59,29 +60,32 @@ exports.extensionTransformers = {
         path: { extension: 'valueCoding', questionnaire: 'unit' },
     },
     [ExtensionIdentifier.UnitOption]: {
-        path: { extension: 'valueCoding', questionnaire: 'unitOption' },
+        path: { extension: 'valueCoding', questionnaire: 'unitOption', isCollection: true },
     },
     [ExtensionIdentifier.RowsNumber]: {
         path: { extension: 'valueInteger', questionnaire: 'rowsNumber' },
     },
     [ExtensionIdentifier.ReferenceResource]: {
         transform: {
-            fromExtension: (extension) => {
-                if (extension.valueCode) {
-                    return { referenceResource: [extension.valueCode] };
+            fromExtensions: (extensions) => {
+                if (extensions[0].valueCode) {
+                    return { referenceResource: [extensions[0].valueCode] };
                 }
                 else {
                     return {};
                 }
             },
-            toExtension: (item) => {
+            toExtensions: (item) => {
                 var _a;
                 if ((_a = item.referenceResource) === null || _a === void 0 ? void 0 : _a.length) {
-                    return {
-                        url: ExtensionIdentifier.ReferenceResource,
-                        valueCode: item.referenceResource[0],
-                    };
+                    return [
+                        {
+                            url: ExtensionIdentifier.ReferenceResource,
+                            valueCode: item.referenceResource[0],
+                        },
+                    ];
                 }
+                return [];
             },
         },
     },
@@ -102,26 +106,26 @@ exports.extensionTransformers = {
     },
     [ExtensionIdentifier.MinValue]: {
         transform: {
-            fromExtension: (extension) => ({ minValue: extension }),
-            toExtension: (item) => item.minValue,
+            fromExtensions: (extensions) => ({ minValue: extensions[0] }),
+            toExtensions: (item) => (item.minValue ? [item.minValue] : []),
         },
     },
     [ExtensionIdentifier.MaxValue]: {
         transform: {
-            fromExtension: (extension) => ({ maxValue: extension }),
-            toExtension: (item) => item.maxValue,
+            fromExtensions: (extensions) => ({ maxValue: extensions[0] }),
+            toExtensions: (item) => (item.maxValue ? [item.maxValue] : []),
         },
     },
     [ExtensionIdentifier.MinQuantity]: {
         transform: {
-            fromExtension: (extension) => ({ minQuantity: extension }),
-            toExtension: (item) => item.minQuantity,
+            fromExtensions: (extensions) => ({ minQuantity: extensions[0] }),
+            toExtensions: (item) => (item.minQuantity ? [item.minQuantity] : []),
         },
     },
     [ExtensionIdentifier.MaxQuantity]: {
         transform: {
-            fromExtension: (extension) => ({ maxQuantity: extension }),
-            toExtension: (item) => item.maxQuantity,
+            fromExtensions: (extensions) => ({ maxQuantity: extensions[0] }),
+            toExtensions: (item) => (item.maxQuantity ? [item.maxQuantity] : []),
         },
     },
     [ExtensionIdentifier.ShowOrdinalValue]: {
@@ -151,6 +155,57 @@ exports.extensionTransformers = {
     [ExtensionIdentifier.ItemPopulationContext]: {
         path: { extension: 'valueExpression', questionnaire: 'itemPopulationContext' },
     },
+    [ExtensionIdentifier.ItemConstraint]: {
+        transform: {
+            fromExtensions: (extensions) => {
+                return {
+                    itemConstraint: extensions.map((extension) => {
+                        var _a;
+                        const itemConstraintExtension = extension.extension;
+                        return {
+                            key: itemConstraintExtension.find((obj) => obj.url === 'key').valueId,
+                            requirements: (_a = itemConstraintExtension.find((obj) => obj.url === 'requirements')) === null || _a === void 0 ? void 0 : _a.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,
+                        };
+                    }),
+                };
+            },
+            toExtensions: (item) => {
+                if (item.itemConstraint) {
+                    return item.itemConstraint.map((itemConstraint) => ({
+                        url: ExtensionIdentifier.ItemConstraint,
+                        extension: [
+                            {
+                                url: 'key',
+                                valueId: itemConstraint.key,
+                            },
+                            {
+                                url: 'requirements',
+                                valueString: itemConstraint.requirements,
+                            },
+                            {
+                                url: 'severity',
+                                valueCode: itemConstraint.severity,
+                            },
+                            {
+                                url: 'human',
+                                valueString: itemConstraint === null || itemConstraint === void 0 ? void 0 : itemConstraint.human,
+                            },
+                            {
+                                url: 'expression',
+                                valueString: itemConstraint.expression,
+                            },
+                        ],
+                    }));
+                }
+                return [];
+            },
+        },
+    },
     [ExtensionIdentifier.InitialExpression]: {
         path: { extension: 'valueExpression', questionnaire: 'initialExpression' },
     },
@@ -165,37 +220,35 @@ exports.extensionTransformers = {
     },
     [ExtensionIdentifier.ChoiceColumn]: {
         transform: {
-            fromExtension: (extension) => {
-                var _a, _b, _c;
-                const choiceColumnExtension = extension.extension;
-                if (choiceColumnExtension) {
-                    return {
-                        choiceColumn: [
-                            {
-                                forDisplay: (_b = (_a = choiceColumnExtension.find((obj) => obj.url === 'forDisplay')) === null || _a === void 0 ? void 0 : _a.valueBoolean) !== null && _b !== void 0 ? _b : false,
-                                path: (_c = choiceColumnExtension.find((obj) => obj.url === 'path')) === null || _c === void 0 ? void 0 : _c.valueString,
-                            },
-                        ],
-                    };
-                }
+            fromExtensions: (extensions) => {
+                return {
+                    choiceColumn: extensions.map((extension) => {
+                        var _a, _b, _c;
+                        const choiceColumnExtension = extension.extension;
+                        return {
+                            forDisplay: (_b = (_a = choiceColumnExtension.find((obj) => obj.url === 'forDisplay')) === null || _a === void 0 ? void 0 : _a.valueBoolean) !== null && _b !== void 0 ? _b : false,
+                            path: (_c = choiceColumnExtension.find((obj) => obj.url === 'path')) === null || _c === void 0 ? void 0 : _c.valueString,
+                        };
+                    }),
+                };
             },
-            toExtension: (item) => {
-                var _a, _b;
+            toExtensions: (item) => {
                 if (item.choiceColumn) {
-                    return {
+                    return item.choiceColumn.map((choiceColumn) => ({
                         url: ExtensionIdentifier.ChoiceColumn,
                         extension: [
                             {
                                 url: 'forDisplay',
-                                valueBoolean: (_a = item.choiceColumn[0]) === null || _a === void 0 ? void 0 : _a.forDisplay,
+                                valueBoolean: choiceColumn.forDisplay,
                             },
                             {
                                 url: 'path',
-                                valueString: (_b = item.choiceColumn[0]) === null || _b === void 0 ? void 0 : _b.path,
+                                valueString: choiceColumn.path,
                             },
                         ],
-                    };
+                    }));
                 }
+                return [];
             },
         },
     },

package/lib/converter/extensions.js.map

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

package/lib/converter/fceToFhir/questionnaire/processItems.js

@@ -8,7 +8,7 @@ function processItems(items) {
     return items.map((item) => {
         const extensions = (0, __1.convertToFHIRExtension)(item);
         if (extensions.length > 0) {
-            const fieldsToOmit = extensions
+            const fieldsToOmit = Object.values(lodash_1.default.groupBy(extensions, (extension) => extension.url))
                 .map(__1.convertFromFHIRExtension)
                 .filter((ext) => ext !== undefined)
                 .flatMap(Object.keys);

package/lib/converter/fceToFhir/questionnaire/processItems.js.map

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

package/lib/converter/fhirToFce/questionnaire/processItems.js

@@ -21,36 +21,28 @@ function convertItemProperties(item) {
     return newItem;
 }
 function getUpdatedPropertiesFromItem(item) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     let updatedProperties = { linkId: item.linkId, type: item.type };
     for (const identifier of Object.values(extensions_1.ExtensionIdentifier)) {
-        if (identifier === extensions_1.ExtensionIdentifier.UnitOption) {
-            const unitOptions = ((_a = item.extension) === null || _a === void 0 ? void 0 : _a.filter((ext) => ext.url === extensions_1.ExtensionIdentifier.UnitOption)) || [];
-            if (unitOptions.length > 0) {
-                const unitOption = unitOptions.map((ext) => { var _a; return (_a = (0, converter_1.convertFromFHIRExtension)(ext)) === null || _a === void 0 ? void 0 : _a.unitOption; });
-                updatedProperties = Object.assign(Object.assign({}, updatedProperties), { unitOption });
-            }
-            continue;
-        }
         for (const property of Object.keys(item)) {
             const element = item[property];
             if (property.startsWith('_') && element instanceof Object) {
-                const primitiveExtensions = (_b = element === null || element === void 0 ? void 0 : element.extension) !== null && _b !== void 0 ? _b : [];
+                const primitiveExtensions = (_a = element === null || element === void 0 ? void 0 : element.extension) !== null && _a !== void 0 ? _a : [];
                 for (const extension of primitiveExtensions) {
                     if (extension.url === identifier) {
-                        updatedProperties = Object.assign(Object.assign({}, updatedProperties), { [property]: (0, converter_1.convertFromFHIRExtension)(extension) });
+                        updatedProperties = Object.assign(Object.assign({}, updatedProperties), { [property]: (0, converter_1.convertFromFHIRExtension)([extension]) });
                     }
                 }
             }
         }
-        const extension = (0, converter_1.findExtension)(item, identifier);
-        if (extension !== undefined) {
-            updatedProperties = Object.assign(Object.assign({}, updatedProperties), (0, converter_1.convertFromFHIRExtension)(extension));
+        const extensions = (0, converter_1.filterExtensions)(item, identifier);
+        if (extensions === null || extensions === void 0 ? void 0 : extensions.length) {
+            updatedProperties = Object.assign(Object.assign({}, updatedProperties), (0, converter_1.convertFromFHIRExtension)(extensions));
         }
     }
-    updatedProperties.answerOption = (_c = item.answerOption) === null || _c === void 0 ? void 0 : _c.map(processItemOption);
-    updatedProperties.initial = (_d = item.initial) === null || _d === void 0 ? void 0 : _d.map(processItemOption);
-    updatedProperties.enableWhen = (_e = item.enableWhen) === null || _e === void 0 ? void 0 : _e.map(processEnableWhenItem);
+    updatedProperties.answerOption = (_b = item.answerOption) === null || _b === void 0 ? void 0 : _b.map(processItemOption);
+    updatedProperties.initial = (_c = item.initial) === null || _c === void 0 ? void 0 : _c.map(processItemOption);
+    updatedProperties.enableWhen = (_d = item.enableWhen) === null || _d === void 0 ? void 0 : _d.map(processEnableWhenItem);
     return updatedProperties;
 }
 function processEnableWhenItem(item) {

package/lib/converter/fhirToFce/questionnaire/processItems.js.map

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

package/lib/converter/index.d.ts

@@ -4,10 +4,10 @@ import { fromFirstClassExtension } from './fceToFhir';
 import { toFirstClassExtension } from './fhirToFce';
 import { processLaunchContext as processLaunchContextToFce } from './fhirToFce/questionnaire/processExtensions';
 export * from './utils';
-export declare function convertFromFHIRExtension(extension: FHIRExtension): Partial<FCEQuestionnaireItem> | undefined;
+export declare function convertFromFHIRExtension(extensions: FHIRExtension[]): Partial<FCEQuestionnaireItem> | undefined;
 export declare function convertToFHIRExtension(item: FCEQuestionnaireItem): FHIRExtension[];
 export declare function extractExtension(extension: FCEExtension[] | undefined, url: 'ex:createdAt'): string | undefined;
-export declare function findExtension(item: FHIRQuestionnaireItem, url: string): FHIRExtension | undefined;
+export declare function filterExtensions(item: FHIRQuestionnaireItem, url: string): FHIRExtension[] | undefined;
 export declare function fromFHIRReference(r?: FHIRReference): InternalReference | undefined;
 export declare function toFHIRReference(r?: InternalReference): FHIRReference | undefined;
 export { toFirstClassExtension, fromFirstClassExtension, processLaunchContextToFce };

package/lib/converter/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.processLaunchContextToFce = exports.fromFirstClassExtension = exports.toFirstClassExtension = exports.toFHIRReference = exports.fromFHIRReference = exports.findExtension = exports.extractExtension = exports.convertToFHIRExtension = exports.convertFromFHIRExtension = void 0;
+exports.processLaunchContextToFce = exports.fromFirstClassExtension = exports.toFirstClassExtension = exports.toFHIRReference = exports.fromFHIRReference = exports.filterExtensions = exports.extractExtension = exports.convertToFHIRExtension = exports.convertFromFHIRExtension = void 0;
 const tslib_1 = require("tslib");
 const extensions_1 = require("./extensions");
 const fceToFhir_1 = require("./fceToFhir");
@@ -10,15 +10,19 @@ Object.defineProperty(exports, "toFirstClassExtension", { enumerable: true, get:
 const processExtensions_1 = require("./fhirToFce/questionnaire/processExtensions");
 Object.defineProperty(exports, "processLaunchContextToFce", { enumerable: true, get: function () { return processExtensions_1.processLaunchContext; } });
 tslib_1.__exportStar(require("./utils"), exports);
-function convertFromFHIRExtension(extension) {
-    const identifier = extension.url;
+function convertFromFHIRExtension(extensions) {
+    const identifier = extensions[0].url;
     const transformer = extensions_1.extensionTransformers[identifier];
     if (transformer !== undefined) {
         if ('transform' in transformer) {
-            return transformer.transform.fromExtension(extension);
+            return transformer.transform.fromExtensions(extensions);
         }
         else {
-            return { [transformer.path.questionnaire]: extension[transformer.path.extension] };
+            return {
+                [transformer.path.questionnaire]: transformer.path.isCollection
+                    ? extensions.map((extension) => extension[transformer.path.extension])
+                    : extensions[0][transformer.path.extension],
+            };
         }
     }
 }
@@ -28,19 +32,16 @@ function convertToFHIRExtension(item) {
     Object.values(extensions_1.ExtensionIdentifier).forEach((identifier) => {
         const transformer = extensions_1.extensionTransformers[identifier];
         if ('transform' in transformer) {
-            const extension = transformer.transform.toExtension(item);
-            if (extension !== undefined) {
-                extensions.push(extension);
-            }
+            extensions.push(...transformer.transform.toExtensions(item));
         }
         else {
-            const extensionValue = item[transformer.path.questionnaire];
-            if (extensionValue !== undefined) {
-                const extension = {
+            const value = item[transformer.path.questionnaire];
+            if (value !== undefined) {
+                const valueArray = Array.isArray(value) ? value : [value];
+                extensions.push(...valueArray.map((extensionValue) => ({
                     [transformer.path.extension]: extensionValue,
                     url: identifier,
-                };
-                extensions.push(extension);
+                })));
             }
         }
     });
@@ -52,15 +53,18 @@ function extractExtension(extension, url) {
     return (_a = extension === null || extension === void 0 ? void 0 : extension.find((e) => e.url === url)) === null || _a === void 0 ? void 0 : _a.valueInstant;
 }
 exports.extractExtension = extractExtension;
-function findExtension(item, url) {
+function filterExtensions(item, url) {
     var _a;
-    return (_a = item.extension) === null || _a === void 0 ? void 0 : _a.find((ext) => ext.url === url);
+    return (_a = item.extension) === null || _a === void 0 ? void 0 : _a.filter((ext) => ext.url === url);
 }
-exports.findExtension = findExtension;
+exports.filterExtensions = filterExtensions;
 function fromFHIRReference(r) {
     if (!r || !r.reference) {
         return undefined;
     }
+    // We remove original reference from r in this "strange" way
+    // TODO: re-write omitting
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const { reference: literalReference } = r, commonReferenceProperties = tslib_1.__rest(r, ["reference"]);
     const isHistoryVersionLink = r.reference.split('/').slice(-2, -1)[0] === '_history';
     if (isHistoryVersionLink) {

package/lib/converter/index.js.map

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

package/package.json

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

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

@@ -13,6 +13,7 @@ import fce_allergies from './resources/questionnaire_fce/allergies.json';
 import fce_beverages from './resources/questionnaire_fce/beverages.json';
 import fce_choice_answer_option from './resources/questionnaire_fce/choice_answer_option.json';
 import fce_consent from './resources/questionnaire_fce/consent.json';
+import fce_constraint from './resources/questionnaire_fce/constraint.json';
 import fce_cqf_examples from './resources/questionnaire_fce/cqf-examples.json';
 import fce_enable_when from './resources/questionnaire_fce/enable_when.json';
 import fce_encounter_create from './resources/questionnaire_fce/encounter_create.json';
@@ -31,12 +32,14 @@ import fce_practitioner_role_create from './resources/questionnaire_fce/practiti
 import fce_public_appointment from './resources/questionnaire_fce/public_appointment.json';
 import fce_review_of_systems from './resources/questionnaire_fce/review_of_systems.json';
 import fce_source_queries from './resources/questionnaire_fce/source_queries.json';
+import fce_unit_option from './resources/questionnaire_fce/unit-option.json';
 import fce_vitals from './resources/questionnaire_fce/vitals.json';
 // fhir questionnaire
 import fhir_allergies from './resources/questionnaire_fhir/allergies.json';
 import fhir_beverages from './resources/questionnaire_fhir/beverages.json';
 import fhir_choice_answer_option from './resources/questionnaire_fhir/choice_answer_option.json';
 import fhir_consent from './resources/questionnaire_fhir/consent.json';
+import fhir_constraint from './resources/questionnaire_fhir/constraint.json';
 import fhir_cqf_examples from './resources/questionnaire_fhir/cqf-examples.json';
 import fhir_enable_when from './resources/questionnaire_fhir/enable_when.json';
 import fhir_encounter_create from './resources/questionnaire_fhir/encounter_create.json';
@@ -55,6 +58,7 @@ import fhir_practitioner_role_create from './resources/questionnaire_fhir/practi
 import fhir_public_appointment from './resources/questionnaire_fhir/public_appointment.json';
 import fhir_review_of_systems from './resources/questionnaire_fhir/review_of_systems.json';
 import fhir_source_queries from './resources/questionnaire_fhir/source_queries.json';
+import fhir_unit_option from './resources/questionnaire_fhir/unit-option.json';
 import fhir_vitals from './resources/questionnaire_fhir/vitals.json';
 // fce questionnaire response
 import fce_allergies_inprogress_qr from './resources/questionnaire_response_fce/allergies_inprogress.json';
@@ -114,6 +118,8 @@ describe('Questionanire and QuestionnaireResponses transformation', () => {
         [fhir_consent, fce_consent],
         [fhir_enable_when, fce_enable_when],
         [fhir_cqf_examples, fce_cqf_examples],
+        [fhir_constraint, fce_constraint],
+        [fhir_unit_option, fce_unit_option],
     ])(
         'Each FHIR Questionnaire should convert to FCE',
         async (fhir_questionnaire, fce_questionnaire) => {
@@ -147,6 +153,8 @@ describe('Questionanire and QuestionnaireResponses transformation', () => {
         [fce_consent, fhir_consent],
         [fce_enable_when, fhir_enable_when],
         [fce_cqf_examples, fhir_cqf_examples],
+        [fce_constraint, fhir_constraint],
+        [fce_unit_option, fhir_unit_option],
     ])(
         'Each FCE Questionnaire should convert to FHIR',
         async (fce_questionnaire, fhir_questionnaire) => {

package/src/converter/__tests__/resources/questionnaire_fce/constraint.json

@@ -0,0 +1,31 @@
+{
+    "resourceType": "Questionnaire",
+    "id": "constraint",
+    "meta": {
+        "profile": ["https://beda.software/beda-emr-questionnaire"]
+    },
+    "status": "active",
+    "item": [
+        {
+            "type": "string",
+            "linkId": "email",
+            "itemConstraint": [
+                {
+                    "key": "first",
+                    "requirements": "Req first",
+                    "severity": "error",
+                    "human": "Human first",
+                    "expression": "false"
+                },
+                {
+                    "key": "second",
+                    "requirements": "Req second",
+                    "severity": "error",
+                    "human": "Human second",
+                    "expression": "true"
+                }
+                 
+            ]
+        }
+    ]
+}

package/src/converter/__tests__/resources/questionnaire_fce/unit-option.json

@@ -0,0 +1,31 @@
+{
+    "resourceType": "Questionnaire",
+    "id": "unit-option",
+    "meta": {
+        "profile": ["https://beda.software/beda-emr-questionnaire"]
+    },
+    "status": "active",
+    "item": [
+        {
+            "type": "quantity",
+            "linkId": "height",
+            "unitOption": [
+                {
+                    "code": "foot",
+                    "system": "http://unitsofmeasure.org",
+                    "display": "ft"
+                },
+                {
+                    "code": "inch",
+                    "system": "http://unitsofmeasure.org",
+                    "display": "in"
+                },
+                {
+                    "code": "cm",
+                    "system": "http://unitsofmeasure.org",
+                    "display": "cm"
+                }
+            ]
+        }
+    ]
+}

package/src/converter/__tests__/resources/questionnaire_fhir/constraint.json

@@ -0,0 +1,66 @@
+{
+    "item": [
+        {
+            "type": "string",
+            "linkId": "email",
+            "extension": [
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-constraint",
+                    "extension": [
+                        {
+                            "url": "key",
+                            "valueId": "first"
+                        },
+                        {
+                            "url": "human",
+                            "valueString": "Human first"
+                        },
+                        {
+                            "url": "severity",
+                            "valueCode": "error"
+                        },
+                        {
+                            "url": "expression",
+                            "valueString": "false"
+                        },
+                        {
+                            "url": "requirements",
+                            "valueString": "Req first"
+                        }
+                    ]
+                },
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-constraint",
+                    "extension": [
+                        {
+                            "url": "key",
+                            "valueId": "second"
+                        },
+                        {
+                            "url": "human",
+                            "valueString": "Human second"
+                        },
+                        {
+                            "url": "severity",
+                            "valueCode": "error"
+                        },
+                        {
+                            "url": "expression",
+                            "valueString": "true"
+                        },
+                        {
+                            "url": "requirements",
+                            "valueString": "Req second"
+                        }
+                    ]
+                }
+            ]
+        }
+    ],
+    "meta": {
+        "profile": ["https://beda.software/beda-emr-questionnaire"]
+    },
+    "status": "active",
+    "resourceType": "Questionnaire",
+    "id": "constraint"
+}

package/src/converter/__tests__/resources/questionnaire_fhir/unit-option.json

@@ -0,0 +1,40 @@
+{
+    "item": [
+        {
+            "type": "quantity",
+            "linkId": "height",
+            "extension": [
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-unitOption",
+                    "valueCoding": {
+                        "code": "foot",
+                        "system": "http://unitsofmeasure.org",
+                        "display": "ft"
+                    }
+                },
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-unitOption",
+                    "valueCoding": {
+                        "code": "inch",
+                        "system": "http://unitsofmeasure.org",
+                        "display": "in"
+                    }
+                },
+                {
+                    "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-unitOption",
+                    "valueCoding": {
+                        "code": "cm",
+                        "system": "http://unitsofmeasure.org",
+                        "display": "cm"
+                    }
+                }
+            ]
+        }
+    ],
+    "meta": {
+        "profile": ["https://beda.software/beda-emr-questionnaire"]
+    },
+    "status": "active",
+    "id": "unit-option",
+    "resourceType": "Questionnaire"
+}

package/src/converter/extensions.ts

@@ -29,6 +29,7 @@ export enum ExtensionIdentifier {
     ChoiceColumns = 'http://aidbox.io/fhir/StructureDefinition/questionnaire-choiceColumns',
 
     ItemPopulationContext = 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-itemPopulationContext',
+    ItemConstraint = 'http://hl7.org/fhir/StructureDefinition/questionnaire-constraint',
     InitialExpression = 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression',
     ChoiceColumn = 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-choiceColumn',
     CalculatedExpression = 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-calculatedExpression',
@@ -49,16 +50,17 @@ export type ExtensionTransformer = {
     [key in ExtensionIdentifier]:
         | {
               transform: {
-                  fromExtension: (
-                      extension: FHIRExtension,
+                  fromExtensions: (
+                      extensions: FHIRExtension[],
                   ) => Partial<FCEQuestionnaireItem> | undefined;
-                  toExtension: (item: FCEQuestionnaireItem) => FHIRExtension | undefined;
+                  toExtensions: (item: FCEQuestionnaireItem) => FHIRExtension[];
               };
           }
         | {
               path: {
                   extension: keyof FHIRExtension;
                   questionnaire: keyof FCEQuestionnaireItem;
+                  isCollection?: boolean;
               };
           };
 };
@@ -80,27 +82,31 @@ export const extensionTransformers: ExtensionTransformer = {
         path: { extension: 'valueCoding', questionnaire: 'unit' },
     },
     [ExtensionIdentifier.UnitOption]: {
-        path: { extension: 'valueCoding', questionnaire: 'unitOption' },
+        path: { extension: 'valueCoding', questionnaire: 'unitOption', isCollection: true },
     },
     [ExtensionIdentifier.RowsNumber]: {
         path: { extension: 'valueInteger', questionnaire: 'rowsNumber' },
     },
     [ExtensionIdentifier.ReferenceResource]: {
         transform: {
-            fromExtension: (extension) => {
-                if (extension.valueCode) {
-                    return { referenceResource: [extension.valueCode] };
+            fromExtensions: (extensions) => {
+                if (extensions[0]!.valueCode) {
+                    return { referenceResource: [extensions[0]!.valueCode] };
                 } else {
                     return {};
                 }
             },
-            toExtension: (item) => {
+            toExtensions: (item) => {
                 if (item.referenceResource?.length) {
-                    return {
-                        url: ExtensionIdentifier.ReferenceResource,
-                        valueCode: item.referenceResource[0],
-                    };
+                    return [
+                        {
+                            url: ExtensionIdentifier.ReferenceResource,
+                            valueCode: item.referenceResource[0],
+                        },
+                    ];
                 }
+
+                return [];
             },
         },
     },
@@ -121,26 +127,26 @@ export const extensionTransformers: ExtensionTransformer = {
     },
     [ExtensionIdentifier.MinValue]: {
         transform: {
-            fromExtension: (extension) => ({ minValue: extension }),
-            toExtension: (item) => item.minValue,
+            fromExtensions: (extensions) => ({ minValue: extensions[0]! }),
+            toExtensions: (item) => (item.minValue ? [item.minValue] : []),
         },
     },
     [ExtensionIdentifier.MaxValue]: {
         transform: {
-            fromExtension: (extension) => ({ maxValue: extension }),
-            toExtension: (item) => item.maxValue,
+            fromExtensions: (extensions) => ({ maxValue: extensions[0]! }),
+            toExtensions: (item) => (item.maxValue ? [item.maxValue] : []),
         },
     },
     [ExtensionIdentifier.MinQuantity]: {
         transform: {
-            fromExtension: (extension) => ({ minQuantity: extension }),
-            toExtension: (item) => item.minQuantity,
+            fromExtensions: (extensions) => ({ minQuantity: extensions[0]! }),
+            toExtensions: (item) => (item.minQuantity ? [item.minQuantity] : []),
         },
     },
     [ExtensionIdentifier.MaxQuantity]: {
         transform: {
-            fromExtension: (extension) => ({ maxQuantity: extension }),
-            toExtension: (item) => item.maxQuantity,
+            fromExtensions: (extensions) => ({ maxQuantity: extensions[0]! }),
+            toExtensions: (item) => (item.maxQuantity ? [item.maxQuantity] : []),
         },
     },
     [ExtensionIdentifier.ShowOrdinalValue]: {
@@ -171,6 +177,62 @@ export const extensionTransformers: ExtensionTransformer = {
     [ExtensionIdentifier.ItemPopulationContext]: {
         path: { extension: 'valueExpression', questionnaire: 'itemPopulationContext' },
     },
+    [ExtensionIdentifier.ItemConstraint]: {
+        transform: {
+            fromExtensions: (extensions) => {
+                return {
+                    itemConstraint: extensions.map((extension) => {
+                        const itemConstraintExtension = extension.extension!;
+
+                        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!,
+                        };
+                    }),
+                };
+            },
+            toExtensions: (item) => {
+                if (item.itemConstraint) {
+                    return item.itemConstraint.map((itemConstraint) => ({
+                        url: ExtensionIdentifier.ItemConstraint,
+                        extension: [
+                            {
+                                url: 'key',
+                                valueId: itemConstraint.key,
+                            },
+                            {
+                                url: 'requirements',
+                                valueString: itemConstraint.requirements,
+                            },
+                            {
+                                url: 'severity',
+                                valueCode: itemConstraint.severity,
+                            },
+                            {
+                                url: 'human',
+                                valueString: itemConstraint?.human,
+                            },
+                            {
+                                url: 'expression',
+                                valueString: itemConstraint.expression,
+                            },
+                        ],
+                    }));
+                }
+
+                return [];
+            },
+        },
+    },
     [ExtensionIdentifier.InitialExpression]: {
         path: { extension: 'valueExpression', questionnaire: 'initialExpression' },
     },
@@ -185,38 +247,39 @@ export const extensionTransformers: ExtensionTransformer = {
     },
     [ExtensionIdentifier.ChoiceColumn]: {
         transform: {
-            fromExtension: (extension) => {
-                const choiceColumnExtension = extension.extension;
-                if (choiceColumnExtension) {
-                    return {
-                        choiceColumn: [
-                            {
-                                forDisplay:
-                                    choiceColumnExtension.find((obj) => obj.url === 'forDisplay')
-                                        ?.valueBoolean ?? false,
-                                path: choiceColumnExtension.find((obj) => obj.url === 'path')
-                                    ?.valueString,
-                            },
-                        ],
-                    };
-                }
+            fromExtensions: (extensions) => {
+                return {
+                    choiceColumn: extensions.map((extension) => {
+                        const choiceColumnExtension = extension.extension!;
+
+                        return {
+                            forDisplay:
+                                choiceColumnExtension.find((obj) => obj.url === 'forDisplay')
+                                    ?.valueBoolean ?? false,
+                            path: choiceColumnExtension.find((obj) => obj.url === 'path')
+                                ?.valueString,
+                        };
+                    }),
+                };
             },
-            toExtension: (item) => {
+            toExtensions: (item) => {
                 if (item.choiceColumn) {
-                    return {
+                    return item.choiceColumn.map((choiceColumn) => ({
                         url: ExtensionIdentifier.ChoiceColumn,
                         extension: [
                             {
                                 url: 'forDisplay',
-                                valueBoolean: item.choiceColumn[0]?.forDisplay,
+                                valueBoolean: choiceColumn.forDisplay,
                             },
                             {
                                 url: 'path',
-                                valueString: item.choiceColumn[0]?.path,
+                                valueString: choiceColumn.path,
                             },
                         ],
-                    };
+                    }));
                 }
+
+                return [];
             },
         },
     },

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

@@ -21,7 +21,7 @@ export function processItems(items: FCEQuestionnaireItem[]): FHIRQuestionnaireIt
     return items.map((item) => {
         const extensions = convertToFHIRExtension(item);
         if (extensions.length > 0) {
-            const fieldsToOmit = extensions
+            const fieldsToOmit = Object.values(_.groupBy(extensions, (extension) => extension.url))
                 .map(convertFromFHIRExtension)
                 .filter((ext): ext is Partial<FCEQuestionnaireItem> => ext !== undefined)
                 .flatMap(Object.keys);

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

@@ -14,10 +14,9 @@ import {
     QuestionnaireItemEnableWhenAnswer as FCEQuestionnaireItemEnableWhenAnswer,
     QuestionnaireItemAnswerOption as FCEQuestionnaireItemAnswerOption,
     QuestionnaireItemInitial as FCEQuestionnaireItemInitial,
-    Coding as FCECoding,
 } from 'shared/src/contrib/aidbox';
 
-import { convertFromFHIRExtension, findExtension, fromFHIRReference } from '../../../converter';
+import { convertFromFHIRExtension, filterExtensions, fromFHIRReference } from '../../../converter';
 import { ExtensionIdentifier } from '../../extensions';
 
 export function processItems(fhirQuestionnaire: FHIRQuestionnaire) {
@@ -41,18 +40,6 @@ function getUpdatedPropertiesFromItem(item: FHIRQuestionnaireItem) {
     let updatedProperties: FCEQuestionnaireItem = { linkId: item.linkId, type: item.type };
 
     for (const identifier of Object.values(ExtensionIdentifier)) {
-        if (identifier === ExtensionIdentifier.UnitOption) {
-            const unitOptions =
-                item.extension?.filter((ext) => ext.url === ExtensionIdentifier.UnitOption) || [];
-            if (unitOptions.length > 0) {
-                const unitOption = unitOptions.map(
-                    (ext) => convertFromFHIRExtension(ext)?.unitOption,
-                ) as FCECoding[];
-                updatedProperties = { ...updatedProperties, unitOption };
-            }
-            continue;
-        }
-
         for (const property of Object.keys(item)) {
             const element = item[property as keyof FHIRQuestionnaireItem];
             if (property.startsWith('_') && element instanceof Object) {
@@ -61,18 +48,18 @@ function getUpdatedPropertiesFromItem(item: FHIRQuestionnaireItem) {
                     if (extension.url === identifier) {
                         updatedProperties = {
                             ...updatedProperties,
-                            ...{ [property]: convertFromFHIRExtension(extension) },
+                            ...{ [property]: convertFromFHIRExtension([extension]) },
                         };
                     }
                 }
             }
         }
 
-        const extension = findExtension(item, identifier);
-        if (extension !== undefined) {
+        const extensions = filterExtensions(item, identifier);
+        if (extensions?.length) {
             updatedProperties = {
                 ...updatedProperties,
-                ...convertFromFHIRExtension(extension),
+                ...convertFromFHIRExtension(extensions),
             };
         }
     }

package/src/converter/index.ts

@@ -17,15 +17,19 @@ import { processLaunchContext as processLaunchContextToFce } from './fhirToFce/q
 export * from './utils';
 
 export function convertFromFHIRExtension(
-    extension: FHIRExtension,
+    extensions: FHIRExtension[],
 ): Partial<FCEQuestionnaireItem> | undefined {
-    const identifier = extension.url;
+    const identifier = extensions[0]!.url;
     const transformer = extensionTransformers[identifier as ExtensionIdentifier];
     if (transformer !== undefined) {
         if ('transform' in transformer) {
-            return transformer.transform.fromExtension(extension);
+            return transformer.transform.fromExtensions(extensions);
         } else {
-            return { [transformer.path.questionnaire]: extension[transformer.path.extension] };
+            return {
+                [transformer.path.questionnaire]: transformer.path.isCollection
+                    ? extensions.map((extension) => extension[transformer.path.extension])
+                    : extensions[0]![transformer.path.extension],
+            };
         }
     }
 }
@@ -35,18 +39,18 @@ export function convertToFHIRExtension(item: FCEQuestionnaireItem): FHIRExtensio
     Object.values(ExtensionIdentifier).forEach((identifier) => {
         const transformer = extensionTransformers[identifier];
         if ('transform' in transformer) {
-            const extension = transformer.transform.toExtension(item);
-            if (extension !== undefined) {
-                extensions.push(extension);
-            }
+            extensions.push(...transformer.transform.toExtensions(item));
         } else {
-            const extensionValue = item[transformer.path.questionnaire];
-            if (extensionValue !== undefined) {
-                const extension: FHIRExtension = {
-                    [transformer.path.extension]: extensionValue,
-                    url: identifier,
-                };
-                extensions.push(extension);
+            const value = item[transformer.path.questionnaire];
+            if (value !== undefined) {
+                const valueArray = Array.isArray(value) ? value : [value];
+
+                extensions.push(
+                    ...valueArray.map((extensionValue) => ({
+                        [transformer.path.extension]: extensionValue,
+                        url: identifier,
+                    })),
+                );
             }
         }
     });
@@ -57,8 +61,8 @@ export function extractExtension(extension: FCEExtension[] | undefined, url: 'ex
     return extension?.find((e) => e.url === url)?.valueInstant;
 }
 
-export function findExtension(item: FHIRQuestionnaireItem, url: string) {
-    return item.extension?.find((ext) => ext.url === url);
+export function filterExtensions(item: FHIRQuestionnaireItem, url: string) {
+    return item.extension?.filter((ext) => ext.url === url);
 }
 
 export function fromFHIRReference(r?: FHIRReference): InternalReference | undefined {
@@ -66,6 +70,9 @@ export function fromFHIRReference(r?: FHIRReference): InternalReference | undefi
         return undefined;
     }
 
+    // We remove original reference from r in this "strange" way
+    // TODO: re-write omitting
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const { reference: literalReference, ...commonReferenceProperties } = r;
     const isHistoryVersionLink = r.reference.split('/').slice(-2, -1)[0] === '_history';