[heft] Move loader cache to instance

Author: dmichon-msft

apps/heft/src/configuration/HeftConfiguration.ts

@@ -33,35 +33,6 @@ interface IProjectConfigurationFileEntry<TConfigFile> {
   loader: ProjectConfigurationFile<TConfigFile>;
 }
 
-const projectConfigurationFileRegistry: Map<string, IProjectConfigurationFileEntry<unknown>> = new Map();
-function getAndValidateProjectConfigurationFileEntry<TConfigFile>(
-  options: IProjectConfigurationFileSpecification<TConfigFile>
-): IProjectConfigurationFileEntry<TConfigFile> {
-  let entry: IProjectConfigurationFileEntry<TConfigFile> | undefined = projectConfigurationFileRegistry.get(
-    options.projectRelativeFilePath
-  ) as IProjectConfigurationFileEntry<TConfigFile> | undefined;
-
-  if (!entry) {
-    entry = {
-      options: Object.freeze(options),
-      loader: new ProjectConfigurationFile<TConfigFile>(options)
-    };
-  } else if (options !== entry.options) {
-    throw new Error(
-      `The project configuration file for ${options.projectRelativeFilePath} has already been loaded with different options. Please ensure that options object used to load the configuration file is the same referenced object in all calls.`
-    );
-  }
-
-  return entry;
-}
-/**
- * For unit test usage.
- * @internal
- */
-export function _clearProjectConfigurationFileRegistry(): void {
-  projectConfigurationFileRegistry.clear();
-}
-
 /**
  * @public
  */
@@ -75,6 +46,8 @@ export class HeftConfiguration {
   private _terminalProvider!: ITerminalProvider;
   private _rigPackageResolver!: RigPackageResolver;
 
+  private readonly _knownConfigurationFiles: Map<string, IProjectConfigurationFileEntry<unknown>> = new Map();
+
   /**
    * Project build folder path. This is the folder containing the project's package.json file.
    */
@@ -197,7 +170,7 @@ export class HeftConfiguration {
     options: IProjectConfigurationFileSpecification<TConfigFile>,
     terminal: ITerminal
   ): TConfigFile | undefined {
-    const { loader } = getAndValidateProjectConfigurationFileEntry(options);
+    const loader: ProjectConfigurationFile<TConfigFile> = this._getConfigFileLoader(options);
     return loader.tryLoadConfigurationFileForProject(terminal, this._buildFolderPath, this._rigConfig);
   }
 
@@ -211,7 +184,7 @@ export class HeftConfiguration {
     options: IProjectConfigurationFileSpecification<TConfigFile>,
     terminal: ITerminal
   ): Promise<TConfigFile | undefined> {
-    const { loader } = getAndValidateProjectConfigurationFileEntry(options);
+    const loader: ProjectConfigurationFile<TConfigFile> = this._getConfigFileLoader(options);
     return loader.tryLoadConfigurationFileForProjectAsync(terminal, this._buildFolderPath, this._rigConfig);
   }
 
@@ -241,4 +214,25 @@ export class HeftConfiguration {
     configuration._globalTerminal = new Terminal(options.terminalProvider);
     return configuration;
   }
+
+  private _getConfigFileLoader<TConfigFile>(
+    options: IProjectConfigurationFileSpecification<TConfigFile>
+  ): ProjectConfigurationFile<TConfigFile> {
+    let entry: IProjectConfigurationFileEntry<TConfigFile> | undefined = this._knownConfigurationFiles.get(
+      options.projectRelativeFilePath
+    ) as IProjectConfigurationFileEntry<TConfigFile> | undefined;
+
+    if (!entry) {
+      entry = {
+        options: Object.freeze(options),
+        loader: new ProjectConfigurationFile<TConfigFile>(options)
+      };
+    } else if (options !== entry.options) {
+      throw new Error(
+        `The project configuration file for ${options.projectRelativeFilePath} has already been loaded with different options. Please ensure that options object used to load the configuration file is the same referenced object in all calls.`
+      );
+    }
+
+    return entry.loader;
+  }
 }