Add error for incorrect wildcard uses and throw in mergeDependency an…

…d lookUpLatestPatchVersion

src/errors/IncorrectWildcardVersionFormatError.ts

@@ -0,0 +1,7 @@
+export class IncorrectWildcardVersionFormatError extends Error {
+  constructor(public packageName: string, version: string) {
+    super(
+      `Incorrect version format for package ${packageName}: ${version}. Wildcard should only be used to specify patch versions.`
+    );
+  }
+}

src/errors/index.ts

@@ -1,2 +1,4 @@
 export * from './CurrentPackageLoadError';
+export * from './IncorrectWildcardVersionFormatError';
+export * from './LatestVersionUnavailableError';
 export * from './PackageLoadError';

src/load.ts

@@ -4,7 +4,11 @@ import os from 'os';
 import { maxSatisfying } from 'semver';
 import tar from 'tar';
 import temp from 'temp';
-import { PackageLoadError, CurrentPackageLoadError } from './errors';
+import {
+  PackageLoadError,
+  CurrentPackageLoadError,
+  IncorrectWildcardVersionFormatError
+} from './errors';
 import { FHIRDefinitions } from './FHIRDefinitions';
 import { LogFunction } from './utils';
 import { axiosGet } from './utils/axiosUtils';
@@ -114,9 +118,11 @@ export async function mergeDependency(
   if (version === 'latest') {
     // using the exported function here to allow for easier mocking in tests
     version = await exports.lookUpLatestVersion(packageName, log);
-  } else if (/\d+\.\d+\.x/.test(version)) {
+  } else if (/^\d+\.\d+\.x$/.test(version)) {
     // using the exported function here to allow for easier mocking in tests
     version = await exports.lookUpLatestPatchVersion(packageName, version, log);
+  } else if (/^\d+\.x$/.test(version)) {
+    throw new IncorrectWildcardVersionFormatError(packageName, version);
   }
   let fullPackageName = `${packageName}#${version}`;
   const loadPath = path.join(cachePath, fullPackageName, 'package');
@@ -401,6 +407,9 @@ export async function lookUpLatestPatchVersion(
   version: string,
   log: LogFunction = () => {}
 ): Promise<string> {
+  if (!/^\d+\.\d+\.x$/.test(version)) {
+    throw new IncorrectWildcardVersionFormatError(packageName, version);
+  }
   const customRegistry = getCustomRegistry(log);
   let res: AxiosResponse;
   try {

test/load.test.ts

@@ -16,9 +16,12 @@ import {
   lookUpLatestPatchVersion
 } from '../src/load';
 import { FHIRDefinitions, Type } from '../src/FHIRDefinitions';
-import { PackageLoadError } from '../src/errors';
+import {
+  IncorrectWildcardVersionFormatError,
+  LatestVersionUnavailableError,
+  PackageLoadError
+} from '../src/errors';
 import { loggerSpy } from './testhelpers';
-import { LatestVersionUnavailableError } from '../src/errors/LatestVersionUnavailableError';
 
 // Represents a typical response from packages.fhir.org
 const TERM_PKG_RESPONSE = {
@@ -1048,6 +1051,13 @@ describe('#mergeDependency()', () => {
     );
   });
 
+  it('should throw IncorrectWildcardVersionFormatError when the given version uses a non-patch wildcard', async () => {
+    await expect(mergeDependency('sushi-test', '0.x', defs, 'foo', log)).rejects.toThrow(
+      'Incorrect version format for package sushi-test: 0.x. Wildcard should only be used to specify patch versions.'
+    );
+    expect(axiosSpy.mock.calls.length).toBe(0);
+  });
+
   it('should throw CurrentPackageLoadError when a current package is not listed', async () => {
     await expect(mergeDependency('hl7.fhir.us.core', 'current', defs, 'foo', log)).rejects.toThrow(
       'The package hl7.fhir.us.core#current is not available on https://build.fhir.org/ig/qas.json, so no current version can be loaded'
@@ -1281,4 +1291,10 @@ describe('#lookUpLatestPatchVersion', () => {
       LatestVersionUnavailableError
     );
   });
+
+  it('should throw IncorrectWildcardVersionFormatError when a wildcard is used for minor version', async () => {
+    await expect(lookUpLatestPatchVersion('hl7.terminology.r4', '1.x')).rejects.toThrow(
+      IncorrectWildcardVersionFormatError
+    );
+  });
 });