merge various branch fixes together

CONTRIBUTING.md

@@ -1,4 +1,4 @@
-# Contributing to blues/jsonata-go
+# Contributing to blues/jsonata-go [xiatechs fork]
 
 We love pull requests from everyone. By participating in this project, you
 agree to abide by the Blues Inc [code of conduct].
@@ -18,7 +18,7 @@ clean up inconsistent whitespace )
 * by closing [issues][]
 * by reviewing patches
 
-[issues]: https://github.com/blues/jsonata-go/issues
+[issues]: https://github.com/xiatechs/jsonata-go/issues
 
 ## Submitting an Issue
 
@@ -55,7 +55,7 @@ clean up inconsistent whitespace )
 * If you don't know how to add tests, please put in a PR and leave a comment asking for help. 
 We love helping!
 
-[repo]: https://github.com/blues/jsonata-go/tree/master
+[repo]: https://github.com/xiatechs/jsonata-go/tree/master
 [fork]: https://help.github.com/articles/fork-a-repo/
 [branch]:
 https://help.github.com/articles/creating-and-deleting-branches-within-your-repository/

README.md

@@ -7,7 +7,7 @@ It currently has feature parity with jsonata-js 1.5.4. As well as a most of the
 
 ## Install
 
- go get github.com/blues/jsonata-go
+ go get github.com/xiatechs/jsonata-go
 
 ## Usage
 
