Unverified Commit 2369de66 authored by Simon Esposito's avatar Simon Esposito Committed by GitHub
Browse files

Upgrade goja dependency version. (#896)

parent 7e7be87a

go.mod

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ require ( 
	github.com/blugelabs/bluge v0.1.9

	github.com/blugelabs/bluge_segment_api v0.2.0

	github.com/blugelabs/query_string v0.3.0

	github.com/dop251/goja v0.0.0-20220403115030-90825c02072b

	github.com/dop251/goja v0.0.0-20220806120448-1444e6b94559

	github.com/gofrs/uuid v4.0.0+incompatible

	github.com/golang-jwt/jwt/v4 v4.1.0

	github.com/gorilla/handlers v1.5.1
@@ -48,7 +48,7 @@ require ( 
	github.com/cespare/xxhash/v2 v2.1.2 // indirect

	github.com/davecgh/go-spew v1.1.1 // indirect

	github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc // indirect

	github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91 // indirect

	github.com/dlclark/regexp2 v1.7.0 // indirect

	github.com/felixge/httpsnoop v1.0.1 // indirect

	github.com/ghodss/yaml v1.0.0 // indirect

	github.com/go-gorp/gorp/v3 v3.0.2 // indirect

go.sum

+8 −0
Original line number Diff line number Diff line
@@ -138,9 +138,15 @@ github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc h1:8WFBn63wegobsY 
github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc/go.mod h1:c9O8+fpSOX1DM8cPNSkX/qsBWdkD4yd2dpciOWQjpBw=

github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91 h1:Izz0+t1Z5nI16/II7vuEo/nHjodOg0p7+OiDpjX5t1E=

github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=

github.com/dlclark/regexp2 v1.7.0 h1:7lJfhqlPssTb1WQx4yvTHN0uElPEv52sbaECrAQxjAo=

github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=

github.com/dop251/goja v0.0.0-20211022113120-dc8c55024d06/go.mod h1:R9ET47fwRVRPZnOGvHxxhuZcbrMCuiqOz3Rlrh4KSnk=

github.com/dop251/goja v0.0.0-20220403115030-90825c02072b h1:W/gxdQhJQDARfor8C7DASS0NhcFDzAZmL+XkAEgwnRI=

github.com/dop251/goja v0.0.0-20220403115030-90825c02072b/go.mod h1:R9ET47fwRVRPZnOGvHxxhuZcbrMCuiqOz3Rlrh4KSnk=

github.com/dop251/goja v0.0.0-20220806120448-1444e6b94559 h1:S3U65m9SN2p5CJpT3CDuqhN+rNJZXDoABYPKdQ7DOfY=

github.com/dop251/goja v0.0.0-20220806120448-1444e6b94559/go.mod h1:1jWwHOtOkEqsfX6tYsufUc7BBTuGHH2ekiJabpkN4CA=

github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y=

github.com/dop251/goja_nodejs v0.0.0-20211022123610-8dd9abb0616d/go.mod h1:DngW8aVqWbuLRMHItjPUyqdj+HWPvnQe8V8y1nDpIbM=

github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=

github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=

github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -370,6 +376,7 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB 
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=

github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=

github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=

github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=

github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=

github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=

github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
@@ -464,6 +471,7 @@ github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3x 
github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=

github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=

github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=

github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=

github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=

github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=

github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=

vendor/github.com/dlclark/regexp2/README.md

+6 −0
Original line number Diff line number Diff line
@@ -80,6 +80,8 @@ The default behavior of `regexp2` is to match the .NET regexp engine, however th 
* add support for named ascii character classes (e.g. `[[:foo:]]`)

* add support for python-style capture groups (e.g. `(P<name>re)`)

* change singleline behavior for `$` to only match end of string (like RE2) (see [#24](https://github.com/dlclark/regexp2/issues/24))

* change the character classes `\d` `\s` and `\w` to match the same characters as RE2. NOTE: if you also use the `ECMAScript` option then this will change the `\s` character class to match ECMAScript instead of RE2.  ECMAScript allows more whitespace characters in `\s` than RE2 (but still fewer than the the default behavior).

* allow character escape sequences to have defaults. For example, by default `\_` isn't a known character escape and will fail to compile, but in RE2 mode it will match the literal character `_`

 

```go

re := regexp2.MustCompile(`Your RE2-compatible pattern`, regexp2.RE2)
@@ -90,6 +92,10 @@ if isMatch, _ := re.MatchString(`Something to match`); isMatch { 


This feature is a work in progress and I'm open to ideas for more things to put here (maybe more relaxed character escaping rules?).



## ECMAScript compatibility mode

In this mode the engine provides compatibility with the [regex engine](https://tc39.es/ecma262/multipage/text-processing.html#sec-regexp-regular-expression-objects) described in the ECMAScript specification.



Additionally a Unicode mode is provided which allows parsing of `\u{CodePoint}` syntax that is only when both are provided.



## Library features that I'm still working on

- Regex split

vendor/github.com/dlclark/regexp2/regexp.go

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ const ( 
	Debug                                = 0x0080 // "d"

	ECMAScript                           = 0x0100 // "e"

	RE2                                  = 0x0200 // RE2 (regexp package) compatibility mode

	Unicode                              = 0x0400 // "u"

)



func (re *Regexp) RightToLeft() bool {

vendor/github.com/dlclark/regexp2/syntax/charclass.go

+13 −2
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ var ( 
	ecmaSpace = []rune{0x0009, 0x000e, 0x0020, 0x0021, 0x00a0, 0x00a1, 0x1680, 0x1681, 0x2000, 0x200b, 0x2028, 0x202a, 0x202f, 0x2030, 0x205f, 0x2060, 0x3000, 0x3001, 0xfeff, 0xff00}

	ecmaWord  = []rune{0x0030, 0x003a, 0x0041, 0x005b, 0x005f, 0x0060, 0x0061, 0x007b}

	ecmaDigit = []rune{0x0030, 0x003a}



	re2Space = []rune{0x0009, 0x000b, 0x000c, 0x000e, 0x0020, 0x0021}

)



var (
@@ -56,6 +58,9 @@ var ( 
	NotSpaceClass = getCharSetFromCategoryString(true, false, spaceCategoryText)

	DigitClass    = getCharSetFromCategoryString(false, false, "Nd")

	NotDigitClass = getCharSetFromCategoryString(false, true, "Nd")



	RE2SpaceClass    = getCharSetFromOldString(re2Space, false)

	NotRE2SpaceClass = getCharSetFromOldString(re2Space, true)

)



var unicodeCategories = func() map[string]*unicode.RangeTable {
@@ -401,13 +406,19 @@ func (c *CharSet) addChar(ch rune) { 
	c.addRange(ch, ch)

}



func (c *CharSet) addSpace(ecma, negate bool) {

func (c *CharSet) addSpace(ecma, re2, negate bool) {

	if ecma {

		if negate {

			c.addRanges(NotECMASpaceClass().ranges)

		} else {

			c.addRanges(ECMASpaceClass().ranges)

		}

	} else if re2 {

		if negate {

			c.addRanges(NotRE2SpaceClass().ranges)

		} else {

			c.addRanges(RE2SpaceClass().ranges)

		}

	} else {

		c.addCategories(category{cat: spaceCategoryText, negate: negate})

	}
@@ -563,7 +574,7 @@ func (c *CharSet) addNamedASCII(name string, negate bool) bool { 
	case "punct": //[!-/:-@[-`{-~]

		rs = []singleRange{singleRange{'!', '/'}, singleRange{':', '@'}, singleRange{'[', '`'}, singleRange{'{', '~'}}

	case "space":

		c.addSpace(true, negate)

		c.addSpace(true, false, negate)

	case "upper":

		rs = []singleRange{singleRange{'A', 'Z'}}

	case "word":