chore: ci & dev environment improvements (#13)

* chore: dev environment

* ci: improved ci

* feat: update go version to 1.22 for flake

* docs: added coverage status badge

* fix: minor code refactors

Author: Oudwins

.envrc

@@ -0,0 +1 @@
+use flake

.github/workflows/ci.yml

@@ -0,0 +1,40 @@
+name: ci
+
+on:
+  push:
+    branches: "**"
+  pull_request:
+    branches: "**"
+  workflow_dispatch:
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        go-version: [1.21.x, 1.22.x]
+        os: [ubuntu-latest]
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ matrix.go-version }}
+      # - name: Set up Make
+      #   run: sudo apt-get install make
+      - name: Run tests
+        #run: make test
+        run: go test ./...
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: 1.22.x
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v4
+        with:
+          version: latest

.github/workflows/test.yaml

@@ -0,0 +1,31 @@
+name: Coverage
+
+on:
+  push:
+    branches: [master]
+  workflow_dispatch:
+
+jobs:
+  coverage:
+    strategy:
+      matrix:
+        go-version: [1.21.x, 1.22.x]
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ matrix.go-version }}
+
+      - name: Test
+        run: go test -race -covermode=atomic -coverprofile="profile.cov" ./...
+
+      - name: Send Coverage
+        if: matrix.os == 'ubuntu-latest' && matrix.go-version == '1.22.x'
+        uses: shogo82148/actions-goveralls@v1
+        with:
+          path-to-profile: profile.cov

.github/workflows/testCoverage.yaml

@@ -0,0 +1,6 @@
+tailwind-merge/
+playground
+.idea
+.direnv
+*.cov
+*.out

.gitignore

@@ -0,0 +1,3 @@
+assets/
+*.md
+docs/

.goignore

@@ -1,4 +1,11 @@
-
+test-watch:
+	@gotestsum --format=short-verbose --watch
 
 test:
-	go test -v -cover ./pkg/twmerge...
+	@gotestsum --format=short-verbose
+
+test-cover:
+	@CGO_ENABLED=1 gotestsum -- -race -covermode=atomic -coverprofile="profile.cov" ./... && go tool cover -func=profile.cov | grep -v "100.0%"
+
+lint:
+	@go run github.com/golangci/golangci-lint/cmd/golangci-lint@latest run

Makefile

@@ -10,6 +10,7 @@
 <a href="https://pkg.go.dev/github.com/Oudwins/tailwind-merge-go"><img src="https://pkg.go.dev/badge/github.com//github.com/Oudwins/tailwind-merge-go.svg" alt="Go Reference" /></a>
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 [![Go Report Card](https://goreportcard.com/badge/Oudwins/tailwind-merge-go)](https://goreportcard.com/report/github.com/Oudwins/tailwind-merge-go)
+[![Coverage Status](https://coveralls.io/repos/github/Oudwins/tailwind-merge-go/badge.svg?branch=master)](https://coveralls.io/github/Oudwins/tailwind-merge-go?branch=master)
 
 Utility function to efficiently merge Tailwind CSS classes in Golang without style conflicts. This library aims to be as close as possible to a 1:1 copy of the original [dcastil/tailwind-merge](https://github.com/dcastil/tailwind-merge/) library written in javascript.
 

README.md

@@ -0,0 +1,44 @@
+{
+  description = "A Nix-flake-based Go 1.22 development environment";
+
+  inputs.nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.*.tar.gz";
+
+  outputs = { self, nixpkgs }:
+    let
+      goVersion = 22; # Change this to update the whole stack
+
+      supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
+      forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f {
+        pkgs = import nixpkgs {
+          inherit system;
+          overlays = [ self.overlays.default ];
+        };
+      });
+    in
+    {
+      overlays.default = final: prev: {
+        go = final."go_1_${toString goVersion}";
+      };
+
+      devShells = forEachSupportedSystem ({ pkgs }: {
+        default = pkgs.mkShell {
+          packages = with pkgs; [
+            # go (version is specified by overlay)
+            go
+
+            # goimports, godoc, etc.
+            gotools
+
+            # https://github.com/golangci/golangci-lint
+            golangci-lint
+
+            # Tests summaries
+            gotestsum
+          ];
+          shellHook = ''
+            export CGO_ENABLED="0" # disables cgo. Not sure why this fixes debugger on tests in vscode
+          '';
+        };
+      });
+    };
+}

flake.lock

@@ -26,7 +26,7 @@ func MakeGetClassGroupId(conf *TwMergeConfig) GetClassGroupIdfn {
 			}
 		}
 
-		if classMap.Validators != nil && len(classMap.Validators) > 0 {
+		if len(classMap.Validators) > 0 {
 			remainingClass := strings.Join(classParts[i:], string(conf.ClassSeparator))
 
 			for _, validator := range classMap.Validators {

flake.nix

@@ -528,9 +528,9 @@ func TestTailwindMerge(t *testing.T) {
 		got := Merge(tc.in)
 		if areStringsEqual(got, tc.out) == false {
 			t.Errorf("twMerge failed -> | in: %v | %v != %v", tc.in, got, tc.out)
-		} else {
+		} /* else {
 			// t.Log("twMerge passed -> | in: ", tc.in, " | out: ", got, " | expected: ", tc.out)
-		}
+		} */
 	}
 }
 

pkg/twmerge/class-utils.go

@@ -96,18 +96,12 @@ func IsNumber(val string) bool {
 
 func IsInteger(val string) bool {
 	_, err := strconv.Atoi(val)
-	if err != nil {
-		return false
-	}
-	return true
+	return err == nil
 }
 
 func IsFloat(val string) bool {
 	_, err := strconv.ParseFloat(val, 64)
-	if err != nil {
-		return false
-	}
-	return true
+	return err == nil
 }
 
 func IsLengthOnly(val string) bool {