Merge remote-tracking branch 'origin/master'

FHIR · Dec 8, 2024 · f90de74 · f90de74
2 parents 8dcfaad + b977e96
commit f90de74
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,3 +27,4 @@ target/
 validator/nested-package-version-dependencies/hl7.fhir.test.versions#0.1.0/package/package-lock.json
 
 validator/nested-package-version-dependencies/hl7.fhir.test.versions#0.2.0/package/package-lock.json
+
diff --git a/tx/simple/simple-expand-active-response-valueSet.json b/tx/simple/simple-expand-active-response-valueSet.json
@@ -17,9 +17,12 @@
     }]
   },
   "expansion" : {
+    "$optional-properties$" : ["id","offset"],
+    "id" : "$id$",
     "identifier" : "$uuid$",
     "timestamp" : "$instant$",
     "total" : 6,
+    "offset" : 0,
     "parameter" : [{
       "name" : "excludeNested",
       "valueBoolean" : true

diff --git a/tx/simple/simple-expand-all-response-valueSet.json b/tx/simple/simple-expand-all-response-valueSet.json
@@ -16,9 +16,12 @@
     }]
   },
   "expansion" : {
+    "$optional-properties$" : ["id","offset"],
+    "id" : "$id$",
     "identifier" : "$uuid$",
     "timestamp" : "$instant$",
     "total" : 7,
+    "offset" : 0,
     "parameter" : [{
       "name" : "excludeNested",
       "valueBoolean" : true
@@ -27,6 +30,11 @@
       "name" : "used-codesystem",
       "valueUri" : "http://hl7.org/fhir/test/CodeSystem/simple|0.1.0"
     },
+    {
+      "$optional$" : true,
+      "name" : "displayLanguage",
+      "valueString" : "en"
+    },
     {
       "$optional$" : true,
       "name" : "version",

diff --git a/tx/simple/simple-expand-enum-bad-response-valueSet.json b/tx/simple/simple-expand-enum-bad-response-valueSet.json
@@ -34,9 +34,12 @@
     }]
   },
   "expansion" : {
+    "$optional-properties$" : ["id", "offset"],
+    "id" : "$id$",
     "identifier" : "$uuid$",
     "timestamp" : "$instant$",
     "total" : 5,
+    "offset" : 0,
     "parameter" : [{
       "name" : "excludeNested",
       "valueBoolean" : true

diff --git a/tx/simple/simple-expand-enum-response-valueSet.json b/tx/simple/simple-expand-enum-response-valueSet.json
@@ -31,9 +31,12 @@
     }]
   },
   "expansion" : {
+    "$optional-properties$" : ["id", "offset"],
+    "id" : "$id$",
     "identifier" : "$uuid$",
     "timestamp" : "$instant$",
     "total" : 5,
+    "offset" : 0,
     "parameter" : [{
       "name" : "excludeNested",
       "valueBoolean" : true

diff --git a/tx/simple/simple-expand-inactive-response-valueSet.json b/tx/simple/simple-expand-inactive-response-valueSet.json
@@ -17,9 +17,12 @@
     }]
   },
   "expansion" : {
+    "$optional-properties$" : ["id","offset"],
+    "id" : "$id$",
     "identifier" : "$uuid$",
     "timestamp" : "$instant$",
     "total" : 7,
+    "offset" : 0,
     "parameter" : [{
       "name" : "excludeNested",
       "valueBoolean" : true

diff --git a/tx/simple/simple-expand-isa-response-valueSet.json b/tx/simple/simple-expand-isa-response-valueSet.json
@@ -21,9 +21,12 @@
     }]
   },
   "expansion" : {
+    "$optional-properties$" : ["id", "offset"],
+    "id" : "$id$",
     "identifier" : "$uuid$",
     "timestamp" : "$instant$",
     "total" : 5,
+    "offset" : 0,
     "parameter" : [{
       "name" : "excludeNested",
       "valueBoolean" : true

diff --git a/tx/simple/simple-expand-prop-response-valueSet.json b/tx/simple/simple-expand-prop-response-valueSet.json
@@ -21,9 +21,12 @@
     }]
   },
   "expansion" : {
+    "$optional-properties$" : ["id", "offset"],
+    "id" : "$id$",
     "identifier" : "$uuid$",
     "timestamp" : "$instant$",
     "total" : 3,
+    "offset" : 0,
     "parameter" : [{
       "name" : "excludeNested",
       "valueBoolean" : true

diff --git a/tx/simple/simple-expand-regex-response-valueSet.json b/tx/simple/simple-expand-regex-response-valueSet.json
@@ -21,9 +21,12 @@
     }]
   },
   "expansion" : {
+    "$optional-properties$" : ["id", "offset"],
+    "id" : "$id$",
     "identifier" : "$uuid$",
     "timestamp" : "$instant$",
     "total" : 3,
+    "offset" : 0,
     "parameter" : [{
       "name" : "excludeNested",
       "valueBoolean" : true

diff --git a/tx/simple/simple-expand-regex2-response-valueSet.json b/tx/simple/simple-expand-regex2-response-valueSet.json
@@ -21,9 +21,12 @@
     }]
   },
   "expansion" : {
+    "$optional-properties$" : ["id", "offset"],
+    "id" : "$id$",
     "identifier" : "$uuid$",
     "timestamp" : "$instant$",
     "total" : 3,
+    "offset" : 0,
     "parameter" : [{
       "name" : "excludeNested",
       "valueBoolean" : true

diff --git a/tx/simple/simple-lookup-response-parameters.json b/tx/simple/simple-lookup-response-parameters.json
@@ -14,8 +14,11 @@
     "part" : [{
       "name" : "use",
       "valueCoding" : {
+        "$optional-properties$" : ["display"],
         "system" : "http://hl7.org/fhir/test/CodeSystem/designations",
-        "code" : "olde-english"
+        "code" : "olde-english",
+        "display" : "olde-english"
+
       }
     },
     {

diff --git a/tx/simple/simple-lookup2-response-parameters.json b/tx/simple/simple-lookup2-response-parameters.json
@@ -14,8 +14,10 @@
     "part" : [{
       "name" : "use",
       "valueCoding" : {
+        "$optional-properties$" : ["display"],
         "system" : "http://hl7.org/fhir/test/CodeSystem/designations",
-        "code" : "olde-english"
+        "code" : "olde-english",
+        "display" : "olde-english"
       }
     },
     {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,3 +27,4 @@ target/
		validator/nested-package-version-dependencies/hl7.fhir.test.versions#0.1.0/package/package-lock.json

		validator/nested-package-version-dependencies/hl7.fhir.test.versions#0.2.0/package/package-lock.json