Test TinyGo on 1.24 and update golangci-lint

Restore testing TinyGo on Go v1.24, as recent releases support it. Also
upgrade `golangci-lint` to 2.1.5, which requires a new config file
format, and fix the issues it identifies.

Author: theory

.github/workflows/ci.yml

@@ -21,10 +21,9 @@ jobs:
         run: make test
       - name: Setup TinyGo
         uses: acifani/setup-tinygo@v2
-        with: { tinygo-version: 0.34.0 }
+        with: { tinygo-version: 0.37.0 }
       - name: Test WASM
         run: make wasm
-        if: matrix.go != '1.24'
   lint:
     name: 📊 Lint and Cover
     runs-on: ubuntu-latest

.golangci.yaml

@@ -1,129 +1,71 @@
-# Options for analysis running.
-run:
-  # Timeout for analysis, e.g. 30s, 5m.
-  # Default: 1m
-  timeout: 5m
-  # Which dirs to skip: issues from them won't be reported.
-  # Can use regexp here: `generated.*`, regexp is applied on full path,
-  # including the path prefix if one is set.
-  # Default value is empty list,
-  # but default dirs are skipped independently of this option's value (see skip-dirs-use-default).
-  # "/" will be replaced by current OS file path separator to properly work on Windows.
-  # skip-dirs: []
-  # Which files to skip: they will be analyzed, but issues from them won't be reported.
-  # Default value is empty list,
-  # but there is no need to include all autogenerated files,
-  # we confidently recognize autogenerated files.
-  # If it's not please let us know.
-  # "/" will be replaced by current OS file path separator to properly work on Windows.
-  # skip-files: []
-
-# output configuration options
-# output:
-# Format: colored-line-number|line-number|json|colored-tab|tab|checkstyle|code-climate|junit-xml|github-actions|teamcity
-#
-# Multiple can be specified by separating them by comma, output can be provided
-# for each of them by separating format name and path by colon symbol.
-# Output path can be either `stdout`, `stderr` or path to the file to write to.
-# Example: "checkstyle:report.xml,json:stdout,colored-line-number"
-#
-# Default: colored-line-number
-# formats: colored-line-number
-
-# Re-enable excluded linters. Restores missing documentation checks, among
-# others.
-# https://golangci-lint.run/usage/false-positives/#default-exclusions
-# https://github.com/golangci/golangci-lint/issues/456#issuecomment-986837325
-issues:
-  exclude-use-default: false
-  exclude-rules:
-    # Exclude some linters from running on tests files.
-    - path: _test\.go
-      linters:
-        - funlen
-        - goerr113
-        - err113
-        - wrapcheck
-        - maintidx
-    - path: registry/funcs\.go
-      linters:
-        - err113
-
+version: "2"
 linters:
-  # Enable specific linter
-  # https://golangci-lint.run/usage/linters/#enabled-by-default
-  # enable: []
-
-  # Enable all available linters.
-  # Default: false
-  enable-all: true
-
-  # Disable specific linter
-  # https://golangci-lint.run/usage/linters/#disabled-by-default
+  default: all
   disable:
-    # Deprecated
-    - exportloopref # Replaced by copyloopvar
-
     # Too strict.
+    - cyclop # redundant, covered by gocyclo
     - depguard
-    - testpackage
-    - varnamelen
     - exhaustruct
-    - cyclop # redundant, covered by gocyclo
+    - funcorder # new, too much to move around
+    - nestif # redundant, covered by gocyclo
     - nlreturn
+    - testpackage
+    - varnamelen
     - wsl
-    - nestif # redundant, covered by gocyclo
-
-  # Enable presets.
-  # https://golangci-lint.run/usage/linters
-  presets: []
-
-  # Run only fast linters from enabled linters set (first run won't be fast)
-  # Default: false
-  # fast: true
-
-linters-settings:
-  errcheck:
-    check-type-assertions: false
-    check-blank: false
-    disable-default-exclusions: false
-    exclude-functions:
-      - fmt.Fprintf
-      - fmt.Fprintln
-      - fmt.Fprint
-  funlen:
-    # Ignore comments when counting lines.
-    ignore-comments: true
-  exhaustive:
-    default-signifies-exhaustive: true
-  ireturn:
-    # ireturn does not allow using `allow` and `reject` settings at the same time.
-    # Both settings are lists of the keywords and regular expressions matched to interface or package names.
-    # keywords:
-    # - `empty` for `any`
-    # - `error` for errors
-    # - `stdlib` for standard library
-    # - `anon` for anonymous interfaces
-    # - `generic` for generic interfaces added in go 1.18
-
-    # By default, it allows using errors, empty interfaces, anonymous interfaces,
-    # and interfaces provided by the standard library.
-    allow:
-      - anon
-      - error
-      - empty
-      - stdlib
-      - generic
-      - spec\.JSONPathValue
-      - spec\.FunctionExprArg
-      - spec\.Selector
-      - spec\.BasicExpr
-      - spec\.CompVal
-      # You can specify idiomatic endings for interface
-      # - (or|er)$
-    # reject-list of interfaces
-    # reject:
-    #   - github.com\/user\/package\/v4\.Type
-  dupword:
-    ignore:
-      - R.
+  settings:
+    dupword:
+      ignore:
+        - R.
+    errcheck:
+      disable-default-exclusions: false
+      check-type-assertions: false
+      check-blank: false
+      exclude-functions:
+        - fmt.Fprintf
+        - fmt.Fprintln
+        - fmt.Fprint
+    exhaustive:
+      default-signifies-exhaustive: true
+    funlen:
+      ignore-comments: true
+    ireturn:
+      allow:
+        - anon
+        - error
+        - empty
+        - stdlib
+        - generic
+        - spec\.JSONPathValue
+        - spec\.FunctionExprArg
+        - spec\.Selector
+        - spec\.BasicExpr
+        - spec\.CompVal
+  exclusions:
+    generated: lax
+    rules:
+      # Exclude some linters from running on tests files.
+      - linters:
+          - err113
+          - funlen
+          - maintidx
+          - wrapcheck
+        path: _test\.go
+      - linters:
+          - err113
+        path: registry/funcs\.go
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gci
+    - gofmt
+    - gofumpt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

