Skip to content

fix: cleanup 27 #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dimyjeannot merged 1 commit into from
Jun 25, 2025
Merged

fix: cleanup 27 #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions libs/plugins/protoc-gen-platform/languages/go/plugins/cli_methods/go_cli_methods.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package cli_methods

import (
"embed"
"path/filepath"
"sort"
"strings"
"text/template"
Expand All @@ -18,7 +19,7 @@ import (
var templates embed.FS

var (
goOutPath = pgs.JoinPaths("platform")
goOutPath = pgs.JoinPaths()
outPath = &goOutPath
)

Expand Down Expand Up @@ -125,7 +126,10 @@ func (m GoCliMethodsModule) GenerateFile(file pgs.File) {
version := fns.GetPackageVersion(file)
methodName := method.Name().LowerSnakeCase().String()

name := outPath.SetExt("/" + system + "/" + version + "/" + system + version + "pbcli" + "/" + methodName + ".cmd.go").String()
fullPath := file.InputPath().String()
dirPath := filepath.Dir(fullPath)

name := outPath.SetExt("/" + dirPath + "/" + system + version + "pbcli" + "/" + methodName + ".cmd.go").String()
m.OverwriteGeneratorTemplateFile(name, m.Tpl, method)

// name := m.ctx.OutputPath(file).SetBase(method.Name().LowerSnakeCase().String()).SetExt(".pb." + l.FileExtension())
Expand Down
11 changes: 6 additions & 5 deletions libs/plugins/protoc-gen-platform/languages/go/plugins/cli_service/go_cli_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package cli_service

import (
"embed"
"path/filepath"
"sort"
"strings"
"text/template"
Expand All @@ -16,7 +17,7 @@ import (
var templates embed.FS

var (
goOutPath = pgs.JoinPaths("platform")
goOutPath = pgs.JoinPaths()
outPath = &goOutPath
)

Expand Down Expand Up @@ -118,9 +119,9 @@ func (m GoCliServiceModule) GenerateFile(file pgs.File) {
system := fns.DomainSystemName2(file).LowerCamelCase().String()
version := fns.GetPackageVersion(file)
fileName := fns.ProtoName(file)
name := outPath.SetExt("/" + system + "/" + version + "/" + system + version + "pbcli" + "/" + fileName + ".cmds.go").String()
m.OverwriteGeneratorTemplateFile(name, m.Tpl, file)
fullPath := file.InputPath().String()
dirPath := filepath.Dir(fullPath)

// name := m.ctx.OutputPath(file).SetExt(".cmd." + l.FileExtension())
// m.OverwriteGeneratorTemplateFile(name.String(), m.Tpl, file)
name := outPath.SetExt("/" + dirPath + "/" + system + version + "pbcli" + "/" + fileName + ".cmds.go").String()
m.OverwriteGeneratorTemplateFile(name, m.Tpl, file)
}
9 changes: 7 additions & 2 deletions libs/plugins/protoc-gen-platform/languages/go/plugins/cli_system/go_cli_system.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package cli_system

import (
"embed"
"path/filepath"
"sort"
"strings"
"text/template"
Expand All @@ -16,7 +17,7 @@ import (
var (
//go:embed templates/*.tmpl
templates embed.FS
goOutPath = pgs.JoinPaths("platform")
goOutPath = pgs.JoinPaths("")
outPath = &goOutPath
)

Expand Down Expand Up @@ -130,7 +131,11 @@ func (m GoCliSystemModule) GenerateFile(file pgs.File) {
system := fns.DomainSystemName2(file).LowerCamelCase().String()
version := fns.GetPackageVersion(file)
fileName := fns.ProtoName(file)
name := outPath.SetExt("/" + system + "/" + version + "/" + system + version + "pbcli" + "/" + fileName + ".cmd.go").String()

fullPath := file.InputPath().String()
dirPath := filepath.Dir(fullPath)

name := outPath.SetExt("/" + dirPath + "/" + system + version + "pbcli" + "/" + fileName + ".cmd.go").String()
m.OverwriteGeneratorTemplateFile(name, m.Tpl, file)

// name := m.ctx.OutputPath(file).SetExt(".cmd." + l.FileExtension())
Expand Down
8 changes: 6 additions & 2 deletions libs/plugins/protoc-gen-platform/languages/go/plugins/cli_systems/go_cli_systems.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package cli_systems

import (
"embed"
"path/filepath"
"sort"
"strings"
"text/template"
Expand All @@ -16,7 +17,7 @@ import (
var (
//go:embed templates/*.tmpl
templates embed.FS
goOutPath = pgs.JoinPaths("platform")
goOutPath = pgs.JoinPaths("")
outPath = &goOutPath
)

Expand Down Expand Up @@ -129,6 +130,9 @@ func (m GoCliSystemsModule) GenerateFile(file pgs.File) {

system := fns.DomainSystemName2(file).LowerCamelCase().String()
version := fns.GetPackageVersion(file)
name := outPath.SetExt("/" + system + "/" + version + "/" + system + version + "pbcli" + "/" + "systems.cmd.go").String()
fullPath := file.InputPath().String()
dirPath := filepath.Dir(fullPath)

name := outPath.SetExt("/" + dirPath + "/" + system + version + "pbcli" + "/" + "systems.cmd.go").String()
m.OverwriteGeneratorTemplateFile(name, m.Tpl, file)
}
5 changes: 4 additions & 1 deletion ...gins/protoc-gen-platform/languages/go/plugins/entity_unspecified/templates/entity.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,10 @@ func (entity *{{ $entityName.UpperCamelCase }}SpecEntity) internal() {
// Enum
var _ *{{ enumTypePackage . }}{{ .Type.Enum.Name.UpperCamelCase }}
{{- else if isMap . }}
//{{ .Name }}
//{{ .Name }}
{{- else if .Type.IsRepeated }}
//Repeated {{ .Name }}
var _ {{ sliceValueTypePackage . }}{{ sliceValueType . }}
{{- else if isStructPB . -}}
//{{ .Name }}
{{- else if isStruct . -}}
Expand Down
Loading
Loading