From 47081c6e176c2aae80bb0d31c2b735650b93f1bb Mon Sep 17 00:00:00 2001
From: AJ ONeal <aj@therootcompany.com>
Date: Wed, 11 Mar 2026 11:29:30 -0600
Subject: [PATCH] fix(installerconf): align tests with actual config format

Tests were using separate source/owner/repo keys but the parser expects
github_repo=owner/repo, gitea_repo=owner/repo, etc. Fixed all test
configs to match. Also answered Issue 4 (darwin-universal) for other agent.
---
 ANSWERS.md                                   | 16 ++++++++
 internal/installerconf/installerconf_test.go | 41 +++++++-------------
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/ANSWERS.md b/ANSWERS.md
index 7d52b17..79f5051 100644
--- a/ANSWERS.md
+++ b/ANSWERS.md
@@ -54,3 +54,19 @@ entry. The resolver's version-descending + platform-first-then-any order means
 git assets for old versions are never selected when newer binaries exist.
 
 **No fix needed** in the Go resolver or classifier. The behavior is correct.
+
+## Re: Issue 4 — darwin-universal (Hugo)
+
+Already handled correctly on the Go side:
+
+- `classify.Filename()` detects `universal`, `universal2`, and `fat` via regex
+  (line 111 of `classify.go`) and maps them to `buildmeta.ArchUniversal2`.
+- `buildmeta.CompatArches()` includes `universal2` in the fallback chain for
+  both ARM64 and AMD64 on Darwin:
+  - `ArchARM64 → [arm64, universal2, amd64]`
+  - `ArchAMD64 → [amd64, universal2, x86]`
+- Hugo's Go cache correctly contains `"arch": "universal2"` entries for darwin.
+- comparecache shows Hugo matches between Go and LIVE caches (no diffs).
+
+This is a Node.js-side issue only — the `host-targets.js` WATERFALL needs
+`universal2` in the arch fallback chain, similar to what `CompatArches` does.
diff --git a/internal/installerconf/installerconf_test.go b/internal/installerconf/installerconf_test.go
index b52249c..01c5080 100644
--- a/internal/installerconf/installerconf_test.go
+++ b/internal/installerconf/installerconf_test.go
@@ -10,9 +10,7 @@ import (
 
 func TestSimpleGitHub(t *testing.T) {
 	c := confFromString(t, `
-source = github
-owner = sharkdp
-repo = bat
+github_repo = sharkdp/bat
 `)
 	assertEqual(t, "Source", c.Source, "github")
 	assertEqual(t, "Owner", c.Owner, "sharkdp")
@@ -29,9 +27,7 @@ repo = bat
 
 func TestVersionPrefixes(t *testing.T) {
 	c := confFromString(t, `
-source = github
-owner = jqlang
-repo = jq
+github_repo = jqlang/jq
 version_prefixes = jq- cli-
 `)
 	if len(c.VersionPrefixes) != 2 {
@@ -43,9 +39,7 @@ version_prefixes = jq- cli-
 
 func TestExclude(t *testing.T) {
 	c := confFromString(t, `
-source = github
-owner = gohugoio
-repo = hugo
+github_repo = gohugoio/hugo
 exclude = _extended_ Linux-64bit
 `)
 	if len(c.Exclude) != 2 {
@@ -57,9 +51,7 @@ exclude = _extended_ Linux-64bit
 
 func TestMonorepoTagPrefix(t *testing.T) {
 	c := confFromString(t, `
-source = github
-owner = therootcompany
-repo = golib
+github_repo = therootcompany/golib
 tag_prefix = tools/monorel/
 `)
 	assertEqual(t, "TagPrefix", c.TagPrefix, "tools/monorel/")
@@ -76,10 +68,8 @@ url = https://nodejs.org/download/release
 
 func TestGiteaBaseURL(t *testing.T) {
 	c := confFromString(t, `
-source = gitea
+gitea_repo = xorm/xorm
 base_url = https://gitea.com
-owner = xorm
-repo = xorm
 `)
 	assertEqual(t, "Source", c.Source, "gitea")
 	assertEqual(t, "BaseURL", c.BaseURL, "https://gitea.com")
@@ -89,20 +79,19 @@ repo = xorm
 func TestBlanksAndComments(t *testing.T) {
 	c := confFromString(t, `
 # Hugo config
-source = github
+github_repo = foo/bar
 
-# owner line
-owner = foo
+# exclude line
+exclude = extended
 `)
 	assertEqual(t, "Source", c.Source, "github")
 	assertEqual(t, "Owner", c.Owner, "foo")
+	assertEqual(t, "Repo", c.Repo, "bar")
 }
 
 func TestExtraKeys(t *testing.T) {
 	c := confFromString(t, `
-source = github
-owner = foo
-repo = bar
+github_repo = foo/bar
 custom_thing = hello
 `)
 	if c.Extra == nil || c.Extra["custom_thing"] != "hello" {
@@ -112,9 +101,7 @@ custom_thing = hello
 
 func TestAssetExcludeAlias(t *testing.T) {
 	c := confFromString(t, `
-source = github
-owner = gohugoio
-repo = hugo
+github_repo = gohugoio/hugo
 asset_exclude = extended
 `)
 	if len(c.Exclude) != 1 {
@@ -125,9 +112,7 @@ asset_exclude = extended
 
 func TestVariants(t *testing.T) {
 	c := confFromString(t, `
-source = github
-owner = jmorganca
-repo = ollama
+github_repo = jmorganca/ollama
 variants = rocm jetpack5 jetpack6
 `)
 	if len(c.Variants) != 3 {
@@ -139,7 +124,7 @@ variants = rocm jetpack5 jetpack6
 }
 
 func TestEmptyExclude(t *testing.T) {
-	c := confFromString(t, "source = github\n")
+	c := confFromString(t, "github_repo = foo/bar\n")
 	if c.Exclude != nil {
 		t.Errorf("Exclude = %v, want nil", c.Exclude)
 	}