From 091e964bd492eed7810c249a39ce4c84732003ce Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Tue, 6 May 2025 17:45:22 +0300 Subject: [PATCH] resurrect old standalone detection Signed-off-by: Vasiliy Tolstov --- util.go | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/util.go b/util.go index e04c974..8cb6485 100644 --- a/util.go +++ b/util.go @@ -41,11 +41,11 @@ func (g *Generator) generateServiceClient(gfile *protogen.GeneratedFile, file *p gfile.P("name string") gfile.P("}") - //if g.standalone { - // gfile.P("func New", serviceName, "Client(name string, c ", microClientPackage.Ident("Client"), ") ", file.GoImportPath.Ident(serviceName), "Client {") - //} else { - gfile.P("func New", serviceName, "Client(name string, c ", microClientPackage.Ident("Client"), ") ", serviceName, "Client {") - //} + if g.standalone { + gfile.P("func New", serviceName, "Client(name string, c ", microClientPackage.Ident("Client"), ") ", file.GoImportPath.Ident(serviceName), "Client {") + } else { + gfile.P("func New", serviceName, "Client(name string, c ", microClientPackage.Ident("Client"), ") ", serviceName, "Client {") + } gfile.P("return &", unexport(serviceName), "Client{c: c, name: name}") gfile.P("}") gfile.P() @@ -326,11 +326,11 @@ func (g *Generator) generateServiceClientMethods(gfile *protogen.GeneratedFile, func (g *Generator) generateServiceServer(gfile *protogen.GeneratedFile, file *protogen.File, service *protogen.Service) { serviceName := service.GoName gfile.P("type ", unexport(serviceName), "Server struct {") - //if g.standalone { - // gfile.P(file.GoImportPath.Ident(serviceName), "Server") - //} else { - gfile.P(serviceName, "Server") - //} + if g.standalone { + gfile.P(file.GoImportPath.Ident(serviceName), "Server") + } else { + gfile.P(serviceName, "Server") + } gfile.P("}") gfile.P() } @@ -487,11 +487,11 @@ func (g *Generator) generateServiceServerMethods(gfile *protogen.GeneratedFile, func (g *Generator) generateServiceRegister(gfile *protogen.GeneratedFile, file *protogen.File, service *protogen.Service, component string) { serviceName := service.GoName - // if g.standalone { - // gfile.P("func Register", serviceName, "Server(s ", microServerPackage.Ident("Server"), ", sh ", file.GoImportPath.Ident(serviceName), "Server, opts ...", microServerPackage.Ident("HandlerOption"), ") error {") - // } else { - gfile.P("func Register", serviceName, "Server(s ", microServerPackage.Ident("Server"), ", sh ", serviceName, "Server, opts ...", microServerPackage.Ident("HandlerOption"), ") error {") - // } + if g.standalone { + gfile.P("func Register", serviceName, "Server(s ", microServerPackage.Ident("Server"), ", sh ", file.GoImportPath.Ident(serviceName), "Server, opts ...", microServerPackage.Ident("HandlerOption"), ") error {") + } else { + gfile.P("func Register", serviceName, "Server(s ", microServerPackage.Ident("Server"), ", sh ", serviceName, "Server, opts ...", microServerPackage.Ident("HandlerOption"), ") error {") + } gfile.P("type ", unexport(serviceName), " interface {") var generate bool for _, method := range service.Methods {