Use name and description extensions to set values in generated IG (#666)

* Use name and description extensions to set values in generated IG * Filter resources based on conformance and terminology resources * Use valueMarkdown instead of string for description
FHIR · Nov 13, 2020 · 8e8000f · 8e8000f
1 parent 3379cb2
commit 8e8000f
Show file tree

Hide file tree

Showing 7 changed files with 179 additions and 4 deletions.
diff --git a/src/fhirtypes/dataTypes.ts b/src/fhirtypes/dataTypes.ts
@@ -73,6 +73,7 @@ export type Element = {
  */
 export type Extension = {
   url: string;
+  [key: string]: any;
 };
 
 /**

diff --git a/src/fhirtypes/specialTypes.ts b/src/fhirtypes/specialTypes.ts
@@ -1,4 +1,4 @@
-import { Coding } from './dataTypes';
+import { Coding, Extension } from './dataTypes';
 
 /**
  * Type to represent FHIR R4 resource metadata.
@@ -14,4 +14,5 @@ export type Meta = {
   profile?: string[];
   security?: Coding[];
   tag?: Coding[];
+  extension?: Extension[];
 };
diff --git a/src/ig/IGExporter.ts b/src/ig/IGExporter.ts
@@ -986,8 +986,13 @@ export class IGExporter {
                 existingResource?.exampleBoolean || existingResource?.exampleCanonical;
               const existingName = existingIsExample ? existingResource.name : null;
               const existingDescription = existingIsExample ? existingResource.description : null;
+
+              const metaExtensionDescription = this.getMetaExtensionDescription(resourceJSON);
+              const metaExtensionName = this.getMetaExtensionName(resourceJSON);
+
               newResource.description =
                 configResource?.description ??
+                metaExtensionDescription ??
                 existingDescription ??
                 (CONFORMANCE_AND_TERMINOLOGY_RESOURCES.has(resourceJSON.resourceType)
                   ? resourceJSON.description
@@ -1000,7 +1005,8 @@ export class IGExporter {
                 this.addGroup(newResource.groupingId);
               }
               if (pathEnd === 'examples') {
-                newResource.name = configResource?.name ?? existingName ?? resourceJSON.id;
+                newResource.name =
+                  configResource?.name ?? metaExtensionName ?? existingName ?? resourceJSON.id;
                 // set exampleCanonical or exampleBoolean, preferring configured values
                 if (configResource?.exampleCanonical) {
                   newResource.exampleCanonical = configResource.exampleCanonical;
@@ -1031,6 +1037,7 @@ export class IGExporter {
                 const name = typeof resourceJSON.name === 'string' ? resourceJSON.name : null;
                 newResource.name =
                   configResource?.name ??
+                  metaExtensionName ??
                   existingResource?.name ??
                   title ??
                   name ??
@@ -1143,6 +1150,24 @@ export class IGExporter {
     }
   }
 
+  private getMetaExtensionDescription(resource: InstanceDefinition): string {
+    const description = resource.meta?.extension?.find(
+      e => e.url === 'http://hl7.org/fhir/StructureDefinition/instance-description'
+    )?.valueMarkdown;
+    if (!CONFORMANCE_AND_TERMINOLOGY_RESOURCES.has(resource.resourceType)) {
+      return description;
+    }
+  }
+
+  private getMetaExtensionName(resource: InstanceDefinition): string {
+    const name = resource.meta?.extension?.find(
+      e => e.url === 'http://hl7.org/fhir/StructureDefinition/instance-name'
+    )?.valueString;
+    if (!CONFORMANCE_AND_TERMINOLOGY_RESOURCES.has(resource.resourceType)) {
+      return name;
+    }
+  }
+
   /**
    * Writes the in-memory ImplementationGuide JSON to the IG output folder.
    *

diff --git a/test/ig/IGExporter.IG.test.ts b/test/ig/IGExporter.IG.test.ts
@@ -867,12 +867,16 @@ describe('IGExporter', () => {
         'StructureDefinition-MyPatient.json',
         'StructureDefinition-MyTitlePatient.json'
       ]);
-      expect(directoryContents.get('resources')).toEqual(['Patient-BazPatient.json']);
+      expect(directoryContents.get('resources')).toEqual([
+        'Patient-BazPatient.json',
+        'Patient-MetaExtensionNotExamplePatient.json'
+      ]);
       expect(directoryContents.get('vocabulary')).toEqual(['ValueSet-MyVS.json']);
       expect(directoryContents.get('examples')).toEqual([
         'Goal-GoalWithDescription.json',
         'Patient-BarPatient.json',
-        'Patient-FooPatient.json' // Renamed from "PoorlyNamedPatient.json"
+        'Patient-FooPatient.json', // Renamed from "PoorlyNamedPatient.json"
+        'Patient-MetaExtensionPatient.json'
       ]);
     });
   });
@@ -1117,6 +1121,104 @@ describe('IGExporter', () => {
       });
     });
 
+    it('should add resource references with a description and name extension to the ImplementationGuide resource', () => {
+      exporter.export(tempOut);
+      const igPath = path.join(
+        tempOut,
+        'fsh-generated',
+        'resources',
+        'ImplementationGuide-fhir.us.minimal.json'
+      );
+      expect(fs.existsSync(igPath)).toBeTruthy();
+      const igContent: ImplementationGuide = fs.readJSONSync(igPath);
+      expect(igContent.definition.resource).toContainEqual({
+        reference: {
+          reference: 'Patient/MetaExtensionPatient'
+        },
+        name: 'MetaExtension Patient Name',
+        description: 'MetaExtension Patient Description',
+        exampleBoolean: true
+      });
+    });
+
+    it('should prefer configured names and descriptions to extensions on resource references', () => {
+      config.resources = [
+        {
+          reference: {
+            reference: 'Patient/MetaExtensionPatient'
+          },
+          name: 'Configured Name',
+          description: 'Configured Description'
+        }
+      ];
+      exporter.export(tempOut);
+      const igPath = path.join(
+        tempOut,
+        'fsh-generated',
+        'resources',
+        'ImplementationGuide-fhir.us.minimal.json'
+      );
+      expect(fs.existsSync(igPath)).toBeTruthy();
+      const igContent: ImplementationGuide = fs.readJSONSync(igPath);
+      expect(igContent.definition.resource).toContainEqual({
+        reference: {
+          reference: 'Patient/MetaExtensionPatient'
+        },
+        name: 'Configured Name',
+        description: 'Configured Description',
+        exampleBoolean: true
+      });
+    });
+
+    it('should add non example resource references with a description and name extension to the ImplementationGuide resource', () => {
+      exporter.export(tempOut);
+      const igPath = path.join(
+        tempOut,
+        'fsh-generated',
+        'resources',
+        'ImplementationGuide-fhir.us.minimal.json'
+      );
+      expect(fs.existsSync(igPath)).toBeTruthy();
+      const igContent: ImplementationGuide = fs.readJSONSync(igPath);
+      expect(igContent.definition.resource).toContainEqual({
+        reference: {
+          reference: 'Patient/MetaExtensionNotExamplePatient'
+        },
+        name: 'MetaExtensionNotExample Patient Name',
+        description: 'MetaExtensionNotExample Patient Description',
+        exampleBoolean: false
+      });
+    });
+
+    it('should prefer non example configured names and descriptions to extensions on resource references', () => {
+      config.resources = [
+        {
+          reference: {
+            reference: 'Patient/MetaExtensionNotExamplePatient'
+          },
+          name: 'Configured Name',
+          description: 'Configured Description'
+        }
+      ];
+      exporter.export(tempOut);
+      const igPath = path.join(
+        tempOut,
+        'fsh-generated',
+        'resources',
+        'ImplementationGuide-fhir.us.minimal.json'
+      );
+      expect(fs.existsSync(igPath)).toBeTruthy();
+      const igContent: ImplementationGuide = fs.readJSONSync(igPath);
+      expect(igContent.definition.resource).toContainEqual({
+        reference: {
+          reference: 'Patient/MetaExtensionNotExamplePatient'
+        },
+        name: 'Configured Name',
+        description: 'Configured Description',
+        exampleBoolean: false
+      });
+    });
+
     it('should omit predefined resources that are configured to be omitted', () => {
       config.resources = [
         {

diff --git a/...res/customized-ig-with-resources/ig-data/input/examples/Patient-MetaExtensionPatient.json b/...res/customized-ig-with-resources/ig-data/input/examples/Patient-MetaExtensionPatient.json
@@ -0,0 +1,17 @@
+{
+  "resourceType": "Patient",
+  "id": "MetaExtensionPatient",
+  "meta": {
+    "extension": [
+      {
+        "url": "http://hl7.org/fhir/StructureDefinition/instance-description",
+        "valueMarkdown": "MetaExtension Patient Description"
+      },
+      {
+        "url": "http://hl7.org/fhir/StructureDefinition/instance-name",
+        "valueString": "MetaExtension Patient Name"
+      }
+    ]
+  },
+  "name": [{ "family": "MetaExtension" }]
+}
diff --git a/.../customized-ig-with-resources/ig-data/input/resources/MetaExtensionNotExamplePatient.json b/.../customized-ig-with-resources/ig-data/input/resources/MetaExtensionNotExamplePatient.json
@@ -0,0 +1,17 @@
+{
+  "resourceType": "Patient",
+  "id": "MetaExtensionNotExamplePatient",
+  "meta": {
+    "extension": [
+      {
+        "url": "http://hl7.org/fhir/StructureDefinition/instance-description",
+        "valueMarkdown": "MetaExtensionNotExample Patient Description"
+      },
+      {
+        "url": "http://hl7.org/fhir/StructureDefinition/instance-name",
+        "valueString": "MetaExtensionNotExample Patient Name"
+      }
+    ]
+  },
+  "name": [{ "family": "MetaExtensionNotExample" }]
+}
diff --git a/test/ig/fixtures/customized-ig-with-resources/ig-data/input/vocabulary/ValueSet-MyVS.json b/test/ig/fixtures/customized-ig-with-resources/ig-data/input/vocabulary/ValueSet-MyVS.json
@@ -1,6 +1,18 @@
 {
   "resourceType": "ValueSet",
   "id": "MyVS",
+  "meta": {
+    "extension": [
+      {
+        "url": "http://hl7.org/fhir/StructureDefinition/instance-description",
+        "valueMarkdown": "Ignored Description"
+      },
+      {
+        "url": "http://hl7.org/fhir/StructureDefinition/instance-name",
+        "valueString": "Ignored Name"
+      }
+    ]
+  },
   "url": "http://hl7.org/fhir/ValueSet/MyVS",
   "version": "4.0.1",
   "name": "Yes/No/Don't Know",