honeymoose/org.hl7.fhir.core
1
0
Fork 0
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git synced 2025-03-03 18:09:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix problem with version dependencies when loading npm packages directly in validator

Browse Source
This commit is contained in:
Grahame Grieve 2023-12-12 15:56:23 +13:00
parent de7dc3023d
commit f9e11e22c1
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/IgLoader.java
View File

@ -105,6 +105,14 @@ public class IgLoader implements IValidationEngineLoader {
} }
NpmPackage npm = srcPackage.matches(FilesystemPackageCacheManager.PACKAGE_VERSION_REGEX_OPT) && !new File(srcPackage).exists() ? getPackageCacheManager().loadPackage(srcPackage, null) : null; NpmPackage npm = srcPackage.matches(FilesystemPackageCacheManager.PACKAGE_VERSION_REGEX_OPT) && !new File(srcPackage).exists() ? getPackageCacheManager().loadPackage(srcPackage, null) : null;
if (npm == null && new File(srcPackage).exists()) {
// try treating the file as an npm
try {
npm = NpmPackage.fromPackage(new FileInputStream(srcPackage));
} catch (Exception e) {
// nothing - any errors will be properly handled later in the process
}
}
if (npm != null) { if (npm != null) {
for (String s : npm.dependencies()) { for (String s : npm.dependencies()) {
if (!getContext().getLoadedPackages().contains(s)) { if (!getContext().getLoadedPackages().contains(s)) {