CHANGELOG.md

@@ -14,6 +14,11 @@ All notable changes to this project will be documented in this file. It uses the
 *   Fixed the panic messages from `spec.Slice` to properly report coming from
     `Slice` and not `NewSlice`.
 
+### 📔 Notes
+
+*   Upgraded to and fixed issues reported by `golangci-lint` v2.1.5.
+*   Added TinyGo testing on Go v1.24.
+
   [v0.4.1]: https://github.com/theory/jsonpath/compare/v0.4.0...v0.4.1
 
 ## [v0.4.0] — 2025-01-15

Makefile

@@ -38,7 +38,7 @@ brew-lint-depends:
 
 .PHONY: debian-lint-depends # Install linting tools on Debian
 debian-lint-depends:
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b /usr/bin v1.63.4
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b /usr/bin v2.1.5
 
 .PHONY: install-generators # Install Go code generators
 install-generators:

parser/parse.go

@@ -304,10 +304,7 @@ func (p *parser) parseLogicalOrExpr() (spec.LogicalOr, error) {
 
 	ands = append(ands, land)
 	lex.scanBlankSpace()
-	for {
-		if lex.r != '|' {
-			break
-		}
+	for lex.r == '|' {
 		lex.scan()
 		next := lex.scan()
 		if next.tok != '|' {
@@ -334,10 +331,7 @@ func (p *parser) parseLogicalAndExpr() (spec.LogicalAnd, error) {
 	ors := []spec.BasicExpr{expr}
 	lex := p.lex
 	lex.scanBlankSpace()
-	for {
-		if lex.r != '&' {
-			break
-		}
+	for lex.r == '&' {
 		lex.scan()
 		next := lex.scan()
 		if next.tok != '&' {

spec/filter.go

@@ -131,7 +131,7 @@ func (e *ExistExpr) testFilter(current, root any) bool {
 
 // writeTo writes a string representation of e to buf.
 func (e *ExistExpr) writeTo(buf *strings.Builder) {
-	buf.WriteString(e.PathQuery.String())
+	buf.WriteString(e.String())
 }
 
 // NonExistExpr represents a nonexistence expression.
@@ -147,7 +147,7 @@ func Nonexistence(q *PathQuery) *NonExistExpr {
 // writeTo writes a string representation of ne to buf.
 func (ne NonExistExpr) writeTo(buf *strings.Builder) {
 	buf.WriteRune('!')
-	buf.WriteString(ne.PathQuery.String())
+	buf.WriteString(ne.String())
 }
 
 // testFilter returns true if ne.Query selects no results from current or

spec/function.go

@@ -358,7 +358,7 @@ func (fq *FilterQueryExpr) ResultType() FuncType {
 
 // writeTo writes a string representation of fq to buf.
 func (fq *FilterQueryExpr) writeTo(buf *strings.Builder) {
-	buf.WriteString(fq.PathQuery.String())
+	buf.WriteString(fq.String())
 }
 
 // FunctionExpr represents a function expression, consisting of a named

spec/selector.go

@@ -101,7 +101,7 @@ func (n Name) writeNormalizedTo(buf *strings.Builder) {
 			buf.WriteString(`\\`)
 		case '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07', '\x0b', '\x0e', '\x0f':
 			// "00"-"07", "0b", "0e"-"0f"
-			buf.WriteString(fmt.Sprintf(`\u000%x`, r))
+			fmt.Fprintf(buf, `\u000%x`, r)
 		default:
 			buf.WriteRune(r)
 		}
@@ -493,7 +493,7 @@ func (f *FilterSelector) SelectLocated(current, root any, parent NormalizedPath)
 // [Select] as it iterates over nodes, and always passes the root value($) for
 // filter expressions that reference it.
 func (f *FilterSelector) Eval(node, root any) bool {
-	return f.LogicalOr.testFilter(node, root)
+	return f.testFilter(node, root)
 }
 
 // isSingular returns false because Filters can return more than one value.