sdc-qrf 0.3.14 → 0.3.15

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.
Files changed (10) hide show
  1. package/lib/converter/fceToFhir/questionnaire/processExtensions.js +1 -0
  2. package/lib/converter/fceToFhir/questionnaire/processExtensions.js.map +1 -1
  3. package/lib/converter/fhirToFce/questionnaire/processExtensions.js +2 -1
  4. package/lib/converter/fhirToFce/questionnaire/processExtensions.js.map +1 -1
  5. package/lib/converter/fhirToFce/utils.js +5 -2
  6. package/lib/converter/fhirToFce/utils.js.map +1 -1
  7. package/package.json +1 -1
  8. package/src/converter/fceToFhir/questionnaire/processExtensions.ts +1 -0
  9. package/src/converter/fhirToFce/questionnaire/processExtensions.ts +3 -1
  10. package/src/converter/fhirToFce/utils.ts +4 -1
package/lib/converter/fceToFhir/questionnaire/processExtensions.js CHANGED
@@ -34,6 +34,7 @@ function processExtensions(questionnaire) {
34
34
  }
35
35
  if (mapping) {
36
36
  extensions = extensions.concat(mapping.map((m) => ({
37
+ // url: 'https://emr.beda.software/StructureDefinition/questionnaire-mapper',
37
38
  url: 'http://beda.software/fhir-extensions/questionnaire-mapper',
38
39
  valueReference: {
39
40
  reference: `Mapping/${m.id}`,
package/lib/converter/fceToFhir/questionnaire/processExtensions.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"processExtensions.js","sourceRoot":"","sources":["../../../../src/converter/fceToFhir/questionnaire/processExtensions.ts"],"names":[],"mappings":";;;;AAIA,SAAgB,iBAAiB,CAAC,aAA+B;;IAC7D,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,EAAE,kBAAkB,KAC7D,aAAa,EADqD,iBAAiB,kBACnF,aAAa,EADX,mEAAmF,CACxE,CAAC;IAElB,IAAI,UAAU,GAAoB,EAAE,CAAC;IAErC,IAAI,aAAa,EAAE;QACf,KAAK,MAAM,iBAAiB,IAAI,aAAa,EAAE;YAC3C,MAAM,IAAI,GAAG,iBAAiB,CAAC,IAAI,CAAC;YACpC,MAAM,QAAQ,GAAG,iBAAiB,CAAC,IAAI,CAAC;YACxC,MAAM,WAAW,GAAG,iBAAiB,CAAC,WAAW,CAAC;YAClD,MAAM,sBAAsB,GAAoB;gBAC5C;oBACI,GAAG,EAAE,MAAM;oBACX,WAAW,EAAE,IAAI;iBACpB;aACJ,CAAC;YAEF,KAAK,MAAM,QAAQ,IAAI,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,EAAE,EAAE;gBACnC,sBAAsB,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC;aACrE;YAED,IAAI,WAAW,KAAK,SAAS,EAAE;gBAC3B,sBAAsB,CAAC,IAAI,CAAC;oBACxB,GAAG,EAAE,aAAa;oBAClB,WAAW,EAAE,WAAW;iBAC3B,CAAC,CAAC;aACN;YAED,UAAU,CAAC,IAAI,CAAC;gBACZ,GAAG,EAAE,gFAAgF;gBACrF,SAAS,EAAE,sBAAsB;aACpC,CAAC,CAAC;SACN;KACJ;IAED,IAAI,OAAO,EAAE;QACT,UAAU,GAAG,UAAU,CAAC,MAAM,CAC1B,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAChB,GAAG,EAAE,2DAA2D;YAChE,cAAc,EAAE;gBACZ,SAAS,EAAE,WAAW,CAAC,CAAC,EAAE,EAAE;aAC/B;SACJ,CAAC,CAAC,CACN,CAAC;KACL;IAED,IAAI,aAAa,EAAE;QACf,UAAU,GAAG,UAAU,CAAC,MAAM,CAC1B,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACzB,GAAG,EAAE,gFAAgF;YACrF,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE;SACrD,CAAC,CAAC,CACN,CAAC;KACL;IAED,IAAI,kBAAkB,EAAE;QACpB,UAAU,GAAG,UAAU,CAAC,MAAM,CAC1B,kBAAkB,CAAC,GAAG,CAAC,CAAC,qBAAqB,EAAE,EAAE,CAAC,CAAC;YAC/C,GAAG,EAAE,qFAAqF;YAC1F,cAAc,EAAE,qBAAqB;SACxC,CAAC,CAAC,CACN,CAAC;KACL;IAED,IAAI,UAAU,CAAC,MAAM,EAAE;QACnB,iBAAiB,CAAC,SAAS,GAAG,CAAC,MAAA,iBAAiB,CAAC,SAAS,mCAAI,EAAE,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;KACxF;IAED,OAAO,iBAAsC,CAAC;AAClD,CAAC;AAtED,8CAsEC"}
1
+ {"version":3,"file":"processExtensions.js","sourceRoot":"","sources":["../../../../src/converter/fceToFhir/questionnaire/processExtensions.ts"],"names":[],"mappings":";;;;AAIA,SAAgB,iBAAiB,CAAC,aAA+B;;IAC7D,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,EAAE,kBAAkB,KAC7D,aAAa,EADqD,iBAAiB,kBACnF,aAAa,EADX,mEAAmF,CACxE,CAAC;IAElB,IAAI,UAAU,GAAoB,EAAE,CAAC;IAErC,IAAI,aAAa,EAAE;QACf,KAAK,MAAM,iBAAiB,IAAI,aAAa,EAAE;YAC3C,MAAM,IAAI,GAAG,iBAAiB,CAAC,IAAI,CAAC;YACpC,MAAM,QAAQ,GAAG,iBAAiB,CAAC,IAAI,CAAC;YACxC,MAAM,WAAW,GAAG,iBAAiB,CAAC,WAAW,CAAC;YAClD,MAAM,sBAAsB,GAAoB;gBAC5C;oBACI,GAAG,EAAE,MAAM;oBACX,WAAW,EAAE,IAAI;iBACpB;aACJ,CAAC;YAEF,KAAK,MAAM,QAAQ,IAAI,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,EAAE,EAAE;gBACnC,sBAAsB,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC;aACrE;YAED,IAAI,WAAW,KAAK,SAAS,EAAE;gBAC3B,sBAAsB,CAAC,IAAI,CAAC;oBACxB,GAAG,EAAE,aAAa;oBAClB,WAAW,EAAE,WAAW;iBAC3B,CAAC,CAAC;aACN;YAED,UAAU,CAAC,IAAI,CAAC;gBACZ,GAAG,EAAE,gFAAgF;gBACrF,SAAS,EAAE,sBAAsB;aACpC,CAAC,CAAC;SACN;KACJ;IAED,IAAI,OAAO,EAAE;QACT,UAAU,GAAG,UAAU,CAAC,MAAM,CAC1B,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAChB,6EAA6E;YAC7E,GAAG,EAAE,2DAA2D;YAChE,cAAc,EAAE;gBACZ,SAAS,EAAE,WAAW,CAAC,CAAC,EAAE,EAAE;aAC/B;SACJ,CAAC,CAAC,CACN,CAAC;KACL;IAED,IAAI,aAAa,EAAE;QACf,UAAU,GAAG,UAAU,CAAC,MAAM,CAC1B,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACzB,GAAG,EAAE,gFAAgF;YACrF,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE;SACrD,CAAC,CAAC,CACN,CAAC;KACL;IAED,IAAI,kBAAkB,EAAE;QACpB,UAAU,GAAG,UAAU,CAAC,MAAM,CAC1B,kBAAkB,CAAC,GAAG,CAAC,CAAC,qBAAqB,EAAE,EAAE,CAAC,CAAC;YAC/C,GAAG,EAAE,qFAAqF;YAC1F,cAAc,EAAE,qBAAqB;SACxC,CAAC,CAAC,CACN,CAAC;KACL;IAED,IAAI,UAAU,CAAC,MAAM,EAAE;QACnB,iBAAiB,CAAC,SAAS,GAAG,CAAC,MAAA,iBAAiB,CAAC,SAAS,mCAAI,EAAE,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;KACxF;IAED,OAAO,iBAAsC,CAAC;AAClD,CAAC;AAvED,8CAuEC"}
package/lib/converter/fhirToFce/questionnaire/processExtensions.js CHANGED
@@ -54,7 +54,8 @@ function processLaunchContext(fhirQuestionnaire) {
54
54
  exports.processLaunchContext = processLaunchContext;
55
55
  function processMapping(fhirQuestionnaire) {
56
56
  var _a;
57
- const mapperExtensions = (_a = fhirQuestionnaire.extension) === null || _a === void 0 ? void 0 : _a.filter((ext) => ext.url === 'http://beda.software/fhir-extensions/questionnaire-mapper');
57
+ const mapperExtensions = (_a = fhirQuestionnaire.extension) === null || _a === void 0 ? void 0 : _a.filter((ext) => ext.url === 'http://beda.software/fhir-extensions/questionnaire-mapper' ||
58
+ ext.url === 'https://emr.beda.software/StructureDefinition/questionnaire-mapper');
58
59
  if (!mapperExtensions) {
59
60
  return undefined;
60
61
  }
package/lib/converter/fhirToFce/questionnaire/processExtensions.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"processExtensions.js","sourceRoot":"","sources":["../../../../src/converter/fhirToFce/questionnaire/processExtensions.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"processExtensions.js","sourceRoot":"","sources":["../../../../src/converter/fhirToFce/questionnaire/processExtensions.ts"],"names":[],"mappings":"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"}
package/lib/converter/fhirToFce/utils.js CHANGED
@@ -2,9 +2,12 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.trimUndefined = exports.checkFhirQuestionnaireProfile = void 0;
4
4
  function checkFhirQuestionnaireProfile(fhirQuestionnaire) {
5
- var _a, _b, _c, _d, _e;
5
+ var _a, _b, _c, _d, _e, _f, _g;
6
6
  if (!(((_c = (_b = (_a = fhirQuestionnaire.meta) === null || _a === void 0 ? void 0 : _a.profile) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0) === 1 &&
7
- ((_e = (_d = fhirQuestionnaire.meta) === null || _d === void 0 ? void 0 : _d.profile) === null || _e === void 0 ? void 0 : _e[0]) === 'https://beda.software/beda-emr-questionnaire')) {
7
+ (((_e = (_d = fhirQuestionnaire.meta) === null || _d === void 0 ? void 0 : _d.profile) === null || _e === void 0 ? void 0 : _e[0]) ===
8
+ 'https://beda.software/beda-emr-questionnaire' ||
9
+ ((_g = (_f = fhirQuestionnaire.meta) === null || _f === void 0 ? void 0 : _f.profile) === null || _g === void 0 ? void 0 : _g[0]) ===
10
+ 'https://emr.beda.software/StructureDefinition/fhir-emr-questionnaire'))) {
8
11
  throw new Error('Only beda emr questionanire supported');
9
12
  }
10
13
  }
package/lib/converter/fhirToFce/utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/converter/fhirToFce/utils.ts"],"names":[],"mappings":";;;AAEA,SAAgB,6BAA6B,CAAC,iBAAoC;;IAC9E,IACI,CAAC,CACG,CAAC,MAAA,MAAA,MAAA,iBAAiB,CAAC,IAAI,0CAAE,OAAO,0CAAE,MAAM,mCAAI,CAAC,CAAC,KAAK,CAAC;QACpD,CAAA,MAAA,MAAA,iBAAiB,CAAC,IAAI,0CAAE,OAAO,0CAAG,CAAC,CAAC,MAAK,8CAA8C,CAC1F,EACH;QACE,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;KAC5D;AACL,CAAC;AATD,sEASC;AAED,SAAgB,aAAa,CAAC,CAAM;IAChC,KAAK,MAAM,IAAI,IAAI,CAAC,EAAE;QAClB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE;YAC/C,MAAM,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC;YACpB,IAAI,GAAG,KAAK,SAAS,EAAE;gBACnB,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;aAClB;iBAAM,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;gBAChC,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;oBACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;wBACjC,IAAI,OAAO,GAAG,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE;4BAC5B,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;yBACzB;qBACJ;iBACJ;qBAAM;oBACH,aAAa,CAAC,GAAG,CAAC,CAAC;iBACtB;aACJ;SACJ;KACJ;IAED,OAAO,CAAC,CAAC;AACb,CAAC;AArBD,sCAqBC"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/converter/fhirToFce/utils.ts"],"names":[],"mappings":";;;AAEA,SAAgB,6BAA6B,CAAC,iBAAoC;;IAC9E,IACI,CAAC,CACG,CAAC,MAAA,MAAA,MAAA,iBAAiB,CAAC,IAAI,0CAAE,OAAO,0CAAE,MAAM,mCAAI,CAAC,CAAC,KAAK,CAAC;QACpD,CAAC,CAAA,MAAA,MAAA,iBAAiB,CAAC,IAAI,0CAAE,OAAO,0CAAG,CAAC,CAAC;YACjC,8CAA8C;YAC9C,CAAA,MAAA,MAAA,iBAAiB,CAAC,IAAI,0CAAE,OAAO,0CAAG,CAAC,CAAC;gBAChC,sEAAsE,CAAC,CAClF,EACH;QACE,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;KAC5D;AACL,CAAC;AAZD,sEAYC;AAED,SAAgB,aAAa,CAAC,CAAM;IAChC,KAAK,MAAM,IAAI,IAAI,CAAC,EAAE;QAClB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE;YAC/C,MAAM,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC;YACpB,IAAI,GAAG,KAAK,SAAS,EAAE;gBACnB,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;aAClB;iBAAM,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;gBAChC,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;oBACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;wBACjC,IAAI,OAAO,GAAG,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE;4BAC5B,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;yBACzB;qBACJ;iBACJ;qBAAM;oBACH,aAAa,CAAC,GAAG,CAAC,CAAC;iBACtB;aACJ;SACJ;KACJ;IAED,OAAO,CAAC,CAAC;AACb,CAAC;AArBD,sCAqBC"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "sdc-qrf",
3
3
  "license": "MIT",
4
- "version": "0.3.14",
4
+ "version": "0.3.15",
5
5
  "scripts": {
6
6
  "build": "tsc",
7
7
  "coverage": "jest --coverage --coverageReporters=text-lcov | coveralls",
package/src/converter/fceToFhir/questionnaire/processExtensions.ts CHANGED
@@ -41,6 +41,7 @@ export function processExtensions(questionnaire: FCEQuestionnaire): FHIRQuestion
41
41
  if (mapping) {
42
42
  extensions = extensions.concat(
43
43
  mapping.map((m) => ({
44
+ // url: 'https://emr.beda.software/StructureDefinition/questionnaire-mapper',
44
45
  url: 'http://beda.software/fhir-extensions/questionnaire-mapper',
45
46
  valueReference: {
46
47
  reference: `Mapping/${m.id}`,
package/src/converter/fhirToFce/questionnaire/processExtensions.ts CHANGED
@@ -72,7 +72,9 @@ export function processLaunchContext(fhirQuestionnaire: FHIRQuestionnaire): any[
72
72
 
73
73
  function processMapping(fhirQuestionnaire: FHIRQuestionnaire): any[] | undefined {
74
74
  const mapperExtensions = fhirQuestionnaire.extension?.filter(
75
- (ext: any) => ext.url === 'http://beda.software/fhir-extensions/questionnaire-mapper',
75
+ (ext: any) =>
76
+ ext.url === 'http://beda.software/fhir-extensions/questionnaire-mapper' ||
77
+ ext.url === 'https://emr.beda.software/StructureDefinition/questionnaire-mapper',
76
78
  );
77
79
 
78
80
  if (!mapperExtensions) {
package/src/converter/fhirToFce/utils.ts CHANGED
@@ -4,7 +4,10 @@ export function checkFhirQuestionnaireProfile(fhirQuestionnaire: FHIRQuestionnai
4
4
  if (
5
5
  !(
6
6
  (fhirQuestionnaire.meta?.profile?.length ?? 0) === 1 &&
7
- fhirQuestionnaire.meta?.profile?.[0] === 'https://beda.software/beda-emr-questionnaire'
7
+ (fhirQuestionnaire.meta?.profile?.[0] ===
8
+ 'https://beda.software/beda-emr-questionnaire' ||
9
+ fhirQuestionnaire.meta?.profile?.[0] ===
10
+ 'https://emr.beda.software/StructureDefinition/fhir-emr-questionnaire')
8
11
  )
9
12
  ) {
10
13
  throw new Error('Only beda emr questionanire supported');