internal/mcp: move jsonschema out of mcp/internal
The jsonschema package is part of of the API of the mcp package,
so it should not be internal.
Change-Id: I9520797837329fc2cda09c2f46ec4d48d031b9d3
Reviewed-on: https://go-review.googlesource.com/c/tools/+/669996
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Robert Findley <rfindley@google.com>
diff --git a/internal/mcp/internal/protocol/protocol.go b/internal/mcp/internal/protocol/protocol.go
index bd02bf0..ead91c5 100644
--- a/internal/mcp/internal/protocol/protocol.go
+++ b/internal/mcp/internal/protocol/protocol.go
@@ -9,7 +9,7 @@
import (
"encoding/json"
- "golang.org/x/tools/internal/mcp/internal/jsonschema"
+ "golang.org/x/tools/internal/mcp/jsonschema"
)
// Optional annotations for the client. The client can use annotations to inform
diff --git a/internal/mcp/internal/jsonschema/annotations.go b/internal/mcp/jsonschema/annotations.go
similarity index 100%
rename from internal/mcp/internal/jsonschema/annotations.go
rename to internal/mcp/jsonschema/annotations.go
diff --git a/internal/mcp/internal/jsonschema/infer.go b/internal/mcp/jsonschema/infer.go
similarity index 100%
rename from internal/mcp/internal/jsonschema/infer.go
rename to internal/mcp/jsonschema/infer.go
diff --git a/internal/mcp/internal/jsonschema/infer_test.go b/internal/mcp/jsonschema/infer_test.go
similarity index 97%
rename from internal/mcp/internal/jsonschema/infer_test.go
rename to internal/mcp/jsonschema/infer_test.go
index 8b56ffc..fe28981 100644
--- a/internal/mcp/internal/jsonschema/infer_test.go
+++ b/internal/mcp/jsonschema/infer_test.go
@@ -9,7 +9,7 @@
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
- "golang.org/x/tools/internal/mcp/internal/jsonschema"
+ "golang.org/x/tools/internal/mcp/jsonschema"
)
func forType[T any]() *jsonschema.Schema {
diff --git a/internal/mcp/internal/jsonschema/resolve.go b/internal/mcp/jsonschema/resolve.go
similarity index 100%
rename from internal/mcp/internal/jsonschema/resolve.go
rename to internal/mcp/jsonschema/resolve.go
diff --git a/internal/mcp/internal/jsonschema/resolve_test.go b/internal/mcp/jsonschema/resolve_test.go
similarity index 100%
rename from internal/mcp/internal/jsonschema/resolve_test.go
rename to internal/mcp/jsonschema/resolve_test.go
diff --git a/internal/mcp/internal/jsonschema/schema.go b/internal/mcp/jsonschema/schema.go
similarity index 100%
rename from internal/mcp/internal/jsonschema/schema.go
rename to internal/mcp/jsonschema/schema.go
diff --git a/internal/mcp/internal/jsonschema/schema_test.go b/internal/mcp/jsonschema/schema_test.go
similarity index 100%
rename from internal/mcp/internal/jsonschema/schema_test.go
rename to internal/mcp/jsonschema/schema_test.go
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/README.md b/internal/mcp/jsonschema/testdata/draft2020-12/README.md
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/README.md
rename to internal/mcp/jsonschema/testdata/draft2020-12/README.md
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/additionalProperties.json b/internal/mcp/jsonschema/testdata/draft2020-12/additionalProperties.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/additionalProperties.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/additionalProperties.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/allOf.json b/internal/mcp/jsonschema/testdata/draft2020-12/allOf.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/allOf.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/allOf.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/anyOf.json b/internal/mcp/jsonschema/testdata/draft2020-12/anyOf.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/anyOf.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/anyOf.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/boolean_schema.json b/internal/mcp/jsonschema/testdata/draft2020-12/boolean_schema.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/boolean_schema.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/boolean_schema.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/const.json b/internal/mcp/jsonschema/testdata/draft2020-12/const.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/const.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/const.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/contains.json b/internal/mcp/jsonschema/testdata/draft2020-12/contains.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/contains.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/contains.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/dependentRequired.json b/internal/mcp/jsonschema/testdata/draft2020-12/dependentRequired.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/dependentRequired.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/dependentRequired.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/dependentSchemas.json b/internal/mcp/jsonschema/testdata/draft2020-12/dependentSchemas.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/dependentSchemas.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/dependentSchemas.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/enum.json b/internal/mcp/jsonschema/testdata/draft2020-12/enum.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/enum.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/enum.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/exclusiveMaximum.json b/internal/mcp/jsonschema/testdata/draft2020-12/exclusiveMaximum.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/exclusiveMaximum.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/exclusiveMaximum.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/exclusiveMinimum.json b/internal/mcp/jsonschema/testdata/draft2020-12/exclusiveMinimum.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/exclusiveMinimum.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/exclusiveMinimum.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/if-then-else.json b/internal/mcp/jsonschema/testdata/draft2020-12/if-then-else.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/if-then-else.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/if-then-else.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/infinite-loop-detection.json b/internal/mcp/jsonschema/testdata/draft2020-12/infinite-loop-detection.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/infinite-loop-detection.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/infinite-loop-detection.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/items.json b/internal/mcp/jsonschema/testdata/draft2020-12/items.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/items.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/items.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/maxContains.json b/internal/mcp/jsonschema/testdata/draft2020-12/maxContains.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/maxContains.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/maxContains.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/maxItems.json b/internal/mcp/jsonschema/testdata/draft2020-12/maxItems.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/maxItems.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/maxItems.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/maxLength.json b/internal/mcp/jsonschema/testdata/draft2020-12/maxLength.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/maxLength.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/maxLength.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/maxProperties.json b/internal/mcp/jsonschema/testdata/draft2020-12/maxProperties.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/maxProperties.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/maxProperties.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/maximum.json b/internal/mcp/jsonschema/testdata/draft2020-12/maximum.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/maximum.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/maximum.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/minContains.json b/internal/mcp/jsonschema/testdata/draft2020-12/minContains.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/minContains.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/minContains.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/minItems.json b/internal/mcp/jsonschema/testdata/draft2020-12/minItems.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/minItems.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/minItems.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/minLength.json b/internal/mcp/jsonschema/testdata/draft2020-12/minLength.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/minLength.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/minLength.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/minProperties.json b/internal/mcp/jsonschema/testdata/draft2020-12/minProperties.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/minProperties.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/minProperties.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/minimum.json b/internal/mcp/jsonschema/testdata/draft2020-12/minimum.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/minimum.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/minimum.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/multipleOf.json b/internal/mcp/jsonschema/testdata/draft2020-12/multipleOf.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/multipleOf.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/multipleOf.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/not.json b/internal/mcp/jsonschema/testdata/draft2020-12/not.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/not.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/not.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/oneOf.json b/internal/mcp/jsonschema/testdata/draft2020-12/oneOf.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/oneOf.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/oneOf.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/pattern.json b/internal/mcp/jsonschema/testdata/draft2020-12/pattern.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/pattern.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/pattern.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/patternProperties.json b/internal/mcp/jsonschema/testdata/draft2020-12/patternProperties.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/patternProperties.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/patternProperties.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/prefixItems.json b/internal/mcp/jsonschema/testdata/draft2020-12/prefixItems.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/prefixItems.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/prefixItems.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/properties.json b/internal/mcp/jsonschema/testdata/draft2020-12/properties.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/properties.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/properties.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/propertyNames.json b/internal/mcp/jsonschema/testdata/draft2020-12/propertyNames.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/propertyNames.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/propertyNames.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/required.json b/internal/mcp/jsonschema/testdata/draft2020-12/required.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/required.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/required.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/type.json b/internal/mcp/jsonschema/testdata/draft2020-12/type.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/type.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/type.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/unevaluatedItems.json b/internal/mcp/jsonschema/testdata/draft2020-12/unevaluatedItems.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/unevaluatedItems.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/unevaluatedItems.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/unevaluatedProperties.json b/internal/mcp/jsonschema/testdata/draft2020-12/unevaluatedProperties.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/unevaluatedProperties.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/unevaluatedProperties.json
diff --git a/internal/mcp/internal/jsonschema/testdata/draft2020-12/uniqueItems.json b/internal/mcp/jsonschema/testdata/draft2020-12/uniqueItems.json
similarity index 100%
rename from internal/mcp/internal/jsonschema/testdata/draft2020-12/uniqueItems.json
rename to internal/mcp/jsonschema/testdata/draft2020-12/uniqueItems.json
diff --git a/internal/mcp/internal/jsonschema/util.go b/internal/mcp/jsonschema/util.go
similarity index 100%
rename from internal/mcp/internal/jsonschema/util.go
rename to internal/mcp/jsonschema/util.go
diff --git a/internal/mcp/internal/jsonschema/util_test.go b/internal/mcp/jsonschema/util_test.go
similarity index 100%
rename from internal/mcp/internal/jsonschema/util_test.go
rename to internal/mcp/jsonschema/util_test.go
diff --git a/internal/mcp/internal/jsonschema/validate.go b/internal/mcp/jsonschema/validate.go
similarity index 100%
rename from internal/mcp/internal/jsonschema/validate.go
rename to internal/mcp/jsonschema/validate.go
diff --git a/internal/mcp/internal/jsonschema/validate_test.go b/internal/mcp/jsonschema/validate_test.go
similarity index 100%
rename from internal/mcp/internal/jsonschema/validate_test.go
rename to internal/mcp/jsonschema/validate_test.go
diff --git a/internal/mcp/mcp_test.go b/internal/mcp/mcp_test.go
index 3baf81e..e6fbcd2 100644
--- a/internal/mcp/mcp_test.go
+++ b/internal/mcp/mcp_test.go
@@ -16,8 +16,8 @@
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
- "golang.org/x/tools/internal/mcp/internal/jsonschema"
"golang.org/x/tools/internal/mcp/internal/protocol"
+ "golang.org/x/tools/internal/mcp/jsonschema"
)
type hiParams struct {
diff --git a/internal/mcp/prompt.go b/internal/mcp/prompt.go
index f136669..2faa380 100644
--- a/internal/mcp/prompt.go
+++ b/internal/mcp/prompt.go
@@ -11,9 +11,9 @@
"reflect"
"slices"
- "golang.org/x/tools/internal/mcp/internal/jsonschema"
"golang.org/x/tools/internal/mcp/internal/protocol"
"golang.org/x/tools/internal/mcp/internal/util"
+ "golang.org/x/tools/internal/mcp/jsonschema"
)
// A PromptHandler handles a call to prompts/get.
diff --git a/internal/mcp/tool.go b/internal/mcp/tool.go
index f10c028..ca2e6b6 100644
--- a/internal/mcp/tool.go
+++ b/internal/mcp/tool.go
@@ -9,9 +9,9 @@
"encoding/json"
"slices"
- "golang.org/x/tools/internal/mcp/internal/jsonschema"
"golang.org/x/tools/internal/mcp/internal/protocol"
"golang.org/x/tools/internal/mcp/internal/util"
+ "golang.org/x/tools/internal/mcp/jsonschema"
)
// A ToolHandler handles a call to tools/call.
diff --git a/internal/mcp/tool_test.go b/internal/mcp/tool_test.go
index 197d43a..85b5e55 100644
--- a/internal/mcp/tool_test.go
+++ b/internal/mcp/tool_test.go
@@ -11,7 +11,7 @@
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
"golang.org/x/tools/internal/mcp"
- "golang.org/x/tools/internal/mcp/internal/jsonschema"
+ "golang.org/x/tools/internal/mcp/jsonschema"
)
// testToolHandler is used for type inference in TestMakeTool.
