Merge pull request #1 from stepzen-dev/go120

chore: update code to go 1.20

Author: ddebrunner

.github/workflows/test.yml

@@ -4,23 +4,23 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.16.x]
+        go-version: [1.20.3]
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
-    - name: Install Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: ${{ matrix.go-version }}
-    - name: Checkout code
-      uses: actions/checkout@v2
-    - name: Install dependencies
-      run: |
-        go get -u honnef.co/go/tools/cmd/staticcheck@latest
-        go get -u golang.org/x/tools/cmd/goimports
-    - name: Run staticcheck
-      run: staticcheck ./...
-    - name: Check code formatting
-      run: test -z $(goimports -l .)
-    - name: Run Test
-      run: go test ./...
+      - name: Install Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: ${{ matrix.go-version }}
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Install dependencies
+        run: |
+          go install honnef.co/go/tools/cmd/staticcheck@latest
+          go install golang.org/x/tools/cmd/goimports@latest
+      - name: Run staticcheck
+        run: which staticcheck ; staticcheck ./...
+      - name: Check code formatting
+        run: test -z $(goimports -l .)
+      - name: Run Test
+        run: go test ./...

example_exts_test.go

@@ -7,9 +7,10 @@ package jsonata_test
 import (
 	"fmt"
 	"log"
-	"strings"
 
 	jsonata "github.com/blues/jsonata-go"
+	"golang.org/x/text/cases"
+	"golang.org/x/text/language"
 )
 
 //
@@ -24,7 +25,10 @@ import (
 // arguments (the second argument must be an error).
 var exts = map[string]jsonata.Extension{
 	"titlecase": {
-		Func: strings.Title,
+		Func: func(v string) any {
+			caser := cases.Title(language.English)
+			return caser.String(v)
+		},
 	},
 }
 

go.mod

@@ -1,3 +1,5 @@
 module github.com/blues/jsonata-go
 
-go 1.16
+go 1.20
+
+require golang.org/x/text v0.9.0

go.sum

@@ -0,0 +1,2 @@
+golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=

jlib/jlib.go

@@ -7,18 +7,11 @@ package jlib
 
 import (
 	"fmt"
-	"math/rand"
 	"reflect"
-	"time"
 
 	"github.com/blues/jsonata-go/jtypes"
 )
 
-func init() {
-	// Seed random numbers for Random() and Shuffle().
-	rand.Seed(time.Now().UnixNano())
-}
-
 var typeBool = reflect.TypeOf((*bool)(nil)).Elem()
 var typeCallable = reflect.TypeOf((*jtypes.Callable)(nil)).Elem()
 var typeString = reflect.TypeOf((*string)(nil)).Elem()

jlib/number.go

@@ -116,7 +116,7 @@ func Random() float64 {
 // It does this by converting back and forth to strings to
 // avoid floating point rounding errors, e.g.
 //
-//     4.525 * math.Pow10(2) returns 452.50000000000006
+//	4.525 * math.Pow10(2) returns 452.50000000000006
 func multByPow10(x float64, n int) float64 {
 	if n == 0 || math.IsNaN(x) || math.IsInf(x, 0) {
 		return x

jlib/string.go

@@ -231,9 +231,9 @@ func Join(values reflect.Value, separator jtypes.OptionalString) (string, error)
 // regular expression in the source string. Each object in the
 // array has the following fields:
 //
-//     match - the substring matched by the regex
-//     index - the starting offset of this match
-//     groups - any captured groups for this match
+//	match - the substring matched by the regex
+//	index - the starting offset of this match
+//	groups - any captured groups for this match
 //
 // The optional third argument specifies the maximum number
 // of matches to return. By default, Match returns all matches.

jparse/doc.go

@@ -6,7 +6,7 @@
 // syntax trees. Most clients will not need to work with
 // this package directly.
 //
-// Usage
+// # Usage
 //
 // Call the Parse function, passing a JSONata expression as
 // a string. If an error occurs, it will be of type Error.

jsonata-test/main.go

@@ -5,7 +5,6 @@ import (
 	"flag"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"reflect"
@@ -179,12 +178,13 @@ func runTest(tc testCase, dataDir string, path string) (bool, error) {
 // loadTestExprFile loads a jsonata expression from a file and returns the
 // expression
 // For example, one test looks like this
-// {
-//     "expr-file": "case000.jsonata",
-//     "dataset": null,
-//     "bindings": {},
-//     "result": 2
-// }
+//
+//	{
+//	    "expr-file": "case000.jsonata",
+//	    "dataset": null,
+//	    "bindings": {},
+//	    "result": 2
+//	}
 //
 // We want to load the expression from case000.jsonata so we can use it
 // as an expression in the test case
@@ -193,7 +193,7 @@ func loadTestExprFile(testPath string, exprFileName string) (string, error) {
 	splitPath[len(splitPath)-1] = exprFileName
 	exprFilePath := strings.Join(splitPath, "/")
 
-	content, err := ioutil.ReadFile(exprFilePath)
+	content, err := os.ReadFile(exprFilePath)
 	if err != nil {
 		return "", err
 	}
@@ -323,7 +323,7 @@ func equalResults(x, y interface{}) bool {
 }
 
 func readJSONFile(path string, dest interface{}) error {
-	b, err := ioutil.ReadFile(path)
+	b, err := os.ReadFile(path)
 	if err != nil {
 		return fmt.Errorf("ReadFile %s: %s", path, err)
 	}

jsonata_test.go

@@ -8,7 +8,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"math"
 	"os"
 	"path/filepath"
@@ -8094,9 +8093,9 @@ func must(t *testing.T, prefix string, err error) {
 
 func readJSON(filename string) interface{} {
 
-	data, err := ioutil.ReadFile(filepath.Join("testdata", filename))
+	data, err := os.ReadFile(filepath.Join("testdata", filename))
 	if err != nil {
-		panicf("ioutil.ReadFile error: %s", err)
+		panicf("os.ReadFile error: %s", err)
 	}
 
 	var dest interface{}