ci: improve test coverage (#243)

Taskfile.yml

@@ -16,12 +16,8 @@ tasks:
 
   build:gowork:
     run: once
-    sources:
-      - /ext
-      - /tests
-    generates:
-      - go.work
-      - go.work.sum
+    status:
+      - test -f ../go.work || test -f go.work
     cmds:
       - go work init
       - go work use -r .

cmd/kod/internal/generate.go

@@ -1,6 +1,7 @@
 package internal
 
 import (
+	"context"
 	"fmt"
 	"path/filepath"
 	"time"
@@ -19,23 +20,24 @@ var generate = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		{
 			if watch, _ := cmd.Flags().GetBool("watch"); watch {
-				// Create new watcher.
-				w := lo.Must(fsnotify.NewWatcher())
-				defer w.Close()
-
-				Watch(&watcher{w: w}, ".",
-					func(event fsnotify.Event) {
-						doGenerate(cmd, filepath.Dir(event.Name), args)
-					},
-					lo.Must(cmd.Flags().GetBool("verbose")),
-				)
+				startWatcher(cmd.Context(), cmd, args)
 			}
 
 			doGenerate(cmd, "./", args)
 		}
 	},
 }
 
+func startWatcher(ctx context.Context, cmd *cobra.Command, args []string) {
+	// Create new watcher.
+	w := lo.Must(fsnotify.NewWatcher())
+	defer w.Close()
+
+	Watch(&watcher{ctx: ctx, w: w}, ".",
+		func(event fsnotify.Event) { doGenerate(cmd, filepath.Dir(event.Name), args) }, lo.Must(cmd.Flags().GetBool("verbose")),
+	)
+}
+
 func doGenerate(cmd *cobra.Command, dir string, args []string) {
 	startTime := time.Now()
 

cmd/kod/internal/generate_test.go

@@ -1,7 +1,9 @@
 package internal
 
 import (
+	"context"
 	"testing"
+	"time"
 )
 
 func TestGenerate(t *testing.T) {
@@ -11,3 +13,9 @@ func TestGenerate(t *testing.T) {
 func TestGenerateWithStruct2Interface(t *testing.T) {
 	execute(t, "generate -s github.com/go-kod/kod/tests/graphcase/...")
 }
+
+func TestStartWatch(t *testing.T) {
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+	defer cancel()
+	startWatcher(ctx, generate, []string{"github.com/go-kod/kod/tests/graphcase/..."})
+}

cmd/kod/internal/generate_types.go

@@ -6,7 +6,6 @@ import (
 	"sort"
 
 	"golang.org/x/tools/go/packages"
-	"golang.org/x/tools/go/types/typeutil"
 )
 
 const kodPackagePath = "github.com/go-kod/kod"
@@ -17,16 +16,6 @@ type typeSet struct {
 	imported       []importPkg          // imported packages
 	importedByPath map[string]importPkg // imported, indexed by path
 	importedByName map[string]importPkg // imported, indexed by name
-
-	// If checked[t] != nil, then checked[t] is the cached result of calling
-	// check(pkg, t, string[]{}). Otherwise, if checked[t] == nil, then t has
-	// not yet been checked for serializability. Read typeutil.Map's
-	// documentation for why checked shouldn't be a map[types.Type]bool.
-	// checked typeutil.Map
-
-	// If measurable[t] != nil, then measurable[t] == isMeasurableType(t).
-	//nolint
-	measurable typeutil.Map
 }
 
 // importPkg is a package imported by the generated code.

cmd/kod/internal/watcher.go

@@ -1,6 +1,7 @@
 package internal
 
 import (
+	"context"
 	"fmt"
 	"log"
 	"os"
@@ -16,10 +17,12 @@ type Watcher interface {
 	Remove(string) error
 	Events() chan fsnotify.Event
 	Errors() chan error
+	Context() context.Context
 }
 
 type watcher struct {
-	w *fsnotify.Watcher
+	ctx context.Context
+	w   *fsnotify.Watcher
 }
 
 func (w *watcher) Add(name string) error {
@@ -34,6 +37,10 @@ func (w *watcher) Errors() chan error {
 	return w.w.Errors
 }
 
+func (w *watcher) Context() context.Context {
+	return w.ctx
+}
+
 func (w *watcher) Remove(name string) error {
 	return w.w.Remove(name)
 }
@@ -53,6 +60,7 @@ func Watch(watcher Watcher, dir string, callback func(fsnotify.Event), verbose b
 	go func() {
 		for {
 			select {
+
 			case event, ok := <-watcher.Events():
 				if !ok {
 					stop <- struct{}{}
@@ -93,6 +101,9 @@ func Watch(watcher Watcher, dir string, callback func(fsnotify.Event), verbose b
 				}
 				log.Println("error:", err)
 				stop <- struct{}{}
+			case <-watcher.Context().Done():
+				stop <- struct{}{}
+				return
 			}
 		}
 	}()

cmd/kod/internal/watcher_test.go

@@ -1,6 +1,7 @@
 package internal
 
 import (
+	"context"
 	"errors"
 	"testing"
 	"time"
@@ -25,6 +26,7 @@ func TestWatcherNormal(t *testing.T) {
 
 	w.EXPECT().Events().Return(events).AnyTimes()
 	w.EXPECT().Errors().Return(nil).AnyTimes()
+	w.EXPECT().Context().Return(context.Background()).AnyTimes()
 
 	time.AfterFunc(time.Second, func() {
 		close(events)
@@ -47,6 +49,7 @@ func TestWatcherNotExistFile(t *testing.T) {
 
 	w.EXPECT().Events().Return(events).AnyTimes()
 	w.EXPECT().Errors().Return(nil).AnyTimes()
+	w.EXPECT().Context().Return(context.Background()).AnyTimes()
 
 	time.AfterFunc(time.Second, func() {
 		close(events)
@@ -69,6 +72,7 @@ func TestWatcherAddDir(t *testing.T) {
 
 	w.EXPECT().Events().Return(events).AnyTimes()
 	w.EXPECT().Errors().Return(nil).AnyTimes()
+	w.EXPECT().Context().Return(context.Background()).AnyTimes()
 
 	time.AfterFunc(time.Second, func() {
 		close(events)
@@ -92,6 +96,7 @@ func TestWatcherRemoveDir(t *testing.T) {
 
 	w.EXPECT().Events().Return(events).AnyTimes()
 	w.EXPECT().Errors().Return(nil).AnyTimes()
+	w.EXPECT().Context().Return(context.Background()).AnyTimes()
 
 	time.AfterFunc(time.Second, func() {
 		close(events)
@@ -114,6 +119,7 @@ func TestWatcherNonGofile(t *testing.T) {
 
 	w.EXPECT().Events().Return(events).AnyTimes()
 	w.EXPECT().Errors().Return(nil).AnyTimes()
+	w.EXPECT().Context().Return(context.Background()).AnyTimes()
 
 	time.AfterFunc(time.Second, func() {
 		close(events)
@@ -136,6 +142,7 @@ func TestWatcherInvalidEvents(t *testing.T) {
 
 	w.EXPECT().Events().Return(events).AnyTimes()
 	w.EXPECT().Errors().Return(nil).AnyTimes()
+	w.EXPECT().Context().Return(context.Background()).AnyTimes()
 
 	time.AfterFunc(time.Second, func() {
 		close(events)
@@ -154,6 +161,7 @@ func TestWatcherErrors(t *testing.T) {
 	events <- fsnotify.ErrEventOverflow
 	w.EXPECT().Events().Return(nil).AnyTimes()
 	w.EXPECT().Errors().Return(events).AnyTimes()
+	w.EXPECT().Context().Return(context.Background()).AnyTimes()
 
 	Watch(w, ".", func(fsnotify.Event) {}, true)
 }
@@ -168,6 +176,7 @@ func TestWatcherAddFail(t *testing.T) {
 	events <- fsnotify.ErrEventOverflow
 	w.EXPECT().Events().Return(nil).AnyTimes()
 	w.EXPECT().Errors().Return(events).AnyTimes()
+	w.EXPECT().Context().Return(context.Background()).AnyTimes()
 
 	Watch(w, ".", func(fsnotify.Event) {}, true)
 }
@@ -181,6 +190,7 @@ func TestWatcherErrorsClose(t *testing.T) {
 	events := make(chan error, 2)
 	w.EXPECT().Events().Return(nil).AnyTimes()
 	w.EXPECT().Errors().Return(events).AnyTimes()
+	w.EXPECT().Context().Return(context.Background()).AnyTimes()
 
 	time.AfterFunc(time.Second, func() {
 		close(events)
@@ -203,6 +213,7 @@ func TestWatcherFilterGenPath(t *testing.T) {
 
 	w.EXPECT().Events().Return(events).AnyTimes()
 	w.EXPECT().Errors().Return(nil).AnyTimes()
+	w.EXPECT().Context().Return(context.Background()).AnyTimes()
 
 	time.AfterFunc(time.Second, func() {
 		close(events)

internal/singleton/singleton.go

@@ -7,7 +7,7 @@ import (
 // Singleton[T any] provides a common structure for components,
 type Singleton[T any] struct {
 	instances map[string]*T
-	mu        sync.Mutex
+	mu        sync.RWMutex
 }
 
 // NewSingleton creates a new Singleton[T].
@@ -19,15 +19,20 @@ func NewSingleton[T any]() *Singleton[T] {
 
 // Get returns the instance of the component with the given name.
 func (s *Singleton[T]) Get(name string, initFn func() *T) *T {
-	s.mu.Lock()
-	defer s.mu.Unlock()
+	s.mu.RLock()
 
 	if instance, exists := s.instances[name]; exists {
+		s.mu.RUnlock()
 		return instance
 	}
 
+	s.mu.RUnlock()
+
 	instance := initFn()
+
+	s.mu.Lock()
 	s.instances[name] = instance
+	s.mu.Unlock()
 
 	return instance
 }