Intermediate commit

bdragon300 · Dec 4, 2024 · b56b78b · b56b78b
1 parent 26cd0cb
commit b56b78b
Show file tree

Hide file tree

Showing 106 changed files with 797 additions and 795 deletions.
diff --git a/cmd/go-asyncapi/generate.go b/cmd/go-asyncapi/generate.go
@@ -54,8 +54,6 @@ type generatePubSubArgs struct {
 
 	ProjectModule string `arg:"-M,--project-module" help:"Project module name to use [default: extracted from go.mod file in the current working directory]" placeholder:"MODULE"`
 	TargetPackage string `arg:"-T,--target-package" help:"Package for generated code [default: {target-dir-name}]" placeholder:"PACKAGE"`
-	//PackageScope  string `arg:"--package-scope" default:"type" help:"How to split up the generated code on packages. Possible values: type, all" placeholder:"SCOPE"`
-	//FileScope     string `arg:"--file-scope" default:"name" help:"How to split up the generated code on files inside packages. Possible values: name, type" placeholder:"SCOPE"`
 	TemplateDir string `arg:"--template-dir" help:"Directory with custom templates" placeholder:"DIR"`
 	generateObjectSelectionOpts
 	ImplementationsOpts

diff --git a/internal/asyncapi/amqp/channel.go b/internal/asyncapi/amqp/channel.go
@@ -64,8 +64,7 @@ func (pb ProtoBuilder) BuildChannel(ctx *common.CompileContext, channel *asyncap
 
 	return &render.ProtoChannel{
 		Channel:         parent,
-		GolangNameProto: golangName,
-		Struct:          chanStruct,
+		Type:            chanStruct,
 		ProtoName:       pb.ProtoName,
 	}, nil
 }

diff --git a/internal/asyncapi/amqp/server.go b/internal/asyncapi/amqp/server.go
@@ -18,7 +18,7 @@ func (pb ProtoBuilder) BuildServer(ctx *common.CompileContext, server *asyncapi.
 	}
 	return &render.ProtoServer{
 		Server:    parent,
-		Struct:    baseServer,
+		Type:      baseServer,
 		ProtoName: pb.ProtoName,
 	}, nil
 }

