Using a proper package name for the generated options proto (#138)

Co-authored-by: Prawn <Prawn@Prawn>

Author: chrusty

internal/converter/converter.go

@@ -18,7 +18,7 @@ import (
 	descriptor "google.golang.org/protobuf/types/descriptorpb"
 	plugin "google.golang.org/protobuf/types/pluginpb"
 
-	"github.com/chrusty/protoc-gen-jsonschema/internal/protos"
+	protoc_gen_jsonschema "github.com/chrusty/protoc-gen-jsonschema"
 )
 
 const (
@@ -146,9 +146,9 @@ func (c *Converter) convertEnumType(enum *descriptor.EnumDescriptorProto, conver
 	converterFlags.EnumsAsStringsOnly = c.Flags.EnumsAsStringsOnly
 
 	// Set some per-enum flags from config and options:
-	if opts := enum.GetOptions(); opts != nil && proto.HasExtension(opts, protos.E_EnumOptions) {
-		if opt := proto.GetExtension(opts, protos.E_EnumOptions); opt != nil {
-			if enumOptions, ok := opt.(*protos.EnumOptions); ok {
+	if opts := enum.GetOptions(); opts != nil && proto.HasExtension(opts, protoc_gen_jsonschema.E_EnumOptions) {
+		if opt := proto.GetExtension(opts, protoc_gen_jsonschema.E_EnumOptions); opt != nil {
+			if enumOptions, ok := opt.(*protoc_gen_jsonschema.EnumOptions); ok {
 
 				// ENUMs as constants:
 				if enumOptions.GetEnumsAsConstants() {
@@ -301,9 +301,9 @@ func (c *Converter) convertFile(file *descriptor.FileDescriptorProto, fileExtens
 		for _, msgDesc := range file.GetMessageType() {
 
 			// Check for our custom message options:
-			if opts := msgDesc.GetOptions(); opts != nil && proto.HasExtension(opts, protos.E_MessageOptions) {
-				if opt := proto.GetExtension(opts, protos.E_MessageOptions); opt != nil {
-					if messageOptions, ok := opt.(*protos.MessageOptions); ok {
+			if opts := msgDesc.GetOptions(); opts != nil && proto.HasExtension(opts, protoc_gen_jsonschema.E_MessageOptions) {
+				if opt := proto.GetExtension(opts, protoc_gen_jsonschema.E_MessageOptions); opt != nil {
+					if messageOptions, ok := opt.(*protoc_gen_jsonschema.MessageOptions); ok {
 
 						// "Ignored" messages are simply skipped:
 						if messageOptions.GetIgnore() {
@@ -372,9 +372,9 @@ func (c *Converter) convert(request *plugin.CodeGeneratorRequest) (*plugin.CodeG
 		fileExtension := c.schemaFileExtension
 
 		// Check for our custom file options:
-		if opts := fileDesc.GetOptions(); opts != nil && proto.HasExtension(opts, protos.E_FileOptions) {
-			if opt := proto.GetExtension(opts, protos.E_FileOptions); opt != nil {
-				if fileOptions, ok := opt.(*protos.FileOptions); ok {
+		if opts := fileDesc.GetOptions(); opts != nil && proto.HasExtension(opts, protoc_gen_jsonschema.E_FileOptions) {
+			if opt := proto.GetExtension(opts, protoc_gen_jsonschema.E_FileOptions); opt != nil {
+				if fileOptions, ok := opt.(*protoc_gen_jsonschema.FileOptions); ok {
 
 					// "Ignored" files are simply skipped:
 					if fileOptions.GetIgnore() {

internal/converter/types.go

@@ -11,7 +11,7 @@ import (
 	"google.golang.org/protobuf/proto"
 	descriptor "google.golang.org/protobuf/types/descriptorpb"
 
-	"github.com/chrusty/protoc-gen-jsonschema/internal/protos"
+	protoc_gen_jsonschema "github.com/chrusty/protoc-gen-jsonschema"
 )
 
 var (
@@ -148,9 +148,9 @@ func (c *Converter) convertField(curPkg *ProtoPackage, desc *descriptor.FieldDes
 		stringDef := &jsonschema.Type{Type: gojsonschema.TYPE_STRING}
 		// Check for custom options
 		opts := desc.GetOptions()
-		if opts != nil && proto.HasExtension(opts, protos.E_FieldOptions) {
-			if opt := proto.GetExtension(opts, protos.E_FieldOptions); opt != nil {
-				if fieldOptions, ok := opt.(*protos.FieldOptions); ok {
+		if opts != nil && proto.HasExtension(opts, protoc_gen_jsonschema.E_FieldOptions) {
+			if opt := proto.GetExtension(opts, protoc_gen_jsonschema.E_FieldOptions); opt != nil {
+				if fieldOptions, ok := opt.(*protoc_gen_jsonschema.FieldOptions); ok {
 					if fieldOptions.GetMinLength() > 0 {
 						stringDef.MinLength = int(fieldOptions.GetMinLength())
 					}
@@ -467,9 +467,9 @@ func (c *Converter) recursiveConvertMessageType(curPkg *ProtoPackage, msgDesc *d
 
 	// Set some per-message flags from config and options:
 	messageFlags := c.Flags
-	if opts := msgDesc.GetOptions(); opts != nil && proto.HasExtension(opts, protos.E_MessageOptions) {
-		if opt := proto.GetExtension(opts, protos.E_MessageOptions); opt != nil {
-			if messageOptions, ok := opt.(*protos.MessageOptions); ok {
+	if opts := msgDesc.GetOptions(); opts != nil && proto.HasExtension(opts, protoc_gen_jsonschema.E_MessageOptions) {
+		if opt := proto.GetExtension(opts, protoc_gen_jsonschema.E_MessageOptions); opt != nil {
+			if messageOptions, ok := opt.(*protoc_gen_jsonschema.MessageOptions); ok {
 
 				// AllFieldsRequired:
 				if messageOptions.GetAllFieldsRequired() {
@@ -578,9 +578,9 @@ func (c *Converter) recursiveConvertMessageType(curPkg *ProtoPackage, msgDesc *d
 
 		// Check for our custom field options:
 		opts := fieldDesc.GetOptions()
-		if opts != nil && proto.HasExtension(opts, protos.E_FieldOptions) {
-			if opt := proto.GetExtension(opts, protos.E_FieldOptions); opt != nil {
-				if fieldOptions, ok := opt.(*protos.FieldOptions); ok {
+		if opts != nil && proto.HasExtension(opts, protoc_gen_jsonschema.E_FieldOptions) {
+			if opt := proto.GetExtension(opts, protoc_gen_jsonschema.E_FieldOptions); opt != nil {
+				if fieldOptions, ok := opt.(*protoc_gen_jsonschema.FieldOptions); ok {
 
 					// "Ignored" fields are simply skipped:
 					if fieldOptions.GetIgnore() {