Merge pull request #8 from koji-1009/fix/version

fix: improve version parsing and clean up internal APIs

Author: koji-1009

__tests__/cache.test.ts

@@ -275,7 +275,7 @@ describe("savePubCache", () => {
 			"file1",
 		] as unknown as ReturnType<typeof fs.readdirSync>);
 		mockedCache.saveCache.mockResolvedValue(1);
-		await savePubCache(["/pub-cache"], "key", "/pub-cache");
+		await savePubCache(["/pub-cache"], "key");
 		expect(mockedCache.saveCache).toHaveBeenCalled();
 	});
 
@@ -284,7 +284,7 @@ describe("savePubCache", () => {
 		vi.mocked(fs.readdirSync).mockReturnValue(
 			[] as unknown as ReturnType<typeof fs.readdirSync>,
 		);
-		await savePubCache(["/pub-cache"], "key", "/pub-cache");
+		await savePubCache(["/pub-cache"], "key");
 		expect(mockedCache.saveCache).not.toHaveBeenCalled();
 		expect(mockedCore.info).toHaveBeenCalledWith(
 			expect.stringContaining("empty"),
@@ -293,7 +293,7 @@ describe("savePubCache", () => {
 
 	it("skips save when directory does not exist", async () => {
 		vi.mocked(fs.existsSync).mockReturnValue(false);
-		await savePubCache(["/pub-cache"], "key", "/pub-cache");
+		await savePubCache(["/pub-cache"], "key");
 		expect(mockedCache.saveCache).not.toHaveBeenCalled();
 	});
 
@@ -305,7 +305,7 @@ describe("savePubCache", () => {
 		const error = new Error("Cache already exists");
 		error.name = "ReserveCacheError";
 		mockedCache.saveCache.mockRejectedValue(error);
-		await savePubCache(["/pub-cache"], "key", "/pub-cache");
+		await savePubCache(["/pub-cache"], "key");
 		expect(mockedCore.info).toHaveBeenCalledWith(
 			expect.stringContaining("already exists"),
 		);
@@ -317,7 +317,7 @@ describe("savePubCache", () => {
 			"file1",
 		] as unknown as ReturnType<typeof fs.readdirSync>);
 		mockedCache.saveCache.mockRejectedValue(new Error("network error"));
-		await savePubCache(["/pub-cache"], "key", "/pub-cache");
+		await savePubCache(["/pub-cache"], "key");
 		expect(mockedCore.warning).toHaveBeenCalledWith(
 			expect.stringContaining("network error"),
 		);

__tests__/fixtures/pubspec-comment.yaml

@@ -0,0 +1,4 @@
+name: test
+environment:
+  sdk: ">=3.5.0 <4.0.0"
+  flutter: ">=3.29.0 <4.0.0" # inline comment

__tests__/fixtures/pubspec-empty-quoted.yaml

@@ -0,0 +1,3 @@
+name: test
+environment:
+  flutter: ""

__tests__/fixtures/pubspec-unquoted-comment.yaml

@@ -0,0 +1,4 @@
+name: test
+environment:
+  sdk: ">=3.5.0 <4.0.0"
+  flutter: 3.29.0 # inline comment

__tests__/fixtures/pubspec-unquoted.yaml

@@ -0,0 +1,3 @@
+name: test
+environment:
+  flutter: 3.29.0

__tests__/installer.test.ts

@@ -145,6 +145,30 @@ describe("installFromArchive", () => {
 		expect(progressCalls[0][0]).toMatch(/\d+\.\d+ MB\/s/);
 	});
 
+	it("skips progress log when threshold is not reached", async () => {
+		// 20 small chunks, each 5% of total — only even thresholds (10%, 20%, …) log
+		const chunkSize = 32;
+		const totalSize = chunkSize * 20;
+		const chunks = Array.from({ length: 20 }, () =>
+			Buffer.alloc(chunkSize, "a"),
+		);
+		const sha = crypto
+			.createHash("sha256")
+			.update(Buffer.concat(chunks))
+			.digest("hex");
+		mockHttpGetWith(200, String(totalSize), chunks);
+		const r = { ...resolved, sha256: sha };
+		await installFromArchive(r, "/opt/flutter", "linux");
+
+		const progressCalls = mockedCore.info.mock.calls.filter((c) =>
+			String(c[0]).includes("Download progress:"),
+		);
+		// 10%, 20%, ..., 100% = 10 log lines (5% chunks don't trigger logs)
+		expect(progressCalls).toHaveLength(10);
+		expect(progressCalls[0][0]).toContain("10%");
+		expect(progressCalls[0][0]).not.toContain("5%");
+	});
+
 	it("logs MB progress when content-length is missing", async () => {
 		// First chunk (50 MB) does NOT cross a 100 MB boundary → false branch
 		// Second chunk (60 MB) crosses the 100 MB boundary → true branch
@@ -167,6 +191,24 @@ describe("installFromArchive", () => {
 		expect(progressCalls[0][0]).toMatch(/\d+\.\d+ MB\/s/);
 	});
 
+	it("uses fallback speed when elapsed is zero", async () => {
+		const now = Date.now();
+		const spy = vi.spyOn(Date, "now").mockReturnValue(now);
+		// content-length missing, single large chunk crossing 100 MB boundary
+		const chunk = Buffer.alloc(101 * 1024 * 1024, "a");
+		const sha = crypto.createHash("sha256").update(chunk).digest("hex");
+		mockHttpGetWith(200, undefined, [chunk]);
+		const r = { ...resolved, sha256: sha };
+		await installFromArchive(r, "/opt/flutter", "linux");
+
+		const progressCalls = mockedCore.info.mock.calls.filter((c) =>
+			String(c[0]).includes("MB downloaded"),
+		);
+		expect(progressCalls).toHaveLength(1);
+		expect(progressCalls[0][0]).toContain("MB/s");
+		spy.mockRestore();
+	});
+
 	it("moves flutter directory to sdkPath", async () => {
 		await installFromArchive(resolved, "/opt/flutter", "linux");
 		expect(mockedIo.mv).toHaveBeenCalledWith(

__tests__/main.test.ts

@@ -167,7 +167,7 @@ describe("main run()", () => {
 	it("overrides channel when version spec is a channel and warns", async () => {
 		const { inputs } = setupDefaultMocks();
 		inputs["flutter-version-file"] = ".fvmrc";
-		mockedVersionFile.readVersionFile.mockResolvedValue("beta");
+		mockedVersionFile.readVersionFile.mockReturnValue("beta");
 		mockedVersion.parseVersionSpec.mockReturnValue({
 			type: "channel",
 			channel: "beta",
@@ -306,6 +306,24 @@ describe("main run()", () => {
 		);
 	});
 
+	it("uses git mode with constraint spec falls back to channel", async () => {
+		const { inputs } = setupDefaultMocks();
+		inputs["git-source"] = "git";
+		inputs.channel = "stable";
+		mockedVersion.parseVersionSpec.mockReturnValue({
+			type: "constraint",
+			range: ">=3.29.0 <4.0.0",
+		});
+
+		await run();
+
+		expect(mockedGitSource.resolveGitRef).toHaveBeenCalledWith(
+			"https://github.com/flutter/flutter.git",
+			"stable",
+			expect.anything(),
+		);
+	});
+
 	it("uses git mode with cache hit skips install", async () => {
 		const { inputs } = setupDefaultMocks();
 		inputs["git-source"] = "git";
@@ -321,7 +339,7 @@ describe("main run()", () => {
 	it("reads version file when flutter-version is empty", async () => {
 		const { inputs } = setupDefaultMocks();
 		inputs["flutter-version-file"] = "pubspec.yaml";
-		mockedVersionFile.readVersionFile.mockResolvedValue(">=3.29.0 <4.0.0");
+		mockedVersionFile.readVersionFile.mockReturnValue(">=3.29.0 <4.0.0");
 		mockedVersion.parseVersionSpec.mockReturnValue({
 			type: "constraint",
 			range: ">=3.29.0 <4.0.0",
@@ -409,9 +427,9 @@ describe("main run()", () => {
 	it("calls setFailed when readVersionFile throws", async () => {
 		const { inputs } = setupDefaultMocks();
 		inputs["flutter-version-file"] = "pubspec.yaml";
-		mockedVersionFile.readVersionFile.mockRejectedValue(
-			new Error("pubspec.yaml does not contain environment.flutter"),
-		);
+		mockedVersionFile.readVersionFile.mockImplementation(() => {
+			throw new Error("pubspec.yaml does not contain environment.flutter");
+		});
 
 		await run();
 

__tests__/post.test.ts

@@ -82,7 +82,6 @@ describe("post run()", () => {
 		expect(mockedCacheModule.savePubCache).toHaveBeenCalledWith(
 			["/home/runner/.pub-cache"],
 			"flutter-pub-linux-abc123",
-			"/home/runner/.pub-cache",
 		);
 	});
 

__tests__/version-file.test.ts

@@ -23,6 +23,30 @@ describe("readPubspec", () => {
 		).toThrow("pubspec.yaml does not contain environment.flutter");
 	});
 
+	it("reads constraint from pubspec with quoted inline comment", () => {
+		expect(readPubspec(path.join(fixturesDir, "pubspec-comment.yaml"))).toBe(
+			">=3.29.0 <4.0.0",
+		);
+	});
+
+	it("reads unquoted version from pubspec", () => {
+		expect(readPubspec(path.join(fixturesDir, "pubspec-unquoted.yaml"))).toBe(
+			"3.29.0",
+		);
+	});
+
+	it("reads unquoted version from pubspec with inline comment", () => {
+		expect(
+			readPubspec(path.join(fixturesDir, "pubspec-unquoted-comment.yaml")),
+		).toBe("3.29.0");
+	});
+
+	it("returns empty string for empty quoted flutter value", () => {
+		expect(
+			readPubspec(path.join(fixturesDir, "pubspec-empty-quoted.yaml")),
+		).toBe("");
+	});
+
 	it("throws for invalid YAML", () => {
 		expect(() =>
 			readPubspec(path.join(fixturesDir, "pubspec-invalid.yaml")),
@@ -81,21 +105,21 @@ describe("readFvmrc", () => {
 });
 
 describe("readVersionFile", () => {
-	it("reads pubspec.yaml", async () => {
-		const result = await readVersionFile(
+	it("reads pubspec.yaml", () => {
+		const result = readVersionFile(
 			path.join(fixturesDir, "pubspec-dir", "pubspec.yaml"),
 		);
 		expect(result).toBe(">=3.29.0 <4.0.0");
 	});
 
-	it("reads .fvmrc", async () => {
-		const result = await readVersionFile(path.join(fixturesDir, ".fvmrc"));
+	it("reads .fvmrc", () => {
+		const result = readVersionFile(path.join(fixturesDir, ".fvmrc"));
 		expect(result).toBe("3.29.0");
 	});
 
-	it("throws for unsupported file type", async () => {
-		await expect(
+	it("throws for unsupported file type", () => {
+		expect(() =>
 			readVersionFile(path.join(fixturesDir, "unknown.txt")),
-		).rejects.toThrow("Unsupported version file");
+		).toThrow("Unsupported version file");
 	});
 });

__tests__/version.test.ts

@@ -76,6 +76,34 @@ describe("parseVersionSpec", () => {
 		});
 	});
 
+	it("returns ref for ~ (not a Dart constraint)", () => {
+		expect(parseVersionSpec("~3.27.0")).toEqual({
+			type: "ref",
+			ref: "~3.27.0",
+		});
+	});
+
+	it("returns constraint for <", () => {
+		expect(parseVersionSpec("<4.0.0")).toEqual({
+			type: "constraint",
+			range: "<4.0.0",
+		});
+	});
+
+	it("returns constraint for >", () => {
+		expect(parseVersionSpec(">3.0.0")).toEqual({
+			type: "constraint",
+			range: ">3.0.0",
+		});
+	});
+
+	it("returns constraint for <=", () => {
+		expect(parseVersionSpec("<=3.29.0")).toEqual({
+			type: "constraint",
+			range: "<=3.29.0",
+		});
+	});
+
 	it("returns range for 3.x", () => {
 		expect(parseVersionSpec("3.x")).toEqual({ type: "range", major: 3 });
 	});