From e31627a622565ca3320f1a80b0336294e28ed481 Mon Sep 17 00:00:00 2001 From: 7opf Date: Fri, 18 Sep 2020 11:10:12 +0100 Subject: [PATCH 1/4] TS import fix Fixes Module not found errors with typescript when importing json files inside module declaration --- fhir-context/r4/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fhir-context/r4/index.js b/fhir-context/r4/index.js index 34738a9..48f494b 100644 --- a/fhir-context/r4/index.js +++ b/fhir-context/r4/index.js @@ -7,11 +7,11 @@ module.exports = { * A hash of resource element paths (e.g. Observation.value) that are known * to point to fiels that are choice types. */ - choiceTypePaths: require('./choiceTypePaths'), + choiceTypePaths: require('./choiceTypePaths.json'), /** * A hash from paths to the path for which their content is defined, e.g. * Questionnaire.item.item -> Questionnaire.item. */ - pathsDefinedElsewhere: require('./pathsDefinedElsewhere') + pathsDefinedElsewhere: require('./pathsDefinedElsewhere.json') } From d045bda205a9ee3f48cef30e402a84fc103a2890 Mon Sep 17 00:00:00 2001 From: 7opf Date: Fri, 18 Sep 2020 11:11:16 +0100 Subject: [PATCH 2/4] fix TS errors --- fhir-context/stu3/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fhir-context/stu3/index.js b/fhir-context/stu3/index.js index a04f9b5..d9a1e66 100644 --- a/fhir-context/stu3/index.js +++ b/fhir-context/stu3/index.js @@ -7,11 +7,11 @@ module.exports = { * A hash of resource element paths (e.g. Observation.value) that are known * to point to fiels that are choice types. */ - choiceTypePaths: require('./choiceTypePaths'), + choiceTypePaths: require('./choiceTypePaths.json'), /** * A hash from paths to the path for which their content is defined, e.g. * Questionnaire.item.item -> Questionnaire.item. */ - pathsDefinedElsewhere: require('./pathsDefinedElsewhere') + pathsDefinedElsewhere: require('./pathsDefinedElsewhere.json') } From ae5efe36c06bd167c0e9b83a10d82fa811ac8e5c Mon Sep 17 00:00:00 2001 From: 7opf Date: Fri, 18 Sep 2020 11:11:36 +0100 Subject: [PATCH 3/4] fix TS errors --- fhir-context/dstu2/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fhir-context/dstu2/index.js b/fhir-context/dstu2/index.js index 02b5cac..23a5881 100644 --- a/fhir-context/dstu2/index.js +++ b/fhir-context/dstu2/index.js @@ -7,11 +7,11 @@ module.exports = { * A hash of resource element paths (e.g. Observation.value) that are known * to point to fields that are choice types. */ - choiceTypePaths: require('./choiceTypePaths'), + choiceTypePaths: require('./choiceTypePaths.json'), /** * A hash from paths to the path for which their content is defined, e.g. * Questionnaire.item.item -> Questionnaire.item. */ - pathsDefinedElsewhere: require('./pathsDefinedElsewhere') + pathsDefinedElsewhere: require('./pathsDefinedElsewhere.json') } From 992170824a5603312a44f29c2675af7d5852c7f8 Mon Sep 17 00:00:00 2001 From: sedinkinya Date: Tue, 22 Sep 2020 14:46:44 -0400 Subject: [PATCH 4/4] Set the version to 2.6.1 and updated the change log --- CHANGELOG.md | 5 +++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b796c5..975e4fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ This log documents significant changes for each release. This project follows [Semantic Versioning](http://semver.org/). +## [2.6.1] - 2020-09-22 +### Fixed +- Module not found errors with TypeScript when importing json files + inside module declaration (in an Angular project) + ## [2.6.0] - 2020-09-01 ### Added Limited support for types (see README.md for details): diff --git a/package-lock.json b/package-lock.json index f2b3e73..4d7f753 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "fhirpath", - "version": "2.6.0", + "version": "2.6.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index b5e5c31..1638e26 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fhirpath", - "version": "2.6.0", + "version": "2.6.1", "description": "A FHIRPath engine", "main": "src/fhirpath.js", "dependencies": {