fix: Clear generated env directory before shim generation

Author: vigy02

packages/backend-function/src/function_env_type_generator.test.ts

@@ -77,17 +77,12 @@ void describe('FunctionEnvironmentTypeGenerator', () => {
     const fsExistsSyncMock = mock.method(fs, 'existsSync', () => true);
     const fsRmSyncMock = mock.method(fs, 'rmSync', () => {});
 
-    const functionEnvironmentTypeGenerator =
-      new FunctionEnvironmentTypeGenerator('testFunction');
+    new FunctionEnvironmentTypeGenerator('testFunction1');
 
     assert.equal(fsExistsSyncMock.mock.calls.length, 1);
     assert.equal(fsRmSyncMock.mock.calls.length, 1);
 
-    const functionEnvironmentTypeGenerator2 =
-      new FunctionEnvironmentTypeGenerator('testFunction2');
-
-    functionEnvironmentTypeGenerator.clearGeneratedEnvDirectory();
-    functionEnvironmentTypeGenerator2.clearGeneratedEnvDirectory();
+    new FunctionEnvironmentTypeGenerator('testFunction2');
 
     assert.equal(fsExistsSyncMock.mock.calls.length, 1);
     assert.equal(fsRmSyncMock.mock.calls.length, 1);

packages/backend-function/src/function_env_type_generator.ts

@@ -31,24 +31,6 @@ export class FunctionEnvironmentTypeGenerator {
     );
     this.clearGeneratedEnvDirectory();
   }
-  /**
-   * Clear existing files and subdirectories in the generated env directory
-   */
-  public clearGeneratedEnvDirectory = (): void => {
-    if (FunctionEnvironmentTypeGenerator.isEnvDirectoryInitialized) {
-      return;
-    }
-    const pathToDelete = path.join(
-      process.cwd(),
-      '.amplify',
-      'generated',
-      'env'
-    );
-    if (fs.existsSync(pathToDelete)) {
-      fs.rmSync(pathToDelete, { recursive: true, force: true });
-      FunctionEnvironmentTypeGenerator.isEnvDirectoryInitialized = true;
-    }
-  };
 
   /**
    * Generate a typed process.env shim
@@ -117,4 +99,22 @@ export class FunctionEnvironmentTypeGenerator {
 
     fs.writeFileSync(this.typeDefFilePath, content);
   };
+  /**
+   * Clear existing files and subdirectories in the generated env directory
+   */
+  private clearGeneratedEnvDirectory = (): void => {
+    if (FunctionEnvironmentTypeGenerator.isEnvDirectoryInitialized) {
+      return;
+    }
+    const pathToDelete = path.join(
+      process.cwd(),
+      '.amplify',
+      'generated',
+      'env'
+    );
+    if (fs.existsSync(pathToDelete)) {
+      fs.rmSync(pathToDelete, { recursive: true, force: true });
+      FunctionEnvironmentTypeGenerator.isEnvDirectoryInitialized = true;
+    }
+  };
 }