@@ -17,7 +17,7 @@ import (
  "fmt"
  "log"
 
- jsonata "github.com/blues/jsonata-go"
+ jsonata "github.com/xiatechs/jsonata-go"
 )
 
 const jsonString = `
@@ -56,7 +56,7 @@ func main() {
 
 ## JSONata Server
 A locally hosted version of [JSONata Exerciser](http://try.jsonata.org/)
-for testing is [available here](https://github.com/blues/jsonata-go/jsonata-server).
+for testing is [available here](https://github.com/xiatechs/jsonata-go/jsonata-server).
 
 ## JSONata tests
 A CLI tool for running jsonata-go against the [JSONata test suite](https://github.com/jsonata-js/jsonata/tree/master/test/test-suite) is [available here](./jsonata-test).

callable.go

@@ -11,9 +11,9 @@ import (
  "regexp"
  "strings"
 
- "github.com/blues/jsonata-go/jlib"
- "github.com/blues/jsonata-go/jparse"
- "github.com/blues/jsonata-go/jtypes"
+ "github.com/xiatechs/jsonata-go/jlib"
+ "github.com/xiatechs/jsonata-go/jparse"
+ "github.com/xiatechs/jsonata-go/jtypes"
 )
 
 type callableName struct {

callable_test.go

@@ -13,8 +13,8 @@ import (
  "strings"
  "testing"
 
- "github.com/blues/jsonata-go/jparse"
- "github.com/blues/jsonata-go/jtypes"
+ "github.com/xiatechs/jsonata-go/jparse"
+ "github.com/xiatechs/jsonata-go/jtypes"
 )
 
 var (

config/config.go

@@ -0,0 +1,7 @@
+package config
+
+var defaultDivisionPrecision int32 = 8
+
+func GetDivisionPrecision() int32 {
+ return defaultDivisionPrecision
+}

env.go

@@ -11,9 +11,9 @@ import (
  "strings"
  "unicode/utf8"
 
- "github.com/blues/jsonata-go/jlib"
- "github.com/blues/jsonata-go/jparse"
- "github.com/blues/jsonata-go/jtypes"
+ "github.com/xiatechs/jsonata-go/jlib"
+ "github.com/xiatechs/jsonata-go/jparse"
+ "github.com/xiatechs/jsonata-go/jtypes"
 )
 
 type environment struct {
@@ -67,6 +67,32 @@ var (
 
 var baseEnv = initBaseEnv(map[string]Extension{
 
+ /*
+ EXTENDED START
+ */
+
+ "objmerge": {
+ Func: jlib.ObjMerge,
+ UndefinedHandler: defaultUndefinedHandler,
+ EvalContextHandler: nil,
+ },
+
+ "sjoin": {
+ Func: jlib.SimpleJoin,
+ UndefinedHandler: defaultUndefinedHandler,
+ EvalContextHandler: nil,
+ },
+
+ "unescape": {
+ Func: jlib.Unescape,
+ UndefinedHandler: defaultUndefinedHandler,
+ EvalContextHandler: defaultContextHandler,
+ },
+
+ /*
+ EXTENDED END
+ */
+
  // String functions
 
  "string": {

error.go

@@ -9,7 +9,7 @@ import (
  "fmt"
  "regexp"
 
- "github.com/blues/jsonata-go/jtypes"
+ "github.com/xiatechs/jsonata-go/jtypes"
 )
 
 // ErrUndefined is returned by the evaluation methods when

eval.go

@@ -10,9 +10,11 @@ import (
  "reflect"
  "sort"
 
- "github.com/blues/jsonata-go/jlib"
- "github.com/blues/jsonata-go/jparse"
- "github.com/blues/jsonata-go/jtypes"
+ "github.com/shopspring/decimal"
+ "github.com/xiatechs/jsonata-go/config"
+ "github.com/xiatechs/jsonata-go/jlib"
+ "github.com/xiatechs/jsonata-go/jparse"
+ "github.com/xiatechs/jsonata-go/jtypes"
 )
 
 var undefined reflect.Value
@@ -990,19 +992,24 @@ func evalNumericOperator(node *jparse.NumericOperatorNode, data reflect.Value, e
  return undefined, nil
  }
 
+ lhsDecimal, rhsDecimal := decimal.NewFromFloat(lhs), decimal.NewFromFloat(rhs)
+
  var x float64
 
  switch node.Type {
  case jparse.NumericAdd:
- x = lhs + rhs
+ x = lhsDecimal.Add(rhsDecimal).RoundCeil(config.GetDivisionPrecision()).InexactFloat64()
  case jparse.NumericSubtract:
- x = lhs - rhs
+ x = lhsDecimal.Sub(rhsDecimal).RoundCeil(config.GetDivisionPrecision()).InexactFloat64()
  case jparse.NumericMultiply:
- x = lhs * rhs
+ x = lhsDecimal.Mul(rhsDecimal).Truncate(config.GetDivisionPrecision()).InexactFloat64()
  case jparse.NumericDivide:
  x = lhs / rhs
+ if !math.IsInf(x, 0) && !math.IsNaN(x) {
+ x = lhsDecimal.Div(rhsDecimal).RoundCeil(config.GetDivisionPrecision()).InexactFloat64()
+ }
  case jparse.NumericModulo:
- x = math.Mod(lhs, rhs)
+ x = lhsDecimal.Mod(rhsDecimal).Truncate(config.GetDivisionPrecision()).InexactFloat64()
  default:
  panicf("unrecognised numeric operator %q", node.Type)
  }

eval_test.go

@@ -11,9 +11,9 @@ import (
  "strings"
  "testing"
 
- "github.com/blues/jsonata-go/jlib"
- "github.com/blues/jsonata-go/jparse"
- "github.com/blues/jsonata-go/jtypes"
+ "github.com/xiatechs/jsonata-go/jlib"
+ "github.com/xiatechs/jsonata-go/jparse"
+ "github.com/xiatechs/jsonata-go/jtypes"
 )
 
 type evalTestCase struct {

example_eval_test.go

@@ -9,7 +9,7 @@ import (
  "fmt"
  "log"
 
- jsonata "github.com/blues/jsonata-go"
+ jsonata "github.com/xiatechs/jsonata-go"
 )
 
 const jsonString = `

example_exts_test.go

@@ -9,7 +9,7 @@ import (
  "log"
  "strings"
 
- jsonata "github.com/blues/jsonata-go"
+ jsonata "github.com/xiatechs/jsonata-go"
 )
 
 //

go.mod

@@ -1,3 +1,14 @@
-module github.com/blues/jsonata-go
+module github.com/xiatechs/jsonata-go
 
