semantic merge of #319

🏠 Remote-Dev: homespace

Author: domdomegg

internal/database/import.go

@@ -51,13 +51,12 @@ func ReadSeedFile(ctx context.Context, path string) ([]*apiv0.ServerRecord, erro
 	}
 
 	// Validate servers and collect warnings instead of failing the whole batch
-	validator := validators.NewObjectValidator()
 	var validRecords []*apiv0.ServerRecord
 	var invalidServers []string
 	var validationFailures []string
 
 	for _, response := range serverResponses {
-		if err := validator.Validate(&response.Server); err != nil {
+		if err := validators.ValidateServerJSON(&response.Server); err != nil {
 			// Log warning and track invalid server instead of failing
 			invalidServers = append(invalidServers, response.Server.Name)
 			validationFailures = append(validationFailures, fmt.Sprintf("Server '%s': %v", response.Server.Name, err))

internal/database/import_test.go

@@ -21,7 +21,7 @@ func TestReadSeedFile_LocalFile(t *testing.T) {
 	seedData := []apiv0.ServerRecord{
 		{
 			Server: model.ServerJSON{
-				Name:        "test-server-1",
+				Name:        "com.example/test-server-1",
 				Description: "Test server 1",
 				Repository: model.Repository{
 					URL:    "https://github.com/test/repo1",
@@ -31,6 +31,11 @@ func TestReadSeedFile_LocalFile(t *testing.T) {
 				VersionDetail: model.VersionDetail{
 					Version: "1.0.0",
 				},
+				Remotes: []model.Remote{
+					{
+						URL: "https://example.com/remote",
+					},
+				},
 			},
 			XIOModelContextProtocolRegistry: apiv0.RegistryExtensions{
 				ID:          "test-id-1",
@@ -61,16 +66,21 @@ func TestReadSeedFile_LocalFile(t *testing.T) {
 	result, err := database.ReadSeedFile(context.Background(), tempFile)
 	assert.NoError(t, err)
 	assert.Len(t, result, 1)
-	assert.Equal(t, "test-server-1", result[0].Server.Name)
+	assert.Equal(t, "com.example/test-server-1", result[0].Server.Name)
 }
 
 func TestReadSeedFile_DirectHTTPURL(t *testing.T) {
 	// Create a test HTTP server that serves seed JSON directly in extension wrapper format
 	seedData := []apiv0.ServerRecord{
 		{
 			Server: model.ServerJSON{
-				Name:        "test-server-1",
+				Name:        "com.example/test-server-1",
 				Description: "Test server 1",
+				Remotes: []model.Remote{
+					{
+						URL: "https://example.com/remote",
+					},
+				},
 			},
 			XIOModelContextProtocolRegistry: apiv0.RegistryExtensions{
 				ID:          "test-id-1",
@@ -93,7 +103,7 @@ func TestReadSeedFile_DirectHTTPURL(t *testing.T) {
 	result, err := database.ReadSeedFile(context.Background(), server.URL+"/seed.json")
 	assert.NoError(t, err)
 	assert.Len(t, result, 1)
-	assert.Equal(t, "test-server-1", result[0].Server.Name)
+	assert.Equal(t, "com.example/test-server-1", result[0].Server.Name)
 }
 
 func TestReadSeedFile_RegistryURL(t *testing.T) {

internal/validators/argument_validator_test.go

@@ -72,43 +72,39 @@ func validatePackageField(obj *model.Package) error {
 	}
 
 	// Validate runtime arguments
-	argumentValidator := NewArgumentValidator()
 	for _, arg := range obj.RuntimeArguments {
-		if err := argumentValidator.Validate(&arg); err != nil {
+		if err := validateArgument(&arg); err != nil {
 			return fmt.Errorf("invalid runtime argument: %w", err)
 		}
 	}
 
 	// Validate package arguments
 	for _, arg := range obj.PackageArguments {
-		if err := argumentValidator.Validate(&arg); err != nil {
+		if err := validateArgument(&arg); err != nil {
 			return fmt.Errorf("invalid package argument: %w", err)
 		}
 	}
 
 	return nil
 }
 
-// ArgumentValidator validates argument details
-type ArgumentValidator struct{}
-
-// Validate checks if the argument details are valid
-func (av *ArgumentValidator) Validate(obj *model.Argument) error {
+// validateArgument validates argument details
+func validateArgument(obj *model.Argument) error {
 	if obj.Type == model.ArgumentTypeNamed {
 		// Validate named argument name format
-		if err := av.validateNamedArgumentName(obj.Name); err != nil {
+		if err := validateNamedArgumentName(obj.Name); err != nil {
 			return err
 		}
 
 		// Validate value and default don't start with the name
-		if err := av.validateValueFields(obj.Name, obj.Value, obj.Default); err != nil {
+		if err := validateArgumentValueFields(obj.Name, obj.Value, obj.Default); err != nil {
 			return err
 		}
 	}
 	return nil
 }
 
-func (av *ArgumentValidator) validateNamedArgumentName(name string) error {
+func validateNamedArgumentName(name string) error {
 	// Check if name is required for named arguments
 	if name == "" {
 		return ErrNamedArgumentNameRequired
@@ -125,7 +121,7 @@ func (av *ArgumentValidator) validateNamedArgumentName(name string) error {
 	return nil
 }
 
-func (av *ArgumentValidator) validateValueFields(name, value, defaultValue string) error {
+func validateArgumentValueFields(name, value, defaultValue string) error {
 	// Check if value starts with the argument name (using startsWith, not contains)
 	if value != "" && strings.HasPrefix(value, name) {
 		return fmt.Errorf("%w: value starts with argument name '%s': %s", ErrArgumentValueStartsWithName, name, value)
@@ -138,11 +134,6 @@ func (av *ArgumentValidator) validateValueFields(name, value, defaultValue strin
 	return nil
 }
 
-// NewArgumentValidator creates a new ArgumentValidator instance
-func NewArgumentValidator() *ArgumentValidator {
-	return &ArgumentValidator{}
-}
-
 func validateRemote(obj *model.Remote) error {
 	if !IsValidURL(obj.URL) {
 		return fmt.Errorf("%w: %s", ErrInvalidRemoteURL, obj.URL)