refactor: better project structure (#35)

This project is starting to grow, and I've seen flaws in the initial project structure design I think I'll restructure the entire project directory for better scalability and also cleaner
2026-07-11 16:15:05 +07:00
parent 94c8af7b1d
commit 1e04949242
52 changed files with 339 additions and 445 deletions
@@ -0,0 +1,254 @@
+package config
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+	"time"
+)
+
+func TestDefaultConfigAndState(t *testing.T) {
+	cfg := DefaultConfig()
+	if cfg.Core.Version != 1 {
+		t.Errorf("expected version 1, got %d", cfg.Core.Version)
+	}
+	if cfg.UI.MaxSuggestions != 100 {
+		t.Errorf("expected suggestions 100, got %d", cfg.UI.MaxSuggestions)
+	}
+	if cfg.AI.Enabled {
+		t.Errorf("expected AI to be disabled by default")
+	}
+	if cfg.AI.Provider != "" {
+		t.Errorf("expected default provider to be empty, got %q", cfg.AI.Provider)
+	}
+	if cfg.AI.Providers != nil {
+		t.Errorf("expected default providers map to be nil, got %v", cfg.AI.Providers)
+	}
+
+	// test manual provider registration
+	cfg.AI.Provider = "custom"
+	cfg.AI.Providers = map[string]ProviderConfig{
+		"custom": {
+			InheritedFrom: "openai",
+			Endpoint:      "https://custom-api.com/v1",
+			APIKey:        "test-key",
+			Model:         "test-model",
+			TimeoutMS:     1000,
+		},
+	}
+	p, ok := cfg.AI.GetActiveProvider()
+	if !ok {
+		t.Fatalf("expected custom provider to exist")
+	}
+	if p.InheritedFrom != "openai" {
+		t.Errorf("expected inherited_from openai, got %q", p.InheritedFrom)
+	}
+	if p.GetAPIKey() != "test-key" {
+		t.Errorf("expected api key test-key, got %q", p.GetAPIKey())
+	}
+	if cfg.AI.SuggestOnEmpty.DebounceMS != 800 {
+		t.Errorf("expected debounce 800, got %d", cfg.AI.SuggestOnEmpty.DebounceMS)
+	}
+	if cfg.AI.SuggestOnEmpty.MinIntervalMS != 5000 {
+		t.Errorf("expected min interval 5000, got %d", cfg.AI.SuggestOnEmpty.MinIntervalMS)
+	}
+
+	state := DefaultState()
+	if state.LastMode != "spec" {
+		t.Errorf("expected last mode spec, got %q", state.LastMode)
+	}
+}
+
+func TestCustomDuration(t *testing.T) {
+	var dur Duration
+	err := dur.UnmarshalText([]byte("6h"))
+	if err != nil {
+		t.Fatalf("unexpected error unmarshalling duration: %v", err)
+	}
+	if time.Duration(dur) != 6*time.Hour {
+		t.Errorf("expected 6 hours, got %v", time.Duration(dur))
+	}
+
+	b, err := dur.MarshalText()
+	if err != nil {
+		t.Fatalf("unexpected error marshaling duration: %v", err)
+	}
+	if string(b) != "6h0m0s" {
+		t.Errorf("expected 6h0m0s, got %q", string(b))
+	}
+
+	err = dur.UnmarshalText([]byte("invalid"))
+	if err == nil {
+		t.Errorf("expected error for invalid duration")
+	}
+}
+
+func TestValidationAndEnvironmentOverrides(t *testing.T) {
+	tmpDir, err := os.MkdirTemp("", "iris-config-env-test")
+	if err != nil {
+		t.Fatalf("failed to create temp dir: %v", err)
+	}
+	defer os.RemoveAll(tmpDir)
+
+	t.Setenv("XDG_CONFIG_HOME", tmpDir)
+
+	configDir := filepath.Join(tmpDir, "iris")
+	if mkErr := os.MkdirAll(configDir, 0755); mkErr != nil {
+		t.Fatalf("failed to create config dir: %v", mkErr)
+	}
+	configPath := filepath.Join(configDir, "config.toml")
+	tomlContent := `
+[ai]
+enabled = true
+provider = "groq"
+
+[ai.providers.groq]
+inherited_from = "openai"
+endpoint = "https://api.groq.com/openai/v1"
+api_key_env = "GROQ_API_KEY"
+model = "qwen-2.5-coder-32b"
+`
+	if wrErr := os.WriteFile(configPath, []byte(tomlContent), 0644); wrErr != nil {
+		t.Fatalf("failed to write config file: %v", wrErr)
+	}
+
+	t.Setenv("IRIS_CORE_DEBUG", "true")
+	t.Setenv("IRIS_CORE_SHELL", "fish")
+	t.Setenv("IRIS_CORE_MODE", "history")
+	t.Setenv("IRIS_UI_GHOST_TEXT", "false")
+	t.Setenv("IRIS_UI_MAX_SUGGESTIONS", "250")
+	t.Setenv("IRIS_UI_MAX_HEIGHT", "25")
+	t.Setenv("IRIS_UPDATER_CHANNEL", "nightly")
+	t.Setenv("IRIS_UPDATER_INTERVAL", "12h")
+	t.Setenv("IRIS_UPDATER_CHECK_ON_STARTUP", "false")
+	t.Setenv("IRIS_AI_PROVIDER", "ollama")
+	t.Setenv("GROQ_API_KEY", "gsk_test_123")
+
+	cfg, err := Load()
+	if err != nil {
+		t.Fatalf("failed to load config: %v", err)
+	}
+
+	if !cfg.Core.Debug {
+		t.Errorf("expected debug to be true")
+	}
+	if cfg.Core.Shell != "fish" {
+		t.Errorf("expected shell fish, got %q", cfg.Core.Shell)
+	}
+	if cfg.Core.Mode != "history" {
+		t.Errorf("expected mode history, got %q", cfg.Core.Mode)
+	}
+	if cfg.UI.GhostText {
+		t.Errorf("expected ghost text to be false")
+	}
+	if cfg.UI.MaxSuggestions != 250 {
+		t.Errorf("expected max suggestions 250, got %d", cfg.UI.MaxSuggestions)
+	}
+	if cfg.UI.MaxHeight != 25 {
+		t.Errorf("expected max height 25, got %d", cfg.UI.MaxHeight)
+	}
+	if cfg.Updater.Channel != "nightly" {
+		t.Errorf("expected channel nightly, got %q", cfg.Updater.Channel)
+	}
+	if time.Duration(cfg.Updater.CheckInterval) != 12*time.Hour {
+		t.Errorf("expected 12h, got %v", time.Duration(cfg.Updater.CheckInterval))
+	}
+	if cfg.Updater.CheckOnStartup {
+		t.Errorf("expected check on startup to be false")
+	}
+	if cfg.AI.Provider != "ollama" {
+		t.Errorf("expected provider ollama from env, got %q", cfg.AI.Provider)
+	}
+	groqCfg := cfg.AI.Providers["groq"]
+	if groqCfg.GetAPIKey() != "gsk_test_123" {
+		t.Errorf("expected groq api key gsk_test_123 from env, got %q", groqCfg.GetAPIKey())
+	}
+
+	t.Setenv("IRIS_CORE_MODE", "invalid")
+	_, err = Load()
+	if err == nil {
+		t.Errorf("expected validation error for invalid mode in env")
+	}
+}
+
+func TestLoadSave(t *testing.T) {
+	tmpDir, err := os.MkdirTemp("", "iris-config-test")
+	if err != nil {
+		t.Fatalf("failed to create temp dir: %v", err)
+	}
+	defer os.RemoveAll(tmpDir)
+
+	t.Setenv("XDG_CONFIG_HOME", tmpDir)
+
+	cfg, err := Load()
+	if err != nil {
+		t.Fatalf("failed to load: %v", err)
+	}
+
+	cfg.Core.Shell = "zsh"
+	cfg.UI.MaxHeight = 20
+
+	err = Save(cfg)
+	if err != nil {
+		t.Fatalf("failed to save: %v", err)
+	}
+
+	loaded, err := Load()
+	if err != nil {
+		t.Fatalf("failed to load after save: %v", err)
+	}
+
+	if loaded.Core.Shell != "zsh" {
+		t.Errorf("expected loaded shell to be zsh, got %q", loaded.Core.Shell)
+	}
+	if loaded.UI.MaxHeight != 20 {
+		t.Errorf("expected loaded height to be 20, got %d", loaded.UI.MaxHeight)
+	}
+}
+
+func TestMigration(t *testing.T) {
+	tmpDir, err := os.MkdirTemp("", "iris-migrate-test")
+	if err != nil {
+		t.Fatalf("failed to create temp dir: %v", err)
+	}
+	defer os.RemoveAll(tmpDir)
+
+	t.Setenv("HOME", tmpDir)
+	t.Setenv("XDG_DATA_HOME", filepath.Join(tmpDir, ".local", "share"))
+
+	legacyDir := filepath.Join(tmpDir, ".iris")
+	if errMkdir := os.MkdirAll(legacyDir, 0755); errMkdir != nil {
+		t.Fatalf("failed to create legacy dir: %v", errMkdir)
+	}
+
+	legacyStateJson := `{"mode": "history"}`
+	_ = os.WriteFile(filepath.Join(legacyDir, "state.json"), []byte(legacyStateJson), 0644)
+
+	legacyUpdateJson := `{"seen_version": "v1.2.3", "last_check": 1234567890}`
+	_ = os.WriteFile(filepath.Join(legacyDir, "update_state.json"), []byte(legacyUpdateJson), 0644)
+
+	err = MigrateFromLegacyJSON()
+	if err != nil {
+		t.Fatalf("migration failed: %v", err)
+	}
+
+	state := LoadState()
+	if state.LastMode != "history" {
+		t.Errorf("expected migrated last mode 'history', got %q", state.LastMode)
+	}
+	if state.Updater.SeenVersion != "v1.2.3" {
+		t.Errorf("expected migrated seen version 'v1.2.3', got %q", state.Updater.SeenVersion)
+	}
+	if state.Updater.LastCheckTime.Unix() != 1234567890 {
+		t.Errorf("expected migrated check time 1234567890, got %v", state.Updater.LastCheckTime.Unix())
+	}
+
+	if _, err := os.Stat(filepath.Join(legacyDir, "state.json.bak")); err != nil {
+		t.Errorf("expected backup file state.json.bak to exist")
+	}
+	if _, err := os.Stat(filepath.Join(legacyDir, "update_state.json.bak")); err != nil {
+		t.Errorf("expected backup file update_state.json.bak to exist")
+	}
+}
+
+