Swap up dependency loading code

cqframework · May 17, 2024 · 4c9e916 · 4c9e916
1 parent fc3c1d8
commit 4c9e916
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/tooling/src/main/java/org/opencds/cqf/tooling/npm/NpmPackageManager.java b/tooling/src/main/java/org/opencds/cqf/tooling/npm/NpmPackageManager.java
@@ -133,9 +133,10 @@ private void loadCorePackage() {
     }
 
     private void loadIg(ImplementationGuide.ImplementationGuideDependsOnComponent dep, int index) throws IOException {
+        logger.info("Loading IG Dependency {}#{}", dep.getUri(), dep.getVersion());
         String name = dep.getId();
         if (!dep.hasId()) {
-            logger.info("Dependency '{}' has no id, so can't be referred to in markdown in the IG", idForDep(dep));
+            logger.warn("Dependency '{}' has no id, so can't be referred to in markdown in the IG", idForDep(dep));
             name = "u" + Utilities.makeUuidLC().replace("-", "");
         }
         if (!isValidIGToken(name)) {
@@ -155,10 +156,9 @@ private void loadIg(ImplementationGuide.ImplementationGuideDependsOnComponent de
             throw new IllegalArgumentException(
                     "You must specify a version for the IG " + packageId + " (" + canonical + ")");
 
-        NpmPackage pi = packageId == null ? null : pcm.loadPackageFromCacheOnly(packageId, igver);
-        if (pi != null)
-            npmList.add(pi);
+        NpmPackage pi = pcm.loadPackage(packageId, igver);
         if (pi == null) {
+            logger.warn("Dependency " + name + " (" + canonical + ") not found by FilesystemPackageCacheManager");
             pi = resolveDependency(canonical, packageId, igver);
             if (pi == null) {
                 if (Utilities.noString(packageId))
@@ -169,6 +169,8 @@ private void loadIg(ImplementationGuide.ImplementationGuideDependsOnComponent de
             }
         }
 
+        npmList.add(pi);
+
         logger.debug(
                 "Load " + name + " (" + canonical + ") from " + packageId + "#" + igver);