feat: More reliable way to remove temporary changes

Author: aarne

jest.config.cjs

@@ -1,6 +1,6 @@
 module.exports = {
     transform: {
-        "\\.[jt]sx?$": ["esbuild-jest", { format: "esm" }],
+        "\\.[jt]sx?$": ["esbuild-jest"],
     },
     moduleFileExtensions: ["ts", "js"],
     extensionsToTreatAsEsm: ['.ts'],

package.json

@@ -14,7 +14,7 @@
 	],
 	"scripts": {
 		"prepack": "tsc",
-		"test": "NODE_OPTIONS=\"--experimental-vm-modules\" jest",
+		"test": "jest --runInBand",
 		"semantic-release": "semantic-release -b main"
 	},
 	"repository": {

src/source.ts

@@ -12,7 +12,10 @@ interface Target {
 	condition?: string;
 }
 
-const selfLocation = join(__dirname, "../../");
+const selfLocation = join(
+	__dirname,
+	__dirname.endsWith("build") ? "../../" : "./"
+);
 
 async function materializeFunctionInFile(source: SourceFile, target: Target) {
 	const localPath = relative(cwd(), source.getFilePath());
@@ -47,27 +50,30 @@ async function materializeFunctionInFile(source: SourceFile, target: Target) {
 	// prettier-ignore
 	source.addStatements(`import { materialize } from "${selfLocation}"`);
 	// prettier-ignore
-	source.addStatements(`materialize(${func.getName()}, ${target.condition ?? "undefined"}).then(console.log).catch((e:any) => console.error(e.message))`);
+	source.addStatements(`materialize/*remove*/(${func.getName()}, ${target.condition ?? "undefined"}).then(console.log).catch((e:any) => console.error(e.message))`);
 	await source.save();
+	await source.refreshFromFileSystem();
 
 	let error: string | undefined = undefined;
 	try {
 		const result = await execAsync(`ts-node ${source.getFilePath()}`);
-
-		await source.refreshFromFileSystem();
-
 		try {
 			const data = extractResponse(result.stdout);
 			func.setBodyText(`/* __materialized__ */\nreturn ${data}`);
 		} catch (e: any) {
 			error = result.stderr.trim();
 		}
 	} catch (e: any) {
-		await source.refreshFromFileSystem();
 		error = e.message.trim();
 	}
 
-	source.removeStatement(source.getStatements().length - 1);
+	const st = source.getStatements();
+	st.forEach((s) => {
+		if (s.getText().startsWith("materialize/*remove*/(")) {
+			s.remove();
+		}
+	});
+
 	source.organizeImports();
 	await source.save();
 	log(`${error ?? "completed"}`);

tests/fixture.spec.ts

@@ -16,8 +16,7 @@ describe("test ficture", () => {
 	});
 
 	test("expect both materialize1 and materialize2 to mutate", async () => {
-		//@ts-ignore
-		const module = await import("./fixtures/test-cases.ts");
+		const module = require("./fixtures/test-cases.ts");
 		expect(await module.materialize1()).not.toEqual(
 			await module.materialize1()
 		);
@@ -28,14 +27,13 @@ describe("test ficture", () => {
 
 	test("modify source", async () => {
 		const current = await readFile("tests/fixtures/test-cases.ts");
-		await main();
+		await main("tests/fixtures/test-cases.ts");
 		const replaced = await readFile("tests/fixtures/test-cases.ts");
 		expect(current).not.toEqual(replaced);
 	});
 
 	test("expect only materialize2 to mutate", async () => {
-		//@ts-ignore
-		const module = await import("./fixtures/test-cases.ts");
+		const module = require("./fixtures/test-cases.ts");
 		expect(await module.materialize1()).toEqual(await module.materialize1());
 		expect(await module.materialize2()).not.toEqual(
 			await module.materialize2()