sdc-qrf 1.0.0-beta.22 → 1.0.0-beta.23
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/converter/fceToFhir/questionnaire/processExtensions.d.ts.map +1 -1
- package/dist/converter/fceToFhir/questionnaire/processExtensions.js +7 -1
- package/dist/converter/fceToFhir/questionnaire/processExtensions.js.map +1 -1
- package/dist/converter/fhirToFce/questionnaire/processExtensions.d.ts +2 -1
- package/dist/converter/fhirToFce/questionnaire/processExtensions.d.ts.map +1 -1
- package/dist/converter/fhirToFce/questionnaire/processExtensions.js +10 -0
- package/dist/converter/fhirToFce/questionnaire/processExtensions.js.map +1 -1
- package/dist/fce.types.d.ts +0 -6
- package/dist/fce.types.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/converter/__tests__/resources/questionnaire_fce/assemble_context.json +4 -0
- package/src/converter/__tests__/resources/questionnaire_fhir/assemble_context.json +7 -0
- package/src/converter/fceToFhir/questionnaire/processExtensions.ts +8 -0
- package/src/converter/fhirToFce/questionnaire/processExtensions.ts +16 -1
- package/src/fce.types.ts +0 -6
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processExtensions.d.ts","sourceRoot":"","sources":["../../../../src/converter/fceToFhir/questionnaire/processExtensions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAA8B,aAAa,IAAI,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAE1F,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,gBAAgB,GAAG,iBAAiB,
|
|
1
|
+
{"version":3,"file":"processExtensions.d.ts","sourceRoot":"","sources":["../../../../src/converter/fceToFhir/questionnaire/processExtensions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAA8B,aAAa,IAAI,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAE1F,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,gBAAgB,GAAG,iBAAiB,CAqGpF"}
|
|
@@ -4,7 +4,7 @@ exports.processExtensions = processExtensions;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
function processExtensions(questionnaire) {
|
|
6
6
|
var _a;
|
|
7
|
-
const { launchContext, mapping, sourceQueries, targetStructureMap, assembledFrom, assembleContext } = questionnaire, fhirQuestionnaire = tslib_1.__rest(questionnaire, ["launchContext", "mapping", "sourceQueries", "targetStructureMap", "assembledFrom", "assembleContext"]);
|
|
7
|
+
const { launchContext, mapping, sourceQueries, targetStructureMap, assembledFrom, assembleContext, itemPopulationContext } = questionnaire, fhirQuestionnaire = tslib_1.__rest(questionnaire, ["launchContext", "mapping", "sourceQueries", "targetStructureMap", "assembledFrom", "assembleContext", "itemPopulationContext"]);
|
|
8
8
|
let extensions = [];
|
|
9
9
|
if (launchContext) {
|
|
10
10
|
for (const launchContextItem of launchContext) {
|
|
@@ -64,6 +64,12 @@ function processExtensions(questionnaire) {
|
|
|
64
64
|
valueString: assembleContextItem,
|
|
65
65
|
})));
|
|
66
66
|
}
|
|
67
|
+
if (itemPopulationContext) {
|
|
68
|
+
extensions.push({
|
|
69
|
+
url: 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-itemPopulationContext',
|
|
70
|
+
valueExpression: itemPopulationContext,
|
|
71
|
+
});
|
|
72
|
+
}
|
|
67
73
|
if (extensions.length) {
|
|
68
74
|
fhirQuestionnaire.extension = ((_a = fhirQuestionnaire.extension) !== null && _a !== void 0 ? _a : []).concat(extensions);
|
|
69
75
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processExtensions.js","sourceRoot":"","sources":["../../../../src/converter/fceToFhir/questionnaire/processExtensions.ts"],"names":[],"mappings":";;AAGA,
|
|
1
|
+
{"version":3,"file":"processExtensions.js","sourceRoot":"","sources":["../../../../src/converter/fceToFhir/questionnaire/processExtensions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Questionnaire as FHIRQuestionnaire } from 'fhir/r4b';
|
|
1
|
+
import { Questionnaire as FHIRQuestionnaire, Expression as FHIRExpression } from 'fhir/r4b';
|
|
2
2
|
export declare function processExtensions(fhirQuestionnaire: FHIRQuestionnaire): {
|
|
3
3
|
launchContext?: any[];
|
|
4
4
|
mapping?: any[];
|
|
@@ -6,6 +6,7 @@ export declare function processExtensions(fhirQuestionnaire: FHIRQuestionnaire):
|
|
|
6
6
|
targetStructureMap?: any[];
|
|
7
7
|
assembledFrom?: any;
|
|
8
8
|
assembleContext?: string[];
|
|
9
|
+
itemPopulationContext?: FHIRExpression;
|
|
9
10
|
};
|
|
10
11
|
export declare function processLaunchContext(fhirQuestionnaire: FHIRQuestionnaire): any[] | undefined;
|
|
11
12
|
//# sourceMappingURL=processExtensions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processExtensions.d.ts","sourceRoot":"","sources":["../../../../src/converter/fhirToFce/questionnaire/processExtensions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,IAAI,iBAAiB,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"processExtensions.d.ts","sourceRoot":"","sources":["../../../../src/converter/fhirToFce/questionnaire/processExtensions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,IAAI,iBAAiB,EAAE,UAAU,IAAI,cAAc,EAAE,MAAM,UAAU,CAAC;AAE5F,wBAAgB,iBAAiB,CAAC,iBAAiB,EAAE,iBAAiB,GAAG;IACrE,aAAa,CAAC,EAAE,GAAG,EAAE,CAAC;IACtB,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC;IAChB,aAAa,CAAC,EAAE,GAAG,EAAE,CAAC;IACtB,kBAAkB,CAAC,EAAE,GAAG,EAAE,CAAC;IAC3B,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,qBAAqB,CAAC,EAAE,cAAc,CAAC;CAC1C,CAkBA;AAED,wBAAgB,oBAAoB,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,GAAG,EAAE,GAAG,SAAS,CA2C5F"}
|
|
@@ -9,6 +9,7 @@ function processExtensions(fhirQuestionnaire) {
|
|
|
9
9
|
const targetStructureMap = processTargetStructureMap(fhirQuestionnaire);
|
|
10
10
|
const assembledFrom = processAssembledFrom(fhirQuestionnaire);
|
|
11
11
|
const assembleContext = processAssembleContext(fhirQuestionnaire);
|
|
12
|
+
const itemPopulationContext = processItemPopulationContext(fhirQuestionnaire);
|
|
12
13
|
return {
|
|
13
14
|
launchContext: (launchContext === null || launchContext === void 0 ? void 0 : launchContext.length) ? launchContext : undefined,
|
|
14
15
|
mapping: (mapping === null || mapping === void 0 ? void 0 : mapping.length) ? mapping : undefined,
|
|
@@ -16,6 +17,7 @@ function processExtensions(fhirQuestionnaire) {
|
|
|
16
17
|
targetStructureMap: (targetStructureMap === null || targetStructureMap === void 0 ? void 0 : targetStructureMap.length) ? targetStructureMap : undefined,
|
|
17
18
|
assembledFrom: assembledFrom ? assembledFrom : undefined,
|
|
18
19
|
assembleContext: assembleContext.length ? assembleContext : undefined,
|
|
20
|
+
itemPopulationContext: itemPopulationContext ? itemPopulationContext : undefined,
|
|
19
21
|
};
|
|
20
22
|
}
|
|
21
23
|
function processLaunchContext(fhirQuestionnaire) {
|
|
@@ -88,4 +90,12 @@ function processAssembleContext(fhirQuestionnaire) {
|
|
|
88
90
|
const extensions = (_a = fhirQuestionnaire.extension) === null || _a === void 0 ? void 0 : _a.filter((ext) => ext.url === 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext');
|
|
89
91
|
return (extensions !== null && extensions !== void 0 ? extensions : []).map((extension) => extension.valueString);
|
|
90
92
|
}
|
|
93
|
+
function processItemPopulationContext(fhirQuestionnaire) {
|
|
94
|
+
var _a;
|
|
95
|
+
const extension = (_a = fhirQuestionnaire.extension) === null || _a === void 0 ? void 0 : _a.find((ext) => ext.url === 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-itemPopulationContext');
|
|
96
|
+
if (!extension) {
|
|
97
|
+
return undefined;
|
|
98
|
+
}
|
|
99
|
+
return extension.valueExpression;
|
|
100
|
+
}
|
|
91
101
|
//# sourceMappingURL=processExtensions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processExtensions.js","sourceRoot":"","sources":["../../../../src/converter/fhirToFce/questionnaire/processExtensions.ts"],"names":[],"mappings":";;AAEA,
|
|
1
|
+
{"version":3,"file":"processExtensions.js","sourceRoot":"","sources":["../../../../src/converter/fhirToFce/questionnaire/processExtensions.ts"],"names":[],"mappings":"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"}
|
package/dist/fce.types.d.ts
CHANGED
|
@@ -5,9 +5,6 @@ export interface FCEQuestionnaire extends Questionnaire {
|
|
|
5
5
|
/** NOTE: from extension https://jira.hl7.org/browse/FHIR-22356#assembledFrom */
|
|
6
6
|
assembledFrom?: string;
|
|
7
7
|
item?: FCEQuestionnaireItem[];
|
|
8
|
-
/** NOTE: from extension http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-itemContext */
|
|
9
|
-
/** Deprecated in favour itemPopulationContext */
|
|
10
|
-
itemContext?: Expression;
|
|
11
8
|
/** NOTE: from extension http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-itemPopulationContext */
|
|
12
9
|
/** Specifies a query that identifies the resource (or set of resources for a repeating item) that should be used to populate this Questionnaire or Questionnaire.item on initial population. */
|
|
13
10
|
itemPopulationContext?: Expression;
|
|
@@ -50,9 +47,6 @@ export interface FCEQuestionnaireItem extends QuestionnaireItem {
|
|
|
50
47
|
initialExpression?: Expression;
|
|
51
48
|
/** Nested questionnaire items */
|
|
52
49
|
item?: FCEQuestionnaireItem[];
|
|
53
|
-
/** NOTE: from extension http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-itemContext */
|
|
54
|
-
/** Deprecated in favour itemPopulationContext */
|
|
55
|
-
itemContext?: Expression;
|
|
56
50
|
/** NOTE: from extension http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl */
|
|
57
51
|
/** The type of data entry control or structure that should be used to render the item. */
|
|
58
52
|
itemControl?: CodeableConcept;
|
package/dist/fce.types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fce.types.d.ts","sourceRoot":"","sources":["../src/fce.types.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,UAAU,EACV,eAAe,EACf,MAAM,EACN,QAAQ,EACR,UAAU,EACV,SAAS,EACT,QAAQ,EACR,aAAa,EACb,iBAAiB,EACjB,SAAS,EACT,6BAA6B,EAChC,MAAM,UAAU,CAAC;AAElB,MAAM,WAAW,gBAAiB,SAAQ,aAAa;IACnD,4GAA4G;IAC5G,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,gFAAgF;IAChF,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,oBAAoB,EAAE,CAAC;IAC9B,
|
|
1
|
+
{"version":3,"file":"fce.types.d.ts","sourceRoot":"","sources":["../src/fce.types.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -24,6 +24,13 @@
|
|
|
24
24
|
{
|
|
25
25
|
"url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembleContext",
|
|
26
26
|
"valueString": "prefix2"
|
|
27
|
+
},
|
|
28
|
+
{
|
|
29
|
+
"url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-itemPopulationContext",
|
|
30
|
+
"valueExpression": {
|
|
31
|
+
"language": "text/fhirpath",
|
|
32
|
+
"expression": "%LaunchPatient.name"
|
|
33
|
+
}
|
|
27
34
|
}
|
|
28
35
|
],
|
|
29
36
|
"status": "active",
|
|
@@ -9,6 +9,7 @@ export function processExtensions(questionnaire: FCEQuestionnaire): FHIRQuestion
|
|
|
9
9
|
targetStructureMap,
|
|
10
10
|
assembledFrom,
|
|
11
11
|
assembleContext,
|
|
12
|
+
itemPopulationContext,
|
|
12
13
|
...fhirQuestionnaire
|
|
13
14
|
} = questionnaire;
|
|
14
15
|
|
|
@@ -89,6 +90,13 @@ export function processExtensions(questionnaire: FCEQuestionnaire): FHIRQuestion
|
|
|
89
90
|
);
|
|
90
91
|
}
|
|
91
92
|
|
|
93
|
+
if (itemPopulationContext) {
|
|
94
|
+
extensions.push({
|
|
95
|
+
url: 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-itemPopulationContext',
|
|
96
|
+
valueExpression: itemPopulationContext,
|
|
97
|
+
});
|
|
98
|
+
}
|
|
99
|
+
|
|
92
100
|
if (extensions.length) {
|
|
93
101
|
fhirQuestionnaire.extension = (fhirQuestionnaire.extension ?? []).concat(extensions);
|
|
94
102
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Questionnaire as FHIRQuestionnaire } from 'fhir/r4b';
|
|
1
|
+
import { Questionnaire as FHIRQuestionnaire, Expression as FHIRExpression } from 'fhir/r4b';
|
|
2
2
|
|
|
3
3
|
export function processExtensions(fhirQuestionnaire: FHIRQuestionnaire): {
|
|
4
4
|
launchContext?: any[];
|
|
@@ -7,6 +7,7 @@ export function processExtensions(fhirQuestionnaire: FHIRQuestionnaire): {
|
|
|
7
7
|
targetStructureMap?: any[];
|
|
8
8
|
assembledFrom?: any;
|
|
9
9
|
assembleContext?: string[];
|
|
10
|
+
itemPopulationContext?: FHIRExpression;
|
|
10
11
|
} {
|
|
11
12
|
const launchContext = processLaunchContext(fhirQuestionnaire);
|
|
12
13
|
const mapping = processMapping(fhirQuestionnaire);
|
|
@@ -14,6 +15,7 @@ export function processExtensions(fhirQuestionnaire: FHIRQuestionnaire): {
|
|
|
14
15
|
const targetStructureMap = processTargetStructureMap(fhirQuestionnaire);
|
|
15
16
|
const assembledFrom = processAssembledFrom(fhirQuestionnaire);
|
|
16
17
|
const assembleContext = processAssembleContext(fhirQuestionnaire);
|
|
18
|
+
const itemPopulationContext = processItemPopulationContext(fhirQuestionnaire);
|
|
17
19
|
|
|
18
20
|
return {
|
|
19
21
|
launchContext: launchContext?.length ? launchContext : undefined,
|
|
@@ -22,6 +24,7 @@ export function processExtensions(fhirQuestionnaire: FHIRQuestionnaire): {
|
|
|
22
24
|
targetStructureMap: targetStructureMap?.length ? targetStructureMap : undefined,
|
|
23
25
|
assembledFrom: assembledFrom ? assembledFrom : undefined,
|
|
24
26
|
assembleContext: assembleContext.length ? assembleContext : undefined,
|
|
27
|
+
itemPopulationContext: itemPopulationContext ? itemPopulationContext : undefined,
|
|
25
28
|
};
|
|
26
29
|
}
|
|
27
30
|
|
|
@@ -122,3 +125,15 @@ function processAssembleContext(fhirQuestionnaire: FHIRQuestionnaire): string[]
|
|
|
122
125
|
|
|
123
126
|
return (extensions ?? []).map((extension) => extension.valueString!);
|
|
124
127
|
}
|
|
128
|
+
|
|
129
|
+
function processItemPopulationContext(fhirQuestionnaire: FHIRQuestionnaire): FHIRExpression | undefined {
|
|
130
|
+
const extension = fhirQuestionnaire.extension?.find(
|
|
131
|
+
(ext) => ext.url === 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-itemPopulationContext',
|
|
132
|
+
);
|
|
133
|
+
|
|
134
|
+
if (!extension) {
|
|
135
|
+
return undefined;
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
return extension.valueExpression;
|
|
139
|
+
}
|
package/src/fce.types.ts
CHANGED
|
@@ -18,9 +18,6 @@ export interface FCEQuestionnaire extends Questionnaire {
|
|
|
18
18
|
/** NOTE: from extension https://jira.hl7.org/browse/FHIR-22356#assembledFrom */
|
|
19
19
|
assembledFrom?: string;
|
|
20
20
|
item?: FCEQuestionnaireItem[];
|
|
21
|
-
/** NOTE: from extension http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-itemContext */
|
|
22
|
-
/** Deprecated in favour itemPopulationContext */
|
|
23
|
-
itemContext?: Expression;
|
|
24
21
|
/** NOTE: from extension http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-itemPopulationContext */
|
|
25
22
|
/** Specifies a query that identifies the resource (or set of resources for a repeating item) that should be used to populate this Questionnaire or Questionnaire.item on initial population. */
|
|
26
23
|
itemPopulationContext?: Expression;
|
|
@@ -64,9 +61,6 @@ export interface FCEQuestionnaireItem extends QuestionnaireItem {
|
|
|
64
61
|
initialExpression?: Expression;
|
|
65
62
|
/** Nested questionnaire items */
|
|
66
63
|
item?: FCEQuestionnaireItem[];
|
|
67
|
-
/** NOTE: from extension http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-itemContext */
|
|
68
|
-
/** Deprecated in favour itemPopulationContext */
|
|
69
|
-
itemContext?: Expression;
|
|
70
64
|
/** NOTE: from extension http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl */
|
|
71
65
|
/** The type of data entry control or structure that should be used to render the item. */
|
|
72
66
|
itemControl?: CodeableConcept;
|