Merge remote-tracking branch 'vilsol/main' into update-upstream

Author: huacnlee

.github/workflows/push.yml

@@ -5,27 +5,21 @@ permissions: read-all
 on: [push, pull_request]
 
 env:
-  GO_VERSION: '1.21.0'
+  GO_VERSION: "1.21.0"
 
 jobs:
   lint-backend:
     name: Lint Backend
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go
-        uses: actions/setup-go@v2
-        with:
-          go-version: ${{ env.GO_VERSION }}
-          stable: false
+      - uses: actions/checkout@v4
 
-      - name: Check out code
-        uses: actions/checkout@v2
+      - uses: actions/setup-go@v5
+        with:
+          go-version-file: "go.mod"
 
-      - name: Lint
-        uses: golangci/golangci-lint-action@v2
+      - uses: golangci/golangci-lint-action@v6
         with:
-          skip-pkg-cache: true
-          skip-build-cache: true
           args: --timeout 5m
 
   lint-frontend:
@@ -46,14 +40,11 @@ jobs:
     name: Test
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go
-        uses: actions/setup-go@v2
-        with:
-          go-version: ${{ env.GO_VERSION }}
-          stable: false
+      - uses: actions/checkout@v4
 
-      - name: Check out code
-        uses: actions/checkout@v2
+      - uses: actions/setup-go@v5
+        with:
+          go-version-file: "go.mod"
 
       - name: Test
         run: go test -v ./...
@@ -64,14 +55,11 @@ jobs:
     needs:
       - lint-backend
     steps:
-      - name: Set up Go
-        uses: actions/setup-go@v2
-        with:
-          go-version: ${{ env.GO_VERSION }}
-          stable: false
+      - uses: actions/checkout@v4
 
-      - name: Check out
-        uses: actions/checkout@v2
+      - uses: actions/setup-go@v5
+        with:
+          go-version-file: "go.mod"
 
       - name: Build wasm
         run: go build -ldflags="-s -w" -v -o build.wasm ./wasm
@@ -94,5 +82,5 @@ jobs:
       - name: Build frontend
         working-directory: frontend
         run: |
-          bun install 
+          bun install
           bun run build

.github/workflows/release.yml

@@ -6,18 +6,14 @@ on:
       - v*
 
 env:
-  GO_VERSION: '1.21.0'
+  GO_VERSION: "1.21.0"
 
 jobs:
   release:
     name: Release
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go
-        uses: actions/setup-go@v2
-        with:
-          go-version: ${{ env.GO_VERSION }}
-          stable: false
+      - uses: actions/checkout@v4
 
       - name: Check out
         uses: actions/checkout@v2
@@ -38,9 +34,8 @@ jobs:
           bun run build
           ls -lah build
 
-      - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
+      - uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./frontend/build
-          exclude_assets: ''
+          exclude_assets: ""

.golangci.yml

@@ -1,30 +1,87 @@
 linters-settings:
   wrapcheck:
