rework -re-package to actually work

hapifhir · Feb 25, 2025 · 5c864a9 · 5c864a9
1 parent 6365012
commit 5c864a9
Show file tree

Hide file tree

Showing 4 changed files with 266 additions and 20 deletions.
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CodeSystem.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CodeSystem.java
@@ -7043,7 +7043,21 @@ private ConceptDefinitionComponent getDefinitionByCode(List<ConceptDefinitionCom
     }
     return null;
   }
+
+
+  public boolean supplements(CodeSystem cs) {
+    if (!hasSupplements()) {
+      return false;      
+    } else if (getSupplements().contains("|")) {
+      return getSupplements().equals(cs.getVersionedUrl());
+
+    } else {
+      return getSupplements().equals(cs.getUrl());
+    }
+  }
+
 // end addition
 
+
 }
 
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/tasks/RePackageTask.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/tasks/RePackageTask.java
@@ -80,6 +80,7 @@ public void executeTask(ValidationService validationService, ValidationEngine va
     }
     IWorkerContext ctxt = validationEngine.getContext();
     PackageReGenerator ep = new PackageReGenerator().setContext(ctxt).setScope(scope);
+    ep.setNpmId(cliContext.getPackageName());
     for (String s : cliContext.getIgs()) {
       ep.addPackage(s);
     }

diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/Params.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/Params.java
@@ -346,7 +346,9 @@ else if (args[i].equals(HTML_OUTPUT)) {
         cliContext.setMode(EngineMode.VERSION);
       } else if (args[i].equals(PACKAGE_NAME)) {
         cliContext.setPackageName(args[++i]);
-        cliContext.setMode(EngineMode.CODEGEN);
+        if (!hasParam(args, "-re-package")) {
+          cliContext.setMode(EngineMode.CODEGEN);
+        }
       } else if (args[i].equals(TX_PACK)) {
         cliContext.setMode(EngineMode.RE_PACKAGE);
         String pn = args[++i];