-go 1.16
+go 1.18
+
+require (
+ github.com/shopspring/decimal v1.3.1
+ github.com/stretchr/testify v1.8.0
+)
+
+require (
+ github.com/davecgh/go-spew v1.1.1 // indirect
+ github.com/pmezard/go-difflib v1.0.0 // indirect
+ gopkg.in/yaml.v3 v3.0.1 // indirect
+)

go.sum

@@ -0,0 +1,17 @@
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
+github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

jlib/aggregate.go

@@ -8,7 +8,9 @@ import (
  "fmt"
  "reflect"
 
- "github.com/blues/jsonata-go/jtypes"
+ "github.com/shopspring/decimal"
+ "github.com/xiatechs/jsonata-go/config"
+ "github.com/xiatechs/jsonata-go/jtypes"
 )
 
 // Sum returns the total of an array of numbers. If the array is
@@ -24,17 +26,17 @@ func Sum(v reflect.Value) (float64, error) {
 
  v = jtypes.Resolve(v)
 
- var sum float64
+ var sum decimal.Decimal
 
  for i := 0; i < v.Len(); i++ {
  n, ok := jtypes.AsNumber(v.Index(i))
  if !ok {
  return 0, fmt.Errorf("cannot call sum on an array with non-number types")
  }
- sum += n
+ sum = sum.Add(decimal.NewFromFloat(n))
  }
 
- return sum, nil
+ return sum.RoundCeil(config.GetDivisionPrecision()).InexactFloat64(), nil
 }
 
 // Max returns the largest value in an array of numbers. If the
@@ -115,15 +117,15 @@ func Average(v reflect.Value) (float64, error) {
  return 0, jtypes.ErrUndefined
  }
 
- var sum float64
+ var sum decimal.Decimal
 
  for i := 0; i < v.Len(); i++ {
  n, ok := jtypes.AsNumber(v.Index(i))
  if !ok {
  return 0, fmt.Errorf("cannot call average on an array with non-number types")
  }
- sum += n
+ sum = sum.Add(decimal.NewFromFloat(n))
  }
 
- return sum / float64(v.Len()), nil
+ return sum.Div(decimal.NewFromInt(int64(v.Len()))).RoundCeil(config.GetDivisionPrecision()).InexactFloat64(), nil
 }

jlib/array.go

@@ -10,7 +10,7 @@ import (
  "reflect"
  "sort"
 
- "github.com/blues/jsonata-go/jtypes"
+ "github.com/xiatechs/jsonata-go/jtypes"
 )
 
 // Count (golint)

jlib/boolean.go

@@ -7,7 +7,7 @@ package jlib
 import (
  "reflect"
 
- "github.com/blues/jsonata-go/jtypes"
+ "github.com/xiatechs/jsonata-go/jtypes"
 )
 
 // Boolean (golint)

jlib/date.go

@@ -10,8 +10,8 @@ import (
  "strconv"
  "time"
 
- "github.com/blues/jsonata-go/jlib/jxpath"
- "github.com/blues/jsonata-go/jtypes"
+ "github.com/xiatechs/jsonata-go/jlib/jxpath"
+ "github.com/xiatechs/jsonata-go/jtypes"
 )
 
 // 2006-01-02T15:04:05.000Z07:00

jlib/date_test.go

@@ -9,8 +9,8 @@ import (
  "testing"
  "time"
 
- "github.com/blues/jsonata-go/jlib"
- "github.com/blues/jsonata-go/jtypes"
+ "github.com/xiatechs/jsonata-go/jlib"
+ "github.com/xiatechs/jsonata-go/jtypes"
 )
 
 func TestFromMillis(t *testing.T) {

jlib/hof.go

@@ -8,7 +8,7 @@ import (
  "fmt"
  "reflect"
 
- "github.com/blues/jsonata-go/jtypes"
+ "github.com/xiatechs/jsonata-go/jtypes"
 )
 
 // Map (golint)

jlib/jlib.go

@@ -11,7 +11,7 @@ import (
  "reflect"
  "time"
 
- "github.com/blues/jsonata-go/jtypes"
+ "github.com/xiatechs/jsonata-go/jtypes"
 )
 
 func init() {