2024 11 gg custom resources

RELEASE_NOTES.md

@@ -1 +1,8 @@
-* validator: fix pattern discriminator validation rule
+* Loader: Support for Custom resources from other packages in publisher
+* Loader: fix NPE processing issue from template
+* validator: fix pattern discriminator validation rule
+* validator: fix issue with FHIRPath engine throwing exception for an invalid path
+* Renderer: Add FeatureDefinition renderer
+* Renderer: fix NPE rendering reference
+* Renderer: fix NPE processing search references
+

org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/Publisher.java

@@ -4968,6 +4968,16 @@ private FetchedResource findLoadedStructure(StructureDefinition sd) {
    * 
    */
   private void loadCustomResources() throws FileNotFoundException, FHIRException, IOException {
+    // scan existing load for custom resources 
+    for (StructureDefinition sd : context.fetchResourcesByType(StructureDefinition.class)) {
+      if (sd.getKind() == StructureDefinitionKind.RESOURCE && sd.getDerivation() == TypeDerivationRule.SPECIALIZATION) {
+        String scope = sd.getUrl().substring(0, sd.getUrl().lastIndexOf("/"));
+        if (!"http://hl7.org/fhir/StructureDefinition".equals(scope)) {
+          customResourceNames.add(sd.getTypeTail());
+        }
+      }
+    }
+    // look for new custom resources in this IG
     for (String s : customResourceFiles) {
       System.out.print("Load Custom Resource from "+s+":");
       System.out.println(loadCustomResource(s));
@@ -8943,7 +8953,7 @@ private void generateSummaryOutputs(DBBuilder db) throws Exception {
         types.add(sd.getType());
         long start = System.currentTimeMillis();
         String src = msr.render(sd);
-        fragment("maps-"+sd.getType(), src, otherFilesRun, start, "maps", "Cross");
+        fragment("maps-"+sd.getTypeTail(), src, otherFilesRun, start, "maps", "Cross");
       }
     }
     long start = System.currentTimeMillis();
@@ -10836,6 +10846,7 @@ private void generateResourceReferences() throws Exception {
     for (StructureDefinition sd : context.fetchResourcesByType(StructureDefinition.class)) {
       if (sd.getDerivation() == TypeDerivationRule.SPECIALIZATION && sd.getKind() == StructureDefinitionKind.RESOURCE) {
         resourceTypes.add(sd.getType());
+        resourceTypes.add(sd.getTypeTail());
       }
     }
     for (String rt : resourceTypes) {
@@ -11576,7 +11587,12 @@ private byte[] processCustomLiquid(DBBuilder db, byte[] content, FetchedFile f)
   }
 
   private String processRefTag(DBBuilder db, String src, FetchedFile f) {
-    if (Utilities.isAbsoluteUrl(src)) {
+    if (Utilities.existsInList(src, "$ver")) {
+      switch (src) {
+      case "$ver": return businessVersion;
+      }
+    } else if (Utilities.isAbsoluteUrl(src)) {
+
       try {
         CanonicalResource cr = (CanonicalResource) context.fetchResource(Resource.class, src);
         if (cr != null && cr.hasWebPath()) {
@@ -13761,12 +13777,11 @@ public static void main(String[] args) throws Exception {
     int exitCode = 0;
 
     org.hl7.fhir.utilities.FileFormat.checkCharsetAndWarnIfNotUTF8(System.out);
-
+    NpmPackage.setLoadCustomResources(true);  
+
     if (CliParams.hasNamedParam(args, FHIR_SETTINGS_PARAM)) {
       FhirSettings.setExplicitFilePath(CliParams.getNamedParam(args, FHIR_SETTINGS_PARAM));
     }
-
-
 
     if (CliParams.hasNamedParam(args, "-gui")) {
       runGUI(args);

org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/StructureDefinitionRenderer.java

@@ -2090,7 +2090,7 @@ public String references() throws FHIRFormatError, IOException {
           if (r.fhirType().equals("SearchParameter")) {
             SearchParameter sp = (SearchParameter) r.getResource();
             String exp = sp.getExpression();
-            if (exp.contains("extension('"+sd.getUrl()+"')")) {
+            if (exp != null && exp.contains("extension('"+sd.getUrl()+"')")) {
               searches.put(igp.getLinkFor(r, true), r.getTitle());
             }
           }

pom.xml

@@ -8,7 +8,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <core_version>6.4.4-SNAPSHOT</core_version>
+        <core_version>6.4.4</core_version>
         <maven_surefire_version>3.0.0-M5</maven_surefire_version>
         <apache_poi_version>5.2.1</apache_poi_version>
         <lombok_version>1.18.32</lombok_version>