fix: filtering bugs

Use value from correct .Only config field when constructing filter for
including symbol types, instead of .Exclude field value.

Make symbol type filters return true for struct fields except for
FilterUnexported.

Author: michenriksen

filter.go

@@ -150,6 +150,10 @@ func (f *filterSymbolTypes) Include(s Symbol) bool {
 		return true
 	}
 
+	if s.SymbolType() == SymbolStructField {
+		return true
+	}
+
 	_, ok := f.stMap[s.SymbolType()]
 
 	if f.action == Include {
@@ -187,6 +191,10 @@ func (f *filterMatchingIdents) Include(s Symbol) bool {
 		return true
 	}
 
+	if s.SymbolType() == SymbolStructField {
+		return true
+	}
+
 	match := f.pattern.MatchString(s.Ident())
 
 	if f.action == Include {

filter_test.go

@@ -20,6 +20,7 @@ var symbolTypes = []pkgdmp.SymbolType{
 	pkgdmp.SymbolChanType,
 	pkgdmp.SymbolArrayType,
 	pkgdmp.SymbolFunc,
+	pkgdmp.SymbolMethod,
 	pkgdmp.SymbolStructField,
 }
 
@@ -72,6 +73,7 @@ func TestFilterSymbolTypes(t *testing.T) {
 		newSymbol(t, "myChan", pkgdmp.SymbolChanType),
 		newSymbol(t, "MyArray", pkgdmp.SymbolArrayType),
 		newSymbol(t, "MyFunc", pkgdmp.SymbolFunc),
+		newSymbol(t, "MyMethod", pkgdmp.SymbolMethod),
 	}
 
 	t.Run("returns true when all symbol types are included", func(t *testing.T) {

internal/cli/flags.go

@@ -149,7 +149,7 @@ func filtersFromCfg(cfg *Config) ([]pkgdmp.SymbolFilter, error) {
 	}
 
 	if cfg.Only != "" {
-		st, err := strToSymbolTypes(cfg.Exclude)
+		st, err := strToSymbolTypes(cfg.Only)
 		if err != nil {
 			return nil, fmt.Errorf("parsing symbol types: %w", err)
 		}

internal/cli/flags_test.go

@@ -44,11 +44,11 @@ func TestParseFlags(t *testing.T) {
 		},
 		{
 			name: "flags and directories",
-			args: []string{"-unexported", "-no-docs", "-exclude=interfaces", "directory1", "directory2"},
+			args: []string{"-unexported", "-no-docs", "-exclude=interface", "directory1", "directory2"},
 			wantCfg: &cli.Config{
 				Unexported: true,
 				NoDocs:     true,
-				Exclude:    "interfaces",
+				Exclude:    "interface",
 				Dirs:       []string{"directory1", "directory2"},
 				Theme:      "swapoff",
 			},