+    ignoreSigs:
+      - .Errorf(
+      - errors.New(
+      - errors.Unwrap(
+      - .WithMessage(
+      - .WithMessagef(
+      - .WithStack(
+      - github.com/labstack/echo/v4.Context
+
     ignorePackageGlobs:
       - github.com/vilsol/timeless-jewels/*
 
+  govet:
+    disable:
+      - shadow
+
+  gocritic:
+    disabled-checks:
+      - ifElseChain
+
+  gci:
+    custom-order: true
+    sections:
+      - standard
+      - default
+      - prefix(github.com/vilsol/timeless-jewels)
+      - blank
+      - dot
+
+  sloglint:
+    attr-only: true
+    context: scope
+    forbidden-keys:
+      - time
+      - level
+      - msg
+      - source
+
+  spancheck:
+    checks:
+      - end
+      - record-error
+      - set-status
+
+
+issues:
+  exclude-files:
+    - ./generated/generated.go
+    - ./generated/models_gen.go
+  exclude-dirs:
+    - ./generated/
+  exclude:
+    - should pass the context parameter
+
 linters:
   disable-all: true
   enable:
-    - deadcode
     - errcheck
     - gosimple
     - govet
     - ineffassign
     - staticcheck
-    - structcheck
     - typecheck
     - unused
-    - varcheck
     - bidichk
     - contextcheck
     - durationcheck
     - errorlint
-    - goconst
     - goimports
     - revive
-    - ifshort
     - misspell
     - prealloc
     - whitespace
     - wrapcheck
+    - gci
+    - gocritic
+    - gofumpt
+    - nonamedreturns
+    - inamedparam
+    - sloglint
+    - spancheck
+    - intrange
+    - copyloopvar
+    - fatcontext
+    - canonicalheader

Makefile

@@ -2,4 +2,4 @@
 wasm:
 	GOOS=js GOARCH=wasm go build -ldflags="-s -w" -v -o frontend/static/calculator.wasm ./wasm
 dev: wasm
-	cd frontend; bun run dev
+	cd frontend; bun install; bun run dev

README.md

@@ -4,4 +4,17 @@ A simple timeless jewel calculator with a skill tree view
 
 Hosted Version: [https://vilsol.github.io/timeless-jewels](https://vilsol.github.io/timeless-jewels)
 
-Uses data extracted with https://github.com/Vilsol/go-pob-data
+Uses data extracted with https://github.com/Vilsol/go-pob-data
+
+## Updates to new leagues
+
+Whenever a new league is coming, the passive tree might get updated.
+**But** it is not guaranteed to contain correct data until a game download is available.
+
+Specifically, this project depends on the following data tables:
+
+* Alternate Passive Additions
+* Alternate Passive Skills
+* Passive Skills
+* Stats
+* Translations

calculator/main.go

@@ -76,16 +76,16 @@ func ReverseSearch(passiveIDs []uint32, statIDs []uint32, timelessJewelType data
 
 	results := make(map[uint32]map[uint32]map[uint32]uint32)
 
-	min := data.TimelessJewelSeedRanges[timelessJewelType].Min
-	max := data.TimelessJewelSeedRanges[timelessJewelType].Max
+	seedMin := data.TimelessJewelSeedRanges[timelessJewelType].Min
+	seedMax := data.TimelessJewelSeedRanges[timelessJewelType].Max
 
 	if data.TimelessJewelSeedRanges[timelessJewelType].Special {
-		min /= 20
-		max /= 20
+		seedMin /= 20
+		seedMax /= 20
 	}
 
 	rng := random.NewRNG()
-	for seed := min; seed <= max; seed++ {
+	for seed := seedMin; seed <= seedMax; seed++ {
 		realSeed := seed
 		if data.TimelessJewelSeedRanges[timelessJewelType].Special {
 			realSeed *= 20

calculator/tree_manager.go

@@ -96,7 +96,7 @@ func (a *AlternateTreeManager) ReplacePassiveSkill(rng *random.NumberGenerator)
 
 	elements := min(uint32(len(rolledAlternatePassiveSkill.StatsKeys)), 4)
 	alternatePassiveSkillStatRolls := make(map[uint32]uint32, elements)
-	for i := uint32(0); i < elements; i++ {
+	for i := range elements {
 		alternatePassiveSkillStatRolls[i] = rolledAlternatePassiveSkill.GetStatMinMax(true, i)
 
 		if rolledAlternatePassiveSkill.GetStatMinMax(false, i) > rolledAlternatePassiveSkill.GetStatMinMax(true, i) {
@@ -130,7 +130,7 @@ func (a *AlternateTreeManager) RollAdditions(minimumAdditions uint32, maximumAdd
 
 	alternatePassiveAdditionInformations := make([]data.AlternatePassiveAdditionInformation, 0)
 
-	for i := uint32(0); i < additionCountRoll; i++ {
+	for range additionCountRoll {
 		var rolledAlternatePassiveAddition *data.AlternatePassiveAddition
 
 		for rolledAlternatePassiveAddition == nil {
@@ -139,7 +139,7 @@ func (a *AlternateTreeManager) RollAdditions(minimumAdditions uint32, maximumAdd
 
 		elements := min(uint32(len(rolledAlternatePassiveAddition.StatsKeys)), 2)
 		alternatePassiveAdditionStatRolls := make(map[uint32]uint32, elements)
-		for j := uint32(0); j < elements; j++ {
+		for j := range elements {
 			alternatePassiveAdditionStatRolls[j] = rolledAlternatePassiveAddition.GetStatMinMax(true, j)
 
 			if rolledAlternatePassiveAddition.GetStatMinMax(false, j) > rolledAlternatePassiveAddition.GetStatMinMax(true, j) {
@@ -155,10 +155,3 @@ func (a *AlternateTreeManager) RollAdditions(minimumAdditions uint32, maximumAdd
 
 	return alternatePassiveAdditionInformations
 }
-
-func min(a uint32, b uint32) uint32 {
-	if a < b {
-		return a
-	}
-	return b
-}