To 2.1.1 (#929)

* Revert "SUSHI now loads lower case package names by default (#912)" This reverts commit 36f2509. * 2.1.1
FHIR · Oct 8, 2021 · 627b66f · 627b66f
1 parent fae385f
commit 627b66f
Show file tree

Hide file tree

Showing 178 changed files with 297 additions and 161 deletions.
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fsh-sushi",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Sushi Unshortens Short Hand Inputs (FSH Compiler)",
   "scripts": {
     "build": "del-cli dist && tsc && cpy src/utils/init-project dist/utils/init-project",

diff --git a/src/fhirdefs/load.ts b/src/fhirdefs/load.ts
@@ -26,12 +26,12 @@ export async function loadDependency(
   cachePath: string = path.join(os.homedir(), '.fhir', 'packages')
 ): Promise<FHIRDefinitions> {
   let fullPackageName = `${packageName}#${version}`;
-  const loadPath = path.join(cachePath, fullPackageName, 'package');
+  let loadPath = path.join(cachePath, fullPackageName, 'package');
   let loadedPackage: string;
 
   // First, try to load the package from the local cache
   logger.info(`Checking local cache for ${fullPackageName}...`);
-  loadedPackage = loadFromPath(cachePath, fullPackageName, FHIRDefs);
+  loadedPackage = loadFromPath(loadPath, fullPackageName, FHIRDefs);
   if (loadedPackage) {
     logger.info(`Found ${fullPackageName} in local cache.`);
   } else {
@@ -46,7 +46,8 @@ export async function loadDependency(
     );
     version = 'current';
     fullPackageName = `${packageName}#${version}`;
-    loadedPackage = loadFromPath(cachePath, fullPackageName, FHIRDefs);
+    loadPath = path.join(cachePath, fullPackageName, 'package');
+    loadedPackage = loadFromPath(loadPath, fullPackageName, FHIRDefs);
   }
 
   let packageUrl;
@@ -262,28 +263,24 @@ export function loadCustomResources(resourceDir: string, defs: FHIRDefinitions):
 }
 
 /**
- * Locates the targetPackage within the cachePath and loads the set of JSON files into FHIRDefs
- * @param {string} cachePath - The path to the directory containing cached packages
+ * Loads a set of JSON files at targetPath into FHIRDefs
+ * @param {string} targetPath - The path to the directory containing the JSON definitions
  * @param {string} targetPackage - The name of the package we are trying to load
  * @param {FHIRDefinitions} FHIRDefs - The FHIRDefinitions object to load defs into
  * @returns {string} the name of the loaded package if successful
  */
 export function loadFromPath(
-  cachePath: string,
+  targetPath: string,
   targetPackage: string,
   FHIRDefs: FHIRDefinitions
 ): string {
   if (FHIRDefs.packages.indexOf(targetPackage) < 0) {
     const originalSize = FHIRDefs.size();
-    const packages = fs.existsSync(cachePath) ? fs.readdirSync(cachePath) : [];
-    const cachedPackage = packages.find(packageName => packageName.toLowerCase() === targetPackage);
-    if (cachedPackage) {
-      const files = fs.readdirSync(path.join(cachePath, cachedPackage, 'package'));
+    if (fs.existsSync(targetPath)) {
+      const files = fs.readdirSync(targetPath);
       for (const file of files) {
         if (file.endsWith('.json')) {
-          const def = JSON.parse(
-            fs.readFileSync(path.join(cachePath, cachedPackage, 'package', file), 'utf-8').trim()
-          );
+          const def = JSON.parse(fs.readFileSync(path.join(targetPath, file), 'utf-8').trim());
           FHIRDefs.add(def);
         }
       }

diff --git a/src/import/importConfiguration.ts b/src/import/importConfiguration.ts
@@ -555,12 +555,6 @@ function parseDependencies(
     return;
   }
   return Object.entries(yamlDependencies).map(([packageId, versionOrDetails]) => {
-    if (/[A-Z]/.test(packageId)) {
-      logger.warn(
-        `${packageId} contains uppercase characters, which is discouraged. SUSHI will use ${packageId.toLowerCase()} as the package name.`
-      );
-      packageId = packageId.toLowerCase();
-    }
     if (typeof versionOrDetails === 'string' || typeof versionOrDetails === 'number') {
       return { packageId, version: `${versionOrDetails}` };
     } else if (versionOrDetails == null) {

diff --git a/test/export/CodeSystemExporter.test.ts b/test/export/CodeSystemExporter.test.ts
@@ -15,7 +15,11 @@ describe('CodeSystemExporter', () => {
 
   beforeAll(() => {
     defs = new FHIRDefinitions();
-    loadFromPath(path.join(__dirname, '..', 'testhelpers', 'testdefs'), 'r4-definitions', defs);
+    loadFromPath(
+      path.join(__dirname, '..', 'testhelpers', 'testdefs', 'package'),
+      'testPackage',
+      defs
+    );
   });
 
   beforeEach(() => {

diff --git a/test/export/FHIRExporter.test.ts b/test/export/FHIRExporter.test.ts
@@ -31,7 +31,11 @@ describe('FHIRExporter', () => {
 
     beforeAll(() => {
       defs = new FHIRDefinitions();
-      loadFromPath(path.join(__dirname, '..', 'testhelpers', 'testdefs'), 'r4-definitions', defs);
+      loadFromPath(
+        path.join(__dirname, '..', 'testhelpers', 'testdefs', 'package'),
+        'testPackage',
+        defs
+      );
     });
 
     beforeEach(() => {

diff --git a/test/export/InstanceExporter.test.ts b/test/export/InstanceExporter.test.ts
@@ -35,7 +35,11 @@ describe('InstanceExporter', () => {
 
   beforeAll(() => {
     defs = new FHIRDefinitions();
-    loadFromPath(path.join(__dirname, '..', 'testhelpers', 'testdefs'), 'r4-definitions', defs);
+    loadFromPath(
+      path.join(__dirname, '..', 'testhelpers', 'testdefs', 'package'),
+      'testPackage',
+      defs
+    );
   });
 
   beforeEach(() => {
@@ -3882,7 +3886,11 @@ describe('InstanceExporter R5', () => {
 
   beforeAll(() => {
     defs = new FHIRDefinitions();
-    loadFromPath(path.join(__dirname, '..', 'testhelpers', 'testdefs'), 'r5-definitions', defs);
+    loadFromPath(
+      path.join(__dirname, '..', 'testhelpers', 'testdefs', 'r5-definitions'),
+      'r5',
+      defs
+    );
   });
 
   beforeEach(() => {

diff --git a/test/export/MappingExporter.test.ts b/test/export/MappingExporter.test.ts
@@ -19,7 +19,11 @@ describe('MappingExporter', () => {
 
   beforeAll(() => {
     defs = new FHIRDefinitions();
-    loadFromPath(path.join(__dirname, '..', 'testhelpers', 'testdefs'), 'r4-definitions', defs);
+    loadFromPath(
+      path.join(__dirname, '..', 'testhelpers', 'testdefs', 'package'),
+      'testPackage',
+      defs
+    );
   });
 
   beforeEach(() => {

diff --git a/test/export/StructureDefinition.ExtensionExporter.test.ts b/test/export/StructureDefinition.ExtensionExporter.test.ts
@@ -15,7 +15,11 @@ describe('ExtensionExporter', () => {
 
   beforeAll(() => {
     defs = new FHIRDefinitions();
-    loadFromPath(path.join(__dirname, '..', 'testhelpers', 'testdefs'), 'r4-definitions', defs);
+    loadFromPath(
+      path.join(__dirname, '..', 'testhelpers', 'testdefs', 'package'),
+      'testPackage',
+      defs
+    );
   });
 
   beforeEach(() => {

diff --git a/test/export/StructureDefinition.LogicalExporter.test.ts b/test/export/StructureDefinition.LogicalExporter.test.ts
@@ -21,7 +21,11 @@ describe('LogicalExporter', () => {
 
   beforeAll(() => {
     defs = new FHIRDefinitions();
-    loadFromPath(path.join(__dirname, '..', 'testhelpers', 'testdefs'), 'r4-definitions', defs);
+    loadFromPath(
+      path.join(__dirname, '..', 'testhelpers', 'testdefs', 'package'),
+      'testPackage',
+      defs
+    );
   });
 
   beforeEach(() => {

diff --git a/test/export/StructureDefinition.ProfileExporter.test.ts b/test/export/StructureDefinition.ProfileExporter.test.ts
@@ -15,7 +15,11 @@ describe('ProfileExporter', () => {
 
   beforeAll(() => {
     defs = new FHIRDefinitions();
-    loadFromPath(path.join(__dirname, '..', 'testhelpers', 'testdefs'), 'r4-definitions', defs);
+    loadFromPath(
+      path.join(__dirname, '..', 'testhelpers', 'testdefs', 'package'),
+      'testPackage',
+      defs
+    );
   });
 
   beforeEach(() => {

diff --git a/test/export/StructureDefinition.ResourceExporter.test.ts b/test/export/StructureDefinition.ResourceExporter.test.ts
@@ -22,7 +22,11 @@ describe('ResourceExporter', () => {
 
   beforeAll(() => {
     defs = new FHIRDefinitions();
-    loadFromPath(path.join(__dirname, '..', 'testhelpers', 'testdefs'), 'r4-definitions', defs);
+    loadFromPath(
+      path.join(__dirname, '..', 'testhelpers', 'testdefs', 'package'),
+      'testPackage',
+      defs
+    );
   });
 
   beforeEach(() => {

diff --git a/test/export/StructureDefinitionExporter.test.ts b/test/export/StructureDefinitionExporter.test.ts
@@ -45,7 +45,11 @@ describe('StructureDefinitionExporter R4', () => {
 
   beforeAll(() => {
     defs = new FHIRDefinitions();
-    loadFromPath(path.join(__dirname, '..', 'testhelpers', 'testdefs'), 'r4-definitions', defs);
+    loadFromPath(
+      path.join(__dirname, '..', 'testhelpers', 'testdefs', 'package'),
+      'testPackage',
+      defs
+    );
   });
 
   beforeEach(() => {
@@ -6972,7 +6976,11 @@ describe('StructureDefinitionExporter R5', () => {
 
   beforeAll(() => {
     defs = new FHIRDefinitions();
-    loadFromPath(path.join(__dirname, '..', 'testhelpers', 'testdefs'), 'r5-definitions', defs);
+    loadFromPath(
+      path.join(__dirname, '..', 'testhelpers', 'testdefs', 'r5-definitions'),
+      'r5',
+      defs
+    );
   });
 
   beforeEach(() => {

diff --git a/test/export/ValueSetExporter.test.ts b/test/export/ValueSetExporter.test.ts
@@ -22,7 +22,11 @@ describe('ValueSetExporter', () => {
 
   beforeAll(() => {
     defs = new FHIRDefinitions();
-    loadFromPath(path.join(__dirname, '..', 'testhelpers', 'testdefs'), 'r4-definitions', defs);
+    loadFromPath(
+      path.join(__dirname, '..', 'testhelpers', 'testdefs', 'package'),
+      'testPackage',
+      defs
+    );
   });
 
   beforeEach(() => {

diff --git a/test/fhirdefs/FHIRDefinitions.test.ts b/test/fhirdefs/FHIRDefinitions.test.ts
@@ -8,10 +8,18 @@ describe('FHIRDefinitions', () => {
   let defs: FHIRDefinitions;
   beforeAll(() => {
     defs = new FHIRDefinitions();
-    loadFromPath(path.join(__dirname, '..', 'testhelpers', 'testdefs'), 'r4-definitions', defs);
+    loadFromPath(
+      path.join(__dirname, '..', 'testhelpers', 'testdefs', 'package'),
+      'test#1.1.1',
+      defs
+    );
     // Supplemental R3 defs needed to test fishing for implied extensions
     const r3Defs = new FHIRDefinitions(true);
-    loadFromPath(path.join(__dirname, '..', 'testhelpers', 'testdefs'), 'r3-definitions', r3Defs);
+    loadFromPath(
+      path.join(__dirname, '..', 'testhelpers', 'testdefs', 'r3-definitions'),
+      'hl7.fhir.r3.core#3.0.2',
+      r3Defs
+    );
     defs.addSupplementalFHIRDefinitions('hl7.fhir.r3.core#3.0.2', r3Defs);
     // Run the dependency resources through TestFisher to force them into the testhelpers cache
     const fisher = new TestFisher().withFHIR(defs);

diff --git a/test/fhirdefs/fixtures/sUshI-tESt-CaPs#0.1.0/package/StructureDefinition-MyPatient.json b/test/fhirdefs/fixtures/sUshI-tESt-CaPs#0.1.0/package/StructureDefinition-MyPatient.json
diff --git a/test/fhirdefs/fixtures/sUshI-tESt-CaPs#0.1.0/package/package.json b/test/fhirdefs/fixtures/sUshI-tESt-CaPs#0.1.0/package/package.json
diff --git a/test/fhirdefs/impliedExtension.test.ts b/test/fhirdefs/impliedExtension.test.ts
@@ -43,15 +43,31 @@ describe('impliedExtensions', () => {
     let defs: FHIRDefinitions;
     beforeEach(() => {
       defs = new FHIRDefinitions();
-      loadFromPath(path.join(__dirname, '..', 'testhelpers', 'testdefs'), 'r4-definitions', defs);
+      loadFromPath(
+        path.join(__dirname, '..', 'testhelpers', 'testdefs', 'package'),
+        'testdefs',
+        defs
+      );
       const r2Defs = new FHIRDefinitions(true);
-      loadFromPath(path.join(__dirname, '..', 'testhelpers', 'testdefs'), 'r2-definitions', r2Defs);
+      loadFromPath(
+        path.join(__dirname, '..', 'testhelpers', 'testdefs', 'r2-definitions'),
+        'hl7.fhir.r2.core#1.0.2',
+        r2Defs
+      );
       defs.addSupplementalFHIRDefinitions('hl7.fhir.r2.core#1.0.2', r2Defs);
       const r3Defs = new FHIRDefinitions(true);
-      loadFromPath(path.join(__dirname, '..', 'testhelpers', 'testdefs'), 'r3-definitions', r3Defs);
+      loadFromPath(
+        path.join(__dirname, '..', 'testhelpers', 'testdefs', 'r3-definitions'),
+        'hl7.fhir.r3.core#3.0.2',
+        r3Defs
+      );
       defs.addSupplementalFHIRDefinitions('hl7.fhir.r3.core#3.0.2', r3Defs);
       const r5Defs = new FHIRDefinitions(true);
-      loadFromPath(path.join(__dirname, '..', 'testhelpers', 'testdefs'), 'r5-definitions', r5Defs);
+      loadFromPath(
+        path.join(__dirname, '..', 'testhelpers', 'testdefs', 'r5-definitions'),
+        'hl7.fhir.r5.core#4.6.0',
+        r5Defs
+      );
       defs.addSupplementalFHIRDefinitions('hl7.fhir.r5.core#current', r5Defs);
       loggerSpy.reset();
     });
@@ -1314,9 +1330,17 @@ describe('impliedExtensions', () => {
     let defs: FHIRDefinitions;
     beforeEach(() => {
       defs = new FHIRDefinitions();
-      loadFromPath(path.join(__dirname, '..', 'testhelpers', 'testdefs'), 'r5-definitions', defs);
+      loadFromPath(
+        path.join(__dirname, '..', 'testhelpers', 'testdefs', 'r5-definitions'),
+        'hl7.fhir.r5.core#4.6.0',
+        defs
+      );
       const r4Defs = new FHIRDefinitions(true);
-      loadFromPath(path.join(__dirname, '..', 'testhelpers', 'testdefs'), 'r4-definitions', r4Defs);
+      loadFromPath(
+        path.join(__dirname, '..', 'testhelpers', 'testdefs', 'package'),
+        'hl7.fhir.r4.core#4.0.1',
+        r4Defs
+      );
       defs.addSupplementalFHIRDefinitions('hl7.fhir.r4.core#4.0.1', r4Defs);
       loggerSpy.reset();
     });