From aa309d52d73ecfe27b809caa45c79282df07d884 Mon Sep 17 00:00:00 2001 From: Willie Date: Wed, 27 May 2026 17:22:26 +0800 Subject: [PATCH] feat(cmd): resolve extension value and validate transform mode --- cmd/skillshare/extension_resolve.go | 47 +++++++++++++++++++++ cmd/skillshare/extension_resolve_test.go | 54 ++++++++++++++++++++++++ 2 files changed, 101 insertions(+) create mode 100644 cmd/skillshare/extension_resolve.go create mode 100644 cmd/skillshare/extension_resolve_test.go diff --git a/cmd/skillshare/extension_resolve.go b/cmd/skillshare/extension_resolve.go new file mode 100644 index 000000000..a4148aace --- /dev/null +++ b/cmd/skillshare/extension_resolve.go @@ -0,0 +1,47 @@ +package main + +import ( + "fmt" + "path/filepath" + "strings" + + "skillshare/internal/config" + "skillshare/internal/sync" +) + +// resolveExtension resolves a target's extension value into a spec. +// A bare name resolves under extensionsDir; a path (contains a separator or +// starts with ".") is used directly. Empty value resolves to (nil, nil). +func resolveExtension(ext, extensionsDir string) (*sync.ExtensionSpec, error) { + if ext == "" { + return nil, nil + } + var execPath string + if strings.ContainsAny(ext, "/\\") || strings.HasPrefix(ext, ".") { + execPath = config.ExpandPath(ext) + } else { + execPath = filepath.Join(extensionsDir, ext) + } + return sync.LoadExtensionSpec(execPath, ext) +} + +// validateExtensionMode ensures a target's mode is compatible with a transform. +// Transforms require copy semantics. Returns the effective mode or an error. +func validateExtensionMode(rawMode string) (string, error) { + switch rawMode { + case "", "copy": + return "copy", nil + default: + return "", fmt.Errorf("extension requires copy mode, but mode %q was set on the target", rawMode) + } +} + +// globalExtensionsDir returns the global extensions directory (~/.config/skillshare/extensions). +func globalExtensionsDir() string { + return filepath.Join(filepath.Dir(config.ConfigPath()), "extensions") +} + +// projectExtensionsDir returns the project extensions directory (.skillshare/extensions). +func projectExtensionsDir(projectRoot string) string { + return filepath.Join(filepath.Dir(config.ProjectConfigPath(projectRoot)), "extensions") +} diff --git a/cmd/skillshare/extension_resolve_test.go b/cmd/skillshare/extension_resolve_test.go new file mode 100644 index 000000000..de9274309 --- /dev/null +++ b/cmd/skillshare/extension_resolve_test.go @@ -0,0 +1,54 @@ +package main + +import ( + "os" + "path/filepath" + "testing" +) + +func TestValidateExtensionMode(t *testing.T) { + for _, tc := range []struct { + raw string + want string + wantErr bool + }{ + {"", "copy", false}, + {"copy", "copy", false}, + {"merge", "", true}, + {"symlink", "", true}, + } { + got, err := validateExtensionMode(tc.raw) + if tc.wantErr && err == nil { + t.Errorf("mode %q: expected error", tc.raw) + } + if !tc.wantErr && (err != nil || got != tc.want) { + t.Errorf("mode %q: got (%q, %v), want (%q, nil)", tc.raw, got, err, tc.want) + } + } +} + +func TestResolveExtension_BareNameInDir(t *testing.T) { + dir := t.TempDir() + extDir := filepath.Join(dir, "md2gemini") + if err := os.MkdirAll(extDir, 0755); err != nil { + t.Fatal(err) + } + if err := os.WriteFile(filepath.Join(extDir, "extension.yaml"), + []byte("run: [\"cat\"]\noutput_ext: toml\n"), 0644); err != nil { + t.Fatal(err) + } + spec, err := resolveExtension("md2gemini", dir) + if err != nil { + t.Fatalf("resolveExtension: %v", err) + } + if spec == nil || spec.OutputExt != "toml" { + t.Errorf("unexpected spec: %+v", spec) + } +} + +func TestResolveExtension_Empty(t *testing.T) { + spec, err := resolveExtension("", t.TempDir()) + if err != nil || spec != nil { + t.Errorf("empty extension should resolve to (nil, nil), got (%v, %v)", spec, err) + } +}