Revert "Upgrade to go 1.19 and update dependencies (#3069)" (#3085)

This reverts commit bba7c23957.

vendor/github.com/antchfx/xpath/README.md

@@ -57,7 +57,6 @@ Supported Features
 
 - `(a, b, c)` : Evaluates each of its operands and concatenates the resulting sequences, in order, into a single result sequence
 
-- `(a/b)` : Selects all matches nodes as grouping set.
 
 #### Node Axes 
 
@@ -159,4 +158,16 @@ Supported Features
 `system-property()`| ✗ |
 `translate()`| ✓ |
 `true()`| ✓ |
-`unparsed-entity-url()` | ✗ |
+`unparsed-entity-url()` | ✗ |
+
+Changelogs
+===
+
+2019-03-19 
+- optimize XPath `|` operation performance. [#33](https://github.com/antchfx/xpath/issues/33). Tips: suggest split into multiple subquery if you have a lot of `|` operations.
+
+2019-01-29
+-  improvement `normalize-space` function. [#32](https://github.com/antchfx/xpath/issues/32)
+
+2018-12-07
+-  supports XPath 2.0 Sequence expressions. [#30](https://github.com/antchfx/xpath/pull/30) by [@minherz](https://github.com/minherz).

vendor/github.com/antchfx/xpath/build.go

@@ -42,7 +42,7 @@ func axisPredicate(root *axisNode) func(NodeNavigator) bool {
 	}
 	nametest := root.LocalName != "" || root.Prefix != ""
 	predicate := func(n NodeNavigator) bool {
-		if typ == n.NodeType() || typ == allNode {
+		if typ == n.NodeType() || typ == allNode || typ == TextNode {
 			if nametest {
 				if root.LocalName == n.LocalName() && root.Prefix == n.Prefix() {
 					return true

vendor/github.com/antchfx/xpath/func.go

@@ -122,19 +122,17 @@ func asNumber(t iterator, o interface{}) float64 {
 		return typ
 	case string:
 		v, err := strconv.ParseFloat(typ, 64)
-		if err == nil {
-			return v
+		if err != nil {
+			panic(errors.New("ceiling() function argument type must be a node-set or number"))
 		}
+		return v
 	}
-	return math.NaN()
+	return 0
 }
 
 // ceilingFunc is a XPath Node Set functions ceiling(node-set).
 func ceilingFunc(q query, t iterator) interface{} {
 	val := asNumber(t, functionArgs(q).Evaluate(t))
-	// if math.IsNaN(val) {
-	// 	panic(errors.New("ceiling() function argument type must be a valid number"))
-	// }
 	return math.Ceil(val)
 }
 

vendor/github.com/antchfx/xpath/func_go110.go

@@ -11,6 +11,6 @@ func round(f float64) int {
 	return int(math.Round(f))
 }
 
-func newStringBuilder() stringBuilder {
+func newStringBuilder() stringBuilder{ 
 	return &strings.Builder{}
 }

vendor/github.com/antchfx/xpath/operator.go

@@ -165,28 +165,15 @@ func cmpNodeSetString(t iterator, op string, m, n interface{}) bool {
 func cmpNodeSetNodeSet(t iterator, op string, m, n interface{}) bool {
 	a := m.(query)
 	b := n.(query)
-	for {
-		x := a.Select(t)
-		if x == nil {
-			return false
-		}
-
-		y := b.Select(t)
-		if y == nil {
-			return false
-		}
-
-		for {
-			if cmpStringStringF(op, x.Value(), y.Value()) {
-				return true
-			}
-			if y = b.Select(t); y == nil {
-				break
-			}
-		}
-		// reset
-		b.Evaluate(t)
+	x := a.Select(t)
+	if x == nil {
+		return false
 	}
+	y := b.Select(t)
+	if y == nil {
+		return false
+	}
+	return cmpStringStringF(op, x.Value(), y.Value())
 }
 
 func cmpStringNumeric(t iterator, op string, m, n interface{}) bool {

vendor/github.com/antchfx/xpath/query.go

@@ -820,8 +820,6 @@ func (b *booleanQuery) Select(t iterator) NodeNavigator {
 }
 
 func (b *booleanQuery) Evaluate(t iterator) interface{} {
-	n := t.Current().Copy()
-
 	m := b.Left.Evaluate(t)
 	left := asBool(t, m)
 	if b.IsOr && left {
@@ -829,8 +827,6 @@ func (b *booleanQuery) Evaluate(t iterator) interface{} {
 	} else if !b.IsOr && !left {
 		return false
 	}
-
-	t.Current().MoveTo(n)
 	m = b.Right.Evaluate(t)
 	return asBool(t, m)
 }