Use the structs name without the @name comment (#2043)

* Fixed struct naming when using dependency parsing

* Fixed naming

* Fixed debug message always triggering

---------

Co-authored-by: skast <[email protected]>

Author: skast96

cmd/swag/main.go

@@ -24,6 +24,7 @@ const (
 	outputTypesFlag          = "outputTypes"
 	parseVendorFlag          = "parseVendor"
 	parseDependencyFlag      = "parseDependency"
+	useStructNameFlag        = "useStructName"
 	parseDependencyLevelFlag = "parseDependencyLevel"
 	markdownFilesFlag        = "markdownFiles"
 	codeExampleFilesFlag     = "codeExampleFiles"
@@ -99,6 +100,11 @@ var initFlags = []cli.Flag{
 		Aliases: []string{"pd"},
 		Usage:   "Parse go files inside dependency folder, disabled by default",
 	},
+	&cli.BoolFlag{
+		Name:    useStructNameFlag,
+		Aliases: []string{"st"},
+		Usage:   "Dont use those ugly full-path names when using dependency flag",
+	},
 	&cli.StringFlag{
 		Name:    markdownFilesFlag,
 		Aliases: []string{"md"},
@@ -251,6 +257,7 @@ func initAction(ctx *cli.Context) error {
 		ParseDependency:     pdv,
 		MarkdownFilesDir:    ctx.String(markdownFilesFlag),
 		ParseInternal:       ctx.Bool(parseInternalFlag),
+		UseStructNames:      ctx.Bool(useStructNameFlag),
 		GeneratedTime:       ctx.Bool(generatedTimeFlag),
 		RequiredByDefault:   ctx.Bool(requiredByDefaultFlag),
 		CodeExampleFilesDir: ctx.String(codeExampleFilesFlag),

gen/gen.go

@@ -108,6 +108,9 @@ type Config struct {
 	// ParseDependencies whether swag should be parse outside dependency folder: 0 none, 1 models, 2 operations, 3 all
 	ParseDependency int
 
+	// UseStructNames stick to the struct name instead of those ugly full-path names
+	UseStructNames bool
+
 	// ParseInternal whether swag should parse internal packages
 	ParseInternal bool
 
@@ -198,6 +201,7 @@ func (g *Gen) Build(config *Config) error {
 
 	p := swag.New(
 		swag.SetParseDependency(config.ParseDependency),
+		swag.SetUseStructName(config.UseStructNames),
 		swag.SetMarkdownFileDirectory(config.MarkdownFilesDir),
 		swag.SetDebugger(config.Debugger),
 		swag.SetExcludedDirsAndFiles(config.Excludes),

parser.go

@@ -182,6 +182,9 @@ type Parser struct {
 
 	// ParseFuncBody whether swag should parse api info inside of funcs
 	ParseFuncBody bool
+
+	// UseStructName Dont use those ugly full-path names when using dependency flag
+	UseStructName bool
 }
 
 // FieldParserFactory create FieldParser.
@@ -261,6 +264,13 @@ func SetParseDependency(parseDependency int) func(*Parser) {
 	}
 }
 
+// SetUseStructName sets whether to strip the full-path definition name.
+func SetUseStructName(useStructName bool) func(*Parser) {
+	return func(p *Parser) {
+		p.UseStructName = useStructName
+	}
+}
+
 // SetMarkdownFileDirectory sets the directory to search for markdown files.
 func SetMarkdownFileDirectory(directoryPath string) func(*Parser) {
 	return func(p *Parser) {
@@ -1330,6 +1340,16 @@ func (parser *Parser) ParseDefinition(typeSpecDef *TypeSpecDef) (*Schema, error)
 			ErrRecursiveParseStruct
 	}
 
+	if parser.UseStructName {
+		schemaName := strings.Split(typeSpecDef.SchemaName, ".")
+		if len(schemaName) > 1 {
+			typeSpecDef.SchemaName = schemaName[len(schemaName)-1]
+			typeName = typeSpecDef.SchemaName
+		} else {
+			parser.debug.Printf("Could not strip type name of %s", typeName)
+		}
+	}
+
 	parser.structStack = append(parser.structStack, typeSpecDef)
 
 	parser.debug.Printf("Generating %s", typeName)