Mapping for implicit dependency on FHIR (#1484)

* WIP

* QICore mapping

* Rev to 3.20.1

Author: JPercival

Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/LibraryBuilder.java

@@ -2753,6 +2753,22 @@ public Expression applyTargetMap(Expression source, String targetMap) {
             TypeSpecifier argumentSignature = null;
             if (this.options.getSignatureLevel() != SignatureLevel.None) {
                 if (qualifiedFunctionName.equals("FHIRHelpers.ToInterval")) {
+                    // Force loading of the FHIR model, as it's an implicit
+                    // dependency of the the target mapping here.
+                    var fhirVersion = "4.0.1";
+                    var qiCoreModel = this.getModel("QICore");
+                    if (qiCoreModel != null) {
+                        var version = qiCoreModel.getModelInfo().getVersion();
+                        if (version.equals("3.3.0")) {
+                            fhirVersion = "4.0.0";
+                        } else if (version.startsWith("3")) {
+                            fhirVersion = "3.0.1";
+                        }
+                    }
+
+                    // Force the FHIR model to be loaded.
+                    this.modelManager.resolveModel("FHIR", fhirVersion);
+
                     NamedTypeSpecifier namedTypeSpecifier =
                             new NamedTypeSpecifier().withName(dataTypeToQName(resolveTypeName("FHIR", "Period")));
                     argumentSignature = namedTypeSpecifier;

Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/ModelManager.java

@@ -268,7 +268,8 @@ public Model resolveModel(ModelIdentifier modelIdentifier) {
 
         if (model == null && this.globalCache.containsKey(modelIdentifier)) {
             model = this.globalCache.get(modelIdentifier);
-            this.models.put(modelPath, model);
+            models.put(modelPath, model);
+            modelsByUri.put(model.getModelInfo().getUrl(), model);
         }
 
         if (model == null) {