B Fixes flaky removal of working directory (again)

quatico-solutions · May 7, 2024 · 4d7da05 · 4d7da05
1 parent 240de58
commit 4d7da05
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 16 deletions.
diff --git a/packages/examples/tests/foobar-replace-processor.test.ts b/packages/examples/tests/foobar-replace-processor.test.ts
@@ -22,7 +22,7 @@ describe("foobar-replace-processor", () => {
         testObj
             .addProjectFromSource({
                 "bar.ts": `console.log("Hello, Bar!");`,
-                "foo.ts": `export class Foobar {}`,
+                "foo.ts": `export class FooBar {}`,
             })
             .compile();
 

diff --git a/packages/examples/tests/foobar-replace-transformer.test.ts b/packages/examples/tests/foobar-replace-transformer.test.ts
@@ -4,7 +4,7 @@ import { join } from "path";
 describe("foobar-replace-transformer", () => {
     let testObj: CompilationEnv;
     beforeAll(() => {
-        testObj = compilationEnv("./__TEST__", { compilerOptions: { project: { outDir: "dist" } }, virtual: false }).addAddon(
+        testObj = compilationEnv("./__TEST__", { compilerOptions: { project: { outDir: "dist" } } }).addAddon(
             "foobar-replace-transformer",
             join(__dirname, "../addons")
         );
@@ -14,10 +14,6 @@ describe("foobar-replace-transformer", () => {
         testObj.cleanUp("project");
     });
 
-    afterAll(() => {
-        testObj.cleanUp();
-    });
-
     it("should replace 'foo' with 'bar' in the output files", () => {
         testObj
             .addProjectFromSource({

diff --git a/packages/testing/src/compilation/environment.ts b/packages/testing/src/compilation/environment.ts
@@ -22,6 +22,7 @@ import ts from "typescript";
 import { compileOptions } from "../compile-options";
 import { copyDirectory } from "./copy-directory";
 import { resolvePath } from "./resolve-path";
+import { rmSync } from "fs";
 
 const DEFAULT_ROOT_DIR = "/";
 const DEFAULT_BUILD_DIR = "./src";
@@ -35,7 +36,7 @@ export class CompilationEnv {
     private buildDir: string;
     private system: ts.System;
     private virtual: boolean;
-    private addons?: AddonRegistry;
+    private addons: AddonRegistry;
 
     constructor(rootDir?: string, options?: Partial<CompilationOptions>, addonConfig?: Partial<AddonConfig>) {
         const { virtual = true, compilerOptions = {}, useCaseSensitiveFileNames } = options ?? {};
@@ -73,10 +74,10 @@ export class CompilationEnv {
         });
 
         const registryConfig = {
-            ...(addonConfig ?? {}),
             addonsDir: join(this.rootDir, "./addons"),
             reporter: new DefaultReporter(this.system),
             system: this.system,
+            ...(addonConfig ?? {}),
         };
         this.addons = new AddonRegistry(registryConfig);
         if (!this.system.directoryExists(this.addons.getAddonsDir())) {
@@ -93,6 +94,10 @@ export class CompilationEnv {
         return this.rootDir;
     }
 
+    public getOutDir(): string {
+        return resolvePath(this.system, this.rootDir, this.compilerOptions.project.outDir ?? DEFAULT_OUT_DIR);
+    }
+
     public getCompilerOptions(): CompilerOptions {
         return this.compilerOptions;
     }
@@ -106,14 +111,22 @@ export class CompilationEnv {
     }
 
     public cleanUp(options: "project" | "addons" | "all" = "all"): this {
-        const target = options === "project" ? this.getProjectDir() : options === "addons" && this.addons ? this.addons.getAddonsDir() : this.rootDir;
-        if (this.system.directoryExists(target)) {
-            if (this.isVirtual()) {
-                this.system.readDirectory(target).forEach(it => this.system.deleteFile!(it));
-            } else {
-                ts.sys.readDirectory(target).forEach(it => this.system.deleteFile!(it));
-            }
+        let directories = [];
+        switch (options) {
+            case "all":
+                directories = [this.rootDir];
+                break;
+            case "project":
+                directories = [this.buildDir, this.getOutDir()];
+                break;
+            case "addons":
+                directories = [this.addons.getAddonsDir()];
+                break;
         }
+        directories.forEach(dir =>
+            this.virtual ? this.system.readDirectory(dir).forEach((it: string) => this.system.deleteFile!(it)) : rmSync(dir, { recursive: true })
+        );
+
         return this;
     }
 
@@ -290,7 +303,7 @@ export class CompilationEnv {
                 acc[filePath] = content;
             } else {
                 if (filePath.includes(addonName)) {
-                    acc[join(this.addons!.getAddonsDir(), filePath)] = content;
+                    acc[join(this.addons.getAddonsDir(), filePath)] = content;
                 } else {
                     acc[join(addonTargetPath, filePath)] = content;
                 }