Reorganise model/types.go

Signed-off-by: Radoslav Dimitrov <[email protected]>

Author: rdimitrov

internal/service/service.go

@@ -2,7 +2,7 @@ package service
 
 import apiv1 "github.com/modelcontextprotocol/registry/pkg/api/v1"
 
-// RegistryService defines the interface for registry operations with extension wrapper architecture
+// RegistryService defines the interface for registry operations
 type RegistryService interface {
 	// List retrieves servers with unified format
 	List(cursor string, limit int) ([]apiv1.ServerRecord, string, error)

pkg/model/types.go

@@ -9,6 +9,41 @@ const (
 	StatusDeleted    Status = "deleted"
 )
 
+// ServerJSON represents complete server information as defined in the MCP spec (pure, no registry metadata)
+type ServerJSON struct {
+	Schema        string        `json:"$schema,omitempty" bson:"$schema,omitempty"`
+	Name          string        `json:"name" minLength:"1" maxLength:"200" bson:"name"`
+	Description   string        `json:"description" minLength:"1" maxLength:"100" bson:"description"`
+	Status        Status        `json:"status,omitempty" minLength:"1" bson:"status,omitempty"`
+	Repository    Repository    `json:"repository,omitempty" bson:"repository"`
+	VersionDetail VersionDetail `json:"version_detail" bson:"version_detail"`
+	Packages      []Package     `json:"packages,omitempty" bson:"packages,omitempty"`
+	Remotes       []Remote      `json:"remotes,omitempty" bson:"remotes,omitempty"`
+}
+
+// Package represents a package configuration
+type Package struct {
+	// RegistryType indicates how to download packages (e.g., "npm", "pypi", "docker-hub", "mcpb")
+	RegistryType string `json:"registry_type,omitempty" bson:"registry_type,omitempty"`
+	// RegistryBaseURL is the base URL of the package registry
+	RegistryBaseURL string `json:"registry_base_url,omitempty" bson:"registry_base_url,omitempty"`
+	// Identifier is the package identifier - either a package name (for registries) or URL (for direct downloads)
+	Identifier           string          `json:"identifier,omitempty" bson:"identifier,omitempty"`
+	Version              string          `json:"version,omitempty" bson:"version,omitempty"`
+	FileSHA256           string          `json:"file_sha256,omitempty" bson:"file_sha256,omitempty"`
+	RunTimeHint          string          `json:"runtime_hint,omitempty" bson:"runtime_hint,omitempty"`
+	RuntimeArguments     []Argument      `json:"runtime_arguments,omitempty" bson:"runtime_arguments,omitempty"`
+	PackageArguments     []Argument      `json:"package_arguments,omitempty" bson:"package_arguments,omitempty"`
+	EnvironmentVariables []KeyValueInput `json:"environment_variables,omitempty" bson:"environment_variables,omitempty"`
+}
+
+// Remote represents a remote connection endpoint
+type Remote struct {
+	TransportType string          `json:"transport_type" bson:"transport_type"`
+	URL           string          `json:"url" format:"uri" bson:"url"`
+	Headers       []KeyValueInput `json:"headers,omitempty" bson:"headers,omitempty"`
+}
+
 // Repository represents a source code repository as defined in the spec
 type Repository struct {
 	URL    string `json:"url" bson:"url"`
@@ -66,42 +101,7 @@ type Argument struct {
 	ValueHint          string       `json:"value_hint,omitempty" bson:"value_hint,omitempty"`
 }
 
-// Package represents a package configuration
-type Package struct {
-	// RegistryType indicates how to download packages (e.g., "npm", "pypi", "docker-hub", "mcpb")
-	RegistryType string `json:"registry_type,omitempty" bson:"registry_type,omitempty"`
-	// RegistryBaseURL is the base URL of the package registry
-	RegistryBaseURL string `json:"registry_base_url,omitempty" bson:"registry_base_url,omitempty"`
-	// Identifier is the package identifier - either a package name (for registries) or URL (for direct downloads)
-	Identifier           string          `json:"identifier,omitempty" bson:"identifier,omitempty"`
-	Version              string          `json:"version,omitempty" bson:"version,omitempty"`
-	FileSHA256           string          `json:"file_sha256,omitempty" bson:"file_sha256,omitempty"`
-	RunTimeHint          string          `json:"runtime_hint,omitempty" bson:"runtime_hint,omitempty"`
-	RuntimeArguments     []Argument      `json:"runtime_arguments,omitempty" bson:"runtime_arguments,omitempty"`
-	PackageArguments     []Argument      `json:"package_arguments,omitempty" bson:"package_arguments,omitempty"`
-	EnvironmentVariables []KeyValueInput `json:"environment_variables,omitempty" bson:"environment_variables,omitempty"`
-}
-
-// Remote represents a remote connection endpoint
-type Remote struct {
-	TransportType string          `json:"transport_type" bson:"transport_type"`
-	URL           string          `json:"url" format:"uri" bson:"url"`
-	Headers       []KeyValueInput `json:"headers,omitempty" bson:"headers,omitempty"`
-}
-
 // VersionDetail represents the version details of a server (pure MCP spec, no registry metadata)
 type VersionDetail struct {
 	Version string `json:"version" bson:"version"`
 }
-
-// ServerJSON represents complete server information as defined in the MCP spec (pure, no registry metadata)
-type ServerJSON struct {
-	Schema        string        `json:"$schema,omitempty" bson:"$schema,omitempty"`
-	Name          string        `json:"name" minLength:"1" maxLength:"200" bson:"name"`
-	Description   string        `json:"description" minLength:"1" maxLength:"100" bson:"description"`
-	Status        Status        `json:"status,omitempty" minLength:"1" bson:"status,omitempty"`
-	Repository    Repository    `json:"repository,omitempty" bson:"repository"`
-	VersionDetail VersionDetail `json:"version_detail" bson:"version_detail"`
-	Packages      []Package     `json:"packages,omitempty" bson:"packages,omitempty"`
-	Remotes       []Remote      `json:"remotes,omitempty" bson:"remotes,omitempty"`
-}