Remove Old FPL Code

src/app.ts

@@ -1,10 +1,16 @@
 #!/usr/bin/env node
 
-import { program, OptionValues } from 'commander';
 import path from 'path';
 import fs from 'fs-extra';
-import { loadDependencies } from './load';
+import os from 'os';
+import initSqlJs from 'sql.js';
 import { logger } from './utils';
+import { program, OptionValues } from 'commander';
+import { BasePackageLoader } from './loader';
+import { SQLJSPackageDB } from './db';
+import { DiskBasedPackageCache } from './cache';
+import { DefaultRegistryClient } from './registry';
+import { BuildDotFhirDotOrgClient } from './current';
 
 function getVersion(): string {
   const packageJSONPath = path.join(__dirname, '..', 'package.json');
@@ -18,21 +24,30 @@ function getVersion(): string {
 function getHelpText(): string {
   return `
 Examples:
-  fpl install hl7.fhir.us.core@current
-  fpl install hl7.fhir.us.core@4.0.0 hl7.fhir.us.mcode@2.0.0 --cachePath ./myProject`;
+  fpl install hl7.fhir.us.core#current
+  fpl install hl7.fhir.us.core#4.0.0 hl7.fhir.us.mcode#2.0.0 --cachePath ./myProject`;
 }
 
 async function install(fhirPackages: string[], options: OptionValues) {
   if (options.debug) logger.level = 'debug';
-
-  const packages = fhirPackages.map(dep => dep.replace('@', '#'));
-  const cachePath = options.cachePath;
-
-  const logMessage = (level: string, message: string) => {
+  const log = (level: string, message: string) => {
     logger.log(level, message);
   };
 
-  await loadDependencies(packages, cachePath, logMessage);
+  const SQL = await initSqlJs();
+  const packageDB = new SQLJSPackageDB(new SQL.Database());
+  const fhirCache = options.cachePath ?? path.join(os.homedir(), '.fhir', 'packages');
+  const packageCache = new DiskBasedPackageCache(fhirCache, [], { log });
+  const registryClient = new DefaultRegistryClient({ log });
+  const buildClient = new BuildDotFhirDotOrgClient({ log });
+  const loader = new BasePackageLoader(packageDB, packageCache, registryClient, buildClient, {
+    log
+  });
+
+  for (const pkg of fhirPackages) {
+    const [name, version] = pkg.split(/[#@]/, 2);
+    await loader.loadPackage(name, version);
+  }
 }
 
 async function app() {
@@ -48,7 +63,7 @@ async function app() {
     .usage('<fhirPackages...> [options]')
     .argument(
       '<fhirPackages...>',
-      'list of FHIR packages to load using the format packageId@packageVersion...'
+      'list of FHIR packages to load using the format packageId#packageVersion or packageId@packageVersion'
     )
     .option(
       '-c, --cachePath <dir>',

src/current/BuildDotFhirDotOrgClient.ts

@@ -1,5 +1,6 @@
 import { Readable } from 'stream';
 import { LogFunction, axiosGet } from '../utils';
+import { CurrentPackageLoadError } from '../errors';
 import { CurrentBuildClient, CurrentBuildClientOptions } from './CurrentBuildClient';
 
 export class BuildDotFhirDotOrgClient implements CurrentBuildClient {
@@ -12,7 +13,7 @@ export class BuildDotFhirDotOrgClient implements CurrentBuildClient {
     const version = branch ? `current$${branch}` : 'current';
     const baseURL = await this.getCurrentBuildBaseURL(name, branch);
     if (!baseURL) {
-      throw new Error(`Failed to download ${name}#${version}`);
+      throw new CurrentPackageLoadError(`${name}#${version}`);
     }
     const url = `${baseURL}/package.tgz`;
     this.log('info', `Attempting to download ${name}#${version} from ${url}`);

src/errors/index.ts

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

src/index.ts

@@ -1,7 +1,4 @@
-export * from './api';
 export * from './errors';
-export * from './FHIRDefinitions';
-export * from './load';
 export * from './utils';
 export * from './cache';
 export * from './current';