query: parse kind: / type: filters and the new status values

Filters gains a Kind []common.Type. The parser accepts either the "kind" or "type" qualifier (kind:pr, kind:issue, type:pr), and the existing status qualifier now recognises "merged" and "draft" via the 4-state common.Status. Parser tests cover both qualifiers plus an unknown-kind rejection. Signed-off-by: Giles Cope <gilescope@gmail.com>
gilescope · Apr 17, 2026 · Apr 17, 2026 · Apr 17, 2026 · Apr 17, 2026 · Apr 17, 2026
commit ef00943c97c42a14cfe3dfd48105957d43358260
diff --git a/query/parser.go b/query/parser.go
@@ -31,6 +31,12 @@ func Parse(query string) (*Query, error) {
 
 		case tokenKindKV:
 			switch t.qualifier {
+			case "kind", "type":
+				kind, err := common.TypeFromString(t.value)
+				if err != nil {
+					return nil, err
+				}
+				q.Kind = append(q.Kind, kind)
 			case "status", "state":
 				status, err := common.StatusFromString(t.value)
 				if err != nil {

diff --git a/query/parser_test.go b/query/parser_test.go
@@ -24,6 +24,23 @@ func TestParse(t *testing.T) {
 			Filters: Filters{Status: []common.Status{common.ClosedStatus}},
 		}},
 		{"status:unknown", nil},
+		{"status:merged", &Query{
+			Filters: Filters{Status: []common.Status{common.MergedStatus}},
+		}},
+		{"status:draft", &Query{
+			Filters: Filters{Status: []common.Status{common.DraftStatus}},
+		}},
+
+		{"kind:pr", &Query{
+			Filters: Filters{Kind: []common.Type{common.PRType}},
+		}},
+		{"kind:issue", &Query{
+			Filters: Filters{Kind: []common.Type{common.IssueType}},
+		}},
+		{"type:pr", &Query{
+			Filters: Filters{Kind: []common.Type{common.PRType}},
+		}},
+		{"kind:nonsense", nil},
 
 		{"author:rene", &Query{
 			Filters: Filters{Author: []string{"rene"}},

diff --git a/query/query.go b/query/query.go
@@ -33,6 +33,7 @@ type StringPair struct {
 
 // Filters is a collection of Filter that implement a complex filter
 type Filters struct {
+	Kind        []common.Type
 	Status      []common.Status
 	Author      []string
 	Metadata    []StringPair