diff --git a/internal/asyncapi/asyncapi.go b/internal/asyncapi/asyncapi.go
@@ -29,7 +29,7 @@ func (a AsyncAPI) Compile(ctx *common.CompileContext) error {
 }
 
 func (a AsyncAPI) build(ctx *common.CompileContext) *render.AsyncAPI {
-	allMessagesPrm := lang.NewListCbPromise[*render.Message](func(item common.Renderer, _ []string) bool {
+	allMessagesPrm := lang.NewListCbPromise[*render.Message](func(item common.Renderable, _ []string) bool {
 		_, ok := item.(*render.Message)
 		return ok
 	})

diff --git a/internal/asyncapi/bindings.go b/internal/asyncapi/bindings.go
@@ -31,10 +31,10 @@ func (b *Bindings) build(
 	ctx *common.CompileContext,
 	bindingsKind int,
 	bindingsKey string,
-) (common.Renderer, error) {
+) (common.Renderable, error) {
 	if b.Ref != "" {
 		ctx.Logger.Trace("Ref", "$ref", b.Ref)
-		res := lang.NewRendererPromise(b.Ref, common.PromiseOriginUser)
+		res := lang.NewRenderablePromise(b.Ref, common.PromiseOriginUser)
 		ctx.PutPromise(res)
 		return res, nil
 	}

diff --git a/internal/asyncapi/channel.go b/internal/asyncapi/channel.go
@@ -37,8 +37,8 @@ func (c Channel) Compile(ctx *common.CompileContext) error {
 	return nil
 }
 
-func (c Channel) buildChannels(ctx *common.CompileContext, channelKey string) ([]common.Renderer, error) {
-	var res []common.Renderer
+func (c Channel) buildChannels(ctx *common.CompileContext, channelKey string) ([]common.Renderable, error) {
+	var res []common.Renderable
 
 	_, isComponent := ctx.Stack.Top().Flags[common.SchemaTagComponent]
 	ignore := c.XIgnore ||
@@ -51,7 +51,7 @@ func (c Channel) buildChannels(ctx *common.CompileContext, channelKey string) ([
 	}
 	if c.Ref != "" {
 		ctx.Logger.Trace("Ref", "$ref", c.Ref)
-		prm := lang.NewRendererPromise(c.Ref, common.PromiseOriginUser)
+		prm := lang.NewRenderablePromise(c.Ref, common.PromiseOriginUser)
 		// Set a channel to be rendered if we reference it from `channels` document section
 		prm.DirectRender = !isComponent
 		ctx.PutPromise(prm)
@@ -95,7 +95,7 @@ func (c Channel) buildChannels(ctx *common.CompileContext, channelKey string) ([
 	if c.Servers != nil {
 		ctx.Logger.Trace("Channel servers", "names", *c.Servers)
 		baseChan.SpecServerNames = *c.Servers
-		prm := lang.NewListCbPromise[*render.Server](func(item common.Renderer, path []string) bool {
+		prm := lang.NewListCbPromise[*render.Server](func(item common.Renderable, path []string) bool {
 			srv, ok := item.(*render.Server)
 			if !ok {
 				return false
@@ -105,7 +105,7 @@ func (c Channel) buildChannels(ctx *common.CompileContext, channelKey string) ([
 		baseChan.ServersPromise = prm
 	} else {
 		ctx.Logger.Trace("Channel for all servers")
-		prm := lang.NewListCbPromise[*render.Server](func(item common.Renderer, path []string) bool {
+		prm := lang.NewListCbPromise[*render.Server](func(item common.Renderable, path []string) bool {
 			_, ok := item.(*render.Server)
 			return ok
 		})

diff --git a/internal/asyncapi/correlationid.go b/internal/asyncapi/correlationid.go
@@ -32,7 +32,7 @@ func (c CorrelationID) Compile(ctx *common.CompileContext) error {
 	return nil
 }
 
-func (c CorrelationID) build(ctx *common.CompileContext, correlationIDKey string) (common.Renderer, error) {
+func (c CorrelationID) build(ctx *common.CompileContext, correlationIDKey string) (common.Renderable, error) {
 	ignore := c.XIgnore || !ctx.CompileOpts.MessageOpts.Enable
 	if ignore {
 		ctx.Logger.Debug("CorrelationID denoted to be ignored")
@@ -41,7 +41,7 @@ func (c CorrelationID) build(ctx *common.CompileContext, correlationIDKey string
 	// TODO: move this ref code from everywhere to single place?
 	if c.Ref != "" {
 		ctx.Logger.Trace("Ref", "$ref", c.Ref)
-		res := lang.NewRendererPromise(c.Ref, common.PromiseOriginUser)
+		res := lang.NewRenderablePromise(c.Ref, common.PromiseOriginUser)
 		ctx.PutPromise(res)
 		return res, nil
 	}

diff --git a/internal/asyncapi/http/channel.go b/internal/asyncapi/http/channel.go
@@ -27,8 +27,7 @@ func (pb ProtoBuilder) BuildChannel(ctx *common.CompileContext, channel *asyncap
 
 	return &render.ProtoChannel{
 		Channel:         parent,
-		GolangNameProto: golangName,
-		Struct:          chanStruct,
+		Type:            chanStruct,
 		ProtoName:       pb.ProtoName,
 	}, nil
 }

diff --git a/internal/asyncapi/http/server.go b/internal/asyncapi/http/server.go
@@ -18,7 +18,7 @@ func (pb ProtoBuilder) BuildServer(ctx *common.CompileContext, server *asyncapi.
 	}
 	return &render.ProtoServer{
 		Server:    parent,
-		Struct:    baseServer,
+		Type:      baseServer,
 		ProtoName: pb.ProtoName,
 	}, nil
 }

diff --git a/internal/asyncapi/ip/channel.go b/internal/asyncapi/ip/channel.go
@@ -21,8 +21,7 @@ func (pb ProtoBuilder) BuildChannel(ctx *common.CompileContext, channel *asyncap
 
 	return &render.ProtoChannel{
 		Channel:         parent,
-		GolangNameProto: golangName,
-		Struct:          chanStruct,
+		Type:            chanStruct,
 		ProtoName:       pb.ProtoName,
 	}, nil
 }

diff --git a/internal/asyncapi/ip/server.go b/internal/asyncapi/ip/server.go
@@ -18,7 +18,7 @@ func (pb ProtoBuilder) BuildServer(ctx *common.CompileContext, server *asyncapi.
 	}
 	return &render.ProtoServer{
 		Server:    parent,
-		Struct:    baseServer,
+		Type:      baseServer,
 		ProtoName: pb.ProtoName,
 	}, nil
 }

diff --git a/internal/asyncapi/kafka/channel.go b/internal/asyncapi/kafka/channel.go
@@ -45,8 +45,7 @@ func (pb ProtoBuilder) BuildChannel(ctx *common.CompileContext, channel *asyncap
 
 	return &render.ProtoChannel{
 		Channel:         parent,
-		GolangNameProto: golangName,
-		Struct:          chanStruct,
+		Type:            chanStruct,
 		ProtoName:       pb.ProtoName,
 	}, nil
 }

diff --git a/internal/asyncapi/kafka/server.go b/internal/asyncapi/kafka/server.go
@@ -23,7 +23,7 @@ func (pb ProtoBuilder) BuildServer(ctx *common.CompileContext, server *asyncapi.
 	}
 	return &render.ProtoServer{
 		Server:    parent,
-		Struct:    baseServer,
+		Type:      baseServer,
 		ProtoName: pb.ProtoName,
 	}, nil
 }

diff --git a/internal/asyncapi/message.go b/internal/asyncapi/message.go
@@ -52,8 +52,8 @@ func (m Message) Compile(ctx *common.CompileContext) error {
 	return nil
 }
 
-func (m Message) build(ctx *common.CompileContext, messageKey string) ([]common.Renderer, error) {
-	var res []common.Renderer
+func (m Message) build(ctx *common.CompileContext, messageKey string) ([]common.Renderable, error) {
+	var res []common.Renderable
 
 	_, isComponent := ctx.Stack.Top().Flags[common.SchemaTagComponent]
 	ignore := m.XIgnore || (isComponent && !ctx.CompileOpts.MessageOpts.IsAllowedName(messageKey))
@@ -64,7 +64,7 @@ func (m Message) build(ctx *common.CompileContext, messageKey string) ([]common.
 	}
 	if m.Ref != "" {
 		ctx.Logger.Trace("Ref", "$ref", m.Ref)
-		prm := lang.NewRendererPromise(m.Ref, common.PromiseOriginUser)
+		prm := lang.NewRenderablePromise(m.Ref, common.PromiseOriginUser)
 		ctx.PutPromise(prm)
 		res = append(res, prm)
 		return res, nil
@@ -103,7 +103,7 @@ func (m Message) build(ctx *common.CompileContext, messageKey string) ([]common.
 	ctx.Logger.Trace(fmt.Sprintf("Message content type is %q", baseMessage.ContentType))
 
 	// Lookup servers after linking to figure out all protocols the message is used in
-	prm := lang.NewListCbPromise[*render.Server](func(item common.Renderer, path []string) bool {
+	prm := lang.NewListCbPromise[*render.Server](func(item common.Renderable, path []string) bool {
 		_, ok := item.(*render.Server)
 		return ok
 	})

diff --git a/internal/asyncapi/mqtt/channel.go b/internal/asyncapi/mqtt/channel.go
@@ -28,8 +28,7 @@ func (pb ProtoBuilder) BuildChannel(ctx *common.CompileContext, channel *asyncap
 
 	return &render.ProtoChannel{
 		Channel:         parent,
-		GolangNameProto: golangName,
-		Struct:          chanStruct,
+		Type:            chanStruct,
 		ProtoName:       pb.ProtoName,
 	}, nil
 }

diff --git a/internal/asyncapi/mqtt/server.go b/internal/asyncapi/mqtt/server.go
@@ -32,7 +32,7 @@ func (pb ProtoBuilder) BuildServer(ctx *common.CompileContext, server *asyncapi.
 	}
 	return &render.ProtoServer{
 		Server:    parent,
-		Struct:    baseServer,
+		Type:      baseServer,
 		ProtoName: pb.ProtoName,
 	}, nil
 }

diff --git a/internal/asyncapi/object.go b/internal/asyncapi/object.go
@@ -120,8 +120,7 @@ func (o Object) build(ctx *common.CompileContext, flags map[common.SchemaTag]str
 	nullable = nullable || lo.FromPtr(o.XNullable)
 	if nullable {
 		ctx.Logger.Trace("Object is nullable, make it pointer")
-		_, hasDefinition := flags[common.SchemaTagDefinition]
-		golangType = &lang.GoPointer{Type: golangType, HasDefinition: hasDefinition}
+		golangType = &lang.GoPointer{Type: golangType}
 	}
 	return golangType, nil
 }
@@ -251,7 +250,7 @@ func (o Object) buildLangStruct(ctx *common.CompileContext, flags map[common.Sch
 	var messagesPrm *lang.ListPromise[*render.Message]
 	_, isMarshal := flags[common.SchemaTagMarshal]
 	if isMarshal {
-		messagesPrm = lang.NewListCbPromise[*render.Message](func(item common.Renderer, _ []string) bool {
+		messagesPrm = lang.NewListCbPromise[*render.Message](func(item common.Renderable, _ []string) bool {
 			_, ok := item.(*render.Message)
 			return ok
 		})
@@ -409,7 +408,7 @@ func (o Object) buildUnionStruct(ctx *common.CompileContext, flags map[common.Sc
 	}
 
 	// Collect all messages to retrieve struct field tags
-	messagesPrm := lang.NewListCbPromise[*render.Message](func(item common.Renderer, _ []string) bool {
+	messagesPrm := lang.NewListCbPromise[*render.Message](func(item common.Renderable, _ []string) bool {
 		_, ok := item.(*render.Message)
 		return ok
 	})

diff --git a/internal/asyncapi/parameter.go b/internal/asyncapi/parameter.go
@@ -28,15 +28,15 @@ func (p Parameter) Compile(ctx *common.CompileContext) error {
 	return nil
 }
 
-func (p Parameter) build(ctx *common.CompileContext, parameterKey string) (common.Renderer, error) {
+func (p Parameter) build(ctx *common.CompileContext, parameterKey string) (common.Renderable, error) {
 	ignore := !ctx.CompileOpts.ChannelOpts.Enable
 	if ignore {
 		ctx.Logger.Debug("Parameter denoted to be ignored along with all channels")
 		return &render.Parameter{Dummy: true}, nil
 	}
 	if p.Ref != "" {
 		ctx.Logger.Trace("Ref", "$ref", p.Ref)
-		res := lang.NewRendererPromise(p.Ref, common.PromiseOriginUser)
+		res := lang.NewRenderablePromise(p.Ref, common.PromiseOriginUser)
 		ctx.PutPromise(res)
 		return res, nil
 	}

diff --git a/internal/asyncapi/redis/channel.go b/internal/asyncapi/redis/channel.go
@@ -21,8 +21,7 @@ func (pb ProtoBuilder) BuildChannel(ctx *common.CompileContext, channel *asyncap
 
 	return &render.ProtoChannel{
 		Channel:         parent,
-		GolangNameProto: golangName,
-		Struct:          chanStruct,
+		Type:            chanStruct,
 		ProtoName:       pb.ProtoName,
 	}, nil
 }

diff --git a/internal/asyncapi/redis/server.go b/internal/asyncapi/redis/server.go
@@ -18,7 +18,7 @@ func (pb ProtoBuilder) BuildServer(ctx *common.CompileContext, server *asyncapi.
 	}
 	return &render.ProtoServer{
 		Server:    parent,
-		Struct:    baseServer,
+		Type:      baseServer,
 		ProtoName: pb.ProtoName,
 	}, nil
 }

diff --git a/internal/asyncapi/server.go b/internal/asyncapi/server.go
@@ -37,7 +37,7 @@ func (s Server) Compile(ctx *common.CompileContext) error {
 	return nil
 }
 
-func (s Server) build(ctx *common.CompileContext, serverKey string) (common.Renderer, error) {
+func (s Server) build(ctx *common.CompileContext, serverKey string) (common.Renderable, error) {
 	_, isComponent := ctx.Stack.Top().Flags[common.SchemaTagComponent]
 	ignore := s.XIgnore || !ctx.CompileOpts.ServerOpts.IsAllowedName(serverKey)
 	if ignore {
@@ -46,7 +46,7 @@ func (s Server) build(ctx *common.CompileContext, serverKey string) (common.Rend
 	}
 	if s.Ref != "" {
 		ctx.Logger.Trace("Ref", "$ref", s.Ref)
-		prm := lang.NewRendererPromise(s.Ref, common.PromiseOriginUser)
+		prm := lang.NewRenderablePromise(s.Ref, common.PromiseOriginUser)
 		// Set a server to be rendered if we reference it from `servers` document section
 		prm.DirectRender = !isComponent
 		ctx.PutPromise(prm)
@@ -65,7 +65,7 @@ func (s Server) build(ctx *common.CompileContext, serverKey string) (common.Rend
 	}
 
 	// Channels which are connected to this server
-	prm := lang.NewListCbPromise[*render.Channel](func(item common.Renderer, path []string) bool {
+	prm := lang.NewListCbPromise[*render.Channel](func(item common.Renderable, path []string) bool {
 		_, ok := item.(*render.Channel)
 		if !ok {
 			return false
@@ -107,7 +107,7 @@ func (s Server) build(ctx *common.CompileContext, serverKey string) (common.Rend
 		if err != nil {
 			return nil, err
 		}
-		return &render.ProtoServer{Server: &baseServer, Struct: protoStruct}, nil
+		return &render.ProtoServer{Server: &baseServer, Type: protoStruct}, nil
 	}
 
 	ctx.Logger.Trace("Server", "proto", protoBuilder.ProtocolName())

diff --git a/internal/asyncapi/servervariable.go b/internal/asyncapi/servervariable.go
@@ -26,10 +26,10 @@ func (sv ServerVariable) Compile(ctx *common.CompileContext) error {
 	return nil
 }
 
-func (sv ServerVariable) build(ctx *common.CompileContext, serverVariableKey string) (common.Renderer, error) {
+func (sv ServerVariable) build(ctx *common.CompileContext, serverVariableKey string) (common.Renderable, error) {
 	if sv.Ref != "" {
 		ctx.Logger.Trace("Ref", "$ref", sv.Ref)
-		res := lang.NewRendererPromise(sv.Ref, common.PromiseOriginUser)
+		res := lang.NewRenderablePromise(sv.Ref, common.PromiseOriginUser)
 		ctx.PutPromise(res)
 		return res, nil
 	}

diff --git a/internal/asyncapi/tcp/channel.go b/internal/asyncapi/tcp/channel.go
@@ -21,8 +21,7 @@ func (pb ProtoBuilder) BuildChannel(ctx *common.CompileContext, channel *asyncap
 
 	return &render.ProtoChannel{
 		Channel:         parent,
-		GolangNameProto: golangName,
-		Struct:          chanStruct,
+		Type:            chanStruct,
 		ProtoName:       pb.ProtoName,
 	}, nil
 }

diff --git a/internal/asyncapi/tcp/server.go b/internal/asyncapi/tcp/server.go
@@ -18,7 +18,7 @@ func (pb ProtoBuilder) BuildServer(ctx *common.CompileContext, server *asyncapi.
 	}
 	return &render.ProtoServer{
 		Server:    parent,
-		Struct:    baseServer,
+		Type:      baseServer,
 		ProtoName: pb.ProtoName,
 	}, nil
 }

diff --git a/internal/asyncapi/udp/channel.go b/internal/asyncapi/udp/channel.go
@@ -21,8 +21,7 @@ func (pb ProtoBuilder) BuildChannel(ctx *common.CompileContext, channel *asyncap
 
 	return &render.ProtoChannel{
 		Channel:         parent,
-		GolangNameProto: golangName,
-		Struct:          chanStruct,
+		Type:            chanStruct,
 		ProtoName:       pb.ProtoName,
 	}, nil
 }

diff --git a/internal/asyncapi/udp/server.go b/internal/asyncapi/udp/server.go
@@ -18,7 +18,7 @@ func (pb ProtoBuilder) BuildServer(ctx *common.CompileContext, server *asyncapi.
 	}
 	return &render.ProtoServer{
 		Server:    parent,
-		Struct:    baseServer,
+		Type:      baseServer,
 		ProtoName: pb.ProtoName,
 	}, nil
 }

diff --git a/internal/asyncapi/ws/channel.go b/internal/asyncapi/ws/channel.go
@@ -29,8 +29,7 @@ func (pb ProtoBuilder) BuildChannel(ctx *common.CompileContext, channel *asyncap
 
 	return &render.ProtoChannel{
 		Channel:         parent,
-		GolangNameProto: golangName,
-		Struct:          chanStruct,
+		Type:            chanStruct,
 		ProtoName:       pb.ProtoName,
 	}, nil
 }

diff --git a/internal/asyncapi/ws/server.go b/internal/asyncapi/ws/server.go
@@ -18,7 +18,7 @@ func (pb ProtoBuilder) BuildServer(ctx *common.CompileContext, server *asyncapi.
 	}
 	return &render.ProtoServer{
 		Server:    parent,
-		Struct:    baseServer,
+		Type:      baseServer,
 		ProtoName: pb.ProtoName,
 	}, nil
 }