CHORE: 0.2.0 pre-release (#30)

Author: dmkjfs

Makefile

@@ -11,7 +11,7 @@ build:
 test:
 	go test ./...
 
-coverage:
+cov:
 	go test -coverprofile=.coverage ./...
 
 clean:

assets/components.json

@@ -1,3 +1,4 @@
 {
-    "tests": "Tests"
+    "^([Tt]ests|.*_test|test_.*)$": "Tests",
+    "^(.*[Cc]ontrollers?)$": "Controllers"
 }

assets/extensions.json assets/languages.jsonassets/extensions.json renamed to assets/languages.json

@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/statloc/core/internal/retrievers/mapping"
+	"github.com/statloc/core/internal/mapping"
 )
 
 type MappingSuite struct {
@@ -19,11 +19,11 @@ type MappingSuite struct {
 }
 
 func (s *MappingSuite) SetupSuite() {
-    rawExtensions, _ := os.ReadFile(filepath.Join("..", "..", "..", "assets", "extensions.json"))
+    rawExtensions, _ := os.ReadFile(filepath.Join("..", "..", "assets", "languages.json"))
     s.extensions = string(rawExtensions)
-    rawComponents, _ := os.ReadFile(filepath.Join("..", "..", "..", "assets", "components.json"))
+    rawComponents, _ := os.ReadFile(filepath.Join("..", "..", "assets", "components.json"))
     s.components = string(rawComponents)
-    rawBroken, _ := os.ReadFile(filepath.Join("..", "..", "..", "testdata", "broken.json.txt"))
+    rawBroken, _ := os.ReadFile(filepath.Join("..", "..", "testdata", "broken.json.txt"))
     s.broken = string(rawBroken)
 }
 
@@ -41,7 +41,7 @@ func (s *MappingSuite) TestLoadMapping() {
     )
 
     assert.NotNil(s.T(), mapping.Components)
-    assert.NotNil(s.T(), mapping.Extensions)
+    assert.NotNil(s.T(), mapping.Languages)
 }
 
 func TestMappingSuite(t *testing.T) {

internal/retrievers/mapping/errors.go internal/mapping/errors.gointernal/retrievers/mapping/errors.go renamed to internal/mapping/errors.go

@@ -6,7 +6,7 @@ import (
 )
 
 var (
-    Extensions ExtensionsMapping
+    Languages  LanguagesMapping
     Components ComponentsMapping
 )
 
@@ -19,8 +19,8 @@ func LoadJSON[mapType any](content string) mapType {
     return mapping
 }
 
-func Load(rawComponents string, rawExtensions string) (ComponentsMapping, ExtensionsMapping) {
+func Load(rawComponents string, rawExtensions string) (ComponentsMapping, LanguagesMapping) {
     Components = LoadJSON[ComponentsMapping](rawComponents)
-    Extensions = LoadJSON[ExtensionsMapping](rawExtensions)
-    return Components, Extensions
+    Languages = LoadJSON[LanguagesMapping](rawExtensions)
+    return Components, Languages
 }

…ernal/retrievers/mapping/mapping_test.go internal/mapping/mapping_test.gointernal/retrievers/mapping/mapping_test.go renamed to internal/mapping/mapping_test.go internal/retrievers/mapping/mapping_test.go renamed to internal/mapping/mapping_test.go

@@ -5,5 +5,5 @@ type (
     ComponentsMapping = map[string]string
 
     // file extension as as a key, category(language or file type) name as a value
-    ExtensionsMapping = map[string]string
+    LanguagesMapping = map[string]string
 )

internal/retrievers/mapping/retriever.go internal/mapping/retriever.gointernal/retrievers/mapping/retriever.go renamed to internal/mapping/retriever.go

@@ -0,0 +1,13 @@
+package matching
+
+import "regexp"
+
+func FindMatch[valueType any](s string, mapping map[string]valueType) (value valueType, exists bool) {
+    for key, value := range mapping {
+        matches, _ := regexp.MatchString(key, s)
+        if matches {
+            return value, true
+        }
+    }
+    return
+}

internal/retrievers/mapping/types.go internal/mapping/types.gointernal/retrievers/mapping/types.go renamed to internal/mapping/types.go

@@ -0,0 +1,43 @@
+package matching_test
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/suite"
+
+	"github.com/statloc/core/internal/matching"
+)
+
+type MatchingSuite struct {
+    suite.Suite
+    mapping      map[string]string
+    wrongMapping map[string]string
+}
+
+func (s *MatchingSuite) SetupSuite() {
+    s.mapping = map[string]string{
+        "^wrong$": "1",
+        "^some_strin.?$": "2",
+        "^some_[Ss].*$": "3",
+    }
+    s.wrongMapping = map[string]string{
+        "^wrong$": "1",
+        "^some_strin.?$": "2",
+    }
+}
+
+func (s *MatchingSuite) TestFindMatch() {
+    response, exists := matching.FindMatch[string]("some_String", s.mapping)
+
+    assert.True(s.T(), exists)
+    assert.Equal(s.T(), "3", response)
+
+    _, exists = matching.FindMatch[string]("some_String", s.wrongMapping)
+
+    assert.False(s.T(), exists)
+}
+
+func TestMatchingSuite(t *testing.T) {
+	suite.Run(t, new(MatchingSuite))
+}

internal/matching/matching.go

@@ -1,11 +1,9 @@
 package tree
 
-import "fmt"
-
 type PathError struct {
-	Path string
+	Message string
 }
 
 func (e *PathError) Error() string {
-	return fmt.Sprintf("%s is not a directory", e.Path)
+	return e.Message
 }